Mesa (master): mesa: expose NV_conditional_render on GLES
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Nov 9 12:04:04 UTC 2018
Module: Mesa
Branch: master
Commit: 5213be9fab72548c799b30e320dd1b257534f096
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5213be9fab72548c799b30e320dd1b257534f096
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Thu Nov 1 13:28:25 2018 +0100
mesa: expose NV_conditional_render on GLES
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>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
---
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 926b262941..4b28c466f7 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 a516a1b17f..04a319271e 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)
More information about the mesa-commit
mailing list