frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: Track the reset notification strategy for a context 

Also require that the reset notification for a new context and the other
context in the share group match.  There isn't yet any way to specify a
non-default reset notification strategy, but that will come.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Ian Romanick 2012-07-04 15:21:07 -07:00 committed by Keith Packard
parent f8198285cf
commit aef0b4593e
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glx/createcontext.c
View File

@ -90,6 +90,13 @@ __glXDisp_CreateContextAttribsARB(__GLXclientState * cl, GLbyte * pc)
__GLXconfig *config; __GLXconfig *config;
int err; int err;
/* The GLX_ARB_create_context_robustness spec says:
*
* "The default value for GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB
* is GLX_NO_RESET_NOTIFICATION_ARB."
*/
int reset = GLX_NO_RESET_NOTIFICATION_ARB;
/* The GLX_ARB_create_context_profile spec says: /* The GLX_ARB_create_context_profile spec says:
* *
* "The default value for GLX_CONTEXT_PROFILE_MASK_ARB is * "The default value for GLX_CONTEXT_PROFILE_MASK_ARB is
@ -259,6 +266,14 @@ __glXDisp_CreateContextAttribsARB(__GLXclientState * cl, GLbyte * pc)
return __glXError(GLXBadProfileARB); return __glXError(GLXBadProfileARB);
} }
/* The GLX_ARB_create_context_robustness spec says:
*
* "* If the reset notification behavior of <share_context> and the
* newly created context are different, BadMatch is generated."
*/
if (shareCtx != NULL && shareCtx->resetNotificationStrategy != reset)
return BadMatch;
/* There is no GLX protocol for desktop OpenGL versions after 1.4. There /* There is no GLX protocol for desktop OpenGL versions after 1.4. There
* is no GLX protocol for any version of OpenGL ES. If the application is * is no GLX protocol for any version of OpenGL ES. If the application is
* requested an indirect rendering context for a version that cannot be * requested an indirect rendering context for a version that cannot be
@ -306,6 +321,7 @@ __glXDisp_CreateContextAttribsARB(__GLXclientState * cl, GLbyte * pc)
ctx->selectBufSize = 0; ctx->selectBufSize = 0;
ctx->drawPriv = NULL; ctx->drawPriv = NULL;
ctx->readPriv = NULL; ctx->readPriv = NULL;
ctx->resetNotificationStrategy = reset;
/* Add the new context to the various global tables of GLX contexts. /* Add the new context to the various global tables of GLX contexts.
*/ */

10
glx/glxcmds.c
View File

@ -308,6 +308,16 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId,
glxc->drawPriv = NULL; glxc->drawPriv = NULL;
glxc->readPriv = NULL; glxc->readPriv = NULL;
/* The GLX_ARB_create_context_robustness spec says:
*
* "The default value for GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB
* is GLX_NO_RESET_NOTIFICATION_ARB."
*
* Without using glXCreateContextAttribsARB, there is no way to specify a
* non-default reset notification strategy.
*/
glxc->resetNotificationStrategy = GLX_NO_RESET_NOTIFICATION_ARB;
/* Add the new context to the various global tables of GLX contexts. /* Add the new context to the various global tables of GLX contexts.
*/ */
if (!__glXAddContext(glxc)) { if (!__glXAddContext(glxc)) {

5
glx/glxcontext.h
View File

@ -104,6 +104,11 @@ struct __GLXcontext {
*/ */
GLenum renderMode; GLenum renderMode;
/**
* Reset notification strategy used when a GPU reset occurs.
*/
GLenum resetNotificationStrategy;
/* /*
** Buffers for feedback and selection. ** Buffers for feedback and selection.
*/ */