summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2017-10-22 17:39:04 +0200
committerNicolai Hähnle <[email protected]>2017-11-09 14:20:58 +0100
commitcc78d770439cfc1ae8ec0c802e5fcb5eae25979f (patch)
treeed9a5b8f1ec6624bab7f97301e8e1b47c8e074df /src/mesa
parent46444613cfc46e71f3b875b9a202e0f60ba79cfd (diff)
mesa: flush and wait after creating a fallback texture
Fixes non-deterministic failures in dEQP-EGL.functional.sharing.gles2.multithread.simple_egl_sync.images.texture_source.teximage2d_render and others in dEQP-EGL.functional.sharing.gles2.multithread.* Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/texobj.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 71c6f813233..02c47677880 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1051,6 +1051,11 @@ _mesa_get_fallback_texture(struct gl_context *ctx, gl_texture_index tex)
assert(texObj->_MipmapComplete);
ctx->Shared->FallbackTex[tex] = texObj;
+
+ /* Complete the driver's operation in case another context will also
+ * use the same fallback texture. */
+ if (ctx->Driver.Finish)
+ ctx->Driver.Finish(ctx);
}
return ctx->Shared->FallbackTex[tex];
}