On 10/04/2011 01:55 PM, Kenneth Graunke wrote:
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.

I've been using 'mesa/es:' as the tag for changes to this file. Other than that and the similarly trivial comment on patch 1/3, the series is:

Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>

Signed-off-by: Kenneth Graunke<kenn...@whitecape.org>
---
  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 0f82d0a..f42b712 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"/>

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to