OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0030745: Visualization, TKOpenGl - fix initialization of GLES3 context

Browse Source 
OpenGl_GraphicDriver::InitContext() now tries to initialize GLES3 context
(EGL_CONTEXT_CLIENT_VERSION) and then fallback to GLES2.
This commit is contained in:
kgv 2019-05-25 18:59:17 +03:00 committed by bugmaster
parent 8e6ce38cf4
commit 9aceb23df6
2 changed files with 58 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/OpenGl/OpenGl_GraphicDriver.cxx
View File

@ -50,6 +50,9 @@ IMPLEMENT_STANDARD_RTTIEXT(OpenGl_GraphicDriver,Graphic3d_GraphicDriver)
#if defined(HAVE_EGL) || defined(HAVE_GLES2) || defined(OCCT_UWP) || defined(__ANDROID__) || defined(__QNX__) #if defined(HAVE_EGL) || defined(HAVE_GLES2) || defined(OCCT_UWP) || defined(__ANDROID__) || defined(__QNX__)
#include <EGL/egl.h> #include <EGL/egl.h>
#ifndef EGL_OPENGL_ES3_BIT
#define EGL_OPENGL_ES3_BIT 0x00000040
#endif
#endif #endif
namespace namespace
@ -78,17 +81,30 @@ namespace
EGLConfig aCfg = NULL; EGLConfig aCfg = NULL;
EGLint aNbConfigs = 0; EGLint aNbConfigs = 0;
if (eglChooseConfig (theDisplay, aConfigAttribs, &aCfg, 1, &aNbConfigs) == EGL_TRUE for (Standard_Integer aGlesVer = 3; aGlesVer >= 2; --aGlesVer)
|| aCfg != NULL)
{ {
return aCfg; #if defined(GL_ES_VERSION_2_0)
} aConfigAttribs[6 * 2 + 1] = aGlesVer == 3 ? EGL_OPENGL_ES3_BIT : EGL_OPENGL_ES2_BIT;
#else
if (aGlesVer == 2)
{
break;
}
#endif
eglGetError(); if (eglChooseConfig (theDisplay, aConfigAttribs, &aCfg, 1, &aNbConfigs) == EGL_TRUE
aConfigAttribs[4 * 2 + 1] = 16; // try config with smaller depth buffer && aCfg != NULL)
if (eglChooseConfig (theDisplay, aConfigAttribs, &aCfg, 1, &aNbConfigs) != EGL_TRUE {
|| aCfg == NULL) return aCfg;
{ }
eglGetError();
aConfigAttribs[4 * 2 + 1] = 16; // try config with smaller depth buffer
if (eglChooseConfig (theDisplay, aConfigAttribs, &aCfg, 1, &aNbConfigs) == EGL_TRUE
&& aCfg != NULL)
{
return aCfg;
}
eglGetError(); eglGetError();
} }
return aCfg; return aCfg;
@ -280,16 +296,18 @@ Standard_Boolean OpenGl_GraphicDriver::InitContext()
} }
#if defined(GL_ES_VERSION_2_0) #if defined(GL_ES_VERSION_2_0)
EGLint anEglCtxAttribs[] = EGLint anEglCtxAttribs3[] = { EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE, EGL_NONE };
{ EGLint anEglCtxAttribs2[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE, EGL_NONE };
EGL_CONTEXT_CLIENT_VERSION, 2,
EGL_NONE
};
if (eglBindAPI (EGL_OPENGL_ES_API) != EGL_TRUE) if (eglBindAPI (EGL_OPENGL_ES_API) != EGL_TRUE)
{ {
::Message::DefaultMessenger()->Send ("Error: EGL does not provide OpenGL ES client!", Message_Fail); ::Message::DefaultMessenger()->Send ("Error: EGL does not provide OpenGL ES client!", Message_Fail);
return Standard_False; return Standard_False;
} }
myEglContext = (Aspect_RenderingContext )eglCreateContext ((EGLDisplay )myEglDisplay, myEglConfig, EGL_NO_CONTEXT, anEglCtxAttribs3);
if ((EGLContext )myEglContext == EGL_NO_CONTEXT)
{
myEglContext = (Aspect_RenderingContext )eglCreateContext ((EGLDisplay )myEglDisplay, myEglConfig, EGL_NO_CONTEXT, anEglCtxAttribs2);
}
#else #else
EGLint* anEglCtxAttribs = NULL; EGLint* anEglCtxAttribs = NULL;
if (eglBindAPI (EGL_OPENGL_API) != EGL_TRUE) if (eglBindAPI (EGL_OPENGL_API) != EGL_TRUE)
@ -297,9 +315,9 @@ Standard_Boolean OpenGl_GraphicDriver::InitContext()
::Message::DefaultMessenger()->Send ("Error: EGL does not provide OpenGL client!", Message_Fail); ::Message::DefaultMessenger()->Send ("Error: EGL does not provide OpenGL client!", Message_Fail);
return Standard_False; return Standard_False;
} }
myEglContext = (Aspect_RenderingContext )eglCreateContext ((EGLDisplay )myEglDisplay, myEglConfig, EGL_NO_CONTEXT, anEglCtxAttribs);
#endif #endif
myEglContext = (Aspect_RenderingContext )eglCreateContext ((EGLDisplay )myEglDisplay, myEglConfig, EGL_NO_CONTEXT, anEglCtxAttribs);
if ((EGLContext )myEglContext == EGL_NO_CONTEXT) if ((EGLContext )myEglContext == EGL_NO_CONTEXT)
{ {
::Message::DefaultMessenger()->Send ("Error: EGL is unable to create OpenGL context!", Message_Fail); ::Message::DefaultMessenger()->Send ("Error: EGL is unable to create OpenGL context!", Message_Fail);

32
src/Xw/Xw_Window.cxx
View File

@ -24,6 +24,9 @@
#if defined(HAVE_EGL) || defined(HAVE_GLES2) #if defined(HAVE_EGL) || defined(HAVE_GLES2)
#include <EGL/egl.h> #include <EGL/egl.h>
#ifndef EGL_OPENGL_ES3_BIT
#define EGL_OPENGL_ES3_BIT 0x00000040
#endif
#else #else
#include <GL/glx.h> #include <GL/glx.h>
@ -120,16 +123,31 @@ Xw_Window::Xw_Window (const Handle(Aspect_DisplayConnection)& theXDisplay,
EGLint aNbConfigs = 0; EGLint aNbConfigs = 0;
void* anEglConfig = NULL; void* anEglConfig = NULL;
if (eglChooseConfig (anEglDisplay, aConfigAttribs, &anEglConfig, 1, &aNbConfigs) != EGL_TRUE for (Standard_Integer aGlesVer = 3; aGlesVer >= 2; --aGlesVer)
|| anEglConfig == NULL)
{ {
eglGetError(); #if defined(GL_ES_VERSION_2_0)
aConfigAttribs[4 * 2 + 1] = 16; // try config with smaller depth buffer aConfigAttribs[6 * 2 + 1] = aGlesVer == 3 ? EGL_OPENGL_ES3_BIT : EGL_OPENGL_ES2_BIT;
if (eglChooseConfig (anEglDisplay, aConfigAttribs, &anEglConfig, 1, &aNbConfigs) != EGL_TRUE #else
|| anEglConfig == NULL) if (aGlesVer == 2)
{ {
anEglConfig = NULL; break;
} }
#endif
if (eglChooseConfig (anEglDisplay, aConfigAttribs, &anEglConfig, 1, &aNbConfigs) == EGL_TRUE
&& anEglConfig != NULL)
{
break;
}
eglGetError();
aConfigAttribs[4 * 2 + 1] = 16; // try config with smaller depth buffer
if (eglChooseConfig (anEglDisplay, aConfigAttribs, &anEglConfig, 1, &aNbConfigs) == EGL_TRUE
&& anEglConfig != NULL)
{
break;
}
eglGetError();
} }
if (anEglConfig != NULL if (anEglConfig != NULL