From: Younggwan Kim Date: Mon, 11 Apr 2022 09:07:40 +0000 (+0100) Subject: Update gl.xml and fix script to build properly X-Git-Tag: upstream/1.3.5~310 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc7b99f1ad7b8e616f9a087c0acab7fb5b837134;p=platform%2Fupstream%2FVK-GL-CTS.git Update gl.xml and fix script to build properly gles spec sha: b0643365776c260efc6317d2ff67dd8bf5078be9 fix scripts/opengl/gen_call_log_wrapper.py script file to build Components: Framerwork, OpenGL Change-Id: I9dbeec42a1127469f0e98cdd68a2f88d12007642 --- diff --git a/android/cts/main/egl-master-2022-03-01.txt b/android/cts/main/egl-master-2022-03-01.txt index e3978c3..dbe85eb 100644 --- a/android/cts/main/egl-master-2022-03-01.txt +++ b/android/cts/main/egl-master-2022-03-01.txt @@ -88,3 +88,10 @@ dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgba16f_ dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgba16f_read_pixels dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_s8_stencil_buffer dEQP-EGL.functional.sharing.gles2.texture.render_sample_mixed +dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_storage_compression +dEQP-EGL.functional.get_proc_address.extension.gl_nv_timeline_semaphore +dEQP-EGL.functional.get_proc_address.extension.gl_mesa_framebuffer_flip_y +dEQP-EGL.functional.get_proc_address.extension.gl_nv_memory_object_sparse +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_motion_estimation +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_frame_extrapolation +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_shading_rate diff --git a/android/cts/main/egl-master.txt b/android/cts/main/egl-master.txt index bea4e39..141c39c 100644 --- a/android/cts/main/egl-master.txt +++ b/android/cts/main/egl-master.txt @@ -2621,7 +2621,9 @@ dEQP-EGL.functional.get_proc_address.extension.gl_ext_sparse_texture dEQP-EGL.functional.get_proc_address.extension.gl_ext_tessellation_shader dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_border_clamp dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_buffer +dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_storage_compression dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_view +dEQP-EGL.functional.get_proc_address.extension.gl_nv_timeline_semaphore dEQP-EGL.functional.get_proc_address.extension.gl_ext_win32_keyed_mutex dEQP-EGL.functional.get_proc_address.extension.gl_ext_window_rectangles dEQP-EGL.functional.get_proc_address.extension.gl_img_bindless_texture @@ -2632,6 +2634,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_khr_blend_equation_advanced dEQP-EGL.functional.get_proc_address.extension.gl_khr_debug dEQP-EGL.functional.get_proc_address.extension.gl_khr_robustness dEQP-EGL.functional.get_proc_address.extension.gl_khr_parallel_shader_compile +dEQP-EGL.functional.get_proc_address.extension.gl_mesa_framebuffer_flip_y dEQP-EGL.functional.get_proc_address.extension.gl_nv_bindless_texture dEQP-EGL.functional.get_proc_address.extension.gl_nv_blend_equation_advanced dEQP-EGL.functional.get_proc_address.extension.gl_nv_clip_space_w_scaling @@ -2651,6 +2654,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_nv_gpu_shader5 dEQP-EGL.functional.get_proc_address.extension.gl_nv_instanced_arrays dEQP-EGL.functional.get_proc_address.extension.gl_nv_internalformat_sample_query dEQP-EGL.functional.get_proc_address.extension.gl_nv_memory_attachment +dEQP-EGL.functional.get_proc_address.extension.gl_nv_memory_object_sparse dEQP-EGL.functional.get_proc_address.extension.gl_nv_mesh_shader dEQP-EGL.functional.get_proc_address.extension.gl_nv_non_square_matrices dEQP-EGL.functional.get_proc_address.extension.gl_nv_path_rendering @@ -2679,8 +2683,11 @@ dEQP-EGL.functional.get_proc_address.extension.gl_ovr_multiview dEQP-EGL.functional.get_proc_address.extension.gl_ovr_multiview_multisampled_render_to_texture dEQP-EGL.functional.get_proc_address.extension.gl_qcom_alpha_test dEQP-EGL.functional.get_proc_address.extension.gl_qcom_framebuffer_foveated +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_motion_estimation +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_frame_extrapolation dEQP-EGL.functional.get_proc_address.extension.gl_qcom_texture_foveated dEQP-EGL.functional.get_proc_address.extension.gl_qcom_shader_framebuffer_fetch_noncoherent +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_shading_rate dEQP-EGL.functional.get_proc_address.core.egl dEQP-EGL.functional.get_proc_address.core.egl15 dEQP-EGL.functional.get_proc_address.core.gles diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt index f60da09..0ac119a 100644 --- a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt +++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt @@ -2533,7 +2533,9 @@ dEQP-EGL.functional.get_proc_address.extension.gl_ext_sparse_texture dEQP-EGL.functional.get_proc_address.extension.gl_ext_tessellation_shader dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_border_clamp dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_buffer +dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_storage_compression dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_view +dEQP-EGL.functional.get_proc_address.extension.gl_nv_timeline_semaphore dEQP-EGL.functional.get_proc_address.extension.gl_ext_win32_keyed_mutex dEQP-EGL.functional.get_proc_address.extension.gl_ext_window_rectangles dEQP-EGL.functional.get_proc_address.extension.gl_img_bindless_texture @@ -2544,6 +2546,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_khr_blend_equation_advanced dEQP-EGL.functional.get_proc_address.extension.gl_khr_debug dEQP-EGL.functional.get_proc_address.extension.gl_khr_robustness dEQP-EGL.functional.get_proc_address.extension.gl_khr_parallel_shader_compile +dEQP-EGL.functional.get_proc_address.extension.gl_mesa_framebuffer_flip_y dEQP-EGL.functional.get_proc_address.extension.gl_nv_bindless_texture dEQP-EGL.functional.get_proc_address.extension.gl_nv_blend_equation_advanced dEQP-EGL.functional.get_proc_address.extension.gl_nv_clip_space_w_scaling @@ -2563,6 +2566,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_nv_gpu_shader5 dEQP-EGL.functional.get_proc_address.extension.gl_nv_instanced_arrays dEQP-EGL.functional.get_proc_address.extension.gl_nv_internalformat_sample_query dEQP-EGL.functional.get_proc_address.extension.gl_nv_memory_attachment +dEQP-EGL.functional.get_proc_address.extension.gl_nv_memory_object_sparse dEQP-EGL.functional.get_proc_address.extension.gl_nv_mesh_shader dEQP-EGL.functional.get_proc_address.extension.gl_nv_non_square_matrices dEQP-EGL.functional.get_proc_address.extension.gl_nv_path_rendering @@ -2591,8 +2595,11 @@ dEQP-EGL.functional.get_proc_address.extension.gl_ovr_multiview dEQP-EGL.functional.get_proc_address.extension.gl_ovr_multiview_multisampled_render_to_texture dEQP-EGL.functional.get_proc_address.extension.gl_qcom_alpha_test dEQP-EGL.functional.get_proc_address.extension.gl_qcom_framebuffer_foveated +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_motion_estimation +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_frame_extrapolation dEQP-EGL.functional.get_proc_address.extension.gl_qcom_texture_foveated dEQP-EGL.functional.get_proc_address.extension.gl_qcom_shader_framebuffer_fetch_noncoherent +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_shading_rate dEQP-EGL.functional.get_proc_address.core.egl dEQP-EGL.functional.get_proc_address.core.egl15 dEQP-EGL.functional.get_proc_address.core.gles diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt index f60da09..0ac119a 100644 --- a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt +++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt @@ -2533,7 +2533,9 @@ dEQP-EGL.functional.get_proc_address.extension.gl_ext_sparse_texture dEQP-EGL.functional.get_proc_address.extension.gl_ext_tessellation_shader dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_border_clamp dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_buffer +dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_storage_compression dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_view +dEQP-EGL.functional.get_proc_address.extension.gl_nv_timeline_semaphore dEQP-EGL.functional.get_proc_address.extension.gl_ext_win32_keyed_mutex dEQP-EGL.functional.get_proc_address.extension.gl_ext_window_rectangles dEQP-EGL.functional.get_proc_address.extension.gl_img_bindless_texture @@ -2544,6 +2546,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_khr_blend_equation_advanced dEQP-EGL.functional.get_proc_address.extension.gl_khr_debug dEQP-EGL.functional.get_proc_address.extension.gl_khr_robustness dEQP-EGL.functional.get_proc_address.extension.gl_khr_parallel_shader_compile +dEQP-EGL.functional.get_proc_address.extension.gl_mesa_framebuffer_flip_y dEQP-EGL.functional.get_proc_address.extension.gl_nv_bindless_texture dEQP-EGL.functional.get_proc_address.extension.gl_nv_blend_equation_advanced dEQP-EGL.functional.get_proc_address.extension.gl_nv_clip_space_w_scaling @@ -2563,6 +2566,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_nv_gpu_shader5 dEQP-EGL.functional.get_proc_address.extension.gl_nv_instanced_arrays dEQP-EGL.functional.get_proc_address.extension.gl_nv_internalformat_sample_query dEQP-EGL.functional.get_proc_address.extension.gl_nv_memory_attachment +dEQP-EGL.functional.get_proc_address.extension.gl_nv_memory_object_sparse dEQP-EGL.functional.get_proc_address.extension.gl_nv_mesh_shader dEQP-EGL.functional.get_proc_address.extension.gl_nv_non_square_matrices dEQP-EGL.functional.get_proc_address.extension.gl_nv_path_rendering @@ -2591,8 +2595,11 @@ dEQP-EGL.functional.get_proc_address.extension.gl_ovr_multiview dEQP-EGL.functional.get_proc_address.extension.gl_ovr_multiview_multisampled_render_to_texture dEQP-EGL.functional.get_proc_address.extension.gl_qcom_alpha_test dEQP-EGL.functional.get_proc_address.extension.gl_qcom_framebuffer_foveated +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_motion_estimation +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_frame_extrapolation dEQP-EGL.functional.get_proc_address.extension.gl_qcom_texture_foveated dEQP-EGL.functional.get_proc_address.extension.gl_qcom_shader_framebuffer_fetch_noncoherent +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_shading_rate dEQP-EGL.functional.get_proc_address.core.egl dEQP-EGL.functional.get_proc_address.core.egl15 dEQP-EGL.functional.get_proc_address.core.gles diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/main/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/main/egl-master.txt index f60da09..0ac119a 100644 --- a/external/openglcts/data/mustpass/egl/aosp_mustpass/main/egl-master.txt +++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/main/egl-master.txt @@ -2533,7 +2533,9 @@ dEQP-EGL.functional.get_proc_address.extension.gl_ext_sparse_texture dEQP-EGL.functional.get_proc_address.extension.gl_ext_tessellation_shader dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_border_clamp dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_buffer +dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_storage_compression dEQP-EGL.functional.get_proc_address.extension.gl_ext_texture_view +dEQP-EGL.functional.get_proc_address.extension.gl_nv_timeline_semaphore dEQP-EGL.functional.get_proc_address.extension.gl_ext_win32_keyed_mutex dEQP-EGL.functional.get_proc_address.extension.gl_ext_window_rectangles dEQP-EGL.functional.get_proc_address.extension.gl_img_bindless_texture @@ -2544,6 +2546,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_khr_blend_equation_advanced dEQP-EGL.functional.get_proc_address.extension.gl_khr_debug dEQP-EGL.functional.get_proc_address.extension.gl_khr_robustness dEQP-EGL.functional.get_proc_address.extension.gl_khr_parallel_shader_compile +dEQP-EGL.functional.get_proc_address.extension.gl_mesa_framebuffer_flip_y dEQP-EGL.functional.get_proc_address.extension.gl_nv_bindless_texture dEQP-EGL.functional.get_proc_address.extension.gl_nv_blend_equation_advanced dEQP-EGL.functional.get_proc_address.extension.gl_nv_clip_space_w_scaling @@ -2563,6 +2566,7 @@ dEQP-EGL.functional.get_proc_address.extension.gl_nv_gpu_shader5 dEQP-EGL.functional.get_proc_address.extension.gl_nv_instanced_arrays dEQP-EGL.functional.get_proc_address.extension.gl_nv_internalformat_sample_query dEQP-EGL.functional.get_proc_address.extension.gl_nv_memory_attachment +dEQP-EGL.functional.get_proc_address.extension.gl_nv_memory_object_sparse dEQP-EGL.functional.get_proc_address.extension.gl_nv_mesh_shader dEQP-EGL.functional.get_proc_address.extension.gl_nv_non_square_matrices dEQP-EGL.functional.get_proc_address.extension.gl_nv_path_rendering @@ -2591,8 +2595,11 @@ dEQP-EGL.functional.get_proc_address.extension.gl_ovr_multiview dEQP-EGL.functional.get_proc_address.extension.gl_ovr_multiview_multisampled_render_to_texture dEQP-EGL.functional.get_proc_address.extension.gl_qcom_alpha_test dEQP-EGL.functional.get_proc_address.extension.gl_qcom_framebuffer_foveated +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_motion_estimation +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_frame_extrapolation dEQP-EGL.functional.get_proc_address.extension.gl_qcom_texture_foveated dEQP-EGL.functional.get_proc_address.extension.gl_qcom_shader_framebuffer_fetch_noncoherent +dEQP-EGL.functional.get_proc_address.extension.gl_qcom_shading_rate dEQP-EGL.functional.get_proc_address.core.egl dEQP-EGL.functional.get_proc_address.core.egl15 dEQP-EGL.functional.get_proc_address.core.gles diff --git a/framework/egl/egluStaticES20Library.inl b/framework/egl/egluStaticES20Library.inl index edeed0e..bd1c9d6 100644 --- a/framework/egl/egluStaticES20Library.inl +++ b/framework/egl/egluStaticES20Library.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ { "glActiveTexture", (deFunctionPtr)glActiveTexture }, { "glAttachShader", (deFunctionPtr)glAttachShader }, diff --git a/framework/egl/egluStaticES30Library.inl b/framework/egl/egluStaticES30Library.inl index 659601c..dd83bcc 100644 --- a/framework/egl/egluStaticES30Library.inl +++ b/framework/egl/egluStaticES30Library.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ { "glActiveTexture", (deFunctionPtr)glActiveTexture }, { "glAttachShader", (deFunctionPtr)glAttachShader }, diff --git a/framework/egl/egluStaticES31Library.inl b/framework/egl/egluStaticES31Library.inl index d69ebd0..9f31ebf 100644 --- a/framework/egl/egluStaticES31Library.inl +++ b/framework/egl/egluStaticES31Library.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ { "glActiveShaderProgram", (deFunctionPtr)glActiveShaderProgram }, { "glActiveTexture", (deFunctionPtr)glActiveTexture }, diff --git a/framework/egl/egluStaticES32Library.inl b/framework/egl/egluStaticES32Library.inl index 6b7718b..f6a4c00 100644 --- a/framework/egl/egluStaticES32Library.inl +++ b/framework/egl/egluStaticES32Library.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ { "glActiveShaderProgram", (deFunctionPtr)glActiveShaderProgram }, { "glActiveTexture", (deFunctionPtr)glActiveTexture }, diff --git a/framework/opengl/gluCallLogUtil.inl b/framework/opengl/gluCallLogUtil.inl index 6637d2c..5999eca 100644 --- a/framework/opengl/gluCallLogUtil.inl +++ b/framework/opengl/gluCallLogUtil.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ int getTextureParamNumArgs (int pname) diff --git a/framework/opengl/gluCallLogWrapper.inl b/framework/opengl/gluCallLogWrapper.inl index 70f162e..ede5c60 100644 --- a/framework/opengl/gluCallLogWrapper.inl +++ b/framework/opengl/gluCallLogWrapper.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ void CallLogWrapper::glActiveShaderProgram (glw::GLuint pipeline, glw::GLuint program) @@ -1717,18 +1717,18 @@ void CallLogWrapper::glGetActiveAttrib (glw::GLuint program, glw::GLuint index, m_gl.getActiveAttrib(program, index, bufSize, length, size, type, name); } -void CallLogWrapper::glGetActiveSubroutineName (glw::GLuint program, glw::GLenum shadertype, glw::GLuint index, glw::GLsizei bufsize, glw::GLsizei *length, glw::GLchar *name) +void CallLogWrapper::glGetActiveSubroutineName (glw::GLuint program, glw::GLenum shadertype, glw::GLuint index, glw::GLsizei bufSize, glw::GLsizei *length, glw::GLchar *name) { if (m_enableLog) - m_log << TestLog::Message << "glGetActiveSubroutineName(" << program << ", " << toHex(shadertype) << ", " << index << ", " << bufsize << ", " << toHex(reinterpret_cast(static_cast(length))) << ", " << toHex(reinterpret_cast(static_cast(name))) << ");" << TestLog::EndMessage; - m_gl.getActiveSubroutineName(program, shadertype, index, bufsize, length, name); + m_log << TestLog::Message << "glGetActiveSubroutineName(" << program << ", " << toHex(shadertype) << ", " << index << ", " << bufSize << ", " << toHex(reinterpret_cast(static_cast(length))) << ", " << toHex(reinterpret_cast(static_cast(name))) << ");" << TestLog::EndMessage; + m_gl.getActiveSubroutineName(program, shadertype, index, bufSize, length, name); } -void CallLogWrapper::glGetActiveSubroutineUniformName (glw::GLuint program, glw::GLenum shadertype, glw::GLuint index, glw::GLsizei bufsize, glw::GLsizei *length, glw::GLchar *name) +void CallLogWrapper::glGetActiveSubroutineUniformName (glw::GLuint program, glw::GLenum shadertype, glw::GLuint index, glw::GLsizei bufSize, glw::GLsizei *length, glw::GLchar *name) { if (m_enableLog) - m_log << TestLog::Message << "glGetActiveSubroutineUniformName(" << program << ", " << toHex(shadertype) << ", " << index << ", " << bufsize << ", " << toHex(reinterpret_cast(static_cast(length))) << ", " << toHex(reinterpret_cast(static_cast(name))) << ");" << TestLog::EndMessage; - m_gl.getActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name); + m_log << TestLog::Message << "glGetActiveSubroutineUniformName(" << program << ", " << toHex(shadertype) << ", " << index << ", " << bufSize << ", " << toHex(reinterpret_cast(static_cast(length))) << ", " << toHex(reinterpret_cast(static_cast(name))) << ");" << TestLog::EndMessage; + m_gl.getActiveSubroutineUniformName(program, shadertype, index, bufSize, length, name); } void CallLogWrapper::glGetActiveSubroutineUniformiv (glw::GLuint program, glw::GLenum shadertype, glw::GLuint index, glw::GLenum pname, glw::GLint *values) @@ -2021,27 +2021,27 @@ void CallLogWrapper::glGetIntegerv (glw::GLenum pname, glw::GLint *data) m_log << TestLog::Message << "// data = " << getPointerStr(data, getBasicQueryNumArgsOut(pname)) << TestLog::EndMessage; } -void CallLogWrapper::glGetInternalformatSampleivNV (glw::GLenum target, glw::GLenum internalformat, glw::GLsizei samples, glw::GLenum pname, glw::GLsizei bufSize, glw::GLint *params) +void CallLogWrapper::glGetInternalformatSampleivNV (glw::GLenum target, glw::GLenum internalformat, glw::GLsizei samples, glw::GLenum pname, glw::GLsizei count, glw::GLint *params) { if (m_enableLog) - m_log << TestLog::Message << "glGetInternalformatSampleivNV(" << toHex(target) << ", " << toHex(internalformat) << ", " << samples << ", " << toHex(pname) << ", " << bufSize << ", " << toHex(reinterpret_cast(static_cast(params))) << ");" << TestLog::EndMessage; - m_gl.getInternalformatSampleivNV(target, internalformat, samples, pname, bufSize, params); + m_log << TestLog::Message << "glGetInternalformatSampleivNV(" << toHex(target) << ", " << toHex(internalformat) << ", " << samples << ", " << toHex(pname) << ", " << count << ", " << toHex(reinterpret_cast(static_cast(params))) << ");" << TestLog::EndMessage; + m_gl.getInternalformatSampleivNV(target, internalformat, samples, pname, count, params); } -void CallLogWrapper::glGetInternalformati64v (glw::GLenum target, glw::GLenum internalformat, glw::GLenum pname, glw::GLsizei bufSize, glw::GLint64 *params) +void CallLogWrapper::glGetInternalformati64v (glw::GLenum target, glw::GLenum internalformat, glw::GLenum pname, glw::GLsizei count, glw::GLint64 *params) { if (m_enableLog) - m_log << TestLog::Message << "glGetInternalformati64v(" << toHex(target) << ", " << toHex(internalformat) << ", " << toHex(pname) << ", " << bufSize << ", " << toHex(reinterpret_cast(static_cast(params))) << ");" << TestLog::EndMessage; - m_gl.getInternalformati64v(target, internalformat, pname, bufSize, params); + m_log << TestLog::Message << "glGetInternalformati64v(" << toHex(target) << ", " << toHex(internalformat) << ", " << toHex(pname) << ", " << count << ", " << toHex(reinterpret_cast(static_cast(params))) << ");" << TestLog::EndMessage; + m_gl.getInternalformati64v(target, internalformat, pname, count, params); } -void CallLogWrapper::glGetInternalformativ (glw::GLenum target, glw::GLenum internalformat, glw::GLenum pname, glw::GLsizei bufSize, glw::GLint *params) +void CallLogWrapper::glGetInternalformativ (glw::GLenum target, glw::GLenum internalformat, glw::GLenum pname, glw::GLsizei count, glw::GLint *params) { if (m_enableLog) - m_log << TestLog::Message << "glGetInternalformativ(" << getInternalFormatTargetStr(target) << ", " << getUncompressedTextureFormatStr(internalformat) << ", " << getInternalFormatParameterStr(pname) << ", " << bufSize << ", " << toHex(reinterpret_cast(static_cast(params))) << ");" << TestLog::EndMessage; - m_gl.getInternalformativ(target, internalformat, pname, bufSize, params); + m_log << TestLog::Message << "glGetInternalformativ(" << getInternalFormatTargetStr(target) << ", " << getUncompressedTextureFormatStr(internalformat) << ", " << getInternalFormatParameterStr(pname) << ", " << count << ", " << toHex(reinterpret_cast(static_cast(params))) << ");" << TestLog::EndMessage; + m_gl.getInternalformativ(target, internalformat, pname, count, params); if (m_enableLog) - m_log << TestLog::Message << "// params = " << getPointerStr(params, bufSize) << TestLog::EndMessage; + m_log << TestLog::Message << "// params = " << getPointerStr(params, count) << TestLog::EndMessage; } void CallLogWrapper::glGetMultiTexEnvfvEXT (glw::GLenum texunit, glw::GLenum target, glw::GLenum pname, glw::GLfloat *params) @@ -2385,15 +2385,15 @@ void CallLogWrapper::glGetProgramResourceName (glw::GLuint program, glw::GLenum m_gl.getProgramResourceName(program, programInterface, index, bufSize, length, name); } -void CallLogWrapper::glGetProgramResourceiv (glw::GLuint program, glw::GLenum programInterface, glw::GLuint index, glw::GLsizei propCount, const glw::GLenum *props, glw::GLsizei bufSize, glw::GLsizei *length, glw::GLint *params) +void CallLogWrapper::glGetProgramResourceiv (glw::GLuint program, glw::GLenum programInterface, glw::GLuint index, glw::GLsizei propCount, const glw::GLenum *props, glw::GLsizei count, glw::GLsizei *length, glw::GLint *params) { if (m_enableLog) - m_log << TestLog::Message << "glGetProgramResourceiv(" << program << ", " << getProgramInterfaceStr(programInterface) << ", " << index << ", " << propCount << ", " << getEnumPointerStr(props, propCount, getProgramResourcePropertyName) << ", " << bufSize << ", " << toHex(reinterpret_cast(static_cast(length))) << ", " << toHex(reinterpret_cast(static_cast(params))) << ");" << TestLog::EndMessage; - m_gl.getProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params); + m_log << TestLog::Message << "glGetProgramResourceiv(" << program << ", " << getProgramInterfaceStr(programInterface) << ", " << index << ", " << propCount << ", " << getEnumPointerStr(props, propCount, getProgramResourcePropertyName) << ", " << count << ", " << toHex(reinterpret_cast(static_cast(length))) << ", " << toHex(reinterpret_cast(static_cast(params))) << ");" << TestLog::EndMessage; + m_gl.getProgramResourceiv(program, programInterface, index, propCount, props, count, length, params); if (m_enableLog) { m_log << TestLog::Message << "// length = " << getPointerStr(length, 1) << TestLog::EndMessage; - m_log << TestLog::Message << "// params = " << getPointerStr(params, ((length == DE_NULL) ? (bufSize) : ((bufSize < *length) ? (bufSize) : (*length)))) << TestLog::EndMessage; + m_log << TestLog::Message << "// params = " << getPointerStr(params, ((length == DE_NULL) ? (count) : ((count < *length) ? (count) : (*length)))) << TestLog::EndMessage; } } @@ -2608,11 +2608,11 @@ glw::GLint CallLogWrapper::glGetSubroutineUniformLocation (glw::GLuint program, return returnValue; } -void CallLogWrapper::glGetSynciv (glw::GLsync sync, glw::GLenum pname, glw::GLsizei bufSize, glw::GLsizei *length, glw::GLint *values) +void CallLogWrapper::glGetSynciv (glw::GLsync sync, glw::GLenum pname, glw::GLsizei count, glw::GLsizei *length, glw::GLint *values) { if (m_enableLog) - m_log << TestLog::Message << "glGetSynciv(" << sync << ", " << toHex(pname) << ", " << bufSize << ", " << toHex(reinterpret_cast(static_cast(length))) << ", " << toHex(reinterpret_cast(static_cast(values))) << ");" << TestLog::EndMessage; - m_gl.getSynciv(sync, pname, bufSize, length, values); + m_log << TestLog::Message << "glGetSynciv(" << sync << ", " << toHex(pname) << ", " << count << ", " << toHex(reinterpret_cast(static_cast(length))) << ", " << toHex(reinterpret_cast(static_cast(values))) << ");" << TestLog::EndMessage; + m_gl.getSynciv(sync, pname, count, length, values); } void CallLogWrapper::glGetTexImage (glw::GLenum target, glw::GLint level, glw::GLenum format, glw::GLenum type, void *pixels) @@ -4845,11 +4845,11 @@ void CallLogWrapper::glScissorIndexedv (glw::GLuint index, const glw::GLint *v) m_gl.scissorIndexedv(index, v); } -void CallLogWrapper::glShaderBinary (glw::GLsizei count, const glw::GLuint *shaders, glw::GLenum binaryformat, const void *binary, glw::GLsizei length) +void CallLogWrapper::glShaderBinary (glw::GLsizei count, const glw::GLuint *shaders, glw::GLenum binaryFormat, const void *binary, glw::GLsizei length) { if (m_enableLog) - m_log << TestLog::Message << "glShaderBinary(" << count << ", " << toHex(reinterpret_cast(static_cast(shaders))) << ", " << toHex(binaryformat) << ", " << binary << ", " << length << ");" << TestLog::EndMessage; - m_gl.shaderBinary(count, shaders, binaryformat, binary, length); + m_log << TestLog::Message << "glShaderBinary(" << count << ", " << toHex(reinterpret_cast(static_cast(shaders))) << ", " << toHex(binaryFormat) << ", " << binary << ", " << length << ");" << TestLog::EndMessage; + m_gl.shaderBinary(count, shaders, binaryFormat, binary, length); } void CallLogWrapper::glShaderSource (glw::GLuint shader, glw::GLsizei count, const glw::GLchar *const*string, const glw::GLint *length) diff --git a/framework/opengl/gluCallLogWrapperApi.inl b/framework/opengl/gluCallLogWrapperApi.inl index ea8bc87..a52b1e1 100644 --- a/framework/opengl/gluCallLogWrapperApi.inl +++ b/framework/opengl/gluCallLogWrapperApi.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ void glActiveShaderProgram (glw::GLuint pipeline, glw::GLuint program); void glActiveTexture (glw::GLenum texture); @@ -242,8 +242,8 @@ void glGenerateTextureMipmap (glw::GLuint texture); void glGenerateTextureMipmapEXT (glw::GLuint texture, glw::GLenum target); void glGetActiveAtomicCounterBufferiv (glw::GLuint program, glw::GLuint bufferIndex, glw::GLenum pname, glw::GLint *params); void glGetActiveAttrib (glw::GLuint program, glw::GLuint index, glw::GLsizei bufSize, glw::GLsizei *length, glw::GLint *size, glw::GLenum *type, glw::GLchar *name); -void glGetActiveSubroutineName (glw::GLuint program, glw::GLenum shadertype, glw::GLuint index, glw::GLsizei bufsize, glw::GLsizei *length, glw::GLchar *name); -void glGetActiveSubroutineUniformName (glw::GLuint program, glw::GLenum shadertype, glw::GLuint index, glw::GLsizei bufsize, glw::GLsizei *length, glw::GLchar *name); +void glGetActiveSubroutineName (glw::GLuint program, glw::GLenum shadertype, glw::GLuint index, glw::GLsizei bufSize, glw::GLsizei *length, glw::GLchar *name); +void glGetActiveSubroutineUniformName (glw::GLuint program, glw::GLenum shadertype, glw::GLuint index, glw::GLsizei bufSize, glw::GLsizei *length, glw::GLchar *name); void glGetActiveSubroutineUniformiv (glw::GLuint program, glw::GLenum shadertype, glw::GLuint index, glw::GLenum pname, glw::GLint *values); void glGetActiveUniform (glw::GLuint program, glw::GLuint index, glw::GLsizei bufSize, glw::GLsizei *length, glw::GLint *size, glw::GLenum *type, glw::GLchar *name); void glGetActiveUniformBlockName (glw::GLuint program, glw::GLuint uniformBlockIndex, glw::GLsizei bufSize, glw::GLsizei *length, glw::GLchar *uniformBlockName); @@ -279,9 +279,9 @@ void glGetInteger64i_v (glw::GLenum target, glw::GLuint index, glw:: void glGetInteger64v (glw::GLenum pname, glw::GLint64 *data); void glGetIntegeri_v (glw::GLenum target, glw::GLuint index, glw::GLint *data); void glGetIntegerv (glw::GLenum pname, glw::GLint *data); -void glGetInternalformatSampleivNV (glw::GLenum target, glw::GLenum internalformat, glw::GLsizei samples, glw::GLenum pname, glw::GLsizei bufSize, glw::GLint *params); -void glGetInternalformati64v (glw::GLenum target, glw::GLenum internalformat, glw::GLenum pname, glw::GLsizei bufSize, glw::GLint64 *params); -void glGetInternalformativ (glw::GLenum target, glw::GLenum internalformat, glw::GLenum pname, glw::GLsizei bufSize, glw::GLint *params); +void glGetInternalformatSampleivNV (glw::GLenum target, glw::GLenum internalformat, glw::GLsizei samples, glw::GLenum pname, glw::GLsizei count, glw::GLint *params); +void glGetInternalformati64v (glw::GLenum target, glw::GLenum internalformat, glw::GLenum pname, glw::GLsizei count, glw::GLint64 *params); +void glGetInternalformativ (glw::GLenum target, glw::GLenum internalformat, glw::GLenum pname, glw::GLsizei count, glw::GLint *params); void glGetMultiTexEnvfvEXT (glw::GLenum texunit, glw::GLenum target, glw::GLenum pname, glw::GLfloat *params); void glGetMultiTexEnvivEXT (glw::GLenum texunit, glw::GLenum target, glw::GLenum pname, glw::GLint *params); void glGetMultiTexGendvEXT (glw::GLenum texunit, glw::GLenum coord, glw::GLenum pname, glw::GLdouble *params); @@ -328,7 +328,7 @@ glw::GLuint glGetProgramResourceIndex (glw::GLuint program, glw::GLenum glw::GLint glGetProgramResourceLocation (glw::GLuint program, glw::GLenum programInterface, const glw::GLchar *name); glw::GLint glGetProgramResourceLocationIndex (glw::GLuint program, glw::GLenum programInterface, const glw::GLchar *name); void glGetProgramResourceName (glw::GLuint program, glw::GLenum programInterface, glw::GLuint index, glw::GLsizei bufSize, glw::GLsizei *length, glw::GLchar *name); -void glGetProgramResourceiv (glw::GLuint program, glw::GLenum programInterface, glw::GLuint index, glw::GLsizei propCount, const glw::GLenum *props, glw::GLsizei bufSize, glw::GLsizei *length, glw::GLint *params); +void glGetProgramResourceiv (glw::GLuint program, glw::GLenum programInterface, glw::GLuint index, glw::GLsizei propCount, const glw::GLenum *props, glw::GLsizei count, glw::GLsizei *length, glw::GLint *params); void glGetProgramStageiv (glw::GLuint program, glw::GLenum shadertype, glw::GLenum pname, glw::GLint *values); void glGetProgramiv (glw::GLuint program, glw::GLenum pname, glw::GLint *params); void glGetQueryBufferObjecti64v (glw::GLuint id, glw::GLuint buffer, glw::GLenum pname, glw::GLintptr offset); @@ -354,7 +354,7 @@ const glw::GLubyte * glGetString (glw::GLenum name); const glw::GLubyte * glGetStringi (glw::GLenum name, glw::GLuint index); glw::GLuint glGetSubroutineIndex (glw::GLuint program, glw::GLenum shadertype, const glw::GLchar *name); glw::GLint glGetSubroutineUniformLocation (glw::GLuint program, glw::GLenum shadertype, const glw::GLchar *name); -void glGetSynciv (glw::GLsync sync, glw::GLenum pname, glw::GLsizei bufSize, glw::GLsizei *length, glw::GLint *values); +void glGetSynciv (glw::GLsync sync, glw::GLenum pname, glw::GLsizei count, glw::GLsizei *length, glw::GLint *values); void glGetTexImage (glw::GLenum target, glw::GLint level, glw::GLenum format, glw::GLenum type, void *pixels); void glGetTexLevelParameterfv (glw::GLenum target, glw::GLint level, glw::GLenum pname, glw::GLfloat *params); void glGetTexLevelParameteriv (glw::GLenum target, glw::GLint level, glw::GLenum pname, glw::GLint *params); @@ -661,7 +661,7 @@ void glScissor (glw::GLint x, glw::GLint y, glw::GLsizei width, gl void glScissorArrayv (glw::GLuint first, glw::GLsizei count, const glw::GLint *v); void glScissorIndexed (glw::GLuint index, glw::GLint left, glw::GLint bottom, glw::GLsizei width, glw::GLsizei height); void glScissorIndexedv (glw::GLuint index, const glw::GLint *v); -void glShaderBinary (glw::GLsizei count, const glw::GLuint *shaders, glw::GLenum binaryformat, const void *binary, glw::GLsizei length); +void glShaderBinary (glw::GLsizei count, const glw::GLuint *shaders, glw::GLenum binaryFormat, const void *binary, glw::GLsizei length); void glShaderSource (glw::GLuint shader, glw::GLsizei count, const glw::GLchar *const*string, const glw::GLint *length); void glShaderStorageBlockBinding (glw::GLuint program, glw::GLuint storageBlockIndex, glw::GLuint storageBlockBinding); void glSpecializeShader (glw::GLuint shader, const glw::GLchar *pEntryPoint, glw::GLuint numSpecializationConstants, const glw::GLuint *pConstantIndex, const glw::GLuint *pConstantValue); diff --git a/framework/opengl/gluQueryUtil.inl b/framework/opengl/gluQueryUtil.inl index 23bfa82..8879ed0 100644 --- a/framework/opengl/gluQueryUtil.inl +++ b/framework/opengl/gluQueryUtil.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ int getBasicQueryNumArgsOut (int pname) diff --git a/framework/opengl/gluStrUtil.inl b/framework/opengl/gluStrUtil.inl index 204ba2e..e88d5d4 100644 --- a/framework/opengl/gluStrUtil.inl +++ b/framework/opengl/gluStrUtil.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ const char* getErrorName (int value) diff --git a/framework/opengl/gluStrUtilPrototypes.inl b/framework/opengl/gluStrUtilPrototypes.inl index 9d8dedd..74ba077 100644 --- a/framework/opengl/gluStrUtilPrototypes.inl +++ b/framework/opengl/gluStrUtilPrototypes.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ const char* getErrorName (int value); const char* getTypeName (int value); diff --git a/framework/opengl/wrapper/glwApi.inl b/framework/opengl/wrapper/glwApi.inl index 54e3110..74c263a 100644 --- a/framework/opengl/wrapper/glwApi.inl +++ b/framework/opengl/wrapper/glwApi.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ #define glActiveShaderProgram glwActiveShaderProgram #define glActiveTexture glwActiveTexture @@ -1148,8 +1148,8 @@ void glwGenerateTextureMipmap (GLuint texture); void glwGenerateTextureMipmapEXT (GLuint texture, GLenum target); void glwGetActiveAtomicCounterBufferiv (GLuint program, GLuint bufferIndex, GLenum pname, GLint *params); void glwGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -void glwGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -void glwGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); +void glwGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); +void glwGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); void glwGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values); void glwGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); void glwGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName); @@ -1185,9 +1185,9 @@ void glwGetInteger64i_v (GLenum target, GLuint index, GLint64 *data); void glwGetInteger64v (GLenum pname, GLint64 *data); void glwGetIntegeri_v (GLenum target, GLuint index, GLint *data); void glwGetIntegerv (GLenum pname, GLint *data); -void glwGetInternalformatSampleivNV (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint *params); -void glwGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params); -void glwGetInternalformativ (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params); +void glwGetInternalformatSampleivNV (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei count, GLint *params); +void glwGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint64 *params); +void glwGetInternalformativ (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint *params); void glwGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); void glwGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); void glwGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params); @@ -1234,7 +1234,7 @@ GLuint glwGetProgramResourceIndex (GLuint program, GLenum programInterfa GLint glwGetProgramResourceLocation (GLuint program, GLenum programInterface, const GLchar *name); GLint glwGetProgramResourceLocationIndex (GLuint program, GLenum programInterface, const GLchar *name); void glwGetProgramResourceName (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); -void glwGetProgramResourceiv (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params); +void glwGetProgramResourceiv (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei count, GLsizei *length, GLint *params); void glwGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values); void glwGetProgramiv (GLuint program, GLenum pname, GLint *params); void glwGetQueryBufferObjecti64v (GLuint id, GLuint buffer, GLenum pname, GLintptr offset); @@ -1260,7 +1260,7 @@ const GLubyte * glwGetString (GLenum name); const GLubyte * glwGetStringi (GLenum name, GLuint index); GLuint glwGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name); GLint glwGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name); -void glwGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); +void glwGetSynciv (GLsync sync, GLenum pname, GLsizei count, GLsizei *length, GLint *values); void glwGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, void *pixels); void glwGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params); void glwGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params); @@ -1567,7 +1567,7 @@ void glwScissor (GLint x, GLint y, GLsizei width, GLsizei height); void glwScissorArrayv (GLuint first, GLsizei count, const GLint *v); void glwScissorIndexed (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); void glwScissorIndexedv (GLuint index, const GLint *v); -void glwShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length); +void glwShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryFormat, const void *binary, GLsizei length); void glwShaderSource (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length); void glwShaderStorageBlockBinding (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding); void glwSpecializeShader (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue); diff --git a/framework/opengl/wrapper/glwEnums.inl b/framework/opengl/wrapper/glwEnums.inl index c8d01ab..3492716 100644 --- a/framework/opengl/wrapper/glwEnums.inl +++ b/framework/opengl/wrapper/glwEnums.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ #define GL_DEPTH_BUFFER_BIT 0x00000100 #define GL_STENCIL_BUFFER_BIT 0x00000400 diff --git a/framework/opengl/wrapper/glwFunctionTypes.inl b/framework/opengl/wrapper/glwFunctionTypes.inl index 152890d..010dc9c 100644 --- a/framework/opengl/wrapper/glwFunctionTypes.inl +++ b/framework/opengl/wrapper/glwFunctionTypes.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ typedef GLW_APICALL void (GLW_APIENTRY* glActiveShaderProgramFunc) (GLuint pipeline, GLuint program); typedef GLW_APICALL void (GLW_APIENTRY* glActiveTextureFunc) (GLenum texture); @@ -242,8 +242,8 @@ typedef GLW_APICALL void (GLW_APIENTRY* glGenerateTextureMipmapFunc) (G typedef GLW_APICALL void (GLW_APIENTRY* glGenerateTextureMipmapEXTFunc) (GLuint texture, GLenum target); typedef GLW_APICALL void (GLW_APIENTRY* glGetActiveAtomicCounterBufferivFunc) (GLuint program, GLuint bufferIndex, GLenum pname, GLint *params); typedef GLW_APICALL void (GLW_APIENTRY* glGetActiveAttribFunc) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef GLW_APICALL void (GLW_APIENTRY* glGetActiveSubroutineNameFunc) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -typedef GLW_APICALL void (GLW_APIENTRY* glGetActiveSubroutineUniformNameFunc) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); +typedef GLW_APICALL void (GLW_APIENTRY* glGetActiveSubroutineNameFunc) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); +typedef GLW_APICALL void (GLW_APIENTRY* glGetActiveSubroutineUniformNameFunc) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); typedef GLW_APICALL void (GLW_APIENTRY* glGetActiveSubroutineUniformivFunc) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values); typedef GLW_APICALL void (GLW_APIENTRY* glGetActiveUniformFunc) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); typedef GLW_APICALL void (GLW_APIENTRY* glGetActiveUniformBlockNameFunc) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName); @@ -279,9 +279,9 @@ typedef GLW_APICALL void (GLW_APIENTRY* glGetInteger64i_vFunc) (GLenum typedef GLW_APICALL void (GLW_APIENTRY* glGetInteger64vFunc) (GLenum pname, GLint64 *data); typedef GLW_APICALL void (GLW_APIENTRY* glGetIntegeri_vFunc) (GLenum target, GLuint index, GLint *data); typedef GLW_APICALL void (GLW_APIENTRY* glGetIntegervFunc) (GLenum pname, GLint *data); -typedef GLW_APICALL void (GLW_APIENTRY* glGetInternalformatSampleivNVFunc) (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint *params); -typedef GLW_APICALL void (GLW_APIENTRY* glGetInternalformati64vFunc) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params); -typedef GLW_APICALL void (GLW_APIENTRY* glGetInternalformativFunc) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params); +typedef GLW_APICALL void (GLW_APIENTRY* glGetInternalformatSampleivNVFunc) (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei count, GLint *params); +typedef GLW_APICALL void (GLW_APIENTRY* glGetInternalformati64vFunc) (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint64 *params); +typedef GLW_APICALL void (GLW_APIENTRY* glGetInternalformativFunc) (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint *params); typedef GLW_APICALL void (GLW_APIENTRY* glGetMultiTexEnvfvEXTFunc) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); typedef GLW_APICALL void (GLW_APIENTRY* glGetMultiTexEnvivEXTFunc) (GLenum texunit, GLenum target, GLenum pname, GLint *params); typedef GLW_APICALL void (GLW_APIENTRY* glGetMultiTexGendvEXTFunc) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params); @@ -328,7 +328,7 @@ typedef GLW_APICALL GLuint (GLW_APIENTRY* glGetProgramResourceIndexFunc) typedef GLW_APICALL GLint (GLW_APIENTRY* glGetProgramResourceLocationFunc) (GLuint program, GLenum programInterface, const GLchar *name); typedef GLW_APICALL GLint (GLW_APIENTRY* glGetProgramResourceLocationIndexFunc) (GLuint program, GLenum programInterface, const GLchar *name); typedef GLW_APICALL void (GLW_APIENTRY* glGetProgramResourceNameFunc) (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); -typedef GLW_APICALL void (GLW_APIENTRY* glGetProgramResourceivFunc) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params); +typedef GLW_APICALL void (GLW_APIENTRY* glGetProgramResourceivFunc) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei count, GLsizei *length, GLint *params); typedef GLW_APICALL void (GLW_APIENTRY* glGetProgramStageivFunc) (GLuint program, GLenum shadertype, GLenum pname, GLint *values); typedef GLW_APICALL void (GLW_APIENTRY* glGetProgramivFunc) (GLuint program, GLenum pname, GLint *params); typedef GLW_APICALL void (GLW_APIENTRY* glGetQueryBufferObjecti64vFunc) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset); @@ -354,7 +354,7 @@ typedef GLW_APICALL const GLubyte * (GLW_APIENTRY* glGetStringFunc) (G typedef GLW_APICALL const GLubyte * (GLW_APIENTRY* glGetStringiFunc) (GLenum name, GLuint index); typedef GLW_APICALL GLuint (GLW_APIENTRY* glGetSubroutineIndexFunc) (GLuint program, GLenum shadertype, const GLchar *name); typedef GLW_APICALL GLint (GLW_APIENTRY* glGetSubroutineUniformLocationFunc) (GLuint program, GLenum shadertype, const GLchar *name); -typedef GLW_APICALL void (GLW_APIENTRY* glGetSyncivFunc) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); +typedef GLW_APICALL void (GLW_APIENTRY* glGetSyncivFunc) (GLsync sync, GLenum pname, GLsizei count, GLsizei *length, GLint *values); typedef GLW_APICALL void (GLW_APIENTRY* glGetTexImageFunc) (GLenum target, GLint level, GLenum format, GLenum type, void *pixels); typedef GLW_APICALL void (GLW_APIENTRY* glGetTexLevelParameterfvFunc) (GLenum target, GLint level, GLenum pname, GLfloat *params); typedef GLW_APICALL void (GLW_APIENTRY* glGetTexLevelParameterivFunc) (GLenum target, GLint level, GLenum pname, GLint *params); @@ -661,7 +661,7 @@ typedef GLW_APICALL void (GLW_APIENTRY* glScissorFunc) (GLint x, GLi typedef GLW_APICALL void (GLW_APIENTRY* glScissorArrayvFunc) (GLuint first, GLsizei count, const GLint *v); typedef GLW_APICALL void (GLW_APIENTRY* glScissorIndexedFunc) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); typedef GLW_APICALL void (GLW_APIENTRY* glScissorIndexedvFunc) (GLuint index, const GLint *v); -typedef GLW_APICALL void (GLW_APIENTRY* glShaderBinaryFunc) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length); +typedef GLW_APICALL void (GLW_APIENTRY* glShaderBinaryFunc) (GLsizei count, const GLuint *shaders, GLenum binaryFormat, const void *binary, GLsizei length); typedef GLW_APICALL void (GLW_APIENTRY* glShaderSourceFunc) (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length); typedef GLW_APICALL void (GLW_APIENTRY* glShaderStorageBlockBindingFunc) (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding); typedef GLW_APICALL void (GLW_APIENTRY* glSpecializeShaderFunc) (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue); diff --git a/framework/opengl/wrapper/glwFunctions.inl b/framework/opengl/wrapper/glwFunctions.inl index bb89906..a20079b 100644 --- a/framework/opengl/wrapper/glwFunctions.inl +++ b/framework/opengl/wrapper/glwFunctions.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ glActiveShaderProgramFunc activeShaderProgram; glActiveTextureFunc activeTexture; diff --git a/framework/opengl/wrapper/glwImpl.inl b/framework/opengl/wrapper/glwImpl.inl index e537ee5..be2c67f 100644 --- a/framework/opengl/wrapper/glwImpl.inl +++ b/framework/opengl/wrapper/glwImpl.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ void glwActiveShaderProgram (GLuint pipeline, GLuint program) @@ -1916,20 +1916,20 @@ void glwGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei gl->getActiveAttrib(program, index, bufSize, length, size, type, name); } -void glwGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name) +void glwGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name) { const glw::Functions* gl = glw::getCurrentThreadFunctions(); if (!gl) return; - gl->getActiveSubroutineName(program, shadertype, index, bufsize, length, name); + gl->getActiveSubroutineName(program, shadertype, index, bufSize, length, name); } -void glwGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name) +void glwGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name) { const glw::Functions* gl = glw::getCurrentThreadFunctions(); if (!gl) return; - gl->getActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name); + gl->getActiveSubroutineUniformName(program, shadertype, index, bufSize, length, name); } void glwGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values) @@ -2212,28 +2212,28 @@ void glwGetIntegerv (GLenum pname, GLint *data) gl->getIntegerv(pname, data); } -void glwGetInternalformatSampleivNV (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint *params) +void glwGetInternalformatSampleivNV (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei count, GLint *params) { const glw::Functions* gl = glw::getCurrentThreadFunctions(); if (!gl) return; - gl->getInternalformatSampleivNV(target, internalformat, samples, pname, bufSize, params); + gl->getInternalformatSampleivNV(target, internalformat, samples, pname, count, params); } -void glwGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params) +void glwGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint64 *params) { const glw::Functions* gl = glw::getCurrentThreadFunctions(); if (!gl) return; - gl->getInternalformati64v(target, internalformat, pname, bufSize, params); + gl->getInternalformati64v(target, internalformat, pname, count, params); } -void glwGetInternalformativ (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params) +void glwGetInternalformativ (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint *params) { const glw::Functions* gl = glw::getCurrentThreadFunctions(); if (!gl) return; - gl->getInternalformativ(target, internalformat, pname, bufSize, params); + gl->getInternalformativ(target, internalformat, pname, count, params); } void glwGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params) @@ -2604,12 +2604,12 @@ void glwGetProgramResourceName (GLuint program, GLenum programInterface, GLuint gl->getProgramResourceName(program, programInterface, index, bufSize, length, name); } -void glwGetProgramResourceiv (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params) +void glwGetProgramResourceiv (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei count, GLsizei *length, GLint *params) { const glw::Functions* gl = glw::getCurrentThreadFunctions(); if (!gl) return; - gl->getProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params); + gl->getProgramResourceiv(program, programInterface, index, propCount, props, count, length, params); } void glwGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values) @@ -2812,12 +2812,12 @@ GLint glwGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const return gl->getSubroutineUniformLocation(program, shadertype, name); } -void glwGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values) +void glwGetSynciv (GLsync sync, GLenum pname, GLsizei count, GLsizei *length, GLint *values) { const glw::Functions* gl = glw::getCurrentThreadFunctions(); if (!gl) return; - gl->getSynciv(sync, pname, bufSize, length, values); + gl->getSynciv(sync, pname, count, length, values); } void glwGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, void *pixels) @@ -5268,12 +5268,12 @@ void glwScissorIndexedv (GLuint index, const GLint *v) gl->scissorIndexedv(index, v); } -void glwShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length) +void glwShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryFormat, const void *binary, GLsizei length) { const glw::Functions* gl = glw::getCurrentThreadFunctions(); if (!gl) return; - gl->shaderBinary(count, shaders, binaryformat, binary, length); + gl->shaderBinary(count, shaders, binaryFormat, binary, length); } void glwShaderSource (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length) diff --git a/framework/opengl/wrapper/glwInitES20.inl b/framework/opengl/wrapper/glwInitES20.inl index eeb04a4..f7c9fd5 100644 --- a/framework/opengl/wrapper/glwInitES20.inl +++ b/framework/opengl/wrapper/glwInitES20.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitES20Direct.inl b/framework/opengl/wrapper/glwInitES20Direct.inl index 19565d1..b6ceb4a 100644 --- a/framework/opengl/wrapper/glwInitES20Direct.inl +++ b/framework/opengl/wrapper/glwInitES20Direct.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeTexture = &glActiveTexture; gl->attachShader = &glAttachShader; diff --git a/framework/opengl/wrapper/glwInitES30.inl b/framework/opengl/wrapper/glwInitES30.inl index 86ff085..423034c 100644 --- a/framework/opengl/wrapper/glwInitES30.inl +++ b/framework/opengl/wrapper/glwInitES30.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitES30Direct.inl b/framework/opengl/wrapper/glwInitES30Direct.inl index c5402a5..1e72a05 100644 --- a/framework/opengl/wrapper/glwInitES30Direct.inl +++ b/framework/opengl/wrapper/glwInitES30Direct.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeTexture = &glActiveTexture; gl->attachShader = &glAttachShader; diff --git a/framework/opengl/wrapper/glwInitES31.inl b/framework/opengl/wrapper/glwInitES31.inl index c7a4d9a..de4c730 100644 --- a/framework/opengl/wrapper/glwInitES31.inl +++ b/framework/opengl/wrapper/glwInitES31.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwInitES31Direct.inl b/framework/opengl/wrapper/glwInitES31Direct.inl index bcfbfa7..59e7458 100644 --- a/framework/opengl/wrapper/glwInitES31Direct.inl +++ b/framework/opengl/wrapper/glwInitES31Direct.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeShaderProgram = &glActiveShaderProgram; gl->activeTexture = &glActiveTexture; diff --git a/framework/opengl/wrapper/glwInitES32.inl b/framework/opengl/wrapper/glwInitES32.inl index 9273879..27ae763 100644 --- a/framework/opengl/wrapper/glwInitES32.inl +++ b/framework/opengl/wrapper/glwInitES32.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwInitES32Direct.inl b/framework/opengl/wrapper/glwInitES32Direct.inl index 0c6c269..d3c799c 100644 --- a/framework/opengl/wrapper/glwInitES32Direct.inl +++ b/framework/opengl/wrapper/glwInitES32Direct.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeShaderProgram = &glActiveShaderProgram; gl->activeTexture = &glActiveTexture; diff --git a/framework/opengl/wrapper/glwInitExtES.inl b/framework/opengl/wrapper/glwInitExtES.inl index 26962da..3038483 100644 --- a/framework/opengl/wrapper/glwInitExtES.inl +++ b/framework/opengl/wrapper/glwInitExtES.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ if (de::contains(extSet, "GL_KHR_blend_equation_advanced")) diff --git a/framework/opengl/wrapper/glwInitExtGL.inl b/framework/opengl/wrapper/glwInitExtGL.inl index fb6c9c1..8729bcc 100644 --- a/framework/opengl/wrapper/glwInitExtGL.inl +++ b/framework/opengl/wrapper/glwInitExtGL.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ if (de::contains(extSet, "GL_KHR_blend_equation_advanced")) @@ -555,6 +555,16 @@ if (de::contains(extSet, "GL_EXT_direct_state_access")) gl->vertexArrayVertexOffsetEXT = (glVertexArrayVertexOffsetEXTFunc) loader->get("glVertexArrayVertexOffsetEXT"); } +if (de::contains(extSet, "GL_EXT_texture_storage")) +{ + gl->texStorage1D = (glTexStorage1DFunc) loader->get("glTexStorage1DEXT"); + gl->texStorage2D = (glTexStorage2DFunc) loader->get("glTexStorage2DEXT"); + gl->texStorage3D = (glTexStorage3DFunc) loader->get("glTexStorage3DEXT"); + gl->textureStorage1DEXT = (glTextureStorage1DEXTFunc) loader->get("glTextureStorage1DEXT"); + gl->textureStorage2DEXT = (glTextureStorage2DEXTFunc) loader->get("glTextureStorage2DEXT"); + gl->textureStorage3DEXT = (glTextureStorage3DEXTFunc) loader->get("glTextureStorage3DEXT"); +} + if (de::contains(extSet, "GL_EXT_debug_marker")) { gl->insertEventMarkerEXT = (glInsertEventMarkerEXTFunc) loader->get("glInsertEventMarkerEXT"); diff --git a/framework/opengl/wrapper/glwInitGL30.inl b/framework/opengl/wrapper/glwInitGL30.inl index 09cd500..140c109 100644 --- a/framework/opengl/wrapper/glwInitGL30.inl +++ b/framework/opengl/wrapper/glwInitGL30.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitGL31.inl b/framework/opengl/wrapper/glwInitGL31.inl index b761a2f..b27d787 100644 --- a/framework/opengl/wrapper/glwInitGL31.inl +++ b/framework/opengl/wrapper/glwInitGL31.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitGL32.inl b/framework/opengl/wrapper/glwInitGL32.inl index e4e2d90..1b7523a 100644 --- a/framework/opengl/wrapper/glwInitGL32.inl +++ b/framework/opengl/wrapper/glwInitGL32.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitGL33.inl b/framework/opengl/wrapper/glwInitGL33.inl index eb5c029..375ef21 100644 --- a/framework/opengl/wrapper/glwInitGL33.inl +++ b/framework/opengl/wrapper/glwInitGL33.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitGL40.inl b/framework/opengl/wrapper/glwInitGL40.inl index 8724d38..bf4a32d 100644 --- a/framework/opengl/wrapper/glwInitGL40.inl +++ b/framework/opengl/wrapper/glwInitGL40.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitGL41.inl b/framework/opengl/wrapper/glwInitGL41.inl index 66009eb..2246897 100644 --- a/framework/opengl/wrapper/glwInitGL41.inl +++ b/framework/opengl/wrapper/glwInitGL41.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwInitGL42.inl b/framework/opengl/wrapper/glwInitGL42.inl index 188f69a..1def4cf 100644 --- a/framework/opengl/wrapper/glwInitGL42.inl +++ b/framework/opengl/wrapper/glwInitGL42.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwInitGL43.inl b/framework/opengl/wrapper/glwInitGL43.inl index b96d717..8180385 100644 --- a/framework/opengl/wrapper/glwInitGL43.inl +++ b/framework/opengl/wrapper/glwInitGL43.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwInitGL44.inl b/framework/opengl/wrapper/glwInitGL44.inl index 2e861bd..fa3a729 100644 --- a/framework/opengl/wrapper/glwInitGL44.inl +++ b/framework/opengl/wrapper/glwInitGL44.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwInitGL45.inl b/framework/opengl/wrapper/glwInitGL45.inl index 525c40b..2f36575 100644 --- a/framework/opengl/wrapper/glwInitGL45.inl +++ b/framework/opengl/wrapper/glwInitGL45.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwInitGL46.inl b/framework/opengl/wrapper/glwInitGL46.inl index e9823f4..9113b68 100644 --- a/framework/opengl/wrapper/glwInitGL46.inl +++ b/framework/opengl/wrapper/glwInitGL46.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwVersions.inl b/framework/opengl/wrapper/glwVersions.inl index f46b1c6..4d190b1 100644 --- a/framework/opengl/wrapper/glwVersions.inl +++ b/framework/opengl/wrapper/glwVersions.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ #define GL_ES_VERSION_2_0 1 #define GL_ES_VERSION_3_0 1 diff --git a/framework/platform/null/tcuNullRenderContextFuncs.inl b/framework/platform/null/tcuNullRenderContextFuncs.inl index c717875..b20d511 100644 --- a/framework/platform/null/tcuNullRenderContextFuncs.inl +++ b/framework/platform/null/tcuNullRenderContextFuncs.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ GLW_APICALL void GLW_APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program) @@ -2075,23 +2075,23 @@ GLW_APICALL void GLW_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, G } -GLW_APICALL void GLW_APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name) +GLW_APICALL void GLW_APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name) { DE_UNREF(program); DE_UNREF(shadertype); DE_UNREF(index); - DE_UNREF(bufsize); + DE_UNREF(bufSize); DE_UNREF(length); DE_UNREF(name); } -GLW_APICALL void GLW_APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name) +GLW_APICALL void GLW_APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name) { DE_UNREF(program); DE_UNREF(shadertype); DE_UNREF(index); - DE_UNREF(bufsize); + DE_UNREF(bufSize); DE_UNREF(length); DE_UNREF(name); @@ -2365,23 +2365,23 @@ GLW_APICALL void GLW_APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLin } -GLW_APICALL void GLW_APIENTRY glGetInternalformatSampleivNV (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint *params) +GLW_APICALL void GLW_APIENTRY glGetInternalformatSampleivNV (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei count, GLint *params) { DE_UNREF(target); DE_UNREF(internalformat); DE_UNREF(samples); DE_UNREF(pname); - DE_UNREF(bufSize); + DE_UNREF(count); DE_UNREF(params); } -GLW_APICALL void GLW_APIENTRY glGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params) +GLW_APICALL void GLW_APIENTRY glGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint64 *params) { DE_UNREF(target); DE_UNREF(internalformat); DE_UNREF(pname); - DE_UNREF(bufSize); + DE_UNREF(count); DE_UNREF(params); } @@ -2793,14 +2793,14 @@ GLW_APICALL void GLW_APIENTRY glGetProgramResourceName (GLuint program, GLenum p } -GLW_APICALL void GLW_APIENTRY glGetProgramResourceiv (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params) +GLW_APICALL void GLW_APIENTRY glGetProgramResourceiv (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei count, GLsizei *length, GLint *params) { DE_UNREF(program); DE_UNREF(programInterface); DE_UNREF(index); DE_UNREF(propCount); DE_UNREF(props); - DE_UNREF(bufSize); + DE_UNREF(count); DE_UNREF(length); DE_UNREF(params); @@ -2985,11 +2985,11 @@ GLW_APICALL GLint GLW_APIENTRY glGetSubroutineUniformLocation (GLuint program, G return (GLint)0; } -GLW_APICALL void GLW_APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values) +GLW_APICALL void GLW_APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei count, GLsizei *length, GLint *values) { DE_UNREF(sync); DE_UNREF(pname); - DE_UNREF(bufSize); + DE_UNREF(count); DE_UNREF(length); DE_UNREF(values); @@ -5711,11 +5711,11 @@ GLW_APICALL void GLW_APIENTRY glScissorIndexedv (GLuint index, const GLint *v) } -GLW_APICALL void GLW_APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length) +GLW_APICALL void GLW_APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryFormat, const void *binary, GLsizei length) { DE_UNREF(count); DE_UNREF(shaders); - DE_UNREF(binaryformat); + DE_UNREF(binaryFormat); DE_UNREF(binary); DE_UNREF(length); diff --git a/framework/platform/null/tcuNullRenderContextInitFuncs.inl b/framework/platform/null/tcuNullRenderContextInitFuncs.inl index a84255a..0618850 100644 --- a/framework/platform/null/tcuNullRenderContextInitFuncs.inl +++ b/framework/platform/null/tcuNullRenderContextInitFuncs.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 9d534f9312e56c72df763207e449c6719576fd54. + * Generated from Khronos GL API description (gl.xml) revision b0643365776c260efc6317d2ff67dd8bf5078be9. */ gl->activeShaderProgram = glActiveShaderProgram; gl->activeTexture = glActiveTexture; diff --git a/modules/egl/teglGetProcAddressTests.inl b/modules/egl/teglGetProcAddressTests.inl index bd65656..3bf55e8 100644 --- a/modules/egl/teglGetProcAddressTests.inl +++ b/modules/egl/teglGetProcAddressTests.inl @@ -1145,6 +1145,7 @@ static const char* s_GL_EXT_disjoint_timer_query[] = "glDeleteQueriesEXT", "glEndQueryEXT", "glGenQueriesEXT", + "glGetInteger64vEXT", "glGetQueryObjecti64vEXT", "glGetQueryObjectivEXT", "glGetQueryObjectui64vEXT", @@ -1392,11 +1393,24 @@ static const char* s_GL_EXT_texture_buffer[] = "glTexBufferRangeEXT", }; +static const char* s_GL_EXT_texture_storage_compression[] = +{ + "glTexStorageAttribs2DEXT", + "glTexStorageAttribs3DEXT", +}; + static const char* s_GL_EXT_texture_view[] = { "glTextureViewEXT", }; +static const char* s_GL_NV_timeline_semaphore[] = +{ + "glCreateSemaphoresNV", + "glGetSemaphoreParameterivNV", + "glSemaphoreParameterivNV", +}; + static const char* s_GL_EXT_win32_keyed_mutex[] = { "glAcquireKeyedMutexWin32EXT", @@ -1477,6 +1491,12 @@ static const char* s_GL_KHR_parallel_shader_compile[] = "glMaxShaderCompilerThreadsKHR", }; +static const char* s_GL_MESA_framebuffer_flip_y[] = +{ + "glFramebufferParameteriMESA", + "glGetFramebufferParameterivMESA", +}; + static const char* s_GL_NV_bindless_texture[] = { "glGetImageHandleNV", @@ -1632,6 +1652,14 @@ static const char* s_GL_NV_memory_attachment[] = "glTextureAttachMemoryNV", }; +static const char* s_GL_NV_memory_object_sparse[] = +{ + "glBufferPageCommitmentMemNV", + "glNamedBufferPageCommitmentMemNV", + "glTexPageCommitmentMemNV", + "glTexturePageCommitmentMemNV", +}; + static const char* s_GL_NV_mesh_shader[] = { "glDrawMeshTasksNV", @@ -1911,6 +1939,17 @@ static const char* s_GL_QCOM_framebuffer_foveated[] = "glFramebufferFoveationParametersQCOM", }; +static const char* s_GL_QCOM_motion_estimation[] = +{ + "glTexEstimateMotionQCOM", + "glTexEstimateMotionRegionsQCOM", +}; + +static const char* s_GL_QCOM_frame_extrapolation[] = +{ + "glExtrapolateTex2DQCOM", +}; + static const char* s_GL_QCOM_texture_foveated[] = { "glTextureFoveationParametersQCOM", @@ -1921,6 +1960,11 @@ static const char* s_GL_QCOM_shader_framebuffer_fetch_noncoherent[] = "glFramebufferFetchBarrierQCOM", }; +static const char* s_GL_QCOM_shading_rate[] = +{ + "glShadingRateQCOM", +}; + static const struct { const char* name; @@ -2051,7 +2095,9 @@ static const struct { "GL_EXT_tessellation_shader", DE_LENGTH_OF_ARRAY(s_GL_EXT_tessellation_shader), s_GL_EXT_tessellation_shader }, { "GL_EXT_texture_border_clamp", DE_LENGTH_OF_ARRAY(s_GL_EXT_texture_border_clamp), s_GL_EXT_texture_border_clamp }, { "GL_EXT_texture_buffer", DE_LENGTH_OF_ARRAY(s_GL_EXT_texture_buffer), s_GL_EXT_texture_buffer }, + { "GL_EXT_texture_storage_compression", DE_LENGTH_OF_ARRAY(s_GL_EXT_texture_storage_compression), s_GL_EXT_texture_storage_compression }, { "GL_EXT_texture_view", DE_LENGTH_OF_ARRAY(s_GL_EXT_texture_view), s_GL_EXT_texture_view }, + { "GL_NV_timeline_semaphore", DE_LENGTH_OF_ARRAY(s_GL_NV_timeline_semaphore), s_GL_NV_timeline_semaphore }, { "GL_EXT_win32_keyed_mutex", DE_LENGTH_OF_ARRAY(s_GL_EXT_win32_keyed_mutex), s_GL_EXT_win32_keyed_mutex }, { "GL_EXT_window_rectangles", DE_LENGTH_OF_ARRAY(s_GL_EXT_window_rectangles), s_GL_EXT_window_rectangles }, { "GL_IMG_bindless_texture", DE_LENGTH_OF_ARRAY(s_GL_IMG_bindless_texture), s_GL_IMG_bindless_texture }, @@ -2062,6 +2108,7 @@ static const struct { "GL_KHR_debug", DE_LENGTH_OF_ARRAY(s_GL_KHR_debug), s_GL_KHR_debug }, { "GL_KHR_robustness", DE_LENGTH_OF_ARRAY(s_GL_KHR_robustness), s_GL_KHR_robustness }, { "GL_KHR_parallel_shader_compile", DE_LENGTH_OF_ARRAY(s_GL_KHR_parallel_shader_compile), s_GL_KHR_parallel_shader_compile }, + { "GL_MESA_framebuffer_flip_y", DE_LENGTH_OF_ARRAY(s_GL_MESA_framebuffer_flip_y), s_GL_MESA_framebuffer_flip_y }, { "GL_NV_bindless_texture", DE_LENGTH_OF_ARRAY(s_GL_NV_bindless_texture), s_GL_NV_bindless_texture }, { "GL_NV_blend_equation_advanced", DE_LENGTH_OF_ARRAY(s_GL_NV_blend_equation_advanced), s_GL_NV_blend_equation_advanced }, { "GL_NV_clip_space_w_scaling", DE_LENGTH_OF_ARRAY(s_GL_NV_clip_space_w_scaling), s_GL_NV_clip_space_w_scaling }, @@ -2081,6 +2128,7 @@ static const struct { "GL_NV_instanced_arrays", DE_LENGTH_OF_ARRAY(s_GL_NV_instanced_arrays), s_GL_NV_instanced_arrays }, { "GL_NV_internalformat_sample_query", DE_LENGTH_OF_ARRAY(s_GL_NV_internalformat_sample_query), s_GL_NV_internalformat_sample_query }, { "GL_NV_memory_attachment", DE_LENGTH_OF_ARRAY(s_GL_NV_memory_attachment), s_GL_NV_memory_attachment }, + { "GL_NV_memory_object_sparse", DE_LENGTH_OF_ARRAY(s_GL_NV_memory_object_sparse), s_GL_NV_memory_object_sparse }, { "GL_NV_mesh_shader", DE_LENGTH_OF_ARRAY(s_GL_NV_mesh_shader), s_GL_NV_mesh_shader }, { "GL_NV_non_square_matrices", DE_LENGTH_OF_ARRAY(s_GL_NV_non_square_matrices), s_GL_NV_non_square_matrices }, { "GL_NV_path_rendering", DE_LENGTH_OF_ARRAY(s_GL_NV_path_rendering), s_GL_NV_path_rendering }, @@ -2109,6 +2157,9 @@ static const struct { "GL_OVR_multiview_multisampled_render_to_texture", DE_LENGTH_OF_ARRAY(s_GL_OVR_multiview_multisampled_render_to_texture), s_GL_OVR_multiview_multisampled_render_to_texture }, { "GL_QCOM_alpha_test", DE_LENGTH_OF_ARRAY(s_GL_QCOM_alpha_test), s_GL_QCOM_alpha_test }, { "GL_QCOM_framebuffer_foveated", DE_LENGTH_OF_ARRAY(s_GL_QCOM_framebuffer_foveated), s_GL_QCOM_framebuffer_foveated }, + { "GL_QCOM_motion_estimation", DE_LENGTH_OF_ARRAY(s_GL_QCOM_motion_estimation), s_GL_QCOM_motion_estimation }, + { "GL_QCOM_frame_extrapolation", DE_LENGTH_OF_ARRAY(s_GL_QCOM_frame_extrapolation), s_GL_QCOM_frame_extrapolation }, { "GL_QCOM_texture_foveated", DE_LENGTH_OF_ARRAY(s_GL_QCOM_texture_foveated), s_GL_QCOM_texture_foveated }, { "GL_QCOM_shader_framebuffer_fetch_noncoherent", DE_LENGTH_OF_ARRAY(s_GL_QCOM_shader_framebuffer_fetch_noncoherent), s_GL_QCOM_shader_framebuffer_fetch_noncoherent }, + { "GL_QCOM_shading_rate", DE_LENGTH_OF_ARRAY(s_GL_QCOM_shading_rate), s_GL_QCOM_shading_rate }, }; diff --git a/scripts/opengl/gen_call_log_wrapper.py b/scripts/opengl/gen_call_log_wrapper.py index 9d9dbc5..3f1bfe8 100644 --- a/scripts/opengl/gen_call_log_wrapper.py +++ b/scripts/opengl/gen_call_log_wrapper.py @@ -167,7 +167,7 @@ CALL_LOG_SPECS = { # wrapper from attempting to print the argument as a C string. }, argOutPrints = {2: booleanPointer(size = "getIndexedQueryNumArgsOut(target)")}), - "glGetInternalformativ": LogSpec({0: enum("InternalFormatTarget"), 1: enum("UncompressedTextureFormat"), 2: enum("InternalFormatParameter")}, argOutPrints = {4: pointer(size = "bufSize")}), + "glGetInternalformativ": LogSpec({0: enum("InternalFormatTarget"), 1: enum("UncompressedTextureFormat"), 2: enum("InternalFormatParameter")}, argOutPrints = {4: pointer(size = "count")}), "glGetMultisamplefv": LogSpec({0: enum("MultisampleParameter")}, argOutPrints = {2: pointer(size = "2")}), "glGetPointerv": LogSpec({0: enum("PointerState")}, argOutPrints = {1: pointer(size = "1")}), "glGetProgramiv": LogSpec({1: enum("ProgramParam")}, argOutPrints = {2: pointer(size = "getProgramQueryNumArgsOut(pname)")}), @@ -343,7 +343,7 @@ CALL_LOG_SPECS = { argOutPrints = { 6: pointer(size = "1"), - 7: pointer(size = "((length == DE_NULL) ? (bufSize) : ((bufSize < *length) ? (bufSize) : (*length)))") + 7: pointer(size = "((length == DE_NULL) ? (count) : ((count < *length) ? (count) : (*length)))") }), "glDebugMessageInsert": LogSpec({0: enum("DebugMessageSource"), 1: enum("DebugMessageType"), 3: enum("DebugMessageSeverity")}), "glDebugMessageControl": LogSpec({0: enum("DebugMessageSource"), 1: enum("DebugMessageType"), 2: enum("DebugMessageSeverity"), 4: pointer(size = "(count)")}), diff --git a/scripts/opengl/src_util.py b/scripts/opengl/src_util.py index 6c4a7fd..9316c34 100644 --- a/scripts/opengl/src_util.py +++ b/scripts/opengl/src_util.py @@ -38,8 +38,8 @@ OPENGL_INC_DIR = os.path.join(OPENGL_DIR, "wrapper") GL_SOURCE = khr_util.registry_cache.RegistrySource( "https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry", "xml/gl.xml", - "9d534f9312e56c72df763207e449c6719576fd54", - "245e90331c83c4c743a2b9d0dad51e27a699f2040ebd34dd5338637adf276752") + "b0643365776c260efc6317d2ff67dd8bf5078be9", + "8b4fd055e2ced6e02dd08ac644e55eaf2c0735d087b37138d831c3e000e04e62") EXTENSIONS = [ 'GL_KHR_texture_compression_astc_ldr',