lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only use modern extension query on new contexts. Refs #1359

Browse Source 
* On mac on legacy contexts (GL2.1) glGetStringi will understandably fail
  completely, so we can't expect to be able to use modern enumeration of
  extensions on the assumption that it's really a compatibility context.
This commit is contained in:
baldurk
2019-05-02 17:24:57 +01:00
parent 95391e3604
commit fa4a6d431b
3 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_common.cpp
+31 -14
View File
@@ -378,14 +378,8 @@ static void CheckExtFromString(const char *ext)
}
}
void FetchEnabledExtensions()
void GetContextVersion(bool &ctxGLES, int &ctxVersion)
{
GLint numExts = 0;
if(GL.glGetIntegerv)
GL.glGetIntegerv(eGL_NUM_EXTENSIONS, &numExts);
RDCEraseEl(HasExt);
if(GL.glGetString)
{
const char *version = (const char *)GL.glGetString(eGL_VERSION);
@@ -395,15 +389,19 @@ void FetchEnabledExtensions()
// "OpenGL ES N.M vendor-specific information"
if(strncmp(version, "OpenGL ES", 9) == 0)
{
IsGLES = true;
ctxGLES = true;
int mj = int(version[10] - '0');
int mn = int(version[12] - '0');
GLCoreVersion = RDCMAX(GLCoreVersion, mj * 10 + mn);
ctxVersion = mj * 10 + mn;
}
else
{
IsGLES = false;
ctxGLES = false;
int mj = int(version[0] - '0');
int mn = int(version[1] - '0');
ctxVersion = mj * 10 + mn;
}
}
@@ -413,14 +411,33 @@ void FetchEnabledExtensions()
GL.glGetIntegerv(eGL_MAJOR_VERSION, &mj);
GL.glGetIntegerv(eGL_MINOR_VERSION, &mn);
GLCoreVersion = RDCMAX(GLCoreVersion, mj * 10 + mn);
if(mj > 0)
ctxVersion = mj * 10 + mn;
}
}
void FetchEnabledExtensions()
{
RDCEraseEl(HasExt);
int ctxVersion = 0;
bool ctxGLES = false;
GetContextVersion(ctxGLES, ctxVersion);
GLCoreVersion = RDCMAX(GLCoreVersion, ctxVersion);
IsGLES = ctxGLES;
RDCLOG("Checking enabled extensions, running as %s %d.%d", IsGLES ? "OpenGL ES" : "OpenGL",
(GLCoreVersion / 10), (GLCoreVersion % 10));
(ctxVersion / 10), (ctxVersion % 10));
if(GL.glGetStringi)
// only use glGetStringi on 3.0 contexts and above (ES and GL), even if we have the function
// pointer
if(GL.glGetStringi && ctxVersion >= 30)
{
GLint numExts = 0;
if(GL.glGetIntegerv)
GL.glGetIntegerv(eGL_NUM_EXTENSIONS, &numExts);
for(int i = 0; i < numExts; i++)
{
const char *ext = (const char *)GL.glGetStringi(eGL_EXTENSIONS, (GLuint)i);
@@ -428,7 +445,7 @@ void FetchEnabledExtensions()
CheckExtFromString(ext);
}
}
else if(GL.glGetString && IsGLES && GLCoreVersion < 30)
else if(GL.glGetString)
{
std::string extstr = (const char *)GL.glGetString(eGL_EXTENSIONS);
renderdoc/driver/gl/gl_common.h
+1
View File
@@ -827,6 +827,7 @@ extern bool VendorCheck[VendorCheck_Count];
// fills out the extension supported array and the version-specific checks above
void DoVendorChecks(GLPlatform &platform, GLWindowingData context);
void GetContextVersion(bool &ctxGLES, int &ctxVersion);
void FetchEnabledExtensions();
// verify that we got a replay context that we can work with
renderdoc/driver/gl/gl_driver.cpp
+7 -1
View File
@@ -1197,7 +1197,13 @@ void WrappedOpenGL::ActivateContext(GLWindowingData winData)
vector<string> implExts;
if(GL.glGetIntegerv && GL.glGetStringi)
int ctxVersion = 0;
bool ctxGLES = false;
GetContextVersion(ctxGLES, ctxVersion);
// only use glGetStringi on 3.0 contexts and above (ES and GL), even if we have the function
// pointer
if(GL.glGetIntegerv && GL.glGetStringi && ctxVersion >= 30)
{
GLuint numExts = 0;
GL.glGetIntegerv(eGL_NUM_EXTENSIONS, (GLint *)&numExts);