From a3f73acb9d2cdc62692af7ff93c51f910dff2d0d Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 2 Apr 2024 10:42:24 +0000 Subject: Merge Mesa 23.3.6 --- .../src/mapi/glapi/gen/ARB_sampler_objects.xml | 20 +++--- lib/mesa/src/mapi/glapi/gen/es_EXT.xml | 84 ++++++++++++++++++++++ lib/mesa/src/mapi/glapi/gen/gl_SPARC_asm.py | 2 +- lib/mesa/src/mapi/glapi/gen/gl_XML.py | 2 +- lib/mesa/src/mapi/glapi/gen/gl_apitemp.py | 8 +-- lib/mesa/src/mapi/glapi/gen/gl_x86-64_asm.py | 2 +- lib/mesa/src/mapi/glapi/gen/gl_x86_asm.py | 2 +- lib/mesa/src/mapi/glapi/gen/remap_helper.py | 34 +-------- lib/mesa/src/mapi/glapi/gen/static_data.py | 56 --------------- 9 files changed, 104 insertions(+), 106 deletions(-) (limited to 'lib/mesa/src/mapi/glapi/gen') 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 @@ - + - + - + - + - + - + - + - + @@ -63,13 +63,13 @@ - + - + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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", -] -- cgit v1.2.3