fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 11:58:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glthread: unbind framebuffers in glDeleteFramebuffers

Browse source 
Tests:
    dEQP-GLES2.functional.lifetime.delete_bound.framebuffer
    dEQP-GLES2.functional.state_query.integers.framebuffer_binding_getinteger

Fixes: e48f676835 - glthread: don't sync for more glGetIntegerv enums for glretrace

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17976>
(cherry picked from commit eb4036ea5b)
This commit is contained in:
Marek Olšák 2022-08-09 19:10:35 -04:00 • committed by Dylan Baker
parent 3490712ad7
commit fa4c949150
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -373,7 +373,7 @@
"description": "glthread: unbind framebuffers in glDeleteFramebuffers",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "e48f676835d110f907e5cd55d659dae511e4af2d"
},

3
src/mapi/glapi/gen/ARB_framebuffer_object.xml
View file

@ -209,7 +209,8 @@
<glx rop="236"/>
</function>
<function name="DeleteFramebuffers" es2="2.0">
<function name="DeleteFramebuffers" es2="2.0"
marshal_call_after="_mesa_glthread_DeleteFramebuffers(ctx, n, framebuffers);">
<param name="n" type="GLsizei" counter="true"/>
<param name="framebuffers" type="const GLuint *" count="n"/>
<glx rop="4320"/>

14
src/mesa/main/glthread_marshal.h
View file

@ -779,6 +779,20 @@ _mesa_glthread_DeleteLists(struct gl_context *ctx, GLsizei range)
_mesa_glthread_flush_batch(ctx);
}
static inline void
_mesa_glthread_DeleteFramebuffers(struct gl_context *ctx, GLsizei n,
const GLuint *ids)
{
if (ctx->GLThread.CurrentDrawFramebuffer) {
for (int i = 0; i < n; i++) {
if (ctx->GLThread.CurrentDrawFramebuffer == ids[i]) {
ctx->GLThread.CurrentDrawFramebuffer = 0;
break;
}
}
}
}
struct marshal_cmd_CallList
{
struct marshal_cmd_base cmd_base;