Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork56.4k
Support OpenGL GTK3 New API#25822
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from5 commits
Commits
Show all changes
10 commits Select commitHold shift + click to select a range
b42405a [GTK3][OpenGL] Support OpenGL GTK3 new API with test codes
mqcmd196c035d93 [GTK3][OpenGL] Add OpenGL 3.2 example
mqcmd19628fb35c [GTK3][OpenGL] Remove message debug in cmake
mqcmd19674c1fcb Got rid of libglm dependency.
asmorkalovb977644 [GTK3][OpenGL] remove exmaple test code
mqcmd196b9b912e [GTK3][OpenGL] remove libepoxy from gtk highgui
mqcmd1961742657 [example][OpenGL3.2] replace lena.jpg with HappyFish.jpg
mqcmd19641efb5b remove libepoxy from all
mqcmd196c76cdb4 Warnings fix.
asmorkalov8ca3ec1 Skip new sample if libepoxy was not found.
asmorkalovFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
7 changes: 6 additions & 1 deletionCMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1464,9 +1464,14 @@ if(WITH_GTK OR HAVE_GTK) | ||
| else() | ||
| status(" GTK+:" "NO") | ||
| endif() | ||
| if(HAVE_GTK) | ||
| status( " GThread :" HAVE_GTHREAD THEN "YES (ver ${GTHREAD_VERSION})" ELSE NO) | ||
| if(HAVE_GTK3) | ||
| status( " Epoxy:" HAVE_EPOXY THEN "YES (ver ${EPOXY_VERSION})" ELSE NO) | ||
mqcmd196 marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| else() | ||
| status( " GtkGlExt:" HAVE_GTKGLEXT THEN "YES (ver ${GTKGLEXT_VERSION})" ELSE NO) | ||
| endif() | ||
| endif() | ||
| endif() | ||
2 changes: 1 addition & 1 deletioncmake/OpenCVFindLibsGUI.cmake
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -62,7 +62,7 @@ endif() | ||
| # --- OpenGl --- | ||
| ocv_clear_vars(HAVE_OPENGL HAVE_QT_OPENGL) | ||
| if(WITH_OPENGL) | ||
| if(WITH_WIN32UI OR (HAVE_QT AND QT_QTOPENGL_FOUND) OR(HAVE_GTK3 AND HAVE_EPOXY) OR (HAVE_GTK AND NOT HAVE_GTK3 ANDHAVE_GTKGLEXT)) | ||
mqcmd196 marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| find_package (OpenGL QUIET) | ||
| if(OPENGL_FOUND) | ||
| set(HAVE_OPENGL TRUE) | ||
2 changes: 1 addition & 1 deletionmodules/core/include/opencv2/core/opengl.hpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletionsmodules/highgui/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
34 changes: 21 additions & 13 deletionsmodules/highgui/cmake/detect_gtk.cmake
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -26,25 +26,33 @@ if(WITH_GTK) | ||
| else() | ||
| ocv_add_external_target(gthread "${GTHREAD_INCLUDE_DIRS}" "${GTHREAD_LIBRARIES}" "HAVE_GTHREAD") | ||
| endif() | ||
| if((WITH_OPENGL OR HAVE_OPENGL) AND (HAVE_GTK2 OR HAVE_GTK3)) | ||
| if(HAVE_GTK2) | ||
| ocv_check_modules(GTKGLEXT gtkglext-1.0) | ||
| if(HAVE_GTKGLEXT) | ||
| # HACK for https://github.com/opencv/opencv/issues/20850 | ||
| # pkg-config reports some include directories that do not exist. Just filter them out. | ||
| set(GTKGLEXT_INCLUDE_DIRS_EXISTS "") | ||
| foreach(p ${GTKGLEXT_INCLUDE_DIRS}) | ||
| if (EXISTS "${p}") | ||
| list(APPEND GTKGLEXT_INCLUDE_DIRS_EXISTS "${p}") | ||
| endif() | ||
| endforeach() | ||
| ocv_add_external_target(gtkglext "${GTKGLEXT_INCLUDE_DIRS}" "${GTKGLEXT_LIBRARIES}" "HAVE_GTKGLEXT") | ||
| endif() | ||
| endif() | ||
| if(HAVE_GTK3) | ||
| ocv_check_modules(EPOXY epoxy) | ||
| if(HAVE_EPOXY) | ||
| ocv_add_external_target(epoxy "${EPOXY_INCLUDE_DIRS}" "${EPOXY_LIBRARIES}" "HAVE_EPOXY") | ||
| endif() | ||
mqcmd196 marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| endif() | ||
| endif() | ||
| elseif(HAVE_GTK) | ||
| ocv_add_external_target(gtk "${GTK_INCLUDE_DIRS}" "${GTK_LIBRARIES}" "${GTK_DEFINES};HAVE_GTK") | ||
| endif() | ||
| if(WITH_OPENGL) | ||
| find_package(OpenGL QUIET) | ||
| if(OPENGL_FOUND) | ||
| set(HAVE_OPENGL TRUE) | ||
109 changes: 97 additions & 12 deletionsmodules/highgui/src/window_gtk.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -46,10 +46,7 @@ | ||
| #include <gtk/gtk.h> | ||
| #if (GTK_MAJOR_VERSION == 2) && defined(HAVE_OPENGL) && !defined(HAVE_GTKGLEXT) | ||
| #undef HAVE_OPENGL // gtkglext is required | ||
| #endif | ||
| @@ -68,9 +65,14 @@ | ||
| #endif | ||
| #ifdef HAVE_OPENGL | ||
| #ifdef GTK_VERSION3 | ||
| #include <gtk/gtkglarea.h> | ||
| #include <epoxy/gl.h> | ||
mqcmd196 marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| #else | ||
| #include <gtk/gtkgl.h> | ||
| #include <GL/glu.h> | ||
| #endif | ||
| #include <GL/gl.h> | ||
| #endif | ||
| #include <opencv2/core/utils/logger.hpp> | ||
| @@ -570,7 +572,7 @@ struct CvWindow : CvUIBase | ||
| last_key(0), flags(0), status(0), | ||
| on_mouse(NULL), on_mouse_param(NULL) | ||
| #ifdef HAVE_OPENGL | ||
| ,useGl(false), glDrawCallback(NULL), glDrawData(NULL), glArea(NULL) | ||
| #endif | ||
| { | ||
| CV_LOG_INFO(NULL, "OpenCV/UI: creating GTK window: " << window_name); | ||
| @@ -597,6 +599,7 @@ struct CvWindow : CvUIBase | ||
| CvOpenGlDrawCallback glDrawCallback; | ||
| void* glDrawData; | ||
| GtkWidget* glArea; | ||
| #endif | ||
| }; | ||
| @@ -640,7 +643,7 @@ CV_IMPL int cvInitSystem( int argc, char** argv ) | ||
| setlocale(LC_NUMERIC,"C"); | ||
| #if defined(HAVE_OPENGL) && not defined(GTK_VERSION3) // GTK3+ uses GtkGLArea so no need to check for GtkGLExt | ||
| if (!gtk_gl_init_check(&argc, &argv)) | ||
| { | ||
| hasError = true; | ||
| @@ -907,11 +910,40 @@ double cvGetOpenGlProp_GTK(const char* name) | ||
| // OpenGL support | ||
| #ifdef HAVE_OPENGL | ||
| namespace | ||
| { | ||
| #ifdef GTK_VERSION3 | ||
| void glRealizeCallback(GtkGLArea* area, gpointer user_data){ | ||
| gtk_gl_area_make_current(area); | ||
| if (gtk_gl_area_get_error(area) != NULL) | ||
| CV_Error(cv::Error::OpenGlApiCallError, "OpenGL context is not initialized"); | ||
| } | ||
| gboolean glRenderCallback(GtkGLArea* area, GdkGLContext* context, gpointer user_data){ | ||
| CvWindow* window = (CvWindow*)user_data; | ||
| gtk_gl_area_make_current(area); | ||
| if (gtk_gl_area_get_error(area) != NULL) { | ||
| CV_Error(cv::Error::OpenGlApiCallError, "OpenGL context is not initialized"); | ||
| return FALSE; | ||
| } | ||
| if(window->glDrawCallback) { | ||
| window->glDrawCallback(window->glDrawData); | ||
| } | ||
| // gtk_gl_area_queue_render(area); | ||
| return TRUE; | ||
| } | ||
| #endif | ||
| void createGlContext(CvWindow* window) | ||
| { | ||
| #ifdef GTK_VERSION3 | ||
| g_signal_connect(window->glArea, "realize", G_CALLBACK(glRealizeCallback), window); | ||
| g_signal_connect(window->glArea, "render", G_CALLBACK(glRenderCallback), window); | ||
| #else | ||
| GdkGLConfig* glconfig; | ||
| // Try double-buffered visual | ||
| @@ -923,11 +955,24 @@ namespace | ||
| if (!gtk_widget_set_gl_capability(window->widget, glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE)) | ||
| CV_Error( cv::Error::OpenGlApiCallError, "Can't Create A GL Device Context" ); | ||
| #endif | ||
| window->useGl = true; | ||
| } | ||
| void drawGl(CvWindow* window) | ||
| { | ||
| #ifdef GTK_VERSION3 | ||
| GtkGLArea* gtkGlArea = GTK_GL_AREA(window->glArea); | ||
| if (gtk_gl_area_get_error(gtkGlArea) != NULL) | ||
| CV_Error(cv::Error::OpenGlApiCallError, "Can't Activate The GL Rendering Context"); | ||
| if (window->glDrawCallback) | ||
| window->glDrawCallback(window->glDrawData); | ||
| #else | ||
| GdkGLContext* glcontext = gtk_widget_get_gl_context(window->widget); | ||
| GdkGLDrawable* gldrawable = gtk_widget_get_gl_drawable(window->widget); | ||
| @@ -947,6 +992,8 @@ namespace | ||
| glFlush(); | ||
| gdk_gl_drawable_gl_end(gldrawable); | ||
| #endif | ||
| } | ||
| } | ||
| @@ -1041,12 +1088,27 @@ static std::shared_ptr<CvWindow> namedWindow_(const std::string& name, int flags | ||
| window->frame = gtk_window_new( GTK_WINDOW_TOPLEVEL ); | ||
| window->widget = cvImageWidgetNew( flags ); | ||
| #if defined(HAVE_OPENGL) && defined(GTK_VERSION3) | ||
| if (flags & cv::WINDOW_OPENGL) { | ||
| window->glArea = gtk_gl_area_new(); | ||
| gtk_container_add(GTK_CONTAINER(window->frame), window->glArea); | ||
| gtk_widget_show(window->glArea); | ||
| } else { | ||
| window->paned = gtk_vbox_new( FALSE, 0 ); | ||
| gtk_box_pack_end( GTK_BOX(window->paned), window->widget, TRUE, TRUE, 0 ); | ||
| gtk_widget_show( window->widget ); | ||
| gtk_container_add( GTK_CONTAINER(window->frame), window->paned ); | ||
| gtk_widget_show( window->paned ); | ||
| } | ||
| #else | ||
| window->paned = gtk_vbox_new( FALSE, 0 ); | ||
| gtk_box_pack_end( GTK_BOX(window->paned), window->widget, TRUE, TRUE, 0 ); | ||
| gtk_widget_show( window->widget ); | ||
| gtk_container_add( GTK_CONTAINER(window->frame), window->paned ); | ||
| gtk_widget_show( window->paned ); | ||
| #endif | ||
| #ifndef HAVE_OPENGL | ||
| if (flags & cv::WINDOW_OPENGL) | ||
| @@ -1122,9 +1184,6 @@ static std::shared_ptr<CvWindow> namedWindow_(const std::string& name, int flags | ||
| CV_IMPL void cvSetOpenGlContext(const char* name) | ||
| { | ||
| CV_Assert(name && "NULL name string"); | ||
| CV_LOCK_MUTEX(); | ||
| @@ -1136,11 +1195,24 @@ CV_IMPL void cvSetOpenGlContext(const char* name) | ||
| if (!window->useGl) | ||
| CV_Error( cv::Error::OpenGlNotSupported, "Window doesn't support OpenGL" ); | ||
| #ifdef GTK_VERSION3 | ||
| if(gtk_gl_area_get_error(GTK_GL_AREA(window->glArea)) != NULL) | ||
| CV_Error( cv::Error::OpenGlApiCallError, "Can't Activate The GL Rendering Context"); | ||
| #else | ||
| GdkGLContext* glcontext; | ||
| GdkGLDrawable* gldrawable; | ||
| glcontext = gtk_widget_get_gl_context(window->widget); | ||
| gldrawable = gtk_widget_get_gl_drawable(window->widget); | ||
| if (!gdk_gl_drawable_make_current(gldrawable, glcontext)) | ||
| CV_Error( cv::Error::OpenGlApiCallError, "Can't Activate The GL Rendering Context" ); | ||
| #endif | ||
| } | ||
| CV_IMPL void cvUpdateWindow(const char* name) | ||
| @@ -1154,7 +1226,20 @@ CV_IMPL void cvUpdateWindow(const char* name) | ||
| return; | ||
| // window does not refresh without this | ||
| #ifdef GTK_VERSION3 | ||
| if ( GTK_IS_GL_AREA(window->glArea) ){ | ||
| gtk_gl_area_queue_render(GTK_GL_AREA(window->glArea)); | ||
| } else { | ||
| gtk_widget_queue_draw( GTK_WIDGET(window->widget)); | ||
| } | ||
| #else | ||
| gtk_widget_queue_draw( GTK_WIDGET(window->widget) ); | ||
| #endif | ||
| } | ||
| CV_IMPL void cvSetOpenGlDrawCallback(const char* name, CvOpenGlDrawCallback callback, void* userdata) | ||
7 changes: 7 additions & 0 deletionssamples/opengl/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.