From: Tapani Pälli Date: Fri, 25 Oct 2019 08:06:05 +0000 (+0300) Subject: mesa: enable ARB_gpu_shader_int64 in compat profile X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=4f8c86e6a58980df524796048e12695e07b78a95 mesa: enable ARB_gpu_shader_int64 in compat profile Signed-off-by: Tapani Pälli Acked-by: Marek Olšák Reviewed-by: Kenneth Graunke --- diff --git a/src/mapi/glapi/gen/apiexec.py b/src/mapi/glapi/gen/apiexec.py index 26adb00ae21..966e66a6c02 100644 --- a/src/mapi/glapi/gen/apiexec.py +++ b/src/mapi/glapi/gen/apiexec.py @@ -254,44 +254,43 @@ functions = { "GetQueryBufferObjecti64v": exec_info(compatibility=31, core=31), "GetQueryBufferObjectui64v": exec_info(compatibility=31, core=31), - # GL_ARB_gpu_shader_int64 - nominally requires OpenGL 4.0, and Mesa - # only supports 4.0 in core profile. - "Uniform1i64ARB": exec_info(core=31), - "Uniform2i64ARB": exec_info(core=31), - "Uniform3i64ARB": exec_info(core=31), - "Uniform4i64ARB": exec_info(core=31), - "Uniform1i64vARB": exec_info(core=31), - "Uniform2i64vARB": exec_info(core=31), - "Uniform3i64vARB": exec_info(core=31), - "Uniform4i64vARB": exec_info(core=31), - "Uniform1ui64ARB": exec_info(core=31), - "Uniform2ui64ARB": exec_info(core=31), - "Uniform3ui64ARB": exec_info(core=31), - "Uniform4ui64ARB": exec_info(core=31), - "Uniform1ui64vARB": exec_info(core=31), - "Uniform2ui64vARB": exec_info(core=31), - "Uniform3ui64vARB": exec_info(core=31), - "Uniform4ui64vARB": exec_info(core=31), - "GetUniformi64vARB": exec_info(core=31), - "GetUniformui64vARB": exec_info(core=31), - "GetnUniformi64vARB": exec_info(core=31), - "GetnUniformui64vARB": exec_info(core=31), - "ProgramUniform1i64ARB": exec_info(core=31), - "ProgramUniform2i64ARB": exec_info(core=31), - "ProgramUniform3i64ARB": exec_info(core=31), - "ProgramUniform4i64ARB": exec_info(core=31), - "ProgramUniform1i64vARB": exec_info(core=31), - "ProgramUniform2i64vARB": exec_info(core=31), - "ProgramUniform3i64vARB": exec_info(core=31), - "ProgramUniform4i64vARB": exec_info(core=31), - "ProgramUniform1ui64ARB": exec_info(core=31), - "ProgramUniform2ui64ARB": exec_info(core=31), - "ProgramUniform3ui64ARB": exec_info(core=31), - "ProgramUniform4ui64ARB": exec_info(core=31), - "ProgramUniform1ui64vARB": exec_info(core=31), - "ProgramUniform2ui64vARB": exec_info(core=31), - "ProgramUniform3ui64vARB": exec_info(core=31), - "ProgramUniform4ui64vARB": exec_info(core=31), + # GL_ARB_gpu_shader_int64 - nominally requires OpenGL 4.0 + "Uniform1i64ARB": exec_info(compatibility=40, core=31), + "Uniform2i64ARB": exec_info(compatibility=40, core=31), + "Uniform3i64ARB": exec_info(compatibility=40, core=31), + "Uniform4i64ARB": exec_info(compatibility=40, core=31), + "Uniform1i64vARB": exec_info(compatibility=40, core=31), + "Uniform2i64vARB": exec_info(compatibility=40, core=31), + "Uniform3i64vARB": exec_info(compatibility=40, core=31), + "Uniform4i64vARB": exec_info(compatibility=40, core=31), + "Uniform1ui64ARB": exec_info(compatibility=40, core=31), + "Uniform2ui64ARB": exec_info(compatibility=40, core=31), + "Uniform3ui64ARB": exec_info(compatibility=40, core=31), + "Uniform4ui64ARB": exec_info(compatibility=40, core=31), + "Uniform1ui64vARB": exec_info(compatibility=40, core=31), + "Uniform2ui64vARB": exec_info(compatibility=40, core=31), + "Uniform3ui64vARB": exec_info(compatibility=40, core=31), + "Uniform4ui64vARB": exec_info(compatibility=40, core=31), + "GetUniformi64vARB": exec_info(compatibility=40, core=31), + "GetUniformui64vARB": exec_info(compatibility=40, core=31), + "GetnUniformi64vARB": exec_info(compatibility=40, core=31), + "GetnUniformui64vARB": exec_info(compatibility=40, core=31), + "ProgramUniform1i64ARB": exec_info(compatibility=40, core=31), + "ProgramUniform2i64ARB": exec_info(compatibility=40, core=31), + "ProgramUniform3i64ARB": exec_info(compatibility=40, core=31), + "ProgramUniform4i64ARB": exec_info(compatibility=40, core=31), + "ProgramUniform1i64vARB": exec_info(compatibility=40, core=31), + "ProgramUniform2i64vARB": exec_info(compatibility=40, core=31), + "ProgramUniform3i64vARB": exec_info(compatibility=40, core=31), + "ProgramUniform4i64vARB": exec_info(compatibility=40, core=31), + "ProgramUniform1ui64ARB": exec_info(compatibility=40, core=31), + "ProgramUniform2ui64ARB": exec_info(compatibility=40, core=31), + "ProgramUniform3ui64ARB": exec_info(compatibility=40, core=31), + "ProgramUniform4ui64ARB": exec_info(compatibility=40, core=31), + "ProgramUniform1ui64vARB": exec_info(compatibility=40, core=31), + "ProgramUniform2ui64vARB": exec_info(compatibility=40, core=31), + "ProgramUniform3ui64vARB": exec_info(compatibility=40, core=31), + "ProgramUniform4ui64vARB": exec_info(compatibility=40, core=31), # GL_ARB_bindless_texture "GetVertexAttribLui64vARB": exec_info(compatibility=30, core=31), diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 991adfc9098..9b056c513a2 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -84,7 +84,7 @@ EXT(ARB_get_texture_sub_image , dummy_true EXT(ARB_gl_spirv , ARB_gl_spirv , x, GLC, x , x , 2016) EXT(ARB_gpu_shader5 , ARB_gpu_shader5 , GLL, GLC, x , x , 2010) EXT(ARB_gpu_shader_fp64 , ARB_gpu_shader_fp64 , 32, GLC, x , x , 2010) -EXT(ARB_gpu_shader_int64 , ARB_gpu_shader_int64 , x , GLC, x , x , 2015) +EXT(ARB_gpu_shader_int64 , ARB_gpu_shader_int64 , 40, GLC, x , x , 2015) EXT(ARB_half_float_pixel , dummy_true , GLL, GLC, x , x , 2003) EXT(ARB_half_float_vertex , ARB_half_float_vertex , GLL, GLC, x , x , 2008) EXT(ARB_indirect_parameters , ARB_indirect_parameters , GLL, GLC, x , x , 2013) diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index 5f3e25a2c5b..3c501ce4a33 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -1384,6 +1384,44 @@ const struct function common_desktop_functions_possible[] = { { "glFramebufferParameteriMESA", 43, -1 }, { "glGetFramebufferParameterivMESA", 43, -1 }, + /* GL_ARB_gpu_shader_int64 */ + { "glUniform1i64ARB", 40, -1 }, + { "glUniform2i64ARB", 40, -1 }, + { "glUniform3i64ARB", 40, -1 }, + { "glUniform4i64ARB", 40, -1 }, + { "glUniform1ui64ARB", 40, -1 }, + { "glUniform2ui64ARB", 40, -1 }, + { "glUniform3ui64ARB", 40, -1 }, + { "glUniform4ui64ARB", 40, -1 }, + { "glUniform1i64vARB", 40, -1 }, + { "glUniform2i64vARB", 40, -1 }, + { "glUniform3i64vARB", 40, -1 }, + { "glUniform4i64vARB", 40, -1 }, + { "glUniform1ui64vARB", 40, -1 }, + { "glUniform2ui64vARB", 40, -1 }, + { "glUniform3ui64vARB", 40, -1 }, + { "glUniform4ui64vARB", 40, -1 }, + { "glGetUniformi64vARB", 40, -1 }, + { "glGetUniformui64vARB", 40, -1 }, + { "glGetnUniformi64vARB", 40, -1 }, + { "glGetnUniformui64vARB", 40, -1 }, + { "glProgramUniform1i64ARB", 40, -1 }, + { "glProgramUniform2i64ARB", 40, -1 }, + { "glProgramUniform3i64ARB", 40, -1 }, + { "glProgramUniform4i64ARB", 40, -1 }, + { "glProgramUniform1ui64ARB", 40, -1 }, + { "glProgramUniform2ui64ARB", 40, -1 }, + { "glProgramUniform3ui64ARB", 40, -1 }, + { "glProgramUniform4ui64ARB", 40, -1 }, + { "glProgramUniform1i64vARB", 40, -1 }, + { "glProgramUniform2i64vARB", 40, -1 }, + { "glProgramUniform3i64vARB", 40, -1 }, + { "glProgramUniform4i64vARB", 40, -1 }, + { "glProgramUniform1ui64vARB", 40, -1 }, + { "glProgramUniform2ui64vARB", 40, -1 }, + { "glProgramUniform3ui64vARB", 40, -1 }, + { "glProgramUniform4ui64vARB", 40, -1 }, + { NULL, 0, -1 } }; @@ -1870,44 +1908,6 @@ const struct function gl_core_functions_possible[] = { /* GL_ARB_ES3_2_compatibility */ { "glPrimitiveBoundingBoxARB", 45, -1 }, - /* GL_ARB_gpu_shader_int64 */ - { "glUniform1i64ARB", 45, -1 }, - { "glUniform2i64ARB", 45, -1 }, - { "glUniform3i64ARB", 45, -1 }, - { "glUniform4i64ARB", 45, -1 }, - { "glUniform1ui64ARB", 45, -1 }, - { "glUniform2ui64ARB", 45, -1 }, - { "glUniform3ui64ARB", 45, -1 }, - { "glUniform4ui64ARB", 45, -1 }, - { "glUniform1i64vARB", 45, -1 }, - { "glUniform2i64vARB", 45, -1 }, - { "glUniform3i64vARB", 45, -1 }, - { "glUniform4i64vARB", 45, -1 }, - { "glUniform1ui64vARB", 45, -1 }, - { "glUniform2ui64vARB", 45, -1 }, - { "glUniform3ui64vARB", 45, -1 }, - { "glUniform4ui64vARB", 45, -1 }, - { "glGetUniformi64vARB", 45, -1 }, - { "glGetUniformui64vARB", 45, -1 }, - { "glGetnUniformi64vARB", 45, -1 }, - { "glGetnUniformui64vARB", 45, -1 }, - { "glProgramUniform1i64ARB", 45, -1 }, - { "glProgramUniform2i64ARB", 45, -1 }, - { "glProgramUniform3i64ARB", 45, -1 }, - { "glProgramUniform4i64ARB", 45, -1 }, - { "glProgramUniform1ui64ARB", 45, -1 }, - { "glProgramUniform2ui64ARB", 45, -1 }, - { "glProgramUniform3ui64ARB", 45, -1 }, - { "glProgramUniform4ui64ARB", 45, -1 }, - { "glProgramUniform1i64vARB", 45, -1 }, - { "glProgramUniform2i64vARB", 45, -1 }, - { "glProgramUniform3i64vARB", 45, -1 }, - { "glProgramUniform4i64vARB", 45, -1 }, - { "glProgramUniform1ui64vARB", 45, -1 }, - { "glProgramUniform2ui64vARB", 45, -1 }, - { "glProgramUniform3ui64vARB", 45, -1 }, - { "glProgramUniform4ui64vARB", 45, -1 }, - /* GL_ARB_gl_spirv */ { "glSpecializeShaderARB", 45, -1 },