summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorErik Faye-Lund <[email protected]>2018-11-01 13:28:25 +0100
committerErik Faye-Lund <[email protected]>2019-01-30 09:43:44 +0100
commit3b6f95ad666eafafe74f2729f085caf5a36128d4 (patch)
treefb3513b0cc8a01ccd12737847bd87bd943246819 /src/mesa
parent90458bef544ac46a912f06e73f71c3cb20fdaaf6 (diff)
mesa: expose NV_conditional_render on GLES
The extension spec has been updated to include GLES 2 support, so let's enable it there. v2: fixup ABI-check as well Signed-off-by: Erik Faye-Lund <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/extensions_table.h2
-rw-r--r--src/mesa/main/tests/dispatch_sanity.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 01c3c9b78e6..7554db1da6b 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -350,7 +350,7 @@ EXT(MESA_ycbcr_texture , MESA_ycbcr_texture
EXT(NVX_gpu_memory_info , NVX_gpu_memory_info , GLL, GLC, x , x , 2013)
EXT(NV_blend_square , dummy_true , GLL, x , x , x , 1999)
-EXT(NV_conditional_render , NV_conditional_render , GLL, GLC, x , x , 2008)
+EXT(NV_conditional_render , NV_conditional_render , GLL, GLC, x , ES2, 2008)
EXT(NV_conservative_raster , NV_conservative_raster , GLL, GLC, ES1, ES2, 2015)
EXT(NV_conservative_raster_dilate , NV_conservative_raster_dilate , GLL, GLC, ES1, ES2, 2015)
EXT(NV_conservative_raster_pre_snap , NV_conservative_raster_pre_snap , GLL, GLC, ES1, ES2, 2017)
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index 307639a4a4e..672e4ce892a 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -2227,6 +2227,10 @@ const struct function gles2_functions_possible[] = {
/* GL_EXT_shader_framebuffer_fetch_non_coherent */
{ "glFramebufferFetchBarrierEXT", 20, -1 },
+ /* GL_NV_conditional_render */
+ { "glBeginConditionalRenderNV", 20, -1 },
+ { "glEndConditionalRenderNV", 20, -1 },
+
/* GL_NV_conservative_raster */
{ "glSubpixelPrecisionBiasNV", 20, -1 },