<div dir="ltr"><div>Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>></div><div><br></div><div>Marek<br></div></div><br><div class="gmail_quote"><div dir="ltr">On Wed, Nov 7, 2018 at 4:19 PM Erik Faye-Lund <<a href="mailto:erik.faye-lund@collabora.com">erik.faye-lund@collabora.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The extension spec has been updated to include GLES 2 support, so let's<br>
enable it there.<br>
<br>
Signed-off-by: Erik Faye-Lund <<a href="mailto:erik.faye-lund@collabora.com" target="_blank">erik.faye-lund@collabora.com</a>><br>
---<br>
Here's a V2 of this patch. The only difference is that this also expose<br>
the extension on ES2. The piglit patches has also been updated:<br>
<a href="https://patchwork.freedesktop.org/series/52039/" rel="noreferrer" target="_blank">https://patchwork.freedesktop.org/series/52039/</a><br>
<br>
 src/mapi/glapi/gen/NV_conditional_render.xml | 4 ++--<br>
 src/mesa/main/extensions_table.h             | 2 +-<br>
 2 files changed, 3 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/src/mapi/glapi/gen/NV_conditional_render.xml b/src/mapi/glapi/gen/NV_conditional_render.xml<br>
index 926b2629412..4b28c466f7d 100644<br>
--- a/src/mapi/glapi/gen/NV_conditional_render.xml<br>
+++ b/src/mapi/glapi/gen/NV_conditional_render.xml<br>
@@ -13,12 +13,12 @@<br>
     <enum name="QUERY_BY_REGION_WAIT_NV"     value="0x8E15"/><br>
     <enum name="QUERY_BY_REGION_NO_WAIT_NV"  value="0x8E16"/><br>
<br>
-    <function name="BeginConditionalRenderNV" alias="BeginConditionalRender"><br>
+    <function name="BeginConditionalRenderNV" alias="BeginConditionalRender" es2="2.0"><br>
        <param name="query" type="GLuint"/><br>
        <param name="mode" type="GLenum"/><br>
     </function><br>
<br>
-    <function name="EndConditionalRenderNV" alias="EndConditionalRender"><br>
+    <function name="EndConditionalRenderNV" alias="EndConditionalRender" es2="2.0"><br>
     </function><br>
<br>
 </category><br>
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h<br>
index a516a1b17f8..04a319271e0 100644<br>
--- a/src/mesa/main/extensions_table.h<br>
+++ b/src/mesa/main/extensions_table.h<br>
@@ -345,7 +345,7 @@ EXT(MESA_ycbcr_texture                      , MESA_ycbcr_texture<br>
 EXT(NVX_gpu_memory_info                     , NVX_gpu_memory_info                    , GLL, GLC,  x ,  x , 2013)<br>
<br>
 EXT(NV_blend_square                         , dummy_true                             , GLL,  x ,  x ,  x , 1999)<br>
-EXT(NV_conditional_render                   , NV_conditional_render                  , GLL, GLC,  x ,  x , 2008)<br>
+EXT(NV_conditional_render                   , NV_conditional_render                  , GLL, GLC,  x , ES2, 2008)<br>
 EXT(NV_conservative_raster                  , NV_conservative_raster                 , GLL, GLC, ES1, ES2, 2015)<br>
 EXT(NV_conservative_raster_dilate           , NV_conservative_raster_dilate          , GLL, GLC, ES1, ES2, 2015)<br>
 EXT(NV_conservative_raster_pre_snap         , NV_conservative_raster_pre_snap        , GLL, GLC, ES1, ES2, 2017)<br>
-- <br>
2.19.1<br>
<br>
</blockquote></div>