Module: Mesa
Branch: master
Commit: 2ad9d6237a510ec2acd0d416c34fe6e231460182
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ad9d6237a510ec2acd0d416c34fe6e231460182
Author: Adam Jackson <a...@redhat.com>
Date: Wed May 4 14:32:38 2016 -0400
glapi/gen: Copy some GL 1.0 enum details into ARB_viewport_array
Otherwise the instances in the extension XML override the core
definitions, and we stop knowing their sizes in indirect_size_get.c
Reviewed-by: Eric Anholt <e...@anholt.net>
Signed-off-by: Adam Jackson <a...@redhat.com>
---
src/mapi/glapi/gen/ARB_viewport_array.xml | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/mapi/glapi/gen/ARB_viewport_array.xml
b/src/mapi/glapi/gen/ARB_viewport_array.xml
index b20cf61..ebd5b99 100644
--- a/src/mapi/glapi/gen/ARB_viewport_array.xml
+++ b/src/mapi/glapi/gen/ARB_viewport_array.xml
@@ -12,10 +12,18 @@
<enum name="VIEWPORT_BOUNDS_RANGE" value="0x825D"/>
<enum name="LAYER_PROVOKING_VERTEX" value="0x825E"/>
<enum name="VIEWPORT_INDEX_PROVOKING_VERTEX" value="0x825F"/>
- <enum name="SCISSOR_BOX" value="0x0C10"/>
- <enum name="VIEWPORT" value="0x0BA2"/>
- <enum name="DEPTH_RANGE" value="0x0B70"/>
- <enum name="SCISSOR_TEST" value="0x0C11"/>
+ <enum name="SCISSOR_BOX" count="4" value="0x0C10">
+ <size name="Get" mode="get"/>
+ </enum>
+ <enum name="VIEWPORT" count="4" value="0x0BA2">
+ <size name="Get" mode="get"/>
+ </enum>
+ <enum name="DEPTH_RANGE" count="2" value="0x0B70">
+ <size name="Get" mode="get"/>
+ </enum>
+ <enum name="SCISSOR_TEST" count="1" value="0x0C11">
+ <size name="Get" mode="get"/>
+ </enum>
<enum name="FIRST_VERTEX_CONVENTION" value="0x8E4D"/>
<enum name="LAST_VERTEX_CONVENTION" value="0x8E4E"/>
<enum name="PROVOKING_VERTEX" value="0x8E4F"/>
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
