From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Thu, 1 Nov 2018 12:28:25 +0000 (+0100)
Subject: mesa: expose NV_conditional_render on GLES
X-Git-Tag: upstream/19.3.0~10128
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b6f95ad666eafafe74f2729f085caf5a36128d4;p=platform%2Fupstream%2Fmesa.git

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 <erik.faye-lund@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/src/mapi/glapi/gen/NV_conditional_render.xml b/src/mapi/glapi/gen/NV_conditional_render.xml
index 926b262..4b28c46 100644
--- a/src/mapi/glapi/gen/NV_conditional_render.xml
+++ b/src/mapi/glapi/gen/NV_conditional_render.xml
@@ -13,12 +13,12 @@
     <enum name="QUERY_BY_REGION_WAIT_NV"     value="0x8E15"/>
     <enum name="QUERY_BY_REGION_NO_WAIT_NV"  value="0x8E16"/>
 
-    <function name="BeginConditionalRenderNV" alias="BeginConditionalRender">
+    <function name="BeginConditionalRenderNV" alias="BeginConditionalRender" es2="2.0">
 	<param name="query" type="GLuint"/>
 	<param name="mode" type="GLenum"/>
     </function>
 
-    <function name="EndConditionalRenderNV" alias="EndConditionalRender">
+    <function name="EndConditionalRenderNV" alias="EndConditionalRender" es2="2.0">
     </function>
 
 </category>
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 01c3c9b..7554db1 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 307639a..672e4ce 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 },