From df3447c331bbf5e2ddb34e9f6e13c0ad1240aca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 28 Nov 2021 19:14:52 -0500 Subject: [PATCH] glapi: autogenerate _mesa_initialize_save_table with python The generated file looks like this: SET_NewList(table, save_NewList); SET_ListBase(table, save_ListBase); SET_Bitmap(table, save_Bitmap); SET_RasterPos2d(table, save_RasterPos2d); SET_RasterPos2dv(table, save_RasterPos2dv); SET_RasterPos2f(table, save_RasterPos2f); SET_RasterPos2fv(table, save_RasterPos2fv); SET_RasterPos2i(table, save_RasterPos2i); SET_RasterPos2iv(table, save_RasterPos2iv); SET_RasterPos2s(table, save_RasterPos2s); ... Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/mapi/glapi/gen/ARB_base_instance.xml | 6 +- src/mapi/glapi/gen/ARB_clip_control.xml | 2 +- src/mapi/glapi/gen/ARB_compute_shader.xml | 4 +- src/mapi/glapi/gen/ARB_draw_buffers_blend.xml | 8 +- .../gen/ARB_draw_elements_base_vertex.xml | 6 +- src/mapi/glapi/gen/ARB_draw_indirect.xml | 8 +- src/mapi/glapi/gen/ARB_draw_instanced.xml | 4 +- src/mapi/glapi/gen/ARB_framebuffer_object.xml | 2 +- src/mapi/glapi/gen/ARB_gpu_shader_fp64.xml | 34 +- src/mapi/glapi/gen/ARB_gpu_shader_int64.xml | 64 +- src/mapi/glapi/gen/ARB_sampler_objects.xml | 14 +- .../glapi/gen/ARB_separate_shader_objects.xml | 102 +-- src/mapi/glapi/gen/ARB_shader_subroutine.xml | 2 +- src/mapi/glapi/gen/ARB_sync.xml | 2 +- .../glapi/gen/ARB_tessellation_shader.xml | 4 +- .../glapi/gen/ARB_uniform_buffer_object.xml | 2 +- src/mapi/glapi/gen/ARB_viewport_array.xml | 16 +- .../glapi/gen/EXT_direct_state_access.xml | 150 ++--- src/mapi/glapi/gen/EXT_provoking_vertex.xml | 2 +- src/mapi/glapi/gen/EXT_texture_integer.xml | 4 +- src/mapi/glapi/gen/EXT_transform_feedback.xml | 8 +- src/mapi/glapi/gen/EXT_window_rectangles.xml | 2 +- src/mapi/glapi/gen/GL3x.xml | 46 +- src/mapi/glapi/gen/NV_texture_barrier.xml | 2 +- src/mapi/glapi/gen/api_exec_init.py | 1 + src/mapi/glapi/gen/api_save_init_h.py | 51 ++ src/mapi/glapi/gen/gl_API.xml | 518 +++++++-------- src/mapi/glapi/gen/meson.build | 9 + src/mesa/main/dlist.c | 627 +----------------- src/mesa/meson.build | 1 + 30 files changed, 569 insertions(+), 1132 deletions(-) create mode 100644 src/mapi/glapi/gen/api_save_init_h.py diff --git a/src/mapi/glapi/gen/ARB_base_instance.xml b/src/mapi/glapi/gen/ARB_base_instance.xml index 0f0d0bfd2fd..06d140368f0 100644 --- a/src/mapi/glapi/gen/ARB_base_instance.xml +++ b/src/mapi/glapi/gen/ARB_base_instance.xml @@ -8,7 +8,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -25,7 +25,7 @@ - + diff --git a/src/mapi/glapi/gen/ARB_clip_control.xml b/src/mapi/glapi/gen/ARB_clip_control.xml index 051a648081f..cb0ee3692fb 100644 --- a/src/mapi/glapi/gen/ARB_clip_control.xml +++ b/src/mapi/glapi/gen/ARB_clip_control.xml @@ -14,7 +14,7 @@ - + diff --git a/src/mapi/glapi/gen/ARB_compute_shader.xml b/src/mapi/glapi/gen/ARB_compute_shader.xml index 84cbdf39681..1edd928cba8 100644 --- a/src/mapi/glapi/gen/ARB_compute_shader.xml +++ b/src/mapi/glapi/gen/ARB_compute_shader.xml @@ -26,13 +26,13 @@ - + - + diff --git a/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml b/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml index 7c2877d3d69..9423a2a6338 100644 --- a/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml +++ b/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml @@ -8,24 +8,24 @@ - + - + - + - + diff --git a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml b/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml index 08ea7a31ca0..129582b1adc 100644 --- a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml +++ b/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml @@ -8,7 +8,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/src/mapi/glapi/gen/ARB_draw_indirect.xml b/src/mapi/glapi/gen/ARB_draw_indirect.xml index 541647a0c38..feb6588de35 100644 --- a/src/mapi/glapi/gen/ARB_draw_indirect.xml +++ b/src/mapi/glapi/gen/ARB_draw_indirect.xml @@ -8,14 +8,14 @@ - - @@ -28,7 +28,7 @@ - @@ -36,7 +36,7 @@ - diff --git a/src/mapi/glapi/gen/ARB_draw_instanced.xml b/src/mapi/glapi/gen/ARB_draw_instanced.xml index 2d67f0a4334..5a63129db05 100644 --- a/src/mapi/glapi/gen/ARB_draw_instanced.xml +++ b/src/mapi/glapi/gen/ARB_draw_instanced.xml @@ -8,14 +8,14 @@ - + - + diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml index 11a09d93e48..7cacf14a8a5 100644 --- a/src/mapi/glapi/gen/ARB_framebuffer_object.xml +++ b/src/mapi/glapi/gen/ARB_framebuffer_object.xml @@ -281,7 +281,7 @@ - + diff --git a/src/mapi/glapi/gen/ARB_gpu_shader_fp64.xml b/src/mapi/glapi/gen/ARB_gpu_shader_fp64.xml index 7f4ee1bc71b..daf31a22548 100644 --- a/src/mapi/glapi/gen/ARB_gpu_shader_fp64.xml +++ b/src/mapi/glapi/gen/ARB_gpu_shader_fp64.xml @@ -5,25 +5,25 @@ - + - + - + - + @@ -31,87 +31,87 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/mapi/glapi/gen/ARB_gpu_shader_int64.xml b/src/mapi/glapi/gen/ARB_gpu_shader_int64.xml index f6ee64c31b4..702b8e8284a 100644 --- a/src/mapi/glapi/gen/ARB_gpu_shader_int64.xml +++ b/src/mapi/glapi/gen/ARB_gpu_shader_int64.xml @@ -5,25 +5,25 @@ - + - + - + - + @@ -31,49 +31,49 @@ - + - + - + - + - + - + - + - + @@ -81,25 +81,25 @@ - + - + - + - + @@ -131,20 +131,20 @@ - + - + - + @@ -152,7 +152,7 @@ - + @@ -161,48 +161,48 @@ - + - + - + - + - + - + - + @@ -210,7 +210,7 @@ - + @@ -219,28 +219,28 @@ - + - + - + - + diff --git a/src/mapi/glapi/gen/ARB_sampler_objects.xml b/src/mapi/glapi/gen/ARB_sampler_objects.xml index 1e628124c7f..1c0c2b5d8b9 100644 --- a/src/mapi/glapi/gen/ARB_sampler_objects.xml +++ b/src/mapi/glapi/gen/ARB_sampler_objects.xml @@ -22,42 +22,42 @@ - + - + - + - + - + - + - + diff --git a/src/mapi/glapi/gen/ARB_separate_shader_objects.xml b/src/mapi/glapi/gen/ARB_separate_shader_objects.xml index c9737e74a06..3eb97dea470 100644 --- a/src/mapi/glapi/gen/ARB_separate_shader_objects.xml +++ b/src/mapi/glapi/gen/ARB_separate_shader_objects.xml @@ -15,7 +15,7 @@ - + @@ -59,25 +59,25 @@ - + - + - + - + @@ -85,25 +85,25 @@ - + - + - + - + @@ -111,25 +111,25 @@ - + - + - + - + @@ -137,135 +137,135 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -282,25 +282,25 @@ - + - + - + - + @@ -308,88 +308,88 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/mapi/glapi/gen/ARB_shader_subroutine.xml b/src/mapi/glapi/gen/ARB_shader_subroutine.xml index 9c537e4d20b..12990792e58 100644 --- a/src/mapi/glapi/gen/ARB_shader_subroutine.xml +++ b/src/mapi/glapi/gen/ARB_shader_subroutine.xml @@ -47,7 +47,7 @@ - + diff --git a/src/mapi/glapi/gen/ARB_sync.xml b/src/mapi/glapi/gen/ARB_sync.xml index 8ffd9c4c0c2..fb5a00915a1 100644 --- a/src/mapi/glapi/gen/ARB_sync.xml +++ b/src/mapi/glapi/gen/ARB_sync.xml @@ -61,7 +61,7 @@ - + diff --git a/src/mapi/glapi/gen/ARB_tessellation_shader.xml b/src/mapi/glapi/gen/ARB_tessellation_shader.xml index 696dfe42581..88d47851c65 100644 --- a/src/mapi/glapi/gen/ARB_tessellation_shader.xml +++ b/src/mapi/glapi/gen/ARB_tessellation_shader.xml @@ -50,11 +50,11 @@ - + - + diff --git a/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml b/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml index 47bb04725ec..ea2b844e6aa 100644 --- a/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml +++ b/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml @@ -86,7 +86,7 @@ - + diff --git a/src/mapi/glapi/gen/ARB_viewport_array.xml b/src/mapi/glapi/gen/ARB_viewport_array.xml index 2db829b69a6..f1614b8c062 100644 --- a/src/mapi/glapi/gen/ARB_viewport_array.xml +++ b/src/mapi/glapi/gen/ARB_viewport_array.xml @@ -29,44 +29,44 @@ - + - + - + - + - + - + - + - + diff --git a/src/mapi/glapi/gen/EXT_direct_state_access.xml b/src/mapi/glapi/gen/EXT_direct_state_access.xml index c88642f104b..b7fc5283f8f 100644 --- a/src/mapi/glapi/gen/EXT_direct_state_access.xml +++ b/src/mapi/glapi/gen/EXT_direct_state_access.xml @@ -18,64 +18,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -84,7 +84,7 @@ - + @@ -93,11 +93,11 @@ - - @@ -144,35 +144,35 @@ - + - + - + - + - @@ -185,7 +185,7 @@ - @@ -199,7 +199,7 @@ - @@ -214,7 +214,7 @@ - @@ -226,7 +226,7 @@ - @@ -240,7 +240,7 @@ - @@ -256,7 +256,7 @@ - + @@ -267,7 +267,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -326,7 +326,7 @@ - + @@ -360,28 +360,28 @@ - + - + - + - + @@ -402,28 +402,28 @@ - + - + - + - + @@ -470,7 +470,7 @@ - @@ -483,7 +483,7 @@ - @@ -497,7 +497,7 @@ - @@ -512,7 +512,7 @@ - @@ -524,7 +524,7 @@ - @@ -538,7 +538,7 @@ - @@ -554,7 +554,7 @@ - + @@ -565,7 +565,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -587,7 +587,7 @@ - + @@ -599,7 +599,7 @@ - + @@ -686,27 +686,27 @@ - + - + - + - + - @@ -718,7 +718,7 @@ - @@ -731,7 +731,7 @@ - @@ -745,7 +745,7 @@ - @@ -757,7 +757,7 @@ - @@ -771,7 +771,7 @@ - @@ -795,7 +795,7 @@ - @@ -807,7 +807,7 @@ - @@ -820,7 +820,7 @@ - @@ -834,7 +834,7 @@ - @@ -846,7 +846,7 @@ - @@ -860,7 +860,7 @@ - @@ -1247,7 +1247,7 @@ - + @@ -1262,7 +1262,7 @@ - + @@ -1272,7 +1272,7 @@ - + @@ -1286,7 +1286,7 @@ - + @@ -1296,7 +1296,7 @@ - + @@ -1333,14 +1333,14 @@ - + - + @@ -1361,14 +1361,14 @@ - + - + diff --git a/src/mapi/glapi/gen/EXT_provoking_vertex.xml b/src/mapi/glapi/gen/EXT_provoking_vertex.xml index 3d1ae771ebf..a21b96d39d2 100644 --- a/src/mapi/glapi/gen/EXT_provoking_vertex.xml +++ b/src/mapi/glapi/gen/EXT_provoking_vertex.xml @@ -26,7 +26,7 @@ - + diff --git a/src/mapi/glapi/gen/EXT_texture_integer.xml b/src/mapi/glapi/gen/EXT_texture_integer.xml index eb6b220ea6b..ee13861330e 100644 --- a/src/mapi/glapi/gen/EXT_texture_integer.xml +++ b/src/mapi/glapi/gen/EXT_texture_integer.xml @@ -55,14 +55,14 @@ - + - + diff --git a/src/mapi/glapi/gen/EXT_transform_feedback.xml b/src/mapi/glapi/gen/EXT_transform_feedback.xml index 01aa2a364ec..8220a027676 100644 --- a/src/mapi/glapi/gen/EXT_transform_feedback.xml +++ b/src/mapi/glapi/gen/EXT_transform_feedback.xml @@ -82,7 +82,7 @@ - + @@ -102,13 +102,13 @@ - + - + - + diff --git a/src/mapi/glapi/gen/EXT_window_rectangles.xml b/src/mapi/glapi/gen/EXT_window_rectangles.xml index cceaeca0968..d928cdf2822 100644 --- a/src/mapi/glapi/gen/EXT_window_rectangles.xml +++ b/src/mapi/glapi/gen/EXT_window_rectangles.xml @@ -19,7 +19,7 @@ - + diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml index 5ac97ae6344..fc15cb02fb6 100644 --- a/src/mapi/glapi/gen/GL3x.xml +++ b/src/mapi/glapi/gen/GL3x.xml @@ -117,25 +117,25 @@ - + - + - + - + @@ -148,7 +148,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -176,12 +176,12 @@ - + - + @@ -206,11 +206,11 @@ - + - + @@ -246,12 +246,12 @@ - + - + @@ -396,25 +396,25 @@ - + - + - + - + @@ -422,25 +422,25 @@ - + - + - + - + @@ -448,13 +448,13 @@ - + - + @@ -626,7 +626,7 @@ - diff --git a/src/mapi/glapi/gen/NV_texture_barrier.xml b/src/mapi/glapi/gen/NV_texture_barrier.xml index b4c361cc3e7..b4d3d88d64f 100644 --- a/src/mapi/glapi/gen/NV_texture_barrier.xml +++ b/src/mapi/glapi/gen/NV_texture_barrier.xml @@ -7,7 +7,7 @@ - + diff --git a/src/mapi/glapi/gen/api_exec_init.py b/src/mapi/glapi/gen/api_exec_init.py index 50b88ef7353..c27ebcd523e 100644 --- a/src/mapi/glapi/gen/api_exec_init.py +++ b/src/mapi/glapi/gen/api_exec_init.py @@ -34,6 +34,7 @@ import apiexec exec_flavor_map = { 'vtxfmt': None, + 'dlist': '_mesa_', 'mesa': '_mesa_', 'skip': None, } diff --git a/src/mapi/glapi/gen/api_save_init_h.py b/src/mapi/glapi/gen/api_save_init_h.py new file mode 100644 index 00000000000..f8a7a686f62 --- /dev/null +++ b/src/mapi/glapi/gen/api_save_init_h.py @@ -0,0 +1,51 @@ +# Copyright (C) 2012 Intel Corporation +# Copyright (C) 2021 Advanced Micro Devices, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +# This script generates the file api_save_init.h. + +import collections +import license +import gl_XML +import sys +import apiexec + + +class PrintCode(gl_XML.gl_print_base): + def __init__(self): + super().__init__() + + self.name = 'api_save_init_h.py' + self.license = license.bsd_license_template % ( + 'Copyright (C) 2012 Intel Corporation\n' + 'Copyright (C) 2021 Advanced Micro Devices, Inc.', + 'AUTHORS') + + def printBody(self, api): + for f in api.functionIterateAll(): + if f.exec_flavor != 'dlist': + continue + + print('SET_{0}(table, save_{0});'.format(f.name)) + + +if __name__ == '__main__': + apiexec.print_glapi_file(PrintCode()) diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 4533a2805f6..e1f22a32f22 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -1110,7 +1110,7 @@ - @@ -1149,7 +1149,7 @@ - @@ -1160,7 +1160,7 @@ - @@ -1466,134 +1466,134 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1605,46 +1605,46 @@ - + - + - + - + - + - + - + @@ -1957,68 +1957,68 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2108,24 +2108,24 @@ - + - + - - + @@ -2133,19 +2133,19 @@ - + - + - + - + - + - @@ -2181,7 +2181,7 @@ - @@ -2195,14 +2195,14 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2330,12 +2330,12 @@ - + - + @@ -2343,22 +2343,22 @@ - + - + - + - + @@ -2366,29 +2366,29 @@ - + - + - + - - @@ -2403,18 +2403,18 @@ - - - + @@ -2424,7 +2424,7 @@ - + @@ -2434,7 +2434,7 @@ - + @@ -2448,7 +2448,7 @@ - + @@ -2462,21 +2462,21 @@ - + - + - + @@ -2486,7 +2486,7 @@ - + @@ -2536,7 +2536,7 @@ - + @@ -2548,7 +2548,7 @@ - + @@ -2563,55 +2563,55 @@ - + - + - + - + - + - + - + - + - + @@ -2629,7 +2629,7 @@ - @@ -2637,7 +2637,7 @@ - @@ -2645,7 +2645,7 @@ - @@ -2653,12 +2653,12 @@ - + - + @@ -2679,7 +2679,7 @@ - @@ -2894,13 +2894,13 @@ - + - + @@ -2910,37 +2910,37 @@ - + - + - + - - + - + - + @@ -2950,17 +2950,17 @@ - - - + @@ -2968,7 +2968,7 @@ - + @@ -2976,35 +2976,35 @@ - + - + - + - + - + @@ -3207,14 +3207,14 @@ - + - + @@ -3288,13 +3288,13 @@ - + - + @@ -3305,7 +3305,7 @@ - + @@ -3317,7 +3317,7 @@ - + @@ -3327,7 +3327,7 @@ - + @@ -3339,7 +3339,7 @@ - @@ -3352,7 +3352,7 @@ - @@ -3375,7 +3375,7 @@ - + @@ -3399,7 +3399,7 @@ - + @@ -3774,7 +3774,7 @@ - + @@ -3782,12 +3782,12 @@ - + - + @@ -4054,7 +4054,7 @@ - @@ -4069,7 +4069,7 @@ - @@ -4086,7 +4086,7 @@ - + @@ -4313,7 +4313,7 @@ - @@ -4528,33 +4528,33 @@ - + - + - + - + - + - @@ -4568,7 +4568,7 @@ - @@ -4581,7 +4581,7 @@ - @@ -4593,7 +4593,7 @@ - @@ -4609,7 +4609,7 @@ - @@ -4623,7 +4623,7 @@ - @@ -4759,7 +4759,7 @@ - + @@ -4793,7 +4793,7 @@ - + @@ -4809,26 +4809,26 @@ - + - + - + - + @@ -4934,93 +4934,93 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -5187,13 +5187,13 @@ - + - + @@ -5315,19 +5315,19 @@ - + - + - + @@ -5335,7 +5335,7 @@ - + @@ -5343,7 +5343,7 @@ - + @@ -5563,31 +5563,31 @@ - - + - + - + - + @@ -5596,25 +5596,25 @@ - + - + - + - + @@ -5623,71 +5623,71 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -5931,42 +5931,42 @@ - + - + - + - + - + - + @@ -7292,7 +7292,7 @@ - + @@ -7300,7 +7300,7 @@ - + @@ -7324,7 +7324,7 @@ - @@ -7334,7 +7334,7 @@ - @@ -7342,7 +7342,7 @@ - @@ -7352,7 +7352,7 @@ - @@ -7360,7 +7360,7 @@ - @@ -7370,7 +7370,7 @@ - @@ -7378,7 +7378,7 @@ - @@ -7388,7 +7388,7 @@ - + @@ -8156,7 +8156,7 @@ - + @@ -8182,19 +8182,19 @@ - + - + - + @@ -8230,13 +8230,13 @@ - + - + @@ -8404,7 +8404,7 @@ - + @@ -9854,7 +9854,7 @@ - + @@ -10907,7 +10907,7 @@ - + @@ -10915,12 +10915,12 @@ - + - + @@ -10928,12 +10928,12 @@ - + - + @@ -10941,12 +10941,12 @@ - + - + @@ -10954,7 +10954,7 @@ - + @@ -12031,7 +12031,7 @@ - + @@ -12144,7 +12144,7 @@ - + @@ -12244,7 +12244,7 @@ - + @@ -12376,7 +12376,7 @@ - + @@ -12611,7 +12611,7 @@ - + @@ -12627,7 +12627,7 @@ - + @@ -12639,7 +12639,7 @@ - + @@ -12653,7 +12653,7 @@ - + @@ -12724,7 +12724,7 @@ - + @@ -12734,14 +12734,14 @@ - + - + diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index d12ed6d4927..d97eb6ca56f 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -224,6 +224,15 @@ main_api_exec_c = custom_target( capture : true, ) +main_api_save_init_h = custom_target( + 'api_save_init.h', + input : ['api_save_init_h.py', 'gl_and_es_API.xml'], + output : 'api_save_init.h', + command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'], + depend_files : files('apiexec.py') + glapi_gen_depends, + capture : true, +) + main_marshal_generated_c = [] foreach x : ['0', '1', '2', '3', '4', '5', '6', '7'] main_marshal_generated_c += custom_target( diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 92d545a1a89..b719b14120b 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -13990,632 +13990,7 @@ _mesa_initialize_save_table(const struct gl_context *ctx) */ memcpy(table, ctx->Exec, numEntries * sizeof(_glapi_proc)); - /* VBO functions */ - /* Note: other glDraw functions aren't compiled into display lists */ - SET_DrawArrays(table, save_DrawArrays); - SET_MultiDrawArrays(table, save_MultiDrawArrays); - SET_DrawElements(table, save_DrawElements); - SET_DrawElementsBaseVertex(table, save_DrawElementsBaseVertex); - SET_DrawRangeElements(table, save_DrawRangeElements); - SET_MultiDrawElementsEXT(table, save_MultiDrawElementsEXT); - SET_MultiDrawElementsBaseVertex(table, save_MultiDrawElementsBaseVertex); - SET_Rectf(table, save_Rectf); - SET_Rectd(table, save_Rectd); - SET_Rectdv(table, save_Rectdv); - SET_Rectfv(table, save_Rectfv); - SET_Recti(table, save_Recti); - SET_Rectiv(table, save_Rectiv); - SET_Rects(table, save_Rects); - SET_Rectsv(table, save_Rectsv); - - /* GL 1.0 */ - SET_Accum(table, save_Accum); - SET_AlphaFunc(table, save_AlphaFunc); - SET_Bitmap(table, save_Bitmap); - SET_BlendFunc(table, save_BlendFunc); - SET_Clear(table, save_Clear); - SET_ClearAccum(table, save_ClearAccum); - SET_ClearColor(table, save_ClearColor); - SET_ClearDepth(table, save_ClearDepth); - SET_ClearIndex(table, save_ClearIndex); - SET_ClearStencil(table, save_ClearStencil); - SET_ClipPlane(table, save_ClipPlane); - SET_ColorMask(table, save_ColorMask); - SET_ColorMaski(table, save_ColorMaski); - SET_ColorMaterial(table, save_ColorMaterial); - SET_CopyPixels(table, save_CopyPixels); - SET_CullFace(table, save_CullFace); - SET_DepthFunc(table, save_DepthFunc); - SET_DepthMask(table, save_DepthMask); - SET_DepthRange(table, save_DepthRange); - SET_Disable(table, save_Disable); - SET_Disablei(table, save_Disablei); - SET_DrawBuffer(table, save_DrawBuffer); - SET_DrawPixels(table, save_DrawPixels); - SET_Enable(table, save_Enable); - SET_Enablei(table, save_Enablei); - SET_EvalMesh1(table, save_EvalMesh1); - SET_EvalMesh2(table, save_EvalMesh2); - SET_Fogf(table, save_Fogf); - SET_Fogfv(table, save_Fogfv); - SET_Fogi(table, save_Fogi); - SET_Fogiv(table, save_Fogiv); - SET_FrontFace(table, save_FrontFace); - SET_Frustum(table, save_Frustum); - SET_Hint(table, save_Hint); - SET_IndexMask(table, save_IndexMask); - SET_InitNames(table, save_InitNames); - SET_LightModelf(table, save_LightModelf); - SET_LightModelfv(table, save_LightModelfv); - SET_LightModeli(table, save_LightModeli); - SET_LightModeliv(table, save_LightModeliv); - SET_Lightf(table, save_Lightf); - SET_Lightfv(table, save_Lightfv); - SET_Lighti(table, save_Lighti); - SET_Lightiv(table, save_Lightiv); - SET_LineStipple(table, save_LineStipple); - SET_LineWidth(table, save_LineWidth); - SET_ListBase(table, save_ListBase); - SET_LoadIdentity(table, save_LoadIdentity); - SET_LoadMatrixd(table, save_LoadMatrixd); - SET_LoadMatrixf(table, save_LoadMatrixf); - SET_LoadName(table, save_LoadName); - SET_LogicOp(table, save_LogicOp); - SET_Map1d(table, save_Map1d); - SET_Map1f(table, save_Map1f); - SET_Map2d(table, save_Map2d); - SET_Map2f(table, save_Map2f); - SET_MapGrid1d(table, save_MapGrid1d); - SET_MapGrid1f(table, save_MapGrid1f); - SET_MapGrid2d(table, save_MapGrid2d); - SET_MapGrid2f(table, save_MapGrid2f); - SET_MatrixMode(table, save_MatrixMode); - SET_MultMatrixd(table, save_MultMatrixd); - SET_MultMatrixf(table, save_MultMatrixf); - SET_NewList(table, save_NewList); - SET_Ortho(table, save_Ortho); - SET_PassThrough(table, save_PassThrough); - SET_PixelMapfv(table, save_PixelMapfv); - SET_PixelMapuiv(table, save_PixelMapuiv); - SET_PixelMapusv(table, save_PixelMapusv); - SET_PixelTransferf(table, save_PixelTransferf); - SET_PixelTransferi(table, save_PixelTransferi); - SET_PixelZoom(table, save_PixelZoom); - SET_PointSize(table, save_PointSize); - SET_PolygonMode(table, save_PolygonMode); - SET_PolygonOffset(table, save_PolygonOffset); - SET_PolygonStipple(table, save_PolygonStipple); - SET_PopAttrib(table, save_PopAttrib); - SET_PopMatrix(table, save_PopMatrix); - SET_PopName(table, save_PopName); - SET_PushAttrib(table, save_PushAttrib); - SET_PushMatrix(table, save_PushMatrix); - SET_PushName(table, save_PushName); - SET_RasterPos2d(table, save_RasterPos2d); - SET_RasterPos2dv(table, save_RasterPos2dv); - SET_RasterPos2f(table, save_RasterPos2f); - SET_RasterPos2fv(table, save_RasterPos2fv); - SET_RasterPos2i(table, save_RasterPos2i); - SET_RasterPos2iv(table, save_RasterPos2iv); - SET_RasterPos2s(table, save_RasterPos2s); - SET_RasterPos2sv(table, save_RasterPos2sv); - SET_RasterPos3d(table, save_RasterPos3d); - SET_RasterPos3dv(table, save_RasterPos3dv); - SET_RasterPos3f(table, save_RasterPos3f); - SET_RasterPos3fv(table, save_RasterPos3fv); - SET_RasterPos3i(table, save_RasterPos3i); - SET_RasterPos3iv(table, save_RasterPos3iv); - SET_RasterPos3s(table, save_RasterPos3s); - SET_RasterPos3sv(table, save_RasterPos3sv); - SET_RasterPos4d(table, save_RasterPos4d); - SET_RasterPos4dv(table, save_RasterPos4dv); - SET_RasterPos4f(table, save_RasterPos4f); - SET_RasterPos4fv(table, save_RasterPos4fv); - SET_RasterPos4i(table, save_RasterPos4i); - SET_RasterPos4iv(table, save_RasterPos4iv); - SET_RasterPos4s(table, save_RasterPos4s); - SET_RasterPos4sv(table, save_RasterPos4sv); - SET_ReadBuffer(table, save_ReadBuffer); - SET_Rotated(table, save_Rotated); - SET_Rotatef(table, save_Rotatef); - SET_Scaled(table, save_Scaled); - SET_Scalef(table, save_Scalef); - SET_Scissor(table, save_Scissor); - SET_ShadeModel(table, save_ShadeModel); - SET_StencilFunc(table, save_StencilFunc); - SET_StencilMask(table, save_StencilMask); - SET_StencilOp(table, save_StencilOp); - SET_TexEnvf(table, save_TexEnvf); - SET_TexEnvfv(table, save_TexEnvfv); - SET_TexEnvi(table, save_TexEnvi); - SET_TexEnviv(table, save_TexEnviv); - SET_TexGend(table, save_TexGend); - SET_TexGendv(table, save_TexGendv); - SET_TexGenf(table, save_TexGenf); - SET_TexGenfv(table, save_TexGenfv); - SET_TexGeni(table, save_TexGeni); - SET_TexGeniv(table, save_TexGeniv); - SET_TexImage1D(table, save_TexImage1D); - SET_TexImage2D(table, save_TexImage2D); - SET_TexParameterf(table, save_TexParameterf); - SET_TexParameterfv(table, save_TexParameterfv); - SET_TexParameteri(table, save_TexParameteri); - SET_TexParameteriv(table, save_TexParameteriv); - SET_Translated(table, save_Translated); - SET_Translatef(table, save_Translatef); - SET_Viewport(table, save_Viewport); - - /* GL 1.1 */ - SET_BindTexture(table, save_BindTexture); - SET_CopyTexImage1D(table, save_CopyTexImage1D); - SET_CopyTexImage2D(table, save_CopyTexImage2D); - SET_CopyTexSubImage1D(table, save_CopyTexSubImage1D); - SET_CopyTexSubImage2D(table, save_CopyTexSubImage2D); - SET_PrioritizeTextures(table, save_PrioritizeTextures); - SET_TexSubImage1D(table, save_TexSubImage1D); - SET_TexSubImage2D(table, save_TexSubImage2D); - - /* GL 1.2 */ - SET_CopyTexSubImage3D(table, save_CopyTexSubImage3D); - SET_TexImage3D(table, save_TexImage3D); - SET_TexSubImage3D(table, save_TexSubImage3D); - - /* GL 2.0 */ - SET_StencilFuncSeparate(table, save_StencilFuncSeparate); - SET_StencilMaskSeparate(table, save_StencilMaskSeparate); - SET_StencilOpSeparate(table, save_StencilOpSeparate); - - /* ATI_separate_stencil */ - SET_StencilFuncSeparateATI(table, save_StencilFuncSeparateATI); - - /* GL_ARB_imaging */ - /* Not all are supported */ - SET_BlendColor(table, save_BlendColor); - SET_BlendEquation(table, save_BlendEquation); - - /* 54. GL_EXT_point_parameters */ - SET_PointParameterf(table, save_PointParameterf); - SET_PointParameterfv(table, save_PointParameterfv); - - /* 91. GL_ARB_tessellation_shader */ - SET_PatchParameteri(table, save_PatchParameteri); - SET_PatchParameterfv(table, save_PatchParameterfv); - - /* 100. ARB_viewport_array */ - SET_ViewportArrayv(table, save_ViewportArrayv); - SET_ViewportIndexedf(table, save_ViewportIndexedf); - SET_ViewportIndexedfv(table, save_ViewportIndexedfv); - SET_ScissorArrayv(table, save_ScissorArrayv); - SET_ScissorIndexed(table, save_ScissorIndexed); - SET_ScissorIndexedv(table, save_ScissorIndexedv); - SET_DepthRangeArrayv(table, save_DepthRangeArrayv); - SET_DepthRangeIndexed(table, save_DepthRangeIndexed); - - /* 122. ARB_compute_shader */ - SET_DispatchCompute(table, save_DispatchCompute); - SET_DispatchComputeIndirect(table, save_DispatchComputeIndirect); - - /* 173. GL_EXT_blend_func_separate */ - SET_BlendFuncSeparate(table, save_BlendFuncSeparate); - - /* 197. GL_MESA_window_pos */ - SET_WindowPos2d(table, save_WindowPos2d); - SET_WindowPos2dv(table, save_WindowPos2dv); - SET_WindowPos2f(table, save_WindowPos2f); - SET_WindowPos2fv(table, save_WindowPos2fv); - SET_WindowPos2i(table, save_WindowPos2i); - SET_WindowPos2iv(table, save_WindowPos2iv); - SET_WindowPos2s(table, save_WindowPos2s); - SET_WindowPos2sv(table, save_WindowPos2sv); - SET_WindowPos3d(table, save_WindowPos3d); - SET_WindowPos3dv(table, save_WindowPos3dv); - SET_WindowPos3f(table, save_WindowPos3f); - SET_WindowPos3fv(table, save_WindowPos3fv); - SET_WindowPos3i(table, save_WindowPos3i); - SET_WindowPos3iv(table, save_WindowPos3iv); - SET_WindowPos3s(table, save_WindowPos3s); - SET_WindowPos3sv(table, save_WindowPos3sv); - SET_WindowPos4dMESA(table, save_WindowPos4dMESA); - SET_WindowPos4dvMESA(table, save_WindowPos4dvMESA); - SET_WindowPos4fMESA(table, save_WindowPos4fMESA); - SET_WindowPos4fvMESA(table, save_WindowPos4fvMESA); - SET_WindowPos4iMESA(table, save_WindowPos4iMESA); - SET_WindowPos4ivMESA(table, save_WindowPos4ivMESA); - SET_WindowPos4sMESA(table, save_WindowPos4sMESA); - SET_WindowPos4svMESA(table, save_WindowPos4svMESA); - - /* 245. GL_ATI_fragment_shader */ - SET_BindFragmentShaderATI(table, save_BindFragmentShaderATI); - SET_SetFragmentShaderConstantATI(table, save_SetFragmentShaderConstantATI); - - /* 262. GL_ARB_point_sprite */ - SET_PointParameteri(table, save_PointParameteri); - SET_PointParameteriv(table, save_PointParameteriv); - - /* 268. GL_EXT_stencil_two_side */ - SET_ActiveStencilFaceEXT(table, save_ActiveStencilFaceEXT); - - /* ???. GL_EXT_depth_bounds_test */ - SET_DepthBoundsEXT(table, save_DepthBoundsEXT); - - /* ARB 1. GL_ARB_multitexture */ - SET_ActiveTexture(table, save_ActiveTexture); - - /* ARB 3. GL_ARB_transpose_matrix */ - SET_LoadTransposeMatrixd(table, save_LoadTransposeMatrixd); - SET_LoadTransposeMatrixf(table, save_LoadTransposeMatrixf); - SET_MultTransposeMatrixd(table, save_MultTransposeMatrixd); - SET_MultTransposeMatrixf(table, save_MultTransposeMatrixf); - - /* ARB 5. GL_ARB_multisample */ - SET_SampleCoverage(table, save_SampleCoverage); - - /* ARB 12. GL_ARB_texture_compression */ - SET_CompressedTexImage3D(table, save_CompressedTexImage3D); - SET_CompressedTexImage2D(table, save_CompressedTexImage2D); - SET_CompressedTexImage1D(table, save_CompressedTexImage1D); - SET_CompressedTexSubImage3D(table, save_CompressedTexSubImage3D); - SET_CompressedTexSubImage2D(table, save_CompressedTexSubImage2D); - SET_CompressedTexSubImage1D(table, save_CompressedTexSubImage1D); - - /* ARB 14. GL_ARB_point_parameters */ - /* aliased with EXT_point_parameters functions */ - - /* ARB 25. GL_ARB_window_pos */ - /* aliased with MESA_window_pos functions */ - - /* ARB 26. GL_ARB_vertex_program */ - /* ARB 27. GL_ARB_fragment_program */ - /* glVertexAttrib* functions alias the NV ones, handled elsewhere */ - SET_ProgramStringARB(table, save_ProgramStringARB); - SET_BindProgramARB(table, save_BindProgramARB); - SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB); - SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB); - SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB); - SET_ProgramEnvParameter4fvARB(table, save_ProgramEnvParameter4fvARB); - SET_ProgramLocalParameter4dARB(table, save_ProgramLocalParameter4dARB); - SET_ProgramLocalParameter4dvARB(table, save_ProgramLocalParameter4dvARB); - SET_ProgramLocalParameter4fARB(table, save_ProgramLocalParameter4fARB); - SET_ProgramLocalParameter4fvARB(table, save_ProgramLocalParameter4fvARB); - - SET_BeginQuery(table, save_BeginQuery); - SET_EndQuery(table, save_EndQuery); - SET_QueryCounter(table, save_QueryCounter); - - SET_DrawBuffers(table, save_DrawBuffers); - - SET_BlitFramebuffer(table, save_BlitFramebuffer); - - SET_UseProgram(table, save_UseProgram); - SET_Uniform1f(table, save_Uniform1f); - SET_Uniform2f(table, save_Uniform2f); - SET_Uniform3f(table, save_Uniform3f); - SET_Uniform4f(table, save_Uniform4f); - SET_Uniform1fv(table, save_Uniform1fv); - SET_Uniform2fv(table, save_Uniform2fv); - SET_Uniform3fv(table, save_Uniform3fv); - SET_Uniform4fv(table, save_Uniform4fv); - SET_Uniform1i(table, save_Uniform1i); - SET_Uniform2i(table, save_Uniform2i); - SET_Uniform3i(table, save_Uniform3i); - SET_Uniform4i(table, save_Uniform4i); - SET_Uniform1iv(table, save_Uniform1iv); - SET_Uniform2iv(table, save_Uniform2iv); - SET_Uniform3iv(table, save_Uniform3iv); - SET_Uniform4iv(table, save_Uniform4iv); - SET_UniformMatrix2fv(table, save_UniformMatrix2fv); - SET_UniformMatrix3fv(table, save_UniformMatrix3fv); - SET_UniformMatrix4fv(table, save_UniformMatrix4fv); - SET_UniformMatrix2x3fv(table, save_UniformMatrix2x3fv); - SET_UniformMatrix3x2fv(table, save_UniformMatrix3x2fv); - SET_UniformMatrix2x4fv(table, save_UniformMatrix2x4fv); - SET_UniformMatrix4x2fv(table, save_UniformMatrix4x2fv); - SET_UniformMatrix3x4fv(table, save_UniformMatrix3x4fv); - SET_UniformMatrix4x3fv(table, save_UniformMatrix4x3fv); - - /* 299. GL_EXT_blend_equation_separate */ - SET_BlendEquationSeparate(table, save_BlendEquationSeparate); - - /* GL_EXT_gpu_program_parameters */ - SET_ProgramEnvParameters4fvEXT(table, save_ProgramEnvParameters4fvEXT); - SET_ProgramLocalParameters4fvEXT(table, save_ProgramLocalParameters4fvEXT); - - /* 364. GL_EXT_provoking_vertex */ - SET_ProvokingVertex(table, save_ProvokingVertex); - - /* GL_EXT_texture_integer */ - SET_ClearColorIiEXT(table, save_ClearColorIiEXT); - SET_ClearColorIuiEXT(table, save_ClearColorIuiEXT); - SET_TexParameterIiv(table, save_TexParameterIiv); - SET_TexParameterIuiv(table, save_TexParameterIuiv); - - /* GL_ARB_clip_control */ - SET_ClipControl(table, save_ClipControl); - - /* GL_ARB_color_buffer_float */ - SET_ClampColor(table, save_ClampColor); - - /* GL 3.0 */ - SET_ClearBufferiv(table, save_ClearBufferiv); - SET_ClearBufferuiv(table, save_ClearBufferuiv); - SET_ClearBufferfv(table, save_ClearBufferfv); - SET_ClearBufferfi(table, save_ClearBufferfi); - SET_Uniform1ui(table, save_Uniform1ui); - SET_Uniform2ui(table, save_Uniform2ui); - SET_Uniform3ui(table, save_Uniform3ui); - SET_Uniform4ui(table, save_Uniform4ui); - SET_Uniform1uiv(table, save_Uniform1uiv); - SET_Uniform2uiv(table, save_Uniform2uiv); - SET_Uniform3uiv(table, save_Uniform3uiv); - SET_Uniform4uiv(table, save_Uniform4uiv); - - /* GL_ARB_gpu_shader_fp64 */ - SET_Uniform1d(table, save_Uniform1d); - SET_Uniform2d(table, save_Uniform2d); - SET_Uniform3d(table, save_Uniform3d); - SET_Uniform4d(table, save_Uniform4d); - SET_Uniform1dv(table, save_Uniform1dv); - SET_Uniform2dv(table, save_Uniform2dv); - SET_Uniform3dv(table, save_Uniform3dv); - SET_Uniform4dv(table, save_Uniform4dv); - SET_UniformMatrix2dv(table, save_UniformMatrix2dv); - SET_UniformMatrix3dv(table, save_UniformMatrix3dv); - SET_UniformMatrix4dv(table, save_UniformMatrix4dv); - SET_UniformMatrix2x3dv(table, save_UniformMatrix2x3dv); - SET_UniformMatrix3x2dv(table, save_UniformMatrix3x2dv); - SET_UniformMatrix2x4dv(table, save_UniformMatrix2x4dv); - SET_UniformMatrix4x2dv(table, save_UniformMatrix4x2dv); - SET_UniformMatrix3x4dv(table, save_UniformMatrix3x4dv); - SET_UniformMatrix4x3dv(table, save_UniformMatrix4x3dv); - - /* GL_ARB_gpu_shader_int64 */ - SET_Uniform1i64ARB(table, save_Uniform1i64ARB); - SET_Uniform2i64ARB(table, save_Uniform2i64ARB); - SET_Uniform3i64ARB(table, save_Uniform3i64ARB); - SET_Uniform4i64ARB(table, save_Uniform4i64ARB); - SET_Uniform1i64vARB(table, save_Uniform1i64vARB); - SET_Uniform2i64vARB(table, save_Uniform2i64vARB); - SET_Uniform3i64vARB(table, save_Uniform3i64vARB); - SET_Uniform4i64vARB(table, save_Uniform4i64vARB); - SET_Uniform1ui64ARB(table, save_Uniform1ui64ARB); - SET_Uniform2ui64ARB(table, save_Uniform2ui64ARB); - SET_Uniform3ui64ARB(table, save_Uniform3ui64ARB); - SET_Uniform4ui64ARB(table, save_Uniform4ui64ARB); - SET_Uniform1ui64vARB(table, save_Uniform1ui64vARB); - SET_Uniform2ui64vARB(table, save_Uniform2ui64vARB); - SET_Uniform3ui64vARB(table, save_Uniform3ui64vARB); - SET_Uniform4ui64vARB(table, save_Uniform4ui64vARB); - - SET_ProgramUniform1i64ARB(table, save_ProgramUniform1i64ARB); - SET_ProgramUniform2i64ARB(table, save_ProgramUniform2i64ARB); - SET_ProgramUniform3i64ARB(table, save_ProgramUniform3i64ARB); - SET_ProgramUniform4i64ARB(table, save_ProgramUniform4i64ARB); - SET_ProgramUniform1i64vARB(table, save_ProgramUniform1i64vARB); - SET_ProgramUniform2i64vARB(table, save_ProgramUniform2i64vARB); - SET_ProgramUniform3i64vARB(table, save_ProgramUniform3i64vARB); - SET_ProgramUniform4i64vARB(table, save_ProgramUniform4i64vARB); - SET_ProgramUniform1ui64ARB(table, save_ProgramUniform1ui64ARB); - SET_ProgramUniform2ui64ARB(table, save_ProgramUniform2ui64ARB); - SET_ProgramUniform3ui64ARB(table, save_ProgramUniform3ui64ARB); - SET_ProgramUniform4ui64ARB(table, save_ProgramUniform4ui64ARB); - SET_ProgramUniform1ui64vARB(table, save_ProgramUniform1ui64vARB); - SET_ProgramUniform2ui64vARB(table, save_ProgramUniform2ui64vARB); - SET_ProgramUniform3ui64vARB(table, save_ProgramUniform3ui64vARB); - SET_ProgramUniform4ui64vARB(table, save_ProgramUniform4ui64vARB); - - /* These are: */ - SET_BeginTransformFeedback(table, save_BeginTransformFeedback); - SET_EndTransformFeedback(table, save_EndTransformFeedback); - SET_BindTransformFeedback(table, save_BindTransformFeedback); - SET_PauseTransformFeedback(table, save_PauseTransformFeedback); - SET_ResumeTransformFeedback(table, save_ResumeTransformFeedback); - SET_DrawTransformFeedback(table, save_DrawTransformFeedback); - SET_DrawTransformFeedbackStream(table, save_DrawTransformFeedbackStream); - SET_DrawTransformFeedbackInstanced(table, - save_DrawTransformFeedbackInstanced); - SET_DrawTransformFeedbackStreamInstanced(table, - save_DrawTransformFeedbackStreamInstanced); - SET_BeginQueryIndexed(table, save_BeginQueryIndexed); - SET_EndQueryIndexed(table, save_EndQueryIndexed); - - /* GL_ARB_instanced_arrays */ - SET_VertexAttribDivisor(table, save_VertexAttribDivisor); - - /* GL_NV_texture_barrier */ - SET_TextureBarrierNV(table, save_TextureBarrierNV); - - SET_BindSampler(table, save_BindSampler); - SET_SamplerParameteri(table, save_SamplerParameteri); - SET_SamplerParameterf(table, save_SamplerParameterf); - SET_SamplerParameteriv(table, save_SamplerParameteriv); - SET_SamplerParameterfv(table, save_SamplerParameterfv); - SET_SamplerParameterIiv(table, save_SamplerParameterIiv); - SET_SamplerParameterIuiv(table, save_SamplerParameterIuiv); - - /* GL_ARB_draw_buffer_blend */ - SET_BlendFunciARB(table, save_BlendFunciARB); - SET_BlendFuncSeparateiARB(table, save_BlendFuncSeparateiARB); - SET_BlendEquationiARB(table, save_BlendEquationiARB); - SET_BlendEquationSeparateiARB(table, save_BlendEquationSeparateiARB); - - /* GL_NV_conditional_render */ - SET_BeginConditionalRender(table, save_BeginConditionalRender); - SET_EndConditionalRender(table, save_EndConditionalRender); - - /* GL_ARB_sync */ - SET_WaitSync(table, save_WaitSync); - - /* GL_ARB_uniform_buffer_object */ - SET_UniformBlockBinding(table, save_UniformBlockBinding); - - /* GL_ARB_shader_subroutines */ - SET_UniformSubroutinesuiv(table, save_UniformSubroutinesuiv); - - /* GL_ARB_draw_instanced */ - SET_DrawArraysInstancedARB(table, save_DrawArraysInstancedARB); - SET_DrawElementsInstancedARB(table, save_DrawElementsInstancedARB); - - /* GL_ARB_draw_elements_base_vertex */ - SET_DrawElementsInstancedBaseVertex(table, save_DrawElementsInstancedBaseVertex); - - /* GL_ARB_base_instance */ - SET_DrawArraysInstancedBaseInstance(table, save_DrawArraysInstancedBaseInstance); - SET_DrawElementsInstancedBaseInstance(table, save_DrawElementsInstancedBaseInstance); - SET_DrawElementsInstancedBaseVertexBaseInstance(table, save_DrawElementsInstancedBaseVertexBaseInstance); - - /* GL_ARB_draw_indirect / GL_ARB_multi_draw_indirect */ - SET_DrawArraysIndirect(table, save_DrawArraysIndirect); - SET_DrawElementsIndirect(table, save_DrawElementsIndirect); - SET_MultiDrawArraysIndirect(table, save_MultiDrawArraysIndirect); - SET_MultiDrawElementsIndirect(table, save_MultiDrawElementsIndirect); - - /* OpenGL 4.2 / GL_ARB_separate_shader_objects */ - SET_UseProgramStages(table, save_UseProgramStages); - SET_ProgramUniform1f(table, save_ProgramUniform1f); - SET_ProgramUniform2f(table, save_ProgramUniform2f); - SET_ProgramUniform3f(table, save_ProgramUniform3f); - SET_ProgramUniform4f(table, save_ProgramUniform4f); - SET_ProgramUniform1fv(table, save_ProgramUniform1fv); - SET_ProgramUniform2fv(table, save_ProgramUniform2fv); - SET_ProgramUniform3fv(table, save_ProgramUniform3fv); - SET_ProgramUniform4fv(table, save_ProgramUniform4fv); - SET_ProgramUniform1d(table, save_ProgramUniform1d); - SET_ProgramUniform2d(table, save_ProgramUniform2d); - SET_ProgramUniform3d(table, save_ProgramUniform3d); - SET_ProgramUniform4d(table, save_ProgramUniform4d); - SET_ProgramUniform1dv(table, save_ProgramUniform1dv); - SET_ProgramUniform2dv(table, save_ProgramUniform2dv); - SET_ProgramUniform3dv(table, save_ProgramUniform3dv); - SET_ProgramUniform4dv(table, save_ProgramUniform4dv); - SET_ProgramUniform1i(table, save_ProgramUniform1i); - SET_ProgramUniform2i(table, save_ProgramUniform2i); - SET_ProgramUniform3i(table, save_ProgramUniform3i); - SET_ProgramUniform4i(table, save_ProgramUniform4i); - SET_ProgramUniform1iv(table, save_ProgramUniform1iv); - SET_ProgramUniform2iv(table, save_ProgramUniform2iv); - SET_ProgramUniform3iv(table, save_ProgramUniform3iv); - SET_ProgramUniform4iv(table, save_ProgramUniform4iv); - SET_ProgramUniform1ui(table, save_ProgramUniform1ui); - SET_ProgramUniform2ui(table, save_ProgramUniform2ui); - SET_ProgramUniform3ui(table, save_ProgramUniform3ui); - SET_ProgramUniform4ui(table, save_ProgramUniform4ui); - SET_ProgramUniform1uiv(table, save_ProgramUniform1uiv); - SET_ProgramUniform2uiv(table, save_ProgramUniform2uiv); - SET_ProgramUniform3uiv(table, save_ProgramUniform3uiv); - SET_ProgramUniform4uiv(table, save_ProgramUniform4uiv); - SET_ProgramUniformMatrix2fv(table, save_ProgramUniformMatrix2fv); - SET_ProgramUniformMatrix3fv(table, save_ProgramUniformMatrix3fv); - SET_ProgramUniformMatrix4fv(table, save_ProgramUniformMatrix4fv); - SET_ProgramUniformMatrix2x3fv(table, save_ProgramUniformMatrix2x3fv); - SET_ProgramUniformMatrix3x2fv(table, save_ProgramUniformMatrix3x2fv); - SET_ProgramUniformMatrix2x4fv(table, save_ProgramUniformMatrix2x4fv); - SET_ProgramUniformMatrix4x2fv(table, save_ProgramUniformMatrix4x2fv); - SET_ProgramUniformMatrix3x4fv(table, save_ProgramUniformMatrix3x4fv); - SET_ProgramUniformMatrix4x3fv(table, save_ProgramUniformMatrix4x3fv); - SET_ProgramUniformMatrix2dv(table, save_ProgramUniformMatrix2dv); - SET_ProgramUniformMatrix3dv(table, save_ProgramUniformMatrix3dv); - SET_ProgramUniformMatrix4dv(table, save_ProgramUniformMatrix4dv); - SET_ProgramUniformMatrix2x3dv(table, save_ProgramUniformMatrix2x3dv); - SET_ProgramUniformMatrix3x2dv(table, save_ProgramUniformMatrix3x2dv); - SET_ProgramUniformMatrix2x4dv(table, save_ProgramUniformMatrix2x4dv); - SET_ProgramUniformMatrix4x2dv(table, save_ProgramUniformMatrix4x2dv); - SET_ProgramUniformMatrix3x4dv(table, save_ProgramUniformMatrix3x4dv); - SET_ProgramUniformMatrix4x3dv(table, save_ProgramUniformMatrix4x3dv); - - /* GL_{ARB,EXT}_polygon_offset_clamp */ - SET_PolygonOffsetClampEXT(table, save_PolygonOffsetClampEXT); - - /* GL_EXT_window_rectangles */ - SET_WindowRectanglesEXT(table, save_WindowRectanglesEXT); - - /* GL_NV_conservative_raster */ - SET_SubpixelPrecisionBiasNV(table, save_SubpixelPrecisionBiasNV); - - /* GL_NV_conservative_raster_dilate */ - SET_ConservativeRasterParameterfNV(table, save_ConservativeRasterParameterfNV); - - /* GL_NV_conservative_raster_pre_snap_triangles */ - SET_ConservativeRasterParameteriNV(table, save_ConservativeRasterParameteriNV); - - /* GL_EXT_direct_state_access */ - SET_MatrixLoadfEXT(table, save_MatrixLoadfEXT); - SET_MatrixLoaddEXT(table, save_MatrixLoaddEXT); - SET_MatrixMultfEXT(table, save_MatrixMultfEXT); - SET_MatrixMultdEXT(table, save_MatrixMultdEXT); - SET_MatrixRotatefEXT(table, save_MatrixRotatefEXT); - SET_MatrixRotatedEXT(table, save_MatrixRotatedEXT); - SET_MatrixScalefEXT(table, save_MatrixScalefEXT); - SET_MatrixScaledEXT(table, save_MatrixScaledEXT); - SET_MatrixTranslatefEXT(table, save_MatrixTranslatefEXT); - SET_MatrixTranslatedEXT(table, save_MatrixTranslatedEXT); - SET_MatrixLoadIdentityEXT(table, save_MatrixLoadIdentityEXT); - SET_MatrixOrthoEXT(table, save_MatrixOrthoEXT); - SET_MatrixFrustumEXT(table, save_MatrixFrustumEXT); - SET_MatrixPushEXT(table, save_MatrixPushEXT); - SET_MatrixPopEXT(table, save_MatrixPopEXT); - SET_MatrixLoadTransposefEXT(table, save_MatrixLoadTransposefEXT); - SET_MatrixLoadTransposedEXT(table, save_MatrixLoadTransposedEXT); - SET_MatrixMultTransposefEXT(table, save_MatrixMultTransposefEXT); - SET_MatrixMultTransposedEXT(table, save_MatrixMultTransposedEXT); - SET_TextureParameteriEXT(table, save_TextureParameteriEXT); - SET_TextureParameterivEXT(table, save_TextureParameterivEXT); - SET_TextureParameterfEXT(table, save_TextureParameterfEXT); - SET_TextureParameterfvEXT(table, save_TextureParameterfvEXT); - SET_TextureParameterIivEXT(table, save_TextureParameterIivEXT); - SET_TextureParameterIuivEXT(table, save_TextureParameterIuivEXT); - SET_TextureImage1DEXT(table, save_TextureImage1DEXT); - SET_TextureImage2DEXT(table, save_TextureImage2DEXT); - SET_TextureImage3DEXT(table, save_TextureImage3DEXT); - SET_TextureSubImage1DEXT(table, save_TextureSubImage1DEXT); - SET_TextureSubImage2DEXT(table, save_TextureSubImage2DEXT); - SET_TextureSubImage3DEXT(table, save_TextureSubImage3DEXT); - SET_CopyTextureImage1DEXT(table, save_CopyTextureImage1DEXT); - SET_CopyTextureImage2DEXT(table, save_CopyTextureImage2DEXT); - SET_CopyTextureSubImage1DEXT(table, save_CopyTextureSubImage1DEXT); - SET_CopyTextureSubImage2DEXT(table, save_CopyTextureSubImage2DEXT); - SET_CopyTextureSubImage3DEXT(table, save_CopyTextureSubImage3DEXT); - SET_BindMultiTextureEXT(table, save_BindMultiTextureEXT); - SET_MultiTexParameteriEXT(table, save_MultiTexParameteriEXT); - SET_MultiTexParameterivEXT(table, save_MultiTexParameterivEXT); - SET_MultiTexParameterIivEXT(table, save_MultiTexParameterIivEXT); - SET_MultiTexParameterIuivEXT(table, save_MultiTexParameterIuivEXT); - SET_MultiTexParameterfEXT(table, save_MultiTexParameterfEXT); - SET_MultiTexParameterfvEXT(table, save_MultiTexParameterfvEXT); - SET_MultiTexImage1DEXT(table, save_MultiTexImage1DEXT); - SET_MultiTexImage2DEXT(table, save_MultiTexImage2DEXT); - SET_MultiTexImage3DEXT(table, save_MultiTexImage3DEXT); - SET_MultiTexSubImage1DEXT(table, save_MultiTexSubImage1DEXT); - SET_MultiTexSubImage2DEXT(table, save_MultiTexSubImage2DEXT); - SET_MultiTexSubImage3DEXT(table, save_MultiTexSubImage3DEXT); - SET_CopyMultiTexImage1DEXT(table, save_CopyMultiTexImage1DEXT); - SET_CopyMultiTexImage2DEXT(table, save_CopyMultiTexImage2DEXT); - SET_CopyMultiTexSubImage1DEXT(table, save_CopyMultiTexSubImage1DEXT); - SET_CopyMultiTexSubImage2DEXT(table, save_CopyMultiTexSubImage2DEXT); - SET_CopyMultiTexSubImage3DEXT(table, save_CopyMultiTexSubImage3DEXT); - SET_MultiTexEnvfEXT(table, save_MultiTexEnvfEXT); - SET_MultiTexEnvfvEXT(table, save_MultiTexEnvfvEXT); - SET_MultiTexEnviEXT(table, save_MultiTexEnviEXT); - SET_MultiTexEnvivEXT(table, save_MultiTexEnvivEXT); - SET_CompressedTextureImage1DEXT(table, save_CompressedTextureImage1DEXT); - SET_CompressedTextureImage2DEXT(table, save_CompressedTextureImage2DEXT); - SET_CompressedTextureImage3DEXT(table, save_CompressedTextureImage3DEXT); - SET_CompressedTextureSubImage1DEXT(table, save_CompressedTextureSubImage1DEXT); - SET_CompressedTextureSubImage2DEXT(table, save_CompressedTextureSubImage2DEXT); - SET_CompressedTextureSubImage3DEXT(table, save_CompressedTextureSubImage3DEXT); - SET_CompressedMultiTexImage1DEXT(table, save_CompressedMultiTexImage1DEXT); - SET_CompressedMultiTexImage2DEXT(table, save_CompressedMultiTexImage2DEXT); - SET_CompressedMultiTexImage3DEXT(table, save_CompressedMultiTexImage3DEXT); - SET_CompressedMultiTexSubImage1DEXT(table, save_CompressedMultiTexSubImage1DEXT); - SET_CompressedMultiTexSubImage2DEXT(table, save_CompressedMultiTexSubImage2DEXT); - SET_CompressedMultiTexSubImage3DEXT(table, save_CompressedMultiTexSubImage3DEXT); - SET_NamedProgramStringEXT(table, save_NamedProgramStringEXT); - SET_NamedProgramLocalParameter4dEXT(table, save_NamedProgramLocalParameter4dEXT); - SET_NamedProgramLocalParameter4dvEXT(table, save_NamedProgramLocalParameter4dvEXT); - SET_NamedProgramLocalParameter4fEXT(table, save_NamedProgramLocalParameter4fEXT); - SET_NamedProgramLocalParameter4fvEXT(table, save_NamedProgramLocalParameter4fvEXT); - - /* GL_ARB_ES3_2_compatibility */ - SET_PrimitiveBoundingBox(table, save_PrimitiveBoundingBox); +#include "api_save_init.h" } diff --git a/src/mesa/meson.build b/src/mesa/meson.build index 5a19c9a6ef8..aad6757b828 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -526,6 +526,7 @@ files_libmesa += [ mesa_lex, program_parse_tab, main_api_exec_c, + main_api_save_init_h, main_enums_c, format_fallback_c, get_hash_h,