KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glthread/gallium: require safe_glthread to start glthread 

Print an error message for the user if the requirement isn't met, or
we're not thread safe.

v2: based on Nicolai feedbacks
Check the DRI extension version

v3: based on Emil feedbacks
improve commit and error messages.
use backgroundCallable variable to improve readability

v5: based on Emil feedbacks
Properly check the function pointer

Signed-off-by: Gregory Hainaut <gregory.hainaut@gmail.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Gregory Hainaut 2017-05-29 13:18:28 +02:00 committed by Emil Velikov
parent 3fde8db53a
commit 79f0fe655d
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gallium/state_trackers/dri/dri_context.c
View File

@ -58,6 +58,8 @@ dri_create_context(gl_api api, const struct gl_config * visual,
enum st_context_error ctx_err = 0;
unsigned allowed_flags = __DRI_CTX_FLAG_DEBUG |
__DRI_CTX_FLAG_FORWARD_COMPATIBLE;
const __DRIbackgroundCallableExtension *backgroundCallable =
screen->sPriv->dri2.backgroundCallable;
if (screen->has_reset_status_query)
allowed_flags |= __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS;
@ -158,10 +160,21 @@ dri_create_context(gl_api api, const struct gl_config * visual,
/* Do this last. */
if (ctx->st->start_thread &&
/* the driver loader must implement this */
screen->sPriv->dri2.backgroundCallable &&
driQueryOptionb(&screen->optionCache, "mesa_glthread"))
ctx->st->start_thread(ctx->st);
driQueryOptionb(&screen->optionCache, "mesa_glthread")) {
if (backgroundCallable && backgroundCallable->base.version >= 2 &&
backgroundCallable->isThreadSafe) {
if (backgroundCallable->isThreadSafe(cPriv->loaderPrivate))
ctx->st->start_thread(ctx->st);
else
fprintf(stderr, "dri_create_context: glthread isn't thread safe "
"- missing call XInitThreads\n");
} else {
fprintf(stderr, "dri_create_context: requested glthread but driver "
"is missing backgroundCallable V2 extension\n");
}
}
*error = __DRI_CTX_ERROR_SUCCESS;
return GL_TRUE;