Merge Mesa 23.3.6

9 files changed, 104 insertions, 106 deletions

diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_sampler_objects.xml b/lib/mesa/src/mapi/glapi/gen/ARB_sampler_objects.xml
index 1c0c2b5d8..e4dc0f624 100644
--- a/lib/mesa/src/mapi/glapi/gen/ARB_sampler_objects.xml
+++ b/lib/mesa/src/mapi/glapi/gen/ARB_sampler_objects.xml
@@ -7,45 +7,45 @@
 
 <category name="GL_ARB_sampler_objects" number="81">
 
-    <function name="GenSamplers" es2="3.0" no_error="true">
+    <function name="GenSamplers" es2="2.0" no_error="true">
       <param name="count" type="GLsizei"/>
       <param name="samplers" type="GLuint *"/>
     </function>
 
-    <function name="DeleteSamplers" es2="3.0" no_error="true">
+    <function name="DeleteSamplers" es2="2.0" no_error="true">
       <param name="count" type="GLsizei"/>
       <param name="samplers" type="const GLuint *" count="count"/>
     </function>
 
-    <function name="IsSampler" es2="3.0">
+    <function name="IsSampler" es2="2.0">
       <param name="sampler" type="GLuint"/>
       <return type="GLboolean"/>
     </function>
 
-    <function name="BindSampler" es2="3.0" no_error="true" exec="dlist">
+    <function name="BindSampler" es2="2.0" no_error="true" exec="dlist">
       <param name="unit" type="GLuint"/>
       <param name="sampler" type="GLuint"/>
     </function>
 
-    <function name="SamplerParameteri" es2="3.0" exec="dlist">
+    <function name="SamplerParameteri" es2="2.0" exec="dlist">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
       <param name="param" type="GLint"/>
     </function>
 
-    <function name="SamplerParameterf" es2="3.0" exec="dlist">
+    <function name="SamplerParameterf" es2="2.0" exec="dlist">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
       <param name="param" type="GLfloat"/>
     </function>
 
-    <function name="SamplerParameteriv" es2="3.0" exec="dlist">
+    <function name="SamplerParameteriv" es2="2.0" exec="dlist">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
       <param name="params" type="const GLint *" count="_mesa_tex_param_enum_to_count(pname)"/>
     </function>
 
-    <function name="SamplerParameterfv" es2="3.0" exec="dlist">
+    <function name="SamplerParameterfv" es2="2.0" exec="dlist">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
       <param name="params" type="const GLfloat *" count="_mesa_tex_param_enum_to_count(pname)"/>
@@ -63,13 +63,13 @@
       <param name="params" type="const GLuint *" count="_mesa_tex_param_enum_to_count(pname)"/>
     </function>
 
-    <function name="GetSamplerParameteriv" es2="3.0">
+    <function name="GetSamplerParameteriv" es2="2.0">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
       <param name="params" type="GLint *"/>
     </function>
 
-    <function name="GetSamplerParameterfv" es2="3.0">
+    <function name="GetSamplerParameterfv" es2="2.0">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
       <param name="params" type="GLfloat *"/>
diff --git a/lib/mesa/src/mapi/glapi/gen/es_EXT.xml b/lib/mesa/src/mapi/glapi/gen/es_EXT.xml
index 7127e66d6..5565fd4f1 100644
--- a/lib/mesa/src/mapi/glapi/gen/es_EXT.xml
+++ b/lib/mesa/src/mapi/glapi/gen/es_EXT.xml
@@ -856,6 +856,90 @@
     </function>
 </category>
 
+<!-- 124. GL_APPLE_sync -->
+<category name="GL_APPLE_sync" number="124">
+    <type name="int64"   size="8"                  glx_name="CARD64"/>
+    <type name="uint64"  size="8"  unsigned="true" glx_name="CARD64"/>
+    <type name="sync"    size="8"  unsigned="true" glx_name="CARD64"/>
+
+    <enum name="MAX_SERVER_WAIT_TIMEOUT_APPLE" count="1"  value="0x9111">
+        <size name="Get" mode="get"/>
+    </enum>
+    <enum name="OBJECT_TYPE_APPLE"             count="1"  value="0x9112">
+        <size name="GetSyncivAPPLE" mode="get"/>
+    </enum>
+    <enum name="SYNC_CONDITION_APPLE"          count="1"  value="0x9113">
+        <size name="GetSyncivAPPLE" mode="get"/>
+    </enum>
+    <enum name="SYNC_STATUS_APPLE"             count="1"  value="0x9114">
+        <size name="GetSyncivAPPLE" mode="get"/>
+    </enum>
+    <enum name="SYNC_FLAGS_APPLE"              count="1"  value="0x9115">
+        <size name="GetSyncivAPPLE" mode="get"/>
+    </enum>
+
+    <enum name="SYNC_FENCE_APPLE"                         value="0x9116"/>
+    <enum name="SYNC_GPU_COMMANDS_COMPLETE_APPLE"         value="0x9117"/>
+    <enum name="UNSIGNALED_APPLE"                         value="0x9118"/>
+    <enum name="SIGNALED_APPLE"                           value="0x9119"/>
+    <enum name="ALREADY_SIGNALED_APPLE"                   value="0x911A"/>
+    <enum name="TIMEOUT_EXPIRED_APPLE"                    value="0x911B"/>
+    <enum name="CONDITION_SATISFIED_APPLE"                value="0x911C"/>
+    <enum name="WAIT_FAILED_APPLE"                        value="0x911D"/>
+
+    <enum name="SYNC_FLUSH_COMMANDS_BIT_APPLE"            value="0x00000001"/>
+
+    <!-- Not really an enum:
+    <enum name="TIMEOUT_IGNORED_APPLE"            value="0xFFFFFFFFFFFFFFFF"/>
+    -->
+
+    <function name="FenceSyncAPPLE" alias="FenceSync"
+              es1="1.1" es2="2.0" no_error="true">
+        <param name="condition" type="GLenum"/>
+        <param name="flags" type="GLbitfield"/>
+        <return type="GLsync"/>
+    </function>
+
+    <function name="IsSyncAPPLE" alias="IsSync" es1="1.1" es2="2.0">
+        <param name="sync" type="GLsync"/>
+	<return type="GLboolean"/>
+    </function>
+
+    <function name="DeleteSyncAPPLE" alias="DeleteSync"
+              es1="1.1" es2="2.0" no_error="true">
+        <param name="sync" type="GLsync"/>
+    </function>
+
+    <function name="ClientWaitSyncAPPLE" alias="ClientWaitSync"
+              es1="1.1" es2="2.0" no_error="true">
+        <param name="sync" type="GLsync"/>
+        <param name="flags" type="GLbitfield"/>
+	<param name="timeout" type="GLuint64"/>
+        <return type="GLenum"/>
+    </function>
+
+    <function name="WaitSyncAPPLE" alias="WaitSync"
+              es1="1.1" es2="2.0" no_error="true" exec="dlist">
+        <param name="sync" type="GLsync"/>
+        <param name="flags" type="GLbitfield"/>
+	<param name="timeout" type="GLuint64"/>
+    </function>
+
+    <function name="GetInteger64vAPPLE" alias="GetInteger64v"
+              es1="1.1" es2="2.0">
+        <param name="pname" type="GLenum"/>
+        <param name="params" type="GLint64 *" output="true" variable_param="pname"/>
+    </function>
+
+    <function name="GetSyncivAPPLE" alias="GetSynciv" es1="1.1" es2="2.0">
+        <param name="sync" type="GLsync"/>
+        <param name="pname" type="GLenum"/>
+        <param name="bufSize" type="GLsizei"/>
+        <param name="length" type="GLsizei *" output="true"/>
+        <param name="values" type="GLint *" output="true" variable_param="pname"/>
+    </function>
+</category>
+
 <!-- 150. GL_EXT_disjoint_timer_query -->
 <category name="GL_EXT_disjoint_timer_query" number="150">
     <enum name="QUERY_COUNTER_BITS_EXT"     value="0x8864"/>
diff --git a/lib/mesa/src/mapi/glapi/gen/gl_SPARC_asm.py b/lib/mesa/src/mapi/glapi/gen/gl_SPARC_asm.py
index d2f9fcd5c..a9161c6a8 100644
--- a/lib/mesa/src/mapi/glapi/gen/gl_SPARC_asm.py
+++ b/lib/mesa/src/mapi/glapi/gen/gl_SPARC_asm.py
@@ -235,7 +235,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
                         text = '\tGL_STUB_ALIAS(gl%s, gl%s)' % (n, f.name)
 
                         if f.has_different_protocol(n):
-                            print('#ifndef GLX_INDIRECT_RENDERING')
+                            print('#if GLAPI_EXPORT_PROTO_ENTRY_POINTS')
                             print(text)
                             print('#endif')
                         else:
diff --git a/lib/mesa/src/mapi/glapi/gen/gl_XML.py b/lib/mesa/src/mapi/glapi/gen/gl_XML.py
index c1fd6f5c2..3e1b8b061 100644
--- a/lib/mesa/src/mapi/glapi/gen/gl_XML.py
+++ b/lib/mesa/src/mapi/glapi/gen/gl_XML.py
@@ -710,7 +710,7 @@ class gl_function( gl_item ):
             else:
                 if self.exec_flavor != "skip":
                     raise RuntimeError("Entry-point %s is missing offset in static_data.py. Add one at the bottom of the list." % (name))
-                self.assign_offset = self.exec_flavor != "skip" or name in static_data.unused_functions
+                self.assign_offset = False
 
         if not self.name:
             self.name = true_name
diff --git a/lib/mesa/src/mapi/glapi/gen/gl_apitemp.py b/lib/mesa/src/mapi/glapi/gen/gl_apitemp.py
index d7e258056..8c4514c58 100644
--- a/lib/mesa/src/mapi/glapi/gen/gl_apitemp.py
+++ b/lib/mesa/src/mapi/glapi/gen/gl_apitemp.py
@@ -238,10 +238,10 @@ _glapi_proc UNUSED_TABLE_NAME[] = {""")
         for ent in normal_entries:
             print('   TABLE_ENTRY(%s),' % (ent))
         print('#endif /* _GLAPI_SKIP_NORMAL_ENTRY_POINTS */')
-        print('#ifndef _GLAPI_SKIP_PROTO_ENTRY_POINTS')
+        print('#if GLAPI_EXPORT_PROTO_ENTRY_POINTS')
         for ent in proto_entries:
             print('   TABLE_ENTRY(%s),' % (ent))
-        print('#endif /* _GLAPI_SKIP_PROTO_ENTRY_POINTS */')
+        print('#endif /* GLAPI_EXPORT_PROTO_ENTRY_POINTS */')
 
         print('};')
         print('#endif /*UNUSED_TABLE_NAME*/')
@@ -291,13 +291,13 @@ _glapi_proc UNUSED_TABLE_NAME[] = {""")
         print('#endif /* _GLAPI_SKIP_NORMAL_ENTRY_POINTS */')
         print('')
         print('/* these entry points might require different protocols */')
-        print('#ifndef _GLAPI_SKIP_PROTO_ENTRY_POINTS')
+        print('#if GLAPI_EXPORT_PROTO_ENTRY_POINTS')
         print('')
         for func, ents in proto_entry_points:
             for ent in ents:
                 self.printFunction(func, ent)
         print('')
-        print('#endif /* _GLAPI_SKIP_PROTO_ENTRY_POINTS */')
+        print('#endif /* GLAPI_EXPORT_PROTO_ENTRY_POINTS */')
         print('')
 
         self.printInitDispatch(api)
diff --git a/lib/mesa/src/mapi/glapi/gen/gl_x86-64_asm.py b/lib/mesa/src/mapi/glapi/gen/gl_x86-64_asm.py
index 487843dd0..2185e0adc 100644
--- a/lib/mesa/src/mapi/glapi/gen/gl_x86-64_asm.py
+++ b/lib/mesa/src/mapi/glapi/gen/gl_x86-64_asm.py
@@ -271,7 +271,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
                         text = '\t.globl GL_PREFIX(%s) ; .set GL_PREFIX(%s), GL_PREFIX(%s)' % (n, n, dispatch)
 
                         if f.has_different_protocol(n):
-                            print('#ifndef GLX_INDIRECT_RENDERING')
+                            print('#if GLAPI_EXPORT_PROTO_ENTRY_POINTS')
                             print(text)
                             print('#endif')
                         else:
diff --git a/lib/mesa/src/mapi/glapi/gen/gl_x86_asm.py b/lib/mesa/src/mapi/glapi/gen/gl_x86_asm.py
index 057aa54ba..9f20516db 100644
--- a/lib/mesa/src/mapi/glapi/gen/gl_x86_asm.py
+++ b/lib/mesa/src/mapi/glapi/gen/gl_x86_asm.py
@@ -178,7 +178,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
                         text = '\tGL_STUB_ALIAS(%s, %d, %s, %s, %s)' % (n, f.offset, alt2, name, alt)
 
                         if f.has_different_protocol(n):
-                            print('#ifndef GLX_INDIRECT_RENDERING')
+                            print('#if GLAPI_EXPORT_PROTO_ENTRY_POINTS')
                             print(text)
                             print('#endif')
                         else:
diff --git a/lib/mesa/src/mapi/glapi/gen/remap_helper.py b/lib/mesa/src/mapi/glapi/gen/remap_helper.py
index dae955263..f5d58675d 100644
--- a/lib/mesa/src/mapi/glapi/gen/remap_helper.py
+++ b/lib/mesa/src/mapi/glapi/gen/remap_helper.py
@@ -29,33 +29,6 @@ import license
 import gl_XML
 
 
-def get_function_spec(func):
-    sig = ""
-    # derive parameter signature
-    for p in func.parameterIterator():
-        if p.is_padding:
-            continue
-        # FIXME: This is a *really* ugly hack. :(
-        tn = p.type_expr.get_base_type_node()
-        if p.is_pointer():
-            sig += 'p'
-        elif tn.integer:
-            sig += 'i'
-        elif tn.size == 4:
-            sig += 'f'
-        else:
-            sig += 'd'
-
-    spec = [sig]
-    for ent in func.entry_points:
-        spec.append("gl" + ent)
-
-    # spec is terminated by an empty string
-    spec.append('')
-
-    return spec
-
-
 class PrintGlRemap(gl_XML.gl_print_base):
     def __init__(self):
         gl_XML.gl_print_base.__init__(self)
@@ -89,8 +62,6 @@ class PrintGlRemap(gl_XML.gl_print_base):
         for f in api.functionIterateAll():
             pool_indices[f] = index
 
-            spec = get_function_spec(f)
-
             # a function has either assigned offset, fixed offset,
             # or no offset
             if f.assign_offset:
@@ -102,9 +73,8 @@ class PrintGlRemap(gl_XML.gl_print_base):
 
             print('   /* _mesa_function_pool[%d]: %s (%s) */' \
                             % (index, f.name, comments))
-            for line in spec:
-                print('   "%s\\0"' % line)
-                index += len(line) + 1
+            print('   "gl%s\\0"' % f.entry_points[0])
+            index += len(f.entry_points[0]) + 3
         print('   ;')
         print('')
 
diff --git a/lib/mesa/src/mapi/glapi/gen/static_data.py b/lib/mesa/src/mapi/glapi/gen/static_data.py
index b4c85358c..58e303e5b 100644
--- a/lib/mesa/src/mapi/glapi/gen/static_data.py
+++ b/lib/mesa/src/mapi/glapi/gen/static_data.py
@@ -3007,59 +3007,3 @@ functions = [
     "WindowPos3sv",
     "WindowPos3svARB",
 ]
-
-"""Functions that need dispatch slots but are not used
-
-Some of these functions may have GLX protocol support (for
-indirect-rendering).  Other were used in previous versions of Mesa.  They keep
-slots in the dispatch table so that newer versions of libGL can still be used
-with older drivers."""
-unused_functions = [
-    # SGIS_multisample
-    "SampleMaskSGIS",
-    "SamplePatternSGIS",
-
-    # NV_vertex_program
-    "AreProgramsResidentNV",
-    "ExecuteProgramNV",
-    "GetProgramParameterdvNV",
-    "GetProgramParameterfvNV",
-    "GetProgramivNV",
-    "GetProgramStringNV",
-    "GetTrackMatrixivNV",
-    "GetVertexAttribdvNV",
-    "GetVertexAttribfvNV",
-    "GetVertexAttribivNV",
-    "LoadProgramNV",
-    "ProgramParameters4dvNV",
-    "ProgramParameters4fvNV",
-    "RequestResidentProgramsNV",
-    "TrackMatrixNV",
-    "VertexAttribPointerNV",
-
-    # MESA_resize_buffers
-    "ResizeBuffersMESA",
-
-    # ATI_envmap_bumpmap
-    "TexBumpParameterfvATI",
-    "TexBumpParameterivATI",
-    "GetTexBumpParameterfvATI",
-    "GetTexBumpParameterivATI",
-
-    # NV_fragment_program
-    "ProgramNamedParameter4fNV",
-    "ProgramNamedParameter4dNV",
-    "ProgramNamedParameter4fvNV",
-    "ProgramNamedParameter4dvNV",
-    "GetProgramNamedParameterfvNV",
-    "GetProgramNamedParameterdvNV",
-
-    # APPLE_flush_buffer_range
-    "BufferParameteriAPPLE",
-    "FlushMappedBufferRangeAPPLE",
-
-    # EXT_separate_shader_objects
-    "UseShaderProgramEXT",
-    "ActiveProgramEXT",
-    "CreateShaderProgramEXT",
-]