DPF

commit 157028c644e7782db0d2849faec3101ea3ffb7f9
parent 36f018dacdcb96a7e858f2c078e6b876b1921119
Author: falkTX <falktx@falktx.com>
Date:   Fri, 25 Nov 2022 11:31:35 +0000

Set DGL_USE_OPENGL3 for GLES2/3 builds

Signed-off-by: falkTX <falktx@falktx.com>

Diffstat:
M
Makefile.base.mk
 | 
4
++--
M
dgl/src/OpenGL.cpp
 | 
12
+-----------
M
dgl/src/pugl.cpp
 | 
8
++++----

3 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/Makefile.base.mk b/Makefile.base.mk
@@ -577,11 +577,11 @@ BUILD_CXX_FLAGS += -DDGL_WINDOWS_ICON_ID=$(WINDOWS_ICON_ID)
 endif
 
 ifeq ($(USE_GLES2),true)
-BUILD_CXX_FLAGS += -DDGL_USE_GLES -DDGL_USE_GLES2
+BUILD_CXX_FLAGS += -DDGL_USE_OPENGL3 -DDGL_USE_GLES -DDGL_USE_GLES2
 endif
 
 ifeq ($(USE_GLES3),true)
-BUILD_CXX_FLAGS += -DDGL_USE_GLES -DDGL_USE_GLES3
+BUILD_CXX_FLAGS += -DDGL_USE_OPENGL3 -DDGL_USE_GLES -DDGL_USE_GLES3
 endif
 
 ifeq ($(USE_OPENGL3),true)
diff --git a/dgl/src/OpenGL.cpp b/dgl/src/OpenGL.cpp
@@ -35,17 +35,7 @@ START_NAMESPACE_DGL
 
 // -----------------------------------------------------------------------
 
-#if defined(DGL_USE_GLES2)
-static void notImplemented(const char* const name)
-{
-//     d_stderr2("GLES2 function not implemented: %s", name);
-}
-#elif defined(DGL_USE_GLES3)
-static void notImplemented(const char* const name)
-{
-    d_stderr2("GLES3 function not implemented: %s", name);
-}
-#elif defined(DGL_USE_OPENGL3)
+#ifdef DGL_USE_OPENGL3
 static void notImplemented(const char* const name)
 {
     d_stderr2("OpenGL3 function not implemented: %s", name);
diff --git a/dgl/src/pugl.cpp b/dgl/src/pugl.cpp
@@ -214,12 +214,12 @@ void puglSetMatchingBackendForCurrentBuild(PuglView* const view)
     if (view->backend != nullptr)
     {
       #ifdef DGL_OPENGL
-       #if defined(DGL_USE_OPENGL3) || defined(DGL_USE_GLES3)
-        puglSetViewHint(view, PUGL_USE_COMPAT_PROFILE, PUGL_FALSE);
-        puglSetViewHint(view, PUGL_CONTEXT_VERSION_MAJOR, 3);
-       #elif defined(DGL_USE_GLES2)
+       #if defined(DGL_USE_GLES2)
         puglSetViewHint(view, PUGL_USE_COMPAT_PROFILE, PUGL_FALSE);
         puglSetViewHint(view, PUGL_CONTEXT_VERSION_MAJOR, 2);
+       #elif defined(DGL_USE_OPENGL3)
+        puglSetViewHint(view, PUGL_USE_COMPAT_PROFILE, PUGL_FALSE);
+        puglSetViewHint(view, PUGL_CONTEXT_VERSION_MAJOR, 3);
        #else
         puglSetViewHint(view, PUGL_USE_COMPAT_PROFILE, PUGL_TRUE);
         puglSetViewHint(view, PUGL_CONTEXT_VERSION_MAJOR, 2);