anulax
/
glfw
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

GLX context option cleanup.

Browse Source
master
Camilla Berglund ago%!(EXTRA string=13 years)
parent 238da01770
commit cf38b34f45
1 changed files with 78 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 154
      src/glx_context.c

154
src/glx_context.c
Unescape View File

@ -221,7 +221,7 @@ static int errorHandler(Display *display, XErrorEvent* event)
// Create the actual OpenGL context // Create the actual OpenGL context
//======================================================================== //========================================================================
#define setGLXattrib(attribs, index, attribName, attribValue) \ #define setGLXattrib(attribName, attribValue) \
attribs[index++] = attribName; \ attribs[index++] = attribName; \
attribs[index++] = attribValue; attribs[index++] = attribValue;
@ -230,7 +230,6 @@ static int createContext(_GLFWwindow* window,
GLXFBConfigID fbconfigID) GLXFBConfigID fbconfigID)
{ {
int attribs[40]; int attribs[40];
int dummy, index;
GLXFBConfig* fbconfig; GLXFBConfig* fbconfig;
GLXContext share = NULL; GLXContext share = NULL;
@ -239,17 +238,18 @@ static int createContext(_GLFWwindow* window,
// Retrieve the previously selected GLXFBConfig // Retrieve the previously selected GLXFBConfig
{ {
index = 0; int dummy, index = 0;
setGLXattrib(attribs, index, GLX_FBCONFIG_ID, (int) fbconfigID); setGLXattrib(GLX_FBCONFIG_ID, (int) fbconfigID);
setGLXattrib(attribs, index, None, None); setGLXattrib(None, None);
if (_glfwLibrary.GLX.SGIX_fbconfig) if (_glfwLibrary.GLX.SGIX_fbconfig)
{ {
fbconfig = _glfwLibrary.GLX.ChooseFBConfigSGIX(_glfwLibrary.X11.display, fbconfig =
_glfwLibrary.X11.screen, _glfwLibrary.GLX.ChooseFBConfigSGIX(_glfwLibrary.X11.display,
attribs, _glfwLibrary.X11.screen,
&dummy); attribs,
&dummy);
} }
else else
{ {
@ -270,8 +270,9 @@ static int createContext(_GLFWwindow* window,
// Retrieve the corresponding visual // Retrieve the corresponding visual
if (_glfwLibrary.GLX.SGIX_fbconfig) if (_glfwLibrary.GLX.SGIX_fbconfig)
{ {
window->GLX.visual = _glfwLibrary.GLX.GetVisualFromFBConfigSGIX(_glfwLibrary.X11.display, window->GLX.visual =
*fbconfig); _glfwLibrary.GLX.GetVisualFromFBConfigSGIX(_glfwLibrary.X11.display,
*fbconfig);
} }
else else
{ {
@ -288,97 +289,98 @@ static int createContext(_GLFWwindow* window,
return GL_FALSE; return GL_FALSE;
} }
if (_glfwLibrary.GLX.ARB_create_context) if (wndconfig->clientAPI == GLFW_OPENGL_ES_API)
{ {
index = 0; if (!_glfwLibrary.GLX.ARB_create_context ||
!_glfwLibrary.GLX.ARB_create_context_profile ||
if (wndconfig->glMajor != 1 || wndconfig->glMinor != 0) !_glfwLibrary.GLX.EXT_create_context_es2_profile)
{ {
// NOTE: Only request an explicitly versioned context when _glfwSetError(GLFW_VERSION_UNAVAILABLE,
// necessary, as explicitly requesting version 1.0 does not always "GLX: OpenGL ES requested but "
// return the highest available version "GLX_EXT_create_context_es2_profile is unavailable");
return GL_FALSE;
setGLXattrib(attribs, index, GLX_CONTEXT_MAJOR_VERSION_ARB, wndconfig->glMajor);
setGLXattrib(attribs, index, GLX_CONTEXT_MINOR_VERSION_ARB, wndconfig->glMinor);
} }
}
if (wndconfig->clientAPI == GLFW_OPENGL_ES_API) if (wndconfig->glForward)
{
if (!_glfwLibrary.GLX.ARB_create_context)
{ {
if (!_glfwLibrary.GLX.ARB_create_context_profile || _glfwSetError(GLFW_VERSION_UNAVAILABLE,
!_glfwLibrary.GLX.EXT_create_context_es2_profile) "GLX: Forward compatibility requested but "
{ "GLX_ARB_create_context_profile is unavailable");
_glfwSetError(GLFW_VERSION_UNAVAILABLE, return GL_FALSE;
"GLX: OpenGL ES requested but "
"GLX_EXT_create_context_es2_profile is unavailable");
return GL_FALSE;
}
setGLXattrib(attribs, index,
GLX_CONTEXT_PROFILE_MASK_ARB,
GLX_CONTEXT_ES2_PROFILE_BIT_EXT);
} }
}
if (wndconfig->glForward || wndconfig->glDebug || wndconfig->glRobustness) if (wndconfig->glProfile)
{
if (!_glfwLibrary.GLX.ARB_create_context ||
!_glfwLibrary.GLX.ARB_create_context_profile)
{ {
int flags = 0; _glfwSetError(GLFW_VERSION_UNAVAILABLE,
"GLX: An OpenGL profile requested but "
"GLX_ARB_create_context_profile is unavailable");
return GL_FALSE;
}
}
if (_glfwLibrary.GLX.ARB_create_context)
{
int index = 0, mask = 0, flags = 0, strategy = 0;
if (wndconfig->clientAPI == GLFW_OPENGL_API)
{
if (wndconfig->glForward) if (wndconfig->glForward)
flags |= GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; flags |= GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
if (wndconfig->glDebug) if (wndconfig->glDebug)
flags |= GLX_CONTEXT_DEBUG_BIT_ARB; flags |= GLX_CONTEXT_DEBUG_BIT_ARB;
if (wndconfig->glRobustness) if (wndconfig->glProfile)
flags |= GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB; {
if (wndconfig->glProfile == GLFW_OPENGL_CORE_PROFILE)
setGLXattrib(attribs, index, GLX_CONTEXT_FLAGS_ARB, flags); mask |= GLX_CONTEXT_CORE_PROFILE_BIT_ARB;
else if (wndconfig->glProfile == GLFW_OPENGL_COMPAT_PROFILE)
mask |= GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
}
} }
else
mask |= GLX_CONTEXT_ES2_PROFILE_BIT_EXT;
if (wndconfig->glProfile) if (wndconfig->glRobustness != GLFW_NO_ROBUSTNESS)
{ {
int flags = 0; if (_glfwLibrary.GLX.ARB_create_context_robustness)
if (!_glfwLibrary.GLX.ARB_create_context_profile)
{ {
_glfwSetError(GLFW_VERSION_UNAVAILABLE, if (wndconfig->glRobustness == GLFW_NO_RESET_NOTIFICATION)
"GLX: An OpenGL profile requested but " strategy = GLX_NO_RESET_NOTIFICATION_ARB;
"GLX_ARB_create_context_profile is unavailable"); else if (wndconfig->glRobustness == GLFW_LOSE_CONTEXT_ON_RESET)
return GL_FALSE; strategy = GLX_LOSE_CONTEXT_ON_RESET_ARB;
}
if (wndconfig->glProfile == GLFW_OPENGL_CORE_PROFILE) flags |= GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB;
flags = GLX_CONTEXT_CORE_PROFILE_BIT_ARB; }
else if (wndconfig->glProfile == GLFW_OPENGL_COMPAT_PROFILE)
flags = GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
setGLXattrib(attribs, index, GLX_CONTEXT_PROFILE_MASK_ARB, flags);
} }
if (wndconfig->glRobustness) if (wndconfig->glMajor != 1 || wndconfig->glMinor != 0)
{ {
int strategy; // NOTE: Only request an explicitly versioned context when
// necessary, as explicitly requesting version 1.0 does not always
// return the highest available version
if (!_glfwLibrary.GLX.ARB_create_context_robustness) setGLXattrib(GLX_CONTEXT_MAJOR_VERSION_ARB, wndconfig->glMajor);
{ setGLXattrib(GLX_CONTEXT_MINOR_VERSION_ARB, wndconfig->glMinor);
_glfwSetError(GLFW_VERSION_UNAVAILABLE, }
"GLX: An OpenGL robustness strategy was "
"requested but GLX_ARB_create_context_robustness "
"is unavailable");
return GL_FALSE;
}
if (wndconfig->glRobustness == GLFW_NO_RESET_NOTIFICATION) if (mask)
strategy = GLX_NO_RESET_NOTIFICATION_ARB; setGLXattrib(GLX_CONTEXT_PROFILE_MASK_ARB, mask);
else if (wndconfig->glRobustness == GLFW_LOSE_CONTEXT_ON_RESET)
strategy = GLX_LOSE_CONTEXT_ON_RESET_ARB;
setGLXattrib(attribs, if (flags)
index, setGLXattrib(GLX_CONTEXT_FLAGS_ARB, flags);
GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB,
strategy); if (strategy)
} setGLXattrib(GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB, strategy);
setGLXattrib(attribs, index, None, None); setGLXattrib(None, None);
// This is the only place we set an Xlib error handler, and we only do // This is the only place we set an Xlib error handler, and we only do
// it because glXCreateContextAttribsARB generates a BadMatch error if // it because glXCreateContextAttribsARB generates a BadMatch error if
@ -424,7 +426,7 @@ static int createContext(_GLFWwindow* window,
// TODO: Handle all the various error codes here // TODO: Handle all the various error codes here
_glfwSetError(GLFW_PLATFORM_ERROR, _glfwSetError(GLFW_PLATFORM_ERROR,
"GLX: Failed to create OpenGL context"); "GLX: Failed to create context");
return GL_FALSE; return GL_FALSE;
} }

Write Preview
Loading…
Cancel
Save