[OpenGL] Add OpenGL Program helper classes and functions for OpenGL >= 3.2 #26090

mqcmd196 · 2024-08-30T05:56:05Z

This PR adds an OpenGL Program wrapper for supporting fragment and vertex shader required from OpenGL >= 3.2. I also edited the sample code and confirmed it worked in my environment.

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

I agree to contribute to the project under Apache 2 License.
To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
The PR is proposed to the proper branch
There is a reference to the original bug report and related work
There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
The feature is well documented and sample code can be built with the project CMake

…nGL >= 3.2

modules/core/include/opencv2/core/opengl.hpp

asmorkalov · 2024-08-30T06:23:20Z

@mqcmd196 Could you adapt existing opengl.cpp sample to GTK3 or we need more changes?

asmorkalov · 2024-08-30T06:28:18Z

Implementation should be guarded as follows:

#ifndef HAVE_OPENGL
    throw_no_ogl();
#else
// impl itself
#endif

Otherwise it leads to complication issues.

mqcmd196 · 2024-08-30T07:22:51Z

Implementation should be guarded as follows:

#ifndef HAVE_OPENGL
throw_no_ogl();
#else
// impl itself
#endif
Otherwise it leads to complication issues.

Fixed in a702432

mqcmd196 · 2024-08-30T07:44:41Z

Could you adapt existing opengl.cpp sample to GTK3 or we need more changes?

The existing samples/opengl/opengl.cpp is written in OpenGL v2.x. I think GTK3 and GTK4 dropped their support and only worked with OpenGL >= 3.2. (I'm sorry, but someone reported the issue somewhere, but I lost.)

asmorkalov · 2024-09-19T13:17:51Z

modules/core/src/opengl.cpp

+
+const Ptr<cv::ogl::VertexArray::Impl> cv::ogl::VertexArray::Impl::empty()
+{
+    static Ptr<Impl> p(new Impl);


Could you provide more info?

modules/core/src/opengl.cpp

asmorkalov · 2024-09-19T13:25:42Z

FAILED: modules/core/CMakeFiles/opencv_core.dir/src/opengl.cpp.o 
/usr/bin/ccache /usr/bin/c++  -DCVAPI_EXPORTS -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int -DOPENCV_WITH_ITT=1 -D_USE_MATH_DEFINES -D__OPENCV_BUILD=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/home/ci/opencv/modules/core/include -Imodules/core -I/home/ci/opencv/3rdparty/include/opencl/1.2 -I/home/ci/opencv/3rdparty/ittnotify/include -isystem . -isystem /usr/include/eigen3 -fsigned-char -W -Wall -Wreturn-type -Wnon-virtual-dtor -Waddress -Wsequence-point -Wformat -Wformat-security -Wmissing-declarations -Wundef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo -Wuninitialized -Wsuggest-override -Wno-delete-non-virtual-dtor -Wno-comment -Wimplicit-fallthrough=3 -Wno-strict-overflow -fdiagnostics-show-option -pthread -fomit-frame-pointer -ffunction-sections -fdata-sections  -fvisibility=hidden -fvisibility-inlines-hidden -O3 -DNDEBUG  -DNDEBUG -fPIC   -std=c++11 -MD -MT modules/core/CMakeFiles/opencv_core.dir/src/opengl.cpp.o -MF modules/core/CMakeFiles/opencv_core.dir/src/opengl.cpp.o.d -o modules/core/CMakeFiles/opencv_core.dir/src/opengl.cpp.o -c /home/ci/opencv/modules/core/src/opengl.cpp
/home/ci/opencv/modules/core/src/opengl.cpp:826:16: error: redefinition of 'class cv::ogl::VertexArray'
  826 | class cv::ogl::VertexArray
      |                ^~~~~~~~~~~
In file included from /home/ci/opencv/modules/core/src/precomp.hpp:56,
                 from /home/ci/opencv/modules/core/src/opengl.cpp:43:
/home/ci/opencv/modules/core/include/opencv2/core/opengl.hpp:281:18: note: previous definition of 'class cv::ogl::VertexArray'
  281 | class CV_EXPORTS VertexArray

asmorkalov · 2024-09-23T06:41:09Z

modules/core/include/opencv2/core/opengl.hpp

+
+    void setAutoRelease(bool flag);
+
+    void vertexAttribPointer(InputArray arr, unsigned int index, int size, int stride, int offset) const;


stride should be in bytes. It's implemented for the case if structure is heterogeneous or larger than just shader input data.

Like void vertexAttribPointer(InputArray arr, unsigned int index, int size, unsigned char stride, int offset) const; ??

asmorkalov · 2024-09-23T06:48:54Z

modules/core/include/opencv2/core/opengl.hpp

+/////////////////// Export to Graphic device ///////////////////
+
+CV_EXPORTS void uniformMatrix4fv(int location, int count, float* value);
+


I propose to make it a method of Program class. Also it makes sense to add methods with integer as location and a string as location name.

asmorkalov · 2024-09-23T06:53:59Z

modules/core/include/opencv2/core/opengl.hpp

+
+/** @brief Wrapper for OpenGL 3.2 Program object
+ */
+class CV_EXPORTS Program{


I propose to refactor it to Pimpl and hide program_ from public interface.

…nter more convenient

mqcmd196 · 2024-09-24T02:02:19Z

FAILED: modules/core/CMakeFiles/opencv_core.dir/src/opengl.cpp.o
/usr/bin/ccache /usr/bin/c++ -DCVAPI_EXPORTS -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int -DOPENCV_WITH_ITT=1 -D_USE_MATH_DEFINES -D__OPENCV_BUILD=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/home/ci/opencv/modules/core/include -Imodules/core -I/home/ci/opencv/3rdparty/include/opencl/1.2 -I/home/ci/opencv/3rdparty/ittnotify/include -isystem . -isystem /usr/include/eigen3 -fsigned-char -W -Wall -Wreturn-type -Wnon-virtual-dtor -Waddress -Wsequence-point -Wformat -Wformat-security -Wmissing-declarations -Wundef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo -Wuninitialized -Wsuggest-override -Wno-delete-non-virtual-dtor -Wno-comment -Wimplicit-fallthrough=3 -Wno-strict-overflow -fdiagnostics-show-option -pthread -fomit-frame-pointer -ffunction-sections -fdata-sections -fvisibility=hidden -fvisibility-inlines-hidden -O3 -DNDEBUG -DNDEBUG -fPIC -std=c++11 -MD -MT modules/core/CMakeFiles/opencv_core.dir/src/opengl.cpp.o -MF modules/core/CMakeFiles/opencv_core.dir/src/opengl.cpp.o.d -o modules/core/CMakeFiles/opencv_core.dir/src/opengl.cpp.o -c /home/ci/opencv/modules/core/src/opengl.cpp
/home/ci/opencv/modules/core/src/opengl.cpp:826:16: error: redefinition of 'class cv::ogl::VertexArray'
826 | class cv::ogl::VertexArray
| ^~~~~~~~~~~
In file included from /home/ci/opencv/modules/core/src/precomp.hpp:56,
from /home/ci/opencv/modules/core/src/opengl.cpp:43:
/home/ci/opencv/modules/core/include/opencv2/core/opengl.hpp:281:18: note: previous definition of 'class cv::ogl::VertexArray'
281 | class CV_EXPORTS VertexArray

1c25ef8

[OpenGL] Add OpenGL Program class for implementing shader used in Ope…

efd93f6

…nGL >= 3.2

asmorkalov added category: highgui-gui category: core labels Aug 30, 2024

asmorkalov self-requested a review August 30, 2024 06:01

asmorkalov reviewed Aug 30, 2024

View reviewed changes

modules/core/include/opencv2/core/opengl.hpp Outdated Show resolved Hide resolved

modules/core/include/opencv2/core/opengl.hpp Outdated Show resolved Hide resolved

modules/core/include/opencv2/core/opengl.hpp Outdated Show resolved Hide resolved

mqcmd196 added 4 commits August 30, 2024 15:42

[OpenGL] std::string -> std::string&

8f9fa1d

[OpenGL] add static getters of default shader

71c422b

[OpenGL] getProgram -> getProgramId

ff9a0ec

[OpenGL][Program] check macro to throw no_ogl

a702432

mqcmd196 changed the title ~~[OpenGL] Add OpenGL Program class for implementing shader used in OpenGL >= 3.2~~ [OpenGL] Add OpenGL Program helper classes and functions for OpenGL >= 3.2 Aug 30, 2024

mqcmd196 marked this pull request as draft August 30, 2024 08:42

Build fix.

8e54474

asmorkalov added the GSoC label Sep 4, 2024

[opengl] support vao

b3439ec

asmorkalov reviewed Sep 19, 2024

View reviewed changes

mqcmd196 marked this pull request as ready for review September 21, 2024 01:56

asmorkalov self-assigned this Sep 23, 2024

asmorkalov added this to the 4.11.0 milestone Sep 23, 2024

asmorkalov reviewed Sep 23, 2024

View reviewed changes

mqcmd196 added 4 commits September 24, 2024 10:58

[opengl] support uniformMatrix4fv and remove epoxy depends

e572d83

[opengl] auto detect the type of vertex array to make vertexAttribPoi…

c44a796

…nter more convenient

remove note

2d7ef2f

[opengl] fix compile error without opengl

1c25ef8

mqcmd196 force-pushed the PR/opengl_shader_wrapper branch from bdf8169 to 1c25ef8 Compare September 24, 2024 02:00

Build fix.

eeb6499

asmorkalov modified the milestones: 4.11.0, 4.12.0 Dec 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[OpenGL] Add OpenGL Program helper classes and functions for OpenGL >= 3.2 #26090

[OpenGL] Add OpenGL Program helper classes and functions for OpenGL >= 3.2 #26090

mqcmd196 commented Aug 30, 2024 •

edited

Loading

asmorkalov commented Aug 30, 2024

asmorkalov commented Aug 30, 2024

mqcmd196 commented Aug 30, 2024

mqcmd196 commented Aug 30, 2024 •

edited

Loading

asmorkalov Sep 19, 2024

mqcmd196 Sep 20, 2024

asmorkalov commented Sep 19, 2024

asmorkalov Sep 23, 2024

mqcmd196 Sep 24, 2024

asmorkalov Sep 23, 2024

asmorkalov Sep 23, 2024

mqcmd196 commented Sep 24, 2024


		void setAutoRelease(bool flag);

		void vertexAttribPointer(InputArray arr, unsigned int index, int size, int stride, int offset) const;

		/////////////////// Export to Graphic device ///////////////////

		CV_EXPORTS void uniformMatrix4fv(int location, int count, float* value);

[OpenGL] Add OpenGL Program helper classes and functions for OpenGL >= 3.2 #26090

Are you sure you want to change the base?

[OpenGL] Add OpenGL Program helper classes and functions for OpenGL >= 3.2 #26090

Conversation

mqcmd196 commented Aug 30, 2024 • edited Loading

Pull Request Readiness Checklist

asmorkalov commented Aug 30, 2024

asmorkalov commented Aug 30, 2024

mqcmd196 commented Aug 30, 2024

mqcmd196 commented Aug 30, 2024 • edited Loading

asmorkalov Sep 19, 2024

Choose a reason for hiding this comment

mqcmd196 Sep 20, 2024

Choose a reason for hiding this comment

asmorkalov commented Sep 19, 2024

asmorkalov Sep 23, 2024

Choose a reason for hiding this comment

mqcmd196 Sep 24, 2024

Choose a reason for hiding this comment

asmorkalov Sep 23, 2024

Choose a reason for hiding this comment

asmorkalov Sep 23, 2024

Choose a reason for hiding this comment

mqcmd196 commented Sep 24, 2024

mqcmd196 commented Aug 30, 2024 •

edited

Loading

mqcmd196 commented Aug 30, 2024 •

edited

Loading