Mesa (master): mesa/es: Allow GL_CLIP_PLANE0+6 and GL_CLIP_PLANE0+7.

Kenneth Graunke kwg at kemper.freedesktop.org
Thu Oct 6 11:24:49 PDT 2011


Module: Mesa
Branch: master
Commit: 09fcd01301cd161e2a5d619933c14f79753108d6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=09fcd01301cd161e2a5d619933c14f79753108d6

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Oct  4 11:29:08 2011 -0700

mesa/es: Allow GL_CLIP_PLANE0+6 and GL_CLIP_PLANE0+7.

Fixes the ES1 conformance 'userclip' test, which broke when we increased
MAX_CLIP_PLANES to 8.  Core Mesa already validates incoming values
against MAX_CLIP_PLANES; we just need the ES wrapper to pass everything
through.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/main/APIspec.xml |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 5d5fc03..574480e 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -41,10 +41,6 @@
 		<param name="plane" type="GLenum"/>
 		<vector name="equation" type="const GLtype *" size="4"/>
 	</proto>
-
-	<desc name="plane">
-		<range base="GL_CLIP_PLANE" from="0" to="5"/>
-	</desc>
 </template>
 
 <template name="CullFace">
@@ -807,6 +803,8 @@
 		<value name="GL_RESCALE_NORMAL"/>
 
 		<range base="GL_CLIP_PLANE" from="0" to="5"/>
+		<value name="GL_CLIP_PLANE0+6"/>
+		<value name="GL_CLIP_PLANE0+7"/>
 
 		<value name="GL_FOG"/>
 		<value name="GL_LIGHTING"/>
@@ -862,6 +860,8 @@
 		<value name="GL_RESCALE_NORMAL"/>
 
 		<range base="GL_CLIP_PLANE" from="0" to="5"/>
+		<value name="GL_CLIP_PLANE0+6"/>
+		<value name="GL_CLIP_PLANE0+7"/>
 
 		<value name="GL_FOG"/>
 		<value name="GL_LIGHTING"/>
@@ -1260,10 +1260,6 @@
 		<param name="plane" type="GLenum"/>
 		<vector name="equation" type="GLtype *" size="4"/>
 	</proto>
-
-	<desc name="plane">
-		<range base="GL_CLIP_PLANE" from="0" to="5"/>
-	</desc>
 </template>
 
 <template name="GetError" direction="get">
@@ -1517,6 +1513,8 @@
 		<value name="GL_RESCALE_NORMAL"/>
 
 		<range base="GL_CLIP_PLANE" from="0" to="5"/>
+		<value name="GL_CLIP_PLANE0+6"/>
+		<value name="GL_CLIP_PLANE0+7"/>
 
 		<value name="GL_FOG"/>
 		<value name="GL_LIGHTING"/>



More information about the mesa-commit mailing list