[Mesa-dev] [PATCH v2] mesa: expose NV_conditional_render on GLES

Erik Faye-Lund erik.faye-lund at collabora.com
Wed Nov 7 21:19:49 UTC 2018


The extension spec has been updated to include GLES 2 support, so let's
enable it there.

Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
---
Here's a V2 of this patch. The only difference is that this also expose
the extension on ES2. The piglit patches has also been updated:
https://patchwork.freedesktop.org/series/52039/

 src/mapi/glapi/gen/NV_conditional_render.xml | 4 ++--
 src/mesa/main/extensions_table.h             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mapi/glapi/gen/NV_conditional_render.xml b/src/mapi/glapi/gen/NV_conditional_render.xml
index 926b2629412..4b28c466f7d 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 a516a1b17f8..04a319271e0 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -345,7 +345,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)
-- 
2.19.1



More information about the mesa-dev mailing list