From 3c621f8a2a2f97f65d2682fe6e79fea93b710023 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 12 Aug 2022 04:58:14 -0400 Subject: [PATCH] glapi: rename 'vtxfmt' to 'beginend' to make it clear These are really just the functions that execute between Begin/End. Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/mapi/glapi/gen/ARB_bindless_texture.xml | 4 +- src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml | 16 +- .../glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml | 76 +-- src/mapi/glapi/gen/EXT_gpu_shader4.xml | 28 +- src/mapi/glapi/gen/GL3x.xml | 12 +- src/mapi/glapi/gen/NV_half_float.xml | 88 ++-- src/mapi/glapi/gen/NV_primitive_restart.xml | 2 +- ...api_vtxfmt_init_h.py => api_beginend_init_h.py} | 6 +- src/mapi/glapi/gen/api_exec_init.py | 4 +- src/mapi/glapi/gen/api_hw_select_init_h.py | 2 +- src/mapi/glapi/gen/gl_API.xml | 512 ++++++++++----------- src/mapi/glapi/gen/meson.build | 8 +- src/mesa/main/dlist.c | 2 +- src/mesa/meson.build | 2 +- src/mesa/vbo/vbo_exec_api.c | 4 +- src/mesa/vbo/vbo_noop.c | 8 +- src/mesa/vbo/vbo_save_api.c | 2 +- 17 files changed, 388 insertions(+), 388 deletions(-) rename src/mapi/glapi/gen/{api_vtxfmt_init_h.py => api_beginend_init_h.py} (95%) diff --git a/src/mapi/glapi/gen/ARB_bindless_texture.xml b/src/mapi/glapi/gen/ARB_bindless_texture.xml index 79be451..0c91675 100644 --- a/src/mapi/glapi/gen/ARB_bindless_texture.xml +++ b/src/mapi/glapi/gen/ARB_bindless_texture.xml @@ -79,12 +79,12 @@ - + - + diff --git a/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml b/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml index 75d7468..c9b75c5 100644 --- a/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml +++ b/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml @@ -5,25 +5,25 @@ - + - + - + - + @@ -31,22 +31,22 @@ - + - + - + - + diff --git a/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml b/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml index 282621f..719bc79 100644 --- a/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml +++ b/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml @@ -7,214 +7,214 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/src/mapi/glapi/gen/EXT_gpu_shader4.xml index 1561d97..b829319 100644 --- a/src/mapi/glapi/gen/EXT_gpu_shader4.xml +++ b/src/mapi/glapi/gen/EXT_gpu_shader4.xml @@ -40,25 +40,25 @@ - + - + - + - + @@ -66,25 +66,25 @@ - + - + - + - + @@ -97,17 +97,17 @@ - + - + - + @@ -117,17 +117,17 @@ - + - + - + diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml index 75307d7..e6fd27b 100644 --- a/src/mapi/glapi/gen/GL3x.xml +++ b/src/mapi/glapi/gen/GL3x.xml @@ -330,7 +330,7 @@ - + @@ -350,7 +350,7 @@ - + @@ -370,22 +370,22 @@ - + - + - + - + diff --git a/src/mapi/glapi/gen/NV_half_float.xml b/src/mapi/glapi/gen/NV_half_float.xml index 40965bd..30d5692 100644 --- a/src/mapi/glapi/gen/NV_half_float.xml +++ b/src/mapi/glapi/gen/NV_half_float.xml @@ -5,139 +5,139 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -145,45 +145,45 @@ - + - + - + - + - + - + - + - + @@ -191,50 +191,50 @@ - + - + - + - + - + - + - + - + - + diff --git a/src/mapi/glapi/gen/NV_primitive_restart.xml b/src/mapi/glapi/gen/NV_primitive_restart.xml index e53062f..eaed2f7 100644 --- a/src/mapi/glapi/gen/NV_primitive_restart.xml +++ b/src/mapi/glapi/gen/NV_primitive_restart.xml @@ -11,7 +11,7 @@ - + diff --git a/src/mapi/glapi/gen/api_vtxfmt_init_h.py b/src/mapi/glapi/gen/api_beginend_init_h.py similarity index 95% rename from src/mapi/glapi/gen/api_vtxfmt_init_h.py rename to src/mapi/glapi/gen/api_beginend_init_h.py index 6bd9bb1..b0aab7b 100644 --- a/src/mapi/glapi/gen/api_vtxfmt_init_h.py +++ b/src/mapi/glapi/gen/api_beginend_init_h.py @@ -20,7 +20,7 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -# This script generates the file api_vtxfmt_init.h. +# This script generates the file api_beginend_init.h. import argparse import collections @@ -35,7 +35,7 @@ class PrintCode(gl_XML.gl_print_base): def __init__(self): super().__init__() - self.name = 'api_vtxfmt_init_h.py' + self.name = 'api_beginend_init_h.py' self.license = license.bsd_license_template % ( 'Copyright (C) 2012 Intel Corporation\n' 'Copyright (C) 2021 Advanced Micro Devices, Inc.', @@ -47,7 +47,7 @@ class PrintCode(gl_XML.gl_print_base): settings_by_condition = collections.defaultdict(lambda: []) for f in api.functionIterateAll(): - if f.exec_flavor != 'vtxfmt': + if f.exec_flavor != 'beginend': continue condition = apiexec.get_api_condition(f) diff --git a/src/mapi/glapi/gen/api_exec_init.py b/src/mapi/glapi/gen/api_exec_init.py index 35ac3bb..b7ad95d 100644 --- a/src/mapi/glapi/gen/api_exec_init.py +++ b/src/mapi/glapi/gen/api_exec_init.py @@ -33,7 +33,7 @@ import apiexec exec_flavor_map = { - 'vtxfmt': None, + 'beginend': None, 'dlist': '_mesa_', 'mesa': '_mesa_', 'skip': None, @@ -105,7 +105,7 @@ class PrintCode(gl_XML.gl_print_base): prefix = exec_flavor_map[f.exec_flavor] if prefix is None: # This function is not implemented, or is dispatched - # via vtxfmt. + # via beginend. continue if f.has_no_error_variant: no_error_condition = '_mesa_is_no_error_enabled(ctx) && ({0})'.format(condition) diff --git a/src/mapi/glapi/gen/api_hw_select_init_h.py b/src/mapi/glapi/gen/api_hw_select_init_h.py index ae8cdda..8d2e851 100644 --- a/src/mapi/glapi/gen/api_hw_select_init_h.py +++ b/src/mapi/glapi/gen/api_hw_select_init_h.py @@ -43,7 +43,7 @@ class PrintCode(gl_XML.gl_print_base): def printBody(self, api): for f in api.functionIterateAll(): - if f.exec_flavor != 'vtxfmt': + if f.exec_flavor != 'beginend': continue if (re.match('Vertex*', f.name)): diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 35bbac8..fc69c15 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -1122,12 +1122,12 @@ - + - @@ -1155,7 +1155,7 @@ - @@ -1173,157 +1173,157 @@ - + - + - + - + + deprecated="3.1" exec="beginend"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + deprecated="3.1" exec="beginend"> - + - + - + - + - + - @@ -1331,139 +1331,139 @@ - + - + - + - + - + + deprecated="3.1" exec="beginend"> - + - - + - + + exec="beginend"> - + - + - + - + - + - + - + - + - + + deprecated="3.1" exec="beginend"> - + - + - + - + - + @@ -1652,309 +1652,309 @@ - + - + + deprecated="3.1" exec="beginend"> - + - + - + - + - + - + - + + deprecated="3.1" exec="beginend"> - + - + - + - + - + - + - + + deprecated="3.1" exec="beginend"> - + - + - + - + - + - + - + + deprecated="3.1" exec="beginend"> - + - + - + - + - + - + - + + deprecated="3.1" exec="beginend"> - + - + - + - + - + - + - + + deprecated="3.1" exec="beginend"> - + - + - + - + - + - + - + + deprecated="3.1" exec="beginend"> - + - + - + - + - + @@ -2080,14 +2080,14 @@ - + - + - + - + - + - + + deprecated="3.1" exec="beginend"> - + - + - + + deprecated="3.1" exec="beginend"> - + @@ -2545,7 +2545,7 @@ - + @@ -2559,7 +2559,7 @@ - + @@ -3188,7 +3188,7 @@ - + @@ -3408,11 +3408,11 @@ - + - + @@ -4327,12 +4327,12 @@ - + - + @@ -4349,35 +4349,35 @@ - + - + - + - + - + - + @@ -4396,38 +4396,38 @@ - + - + - + - + - + - + @@ -4447,33 +4447,33 @@ - + - + - + - + - + @@ -4481,7 +4481,7 @@ - + @@ -4502,7 +4502,7 @@ - + @@ -4510,13 +4510,13 @@ - + - + @@ -4524,7 +4524,7 @@ - + @@ -4777,11 +4777,11 @@ - + - + @@ -4837,91 +4837,91 @@ - + - + - + - + + deprecated="3.1" exec="beginend"> + deprecated="3.1" exec="beginend"> - + - + - + - + - + - + - + - + - + - + @@ -5702,11 +5702,11 @@ - + - + @@ -5719,22 +5719,22 @@ - + - + - + - + @@ -5748,24 +5748,24 @@ - + - + - + - + @@ -5780,68 +5780,68 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -5857,34 +5857,34 @@ - + - + - + - + - + - + @@ -6044,12 +6044,12 @@ + vectorequiv="MultiTexCoord1fvARB" exec="beginend"> - + @@ -6090,13 +6090,13 @@ + vectorequiv="MultiTexCoord2fvARB" exec="beginend"> - + @@ -6140,14 +6140,14 @@ + vectorequiv="MultiTexCoord3fvARB" exec="beginend"> - + @@ -6194,7 +6194,7 @@ + vectorequiv="MultiTexCoord4fvARB" exec="beginend"> @@ -6202,7 +6202,7 @@ - + @@ -7071,12 +7071,12 @@ + vectorequiv="VertexAttrib1fvARB" exec="beginend"> - + @@ -7106,13 +7106,13 @@ + vectorequiv="VertexAttrib2fvARB" exec="beginend"> - + @@ -7144,14 +7144,14 @@ + vectorequiv="VertexAttrib3fvARB" exec="beginend"> - + @@ -7185,7 +7185,7 @@ + vectorequiv="VertexAttrib4fvARB" exec="beginend"> @@ -7193,7 +7193,7 @@ - + @@ -9871,11 +9871,11 @@ - + - + @@ -11567,32 +11567,32 @@ - - + - - + - @@ -11600,13 +11600,13 @@ - + - @@ -11615,53 +11615,53 @@ - + + vectorequiv="VertexAttrib1fvNV" deprecated="3.1" exec="beginend"> - + + vectorequiv="VertexAttrib2fvNV" deprecated="3.1" exec="beginend"> - + + vectorequiv="VertexAttrib3fvNV" deprecated="3.1" exec="beginend"> - + + vectorequiv="VertexAttrib4fvNV" deprecated="3.1" exec="beginend"> @@ -11669,38 +11669,38 @@ - + - - + - - + - @@ -11708,13 +11708,13 @@ - + - @@ -11723,13 +11723,13 @@ - + - @@ -11738,97 +11738,97 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index bc3761c..e70fd59 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -253,10 +253,10 @@ main_api_save_h = custom_target( capture : true, ) -main_api_vtxfmt_init_h = custom_target( - 'api_vtxfmt_init.h', - input : ['api_vtxfmt_init_h.py', 'gl_and_es_API.xml'], - output : 'api_vtxfmt_init.h', +main_api_beginend_init_h = custom_target( + 'api_beginend_init.h', + input : ['api_beginend_init_h.py', 'gl_and_es_API.xml'], + output : 'api_beginend_init.h', command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'], depend_files : files('apiexec.py') + glapi_gen_depends, capture : true, diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 27ec08a..c78242b 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -14104,5 +14104,5 @@ _mesa_install_save_vtxfmt(struct gl_context *ctx) #define NAME(x) save_##x #define NAME_ES(x) save_##x - #include "api_vtxfmt_init.h" + #include "api_beginend_init.h" } diff --git a/src/mesa/meson.build b/src/mesa/meson.build index 7c300bf..6dc5844 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -447,7 +447,7 @@ files_libmesa += [ main_api_exec_decl_h, main_api_save_h, main_api_save_init_h, - main_api_vtxfmt_init_h, + main_api_beginend_init_h, main_api_hw_select_init_h, main_enums_c, format_fallback_c, diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 1396e07..421a7f9 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -1077,11 +1077,11 @@ vbo_install_exec_vtxfmt(struct gl_context *ctx) #define NAME_ES(x) _es_##x struct _glapi_table *tab = ctx->OutsideBeginEnd; - #include "api_vtxfmt_init.h" + #include "api_beginend_init.h" if (ctx->BeginEnd) { tab = ctx->BeginEnd; - #include "api_vtxfmt_init.h" + #include "api_beginend_init.h" } } diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c index 9ed773d..04d6724 100644 --- a/src/mesa/vbo/vbo_noop.c +++ b/src/mesa/vbo/vbo_noop.c @@ -128,16 +128,16 @@ vbo_install_exec_vtxfmt_noop(struct gl_context *ctx) #define NAME_ES(x) _mesa_noop_##x struct _glapi_table *tab = ctx->Exec; - #include "api_vtxfmt_init.h" + #include "api_beginend_init.h" if (ctx->BeginEnd) { tab = ctx->BeginEnd; - #include "api_vtxfmt_init.h" + #include "api_beginend_init.h" } if (ctx->HWSelectModeBeginEnd) { tab = ctx->HWSelectModeBeginEnd; - #include "api_vtxfmt_init.h" + #include "api_beginend_init.h" } } @@ -146,7 +146,7 @@ void vbo_install_save_vtxfmt_noop(struct gl_context *ctx) { struct _glapi_table *tab = ctx->Save; - #include "api_vtxfmt_init.h" + #include "api_beginend_init.h" } /** diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index 5abc417..4311bd5 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -1943,7 +1943,7 @@ vbo_install_save_vtxfmt(struct gl_context *ctx) #define NAME_ES(x) _save_##x struct _glapi_table *tab = ctx->Save; - #include "api_vtxfmt_init.h" + #include "api_beginend_init.h" } -- 2.7.4