dispatch offsets for ARB_window_pos

4 files changed, 32 insertions, 158 deletions

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 99d477e7a4..6af83a9167 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,4 +1,4 @@
-/* $Id: dlist.c,v 1.86 2002/04/09 16:56:50 keithw Exp $ */
+/* $Id: dlist.c,v 1.87 2002/05/27 17:03:09 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -2517,6 +2517,18 @@ static void save_PointParameterfEXT( GLenum pname, GLfloat param )
    save_PointParameterfvEXT(pname, &param);
 }
 
+static void save_PointParameteriEXT( GLenum pname, GLint param )
+{
+   GLfloat p = (GLfloat) param;
+   save_PointParameterfvEXT(pname, &p);
+}
+
+static void save_PointParameterivEXT( GLenum pname, const GLint *param )
+{
+   GLfloat p = (GLfloat) param[0];
+   save_PointParameterfvEXT(pname, &p);
+}
+
 
 static void save_PointSize( GLfloat size )
 {
@@ -4858,7 +4870,7 @@ execute_list( GLcontext *ctx, GLuint list )
             (*ctx->Exec->SampleCoverageARB)(n[1].f, n[2].b);
             break;
 	 case OPCODE_WINDOW_POS_ARB: /* GL_ARB_window_pos */
-            (*ctx->Exec->WindowPos3fARB)( n[1].f, n[2].f, n[3].f );
+            (*ctx->Exec->WindowPos3fMESA)( n[1].f, n[2].f, n[3].f );
 	    break;
          case OPCODE_BIND_PROGRAM_NV: /* GL_NV_vertex_program */
             (*ctx->Exec->BindProgramNV)( n[1].e, n[2].ui );
@@ -6199,6 +6211,12 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
    table->TrackMatrixNV = save_TrackMatrixNV;
    table->VertexAttribPointerNV = _mesa_VertexAttribPointerNV;
 
+   /* 262. GL_NV_point_sprite */
+#if 0
+   table->PointParameteriNV = save_PointParameteriNV;
+   table->PointParameterivNV = save_PointParameterivNV;
+#endif
+
    /* ARB 1. GL_ARB_multitexture */
    table->ActiveTextureARB = save_ActiveTextureARB;
    table->ClientActiveTextureARB = exec_ClientActiveTextureARB;
@@ -6225,22 +6243,7 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
    /* re-use EXT_point_parameters functions */
 
    /* ARB 25. GL_ARB_window_pos */
-   table->WindowPos2dARB = save_WindowPos2dARB;
-   table->WindowPos2dvARB = save_WindowPos2dvARB;
-   table->WindowPos2fARB = save_WindowPos2fARB;
-   table->WindowPos2fvARB = save_WindowPos2fvARB;
-   table->WindowPos2iARB = save_WindowPos2iARB;
-   table->WindowPos2ivARB = save_WindowPos2ivARB;
-   table->WindowPos2sARB = save_WindowPos2sARB;
-   table->WindowPos2svARB = save_WindowPos2svARB;
-   table->WindowPos3dARB = save_WindowPos3dARB;
-   table->WindowPos3dvARB = save_WindowPos3dvARB;
-   table->WindowPos3fARB = save_WindowPos3fARB;
-   table->WindowPos3fvARB = save_WindowPos3fvARB;
-   table->WindowPos3iARB = save_WindowPos3iARB;
-   table->WindowPos3ivARB = save_WindowPos3ivARB;
-   table->WindowPos3sARB = save_WindowPos3sARB;
-   table->WindowPos3svARB = save_WindowPos3svARB;
+   /* re-use MESA_window_pos functions */
 }
 
 
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index 483324932b..945eea9ecc 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -1,4 +1,4 @@
-/* $Id: rastpos.c,v 1.37 2002/05/09 21:54:16 brianp Exp $ */
+/* $Id: rastpos.c,v 1.38 2002/05/27 17:03:08 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -790,84 +790,3 @@ void glWindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
 }
 
 #endif
-
-void _mesa_WindowPos2dARB(GLdouble x, GLdouble y)
-{
-   window_pos3f((GLfloat) x, (GLfloat) y, 0.0F);
-}
-
-void _mesa_WindowPos2fARB(GLfloat x, GLfloat y)
-{
-   window_pos3f(x, y, 0.0F);
-}
-
-void _mesa_WindowPos2iARB(GLint x, GLint y)
-{
-   window_pos3f((GLfloat) x, (GLfloat) y, 0.0F);
-}
-
-void _mesa_WindowPos2sARB(GLshort x, GLshort y)
-{
-   window_pos3f((GLfloat) x, (GLfloat) y, 0.0F);
-}
-
-void _mesa_WindowPos2dvARB(const GLdouble *p)
-{
-   window_pos3f((GLfloat) p[0], (GLfloat) p[1], 0.0F);
-}
-
-void _mesa_WindowPos2fvARB(const GLfloat *p)
-{
-   window_pos3f((GLfloat) p[0], (GLfloat) p[1], 0.0F);
-}
-
-void _mesa_WindowPos2ivARB(const GLint *p)
-{
-   window_pos3f((GLfloat) p[0], (GLfloat) p[1], 0.0F);
-}
-
-void _mesa_WindowPos2svARB(const GLshort *p)
-{
-   window_pos3f((GLfloat) p[0], (GLfloat) p[1], 0.0F);
-}
-
-void _mesa_WindowPos3dARB(GLdouble x, GLdouble y, GLdouble z)
-{
-   window_pos3f((GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-
-void _mesa_WindowPos3fARB(GLfloat x, GLfloat y, GLfloat z)
-{
-   window_pos3f(x, y, z);
-}
-
-void _mesa_WindowPos3iARB(GLint x, GLint y, GLint z)
-{
-   window_pos3f((GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-
-void _mesa_WindowPos3sARB(GLshort x, GLshort y, GLshort z)
-{
-   window_pos3f((GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-
-void _mesa_WindowPos3dvARB(const GLdouble *p)
-{
-   window_pos3f((GLfloat) p[0], (GLfloat) p[1], (GLfloat) p[2]);
-}
-
-void _mesa_WindowPos3fvARB(const GLfloat *p)
-{
-   window_pos3f(p[0], p[1], p[2]);
-}
-
-void _mesa_WindowPos3ivARB(const GLint *p)
-{
-   window_pos3f((GLfloat) p[0], (GLfloat) p[1], (GLfloat) p[2]);
-}
-
-void _mesa_WindowPos3svARB(const GLshort *p)
-{
-   window_pos3f((GLfloat) p[0], (GLfloat) p[1], (GLfloat) p[2]);
-}
-
diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h
index 62779443c0..618057b9d6 100644
--- a/src/mesa/main/rastpos.h
+++ b/src/mesa/main/rastpos.h
@@ -1,10 +1,10 @@
-/* $Id: rastpos.h,v 1.5 2001/11/18 23:52:38 brianp Exp $ */
+/* $Id: rastpos.h,v 1.6 2002/05/27 17:03:09 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  4.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2002  Brian Paul   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"),
@@ -182,41 +182,4 @@ extern void
 _mesa_WindowPos4svMESA(const GLshort *v);
 
 
-/**********************************************************************/
-/***                     GL_ARB_window_pos                          ***/
-/**********************************************************************/
-
-extern void _mesa_WindowPos2dARB(GLdouble x, GLdouble y);
-
-extern void _mesa_WindowPos2fARB(GLfloat x, GLfloat y);
-
-extern void _mesa_WindowPos2iARB(GLint x, GLint y);
-
-extern void _mesa_WindowPos2sARB(GLshort x, GLshort y);
-
-extern void _mesa_WindowPos2dvARB(const GLdouble *p);
-
-extern void _mesa_WindowPos2fvARB(const GLfloat *p);
-
-extern void _mesa_WindowPos2ivARB(const GLint *p);
-
-extern void _mesa_WindowPos2svARB(const GLshort *p);
-
-extern void _mesa_WindowPos3dARB(GLdouble x, GLdouble y, GLdouble z);
-
-extern void _mesa_WindowPos3fARB(GLfloat x, GLfloat y, GLfloat z);
-
-extern void _mesa_WindowPos3iARB(GLint x, GLint y, GLint z);
-
-extern void _mesa_WindowPos3sARB(GLshort x, GLshort y, GLshort z);
-
-extern void _mesa_WindowPos3dvARB(const GLdouble *p);
-
-extern void _mesa_WindowPos3fvARB(const GLfloat *p);
-
-extern void _mesa_WindowPos3ivARB(const GLint *p);
-
-extern void _mesa_WindowPos3svARB(const GLshort *p);
-
-
 #endif
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index c1657125f8..de7679365a 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.81 2002/04/09 16:56:50 keithw Exp $ */
+/* $Id: state.c,v 1.82 2002/05/27 17:03:09 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -484,6 +484,12 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
    exec->TrackMatrixNV = _mesa_TrackMatrixNV;
    exec->VertexAttribPointerNV = _mesa_VertexAttribPointerNV;
 
+   /* 262. GL_NV_point_sprite */
+#if 0
+   exec->PointParameteriNV = _mesa_PointParameteriNV;
+   exec->PointParameterivNV = _mesa_PointParameterivNV;
+#endif
+
    /* ARB 1. GL_ARB_multitexture */
    exec->ActiveTextureARB = _mesa_ActiveTextureARB;
    exec->ClientActiveTextureARB = _mesa_ClientActiveTextureARB;
@@ -509,23 +515,6 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
    /* ARB 14. GL_ARB_point_parameters */
    /* reuse EXT_point_parameters functions */
 
-   /* ARB 25. GL_ARB_window_pos */
-   exec->WindowPos2dARB = _mesa_WindowPos2dARB;
-   exec->WindowPos2dvARB = _mesa_WindowPos2dvARB;
-   exec->WindowPos2fARB = _mesa_WindowPos2fARB;
-   exec->WindowPos2fvARB = _mesa_WindowPos2fvARB;
-   exec->WindowPos2iARB = _mesa_WindowPos2iARB;
-   exec->WindowPos2ivARB = _mesa_WindowPos2ivARB;
-   exec->WindowPos2sARB = _mesa_WindowPos2sARB;
-   exec->WindowPos2svARB = _mesa_WindowPos2svARB;
-   exec->WindowPos3dARB = _mesa_WindowPos3dARB;
-   exec->WindowPos3dvARB = _mesa_WindowPos3dvARB;
-   exec->WindowPos3fARB = _mesa_WindowPos3fARB;
-   exec->WindowPos3fvARB = _mesa_WindowPos3fvARB;
-   exec->WindowPos3iARB = _mesa_WindowPos3iARB;
-   exec->WindowPos3ivARB = _mesa_WindowPos3ivARB;
-   exec->WindowPos3sARB = _mesa_WindowPos3sARB;
-   exec->WindowPos3svARB = _mesa_WindowPos3svARB;
 }