Module: Mesa
Branch: master
Commit: b55af392d9e81e6c1e06536c22d434f275c429f4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b55af392d9e81e6c1e06536c22d434f275c429f4
Author: Erik Faye-Lund <erik.faye-l...@collabora.com>
Date: Fri Nov 9 17:39:25 2018 +0100
Revert "mesa: expose NV_conditional_render on GLES"
This reverts commit 5213be9fab72548c799b30e320dd1b257534f096.
---
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 4b28c466f7..926b262941 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"
es2="2.0">
+ <function name="BeginConditionalRenderNV" alias="BeginConditionalRender">
<param name="query" type="GLuint"/>
<param name="mode" type="GLenum"/>
</function>
- <function name="EndConditionalRenderNV" alias="EndConditionalRender"
es2="2.0">
+ <function name="EndConditionalRenderNV" alias="EndConditionalRender">
</function>
</category>
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 04a319271e..a516a1b17f 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 , ES2, 2008)
+EXT(NV_conditional_render , NV_conditional_render
, GLL, GLC, x , x , 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)
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
