summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorErik Faye-Lund <[email protected]>2018-11-09 17:39:22 +0100
committerErik Faye-Lund <[email protected]>2018-11-09 17:39:22 +0100
commitcf8b271cbe69d8ac9013cc46e6f1d37ead0bc229 (patch)
tree07cf986127ae6d17c4e0ff775f9eb4ed9d5af144 /src
parentcccd7a253f9ed14ea748a222f58b0e5c895eb939 (diff)
Revert "mesa/main: fixup make check after NV_conditional_render for gles"
This reverts commit cccd7a253f9ed14ea748a222f58b0e5c895eb939.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/mapi/es2api/ABI-check2
-rw-r--r--src/mesa/main/tests/dispatch_sanity.cpp4
2 files changed, 0 insertions, 6 deletions
diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check
index 8f601a0603c..a04b03d7d60 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 c5d75f9683e..fb2acfbdeea 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 }
};