mesa: remove duplicate dispatch sanity tests

This removes duplicate tests from gl_core_functions_possible
that are already covered by common_desktop_functions_possible.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index 449dd3652cc1e68da19ba054b42e5d89b344645d..63c687c46fca40685cf3a4cd3898ba3d6cb38895 100644 (file)
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -1681,271 +1681,6 @@ const struct function gl_compatibility_functions_possible[] = {
 };
 
 const struct function gl_core_functions_possible[] = {
-   /* GL 3.2 */
-   { "glFramebufferTexture", 32, -1 },
-
-   /* GL 4.3 */
-   { "glIsRenderbuffer", 43, -1 },
-   { "glBindRenderbuffer", 43, -1 },
-   { "glDeleteRenderbuffers", 43, -1 },
-   { "glGenRenderbuffers", 43, -1 },
-   { "glRenderbufferStorage", 43, -1 },
-   { "glGetRenderbufferParameteriv", 43, -1 },
-   { "glIsFramebuffer", 43, -1 },
-   { "glBindFramebuffer", 43, -1 },
-   { "glDeleteFramebuffers", 43, -1 },
-   { "glGenFramebuffers", 43, -1 },
-   { "glCheckFramebufferStatus", 43, -1 },
-   { "glFramebufferTexture1D", 43, -1 },
-   { "glFramebufferTexture2D", 43, -1 },
-   { "glFramebufferTexture3D", 43, -1 },
-   { "glFramebufferRenderbuffer", 43, -1 },
-   { "glGetFramebufferAttachmentParameteriv", 43, -1 },
-   { "glGenerateMipmap", 43, -1 },
-   { "glBlitFramebuffer", 43, -1 },
-   { "glRenderbufferStorageMultisample", 43, -1 },
-   { "glFramebufferTextureLayer", 43, -1 },
-   { "glMapBufferRange", 43, -1 },
-   { "glFlushMappedBufferRange", 43, -1 },
-   { "glBindVertexArray", 43, -1 },
-   { "glDeleteVertexArrays", 43, -1 },
-   { "glGenVertexArrays", 43, -1 },
-   { "glIsVertexArray", 43, -1 },
-   { "glGetUniformIndices", 43, -1 },
-   { "glGetActiveUniformsiv", 43, -1 },
-   { "glGetActiveUniformName", 43, -1 },
-   { "glGetUniformBlockIndex", 43, -1 },
-   { "glGetActiveUniformBlockiv", 43, -1 },
-   { "glGetActiveUniformBlockName", 43, -1 },
-   { "glUniformBlockBinding", 43, -1 },
-   { "glCopyBufferSubData", 43, -1 },
-   { "glDrawElementsBaseVertex", 43, -1 },
-   { "glDrawRangeElementsBaseVertex", 43, -1 },
-   { "glDrawElementsInstancedBaseVertex", 43, -1 },
-   { "glMultiDrawElementsBaseVertex", 43, -1 },
-   { "glProvokingVertex", 43, -1 },
-   { "glFenceSync", 43, -1 },
-   { "glIsSync", 43, -1 },
-   { "glDeleteSync", 43, -1 },
-   { "glClientWaitSync", 43, -1 },
-   { "glWaitSync", 43, -1 },
-   { "glGetInteger64v", 43, -1 },
-   { "glGetSynciv", 43, -1 },
-   { "glTexImage2DMultisample", 43, -1 },
-   { "glTexImage3DMultisample", 43, -1 },
-   { "glGetMultisamplefv", 43, -1 },
-   { "glSampleMaski", 43, -1 },
-   { "glBlendEquationiARB", 43, -1 },
-   { "glBlendEquationSeparateiARB", 43, -1 },
-   { "glBlendFunciARB", 43, -1 },
-   { "glBlendFuncSeparateiARB", 43, -1 },
-   { "glMinSampleShadingARB", 43, -1 },                 // XXX: Add to xml
-// { "glNamedStringARB", 43, -1 },                      // XXX: Add to xml
-// { "glDeleteNamedStringARB", 43, -1 },                // XXX: Add to xml
-// { "glCompileShaderIncludeARB", 43, -1 },             // XXX: Add to xml
-// { "glIsNamedStringARB", 43, -1 },                    // XXX: Add to xml
-// { "glGetNamedStringARB", 43, -1 },                   // XXX: Add to xml
-// { "glGetNamedStringivARB", 43, -1 },                 // XXX: Add to xml
-   { "glBindFragDataLocationIndexed", 43, -1 },
-   { "glGetFragDataIndex", 43, -1 },
-   { "glGenSamplers", 43, -1 },
-   { "glDeleteSamplers", 43, -1 },
-   { "glIsSampler", 43, -1 },
-   { "glBindSampler", 43, -1 },
-   { "glSamplerParameteri", 43, -1 },
-   { "glSamplerParameteriv", 43, -1 },
-   { "glSamplerParameterf", 43, -1 },
-   { "glSamplerParameterfv", 43, -1 },
-   { "glSamplerParameterIiv", 43, -1 },
-   { "glSamplerParameterIuiv", 43, -1 },
-   { "glGetSamplerParameteriv", 43, -1 },
-   { "glGetSamplerParameterIiv", 43, -1 },
-   { "glGetSamplerParameterfv", 43, -1 },
-   { "glGetSamplerParameterIuiv", 43, -1 },
-   { "glQueryCounter", 43, -1 },
-   { "glGetQueryObjecti64v", 43, -1 },
-   { "glGetQueryObjectui64v", 43, -1 },
-   { "glVertexP2ui", 43, -1 },
-   { "glVertexP2uiv", 43, -1 },
-   { "glVertexP3ui", 43, -1 },
-   { "glVertexP3uiv", 43, -1 },
-   { "glVertexP4ui", 43, -1 },
-   { "glVertexP4uiv", 43, -1 },
-   { "glTexCoordP1ui", 43, -1 },
-   { "glTexCoordP1uiv", 43, -1 },
-   { "glTexCoordP2ui", 43, -1 },
-   { "glTexCoordP2uiv", 43, -1 },
-   { "glTexCoordP3ui", 43, -1 },
-   { "glTexCoordP3uiv", 43, -1 },
-   { "glTexCoordP4ui", 43, -1 },
-   { "glTexCoordP4uiv", 43, -1 },
-   { "glMultiTexCoordP1ui", 43, -1 },
-   { "glMultiTexCoordP1uiv", 43, -1 },
-   { "glMultiTexCoordP2ui", 43, -1 },
-   { "glMultiTexCoordP2uiv", 43, -1 },
-   { "glMultiTexCoordP3ui", 43, -1 },
-   { "glMultiTexCoordP3uiv", 43, -1 },
-   { "glMultiTexCoordP4ui", 43, -1 },
-   { "glMultiTexCoordP4uiv", 43, -1 },
-   { "glNormalP3ui", 43, -1 },
-   { "glNormalP3uiv", 43, -1 },
-   { "glColorP3ui", 43, -1 },
-   { "glColorP3uiv", 43, -1 },
-   { "glColorP4ui", 43, -1 },
-   { "glColorP4uiv", 43, -1 },
-   { "glVertexAttribP1ui", 43, -1 },
-   { "glVertexAttribP1uiv", 43, -1 },
-   { "glVertexAttribP2ui", 43, -1 },
-   { "glVertexAttribP2uiv", 43, -1 },
-   { "glVertexAttribP3ui", 43, -1 },
-   { "glVertexAttribP3uiv", 43, -1 },
-   { "glVertexAttribP4ui", 43, -1 },
-   { "glVertexAttribP4uiv", 43, -1 },
-   { "glDrawArraysIndirect", 43, -1 },
-   { "glDrawElementsIndirect", 43, -1 },
-
-   { "glBindTransformFeedback", 43, -1 },
-   { "glDeleteTransformFeedbacks", 43, -1 },
-   { "glGenTransformFeedbacks", 43, -1 },
-   { "glIsTransformFeedback", 43, -1 },
-   { "glPauseTransformFeedback", 43, -1 },
-   { "glResumeTransformFeedback", 43, -1 },
-   { "glDrawTransformFeedback", 43, -1 },
-   { "glDrawTransformFeedbackStream", 43, -1 },
-   { "glBeginQueryIndexed", 43, -1 },
-   { "glEndQueryIndexed", 43, -1 },
-   { "glGetQueryIndexediv", 43, -1 },
-   { "glReleaseShaderCompiler", 43, -1 },
-   { "glShaderBinary", 43, -1 },
-   { "glGetShaderPrecisionFormat", 43, -1 },
-   { "glDepthRangef", 43, -1 },
-   { "glClearDepthf", 43, -1 },
-   { "glGetProgramBinary", 43, -1 },
-   { "glProgramBinary", 43, -1 },
-   { "glProgramParameteri", 43, -1 },
-   { "glUseProgramStages", 43, -1 },
-   { "glActiveShaderProgram", 43, -1 },
-   { "glCreateShaderProgramv", 43, -1 },
-   { "glBindProgramPipeline", 43, -1 },
-   { "glDeleteProgramPipelines", 43, -1 },
-   { "glGenProgramPipelines", 43, -1 },
-   { "glIsProgramPipeline", 43, -1 },
-   { "glGetProgramPipelineiv", 43, -1 },
-   { "glProgramUniform1i", 43, -1 },
-   { "glProgramUniform1iv", 43, -1 },
-   { "glProgramUniform1f", 43, -1 },
-   { "glProgramUniform1fv", 43, -1 },
-   { "glProgramUniform1d", 40, -1 },
-   { "glProgramUniform1dv", 40, -1 },
-   { "glProgramUniform1ui", 43, -1 },
-   { "glProgramUniform1uiv", 43, -1 },
-   { "glProgramUniform2i", 43, -1 },
-   { "glProgramUniform2iv", 43, -1 },
-   { "glProgramUniform2f", 43, -1 },
-   { "glProgramUniform2fv", 43, -1 },
-   { "glProgramUniform2d", 40, -1 },
-   { "glProgramUniform2dv", 40, -1 },
-   { "glProgramUniform2ui", 43, -1 },
-   { "glProgramUniform2uiv", 43, -1 },
-   { "glProgramUniform3i", 43, -1 },
-   { "glProgramUniform3iv", 43, -1 },
-   { "glProgramUniform3f", 43, -1 },
-   { "glProgramUniform3fv", 43, -1 },
-   { "glProgramUniform3d", 40, -1 },
-   { "glProgramUniform3dv", 40, -1 },
-   { "glProgramUniform3ui", 43, -1 },
-   { "glProgramUniform3uiv", 43, -1 },
-   { "glProgramUniform4i", 43, -1 },
-   { "glProgramUniform4iv", 43, -1 },
-   { "glProgramUniform4f", 43, -1 },
-   { "glProgramUniform4fv", 43, -1 },
-   { "glProgramUniform4d", 40, -1 },
-   { "glProgramUniform4dv", 40, -1 },
-   { "glProgramUniform4ui", 43, -1 },
-   { "glProgramUniform4uiv", 43, -1 },
-   { "glProgramUniformMatrix2fv", 43, -1 },
-   { "glProgramUniformMatrix3fv", 43, -1 },
-   { "glProgramUniformMatrix4fv", 43, -1 },
-   { "glProgramUniformMatrix2dv", 40, -1 },
-   { "glProgramUniformMatrix3dv", 40, -1 },
-   { "glProgramUniformMatrix4dv", 40, -1 },
-   { "glProgramUniformMatrix2x3fv", 43, -1 },
-   { "glProgramUniformMatrix3x2fv", 43, -1 },
-   { "glProgramUniformMatrix2x4fv", 43, -1 },
-   { "glProgramUniformMatrix4x2fv", 43, -1 },
-   { "glProgramUniformMatrix3x4fv", 43, -1 },
-   { "glProgramUniformMatrix4x3fv", 43, -1 },
-   { "glProgramUniformMatrix2x3dv", 40, -1 },
-   { "glProgramUniformMatrix3x2dv", 40, -1 },
-   { "glProgramUniformMatrix2x4dv", 40, -1 },
-   { "glProgramUniformMatrix4x2dv", 40, -1 },
-   { "glProgramUniformMatrix3x4dv", 40, -1 },
-   { "glProgramUniformMatrix4x3dv", 40, -1 },
-   { "glValidateProgramPipeline", 43, -1 },
-   { "glGetProgramPipelineInfoLog", 43, -1 },
-
-// { "glCreateSyncFromCLeventARB", 43, -1 },            // XXX: Add to xml
-
-   { "glDrawArraysInstancedBaseInstance", 43, -1 },
-   { "glDrawElementsInstancedBaseInstance", 43, -1 },
-   { "glDrawElementsInstancedBaseVertexBaseInstance", 43, -1 },
-   { "glDrawTransformFeedbackInstanced", 43, -1 },
-   { "glDrawTransformFeedbackStreamInstanced", 43, -1 },
-   { "glGetActiveAtomicCounterBufferiv", 43, -1 },
-   { "glBindImageTexture", 43, -1 },
-   { "glMemoryBarrier", 43, -1 },
-   { "glTexStorage1D", 43, -1 },
-   { "glTexStorage2D", 43, -1 },
-   { "glTexStorage3D", 43, -1 },
-   { "glTextureStorage1DEXT", 43, -1 },
-   { "glTextureStorage2DEXT", 43, -1 },
-   { "glTextureStorage3DEXT", 43, -1 },
-   { "glClearBufferData", 43, -1 },
-   { "glClearBufferSubData", 43, -1 },
-// { "glClearNamedBufferDataEXT", 43, -1 },             // XXX: Add to xml
-// { "glClearNamedBufferSubDataEXT", 43, -1 },          // XXX: Add to xml
-   { "glCopyImageSubData", 43, -1 },
-   { "glTextureView", 43, -1 },
-   { "glBindVertexBuffer", 43, -1 },
-   { "glVertexAttribFormat", 43, -1 },
-   { "glVertexAttribIFormat", 43, -1 },
-   { "glVertexAttribBinding", 43, -1 },
-   { "glVertexBindingDivisor", 43, -1 },
-// { "glVertexArrayBindVertexBufferEXT", 43, -1 },      // XXX: Add to xml
-// { "glVertexArrayVertexAttribFormatEXT", 43, -1 },    // XXX: Add to xml
-// { "glVertexArrayVertexAttribIFormatEXT", 43, -1 },   // XXX: Add to xml
-// { "glVertexArrayVertexAttribLFormatEXT", 43, -1 },   // XXX: Add to xml
-// { "glVertexArrayVertexAttribBindingEXT", 43, -1 },   // XXX: Add to xml
-// { "glVertexArrayVertexBindingDivisorEXT", 43, -1 },  // XXX: Add to xml
-// { "glFramebufferParameteri", 43, -1 },               // XXX: Add to xml
-// { "glGetFramebufferParameteriv", 43, -1 },           // XXX: Add to xml
-// { "glNamedFramebufferParameteriEXT", 43, -1 },       // XXX: Add to xml
-// { "glGetNamedFramebufferParameterivEXT", 43, -1 },   // XXX: Add to xml
-// { "glGetInternalformati64v", 43, -1 },               // XXX: Add to xml
-   { "glInvalidateTexSubImage", 43, -1 },
-   { "glInvalidateTexImage", 43, -1 },
-   { "glInvalidateBufferSubData", 43, -1 },
-   { "glInvalidateBufferData", 43, -1 },
-   { "glInvalidateFramebuffer", 43, -1 },
-   { "glInvalidateSubFramebuffer", 43, -1 },
-   { "glMultiDrawArraysIndirect", 43, -1 },
-   { "glMultiDrawElementsIndirect", 43, -1 },
-   { "glGetProgramInterfaceiv", 43, -1 },
-   { "glGetProgramResourceIndex", 43, -1 },
-   { "glGetProgramResourceName", 43, -1 },
-   { "glGetProgramResourceiv", 43, -1 },
-   { "glGetProgramResourceLocation", 43, -1 },
-   { "glGetProgramResourceLocationIndex", 43, -1 },
-// { "glShaderStorageBlockBinding", 43, -1 },           // XXX: Add to xml
-// { "glTextureBufferRangeEXT", 43, -1 },               // XXX: Add to xml
-   { "glTexStorage2DMultisample", 43, -1 },
-   { "glTexStorage3DMultisample", 43, -1 },
-// { "glTextureStorage2DMultisampleEXT", 43, -1 },      // XXX: Add to xml
-// { "glTextureStorage3DMultisampleEXT", 43, -1 },      // XXX: Add to xml
-
-/* GL 4.5 */
-   { "glMemoryBarrierByRegion", 45, -1 },
-
    /* GL_ARB_ES3_2_compatibility */
    { "glPrimitiveBoundingBoxARB", 45, -1 },