Module: Mesa
Branch: staging/22.3
Commit: bf52295095b4a81a7d735c6afe6f9aabbc55b367
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf52295095b4a81a7d735c6afe6f9aabbc55b367

Author: Pierre-Eric Pelloux-Prayer <[email protected]>
Date:   Tue Jan 17 16:06:00 2023 +0100

glthread: fix glArrayElement handling

This must be marshalled synchronously or the attrib pointers' content
might change by the time we use them.

Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8068
Reviewed-by: Marek Olšák <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20748>
(cherry picked from commit ddc721e15c6260e5a505f7e5fab2115e4cbd7c72)

---

 .pick_status.json             | 2 +-
 src/mapi/glapi/gen/gl_API.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 8915efe9ee7..160ba075f0e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -13,7 +13,7 @@
         "description": "glthread: fix glArrayElement handling",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 03793d95f9f..8ead49dbc3d 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -3189,7 +3189,7 @@
     <enum name="CLIENT_VERTEX_ARRAY_BIT"                  value="0x00000002"/>
     <enum name="CLIENT_ALL_ATTRIB_BITS"                   value="0xFFFFFFFF"/>
 
-    <function name="ArrayElement" deprecated="3.1" exec="beginend">
+    <function name="ArrayElement" deprecated="3.1" exec="beginend" 
marshal="sync">
         <param name="i" type="GLint"/>
         <glx handcode="true"/>
     </function>

Reply via email to