Make the transition to script-genereated GLX code easier.

Move "handcoded" ARB_transpose_matrix functions to their own file.  From
here on out, such handcoded functions should go in a file named
indirect_FOO.c, where "FOO" is some logical name for the functionality
(e.g., part of the extension name, etc.).

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index a44e0a4a3648a9f77ed72bf71f6a7dfee496874a..144727062290c88c5a0c798f3d7757f967537534 100644 (file)
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -31,6 +31,7 @@ C_SOURCES = \
          glxext.c \
          glxextensions.c \
          indirect_init.c \
+         indirect_transpose_matrix.c \
          pixel.c \
          pixelstore.c \
          render2.c \

diff --git a/src/glx/x11/indirect.h b/src/glx/x11/indirect.h
index 5b39b74fe7e0a6c25a6a31f1eeb359894cc0a299..e62589699e6cd3bbb5e7ea5a7db8c3fa2b01fe7d 100644 (file)
--- a/src/glx/x11/indirect.h
+++ b/src/glx/x11/indirect.h
@@ -350,10 +350,11 @@ glxproto_Cv(LoadMatrixf, X_GLrop_LoadMatrixf, GLfloat, 16)
 glxproto_Cv(MultMatrixf, X_GLrop_MultMatrixf, GLfloat, 16)
 glxproto_Cv(LoadMatrixd, X_GLrop_LoadMatrixd, GLdouble, 16)
 glxproto_Cv(MultMatrixd, X_GLrop_MultMatrixd, GLdouble, 16)
-glxproto_Cv_transpose(LoadTransposeMatrixfARB, X_GLrop_LoadMatrixf, GLfloat, 4)
-glxproto_Cv_transpose(MultTransposeMatrixfARB, X_GLrop_MultMatrixf, GLfloat, 4)
-glxproto_Cv_transpose(LoadTransposeMatrixdARB, X_GLrop_LoadMatrixd, GLdouble, 4)
-glxproto_Cv_transpose(MultTransposeMatrixdARB, X_GLrop_MultMatrixd, GLdouble, 4)
+
+void __indirect_glLoadTransposeMatrixdARB( const GLdouble * m );
+void __indirect_glLoadTransposeMatrixfARB( const GLfloat * m );
+void __indirect_glMultTransposeMatrixdARB( const GLdouble * m );
+void __indirect_glMultTransposeMatrixfARB( const GLfloat * m );
 
 glxproto_6s(Ortho, X_GLrop_Ortho, GLdouble)
 

diff --git a/src/glx/x11/indirect_transpose_matrix.c b/src/glx/x11/indirect_transpose_matrix.c
new file mode 100644 (file)
index 0000000..d7b9de6
--- /dev/null
+++ b/src/glx/x11/indirect_transpose_matrix.c
@@ -0,0 +1,83 @@
+/*
+ * (C) Copyright IBM Corporation 2004
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/gl.h>
+#include "indirect.h"
+
+static void TransposeMatrixf(const GLfloat s[16], GLfloat d[16])
+{
+    int i, j;
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < i; j++) {
+            d[i*4+j] = s[j*4+i];
+        }
+    }
+}
+
+static void TransposeMatrixd(const GLdouble s[16], GLdouble d[16])
+{
+    int i, j;
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < i; j++) {
+            d[i*4+j] = s[j*4+i];
+        }
+    }
+}
+
+
+void
+__indirect_glLoadTransposeMatrixdARB( const GLdouble * m )
+{
+   GLdouble mt[16];
+   
+   TransposeMatrixd( m, mt );
+   __indirect_glLoadMatrixd( mt );
+}
+
+void
+__indirect_glLoadTransposeMatrixfARB( const GLfloat * m )
+{
+   GLfloat mt[16];
+
+   TransposeMatrixf( m, mt );
+   __indirect_glLoadMatrixf( mt );
+}
+
+void
+__indirect_glMultTransposeMatrixdARB( const GLdouble * m )
+{
+   GLdouble mt[16];
+   
+   TransposeMatrixd( m, mt );
+   __indirect_glMultMatrixd( mt );
+}
+
+void
+__indirect_glMultTransposeMatrixfARB( const GLfloat * m )
+{
+   GLfloat mt[16];
+
+   TransposeMatrixf( m, mt );
+   __indirect_glMultMatrixf( mt );
+}