OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: remove st_context callbacks for dri/glx/wgl frontends

Browse Source 
Use direct calls.

Other changes:
- kopper called thread_finish twice in the same function.
  Remove the second call.
- Context creation had no-op initializations of cso_context and pipe.

Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20027>
This commit is contained in:
Marek Olšák
2022-11-27 13:40:42 -05:00
committed by Marge Bot
parent 263dc7b605
commit 59c9e62f48
16 changed files with 106 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gallium/frontends/dri/kopper.c
View File

@@ -472,8 +472,7 @@ kopper_allocate_textures(struct dri_context *ctx,
/* Wait for glthread to finish because we can't use pipe_context from
* multiple threads.
*/
if (ctx->st->thread_finish)
ctx->st->thread_finish(ctx->st);
_mesa_glthread_finish(ctx->st->ctx);
/* First get the buffers from the loader */
if (image) {
@@ -683,8 +682,7 @@ kopper_flush_frontbuffer(struct dri_context *ctx,
/* Wait for glthread to finish because we can't use pipe_context from
* multiple threads.
*/
if (ctx->st->thread_finish)
ctx->st->thread_finish(ctx->st);
_mesa_glthread_finish(ctx->st->ctx);
if (drawable) {
/* prevent recursion */
@@ -709,10 +707,8 @@ kopper_flush_frontbuffer(struct dri_context *ctx,
struct pipe_fence_handle *new_fence = NULL;
st = ctx->st;
if (st->thread_finish)
st->thread_finish(st);
st->flush(st, ST_FLUSH_FRONT, &new_fence, NULL, NULL);
st_context_flush(st, ST_FLUSH_FRONT, &new_fence, NULL, NULL);
if (drawable) {
drawable->flushing = false;
}
@@ -779,8 +775,7 @@ kopper_update_tex_buffer(struct dri_drawable *drawable,
/* Wait for glthread to finish because we can't use pipe_context from
* multiple threads.
*/
if (ctx->st->thread_finish)
ctx->st->thread_finish(ctx->st);
_mesa_glthread_finish(ctx->st->ctx);
get_drawable_info(drawable, &x, &y, &w, &h);
@@ -863,8 +858,7 @@ kopperSwapBuffers(__DRIdrawable *dPriv)
/* Wait for glthread to finish because we can't use pipe_context from
* multiple threads.
*/
if (ctx->st->thread_finish)
ctx->st->thread_finish(ctx->st);
_mesa_glthread_finish(ctx->st->ctx);
drawable->texture_stamp = drawable->lastStamp - 1;
@@ -938,8 +932,7 @@ kopperQueryBufferAge(__DRIdrawable *dPriv)
/* Wait for glthread to finish because we can't use pipe_context from
* multiple threads.
*/
if (ctx->st->thread_finish)
ctx->st->thread_finish(ctx->st);
_mesa_glthread_finish(ctx->st->ctx);
return zink_kopper_query_buffer_age(ctx->st->pipe, ptex);
}