Mesa (master): Revert "mesa/main: fixup make check after NV_conditional_render for gles"

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: cf8b271cbe69d8ac9013cc46e6f1d37ead0bc229
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf8b271cbe69d8ac9013cc46e6f1d37ead0bc229

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Fri Nov  9 17:39:22 2018 +0100

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

This reverts commit cccd7a253f9ed14ea748a222f58b0e5c895eb939.

---

 src/mapi/es2api/ABI-check               | 2 --
 src/mesa/main/tests/dispatch_sanity.cpp | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check
index 8f601a0603..a04b03d7d6 100755
--- 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 c5d75f9683..fb2acfbdee 100644
--- 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 }
 };