X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Frastpos.h;h=90b8f957b9f3c2676557954134fdcc3a9e71bd8a;hb=43f5a2c915e9f0fb7ac048964a3b55909146f8cd;hp=0c4c193e20de4660fd830db7b89c5db74982e08b;hpb=f7fa946d1da96178e63e42dd8d8739d3e0f66e1d;p=mesa.git

diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h
index 0c4c193e20d..90b8f957b9f 100644
--- a/src/mesa/main/rastpos.h
+++ b/src/mesa/main/rastpos.h
@@ -5,7 +5,6 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
  *
  * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
  *
@@ -22,9 +21,10 @@
  * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL 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.
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
  */
 
 
@@ -32,18 +32,18 @@
 #define RASTPOS_H
 
 
-#include "compiler.h"
-#include "mfeatures.h"
+#include "glheader.h"
+
 
 struct _glapi_table;
 struct gl_context;
 
-extern void
-_mesa_init_rastpos_dispatch(struct _glapi_table *disp);
-
 extern void 
 _mesa_init_rastpos(struct gl_context *ctx);
 
+void
+_mesa_RasterPos(struct gl_context *ctx, const GLfloat vObj[4]);
+
 void GLAPIENTRY
 _mesa_RasterPos2d(GLdouble x, GLdouble y);
 void GLAPIENTRY
@@ -93,21 +93,21 @@ _mesa_RasterPos4iv(const GLint *v);
 void GLAPIENTRY
 _mesa_RasterPos4sv(const GLshort *v);
 void GLAPIENTRY
-_mesa_WindowPos2dMESA(GLdouble x, GLdouble y);
+_mesa_WindowPos2d(GLdouble x, GLdouble y);
 void GLAPIENTRY
-_mesa_WindowPos2fMESA(GLfloat x, GLfloat y);
+_mesa_WindowPos2f(GLfloat x, GLfloat y);
 void GLAPIENTRY
-_mesa_WindowPos2iMESA(GLint x, GLint y);
+_mesa_WindowPos2i(GLint x, GLint y);
 void GLAPIENTRY
-_mesa_WindowPos2sMESA(GLshort x, GLshort y);
+_mesa_WindowPos2s(GLshort x, GLshort y);
 void GLAPIENTRY
-_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z);
+_mesa_WindowPos3d(GLdouble x, GLdouble y, GLdouble z);
 void GLAPIENTRY
-_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z);
+_mesa_WindowPos3f(GLfloat x, GLfloat y, GLfloat z);
 void GLAPIENTRY
-_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z);
+_mesa_WindowPos3i(GLint x, GLint y, GLint z);
 void GLAPIENTRY
-_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z);
+_mesa_WindowPos3s(GLshort x, GLshort y, GLshort z);
 void GLAPIENTRY
 _mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
 void GLAPIENTRY
@@ -117,21 +117,21 @@ _mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w);
 void GLAPIENTRY
 _mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w);
 void GLAPIENTRY
-_mesa_WindowPos2dvMESA(const GLdouble *v);
+_mesa_WindowPos2dv(const GLdouble *v);
 void GLAPIENTRY
-_mesa_WindowPos2fvMESA(const GLfloat *v);
+_mesa_WindowPos2fv(const GLfloat *v);
 void GLAPIENTRY
-_mesa_WindowPos2ivMESA(const GLint *v);
+_mesa_WindowPos2iv(const GLint *v);
 void GLAPIENTRY
-_mesa_WindowPos2svMESA(const GLshort *v);
+_mesa_WindowPos2sv(const GLshort *v);
 void GLAPIENTRY
-_mesa_WindowPos3dvMESA(const GLdouble *v);
+_mesa_WindowPos3dv(const GLdouble *v);
 void GLAPIENTRY
-_mesa_WindowPos3fvMESA(const GLfloat *v);
+_mesa_WindowPos3fv(const GLfloat *v);
 void GLAPIENTRY
-_mesa_WindowPos3ivMESA(const GLint *v);
+_mesa_WindowPos3iv(const GLint *v);
 void GLAPIENTRY
-_mesa_WindowPos3svMESA(const GLshort *v);
+_mesa_WindowPos3sv(const GLshort *v);
 void GLAPIENTRY
 _mesa_WindowPos4dvMESA(const GLdouble *v);
 void GLAPIENTRY