xserver and mesa git update 28-12-2010

1 files changed, 119 insertions, 115 deletions

diff --git a/mesalib/src/mesa/main/nvprogram.h b/mesalib/src/mesa/main/nvprogram.h
index 260a25ba9..3d12b4e33 100644
--- a/mesalib/src/mesa/main/nvprogram.h
+++ b/mesalib/src/mesa/main/nvprogram.h
@@ -1,115 +1,119 @@
-/*
- * Mesa 3-D graphics library
- * Version:  5.1
- *
- * Copyright (C) 1999-2003  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"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * 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 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 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.
- *
- * Authors:
- *    Brian Paul
- */
-
-
-#ifndef NVPROGRAM_H
-#define NVPROGRAM_H
-
-#include "glheader.h"
-#include "mtypes.h"
-
-extern void GLAPIENTRY
-_mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params);
-
-extern GLboolean GLAPIENTRY 
-_mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids, GLboolean *residences);
-
-extern void GLAPIENTRY
-_mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids);
-
-extern void GLAPIENTRY
-_mesa_GetProgramParameterfvNV(GLenum target, GLuint index, GLenum pname, GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramParameterdvNV(GLenum target, GLuint index, GLenum pname, GLdouble *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program);
-
-extern void GLAPIENTRY
-_mesa_GetTrackMatrixivNV(GLenum target, GLuint address, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params);
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer);
-
-extern void GLAPIENTRY
-_mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-
-extern void GLAPIENTRY
-_mesa_ProgramParameters4dvNV(GLenum target, GLuint index, GLuint num, const GLdouble *params);
-
-extern void GLAPIENTRY
-_mesa_ProgramParameters4fvNV(GLenum target, GLuint index, GLuint num, const GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_TrackMatrixNV(GLenum target, GLuint address, GLenum matrix, GLenum transform);
-
-
-extern void GLAPIENTRY
-_mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,
-                                GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-
-extern void GLAPIENTRY
-_mesa_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name,
-                                 const float v[]);
-
-extern void GLAPIENTRY
-_mesa_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name,
-                                GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-
-extern void GLAPIENTRY
-_mesa_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name,
-                                 const double v[]);
-
-extern void GLAPIENTRY
-_mesa_GetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name,
-                                   GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramNamedParameterdvNV(GLuint id, GLsizei len, const GLubyte *name,
-                                   GLdouble *params);
-
-extern void
-_mesa_setup_nv_temporary_count(GLcontext *ctx, struct gl_program *program);
-
-extern void
-_mesa_emit_nv_temp_initialization(GLcontext *ctx,
-				  struct gl_program *program);
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  5.1

+ *

+ * Copyright (C) 1999-2003  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"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * 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 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 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.

+ *

+ * Authors:

+ *    Brian Paul

+ */

+

+

+#ifndef NVPROGRAM_H

+#define NVPROGRAM_H

+

+#include "glheader.h"

+

+struct gl_context;

+struct gl_program;

+

+extern void GLAPIENTRY

+_mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params);

+

+extern GLboolean GLAPIENTRY 

+_mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids, GLboolean *residences);

+

+extern void GLAPIENTRY

+_mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids);

+

+extern void GLAPIENTRY

+_mesa_GetProgramParameterfvNV(GLenum target, GLuint index, GLenum pname, GLfloat *params);

+

+extern void GLAPIENTRY

+_mesa_GetProgramParameterdvNV(GLenum target, GLuint index, GLenum pname, GLdouble *params);

+

+extern void GLAPIENTRY

+_mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params);

+

+extern void GLAPIENTRY

+_mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program);

+

+extern void GLAPIENTRY

+_mesa_GetTrackMatrixivNV(GLenum target, GLuint address, GLenum pname, GLint *params);

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params);

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params);

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params);

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer);

+

+extern void GLAPIENTRY

+_mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len, const GLubyte *program);

+

+extern void GLAPIENTRY

+_mesa_ProgramParameters4dvNV(GLenum target, GLuint index, GLsizei num,

+                             const GLdouble *params);

+

+extern void GLAPIENTRY

+_mesa_ProgramParameters4fvNV(GLenum target, GLuint index, GLsizei num,

+                             const GLfloat *params);

+

+extern void GLAPIENTRY

+_mesa_TrackMatrixNV(GLenum target, GLuint address, GLenum matrix, GLenum transform);

+

+

+extern void GLAPIENTRY

+_mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,

+                                GLfloat x, GLfloat y, GLfloat z, GLfloat w);

+

+extern void GLAPIENTRY

+_mesa_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name,

+                                 const float v[]);

+

+extern void GLAPIENTRY

+_mesa_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name,

+                                GLdouble x, GLdouble y, GLdouble z, GLdouble w);

+

+extern void GLAPIENTRY

+_mesa_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name,

+                                 const double v[]);

+

+extern void GLAPIENTRY

+_mesa_GetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name,

+                                   GLfloat *params);

+

+extern void GLAPIENTRY

+_mesa_GetProgramNamedParameterdvNV(GLuint id, GLsizei len, const GLubyte *name,

+                                   GLdouble *params);

+

+extern void

+_mesa_setup_nv_temporary_count(struct gl_context *ctx, struct gl_program *program);

+

+extern void

+_mesa_emit_nv_temp_initialization(struct gl_context *ctx,

+				  struct gl_program *program);

+

+#endif