Revert "mesa/main: fixup make check after NV_conditional_render for gles"

This reverts commit cccd7a253f9ed14ea748a222f58b0e5c895eb939.

diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check
index 8f601a0603ccabbf1c17d57753999b4eca57182c..a04b03d7d6006ad7f2cc5e48dcc36c2e7cdd5614 100755 (executable)
--- a/src/mapi/es2api/ABI-check
+++ b/src/mapi/es2api/ABI-check
@@ -28,7 +28,6 @@ FUNCS=$($NM -D --defined-only $LIB | grep -o 'T gl.*' | cut -c 3- | while read f
 glActiveShaderProgram
 glActiveTexture
 glAttachShader
-glBeginConditionalRenderNV
 glBeginQuery
 glBeginTransformFeedback
 glBindAttribLocation
@@ -124,7 +123,6 @@ glEGLImageTargetTexture2DOES
 glEnable
 glEnableVertexAttribArray
 glEnablei
-glEndConditionalRenderNV
 glEndQuery
 glEndTransformFeedback
 glFenceSync

diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index c5d75f9683ee0511cb9289c610ea95fecfd75773..fb2acfbdeeadc5fc8c7815b35c982995a73cdb19 100644 (file)
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -2236,10 +2236,6 @@ const struct function gles2_functions_possible[] = {
    /* GL_NV_conservative_raster_pre_snap_triangles */
    { "glConservativeRasterParameteriNV", 20, -1 },
 
-   /* GL_NV_conditional_render */
-   { "glBeginConditionalRenderNV", 20, -1 },
-   { "glEndConditionalRenderNV", 20, -1 },
-
    { NULL, 0, -1 }
 };