GLES3 adaption

modules/viz2d/CMakeLists.txt

@@ -18,12 +18,13 @@ elseif(NOT nanovg_FOUND)
 elseif(NOT nanogui_FOUND)
   message(STATUS "Module opencv_viz2d disabled because NanoGUI was not found")
   ocv_module_disable(viz2d)
-else() # we need C++20
+else()
   if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qstd=c++20")
   else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
   endif()
+#  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVIZ2D_USE_ES3=1")
 endif()
 
 include_directories(${glfw3_INCLUDE_DIRS})

modules/viz2d/include/opencv2/viz2d/dialog.hpp

@@ -5,7 +5,16 @@
 
 #ifndef SRC_COMMON_DIALOG_HPP_
 #define SRC_COMMON_DIALOG_HPP_
+#ifdef __EMSCRIPTEN__
+#define VIZ2D_USE_ES3 1
+#endif
 
+#ifndef VIZ2D_USE_ES3
+#define NANOGUI_USE_OPENGL
+#else
+#define NANOGUI_USE_GLES
+#define NANOGUI_GLES_VERSION 3
+#endif
 #include <nanogui/nanogui.h>
 #include <opencv2/opencv.hpp>
 

modules/viz2d/include/opencv2/viz2d/viz2d.hpp

@@ -17,11 +17,18 @@
 #include <string>
 #include <opencv2/opencv.hpp>
 #include <opencv2/videoio.hpp>
-#include <nanogui/nanogui.h>
 #ifdef __EMSCRIPTEN__
 #define VIZ2D_USE_ES3 1
 #include <emscripten.h>
 #endif
+
+#ifndef VIZ2D_USE_ES3
+#define NANOGUI_USE_OPENGL
+#else
+#define NANOGUI_USE_GLES
+#define NANOGUI_GLES_VERSION 3
+#endif
+#include <nanogui/nanogui.h>
 #ifndef VIZ2D_USE_ES3
 #include <GL/glew.h>
 #else

modules/viz2d/samples/cpp/Makefile

@@ -4,6 +4,7 @@ ifdef EMSDK
 LDFLAGS  := -flto -L/usr/local/lib/ -L../common
 LIBS     := -lopencv_core -lopencv_imgproc -lnanogui
 else
+#CXXFLAGS += -DVIZ2D_USE_ES3=1
 LDFLAGS  := -L/opt/local/lib -flto -L/usr/local/lib64 -L../common/ -L/usr/local/lib
 LIBS     := -lnanogui
 endif

modules/viz2d/src/dialog.cpp

@@ -5,6 +5,16 @@
 
 #include "opencv2/viz2d/dialog.hpp"
 #include <nanogui/layout.h>
+#ifdef __EMSCRIPTEN__
+#define VIZ2D_USE_ES3 1
+#endif
+#ifndef VIZ2D_USE_ES3
+#  include <GL/glew.h>
+#  define GLFW_INCLUDE_GLCOREARB
+#else
+#  define GLFW_INCLUDE_ES3
+#  define GLFW_INCLUDE_GLEXT
+#endif
 #include <GLFW/glfw3.h>
 
 namespace cv {