diff options
author | Bruce Cherniak <[email protected]> | 2016-06-17 12:14:54 -0500 |
---|---|---|
committer | Tim Rowley <[email protected]> | 2016-06-17 13:56:03 -0500 |
commit | 6b0ac95c2862b4d464079b2edd9b59b5ef906da3 (patch) | |
tree | ce7822d32888051c4418d1198f1ca3400381e792 /src/gallium/drivers/swr/swr_context.cpp | |
parent | ace3124f2293616aa09f66a4cb0b38830df8683a (diff) |
swr: Update screen->context pointer with multiple contexts.
A pipe pointer in the screen allows for access to current device context
in flush_frontbuffer and resource_destroy. This wasn't tracking current
context in multi-context situations.
v2: More caffeine. Corrected compare, removed unnecessary set of
screen-pipe in create_context, and added a few comments.
Diffstat (limited to 'src/gallium/drivers/swr/swr_context.cpp')
-rw-r--r-- | src/gallium/drivers/swr/swr_context.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/swr/swr_context.cpp b/src/gallium/drivers/swr/swr_context.cpp index 3a5d9e07ab3..1f3a14cb9c8 100644 --- a/src/gallium/drivers/swr/swr_context.cpp +++ b/src/gallium/drivers/swr/swr_context.cpp @@ -322,8 +322,10 @@ swr_destroy(struct pipe_context *pipe) swr_destroy_scratch_buffers(ctx); + /* Only update screen->pipe if current context is being destroyed */ assert(screen); - screen->pipe = NULL; + if (screen->pipe == pipe) + screen->pipe = NULL; FREE(ctx); } @@ -346,7 +348,6 @@ struct pipe_context * swr_create_context(struct pipe_screen *p_screen, void *priv, unsigned flags) { struct swr_context *ctx = CALLOC_STRUCT(swr_context); - struct swr_screen *screen = swr_screen(p_screen); ctx->blendJIT = new std::unordered_map<BLEND_COMPILE_STATE, PFN_BLEND_JIT_FUNC>; @@ -366,7 +367,6 @@ swr_create_context(struct pipe_screen *p_screen, void *priv, unsigned flags) if (ctx->swrContext == NULL) goto fail; - screen->pipe = &ctx->pipe; ctx->pipe.screen = p_screen; ctx->pipe.destroy = swr_destroy; ctx->pipe.priv = priv; |