summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2022-08-09 19:15:35 -0400
committerDylan Baker <dylan.c.baker@intel.com>2022-08-12 09:45:35 -0700
commit68682362163d21784d6f0c6510e0a0683fb086a1 (patch)
treea6fbc738a58280326272cc413c2b3209f01f6809
parentacbef69cf0c74349e19350242640fd5a5c7ca42f (diff)
glthread: call _mesa_glthread_DeleteBuffers unconditionally
Deleted buffers were not unbound in glthread. Fixes: 4fa24747b9089b - glthread: call _mesa_glthread_BindBuffer unconditionally 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 28e351673ef8c22c5ae0585f40e1cbd2b15eda5c)
-rw-r--r--.pick_status.json2
-rw-r--r--src/mapi/glapi/gen/gl_API.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index d77dc4ec462..f3572d532c4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -364,7 +364,7 @@
"description": "glthread: call _mesa_glthread_DeleteBuffers unconditionally",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "4fa24747b9089bda0453051e5fd5188e6fce6996"
},
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index cc5d9488d84..e2753db482b 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -5116,7 +5116,7 @@
</function>
<function name="DeleteBuffers" es1="1.1" es2="2.0" no_error="true"
- marshal_call_after="if (COMPAT) _mesa_glthread_DeleteBuffers(ctx, n, buffer);">
+ marshal_call_after="_mesa_glthread_DeleteBuffers(ctx, n, buffer);">
<param name="n" type="GLsizei" counter="true"/>
<param name="buffer" type="const GLuint *" count="n"/>
<glx ignore="true"/>