AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added GLAPIENTRY decorations for all first level OpenGL API function entry

Browse Source 
points so that the calling conventions will work correctly with the assembler
stubs with the Open Watcom compiler.
This commit is contained in:
Kendall Bennett
2003-10-21 22:22:17 +00:00
parent b1ca87a565
commit c40d1dd62d
83 changed files with 2523 additions and 2511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/glapi/glapitable.h
+710 -710
View File
File diff suppressed because it is too large Load Diff
src/mesa/glapi/gltable.py
+2 -2
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# $Id: gltable.py,v 1.3 2001/11/18 22:42:57 brianp Exp $
# $Id: gltable.py,v 1.4 2003/10/21 22:22:18 kendallb Exp $
# Mesa 3-D graphics library
# Version: 4.1
@@ -77,7 +77,7 @@ def PrintRecords():
pass
prevk = int(k)
(name, returnType, argList) = records[k]
print ' %s (*%s)(%s); /* %d */' % (returnType, name, argList, k)
print ' %s (GLAPIENTRYP %s)(%s); /* %d */' % (returnType, name, argList, k)
#endef
src/mesa/main/accum.c
+2 -2
View File
@@ -32,7 +32,7 @@
#include "mtypes.h"
void
void GLAPIENTRY
_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
{
GLfloat tmp[4];
@@ -53,7 +53,7 @@ _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
/* Should really be a driver-supplied function?
*/
void
void GLAPIENTRY
_mesa_Accum( GLenum op, GLfloat value )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/accum.h
+2 -2
View File
@@ -42,11 +42,11 @@
#if _HAVE_FULL_GL
extern void
extern void GLAPIENTRY
_mesa_Accum( GLenum op, GLfloat value );
extern void
extern void GLAPIENTRY
_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
extern void
src/mesa/main/api_loopback.c
+221 -221
View File
File diff suppressed because it is too large Load Diff
src/mesa/main/arbprogram.c
+21 -21
View File
@@ -44,7 +44,7 @@
#include "nvvertprog.h"
void
void GLAPIENTRY
_mesa_EnableVertexAttribArrayARB(GLuint index)
{
GET_CURRENT_CONTEXT(ctx);
@@ -62,7 +62,7 @@ _mesa_EnableVertexAttribArrayARB(GLuint index)
}
void
void GLAPIENTRY
_mesa_DisableVertexAttribArrayARB(GLuint index)
{
GET_CURRENT_CONTEXT(ctx);
@@ -80,7 +80,7 @@ _mesa_DisableVertexAttribArrayARB(GLuint index)
}
void
void GLAPIENTRY
_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)
{
GLfloat fparams[4];
@@ -99,7 +99,7 @@ _mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)
}
void
void GLAPIENTRY
_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -143,7 +143,7 @@ _mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
}
void
void GLAPIENTRY
_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params)
{
GLfloat fparams[4];
@@ -162,7 +162,7 @@ _mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params)
}
void
void GLAPIENTRY
_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer)
{
GET_CURRENT_CONTEXT(ctx);
@@ -182,7 +182,7 @@ _mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer)
}
void
void GLAPIENTRY
_mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
const GLvoid *string)
{
@@ -215,7 +215,7 @@ _mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
}
void
void GLAPIENTRY
_mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index,
GLdouble x, GLdouble y, GLdouble z, GLdouble w)
{
@@ -224,7 +224,7 @@ _mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index,
}
void
void GLAPIENTRY
_mesa_ProgramEnvParameter4dvARB(GLenum target, GLuint index,
const GLdouble *params)
{
@@ -234,7 +234,7 @@ _mesa_ProgramEnvParameter4dvARB(GLenum target, GLuint index,
}
void
void GLAPIENTRY
_mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
GLfloat x, GLfloat y, GLfloat z, GLfloat w)
{
@@ -264,7 +264,7 @@ _mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
}
void
void GLAPIENTRY
_mesa_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
const GLfloat *params)
{
@@ -273,7 +273,7 @@ _mesa_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
}
void
void GLAPIENTRY
_mesa_GetProgramEnvParameterdvARB(GLenum target, GLuint index,
GLdouble *params)
{
@@ -290,7 +290,7 @@ _mesa_GetProgramEnvParameterdvARB(GLenum target, GLuint index,
}
void
void GLAPIENTRY
_mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index,
GLfloat *params)
{
@@ -325,7 +325,7 @@ _mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index,
/**
* Note, this function is also used by the GL_NV_fragment_program extension.
*/
void
void GLAPIENTRY
_mesa_ProgramLocalParameter4fARB(GLenum target, GLuint index,
GLfloat x, GLfloat y, GLfloat z, GLfloat w)
{
@@ -367,7 +367,7 @@ _mesa_ProgramLocalParameter4fARB(GLenum target, GLuint index,
/**
* Note, this function is also used by the GL_NV_fragment_program extension.
*/
void
void GLAPIENTRY
_mesa_ProgramLocalParameter4fvARB(GLenum target, GLuint index,
const GLfloat *params)
{
@@ -379,7 +379,7 @@ _mesa_ProgramLocalParameter4fvARB(GLenum target, GLuint index,
/**
* Note, this function is also used by the GL_NV_fragment_program extension.
*/
void
void GLAPIENTRY
_mesa_ProgramLocalParameter4dARB(GLenum target, GLuint index,
GLdouble x, GLdouble y,
GLdouble z, GLdouble w)
@@ -392,7 +392,7 @@ _mesa_ProgramLocalParameter4dARB(GLenum target, GLuint index,
/**
* Note, this function is also used by the GL_NV_fragment_program extension.
*/
void
void GLAPIENTRY
_mesa_ProgramLocalParameter4dvARB(GLenum target, GLuint index,
const GLdouble *params)
{
@@ -405,7 +405,7 @@ _mesa_ProgramLocalParameter4dvARB(GLenum target, GLuint index,
/**
* Note, this function is also used by the GL_NV_fragment_program extension.
*/
void
void GLAPIENTRY
_mesa_GetProgramLocalParameterfvARB(GLenum target, GLuint index,
GLfloat *params)
{
@@ -450,7 +450,7 @@ _mesa_GetProgramLocalParameterfvARB(GLenum target, GLuint index,
/**
* Note, this function is also used by the GL_NV_fragment_program extension.
*/
void
void GLAPIENTRY
_mesa_GetProgramLocalParameterdvARB(GLenum target, GLuint index,
GLdouble *params)
{
@@ -463,7 +463,7 @@ _mesa_GetProgramLocalParameterdvARB(GLenum target, GLuint index,
}
void
void GLAPIENTRY
_mesa_GetProgramivARB(GLenum target, GLenum pname, GLint *params)
{
struct program *prog;
@@ -670,7 +670,7 @@ _mesa_GetProgramivARB(GLenum target, GLenum pname, GLint *params)
}
void
void GLAPIENTRY
_mesa_GetProgramStringARB(GLenum target, GLenum pname, GLvoid *string)
{
struct program *prog;
src/mesa/main/arbprogram.h
+21 -21
View File
@@ -27,101 +27,101 @@
#define ARBPROGRAM_H
extern void
extern void GLAPIENTRY
_mesa_EnableVertexAttribArrayARB(GLuint index);
extern void
extern void GLAPIENTRY
_mesa_DisableVertexAttribArrayARB(GLuint index);
extern void
extern void GLAPIENTRY
_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params);
extern void
extern void GLAPIENTRY
_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params);
extern void
extern void GLAPIENTRY
_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer);
extern void
extern void GLAPIENTRY
_mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
const GLvoid *string);
extern void
extern void GLAPIENTRY
_mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index,
GLdouble x, GLdouble y, GLdouble z, GLdouble w);
extern void
extern void GLAPIENTRY
_mesa_ProgramEnvParameter4dvARB(GLenum target, GLuint index,
const GLdouble *params);
extern void
extern void GLAPIENTRY
_mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
GLfloat x, GLfloat y, GLfloat z, GLfloat w);
extern void
extern void GLAPIENTRY
_mesa_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
const GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_ProgramLocalParameter4dARB(GLenum target, GLuint index,
GLdouble x, GLdouble y,
GLdouble z, GLdouble w);
extern void
extern void GLAPIENTRY
_mesa_ProgramLocalParameter4dvARB(GLenum target, GLuint index,
const GLdouble *params);
extern void
extern void GLAPIENTRY
_mesa_ProgramLocalParameter4fARB(GLenum target, GLuint index,
GLfloat x, GLfloat y, GLfloat z, GLfloat w);
extern void
extern void GLAPIENTRY
_mesa_ProgramLocalParameter4fvARB(GLenum target, GLuint index,
const GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_GetProgramEnvParameterdvARB(GLenum target, GLuint index,
GLdouble *params);
extern void
extern void GLAPIENTRY
_mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index,
GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_GetProgramLocalParameterdvARB(GLenum target, GLuint index,
GLdouble *params);
extern void
extern void GLAPIENTRY
_mesa_GetProgramLocalParameterfvARB(GLenum target, GLuint index,
GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_GetProgramivARB(GLenum target, GLenum pname, GLint *params);
extern void
extern void GLAPIENTRY
_mesa_GetProgramStringARB(GLenum target, GLenum pname, GLvoid *string);
src/mesa/main/attrib.c
+4 -4
View File
@@ -65,7 +65,7 @@ new_attrib_node( GLbitfield kind )
}
void
void GLAPIENTRY
_mesa_PushAttrib(GLbitfield mask)
{
struct gl_attrib_node *newnode;
@@ -783,7 +783,7 @@ pop_texture_group(GLcontext *ctx, const struct gl_texture_attrib *texAttrib)
* We could at least check if the value to restore equals the current value
* and then skip the Mesa call.
*/
void
void GLAPIENTRY
_mesa_PopAttrib(void)
{
struct gl_attrib_node *attr, *next;
@@ -1138,7 +1138,7 @@ _mesa_PopAttrib(void)
#define GL_CLIENT_UNPACK_BIT (1<<21)
void
void GLAPIENTRY
_mesa_PushClientAttrib(GLbitfield mask)
{
struct gl_attrib_node *newnode;
@@ -1190,7 +1190,7 @@ _mesa_PushClientAttrib(GLbitfield mask)
void
void GLAPIENTRY
_mesa_PopClientAttrib(void)
{
struct gl_attrib_node *attr, *next;
src/mesa/main/attrib.h
+4 -4
View File
@@ -43,16 +43,16 @@
#if _HAVE_FULL_GL
extern void
extern void GLAPIENTRY
_mesa_PushAttrib( GLbitfield mask );
extern void
extern void GLAPIENTRY
_mesa_PopAttrib( void );
extern void
extern void GLAPIENTRY
_mesa_PushClientAttrib( GLbitfield mask );
extern void
extern void GLAPIENTRY
_mesa_PopClientAttrib( void );
extern void
src/mesa/main/blend.c
+8 -8
View File
@@ -50,7 +50,7 @@
* flushes the vertices and notifies the driver via
* dd_function_table::BlendFunc callback.
*/
void
void GLAPIENTRY
_mesa_BlendFunc( GLenum sfactor, GLenum dfactor )
{
@@ -144,7 +144,7 @@ _mesa_BlendFunc( GLenum sfactor, GLenum dfactor )
* On a change, flush the vertices and notify the driver via
* dd_function_table::BlendFuncSeparate.
*/
void
void GLAPIENTRY
_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA )
{
@@ -285,7 +285,7 @@ _mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
/* This is really an extension function! */
void
void GLAPIENTRY
_mesa_BlendEquation( GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
@@ -358,7 +358,7 @@ _mesa_BlendEquation( GLenum mode )
* change, flushes the vertices and notifies the driver via
* dd_function_table::BlendColor callback.
*/
void
void GLAPIENTRY
_mesa_BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
{
GLfloat tmp[4];
@@ -391,7 +391,7 @@ _mesa_BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
* On a change, flushes the vertices and notifies the driver via
* dd_function_table::AlphaFunc callback.
*/
void
void GLAPIENTRY
_mesa_AlphaFunc( GLenum func, GLclampf ref )
{
GET_CURRENT_CONTEXT(ctx);
@@ -436,7 +436,7 @@ gl_colorbuffer_attrib::LogicOp.
* On a change, flushes the vertices and notifies the driver via the
* dd_function_table::LogicOpcode callback.
*/
void
void GLAPIENTRY
_mesa_LogicOp( GLenum opcode )
{
GET_CURRENT_CONTEXT(ctx);
@@ -476,7 +476,7 @@ _mesa_LogicOp( GLenum opcode )
}
#if _HAVE_FULL_GL
void
void GLAPIENTRY
_mesa_IndexMask( GLuint mask )
{
GET_CURRENT_CONTEXT(ctx);
@@ -508,7 +508,7 @@ _mesa_IndexMask( GLuint mask )
* change, flushes the vertices and notifies the driver via the
* dd_function_table::ColorMask callback.
*/
void
void GLAPIENTRY
_mesa_ColorMask( GLboolean red, GLboolean green,
GLboolean blue, GLboolean alpha )
{
src/mesa/main/blend.h
+9 -9
View File
@@ -36,39 +36,39 @@
#include "mtypes.h"
extern void
extern void GLAPIENTRY
_mesa_BlendFunc( GLenum sfactor, GLenum dfactor );
extern void
extern void GLAPIENTRY
_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA );
extern void
extern void GLAPIENTRY
_mesa_BlendEquation( GLenum mode );
extern void
extern void GLAPIENTRY
_mesa_BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
extern void
extern void GLAPIENTRY
_mesa_AlphaFunc( GLenum func, GLclampf ref );
extern void
extern void GLAPIENTRY
_mesa_LogicOp( GLenum opcode );
extern void
extern void GLAPIENTRY
_mesa_IndexMask( GLuint mask );
extern void
extern void GLAPIENTRY
_mesa_ColorMask( GLboolean red, GLboolean green,
GLboolean blue, GLboolean alpha );
extern void
extern void
_mesa_init_color( GLcontext * ctx );
#endif
src/mesa/main/bufferobj.c
+11 -11
View File
@@ -367,7 +367,7 @@ _mesa_init_buffer_objects( GLcontext *ctx )
/* API Functions */
/**********************************************************************/
void
void GLAPIENTRY
_mesa_BindBufferARB(GLenum target, GLuint buffer)
{
GET_CURRENT_CONTEXT(ctx);
@@ -436,7 +436,7 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
* \param n Number of buffer objects to delete.
* \param buffer Array of \c n buffer object IDs.
*/
void
void GLAPIENTRY
_mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
{
GET_CURRENT_CONTEXT(ctx);
@@ -511,7 +511,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
* \param n Number of IDs to generate.
* \param buffer Array of \c n locations to store the IDs.
*/
void
void GLAPIENTRY
_mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
{
GET_CURRENT_CONTEXT(ctx);
@@ -560,7 +560,7 @@ _mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
* \return \c GL_TRUE if \c id is the name of a buffer object,
* \c GL_FALSE otherwise.
*/
GLboolean
GLboolean GLAPIENTRY
_mesa_IsBufferARB(GLuint id)
{
struct gl_buffer_object * bufObj;
@@ -578,7 +578,7 @@ _mesa_IsBufferARB(GLuint id)
}
void
void GLAPIENTRY
_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
const GLvoid * data, GLenum usage)
{
@@ -626,7 +626,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
}
void
void GLAPIENTRY
_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
GLsizeiptrARB size, const GLvoid * data)
{
@@ -651,7 +651,7 @@ _mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
}
void
void GLAPIENTRY
_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
GLsizeiptrARB size, void * data)
{
@@ -676,7 +676,7 @@ _mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
}
void *
void * GLAPIENTRY
_mesa_MapBufferARB(GLenum target, GLenum access)
{
GET_CURRENT_CONTEXT(ctx);
@@ -717,7 +717,7 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
}
GLboolean
GLboolean GLAPIENTRY
_mesa_UnmapBufferARB(GLenum target)
{
GET_CURRENT_CONTEXT(ctx);
@@ -747,7 +747,7 @@ _mesa_UnmapBufferARB(GLenum target)
}
void
void GLAPIENTRY
_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -780,7 +780,7 @@ _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
}
void
void GLAPIENTRY
_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/bufferobj.h
+11 -11
View File
@@ -84,37 +84,37 @@ _mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
* API functions
*/
extern void
extern void GLAPIENTRY
_mesa_BindBufferARB(GLenum target, GLuint buffer);
extern void
extern void GLAPIENTRY
_mesa_DeleteBuffersARB(GLsizei n, const GLuint * buffer);
extern void
extern void GLAPIENTRY
_mesa_GenBuffersARB(GLsizei n, GLuint * buffer);
extern GLboolean
extern GLboolean GLAPIENTRY
_mesa_IsBufferARB(GLuint buffer);
extern void
extern void GLAPIENTRY
_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage);
extern void
extern void GLAPIENTRY
_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data);
extern void
extern void GLAPIENTRY
_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data);
extern void *
extern void * GLAPIENTRY
_mesa_MapBufferARB(GLenum target, GLenum access);
extern GLboolean
extern GLboolean GLAPIENTRY
_mesa_UnmapBufferARB(GLenum target);
extern void
extern void GLAPIENTRY
_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params);
extern void
extern void GLAPIENTRY
_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params);
#endif
src/mesa/main/buffers.c
+8 -8
View File
@@ -41,7 +41,7 @@
#if _HAVE_FULL_GL
void
void GLAPIENTRY
_mesa_ClearIndex( GLfloat c )
{
GET_CURRENT_CONTEXT(ctx);
@@ -75,7 +75,7 @@ _mesa_ClearIndex( GLfloat c )
* change, flushes the vertices and notifies the driver via the
* dd_function_table::ClearColor callback.
*/
void
void GLAPIENTRY
_mesa_ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
{
GLfloat tmp[4];
@@ -110,7 +110,7 @@ _mesa_ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
* etc. If the rasterization mode is set to GL_RENDER then requests the driver
* to clear the buffers, via the dd_function_table::Clear callback.
*/
void
void GLAPIENTRY
_mesa_Clear( GLbitfield mask )
{
GET_CURRENT_CONTEXT(ctx);
@@ -176,7 +176,7 @@ _mesa_Clear( GLbitfield mask )
* __GLcontextRec::NewState and notifies the driver via the
* dd_function_table::DrawBuffer callback.
*/
void
void GLAPIENTRY
_mesa_DrawBuffer( GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
@@ -327,7 +327,7 @@ _mesa_DrawBuffer( GLenum mode )
* new pixel state in __GLcontextRec::NewState and notifies the driver via
* dd_function_table::ReadBuffer.
*/
void
void GLAPIENTRY
_mesa_ReadBuffer( GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
@@ -436,7 +436,7 @@ _mesa_ReadBuffer( GLenum mode )
* \note This function may be called from within Mesa or called by the
* user directly (see the GL_MESA_resize_buffers extension).
*/
void
void GLAPIENTRY
_mesa_ResizeBuffersMESA( void )
{
GLcontext *ctx = _mesa_get_current_context();
@@ -488,7 +488,7 @@ _mesa_ResizeBuffersMESA( void )
/*
* XXX move somewhere else someday?
*/
void
void GLAPIENTRY
_mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
{
GLcontext *ctx = _mesa_get_current_context();
@@ -520,7 +520,7 @@ _mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
* change flushes the vertices and notifies the driver via
* the dd_function_table::Scissor callback.
*/
void
void GLAPIENTRY
_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/buffers.h
+8 -8
View File
@@ -36,29 +36,29 @@
#include "mtypes.h"
extern void
extern void GLAPIENTRY
_mesa_ClearIndex( GLfloat c );
extern void
extern void GLAPIENTRY
_mesa_ClearColor( GLclampf red, GLclampf green,
GLclampf blue, GLclampf alpha );
extern void
extern void GLAPIENTRY
_mesa_Clear( GLbitfield mask );
extern void
extern void GLAPIENTRY
_mesa_DrawBuffer( GLenum mode );
extern void
extern void GLAPIENTRY
_mesa_ReadBuffer( GLenum mode );
extern void
extern void GLAPIENTRY
_mesa_ResizeBuffersMESA( void );
extern void
extern void GLAPIENTRY
_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height );
extern void
extern void GLAPIENTRY
_mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
extern void
src/mesa/main/clip.c
+2 -2
View File
@@ -41,7 +41,7 @@
void
void GLAPIENTRY
_mesa_ClipPlane( GLenum plane, const GLdouble *eq )
{
GET_CURRENT_CONTEXT(ctx);
@@ -98,7 +98,7 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
}
void
void GLAPIENTRY
_mesa_GetClipPlane( GLenum plane, GLdouble *equation )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/clip.h
+4 -2
View File
@@ -33,8 +33,10 @@
#include "mtypes.h"
extern void _mesa_ClipPlane( GLenum plane, const GLdouble *equation );
extern void GLAPIENTRY
_mesa_ClipPlane( GLenum plane, const GLdouble *equation );
extern void _mesa_GetClipPlane( GLenum plane, GLdouble *equation );
extern void GLAPIENTRY
_mesa_GetClipPlane( GLenum plane, GLdouble *equation );
#endif
src/mesa/main/colortab.c
+9 -9
View File
@@ -155,7 +155,7 @@ set_component_sizes( struct gl_color_table *table )
void
void GLAPIENTRY
_mesa_ColorTable( GLenum target, GLenum internalFormat,
GLsizei width, GLenum format, GLenum type,
const GLvoid *data )
@@ -439,7 +439,7 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat,
void
void GLAPIENTRY
_mesa_ColorSubTable( GLenum target, GLsizei start,
GLsizei count, GLenum format, GLenum type,
const GLvoid *data )
@@ -637,7 +637,7 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
/* XXX not tested */
void
void GLAPIENTRY
_mesa_CopyColorTable(GLenum target, GLenum internalformat,
GLint x, GLint y, GLsizei width)
{
@@ -651,7 +651,7 @@ _mesa_CopyColorTable(GLenum target, GLenum internalformat,
/* XXX not tested */
void
void GLAPIENTRY
_mesa_CopyColorSubTable(GLenum target, GLsizei start,
GLint x, GLint y, GLsizei width)
{
@@ -663,7 +663,7 @@ _mesa_CopyColorSubTable(GLenum target, GLsizei start,
void
void GLAPIENTRY
_mesa_GetColorTable( GLenum target, GLenum format,
GLenum type, GLvoid *data )
{
@@ -864,7 +864,7 @@ _mesa_GetColorTable( GLenum target, GLenum format,
void
void GLAPIENTRY
_mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -957,7 +957,7 @@ _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
void
void GLAPIENTRY
_mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
{
GLfloat fparams[4];
@@ -980,7 +980,7 @@ _mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
void
void GLAPIENTRY
_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -1154,7 +1154,7 @@ _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
void
void GLAPIENTRY
_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/colortab.h
+9 -9
View File
@@ -41,40 +41,40 @@
#if _HAVE_FULL_GL
extern void
extern void GLAPIENTRY
_mesa_ColorTable( GLenum target, GLenum internalformat,
GLsizei width, GLenum format, GLenum type,
const GLvoid *table );
extern void
extern void GLAPIENTRY
_mesa_ColorSubTable( GLenum target, GLsizei start,
GLsizei count, GLenum format, GLenum type,
const GLvoid *table );
extern void
extern void GLAPIENTRY
_mesa_CopyColorSubTable(GLenum target, GLsizei start,
GLint x, GLint y, GLsizei width);
extern void
extern void GLAPIENTRY
_mesa_CopyColorTable(GLenum target, GLenum internalformat,
GLint x, GLint y, GLsizei width);
extern void
extern void GLAPIENTRY
_mesa_GetColorTable( GLenum target, GLenum format,
GLenum type, GLvoid *table );
extern void
extern void GLAPIENTRY
_mesa_ColorTableParameterfv(GLenum target, GLenum pname,
const GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_ColorTableParameteriv(GLenum target, GLenum pname,
const GLint *params);
extern void
extern void GLAPIENTRY
_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params );
src/mesa/main/context.c
+2 -2
View File
@@ -1908,7 +1908,7 @@ _mesa_record_error( GLcontext *ctx, GLenum error )
* Calls the #ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH macro and the
* dd_function_table::Finish driver callback, if not NULL.
*/
void
void GLAPIENTRY
_mesa_Finish( void )
{
GET_CURRENT_CONTEXT(ctx);
@@ -1924,7 +1924,7 @@ _mesa_Finish( void )
* Calls the #ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH macro and the
* dd_function_table::Flush driver callback, if not NULL.
*/
void
void GLAPIENTRY
_mesa_Flush( void )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/context.h
+2 -2
View File
@@ -249,10 +249,10 @@ extern void
_mesa_record_error( GLcontext *ctx, GLenum error );
extern void
extern void GLAPIENTRY
_mesa_Finish( void );
extern void
extern void GLAPIENTRY
_mesa_Flush( void );
/*@}*/
src/mesa/main/convolve.c
+13 -13
View File
@@ -101,7 +101,7 @@ base_filter_format( GLenum format )
}
void
void GLAPIENTRY
_mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
{
GLint baseFormat;
@@ -174,7 +174,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
}
void
void GLAPIENTRY
_mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
{
GLint baseFormat;
@@ -257,7 +257,7 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G
}
void
void GLAPIENTRY
_mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)
{
GET_CURRENT_CONTEXT(ctx);
@@ -300,7 +300,7 @@ _mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)
}
void
void GLAPIENTRY
_mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -356,7 +356,7 @@ _mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
}
void
void GLAPIENTRY
_mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)
{
GET_CURRENT_CONTEXT(ctx);
@@ -399,7 +399,7 @@ _mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)
}
void
void GLAPIENTRY
_mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -468,7 +468,7 @@ _mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
}
void
void GLAPIENTRY
_mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width)
{
GLint baseFormat;
@@ -496,7 +496,7 @@ _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLi
}
void
void GLAPIENTRY
_mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height)
{
GLint baseFormat;
@@ -529,7 +529,7 @@ _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLi
}
void
void GLAPIENTRY
_mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
{
const struct gl_convolution_attrib *filter;
@@ -579,7 +579,7 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *im
}
void
void GLAPIENTRY
_mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -640,7 +640,7 @@ _mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
}
void
void GLAPIENTRY
_mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -710,7 +710,7 @@ _mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
}
void
void GLAPIENTRY
_mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
{
const GLint colStart = MAX_CONVOLUTION_WIDTH * 4;
@@ -768,7 +768,7 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row,
}
void
void GLAPIENTRY
_mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
{
const GLint colStart = MAX_CONVOLUTION_WIDTH * 4;
src/mesa/main/convolve.h
+13 -13
View File
@@ -32,51 +32,51 @@
#if _HAVE_FULL_GL
extern void
extern void GLAPIENTRY
_mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width,
GLenum format, GLenum type, const GLvoid *image);
extern void
extern void GLAPIENTRY
_mesa_ConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width,
GLsizei height, GLenum format, GLenum type,
const GLvoid *image);
extern void
extern void GLAPIENTRY
_mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat params);
extern void
extern void GLAPIENTRY
_mesa_ConvolutionParameterfv(GLenum target, GLenum pname,
const GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint params);
extern void
extern void GLAPIENTRY
_mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params);
extern void
extern void GLAPIENTRY
_mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalformat,
GLint x, GLint y, GLsizei width);
extern void
extern void GLAPIENTRY
_mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalformat,
GLint x, GLint y, GLsizei width, GLsizei height);
extern void
extern void GLAPIENTRY
_mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
GLvoid *image);
extern void
extern void GLAPIENTRY
_mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params);
extern void
extern void GLAPIENTRY
_mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
GLvoid *row, GLvoid *column, GLvoid *span);
extern void
extern void GLAPIENTRY
_mesa_SeparableFilter2D(GLenum target, GLenum internalformat,
GLsizei width, GLsizei height,
GLenum format, GLenum type,
src/mesa/main/dd.h
+61 -61
View File
@@ -896,66 +896,66 @@ typedef struct {
* \name Vertex
*/
/*@{*/
void (*ArrayElement)( GLint ); /* NOTE */
void (*Color3f)( GLfloat, GLfloat, GLfloat );
void (*Color3fv)( const GLfloat * );
void (*Color3ub)( GLubyte, GLubyte, GLubyte );
void (*Color3ubv)( const GLubyte * );
void (*Color4f)( GLfloat, GLfloat, GLfloat, GLfloat );
void (*Color4fv)( const GLfloat * );
void (*Color4ub)( GLubyte, GLubyte, GLubyte, GLubyte );
void (*Color4ubv)( const GLubyte * );
void (*EdgeFlag)( GLboolean );
void (*EdgeFlagv)( const GLboolean * );
void (*EvalCoord1f)( GLfloat ); /* NOTE */
void (*EvalCoord1fv)( const GLfloat * ); /* NOTE */
void (*EvalCoord2f)( GLfloat, GLfloat ); /* NOTE */
void (*EvalCoord2fv)( const GLfloat * ); /* NOTE */
void (*EvalPoint1)( GLint ); /* NOTE */
void (*EvalPoint2)( GLint, GLint ); /* NOTE */
void (*FogCoordfEXT)( GLfloat );
void (*FogCoordfvEXT)( const GLfloat * );
void (*Indexi)( GLint );
void (*Indexiv)( const GLint * );
void (*Materialfv)( GLenum face, GLenum pname, const GLfloat * ); /* NOTE */
void (*MultiTexCoord1fARB)( GLenum, GLfloat );
void (*MultiTexCoord1fvARB)( GLenum, const GLfloat * );
void (*MultiTexCoord2fARB)( GLenum, GLfloat, GLfloat );
void (*MultiTexCoord2fvARB)( GLenum, const GLfloat * );
void (*MultiTexCoord3fARB)( GLenum, GLfloat, GLfloat, GLfloat );
void (*MultiTexCoord3fvARB)( GLenum, const GLfloat * );
void (*MultiTexCoord4fARB)( GLenum, GLfloat, GLfloat, GLfloat, GLfloat );
void (*MultiTexCoord4fvARB)( GLenum, const GLfloat * );
void (*Normal3f)( GLfloat, GLfloat, GLfloat );
void (*Normal3fv)( const GLfloat * );
void (*SecondaryColor3fEXT)( GLfloat, GLfloat, GLfloat );
void (*SecondaryColor3fvEXT)( const GLfloat * );
void (*SecondaryColor3ubEXT)( GLubyte, GLubyte, GLubyte );
void (*SecondaryColor3ubvEXT)( const GLubyte * );
void (*TexCoord1f)( GLfloat );
void (*TexCoord1fv)( const GLfloat * );
void (*TexCoord2f)( GLfloat, GLfloat );
void (*TexCoord2fv)( const GLfloat * );
void (*TexCoord3f)( GLfloat, GLfloat, GLfloat );
void (*TexCoord3fv)( const GLfloat * );
void (*TexCoord4f)( GLfloat, GLfloat, GLfloat, GLfloat );
void (*TexCoord4fv)( const GLfloat * );
void (*Vertex2f)( GLfloat, GLfloat );
void (*Vertex2fv)( const GLfloat * );
void (*Vertex3f)( GLfloat, GLfloat, GLfloat );
void (*Vertex3fv)( const GLfloat * );
void (*Vertex4f)( GLfloat, GLfloat, GLfloat, GLfloat );
void (*Vertex4fv)( const GLfloat * );
void (*CallList)( GLuint ); /* NOTE */
void (*Begin)( GLenum );
void (*End)( void );
void (*VertexAttrib4fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w );
void (*VertexAttrib4fvNV)( GLuint index, const GLfloat *v );
void (GLAPIENTRYP ArrayElement)( GLint ); /* NOTE */
void (GLAPIENTRYP Color3f)( GLfloat, GLfloat, GLfloat );
void (GLAPIENTRYP Color3fv)( const GLfloat * );
void (GLAPIENTRYP Color3ub)( GLubyte, GLubyte, GLubyte );
void (GLAPIENTRYP Color3ubv)( const GLubyte * );
void (GLAPIENTRYP Color4f)( GLfloat, GLfloat, GLfloat, GLfloat );
void (GLAPIENTRYP Color4fv)( const GLfloat * );
void (GLAPIENTRYP Color4ub)( GLubyte, GLubyte, GLubyte, GLubyte );
void (GLAPIENTRYP Color4ubv)( const GLubyte * );
void (GLAPIENTRYP EdgeFlag)( GLboolean );
void (GLAPIENTRYP EdgeFlagv)( const GLboolean * );
void (GLAPIENTRYP EvalCoord1f)( GLfloat ); /* NOTE */
void (GLAPIENTRYP EvalCoord1fv)( const GLfloat * ); /* NOTE */
void (GLAPIENTRYP EvalCoord2f)( GLfloat, GLfloat ); /* NOTE */
void (GLAPIENTRYP EvalCoord2fv)( const GLfloat * ); /* NOTE */
void (GLAPIENTRYP EvalPoint1)( GLint ); /* NOTE */
void (GLAPIENTRYP EvalPoint2)( GLint, GLint ); /* NOTE */
void (GLAPIENTRYP FogCoordfEXT)( GLfloat );
void (GLAPIENTRYP FogCoordfvEXT)( const GLfloat * );
void (GLAPIENTRYP Indexi)( GLint );
void (GLAPIENTRYP Indexiv)( const GLint * );
void (GLAPIENTRYP Materialfv)( GLenum face, GLenum pname, const GLfloat * ); /* NOTE */
void (GLAPIENTRYP MultiTexCoord1fARB)( GLenum, GLfloat );
void (GLAPIENTRYP MultiTexCoord1fvARB)( GLenum, const GLfloat * );
void (GLAPIENTRYP MultiTexCoord2fARB)( GLenum, GLfloat, GLfloat );
void (GLAPIENTRYP MultiTexCoord2fvARB)( GLenum, const GLfloat * );
void (GLAPIENTRYP MultiTexCoord3fARB)( GLenum, GLfloat, GLfloat, GLfloat );
void (GLAPIENTRYP MultiTexCoord3fvARB)( GLenum, const GLfloat * );
void (GLAPIENTRYP MultiTexCoord4fARB)( GLenum, GLfloat, GLfloat, GLfloat, GLfloat );
void (GLAPIENTRYP MultiTexCoord4fvARB)( GLenum, const GLfloat * );
void (GLAPIENTRYP Normal3f)( GLfloat, GLfloat, GLfloat );
void (GLAPIENTRYP Normal3fv)( const GLfloat * );
void (GLAPIENTRYP SecondaryColor3fEXT)( GLfloat, GLfloat, GLfloat );
void (GLAPIENTRYP SecondaryColor3fvEXT)( const GLfloat * );
void (GLAPIENTRYP SecondaryColor3ubEXT)( GLubyte, GLubyte, GLubyte );
void (GLAPIENTRYP SecondaryColor3ubvEXT)( const GLubyte * );
void (GLAPIENTRYP TexCoord1f)( GLfloat );
void (GLAPIENTRYP TexCoord1fv)( const GLfloat * );
void (GLAPIENTRYP TexCoord2f)( GLfloat, GLfloat );
void (GLAPIENTRYP TexCoord2fv)( const GLfloat * );
void (GLAPIENTRYP TexCoord3f)( GLfloat, GLfloat, GLfloat );
void (GLAPIENTRYP TexCoord3fv)( const GLfloat * );
void (GLAPIENTRYP TexCoord4f)( GLfloat, GLfloat, GLfloat, GLfloat );
void (GLAPIENTRYP TexCoord4fv)( const GLfloat * );
void (GLAPIENTRYP Vertex2f)( GLfloat, GLfloat );
void (GLAPIENTRYP Vertex2fv)( const GLfloat * );
void (GLAPIENTRYP Vertex3f)( GLfloat, GLfloat, GLfloat );
void (GLAPIENTRYP Vertex3fv)( const GLfloat * );
void (GLAPIENTRYP Vertex4f)( GLfloat, GLfloat, GLfloat, GLfloat );
void (GLAPIENTRYP Vertex4fv)( const GLfloat * );
void (GLAPIENTRYP CallList)( GLuint ); /* NOTE */
void (GLAPIENTRYP Begin)( GLenum );
void (GLAPIENTRYP End)( void );
void (GLAPIENTRYP VertexAttrib4fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w );
void (GLAPIENTRYP VertexAttrib4fvNV)( GLuint index, const GLfloat *v );
/*@}*/
/*
*/
void (*Rectf)( GLfloat, GLfloat, GLfloat, GLfloat );
void (GLAPIENTRYP Rectf)( GLfloat, GLfloat, GLfloat, GLfloat );
/**
* \name Array
@@ -965,10 +965,10 @@ typedef struct {
* its current size natively.
*/
/*@{*/
void (*DrawArrays)( GLenum mode, GLint start, GLsizei count );
void (*DrawElements)( GLenum mode, GLsizei count, GLenum type,
void (GLAPIENTRYP DrawArrays)( GLenum mode, GLint start, GLsizei count );
void (GLAPIENTRYP DrawElements)( GLenum mode, GLsizei count, GLenum type,
const GLvoid *indices );
void (*DrawRangeElements)( GLenum mode, GLuint start,
void (GLAPIENTRYP DrawRangeElements)( GLenum mode, GLuint start,
GLuint end, GLsizei count,
GLenum type, const GLvoid *indices );
/*@}*/
@@ -984,8 +984,8 @@ typedef struct {
* accelerated vertex formats, eventually...
*/
/*@{*/
void (*EvalMesh1)( GLenum mode, GLint i1, GLint i2 );
void (*EvalMesh2)( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
void (GLAPIENTRYP EvalMesh1)( GLenum mode, GLint i1, GLint i2 );
void (GLAPIENTRYP EvalMesh2)( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
/*@}*/
/**
src/mesa/main/depth.c
+4 -4
View File
@@ -39,7 +39,7 @@
void
void GLAPIENTRY
_mesa_ClearDepth( GLclampd depth )
{
GET_CURRENT_CONTEXT(ctx);
@@ -58,7 +58,7 @@ _mesa_ClearDepth( GLclampd depth )
void
void GLAPIENTRY
_mesa_DepthFunc( GLenum func )
{
GET_CURRENT_CONTEXT(ctx);
@@ -94,7 +94,7 @@ _mesa_DepthFunc( GLenum func )
void
void GLAPIENTRY
_mesa_DepthMask( GLboolean flag )
{
GET_CURRENT_CONTEXT(ctx);
@@ -120,7 +120,7 @@ _mesa_DepthMask( GLboolean flag )
/* GL_EXT_depth_bounds_test */
void
void GLAPIENTRY
_mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/depth.h
+4 -4
View File
@@ -37,19 +37,19 @@
#if _HAVE_FULL_GL
extern void
extern void GLAPIENTRY
_mesa_ClearDepth( GLclampd depth );
extern void
extern void GLAPIENTRY
_mesa_DepthFunc( GLenum func );
extern void
extern void GLAPIENTRY
_mesa_DepthMask( GLboolean flag );
extern void
_mesa_init_depth( GLcontext * ctx );
extern void
extern void GLAPIENTRY
_mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax );
#else
src/mesa/main/dispatch.c
+1 -1
View File
@@ -41,7 +41,7 @@
#include "glthread.h"
#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM)) || defined(__SCITECH_SNAP__)
#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM))
#if defined(WIN32)
#define KEYWORD1 GLAPI
src/mesa/main/dlist.c
+334 -334
View File
File diff suppressed because it is too large Load Diff
src/mesa/main/dlist.h
+12 -12
View File
@@ -42,21 +42,21 @@ extern void _mesa_init_lists( void );
extern void _mesa_destroy_list( GLcontext *ctx, GLuint list );
extern void _mesa_CallList( GLuint list );
extern void GLAPIENTRY _mesa_CallList( GLuint list );
extern void _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
extern void _mesa_DeleteLists( GLuint list, GLsizei range );
extern void GLAPIENTRY _mesa_DeleteLists( GLuint list, GLsizei range );
extern void _mesa_EndList( void );
extern void GLAPIENTRY _mesa_EndList( void );
extern GLuint _mesa_GenLists( GLsizei range );
extern GLuint GLAPIENTRY _mesa_GenLists( GLsizei range );
extern GLboolean _mesa_IsList( GLuint list );
extern GLboolean GLAPIENTRY _mesa_IsList( GLuint list );
extern void _mesa_ListBase( GLuint base );
extern void GLAPIENTRY _mesa_ListBase( GLuint base );
extern void _mesa_NewList( GLuint list, GLenum mode );
extern void GLAPIENTRY _mesa_NewList( GLuint list, GLenum mode );
extern void _mesa_init_dlist_table( struct _glapi_table *table,
GLuint tableSize );
@@ -73,11 +73,11 @@ extern int _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
void (*destroy)( GLcontext *, void * ),
void (*print)( GLcontext *, void * ) );
extern void _mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2,
extern void GLAPIENTRY _mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2,
GLint j1, GLint j2 );
extern void _mesa_save_EvalMesh1( GLenum mode, GLint i1, GLint i2 );
extern void _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
extern void _mesa_save_CallList( GLuint list );
extern void GLAPIENTRY _mesa_save_EvalMesh1( GLenum mode, GLint i1, GLint i2 );
extern void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
extern void GLAPIENTRY _mesa_save_CallList( GLuint list );
extern void _mesa_init_display_list( GLcontext * ctx );
#else
src/mesa/main/drawpix.c
+5 -5
View File
@@ -38,7 +38,7 @@
/*
* Execute glDrawPixels
*/
void
void GLAPIENTRY
_mesa_DrawPixels( GLsizei width, GLsizei height,
GLenum format, GLenum type, const GLvoid *pixels )
{
@@ -87,7 +87,7 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
}
}
void
void GLAPIENTRY
_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
GLenum type )
{
@@ -139,7 +139,7 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
void
void GLAPIENTRY
_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
GLenum format, GLenum type, GLvoid *pixels )
{
@@ -168,7 +168,7 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
void
void GLAPIENTRY
_mesa_Bitmap( GLsizei width, GLsizei height,
GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,
const GLubyte *bitmap )
@@ -232,7 +232,7 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
* Z-compositing. Normally, this operation requires two glDrawPixels
* calls with stencil testing.
*/
void
void GLAPIENTRY
_mesa_DrawDepthPixelsMESA( GLsizei width, GLsizei height,
GLenum colorFormat, GLenum colorType,
const GLvoid *colors,
src/mesa/main/drawpix.h
+4 -4
View File
@@ -31,22 +31,22 @@
#include "mtypes.h"
extern void
extern void GLAPIENTRY
_mesa_DrawPixels( GLsizei width, GLsizei height,
GLenum format, GLenum type, const GLvoid *pixels );
extern void
extern void GLAPIENTRY
_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
GLenum format, GLenum type, GLvoid *pixels );
extern void
extern void GLAPIENTRY
_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
GLenum type );
extern void
extern void GLAPIENTRY
_mesa_Bitmap( GLsizei width, GLsizei height,
GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,
const GLubyte *bitmap );
src/mesa/main/enable.c
+5 -5
View File
@@ -156,7 +156,7 @@ client_state( GLcontext *ctx, GLenum cap, GLboolean state )
* Get's the current context, assures that we're outside glBegin()/glEnd() and
* calls client_state().
*/
void
void GLAPIENTRY
_mesa_EnableClientState( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
@@ -175,7 +175,7 @@ _mesa_EnableClientState( GLenum cap )
* Get's the current context, assures that we're outside glBegin()/glEnd() and
* calls client_state().
*/
void
void GLAPIENTRY
_mesa_DisableClientState( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
@@ -1009,7 +1009,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
* Get's the current context, assures that we're outside glBegin()/glEnd() and
* calls _mesa_set_enable().
*/
void
void GLAPIENTRY
_mesa_Enable( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
@@ -1029,7 +1029,7 @@ _mesa_Enable( GLenum cap )
* Get's the current context, assures that we're outside glBegin()/glEnd() and
* calls _mesa_set_enable().
*/
void
void GLAPIENTRY
_mesa_Disable( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
@@ -1056,7 +1056,7 @@ _mesa_Disable( GLenum cap )
* For the capabilities associated with extensions verifies that those
* extensions are effectively present before reporting.
*/
GLboolean
GLboolean GLAPIENTRY
_mesa_IsEnabled( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/enable.h
+5 -5
View File
@@ -38,19 +38,19 @@
extern void
_mesa_set_enable( GLcontext* ctx, GLenum cap, GLboolean state );
extern void
extern void GLAPIENTRY
_mesa_Disable( GLenum cap );
extern void
extern void GLAPIENTRY
_mesa_Enable( GLenum cap );
extern GLboolean
extern GLboolean GLAPIENTRY
_mesa_IsEnabled( GLenum cap );
extern void
extern void GLAPIENTRY
_mesa_EnableClientState( GLenum cap );
extern void
extern void GLAPIENTRY
_mesa_DisableClientState( GLenum cap );
src/mesa/main/eval.c
+11 -11
View File
@@ -417,7 +417,7 @@ map1(GLenum target, GLfloat u1, GLfloat u2, GLint ustride,
void
void GLAPIENTRY
_mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride,
GLint order, const GLfloat *points )
{
@@ -425,7 +425,7 @@ _mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride,
}
void
void GLAPIENTRY
_mesa_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride,
GLint order, const GLdouble *points )
{
@@ -516,7 +516,7 @@ map2( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
}
void
void GLAPIENTRY
_mesa_Map2f( GLenum target,
GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
@@ -527,7 +527,7 @@ _mesa_Map2f( GLenum target,
}
void
void GLAPIENTRY
_mesa_Map2d( GLenum target,
GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
@@ -539,7 +539,7 @@ _mesa_Map2d( GLenum target,
void
void GLAPIENTRY
_mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v )
{
GET_CURRENT_CONTEXT(ctx);
@@ -604,7 +604,7 @@ _mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v )
}
void
void GLAPIENTRY
_mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v )
{
GET_CURRENT_CONTEXT(ctx);
@@ -669,7 +669,7 @@ _mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v )
}
void
void GLAPIENTRY
_mesa_GetMapiv( GLenum target, GLenum query, GLint *v )
{
GET_CURRENT_CONTEXT(ctx);
@@ -735,7 +735,7 @@ _mesa_GetMapiv( GLenum target, GLenum query, GLint *v )
void
void GLAPIENTRY
_mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 )
{
GET_CURRENT_CONTEXT(ctx);
@@ -753,14 +753,14 @@ _mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 )
}
void
void GLAPIENTRY
_mesa_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 )
{
_mesa_MapGrid1f( un, (GLfloat) u1, (GLfloat) u2 );
}
void
void GLAPIENTRY
_mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2,
GLint vn, GLfloat v1, GLfloat v2 )
{
@@ -788,7 +788,7 @@ _mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2,
}
void
void GLAPIENTRY
_mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,
GLint vn, GLdouble v1, GLdouble v2 )
{
src/mesa/main/eval.h
+11 -11
View File
@@ -72,47 +72,47 @@ extern GLfloat *_mesa_copy_map_points2d(GLenum target,
extern void
extern void GLAPIENTRY
_mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride,
GLint order, const GLfloat *points );
extern void
extern void GLAPIENTRY
_mesa_Map2f( GLenum target,
GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
const GLfloat *points );
extern void
extern void GLAPIENTRY
_mesa_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride,
GLint order, const GLdouble *points );
extern void
extern void GLAPIENTRY
_mesa_Map2d( GLenum target,
GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
const GLdouble *points );
extern void
extern void GLAPIENTRY
_mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 );
extern void
extern void GLAPIENTRY
_mesa_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 );
extern void
extern void GLAPIENTRY
_mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2,
GLint vn, GLfloat v1, GLfloat v2 );
extern void
extern void GLAPIENTRY
_mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,
GLint vn, GLdouble v1, GLdouble v2 );
extern void
extern void GLAPIENTRY
_mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v );
extern void
extern void GLAPIENTRY
_mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v );
extern void
extern void GLAPIENTRY
_mesa_GetMapiv( GLenum target, GLenum query, GLint *v );
#else
src/mesa/main/feedback.c
+8 -8
View File
@@ -48,7 +48,7 @@
void
void GLAPIENTRY
_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
{
GET_CURRENT_CONTEXT(ctx);
@@ -102,7 +102,7 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
}
void
void GLAPIENTRY
_mesa_PassThrough( GLfloat token )
{
GET_CURRENT_CONTEXT(ctx);
@@ -171,7 +171,7 @@ void _mesa_feedback_vertex( GLcontext *ctx,
* Verifies we're not in selection mode, flushes the vertices and initialize
* the fields in __GLcontextRec::Select with the given buffer.
*/
void
void GLAPIENTRY
_mesa_SelectBuffer( GLsizei size, GLuint *buffer )
{
GET_CURRENT_CONTEXT(ctx);
@@ -273,7 +273,7 @@ static void write_hit_record( GLcontext *ctx )
* the hit record data in gl_selection. Marks new render mode in
* __GLcontextRec::NewState.
*/
void
void GLAPIENTRY
_mesa_InitNames( void )
{
GET_CURRENT_CONTEXT(ctx);
@@ -304,7 +304,7 @@ _mesa_InitNames( void )
*
* sa __GLcontextRec::Select.
*/
void
void GLAPIENTRY
_mesa_LoadName( GLuint name )
{
GET_CURRENT_CONTEXT(ctx);
@@ -343,7 +343,7 @@ _mesa_LoadName( GLuint name )
*
* sa __GLcontextRec::Select.
*/
void
void GLAPIENTRY
_mesa_PushName( GLuint name )
{
GET_CURRENT_CONTEXT(ctx);
@@ -374,7 +374,7 @@ _mesa_PushName( GLuint name )
*
* sa __GLcontextRec::Select.
*/
void
void GLAPIENTRY
_mesa_PopName( void )
{
GET_CURRENT_CONTEXT(ctx);
@@ -417,7 +417,7 @@ _mesa_PopName( void )
* __GLcontextRec::RenderMode and notifies the driver via the
* dd_function_table::RenderMode callback.
*/
GLint
GLint GLAPIENTRY
_mesa_RenderMode( GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/feedback.h
+8 -8
View File
@@ -54,28 +54,28 @@ extern void _mesa_feedback_vertex( GLcontext *ctx,
extern void _mesa_update_hitflag( GLcontext *ctx, GLfloat z );
extern void
extern void GLAPIENTRY
_mesa_PassThrough( GLfloat token );
extern void
extern void GLAPIENTRY
_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
extern void
extern void GLAPIENTRY
_mesa_SelectBuffer( GLsizei size, GLuint *buffer );
extern void
extern void GLAPIENTRY
_mesa_InitNames( void );
extern void
extern void GLAPIENTRY
_mesa_LoadName( GLuint name );
extern void
extern void GLAPIENTRY
_mesa_PushName( GLuint name );
extern void
extern void GLAPIENTRY
_mesa_PopName( void );
extern GLint
extern GLint GLAPIENTRY
_mesa_RenderMode( GLenum mode );
src/mesa/main/fog.c
+4 -4
View File
@@ -31,14 +31,14 @@
void
void GLAPIENTRY
_mesa_Fogf(GLenum pname, GLfloat param)
{
_mesa_Fogfv(pname, &param);
}
void
void GLAPIENTRY
_mesa_Fogi(GLenum pname, GLint param )
{
GLfloat fparam = (GLfloat) param;
@@ -46,7 +46,7 @@ _mesa_Fogi(GLenum pname, GLint param )
}
void
void GLAPIENTRY
_mesa_Fogiv(GLenum pname, const GLint *params )
{
GLfloat p[4];
@@ -73,7 +73,7 @@ _mesa_Fogiv(GLenum pname, const GLint *params )
}
void
void GLAPIENTRY
_mesa_Fogfv( GLenum pname, const GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/fog.h
+4 -4
View File
@@ -42,16 +42,16 @@
#if _HAVE_FULL_GL
extern void
extern void GLAPIENTRY
_mesa_Fogf(GLenum pname, GLfloat param);
extern void
extern void GLAPIENTRY
_mesa_Fogi(GLenum pname, GLint param );
extern void
extern void GLAPIENTRY
_mesa_Fogfv(GLenum pname, const GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_Fogiv(GLenum pname, const GLint *params );
extern void _mesa_init_fog( GLcontext * ctx );
src/mesa/main/get.c
+7 -7
View File
@@ -133,7 +133,7 @@ pixel_texgen_mode(const GLcontext *ctx)
* otherwise gets the specified parameter from the current context, converting
* it value into GLboolean.
*/
void
void GLAPIENTRY
_mesa_GetBooleanv( GLenum pname, GLboolean *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -1676,7 +1676,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
* otherwise gets the specified parameter from the current context, converting
* it value into GLdouble.
*/
void
void GLAPIENTRY
_mesa_GetDoublev( GLenum pname, GLdouble *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -3213,7 +3213,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
* otherwise gets the specified parameter from the current context, converting
* it value into GLfloat.
*/
void
void GLAPIENTRY
_mesa_GetFloatv( GLenum pname, GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -4726,7 +4726,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
* otherwise gets the specified parameter from the current context, converting
* it value into GLinteger.
*/
void
void GLAPIENTRY
_mesa_GetIntegerv( GLenum pname, GLint *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -6276,7 +6276,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
* Tries to get the specified pointer via dd_function_table::GetPointerv,
* otherwise gets the specified pointer from the current context.
*/
void
void GLAPIENTRY
_mesa_GetPointerv( GLenum pname, GLvoid **params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -6371,7 +6371,7 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
* Tries to get the string from dd_function_table::GetString, otherwise returns
* the hardcoded strings.
*/
const GLubyte *
const GLubyte * GLAPIENTRY
_mesa_GetString( GLenum name )
{
GET_CURRENT_CONTEXT(ctx);
@@ -6466,7 +6466,7 @@ _mesa_GetString( GLenum name )
*
* Returns __GLcontextRec::ErrorValue.
*/
GLenum
GLenum GLAPIENTRY
_mesa_GetError( void )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/get.h
+7 -7
View File
@@ -35,25 +35,25 @@
#include "mtypes.h"
extern void
extern void GLAPIENTRY
_mesa_GetBooleanv( GLenum pname, GLboolean *params );
extern void
extern void GLAPIENTRY
_mesa_GetDoublev( GLenum pname, GLdouble *params );
extern void
extern void GLAPIENTRY
_mesa_GetFloatv( GLenum pname, GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_GetIntegerv( GLenum pname, GLint *params );
extern void
extern void GLAPIENTRY
_mesa_GetPointerv( GLenum pname, GLvoid **params );
extern const GLubyte *
extern const GLubyte * GLAPIENTRY
_mesa_GetString( GLenum name );
extern GLenum
extern GLenum GLAPIENTRY
_mesa_GetError( void );
#endif
src/mesa/main/hint.c
+1 -1
View File
@@ -32,7 +32,7 @@
void
void GLAPIENTRY
_mesa_Hint( GLenum target, GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/hint.h
+1 -1
View File
@@ -41,7 +41,7 @@
#if _HAVE_FULL_GL
extern void
extern void GLAPIENTRY
_mesa_Hint( GLenum target, GLenum mode );
extern void
src/mesa/main/histogram.c
+10 -10
View File
@@ -662,7 +662,7 @@ base_histogram_format( GLenum format )
*/
void
void GLAPIENTRY
_mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
{
GET_CURRENT_CONTEXT(ctx);
@@ -729,7 +729,7 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
}
void
void GLAPIENTRY
_mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
{
GET_CURRENT_CONTEXT(ctx);
@@ -792,7 +792,7 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, G
}
void
void GLAPIENTRY
_mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -839,7 +839,7 @@ _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
}
void
void GLAPIENTRY
_mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -886,7 +886,7 @@ _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
}
void
void GLAPIENTRY
_mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -912,7 +912,7 @@ _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
}
void
void GLAPIENTRY
_mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -938,7 +938,7 @@ _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
}
void
void GLAPIENTRY
_mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink)
{
GLuint i;
@@ -1021,7 +1021,7 @@ _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean s
}
void
void GLAPIENTRY
_mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
{
GET_CURRENT_CONTEXT(ctx);
@@ -1049,7 +1049,7 @@ _mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
}
void
void GLAPIENTRY
_mesa_ResetHistogram(GLenum target)
{
GLuint i;
@@ -1077,7 +1077,7 @@ _mesa_ResetHistogram(GLenum target)
}
void
void GLAPIENTRY
_mesa_ResetMinmax(GLenum target)
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/histogram.h
+20 -10
View File
@@ -48,25 +48,35 @@ extern void
_mesa_update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
extern void _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values);
extern void GLAPIENTRY
_mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values);
extern void _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
extern void GLAPIENTRY
_mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
extern void _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params);
extern void GLAPIENTRY
_mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params);
extern void _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params);
extern void GLAPIENTRY
_mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params);
extern void _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params);
extern void GLAPIENTRY
_mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params);
extern void _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params);
extern void GLAPIENTRY
_mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params);
extern void _mesa_Histogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
extern void GLAPIENTRY
_mesa_Histogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
extern void _mesa_Minmax(GLenum target, GLenum internalformat, GLboolean sink);
extern void GLAPIENTRY
_mesa_Minmax(GLenum target, GLenum internalformat, GLboolean sink);
extern void _mesa_ResetHistogram(GLenum target);
extern void GLAPIENTRY
_mesa_ResetHistogram(GLenum target);
extern void _mesa_ResetMinmax(GLenum target);
extern void GLAPIENTRY
_mesa_ResetMinmax(GLenum target);
extern void
_mesa_update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
src/mesa/main/light.c
+14 -14
View File
@@ -34,7 +34,7 @@
#include "math/m_matrix.h"
void
void GLAPIENTRY
_mesa_ShadeModel( GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
@@ -59,14 +59,14 @@ _mesa_ShadeModel( GLenum mode )
}
void
void GLAPIENTRY
_mesa_Lightf( GLenum light, GLenum pname, GLfloat param )
{
_mesa_Lightfv( light, pname, &param );
}
void
void GLAPIENTRY
_mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -192,14 +192,14 @@ _mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params )
}
void
void GLAPIENTRY
_mesa_Lighti( GLenum light, GLenum pname, GLint param )
{
_mesa_Lightiv( light, pname, &param );
}
void
void GLAPIENTRY
_mesa_Lightiv( GLenum light, GLenum pname, const GLint *params )
{
GLfloat fparam[4];
@@ -241,7 +241,7 @@ _mesa_Lightiv( GLenum light, GLenum pname, const GLint *params )
void
void GLAPIENTRY
_mesa_GetLightfv( GLenum light, GLenum pname, GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -291,7 +291,7 @@ _mesa_GetLightfv( GLenum light, GLenum pname, GLfloat *params )
}
void
void GLAPIENTRY
_mesa_GetLightiv( GLenum light, GLenum pname, GLint *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -361,7 +361,7 @@ _mesa_GetLightiv( GLenum light, GLenum pname, GLint *params )
/**********************************************************************/
void
void GLAPIENTRY
_mesa_LightModelfv( GLenum pname, const GLfloat *params )
{
GLenum newenum;
@@ -428,7 +428,7 @@ _mesa_LightModelfv( GLenum pname, const GLfloat *params )
}
void
void GLAPIENTRY
_mesa_LightModeliv( GLenum pname, const GLint *params )
{
GLfloat fparam[4];
@@ -453,14 +453,14 @@ _mesa_LightModeliv( GLenum pname, const GLint *params )
}
void
void GLAPIENTRY
_mesa_LightModeli( GLenum pname, GLint param )
{
_mesa_LightModeliv( pname, &param );
}
void
void GLAPIENTRY
_mesa_LightModelf( GLenum pname, GLfloat param )
{
_mesa_LightModelfv( pname, &param );
@@ -649,7 +649,7 @@ _mesa_update_color_material( GLcontext *ctx, const GLfloat color[4] )
}
void
void GLAPIENTRY
_mesa_ColorMaterial( GLenum face, GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
@@ -687,7 +687,7 @@ _mesa_ColorMaterial( GLenum face, GLenum mode )
}
void
void GLAPIENTRY
_mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -733,7 +733,7 @@ _mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params )
}
void
void GLAPIENTRY
_mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/light.h
+14 -14
View File
@@ -34,47 +34,47 @@
#include "mtypes.h"
extern void
extern void GLAPIENTRY
_mesa_ShadeModel( GLenum mode );
#if _HAVE_FULL_GL
extern void
extern void GLAPIENTRY
_mesa_ColorMaterial( GLenum face, GLenum mode );
extern void
extern void GLAPIENTRY
_mesa_Lightf( GLenum light, GLenum pname, GLfloat param );
extern void
extern void GLAPIENTRY
_mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_Lightiv( GLenum light, GLenum pname, const GLint *params );
extern void
extern void GLAPIENTRY
_mesa_Lighti( GLenum light, GLenum pname, GLint param );
extern void
extern void GLAPIENTRY
_mesa_LightModelf( GLenum pname, GLfloat param );
extern void
extern void GLAPIENTRY
_mesa_LightModelfv( GLenum pname, const GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_LightModeli( GLenum pname, GLint param );
extern void
extern void GLAPIENTRY
_mesa_LightModeliv( GLenum pname, const GLint *params );
extern void
extern void GLAPIENTRY
_mesa_GetLightfv( GLenum light, GLenum pname, GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_GetLightiv( GLenum light, GLenum pname, GLint *params );
extern void
extern void GLAPIENTRY
_mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params );
src/mesa/main/lines.c
+2 -2
View File
@@ -50,7 +50,7 @@
* width is different from one. Notifies the driver via the
* dd_function_table::LineWidth callback.
*/
void
void GLAPIENTRY
_mesa_LineWidth( GLfloat width )
{
GET_CURRENT_CONTEXT(ctx);
@@ -93,7 +93,7 @@ _mesa_LineWidth( GLfloat width )
* change flushes the vertices and notifies the driver via
* the dd_function_table::LineStipple callback.
*/
void
void GLAPIENTRY
_mesa_LineStipple( GLint factor, GLushort pattern )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/lines.h
+3 -3
View File
@@ -36,13 +36,13 @@
#include "mtypes.h"
extern void
extern void GLAPIENTRY
_mesa_LineWidth( GLfloat width );
extern void
extern void GLAPIENTRY
_mesa_LineStipple( GLint factor, GLushort pattern );
extern void
extern void GLAPIENTRY
_mesa_init_line( GLcontext * ctx );
#endif
src/mesa/main/macros.h
+300 -301
View File
@@ -44,45 +44,45 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
#define UBYTE_TO_FLOAT(u) _mesa_ubyte_to_float_color_tab[(unsigned int)(u)]
/** Convert GLfloat in [0.0,1.0] to GLubyte in [0,255] */
#define FLOAT_TO_UBYTE(X) ((GLubyte) (GLint) ((X) * 255.0F))
#define FLOAT_TO_UBYTE(X) ((GLubyte) (GLint) ((X) * 255.0F))
/** Convert GLbyte in [-128,127] to GLfloat in [-1.0,1.0] */
#define BYTE_TO_FLOAT(B) ((2.0F * (B) + 1.0F) * (1.0F/255.0F))
#define BYTE_TO_FLOAT(B) ((2.0F * (B) + 1.0F) * (1.0F/255.0F))
/** Convert GLfloat in [-1.0,1.0] to GLbyte in [-128,127] */
#define FLOAT_TO_BYTE(X) ( (((GLint) (255.0F * (X))) - 1) / 2 )
#define FLOAT_TO_BYTE(X) ( (((GLint) (255.0F * (X))) - 1) / 2 )
/** Convert GLushort in [0,65536] to GLfloat in [0.0,1.0] */
#define USHORT_TO_FLOAT(S) ((GLfloat) (S) * (1.0F / 65535.0F))
#define USHORT_TO_FLOAT(S) ((GLfloat) (S) * (1.0F / 65535.0F))
/** Convert GLfloat in [0.0,1.0] to GLushort in [0,65536] */
#define FLOAT_TO_USHORT(X) ((GLushort) (GLint) ((X) * 65535.0F))
#define FLOAT_TO_USHORT(X) ((GLushort) (GLint) ((X) * 65535.0F))
/** Convert GLshort in [-32768,32767] to GLfloat in [-1.0,1.0] */
#define SHORT_TO_FLOAT(S) ((2.0F * (S) + 1.0F) * (1.0F/65535.0F))
#define SHORT_TO_FLOAT(S) ((2.0F * (S) + 1.0F) * (1.0F/65535.0F))
/** Convert GLfloat in [0.0,1.0] to GLshort in [-32768,32767] */
#define FLOAT_TO_SHORT(X) ( (((GLint) (65535.0F * (X))) - 1) / 2 )
#define FLOAT_TO_SHORT(X) ( (((GLint) (65535.0F * (X))) - 1) / 2 )
/** Convert GLuint in [0,4294967295] to GLfloat in [0.0,1.0] */
#define UINT_TO_FLOAT(U) ((GLfloat) (U) * (1.0F / 4294967295.0F))
#define UINT_TO_FLOAT(U) ((GLfloat) (U) * (1.0F / 4294967295.0F))
/** Convert GLfloat in [0.0,1.0] to GLuint in [0,4294967295] */
#define FLOAT_TO_UINT(X) ((GLuint) ((X) * 4294967295.0))
#define FLOAT_TO_UINT(X) ((GLuint) ((X) * 4294967295.0))
/** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0] */
#define INT_TO_FLOAT(I) ((2.0F * (I) + 1.0F) * (1.0F/4294967294.0F))
#define INT_TO_FLOAT(I) ((2.0F * (I) + 1.0F) * (1.0F/4294967294.0F))
/** Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647] */
/* causes overflow:
#define FLOAT_TO_INT(X) ( (((GLint) (4294967294.0F * (X))) - 1) / 2 )
#define FLOAT_TO_INT(X) ( (((GLint) (4294967294.0F * (X))) - 1) / 2 )
*/
/* a close approximation: */
#define FLOAT_TO_INT(X) ( (GLint) (2147483647.0 * (X)) )
#define FLOAT_TO_INT(X) ( (GLint) (2147483647.0 * (X)) )
#define BYTE_TO_UBYTE(b) ((GLubyte) ((b) < 0 ? 0 : (GLubyte) (b)))
@@ -122,13 +122,13 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
/*@{*/
/** Zero */
#define ZERO_4V( DST ) (DST)[0] = (DST)[1] = (DST)[2] = (DST)[3] = 0
#define ZERO_4V( DST ) (DST)[0] = (DST)[1] = (DST)[2] = (DST)[3] = 0
/** Test for equality */
#define TEST_EQ_4V(a,b) ((a)[0] == (b)[0] && \
(a)[1] == (b)[1] && \
(a)[2] == (b)[2] && \
(a)[3] == (b)[3])
#define TEST_EQ_4V(a,b) ((a)[0] == (b)[0] && \
(a)[1] == (b)[1] && \
(a)[2] == (b)[2] && \
(a)[3] == (b)[3])
/** Test for equality (unsigned bytes) */
#if defined(__i386__)
@@ -138,149 +138,148 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
#endif
/** Copy a 4-element vector */
#define COPY_4V( DST, SRC ) \
do { \
(DST)[0] = (SRC)[0]; \
(DST)[1] = (SRC)[1]; \
(DST)[2] = (SRC)[2]; \
(DST)[3] = (SRC)[3]; \
#define COPY_4V( DST, SRC ) \
do { \
(DST)[0] = (SRC)[0]; \
(DST)[1] = (SRC)[1]; \
(DST)[2] = (SRC)[2]; \
(DST)[3] = (SRC)[3]; \
} while (0)
/** Copy a 4-element vector with cast */
#define COPY_4V_CAST( DST, SRC, CAST ) \
do { \
(DST)[0] = (CAST)(SRC)[0]; \
(DST)[1] = (CAST)(SRC)[1]; \
(DST)[2] = (CAST)(SRC)[2]; \
(DST)[3] = (CAST)(SRC)[3]; \
#define COPY_4V_CAST( DST, SRC, CAST ) \
do { \
(DST)[0] = (CAST)(SRC)[0]; \
(DST)[1] = (CAST)(SRC)[1]; \
(DST)[2] = (CAST)(SRC)[2]; \
(DST)[3] = (CAST)(SRC)[3]; \
} while (0)
/** Copy a 4-element unsigned byte vector */
#if defined(__i386__)
#define COPY_4UBV(DST, SRC) \
do { \
*((GLuint*)(DST)) = *((GLuint*)(SRC)); \
#define COPY_4UBV(DST, SRC) \
do { \
*((GLuint*)(DST)) = *((GLuint*)(SRC)); \
} while (0)
#else
/* The GLuint cast might fail if DST or SRC are not dword-aligned (RISC) */
#define COPY_4UBV(DST, SRC) \
do { \
(DST)[0] = (SRC)[0]; \
(DST)[1] = (SRC)[1]; \
(DST)[2] = (SRC)[2]; \
(DST)[3] = (SRC)[3]; \
#define COPY_4UBV(DST, SRC) \
do { \
(DST)[0] = (SRC)[0]; \
(DST)[1] = (SRC)[1]; \
(DST)[2] = (SRC)[2]; \
(DST)[3] = (SRC)[3]; \
} while (0)
#endif
/** Copy a 4-element float vector */
#define COPY_4FV( DST, SRC ) \
do { \
const GLfloat *_tmp = (SRC); \
(DST)[0] = _tmp[0]; \
(DST)[1] = _tmp[1]; \
(DST)[2] = _tmp[2]; \
(DST)[3] = _tmp[3]; \
/** Copy a 4-element float vector (Use COPY_FLOAT to avoid loading FPU) */
#define COPY_4FV( DST, SRC ) \
do { \
COPY_FLOAT((DST)[0], (SRC)[0]); \
COPY_FLOAT((DST)[1], (SRC)[1]); \
COPY_FLOAT((DST)[2], (SRC)[2]); \
COPY_FLOAT((DST)[3], (SRC)[3]); \
} while (0)
/** Copy \p SZ elements into a 4-element vector */
#define COPY_SZ_4V(DST, SZ, SRC) \
do { \
switch (SZ) { \
case 4: (DST)[3] = (SRC)[3]; \
case 3: (DST)[2] = (SRC)[2]; \
case 2: (DST)[1] = (SRC)[1]; \
case 1: (DST)[0] = (SRC)[0]; \
} \
#define COPY_SZ_4V(DST, SZ, SRC) \
do { \
switch (SZ) { \
case 4: (DST)[3] = (SRC)[3]; \
case 3: (DST)[2] = (SRC)[2]; \
case 2: (DST)[1] = (SRC)[1]; \
case 1: (DST)[0] = (SRC)[0]; \
} \
} while(0)
/** Copy \p SZ elements into a homegeneous (4-element) vector, giving
* default values to the remaining */
#define COPY_CLEAN_4V(DST, SZ, SRC) \
do { \
ASSIGN_4V( DST, 0, 0, 0, 1 ); \
COPY_SZ_4V( DST, SZ, SRC ); \
#define COPY_CLEAN_4V(DST, SZ, SRC) \
do { \
ASSIGN_4V( DST, 0, 0, 0, 1 ); \
COPY_SZ_4V( DST, SZ, SRC ); \
} while (0)
/** Subtraction */
#define SUB_4V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] - (SRCB)[0]; \
(DST)[1] = (SRCA)[1] - (SRCB)[1]; \
(DST)[2] = (SRCA)[2] - (SRCB)[2]; \
(DST)[3] = (SRCA)[3] - (SRCB)[3]; \
#define SUB_4V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] - (SRCB)[0]; \
(DST)[1] = (SRCA)[1] - (SRCB)[1]; \
(DST)[2] = (SRCA)[2] - (SRCB)[2]; \
(DST)[3] = (SRCA)[3] - (SRCB)[3]; \
} while (0)
/** Addition */
#define ADD_4V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] + (SRCB)[0]; \
(DST)[1] = (SRCA)[1] + (SRCB)[1]; \
(DST)[2] = (SRCA)[2] + (SRCB)[2]; \
(DST)[3] = (SRCA)[3] + (SRCB)[3]; \
#define ADD_4V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] + (SRCB)[0]; \
(DST)[1] = (SRCA)[1] + (SRCB)[1]; \
(DST)[2] = (SRCA)[2] + (SRCB)[2]; \
(DST)[3] = (SRCA)[3] + (SRCB)[3]; \
} while (0)
/** Element-wise multiplication */
#define SCALE_4V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] * (SRCB)[0]; \
(DST)[1] = (SRCA)[1] * (SRCB)[1]; \
(DST)[2] = (SRCA)[2] * (SRCB)[2]; \
(DST)[3] = (SRCA)[3] * (SRCB)[3]; \
#define SCALE_4V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] * (SRCB)[0]; \
(DST)[1] = (SRCA)[1] * (SRCB)[1]; \
(DST)[2] = (SRCA)[2] * (SRCB)[2]; \
(DST)[3] = (SRCA)[3] * (SRCB)[3]; \
} while (0)
/** In-place addition */
#define ACC_4V( DST, SRC ) \
do { \
(DST)[0] += (SRC)[0]; \
(DST)[1] += (SRC)[1]; \
(DST)[2] += (SRC)[2]; \
(DST)[3] += (SRC)[3]; \
#define ACC_4V( DST, SRC ) \
do { \
(DST)[0] += (SRC)[0]; \
(DST)[1] += (SRC)[1]; \
(DST)[2] += (SRC)[2]; \
(DST)[3] += (SRC)[3]; \
} while (0)
/** Element-wise multiplication and addition */
#define ACC_SCALE_4V( DST, SRCA, SRCB ) \
do { \
(DST)[0] += (SRCA)[0] * (SRCB)[0]; \
(DST)[1] += (SRCA)[1] * (SRCB)[1]; \
(DST)[2] += (SRCA)[2] * (SRCB)[2]; \
(DST)[3] += (SRCA)[3] * (SRCB)[3]; \
#define ACC_SCALE_4V( DST, SRCA, SRCB ) \
do { \
(DST)[0] += (SRCA)[0] * (SRCB)[0]; \
(DST)[1] += (SRCA)[1] * (SRCB)[1]; \
(DST)[2] += (SRCA)[2] * (SRCB)[2]; \
(DST)[3] += (SRCA)[3] * (SRCB)[3]; \
} while (0)
/** In-place scalar multiplication and addition */
#define ACC_SCALE_SCALAR_4V( DST, S, SRCB ) \
do { \
(DST)[0] += S * (SRCB)[0]; \
(DST)[1] += S * (SRCB)[1]; \
(DST)[2] += S * (SRCB)[2]; \
(DST)[3] += S * (SRCB)[3]; \
#define ACC_SCALE_SCALAR_4V( DST, S, SRCB ) \
do { \
(DST)[0] += S * (SRCB)[0]; \
(DST)[1] += S * (SRCB)[1]; \
(DST)[2] += S * (SRCB)[2]; \
(DST)[3] += S * (SRCB)[3]; \
} while (0)
/** Scalar multiplication */
#define SCALE_SCALAR_4V( DST, S, SRCB ) \
do { \
(DST)[0] = S * (SRCB)[0]; \
(DST)[1] = S * (SRCB)[1]; \
(DST)[2] = S * (SRCB)[2]; \
(DST)[3] = S * (SRCB)[3]; \
#define SCALE_SCALAR_4V( DST, S, SRCB ) \
do { \
(DST)[0] = S * (SRCB)[0]; \
(DST)[1] = S * (SRCB)[1]; \
(DST)[2] = S * (SRCB)[2]; \
(DST)[3] = S * (SRCB)[3]; \
} while (0)
/** In-place scalar multiplication */
#define SELF_SCALE_SCALAR_4V( DST, S ) \
do { \
(DST)[0] *= S; \
(DST)[1] *= S; \
(DST)[2] *= S; \
(DST)[3] *= S; \
#define SELF_SCALE_SCALAR_4V( DST, S ) \
do { \
(DST)[0] *= S; \
(DST)[1] *= S; \
(DST)[2] *= S; \
(DST)[3] *= S; \
} while (0)
/** Assignment */
#define ASSIGN_4V( V, V0, V1, V2, V3 ) \
do { \
V[0] = V0; \
V[1] = V1; \
V[2] = V2; \
V[3] = V3; \
#define ASSIGN_4V( V, V0, V1, V2, V3 ) \
do { \
V[0] = V0; \
V[1] = V1; \
V[2] = V2; \
V[3] = V3; \
} while(0)
/*@}*/
@@ -291,124 +290,124 @@ do { \
/*@{*/
/** Zero */
#define ZERO_3V( DST ) (DST)[0] = (DST)[1] = (DST)[2] = 0
#define ZERO_3V( DST ) (DST)[0] = (DST)[1] = (DST)[2] = 0
/** Test for equality */
#define TEST_EQ_3V(a,b) ((a)[0] == (b)[0] && \
(a)[1] == (b)[1] && \
(a)[2] == (b)[2])
#define TEST_EQ_3V(a,b) ((a)[0] == (b)[0] && \
(a)[1] == (b)[1] && \
(a)[2] == (b)[2])
/** Copy a 3-element vector */
#define COPY_3V( DST, SRC ) \
do { \
(DST)[0] = (SRC)[0]; \
(DST)[1] = (SRC)[1]; \
(DST)[2] = (SRC)[2]; \
#define COPY_3V( DST, SRC ) \
do { \
(DST)[0] = (SRC)[0]; \
(DST)[1] = (SRC)[1]; \
(DST)[2] = (SRC)[2]; \
} while (0)
/** Copy a 3-element vector with cast */
#define COPY_3V_CAST( DST, SRC, CAST ) \
do { \
(DST)[0] = (CAST)(SRC)[0]; \
(DST)[1] = (CAST)(SRC)[1]; \
(DST)[2] = (CAST)(SRC)[2]; \
#define COPY_3V_CAST( DST, SRC, CAST ) \
do { \
(DST)[0] = (CAST)(SRC)[0]; \
(DST)[1] = (CAST)(SRC)[1]; \
(DST)[2] = (CAST)(SRC)[2]; \
} while (0)
/** Copy a 3-element float vector */
#define COPY_3FV( DST, SRC ) \
do { \
const GLfloat *_tmp = (SRC); \
(DST)[0] = _tmp[0]; \
(DST)[1] = _tmp[1]; \
(DST)[2] = _tmp[2]; \
#define COPY_3FV( DST, SRC ) \
do { \
const GLfloat *_tmp = (SRC); \
(DST)[0] = _tmp[0]; \
(DST)[1] = _tmp[1]; \
(DST)[2] = _tmp[2]; \
} while (0)
/** Subtraction */
#define SUB_3V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] - (SRCB)[0]; \
(DST)[1] = (SRCA)[1] - (SRCB)[1]; \
(DST)[2] = (SRCA)[2] - (SRCB)[2]; \
#define SUB_3V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] - (SRCB)[0]; \
(DST)[1] = (SRCA)[1] - (SRCB)[1]; \
(DST)[2] = (SRCA)[2] - (SRCB)[2]; \
} while (0)
/** Addition */
#define ADD_3V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] + (SRCB)[0]; \
(DST)[1] = (SRCA)[1] + (SRCB)[1]; \
(DST)[2] = (SRCA)[2] + (SRCB)[2]; \
#define ADD_3V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] + (SRCB)[0]; \
(DST)[1] = (SRCA)[1] + (SRCB)[1]; \
(DST)[2] = (SRCA)[2] + (SRCB)[2]; \
} while (0)
/** In-place scalar multiplication */
#define SCALE_3V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] * (SRCB)[0]; \
(DST)[1] = (SRCA)[1] * (SRCB)[1]; \
(DST)[2] = (SRCA)[2] * (SRCB)[2]; \
#define SCALE_3V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] * (SRCB)[0]; \
(DST)[1] = (SRCA)[1] * (SRCB)[1]; \
(DST)[2] = (SRCA)[2] * (SRCB)[2]; \
} while (0)
/** In-place element-wise multiplication */
#define SELF_SCALE_3V( DST, SRC ) \
do { \
(DST)[0] *= (SRC)[0]; \
(DST)[1] *= (SRC)[1]; \
(DST)[2] *= (SRC)[2]; \
#define SELF_SCALE_3V( DST, SRC ) \
do { \
(DST)[0] *= (SRC)[0]; \
(DST)[1] *= (SRC)[1]; \
(DST)[2] *= (SRC)[2]; \
} while (0)
/** In-place addition */
#define ACC_3V( DST, SRC ) \
do { \
(DST)[0] += (SRC)[0]; \
(DST)[1] += (SRC)[1]; \
(DST)[2] += (SRC)[2]; \
#define ACC_3V( DST, SRC ) \
do { \
(DST)[0] += (SRC)[0]; \
(DST)[1] += (SRC)[1]; \
(DST)[2] += (SRC)[2]; \
} while (0)
/** Element-wise multiplication and addition */
#define ACC_SCALE_3V( DST, SRCA, SRCB ) \
do { \
(DST)[0] += (SRCA)[0] * (SRCB)[0]; \
(DST)[1] += (SRCA)[1] * (SRCB)[1]; \
(DST)[2] += (SRCA)[2] * (SRCB)[2]; \
#define ACC_SCALE_3V( DST, SRCA, SRCB ) \
do { \
(DST)[0] += (SRCA)[0] * (SRCB)[0]; \
(DST)[1] += (SRCA)[1] * (SRCB)[1]; \
(DST)[2] += (SRCA)[2] * (SRCB)[2]; \
} while (0)
/** Scalar multiplication */
#define SCALE_SCALAR_3V( DST, S, SRCB ) \
do { \
(DST)[0] = S * (SRCB)[0]; \
(DST)[1] = S * (SRCB)[1]; \
(DST)[2] = S * (SRCB)[2]; \
#define SCALE_SCALAR_3V( DST, S, SRCB ) \
do { \
(DST)[0] = S * (SRCB)[0]; \
(DST)[1] = S * (SRCB)[1]; \
(DST)[2] = S * (SRCB)[2]; \
} while (0)
/** In-place scalar multiplication and addition */
#define ACC_SCALE_SCALAR_3V( DST, S, SRCB ) \
do { \
(DST)[0] += S * (SRCB)[0]; \
(DST)[1] += S * (SRCB)[1]; \
(DST)[2] += S * (SRCB)[2]; \
#define ACC_SCALE_SCALAR_3V( DST, S, SRCB ) \
do { \
(DST)[0] += S * (SRCB)[0]; \
(DST)[1] += S * (SRCB)[1]; \
(DST)[2] += S * (SRCB)[2]; \
} while (0)
/** In-place scalar multiplication */
#define SELF_SCALE_SCALAR_3V( DST, S ) \
do { \
(DST)[0] *= S; \
(DST)[1] *= S; \
(DST)[2] *= S; \
#define SELF_SCALE_SCALAR_3V( DST, S ) \
do { \
(DST)[0] *= S; \
(DST)[1] *= S; \
(DST)[2] *= S; \
} while (0)
/** In-place scalar addition */
#define ACC_SCALAR_3V( DST, S ) \
do { \
(DST)[0] += S; \
(DST)[1] += S; \
(DST)[2] += S; \
#define ACC_SCALAR_3V( DST, S ) \
do { \
(DST)[0] += S; \
(DST)[1] += S; \
(DST)[2] += S; \
} while (0)
/** Assignment */
#define ASSIGN_3V( V, V0, V1, V2 ) \
do { \
V[0] = V0; \
V[1] = V1; \
V[2] = V2; \
#define ASSIGN_3V( V, V0, V1, V2 ) \
do { \
V[0] = V0; \
V[1] = V1; \
V[2] = V2; \
} while(0)
/*@}*/
@@ -419,91 +418,91 @@ do { \
/*@{*/
/** Zero */
#define ZERO_2V( DST ) (DST)[0] = (DST)[1] = 0
#define ZERO_2V( DST ) (DST)[0] = (DST)[1] = 0
/** Copy a 2-element vector */
#define COPY_2V( DST, SRC ) \
do { \
(DST)[0] = (SRC)[0]; \
(DST)[1] = (SRC)[1]; \
#define COPY_2V( DST, SRC ) \
do { \
(DST)[0] = (SRC)[0]; \
(DST)[1] = (SRC)[1]; \
} while (0)
/** Copy a 2-element vector with cast */
#define COPY_2V_CAST( DST, SRC, CAST ) \
do { \
(DST)[0] = (CAST)(SRC)[0]; \
(DST)[1] = (CAST)(SRC)[1]; \
#define COPY_2V_CAST( DST, SRC, CAST ) \
do { \
(DST)[0] = (CAST)(SRC)[0]; \
(DST)[1] = (CAST)(SRC)[1]; \
} while (0)
/** Copy a 2-element float vector */
#define COPY_2FV( DST, SRC ) \
do { \
const GLfloat *_tmp = (SRC); \
(DST)[0] = _tmp[0]; \
(DST)[1] = _tmp[1]; \
#define COPY_2FV( DST, SRC ) \
do { \
const GLfloat *_tmp = (SRC); \
(DST)[0] = _tmp[0]; \
(DST)[1] = _tmp[1]; \
} while (0)
/** Subtraction */
#define SUB_2V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] - (SRCB)[0]; \
(DST)[1] = (SRCA)[1] - (SRCB)[1]; \
#define SUB_2V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] - (SRCB)[0]; \
(DST)[1] = (SRCA)[1] - (SRCB)[1]; \
} while (0)
/** Addition */
#define ADD_2V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] + (SRCB)[0]; \
(DST)[1] = (SRCA)[1] + (SRCB)[1]; \
#define ADD_2V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] + (SRCB)[0]; \
(DST)[1] = (SRCA)[1] + (SRCB)[1]; \
} while (0)
/** In-place scalar multiplication */
#define SCALE_2V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] * (SRCB)[0]; \
(DST)[1] = (SRCA)[1] * (SRCB)[1]; \
#define SCALE_2V( DST, SRCA, SRCB ) \
do { \
(DST)[0] = (SRCA)[0] * (SRCB)[0]; \
(DST)[1] = (SRCA)[1] * (SRCB)[1]; \
} while (0)
/** In-place addition */
#define ACC_2V( DST, SRC ) \
do { \
(DST)[0] += (SRC)[0]; \
(DST)[1] += (SRC)[1]; \
#define ACC_2V( DST, SRC ) \
do { \
(DST)[0] += (SRC)[0]; \
(DST)[1] += (SRC)[1]; \
} while (0)
/** Element-wise multiplication and addition */
#define ACC_SCALE_2V( DST, SRCA, SRCB ) \
do { \
(DST)[0] += (SRCA)[0] * (SRCB)[0]; \
(DST)[1] += (SRCA)[1] * (SRCB)[1]; \
#define ACC_SCALE_2V( DST, SRCA, SRCB ) \
do { \
(DST)[0] += (SRCA)[0] * (SRCB)[0]; \
(DST)[1] += (SRCA)[1] * (SRCB)[1]; \
} while (0)
/** Scalar multiplication */
#define SCALE_SCALAR_2V( DST, S, SRCB ) \
do { \
(DST)[0] = S * (SRCB)[0]; \
(DST)[1] = S * (SRCB)[1]; \
#define SCALE_SCALAR_2V( DST, S, SRCB ) \
do { \
(DST)[0] = S * (SRCB)[0]; \
(DST)[1] = S * (SRCB)[1]; \
} while (0)
/** In-place scalar multiplication and addition */
#define ACC_SCALE_SCALAR_2V( DST, S, SRCB ) \
do { \
(DST)[0] += S * (SRCB)[0]; \
(DST)[1] += S * (SRCB)[1]; \
#define ACC_SCALE_SCALAR_2V( DST, S, SRCB ) \
do { \
(DST)[0] += S * (SRCB)[0]; \
(DST)[1] += S * (SRCB)[1]; \
} while (0)
/** In-place scalar multiplication */
#define SELF_SCALE_SCALAR_2V( DST, S ) \
do { \
(DST)[0] *= S; \
(DST)[1] *= S; \
#define SELF_SCALE_SCALAR_2V( DST, S ) \
do { \
(DST)[0] *= S; \
(DST)[1] *= S; \
} while (0)
/** In-place scalar addition */
#define ACC_SCALAR_2V( DST, S ) \
do { \
(DST)[0] += S; \
(DST)[1] += S; \
#define ACC_SCALAR_2V( DST, S ) \
do { \
(DST)[0] += S; \
(DST)[1] += S; \
} while (0)
@@ -514,79 +513,79 @@ do { \
* \note \p OUT argument is evaluated twice!
* \note Be wary of using *coord++ as an argument to any of these macros!
*/
#define LINTERP(T, OUT, IN) ((OUT) + (T) * ((IN) - (OUT)))
#define LINTERP(T, OUT, IN) ((OUT) + (T) * ((IN) - (OUT)))
/* Can do better with integer math
*/
#define INTERP_UB( t, dstub, outub, inub ) \
do { \
GLfloat inf = UBYTE_TO_FLOAT( inub ); \
GLfloat outf = UBYTE_TO_FLOAT( outub ); \
GLfloat dstf = LINTERP( t, outf, inf ); \
UNCLAMPED_FLOAT_TO_UBYTE( dstub, dstf ); \
#define INTERP_UB( t, dstub, outub, inub ) \
do { \
GLfloat inf = UBYTE_TO_FLOAT( inub ); \
GLfloat outf = UBYTE_TO_FLOAT( outub ); \
GLfloat dstf = LINTERP( t, outf, inf ); \
UNCLAMPED_FLOAT_TO_UBYTE( dstub, dstf ); \
} while (0)
#define INTERP_CHAN( t, dstc, outc, inc ) \
do { \
GLfloat inf = CHAN_TO_FLOAT( inc ); \
GLfloat outf = CHAN_TO_FLOAT( outc ); \
GLfloat dstf = LINTERP( t, outf, inf ); \
UNCLAMPED_FLOAT_TO_CHAN( dstc, dstf ); \
#define INTERP_CHAN( t, dstc, outc, inc ) \
do { \
GLfloat inf = CHAN_TO_FLOAT( inc ); \
GLfloat outf = CHAN_TO_FLOAT( outc ); \
GLfloat dstf = LINTERP( t, outf, inf ); \
UNCLAMPED_FLOAT_TO_CHAN( dstc, dstf ); \
} while (0)
#define INTERP_UI( t, dstui, outui, inui ) \
#define INTERP_UI( t, dstui, outui, inui ) \
dstui = (GLuint) (GLint) LINTERP( (t), (GLfloat) (outui), (GLfloat) (inui) )
#define INTERP_F( t, dstf, outf, inf ) \
#define INTERP_F( t, dstf, outf, inf ) \
dstf = LINTERP( t, outf, inf )
#define INTERP_4F( t, dst, out, in ) \
do { \
dst[0] = LINTERP( (t), (out)[0], (in)[0] ); \
dst[1] = LINTERP( (t), (out)[1], (in)[1] ); \
dst[2] = LINTERP( (t), (out)[2], (in)[2] ); \
dst[3] = LINTERP( (t), (out)[3], (in)[3] ); \
#define INTERP_4F( t, dst, out, in ) \
do { \
dst[0] = LINTERP( (t), (out)[0], (in)[0] ); \
dst[1] = LINTERP( (t), (out)[1], (in)[1] ); \
dst[2] = LINTERP( (t), (out)[2], (in)[2] ); \
dst[3] = LINTERP( (t), (out)[3], (in)[3] ); \
} while (0)
#define INTERP_3F( t, dst, out, in ) \
do { \
dst[0] = LINTERP( (t), (out)[0], (in)[0] ); \
dst[1] = LINTERP( (t), (out)[1], (in)[1] ); \
dst[2] = LINTERP( (t), (out)[2], (in)[2] ); \
#define INTERP_3F( t, dst, out, in ) \
do { \
dst[0] = LINTERP( (t), (out)[0], (in)[0] ); \
dst[1] = LINTERP( (t), (out)[1], (in)[1] ); \
dst[2] = LINTERP( (t), (out)[2], (in)[2] ); \
} while (0)
#define INTERP_4CHAN( t, dst, out, in ) \
do { \
INTERP_CHAN( (t), (dst)[0], (out)[0], (in)[0] ); \
INTERP_CHAN( (t), (dst)[1], (out)[1], (in)[1] ); \
INTERP_CHAN( (t), (dst)[2], (out)[2], (in)[2] ); \
INTERP_CHAN( (t), (dst)[3], (out)[3], (in)[3] ); \
#define INTERP_4CHAN( t, dst, out, in ) \
do { \
INTERP_CHAN( (t), (dst)[0], (out)[0], (in)[0] ); \
INTERP_CHAN( (t), (dst)[1], (out)[1], (in)[1] ); \
INTERP_CHAN( (t), (dst)[2], (out)[2], (in)[2] ); \
INTERP_CHAN( (t), (dst)[3], (out)[3], (in)[3] ); \
} while (0)
#define INTERP_3CHAN( t, dst, out, in ) \
do { \
INTERP_CHAN( (t), (dst)[0], (out)[0], (in)[0] ); \
INTERP_CHAN( (t), (dst)[1], (out)[1], (in)[1] ); \
INTERP_CHAN( (t), (dst)[2], (out)[2], (in)[2] ); \
#define INTERP_3CHAN( t, dst, out, in ) \
do { \
INTERP_CHAN( (t), (dst)[0], (out)[0], (in)[0] ); \
INTERP_CHAN( (t), (dst)[1], (out)[1], (in)[1] ); \
INTERP_CHAN( (t), (dst)[2], (out)[2], (in)[2] ); \
} while (0)
#define INTERP_SZ( t, vec, to, out, in, sz ) \
do { \
switch (sz) { \
case 4: vec[to][3] = LINTERP( (t), (vec)[out][3], (vec)[in][3] ); \
case 3: vec[to][2] = LINTERP( (t), (vec)[out][2], (vec)[in][2] ); \
case 2: vec[to][1] = LINTERP( (t), (vec)[out][1], (vec)[in][1] ); \
case 1: vec[to][0] = LINTERP( (t), (vec)[out][0], (vec)[in][0] ); \
} \
#define INTERP_SZ( t, vec, to, out, in, sz ) \
do { \
switch (sz) { \
case 4: vec[to][3] = LINTERP( (t), (vec)[out][3], (vec)[in][3] ); \
case 3: vec[to][2] = LINTERP( (t), (vec)[out][2], (vec)[in][2] ); \
case 2: vec[to][1] = LINTERP( (t), (vec)[out][1], (vec)[in][1] ); \
case 1: vec[to][0] = LINTERP( (t), (vec)[out][0], (vec)[in][0] ); \
} \
} while(0)
/** Assign scalers to short vectors */
#define ASSIGN_2V( V, V0, V1 ) \
do { \
V[0] = V0; \
V[1] = V1; \
#define ASSIGN_2V( V, V0, V1 ) \
do { \
V[0] = V0; \
V[1] = V1; \
} while(0)
/*@}*/
@@ -616,31 +615,31 @@ do { \
/** Dot product of two 4-element vectors */
#define DOT4( a, b ) ( (a)[0]*(b)[0] + (a)[1]*(b)[1] + \
(a)[2]*(b)[2] + (a)[3]*(b)[3] )
(a)[2]*(b)[2] + (a)[3]*(b)[3] )
/** Dot product of two 4-element vectors */
#define DOT4V(v,a,b,c,d) (v[0]*(a) + v[1]*(b) + v[2]*(c) + v[3]*(d))
/** Cross product of two 3-element vectors */
#define CROSS3(n, u, v) \
do { \
(n)[0] = (u)[1]*(v)[2] - (u)[2]*(v)[1]; \
(n)[1] = (u)[2]*(v)[0] - (u)[0]*(v)[2]; \
(n)[2] = (u)[0]*(v)[1] - (u)[1]*(v)[0]; \
#define CROSS3(n, u, v) \
do { \
(n)[0] = (u)[1]*(v)[2] - (u)[2]*(v)[1]; \
(n)[1] = (u)[2]*(v)[0] - (u)[0]*(v)[2]; \
(n)[2] = (u)[0]*(v)[1] - (u)[1]*(v)[0]; \
} while (0)
/* Normalize a 3-element vector to unit length. */
#define NORMALIZE_3FV( V ) \
do { \
GLfloat len = (GLfloat) LEN_SQUARED_3FV(V); \
if (len) { \
len = INV_SQRTF(len); \
(V)[0] = (GLfloat) ((V)[0] * len); \
(V)[1] = (GLfloat) ((V)[1] * len); \
(V)[2] = (GLfloat) ((V)[2] * len); \
} \
#define NORMALIZE_3FV( V ) \
do { \
GLfloat len = (GLfloat) LEN_SQUARED_3FV(V); \
if (len) { \
len = INV_SQRTF(len); \
(V)[0] = (GLfloat) ((V)[0] * len); \
(V)[1] = (GLfloat) ((V)[1] * len); \
(V)[2] = (GLfloat) ((V)[2] * len); \
} \
} while(0)
#define LEN_3FV( V ) (SQRTF((V)[0]*(V)[0]+(V)[1]*(V)[1]+(V)[2]*(V)[2]))
src/mesa/main/matrix.c
+22 -22
View File
@@ -61,7 +61,7 @@
* the top matrix of the current matrix stack and sets
* __GLcontextRec::NewState.
*/
void
void GLAPIENTRY
_mesa_Frustum( GLdouble left, GLdouble right,
GLdouble bottom, GLdouble top,
GLdouble nearval, GLdouble farval )
@@ -103,7 +103,7 @@ _mesa_Frustum( GLdouble left, GLdouble right,
* the top matrix of the current matrix stack and sets
* __GLcontextRec::NewState.
*/
void
void GLAPIENTRY
_mesa_Ortho( GLdouble left, GLdouble right,
GLdouble bottom, GLdouble top,
GLdouble nearval, GLdouble farval )
@@ -142,7 +142,7 @@ _mesa_Ortho( GLdouble left, GLdouble right,
* __GLcontextRec::CurrentStack and gl_transform_attrib::MatrixMode with the
* specified matrix stack.
*/
void
void GLAPIENTRY
_mesa_MatrixMode( GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
@@ -222,7 +222,7 @@ _mesa_MatrixMode( GLenum mode )
* matrix in the stack. Marks __GLcontextRec::NewState with the stack dirty
* flag.
*/
void
void GLAPIENTRY
_mesa_PushMatrix( void )
{
GET_CURRENT_CONTEXT(ctx);
@@ -254,7 +254,7 @@ _mesa_PushMatrix( void )
* moves the stack head down. Marks __GLcontextRec::NewState with the dirty
* stack flag.
*/
void
void GLAPIENTRY
_mesa_PopMatrix( void )
{
GET_CURRENT_CONTEXT(ctx);
@@ -284,7 +284,7 @@ _mesa_PopMatrix( void )
* matrix in the current stack. Marks __GLcontextRec::NewState with the stack
* dirty flag.
*/
void
void GLAPIENTRY
_mesa_LoadIdentity( void )
{
GET_CURRENT_CONTEXT(ctx);
@@ -309,7 +309,7 @@ _mesa_LoadIdentity( void )
* in the current stack and the given matrix. Marks __GLcontextRec::NewState
* with the dirty stack flag.
*/
void
void GLAPIENTRY
_mesa_LoadMatrixf( const GLfloat *m )
{
GET_CURRENT_CONTEXT(ctx);
@@ -339,7 +339,7 @@ _mesa_LoadMatrixf( const GLfloat *m )
* matrix in the current stack and the given matrix. Marks
* __GLcontextRec::NewState with the dirty stack flag.
*/
void
void GLAPIENTRY
_mesa_MultMatrixf( const GLfloat *m )
{
GET_CURRENT_CONTEXT(ctx);
@@ -371,7 +371,7 @@ _mesa_MultMatrixf( const GLfloat *m )
* matrix in the current stack and the given parameters. Marks
* __GLcontextRec::NewState with the dirty stack flag.
*/
void
void GLAPIENTRY
_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
{
GET_CURRENT_CONTEXT(ctx);
@@ -396,7 +396,7 @@ _mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
* matrix in the current stack and the given parameters. Marks
* __GLcontextRec::NewState with the dirty stack flag.
*/
void
void GLAPIENTRY
_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z )
{
GET_CURRENT_CONTEXT(ctx);
@@ -419,7 +419,7 @@ _mesa_Scalef( GLfloat x, GLfloat y, GLfloat z )
* matrix in the current stack and the given parameters. Marks
* __GLcontextRec::NewState with the dirty stack flag.
*/
void
void GLAPIENTRY
_mesa_Translatef( GLfloat x, GLfloat y, GLfloat z )
{
GET_CURRENT_CONTEXT(ctx);
@@ -430,7 +430,7 @@ _mesa_Translatef( GLfloat x, GLfloat y, GLfloat z )
#if _HAVE_FULL_GL
void
void GLAPIENTRY
_mesa_LoadMatrixd( const GLdouble *m )
{
GLint i;
@@ -441,7 +441,7 @@ _mesa_LoadMatrixd( const GLdouble *m )
_mesa_LoadMatrixf(f);
}
void
void GLAPIENTRY
_mesa_MultMatrixd( const GLdouble *m )
{
GLint i;
@@ -453,21 +453,21 @@ _mesa_MultMatrixd( const GLdouble *m )
}
void
void GLAPIENTRY
_mesa_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z )
{
_mesa_Rotatef((GLfloat) angle, (GLfloat) x, (GLfloat) y, (GLfloat) z);
}
void
void GLAPIENTRY
_mesa_Scaled( GLdouble x, GLdouble y, GLdouble z )
{
_mesa_Scalef((GLfloat) x, (GLfloat) y, (GLfloat) z);
}
void
void GLAPIENTRY
_mesa_Translated( GLdouble x, GLdouble y, GLdouble z )
{
_mesa_Translatef((GLfloat) x, (GLfloat) y, (GLfloat) z);
@@ -476,7 +476,7 @@ _mesa_Translated( GLdouble x, GLdouble y, GLdouble z )
#if _HAVE_FULL_GL
void
void GLAPIENTRY
_mesa_LoadTransposeMatrixfARB( const GLfloat *m )
{
GLfloat tm[16];
@@ -486,7 +486,7 @@ _mesa_LoadTransposeMatrixfARB( const GLfloat *m )
}
void
void GLAPIENTRY
_mesa_LoadTransposeMatrixdARB( const GLdouble *m )
{
GLfloat tm[16];
@@ -496,7 +496,7 @@ _mesa_LoadTransposeMatrixdARB( const GLdouble *m )
}
void
void GLAPIENTRY
_mesa_MultTransposeMatrixfARB( const GLfloat *m )
{
GLfloat tm[16];
@@ -506,7 +506,7 @@ _mesa_MultTransposeMatrixfARB( const GLfloat *m )
}
void
void GLAPIENTRY
_mesa_MultTransposeMatrixdARB( const GLdouble *m )
{
GLfloat tm[16];
@@ -528,7 +528,7 @@ _mesa_MultTransposeMatrixdARB( const GLdouble *m )
* Flushes the vertices and calls _mesa_set_viewport() with the given
* parameters.
*/
void
void GLAPIENTRY
_mesa_Viewport( GLint x, GLint y, GLsizei width, GLsizei height )
{
GET_CURRENT_CONTEXT(ctx);
@@ -625,7 +625,7 @@ _mesa_set_viewport( GLcontext *ctx, GLint x, GLint y,
#if _HAVE_FULL_GL
void
void GLAPIENTRY
_mesa_DepthRange( GLclampd nearval, GLclampd farval )
{
/*
src/mesa/main/matrix.h
+23 -23
View File
@@ -35,77 +35,77 @@
#include "mtypes.h"
extern void
extern void GLAPIENTRY
_mesa_Frustum( GLdouble left, GLdouble right,
GLdouble bottom, GLdouble top,
GLdouble nearval, GLdouble farval );
extern void
extern void GLAPIENTRY
_mesa_Ortho( GLdouble left, GLdouble right,
GLdouble bottom, GLdouble top,
GLdouble nearval, GLdouble farval );
extern void
extern void GLAPIENTRY
_mesa_PushMatrix( void );
extern void
extern void GLAPIENTRY
_mesa_PopMatrix( void );
extern void
extern void GLAPIENTRY
_mesa_LoadIdentity( void );
extern void
extern void GLAPIENTRY
_mesa_LoadMatrixf( const GLfloat *m );
extern void
extern void GLAPIENTRY
_mesa_LoadMatrixd( const GLdouble *m );
extern void
extern void GLAPIENTRY
_mesa_MatrixMode( GLenum mode );
extern void
extern void GLAPIENTRY
_mesa_MultMatrixf( const GLfloat *m );
extern void
extern void GLAPIENTRY
_mesa_MultMatrixd( const GLdouble *m );
extern void
extern void GLAPIENTRY
_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z );
extern void
extern void GLAPIENTRY
_mesa_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z );
extern void
extern void GLAPIENTRY
_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z );
extern void
extern void GLAPIENTRY
_mesa_Scaled( GLdouble x, GLdouble y, GLdouble z );
extern void
extern void GLAPIENTRY
_mesa_Translatef( GLfloat x, GLfloat y, GLfloat z );
extern void
extern void GLAPIENTRY
_mesa_Translated( GLdouble x, GLdouble y, GLdouble z );
extern void
extern void GLAPIENTRY
_mesa_LoadTransposeMatrixfARB( const GLfloat *m );
extern void
extern void GLAPIENTRY
_mesa_LoadTransposeMatrixdARB( const GLdouble *m );
extern void
extern void GLAPIENTRY
_mesa_MultTransposeMatrixfARB( const GLfloat *m );
extern void
extern void GLAPIENTRY
_mesa_MultTransposeMatrixdARB( const GLdouble *m );
extern void
extern void GLAPIENTRY
_mesa_Viewport( GLint x, GLint y, GLsizei width, GLsizei height );
extern void
extern void
_mesa_set_viewport( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height );
extern void
extern void GLAPIENTRY
_mesa_DepthRange( GLclampd nearval, GLclampd farval );
src/mesa/main/nvprogram.c
+26 -26
View File
@@ -49,7 +49,7 @@
* Execute a vertex state program.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params)
{
struct vertex_program *vprog;
@@ -81,7 +81,7 @@ _mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params)
* \note Not compiled into display lists.
* \note Called from the GL API dispatcher.
*/
GLboolean _mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids,
GLboolean GLAPIENTRY _mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids,
GLboolean *residences)
{
GLint i, j;
@@ -128,7 +128,7 @@ GLboolean _mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids,
* Request that a set of programs be resident in hardware.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids)
{
GLint i;
@@ -166,7 +166,7 @@ _mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids)
* \note Not compiled into display lists.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_GetProgramParameterfvNV(GLenum target, GLuint index,
GLenum pname, GLfloat *params)
{
@@ -201,7 +201,7 @@ _mesa_GetProgramParameterfvNV(GLenum target, GLuint index,
* \note Not compiled into display lists.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_GetProgramParameterdvNV(GLenum target, GLuint index,
GLenum pname, GLdouble *params)
{
@@ -236,7 +236,7 @@ _mesa_GetProgramParameterdvNV(GLenum target, GLuint index,
* \note Not compiled into display lists.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params)
{
struct program *prog;
@@ -273,7 +273,7 @@ _mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params)
* \note Not compiled into display lists.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program)
{
struct program *prog;
@@ -307,7 +307,7 @@ _mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program)
* \note Not compiled into display lists.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_GetTrackMatrixivNV(GLenum target, GLuint address,
GLenum pname, GLint *params)
{
@@ -349,7 +349,7 @@ _mesa_GetTrackMatrixivNV(GLenum target, GLuint address,
* \note Not compiled into display lists.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -385,7 +385,7 @@ _mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params)
* \note Not compiled into display lists.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -421,7 +421,7 @@ _mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params)
* \note Not compiled into display lists.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -468,7 +468,7 @@ _mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params)
* \note Not compiled into display lists.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer)
{
GET_CURRENT_CONTEXT(ctx);
@@ -493,7 +493,7 @@ _mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer)
* Load/parse/compile a program.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
const GLubyte *program)
{
@@ -555,7 +555,7 @@ _mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
* Set a program parameter register.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_ProgramParameter4dNV(GLenum target, GLuint index,
GLdouble x, GLdouble y, GLdouble z, GLdouble w)
{
@@ -568,7 +568,7 @@ _mesa_ProgramParameter4dNV(GLenum target, GLuint index,
* Set a program parameter register.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_ProgramParameter4dvNV(GLenum target, GLuint index,
const GLdouble *params)
{
@@ -582,7 +582,7 @@ _mesa_ProgramParameter4dvNV(GLenum target, GLuint index,
* Set a program parameter register.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_ProgramParameter4fNV(GLenum target, GLuint index,
GLfloat x, GLfloat y, GLfloat z, GLfloat w)
{
@@ -609,7 +609,7 @@ _mesa_ProgramParameter4fNV(GLenum target, GLuint index,
* Set a program parameter register.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_ProgramParameter4fvNV(GLenum target, GLuint index,
const GLfloat *params)
{
@@ -623,7 +623,7 @@ _mesa_ProgramParameter4fvNV(GLenum target, GLuint index,
* Set a sequence of program parameter registers.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_ProgramParameters4dvNV(GLenum target, GLuint index,
GLuint num, const GLdouble *params)
{
@@ -655,7 +655,7 @@ _mesa_ProgramParameters4dvNV(GLenum target, GLuint index,
* Set a sequence of program parameter registers.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_ProgramParameters4fvNV(GLenum target, GLuint index,
GLuint num, const GLfloat *params)
{
@@ -685,7 +685,7 @@ _mesa_ProgramParameters4fvNV(GLenum target, GLuint index,
* Setup tracking of matrices into program parameter registers.
* \note Called from the GL API dispatcher.
*/
void
void GLAPIENTRY
_mesa_TrackMatrixNV(GLenum target, GLuint address,
GLenum matrix, GLenum transform)
{
@@ -743,7 +743,7 @@ _mesa_TrackMatrixNV(GLenum target, GLuint address,
}
void
void GLAPIENTRY
_mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,
GLfloat x, GLfloat y, GLfloat z, GLfloat w)
{
@@ -779,7 +779,7 @@ _mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,
}
void
void GLAPIENTRY
_mesa_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name,
const float v[])
{
@@ -787,7 +787,7 @@ _mesa_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name,
}
void
void GLAPIENTRY
_mesa_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name,
GLdouble x, GLdouble y, GLdouble z, GLdouble w)
{
@@ -796,7 +796,7 @@ _mesa_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name,
}
void
void GLAPIENTRY
_mesa_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name,
const double v[])
{
@@ -806,7 +806,7 @@ _mesa_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name,
}
void
void GLAPIENTRY
_mesa_GetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name,
GLfloat *params)
{
@@ -844,7 +844,7 @@ _mesa_GetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name,
}
void
void GLAPIENTRY
_mesa_GetProgramNamedParameterdvNV(GLuint id, GLsizei len, const GLubyte *name,
GLdouble *params)
{
src/mesa/main/nvprogram.h
+26 -26
View File
@@ -30,88 +30,88 @@
#define NVPROGRAM_H
extern void
extern void GLAPIENTRY
_mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params);
extern GLboolean
extern GLboolean GLAPIENTRY
_mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids, GLboolean *residences);
extern void
extern void GLAPIENTRY
_mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids);
extern void
extern void GLAPIENTRY
_mesa_GetProgramParameterfvNV(GLenum target, GLuint index, GLenum pname, GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_GetProgramParameterdvNV(GLenum target, GLuint index, GLenum pname, GLdouble *params);
extern void
extern void GLAPIENTRY
_mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params);
extern void
extern void GLAPIENTRY
_mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program);
extern void
extern void GLAPIENTRY
_mesa_GetTrackMatrixivNV(GLenum target, GLuint address, GLenum pname, GLint *params);
extern void
extern void GLAPIENTRY
_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params);
extern void
extern void GLAPIENTRY
_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params);
extern void
extern void GLAPIENTRY
_mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer);
extern void
extern void GLAPIENTRY
_mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len, const GLubyte *program);
extern void
extern void GLAPIENTRY
_mesa_ProgramParameter4dNV(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
extern void
extern void GLAPIENTRY
_mesa_ProgramParameter4dvNV(GLenum target, GLuint index, const GLdouble *params);
extern void
extern void GLAPIENTRY
_mesa_ProgramParameter4fNV(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
extern void
extern void GLAPIENTRY
_mesa_ProgramParameter4fvNV(GLenum target, GLuint index, const GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_ProgramParameters4dvNV(GLenum target, GLuint index, GLuint num, const GLdouble *params);
extern void
extern void GLAPIENTRY
_mesa_ProgramParameters4fvNV(GLenum target, GLuint index, GLuint num, const GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_TrackMatrixNV(GLenum target, GLuint address, GLenum matrix, GLenum transform);
extern void
extern void GLAPIENTRY
_mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,
GLfloat x, GLfloat y, GLfloat z, GLfloat w);
extern void
extern void GLAPIENTRY
_mesa_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name,
const float v[]);
extern void
extern void GLAPIENTRY
_mesa_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name,
GLdouble x, GLdouble y, GLdouble z, GLdouble w);
extern void
extern void GLAPIENTRY
_mesa_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name,
const double v[]);
extern void
extern void GLAPIENTRY
_mesa_GetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name,
GLfloat *params);
extern void
extern void GLAPIENTRY
_mesa_GetProgramNamedParameterdvNV(GLuint id, GLsizei len, const GLubyte *name,
GLdouble *params);
src/mesa/main/occlude.c
+8 -8
View File
@@ -97,7 +97,7 @@ delete_query_object(struct occlusion_query *q)
}
void
void GLAPIENTRY
_mesa_GenQueriesARB(GLsizei n, GLuint *ids)
{
GET_CURRENT_CONTEXT(ctx);
@@ -131,7 +131,7 @@ _mesa_GenQueriesARB(GLsizei n, GLuint *ids)
}
void
void GLAPIENTRY
_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
{
GET_CURRENT_CONTEXT(ctx);
@@ -161,7 +161,7 @@ _mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
}
GLboolean
GLboolean GLAPIENTRY
_mesa_IsQueryARB(GLuint id)
{
GET_CURRENT_CONTEXT(ctx);
@@ -174,7 +174,7 @@ _mesa_IsQueryARB(GLuint id)
}
void
void GLAPIENTRY
_mesa_BeginQueryARB(GLenum target, GLuint id)
{
GET_CURRENT_CONTEXT(ctx);
@@ -216,7 +216,7 @@ _mesa_BeginQueryARB(GLenum target, GLuint id)
}
void
void GLAPIENTRY
_mesa_EndQueryARB(GLenum target)
{
GET_CURRENT_CONTEXT(ctx);
@@ -245,7 +245,7 @@ _mesa_EndQueryARB(GLenum target)
}
void
void GLAPIENTRY
_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -270,7 +270,7 @@ _mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)
}
void
void GLAPIENTRY
_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
@@ -299,7 +299,7 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
}
void
void GLAPIENTRY
_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/occlude.h
+8 -8
View File
@@ -30,28 +30,28 @@
extern void
_mesa_init_occlude(GLcontext *ctx);
extern void
extern void GLAPIENTRY
_mesa_GenQueriesARB(GLsizei n, GLuint *ids);
extern void
extern void GLAPIENTRY
_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids);
extern GLboolean
extern GLboolean GLAPIENTRY
_mesa_IsQueryARB(GLuint id);
extern void
extern void GLAPIENTRY
_mesa_BeginQueryARB(GLenum target, GLuint id);
extern void
extern void GLAPIENTRY
_mesa_EndQueryARB(GLenum target);
extern void
extern void GLAPIENTRY
_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params);
extern void
extern void GLAPIENTRY
_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params);
extern void
extern void GLAPIENTRY
_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params);
src/mesa/main/pixel.c
+11 -11
View File
@@ -38,7 +38,7 @@
void
void GLAPIENTRY
_mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor )
{
GET_CURRENT_CONTEXT(ctx);
@@ -59,7 +59,7 @@ _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor )
/**********************************************************************/
void
void GLAPIENTRY
_mesa_PixelStorei( GLenum pname, GLint param )
{
/* NOTE: this call can't be compiled into the display list */
@@ -240,7 +240,7 @@ _mesa_PixelStorei( GLenum pname, GLint param )
}
void
void GLAPIENTRY
_mesa_PixelStoref( GLenum pname, GLfloat param )
{
_mesa_PixelStorei( pname, (GLint) param );
@@ -254,7 +254,7 @@ _mesa_PixelStoref( GLenum pname, GLfloat param )
void
void GLAPIENTRY
_mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values )
{
GLint i;
@@ -352,7 +352,7 @@ _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values )
void
void GLAPIENTRY
_mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values )
{
const GLint n = MIN2(mapsize, MAX_PIXEL_MAP_TABLE);
@@ -373,7 +373,7 @@ _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values )
void
void GLAPIENTRY
_mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values )
{
const GLint n = MIN2(mapsize, MAX_PIXEL_MAP_TABLE);
@@ -394,7 +394,7 @@ _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values )
void
void GLAPIENTRY
_mesa_GetPixelMapfv( GLenum map, GLfloat *values )
{
GET_CURRENT_CONTEXT(ctx);
@@ -442,7 +442,7 @@ _mesa_GetPixelMapfv( GLenum map, GLfloat *values )
}
void
void GLAPIENTRY
_mesa_GetPixelMapuiv( GLenum map, GLuint *values )
{
GET_CURRENT_CONTEXT(ctx);
@@ -502,7 +502,7 @@ _mesa_GetPixelMapuiv( GLenum map, GLuint *values )
}
void
void GLAPIENTRY
_mesa_GetPixelMapusv( GLenum map, GLushort *values )
{
GET_CURRENT_CONTEXT(ctx);
@@ -576,7 +576,7 @@ _mesa_GetPixelMapusv( GLenum map, GLushort *values )
* Implements glPixelTransfer[fi] whether called immediately or from a
* display list.
*/
void
void GLAPIENTRY
_mesa_PixelTransferf( GLenum pname, GLfloat param )
{
GET_CURRENT_CONTEXT(ctx);
@@ -770,7 +770,7 @@ _mesa_PixelTransferf( GLenum pname, GLfloat param )
}
void
void GLAPIENTRY
_mesa_PixelTransferi( GLenum pname, GLint param )
{
_mesa_PixelTransferf( pname, (GLfloat) param );
src/mesa/main/pixel.h
+12 -11
View File
@@ -38,37 +38,38 @@
/** \name API functions */
/*@*/
extern void
extern void GLAPIENTRY
_mesa_GetPixelMapfv( GLenum map, GLfloat *values );
extern void
extern void GLAPIENTRY
_mesa_GetPixelMapuiv( GLenum map, GLuint *values );
extern void
extern void GLAPIENTRY
_mesa_GetPixelMapusv( GLenum map, GLushort *values );
extern void
extern void GLAPIENTRY
_mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values );
extern void
extern void GLAPIENTRY
_mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values );
extern void
extern void GLAPIENTRY
_mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values );
extern void
extern void GLAPIENTRY
_mesa_PixelStoref( GLenum pname, GLfloat param );
extern void
extern void GLAPIENTRY
_mesa_PixelStorei( GLenum pname, GLint param );
extern void
extern void GLAPIENTRY
_mesa_PixelTransferf( GLenum pname, GLfloat param );
extern void
extern void GLAPIENTRY
_mesa_PixelTransferi( GLenum pname, GLint param );
extern void
extern void GLAPIENTRY
_mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor );
/*@}*/
src/mesa/main/points.c
+5 -5
View File
@@ -49,7 +49,7 @@
* size is different from one. Notifies the driver via
* the dd_function_table::PointSize callback.
*/
void
void GLAPIENTRY
_mesa_PointSize( GLfloat size )
{
GET_CURRENT_CONTEXT(ctx);
@@ -84,7 +84,7 @@ _mesa_PointSize( GLfloat size )
/*
* Added by GL_NV_point_sprite
*/
void
void GLAPIENTRY
_mesa_PointParameteriNV( GLenum pname, GLint param )
{
const GLfloat value = (GLfloat) param;
@@ -95,7 +95,7 @@ _mesa_PointParameteriNV( GLenum pname, GLint param )
/*
* Added by GL_NV_point_sprite
*/
void
void GLAPIENTRY
_mesa_PointParameterivNV( GLenum pname, const GLint *params )
{
const GLfloat value = (GLfloat) params[0];
@@ -107,7 +107,7 @@ _mesa_PointParameterivNV( GLenum pname, const GLint *params )
/*
* Same for both GL_EXT_point_parameters and GL_ARB_point_parameters.
*/
void
void GLAPIENTRY
_mesa_PointParameterfEXT( GLenum pname, GLfloat param)
{
_mesa_PointParameterfvEXT(pname, &param);
@@ -118,7 +118,7 @@ _mesa_PointParameterfEXT( GLenum pname, GLfloat param)
/*
* Same for both GL_EXT_point_parameters and GL_ARB_point_parameters.
*/
void
void GLAPIENTRY
_mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/points.h
+5 -5
View File
@@ -35,19 +35,19 @@
#include "mtypes.h"
extern void
extern void GLAPIENTRY
_mesa_PointSize( GLfloat size );
extern void
extern void GLAPIENTRY
_mesa_PointParameteriNV( GLenum pname, GLint param );
extern void
extern void GLAPIENTRY
_mesa_PointParameterivNV( GLenum pname, const GLint *params );
extern void
extern void GLAPIENTRY
_mesa_PointParameterfEXT( GLenum pname, GLfloat param );
extern void
extern void GLAPIENTRY
_mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params );
extern void
src/mesa/main/polygon.c
+7 -7
View File
@@ -49,7 +49,7 @@
* change, flushes the vertices and notifies the driver via
* the dd_function_table::CullFace callback.
*/
void
void GLAPIENTRY
_mesa_CullFace( GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
@@ -85,7 +85,7 @@ _mesa_CullFace( GLenum mode )
* flushes the vertices and notifies the driver via
* the dd_function_table::FrontFace callback.
*/
void
void GLAPIENTRY
_mesa_FrontFace( GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
@@ -124,7 +124,7 @@ _mesa_FrontFace( GLenum mode )
* gl_polygon_attrib::BackMode. On change flushes the vertices and notifies the
* driver via the dd_function_table::PolygonMode callback.
*/
void
void GLAPIENTRY
_mesa_PolygonMode( GLenum face, GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
@@ -177,7 +177,7 @@ _mesa_PolygonMode( GLenum face, GLenum mode )
#if _HAVE_FULL_GL
void
void GLAPIENTRY
_mesa_PolygonStipple( const GLubyte *pattern )
{
GET_CURRENT_CONTEXT(ctx);
@@ -195,7 +195,7 @@ _mesa_PolygonStipple( const GLubyte *pattern )
void
void GLAPIENTRY
_mesa_GetPolygonStipple( GLubyte *dest )
{
GET_CURRENT_CONTEXT(ctx);
@@ -208,7 +208,7 @@ _mesa_GetPolygonStipple( GLubyte *dest )
}
void
void GLAPIENTRY
_mesa_PolygonOffset( GLfloat factor, GLfloat units )
{
GET_CURRENT_CONTEXT(ctx);
@@ -231,7 +231,7 @@ _mesa_PolygonOffset( GLfloat factor, GLfloat units )
void
void GLAPIENTRY
_mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/polygon.h
+8 -8
View File
@@ -35,28 +35,28 @@
#include "mtypes.h"
extern void
extern void GLAPIENTRY
_mesa_CullFace( GLenum mode );
extern void
extern void GLAPIENTRY
_mesa_FrontFace( GLenum mode );
extern void
extern void GLAPIENTRY
_mesa_PolygonMode( GLenum face, GLenum mode );
extern void
extern void GLAPIENTRY
_mesa_PolygonOffset( GLfloat factor, GLfloat units );
extern void
extern void GLAPIENTRY
_mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias );
extern void
extern void GLAPIENTRY
_mesa_PolygonStipple( const GLubyte *mask );
extern void
extern void GLAPIENTRY
_mesa_GetPolygonStipple( GLubyte *mask );
extern void
extern void
_mesa_update_polygon( GLcontext *ctx );
extern void
src/mesa/main/program.c
+1 -1
View File
@@ -894,7 +894,7 @@ _mesa_BindProgram(GLenum target, GLuint id)
* \note Not compiled into display lists.
* \note Called by both glDeleteProgramsNV and glDeleteProgramsARB.
*/
void
void GLAPIENTRY
_mesa_DeletePrograms(GLsizei n, const GLuint *ids)
{
GLint i;
src/mesa/main/program.h
+4 -4
View File
@@ -206,16 +206,16 @@ _mesa_load_state_parameters(GLcontext *ctx,
* API functions
*/
extern void
extern void GLAPIENTRY
_mesa_BindProgram(GLenum target, GLuint id);
extern void
extern void GLAPIENTRY
_mesa_DeletePrograms(GLsizei n, const GLuint *ids);
extern void
extern void GLAPIENTRY
_mesa_GenPrograms(GLsizei n, GLuint *ids);
extern GLboolean
extern GLboolean GLAPIENTRY
_mesa_IsProgram(GLuint id);
src/mesa/main/rastpos.c
+48 -48
View File
@@ -411,70 +411,70 @@ raster_pos4f(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos2d(GLdouble x, GLdouble y)
{
_mesa_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos2f(GLfloat x, GLfloat y)
{
_mesa_RasterPos4f(x, y, 0.0F, 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos2i(GLint x, GLint y)
{
_mesa_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos2s(GLshort x, GLshort y)
{
_mesa_RasterPos4f(x, y, 0.0F, 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos3d(GLdouble x, GLdouble y, GLdouble z)
{
_mesa_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos3f(GLfloat x, GLfloat y, GLfloat z)
{
_mesa_RasterPos4f(x, y, z, 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos3i(GLint x, GLint y, GLint z)
{
_mesa_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos3s(GLshort x, GLshort y, GLshort z)
{
_mesa_RasterPos4f(x, y, z, 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
{
_mesa_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
}
/** Calls raster_pos4f() */
void
void GLAPIENTRY
_mesa_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
{
GET_CURRENT_CONTEXT(ctx);
@@ -482,77 +482,77 @@ _mesa_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos4i(GLint x, GLint y, GLint z, GLint w)
{
_mesa_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
{
_mesa_RasterPos4f(x, y, z, w);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos2dv(const GLdouble *v)
{
_mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos2fv(const GLfloat *v)
{
_mesa_RasterPos4f(v[0], v[1], 0.0F, 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos2iv(const GLint *v)
{
_mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos2sv(const GLshort *v)
{
_mesa_RasterPos4f(v[0], v[1], 0.0F, 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos3dv(const GLdouble *v)
{
_mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos3fv(const GLfloat *v)
{
_mesa_RasterPos4f(v[0], v[1], v[2], 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos3iv(const GLint *v)
{
_mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos3sv(const GLshort *v)
{
_mesa_RasterPos4f(v[0], v[1], v[2], 1.0F);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos4dv(const GLdouble *v)
{
_mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1],
@@ -560,14 +560,14 @@ _mesa_RasterPos4dv(const GLdouble *v)
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos4fv(const GLfloat *v)
{
_mesa_RasterPos4f(v[0], v[1], v[2], v[3]);
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos4iv(const GLint *v)
{
_mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1],
@@ -575,7 +575,7 @@ _mesa_RasterPos4iv(const GLint *v)
}
/** Calls _mesa_RasterPos4f() */
void
void GLAPIENTRY
_mesa_RasterPos4sv(const GLshort *v)
{
_mesa_RasterPos4f(v[0], v[1], v[2], v[3]);
@@ -664,147 +664,147 @@ window_pos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
}
void
void GLAPIENTRY
_mesa_WindowPos2dMESA(GLdouble x, GLdouble y)
{
window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos2fMESA(GLfloat x, GLfloat y)
{
window_pos4f(x, y, 0.0F, 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos2iMESA(GLint x, GLint y)
{
window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos2sMESA(GLshort x, GLshort y)
{
window_pos4f(x, y, 0.0F, 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z)
{
window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z)
{
window_pos4f(x, y, z, 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z)
{
window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z)
{
window_pos4f(x, y, z, 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
{
window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
}
void
void GLAPIENTRY
_mesa_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
{
window_pos4f(x, y, z, w);
}
void
void GLAPIENTRY
_mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w)
{
window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
}
void
void GLAPIENTRY
_mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w)
{
window_pos4f(x, y, z, w);
}
void
void GLAPIENTRY
_mesa_WindowPos2dvMESA(const GLdouble *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos2fvMESA(const GLfloat *v)
{
window_pos4f(v[0], v[1], 0.0F, 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos2ivMESA(const GLint *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos2svMESA(const GLshort *v)
{
window_pos4f(v[0], v[1], 0.0F, 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos3dvMESA(const GLdouble *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos3fvMESA(const GLfloat *v)
{
window_pos4f(v[0], v[1], v[2], 1.0);
}
void
void GLAPIENTRY
_mesa_WindowPos3ivMESA(const GLint *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos3svMESA(const GLshort *v)
{
window_pos4f(v[0], v[1], v[2], 1.0F);
}
void
void GLAPIENTRY
_mesa_WindowPos4dvMESA(const GLdouble *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1],
(GLfloat) v[2], (GLfloat) v[3]);
}
void
void GLAPIENTRY
_mesa_WindowPos4fvMESA(const GLfloat *v)
{
window_pos4f(v[0], v[1], v[2], v[3]);
}
void
void GLAPIENTRY
_mesa_WindowPos4ivMESA(const GLint *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1],
(GLfloat) v[2], (GLfloat) v[3]);
}
void
void GLAPIENTRY
_mesa_WindowPos4svMESA(const GLshort *v)
{
window_pos4f(v[0], v[1], v[2], v[3]);
src/mesa/main/rastpos.h
+48 -48
View File
@@ -35,76 +35,76 @@
#include "glheader.h"
extern void
extern void GLAPIENTRY
_mesa_RasterPos2d(GLdouble x, GLdouble y);
extern void
extern void GLAPIENTRY
_mesa_RasterPos2f(GLfloat x, GLfloat y);
extern void
extern void GLAPIENTRY
_mesa_RasterPos2i(GLint x, GLint y);
extern void
extern void GLAPIENTRY
_mesa_RasterPos2s(GLshort x, GLshort y);
extern void
extern void GLAPIENTRY
_mesa_RasterPos3d(GLdouble x, GLdouble y, GLdouble z);
extern void
extern void GLAPIENTRY
_mesa_RasterPos3f(GLfloat x, GLfloat y, GLfloat z);
extern void
extern void GLAPIENTRY
_mesa_RasterPos3i(GLint x, GLint y, GLint z);
extern void
extern void GLAPIENTRY
_mesa_RasterPos3s(GLshort x, GLshort y, GLshort z);
extern void
extern void GLAPIENTRY
_mesa_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
extern void
extern void GLAPIENTRY
_mesa_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
extern void
extern void GLAPIENTRY
_mesa_RasterPos4i(GLint x, GLint y, GLint z, GLint w);
extern void
extern void GLAPIENTRY
_mesa_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w);
extern void
extern void GLAPIENTRY
_mesa_RasterPos2dv(const GLdouble *v);
extern void
extern void GLAPIENTRY
_mesa_RasterPos2fv(const GLfloat *v);
extern void
extern void GLAPIENTRY
_mesa_RasterPos2iv(const GLint *v);
extern void
extern void GLAPIENTRY
_mesa_RasterPos2sv(const GLshort *v);
extern void
extern void GLAPIENTRY
_mesa_RasterPos3dv(const GLdouble *v);
extern void
extern void GLAPIENTRY
_mesa_RasterPos3fv(const GLfloat *v);
extern void
extern void GLAPIENTRY
_mesa_RasterPos3iv(const GLint *v);
extern void
extern void GLAPIENTRY
_mesa_RasterPos3sv(const GLshort *v);
extern void
extern void GLAPIENTRY
_mesa_RasterPos4dv(const GLdouble *v);
extern void
extern void GLAPIENTRY
_mesa_RasterPos4fv(const GLfloat *v);
extern void
extern void GLAPIENTRY
_mesa_RasterPos4iv(const GLint *v);
extern void
extern void GLAPIENTRY
_mesa_RasterPos4sv(const GLshort *v);
@@ -113,76 +113,76 @@ _mesa_RasterPos4sv(const GLshort *v);
/**********************************************************************/
/*@{*/
extern void
extern void GLAPIENTRY
_mesa_WindowPos2dMESA(GLdouble x, GLdouble y);
extern void
extern void GLAPIENTRY
_mesa_WindowPos2fMESA(GLfloat x, GLfloat y);
extern void
extern void GLAPIENTRY
_mesa_WindowPos2iMESA(GLint x, GLint y);
extern void
extern void GLAPIENTRY
_mesa_WindowPos2sMESA(GLshort x, GLshort y);
extern void
extern void GLAPIENTRY
_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z);
extern void
extern void GLAPIENTRY
_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z);
extern void
extern void GLAPIENTRY
_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z);
extern void
extern void GLAPIENTRY
_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z);
extern void
extern void GLAPIENTRY
_mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
extern void
extern void GLAPIENTRY
_mesa_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
extern void
extern void GLAPIENTRY
_mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w);
extern void
extern void GLAPIENTRY
_mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w);
extern void
extern void GLAPIENTRY
_mesa_WindowPos2dvMESA(const GLdouble *v);
extern void
extern void GLAPIENTRY
_mesa_WindowPos2fvMESA(const GLfloat *v);
extern void
extern void GLAPIENTRY
_mesa_WindowPos2ivMESA(const GLint *v);
extern void
extern void GLAPIENTRY
_mesa_WindowPos2svMESA(const GLshort *v);
extern void
extern void GLAPIENTRY
_mesa_WindowPos3dvMESA(const GLdouble *v);
extern void
extern void GLAPIENTRY
_mesa_WindowPos3fvMESA(const GLfloat *v);
extern void
extern void GLAPIENTRY
_mesa_WindowPos3ivMESA(const GLint *v);
extern void
extern void GLAPIENTRY
_mesa_WindowPos3svMESA(const GLshort *v);
extern void
extern void GLAPIENTRY
_mesa_WindowPos4dvMESA(const GLdouble *v);
extern void
extern void GLAPIENTRY
_mesa_WindowPos4fvMESA(const GLfloat *v);
extern void
extern void GLAPIENTRY
_mesa_WindowPos4ivMESA(const GLint *v);
extern void
extern void GLAPIENTRY
_mesa_WindowPos4svMESA(const GLshort *v);
extern void
src/mesa/main/stencil.c
+5 -5
View File
@@ -49,7 +49,7 @@
* flushes the vertices and notifies the driver via
* the dd_function_table::ClearStencil callback.
*/
void
void GLAPIENTRY
_mesa_ClearStencil( GLint s )
{
GET_CURRENT_CONTEXT(ctx);
@@ -80,7 +80,7 @@ _mesa_ClearStencil( GLint s )
* __GLcontextRec::Stencil. On change flushes the vertices and notifies the
* driver via the dd_function_table::StencilFunc callback.
*/
void
void GLAPIENTRY
_mesa_StencilFunc( GLenum func, GLint ref, GLuint mask )
{
GET_CURRENT_CONTEXT(ctx);
@@ -133,7 +133,7 @@ _mesa_StencilFunc( GLenum func, GLint ref, GLuint mask )
* Updates gl_stencil_attrib::WriteMask. On change flushes the vertices and
* notifies the driver via the dd_function_table::StencilMask callback.
*/
void
void GLAPIENTRY
_mesa_StencilMask( GLuint mask )
{
GET_CURRENT_CONTEXT(ctx);
@@ -166,7 +166,7 @@ _mesa_StencilMask( GLuint mask )
* __GLcontextRec::Stencil. On change flushes the vertices and notifies the
* driver via the dd_function_table::StencilOp callback.
*/
void
void GLAPIENTRY
_mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
{
GET_CURRENT_CONTEXT(ctx);
@@ -246,7 +246,7 @@ _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
#if _HAVE_FULL_GL
/* GL_EXT_stencil_two_side */
void
void GLAPIENTRY
_mesa_ActiveStencilFaceEXT(GLenum face)
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/stencil.h
+6 -6
View File
@@ -35,27 +35,27 @@
#include "mtypes.h"
extern void
extern void GLAPIENTRY
_mesa_ClearStencil( GLint s );
extern void
extern void GLAPIENTRY
_mesa_StencilFunc( GLenum func, GLint ref, GLuint mask );
extern void
extern void GLAPIENTRY
_mesa_StencilMask( GLuint mask );
extern void
extern void GLAPIENTRY
_mesa_StencilOp( GLenum fail, GLenum zfail, GLenum zpass );
extern void
extern void GLAPIENTRY
_mesa_ActiveStencilFaceEXT(GLenum face);
extern void
extern void
_mesa_init_stencil( GLcontext * ctx );
#endif
src/mesa/main/teximage.c
+20 -20
View File
@@ -1756,7 +1756,7 @@ copytexsubimage_error_check( GLcontext *ctx, GLuint dimensions,
* \param type pixel data type.
* \param pixels pixel data.
*/
void
void GLAPIENTRY
_mesa_GetTexImage( GLenum target, GLint level, GLenum format,
GLenum type, GLvoid *pixels )
{
@@ -1895,7 +1895,7 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
/*
* Called from the API. Note that width includes the border.
*/
void
void GLAPIENTRY
_mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
GLsizei width, GLint border, GLenum format,
GLenum type, const GLvoid *pixels )
@@ -1984,7 +1984,7 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
}
void
void GLAPIENTRY
_mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
GLsizei width, GLsizei height, GLint border,
GLenum format, GLenum type,
@@ -2089,7 +2089,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
* Called by the API or display list executor.
* Note that width and height include the border.
*/
void
void GLAPIENTRY
_mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
GLsizei width, GLsizei height, GLsizei depth,
GLint border, GLenum format, GLenum type,
@@ -2170,7 +2170,7 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
}
void
void GLAPIENTRY
_mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalFormat,
GLsizei width, GLsizei height, GLsizei depth,
GLint border, GLenum format, GLenum type,
@@ -2182,7 +2182,7 @@ _mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalFormat,
void
void GLAPIENTRY
_mesa_TexSubImage1D( GLenum target, GLint level,
GLint xoffset, GLsizei width,
GLenum format, GLenum type,
@@ -2227,7 +2227,7 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
}
void
void GLAPIENTRY
_mesa_TexSubImage2D( GLenum target, GLint level,
GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height,
@@ -2276,7 +2276,7 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
void
void GLAPIENTRY
_mesa_TexSubImage3D( GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,
GLsizei width, GLsizei height, GLsizei depth,
@@ -2321,7 +2321,7 @@ _mesa_TexSubImage3D( GLenum target, GLint level,
void
void GLAPIENTRY
_mesa_CopyTexImage1D( GLenum target, GLint level,
GLenum internalFormat,
GLint x, GLint y,
@@ -2381,7 +2381,7 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
void
void GLAPIENTRY
_mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
GLint x, GLint y, GLsizei width, GLsizei height,
GLint border )
@@ -2441,7 +2441,7 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
void
void GLAPIENTRY
_mesa_CopyTexSubImage1D( GLenum target, GLint level,
GLint xoffset, GLint x, GLint y, GLsizei width )
{
@@ -2477,7 +2477,7 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
void
void GLAPIENTRY
_mesa_CopyTexSubImage2D( GLenum target, GLint level,
GLint xoffset, GLint yoffset,
GLint x, GLint y, GLsizei width, GLsizei height )
@@ -2516,7 +2516,7 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
void
void GLAPIENTRY
_mesa_CopyTexSubImage3D( GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,
GLint x, GLint y, GLsizei width, GLsizei height )
@@ -2733,7 +2733,7 @@ compressed_subtexture_error_check(GLcontext *ctx, GLint dimensions,
void
void GLAPIENTRY
_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
GLenum internalFormat, GLsizei width,
GLint border, GLsizei imageSize,
@@ -2812,7 +2812,7 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
}
void
void GLAPIENTRY
_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
GLenum internalFormat, GLsizei width,
GLsizei height, GLint border, GLsizei imageSize,
@@ -2896,7 +2896,7 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
}
void
void GLAPIENTRY
_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
GLenum internalFormat, GLsizei width,
GLsizei height, GLsizei depth, GLint border,
@@ -2976,7 +2976,7 @@ _mesa_CompressedTexImage3DARB(GLenum target, GLint level,
}
void
void GLAPIENTRY
_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
GLsizei width, GLenum format,
GLsizei imageSize, const GLvoid *data)
@@ -3024,7 +3024,7 @@ _mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
}
void
void GLAPIENTRY
_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height,
GLenum format, GLsizei imageSize,
@@ -3074,7 +3074,7 @@ _mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
}
void
void GLAPIENTRY
_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLint zoffset, GLsizei width,
GLsizei height, GLsizei depth, GLenum format,
@@ -3126,7 +3126,7 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
}
void
void GLAPIENTRY
_mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)
{
const struct gl_texture_unit *texUnit;
src/mesa/main/teximage.h
+20 -20
View File
@@ -97,44 +97,44 @@ _mesa_test_proxy_teximage(GLcontext *ctx, GLenum target, GLint level,
/** \name API entry point functions */
/*@{*/
extern void
extern void GLAPIENTRY
_mesa_TexImage1D( GLenum target, GLint level, GLint internalformat,
GLsizei width, GLint border,
GLenum format, GLenum type, const GLvoid *pixels );
extern void
extern void GLAPIENTRY
_mesa_TexImage2D( GLenum target, GLint level, GLint internalformat,
GLsizei width, GLsizei height, GLint border,
GLenum format, GLenum type, const GLvoid *pixels );
extern void
extern void GLAPIENTRY
_mesa_TexImage3D( GLenum target, GLint level, GLint internalformat,
GLsizei width, GLsizei height, GLsizei depth, GLint border,
GLenum format, GLenum type, const GLvoid *pixels );
extern void
extern void GLAPIENTRY
_mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalformat,
GLsizei width, GLsizei height, GLsizei depth,
GLint border, GLenum format, GLenum type,
const GLvoid *pixels );
extern void
extern void GLAPIENTRY
_mesa_GetTexImage( GLenum target, GLint level,
GLenum format, GLenum type, GLvoid *pixels );
extern void
extern void GLAPIENTRY
_mesa_TexSubImage1D( GLenum target, GLint level, GLint xoffset,
GLsizei width,
GLenum format, GLenum type,
const GLvoid *pixels );
extern void
extern void GLAPIENTRY
_mesa_TexSubImage2D( GLenum target, GLint level,
GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height,
@@ -142,7 +142,7 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
const GLvoid *pixels );
extern void
extern void GLAPIENTRY
_mesa_TexSubImage3D( GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,
GLsizei width, GLsizei height, GLsizei depth,
@@ -150,48 +150,48 @@ _mesa_TexSubImage3D( GLenum target, GLint level,
const GLvoid *pixels );
extern void
extern void GLAPIENTRY
_mesa_CopyTexImage1D( GLenum target, GLint level, GLenum internalformat,
GLint x, GLint y, GLsizei width, GLint border );
extern void
extern void GLAPIENTRY
_mesa_CopyTexImage2D( GLenum target, GLint level,
GLenum internalformat, GLint x, GLint y,
GLsizei width, GLsizei height, GLint border );
extern void
extern void GLAPIENTRY
_mesa_CopyTexSubImage1D( GLenum target, GLint level, GLint xoffset,
GLint x, GLint y, GLsizei width );
extern void
extern void GLAPIENTRY
_mesa_CopyTexSubImage2D( GLenum target, GLint level,
GLint xoffset, GLint yoffset,
GLint x, GLint y, GLsizei width, GLsizei height );
extern void
extern void GLAPIENTRY
_mesa_CopyTexSubImage3D( GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,
GLint x, GLint y, GLsizei width, GLsizei height );
extern void
extern void GLAPIENTRY
_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
GLenum internalformat, GLsizei width,
GLint border, GLsizei imageSize,
const GLvoid *data);
extern void
extern void GLAPIENTRY
_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
GLenum internalformat, GLsizei width,
GLsizei height, GLint border, GLsizei imageSize,
const GLvoid *data);
extern void
extern void GLAPIENTRY
_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
GLenum internalformat, GLsizei width,
GLsizei height, GLsizei depth, GLint border,
@@ -202,24 +202,24 @@ _mesa_CompressedTexImage3DARB(GLenum target, GLint level,
#define _mesa_CompressedTexSubImage2DARB _mesa_CompressedTexSubImage2DAR
#define _mesa_CompressedTexSubImage3DARB _mesa_CompressedTexSubImage3DAR
#endif
extern void
extern void GLAPIENTRY
_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
GLsizei width, GLenum format,
GLsizei imageSize, const GLvoid *data);
extern void
extern void GLAPIENTRY
_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height,
GLenum format, GLsizei imageSize,
const GLvoid *data);
extern void
extern void GLAPIENTRY
_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLint zoffset, GLsizei width,
GLsizei height, GLsizei depth, GLenum format,
GLsizei imageSize, const GLvoid *data);
extern void
extern void GLAPIENTRY
_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img);
/*@}*/
src/mesa/main/texobj.c
+6 -6
View File
@@ -603,7 +603,7 @@ _glthread_DECLARE_STATIC_MUTEX(GenTexturesLock);
* to find a block of free texture IDs which are stored in \p texName.
* Corresponding empty texture objects are also generated.
*/
void
void GLAPIENTRY
_mesa_GenTextures( GLsizei n, GLuint *texName )
{
GET_CURRENT_CONTEXT(ctx);
@@ -655,7 +655,7 @@ _mesa_GenTextures( GLsizei n, GLuint *texName )
* it and decrementing the reference count if so. If the texture reference
* count is zero, delete its object.
*/
void
void GLAPIENTRY
_mesa_DeleteTextures( GLsizei n, const GLuint *texName)
{
GET_CURRENT_CONTEXT(ctx);
@@ -744,7 +744,7 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *texName)
* calls dd_function_table::BindTexture. Decrements the old texture reference
* count and deletes it if it reaches zero.
*/
void
void GLAPIENTRY
_mesa_BindTexture( GLenum target, GLuint texName )
{
GET_CURRENT_CONTEXT(ctx);
@@ -900,7 +900,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
* Looks up each texture in the hash, clamps the corresponding priority between
* 0.0 and 1.0, and calls dd_function_table::PrioritizeTexture.
*/
void
void GLAPIENTRY
_mesa_PrioritizeTextures( GLsizei n, const GLuint *texName,
const GLclampf *priorities )
{
@@ -945,7 +945,7 @@ _mesa_PrioritizeTextures( GLsizei n, const GLuint *texName,
* Looks up each texture in the hash and calls
* dd_function_table::IsTextureResident.
*/
GLboolean
GLboolean GLAPIENTRY
_mesa_AreTexturesResident(GLsizei n, const GLuint *texName,
GLboolean *residences)
{
@@ -1006,7 +1006,7 @@ _mesa_AreTexturesResident(GLsizei n, const GLuint *texName,
*
* Calls _mesa_HashLookup().
*/
GLboolean
GLboolean GLAPIENTRY
_mesa_IsTexture( GLuint texture )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/texobj.h
+6 -6
View File
@@ -72,28 +72,28 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
*/
/*@{*/
extern void
extern void GLAPIENTRY
_mesa_GenTextures( GLsizei n, GLuint *textures );
extern void
extern void GLAPIENTRY
_mesa_DeleteTextures( GLsizei n, const GLuint *textures );
extern void
extern void GLAPIENTRY
_mesa_BindTexture( GLenum target, GLuint texture );
extern void
extern void GLAPIENTRY
_mesa_PrioritizeTextures( GLsizei n, const GLuint *textures,
const GLclampf *priorities );
extern GLboolean
extern GLboolean GLAPIENTRY
_mesa_AreTexturesResident( GLsizei n, const GLuint *textures,
GLboolean *residences );
extern GLboolean
extern GLboolean GLAPIENTRY
_mesa_IsTexture( GLuint texture );
/*@}*/
src/mesa/main/texstate.c
+32 -32
View File
@@ -151,7 +151,7 @@ _mesa_print_texunit_state( GLcontext *ctx, GLuint unit )
/**********************************************************************/
void
void GLAPIENTRY
_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
{
GET_CURRENT_CONTEXT(ctx);
@@ -580,7 +580,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
}
void
void GLAPIENTRY
_mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param )
{
_mesa_TexEnvfv( target, pname, &param );
@@ -588,7 +588,7 @@ _mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param )
void
void GLAPIENTRY
_mesa_TexEnvi( GLenum target, GLenum pname, GLint param )
{
GLfloat p[4];
@@ -598,7 +598,7 @@ _mesa_TexEnvi( GLenum target, GLenum pname, GLint param )
}
void
void GLAPIENTRY
_mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param )
{
GLfloat p[4];
@@ -616,7 +616,7 @@ _mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param )
}
void
void GLAPIENTRY
_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -827,7 +827,7 @@ _mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
}
void
void GLAPIENTRY
_mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -1078,14 +1078,14 @@ _mesa_validate_texture_wrap_mode(GLcontext * ctx,
}
void
void GLAPIENTRY
_mesa_TexParameterf( GLenum target, GLenum pname, GLfloat param )
{
_mesa_TexParameterfv(target, pname, &param);
}
void
void GLAPIENTRY
_mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -1404,7 +1404,7 @@ _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
}
void
void GLAPIENTRY
_mesa_TexParameteri( GLenum target, GLenum pname, GLint param )
{
GLfloat fparam[4];
@@ -1417,7 +1417,7 @@ _mesa_TexParameteri( GLenum target, GLenum pname, GLint param )
}
void
void GLAPIENTRY
_mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params )
{
GLfloat fparam[4];
@@ -1438,7 +1438,7 @@ _mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params )
}
void
void GLAPIENTRY
_mesa_GetTexLevelParameterfv( GLenum target, GLint level,
GLenum pname, GLfloat *params )
{
@@ -1480,7 +1480,7 @@ tex_image_dimensions(GLcontext *ctx, GLenum target)
}
void
void GLAPIENTRY
_mesa_GetTexLevelParameteriv( GLenum target, GLint level,
GLenum pname, GLint *params )
{
@@ -1656,7 +1656,7 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
void
void GLAPIENTRY
_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -1780,7 +1780,7 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
}
void
void GLAPIENTRY
_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -1917,7 +1917,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
/**********************************************************************/
#if FEATURE_texgen
void
void GLAPIENTRY
_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -2156,7 +2156,7 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
}
void
void GLAPIENTRY
_mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params )
{
GLfloat p[4];
@@ -2173,7 +2173,7 @@ _mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params )
}
void
void GLAPIENTRY
_mesa_TexGend(GLenum coord, GLenum pname, GLdouble param )
{
GLfloat p = (GLfloat) param;
@@ -2181,7 +2181,7 @@ _mesa_TexGend(GLenum coord, GLenum pname, GLdouble param )
}
void
void GLAPIENTRY
_mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params )
{
GLfloat p[4];
@@ -2198,14 +2198,14 @@ _mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params )
}
void
void GLAPIENTRY
_mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param )
{
_mesa_TexGenfv(coord, pname, &param);
}
void
void GLAPIENTRY
_mesa_TexGeni( GLenum coord, GLenum pname, GLint param )
{
_mesa_TexGeniv( coord, pname, &param );
@@ -2213,7 +2213,7 @@ _mesa_TexGeni( GLenum coord, GLenum pname, GLint param )
void
void GLAPIENTRY
_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -2290,7 +2290,7 @@ _mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params )
void
void GLAPIENTRY
_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -2367,7 +2367,7 @@ _mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params )
void
void GLAPIENTRY
_mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
{
GET_CURRENT_CONTEXT(ctx);
@@ -2468,7 +2468,7 @@ _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
#endif
/* GL_ARB_multitexture */
void
void GLAPIENTRY
_mesa_ActiveTextureARB( GLenum target )
{
GET_CURRENT_CONTEXT(ctx);
@@ -2503,7 +2503,7 @@ _mesa_ActiveTextureARB( GLenum target )
/* GL_ARB_multitexture */
void
void GLAPIENTRY
_mesa_ClientActiveTextureARB( GLenum target )
{
GET_CURRENT_CONTEXT(ctx);
@@ -2525,7 +2525,7 @@ _mesa_ClientActiveTextureARB( GLenum target )
/* Pixel Texgen Extensions */
/**********************************************************************/
void
void GLAPIENTRY
_mesa_PixelTexGenSGIX(GLenum mode)
{
GLenum newRgbSource, newAlphaSource;
@@ -2564,21 +2564,21 @@ _mesa_PixelTexGenSGIX(GLenum mode)
}
void
void GLAPIENTRY
_mesa_PixelTexGenParameterfSGIS(GLenum target, GLfloat value)
{
_mesa_PixelTexGenParameteriSGIS(target, (GLint) value);
}
void
void GLAPIENTRY
_mesa_PixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value)
{
_mesa_PixelTexGenParameteriSGIS(target, (GLint) *value);
}
void
void GLAPIENTRY
_mesa_PixelTexGenParameteriSGIS(GLenum target, GLint value)
{
GET_CURRENT_CONTEXT(ctx);
@@ -2609,14 +2609,14 @@ _mesa_PixelTexGenParameteriSGIS(GLenum target, GLint value)
}
void
void GLAPIENTRY
_mesa_PixelTexGenParameterivSGIS(GLenum target, const GLint *value)
{
_mesa_PixelTexGenParameteriSGIS(target, *value);
}
void
void GLAPIENTRY
_mesa_GetPixelTexGenParameterfvSGIS(GLenum target, GLfloat *value)
{
GET_CURRENT_CONTEXT(ctx);
@@ -2634,7 +2634,7 @@ _mesa_GetPixelTexGenParameterfvSGIS(GLenum target, GLfloat *value)
}
void
void GLAPIENTRY
_mesa_GetPixelTexGenParameterivSGIS(GLenum target, GLint *value)
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/main/texstate.h
+32 -32
View File
@@ -47,89 +47,89 @@ _mesa_print_texunit_state( GLcontext *ctx, GLuint unit );
*/
/*@{*/
extern void
extern void GLAPIENTRY
_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params );
extern void
extern void GLAPIENTRY
_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
extern void
extern void GLAPIENTRY
_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params );
extern void
extern void GLAPIENTRY
_mesa_GetTexLevelParameterfv( GLenum target, GLint level,
GLenum pname, GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_GetTexLevelParameteriv( GLenum target, GLint level,
GLenum pname, GLint *params );
extern void
extern void GLAPIENTRY
_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params );
extern void
extern void GLAPIENTRY
_mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param );
extern void
extern void GLAPIENTRY
_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param );
extern void
extern void GLAPIENTRY
_mesa_TexEnvi( GLenum target, GLenum pname, GLint param );
extern void
extern void GLAPIENTRY
_mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param );
extern void
extern void GLAPIENTRY
_mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_TexParameterf( GLenum target, GLenum pname, GLfloat param );
extern void
extern void GLAPIENTRY
_mesa_TexParameteri( GLenum target, GLenum pname, GLint param );
extern void
extern void GLAPIENTRY
_mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params );
extern void
extern void GLAPIENTRY
_mesa_TexGend( GLenum coord, GLenum pname, GLdouble param );
extern void
extern void GLAPIENTRY
_mesa_TexGendv( GLenum coord, GLenum pname, const GLdouble *params );
extern void
extern void GLAPIENTRY
_mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param );
extern void
extern void GLAPIENTRY
_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
extern void
extern void GLAPIENTRY
_mesa_TexGeni( GLenum coord, GLenum pname, GLint param );
extern void
extern void GLAPIENTRY
_mesa_TexGeniv( GLenum coord, GLenum pname, const GLint *params );
/*
* GL_ARB_multitexture
*/
extern void
extern void GLAPIENTRY
_mesa_ActiveTextureARB( GLenum target );
extern void
extern void GLAPIENTRY
_mesa_ClientActiveTextureARB( GLenum target );
@@ -137,37 +137,37 @@ _mesa_ClientActiveTextureARB( GLenum target );
* Pixel Texture Extensions
*/
extern void
extern void GLAPIENTRY
_mesa_PixelTexGenSGIX(GLenum mode);
extern void
extern void GLAPIENTRY
_mesa_PixelTexGenParameterfSGIS(GLenum target, GLfloat value);
#ifdef VMS
#define _mesa_PixelTexGenParameterfvSGIS _mesa_PixelTexGenParameterfv
#endif
extern void
extern void GLAPIENTRY
_mesa_PixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value);
extern void
extern void GLAPIENTRY
_mesa_PixelTexGenParameteriSGIS(GLenum target, GLint value);
#ifdef VMS
#define _mesa_PixelTexGenParameterivSGIS _mesa_PixelTexGenParameteriv
#endif
extern void
extern void GLAPIENTRY
_mesa_PixelTexGenParameterivSGIS(GLenum target, const GLint *value);
#ifdef VMS
#define _mesa_GetPixelTexGenParameterfvSGIS _mesa_GetPixelTexGenParameterfv
#endif
extern void
extern void GLAPIENTRY
_mesa_GetPixelTexGenParameterfvSGIS(GLenum target, GLfloat *value);
#ifdef VMS
#define _mesa_GetPixelTexGenParameterivSGIS _mesa_GetPixelTexGenParameteriv
#endif
extern void
extern void GLAPIENTRY
_mesa_GetPixelTexGenParameterivSGIS(GLenum target, GLint *value);
/*@}*/
src/mesa/main/varray.c
+24 -24
View File
@@ -34,7 +34,7 @@
#include "varray.h"
void
void GLAPIENTRY
_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
{
GET_CURRENT_CONTEXT(ctx);
@@ -90,7 +90,7 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
}
void
void GLAPIENTRY
_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
{
GET_CURRENT_CONTEXT(ctx);
@@ -143,7 +143,7 @@ _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
}
void
void GLAPIENTRY
_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
{
GET_CURRENT_CONTEXT(ctx);
@@ -210,7 +210,7 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
}
void
void GLAPIENTRY
_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
{
GET_CURRENT_CONTEXT(ctx);
@@ -251,7 +251,7 @@ _mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
}
void
void GLAPIENTRY
_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
{
GET_CURRENT_CONTEXT(ctx);
@@ -301,7 +301,7 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
}
void
void GLAPIENTRY
_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr)
{
@@ -369,7 +369,7 @@ _mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
}
void
void GLAPIENTRY
_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
const GLvoid *ptr)
{
@@ -427,7 +427,7 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
}
void
void GLAPIENTRY
_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *vptr)
{
GET_CURRENT_CONTEXT(ctx);
@@ -453,7 +453,7 @@ _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *vptr)
#if FEATURE_NV_vertex_program
void
void GLAPIENTRY
_mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr)
{
@@ -519,7 +519,7 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
#if FEATURE_ARB_vertex_program
void
void GLAPIENTRY
_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
GLboolean normalized,
GLsizei stride, const GLvoid *ptr)
@@ -601,7 +601,7 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
#endif
void
void GLAPIENTRY
_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
GLsizei count, const GLvoid *ptr)
{
@@ -610,7 +610,7 @@ _mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
}
void
void GLAPIENTRY
_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
const GLvoid *ptr)
{
@@ -619,7 +619,7 @@ _mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
}
void
void GLAPIENTRY
_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
const GLvoid *ptr)
{
@@ -628,7 +628,7 @@ _mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
}
void
void GLAPIENTRY
_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
const GLvoid *ptr)
{
@@ -637,7 +637,7 @@ _mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
}
void
void GLAPIENTRY
_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
GLsizei count, const GLvoid *ptr)
{
@@ -646,7 +646,7 @@ _mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
}
void
void GLAPIENTRY
_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr)
{
(void) count;
@@ -654,7 +654,7 @@ _mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr)
}
void
void GLAPIENTRY
_mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
{
GET_CURRENT_CONTEXT(ctx);
@@ -849,7 +849,7 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
}
void
void GLAPIENTRY
_mesa_LockArraysEXT(GLint first, GLsizei count)
{
GET_CURRENT_CONTEXT(ctx);
@@ -876,7 +876,7 @@ _mesa_LockArraysEXT(GLint first, GLsizei count)
}
void
void GLAPIENTRY
_mesa_UnlockArraysEXT( void )
{
GET_CURRENT_CONTEXT(ctx);
@@ -897,7 +897,7 @@ _mesa_UnlockArraysEXT( void )
/* GL_EXT_multi_draw_arrays */
/* Somebody forgot to spec the first and count parameters as const! <sigh> */
void
void GLAPIENTRY
_mesa_MultiDrawArraysEXT( GLenum mode, GLint *first,
GLsizei *count, GLsizei primcount )
{
@@ -915,7 +915,7 @@ _mesa_MultiDrawArraysEXT( GLenum mode, GLint *first,
/* GL_EXT_multi_draw_arrays */
void
void GLAPIENTRY
_mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,
const GLvoid **indices, GLsizei primcount )
{
@@ -939,7 +939,7 @@ _mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,
/* GL_IBM_multimode_draw_arrays */
void
void GLAPIENTRY
_mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,
const GLsizei * count,
GLsizei primcount, GLint modestride )
@@ -959,7 +959,7 @@ _mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,
/* GL_IBM_multimode_draw_arrays */
void
void GLAPIENTRY
_mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
GLenum type, const GLvoid * const * indices,
GLsizei primcount, GLint modestride )
@@ -984,7 +984,7 @@ _mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
/***** Initialization *****/
/**********************************************************************/
void
void
_mesa_init_varray( GLcontext * ctx )
{
GLuint i;
src/mesa/main/varray.h
+23 -23
View File
@@ -41,107 +41,107 @@
#if _HAVE_FULL_GL
extern void
extern void GLAPIENTRY
_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride,
const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_UnlockArraysEXT( void );
extern void
extern void GLAPIENTRY
_mesa_LockArraysEXT(GLint first, GLsizei count);
extern void
extern void GLAPIENTRY
_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
GLsizei count, const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
GLsizei count, const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);
extern void
extern void GLAPIENTRY
_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr);
extern void
extern void GLAPIENTRY
_mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
GLsizei stride, const GLvoid *pointer);
extern void
extern void GLAPIENTRY
_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
GLboolean normalized, GLsizei stride,
const GLvoid *pointer);
extern void
extern void GLAPIENTRY
_mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer);
extern void
extern void GLAPIENTRY
_mesa_MultiDrawArraysEXT( GLenum mode, GLint *first,
GLsizei *count, GLsizei primcount );
extern void
extern void GLAPIENTRY
_mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,
const GLvoid **indices, GLsizei primcount );
extern void
extern void GLAPIENTRY
_mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,
const GLsizei * count,
GLsizei primcount, GLint modestride );
extern void
extern void GLAPIENTRY
_mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
GLenum type, const GLvoid * const * indices,
GLsizei primcount, GLint modestride );
src/mesa/main/vtxfmt_tmp.h
+61 -61
View File
@@ -30,346 +30,346 @@
#define PRE_LOOPBACK( FUNC )
#endif
static void TAG(ArrayElement)( GLint i )
static void GLAPIENTRY TAG(ArrayElement)( GLint i )
{
PRE_LOOPBACK( ArrayElement );
_glapi_Dispatch->ArrayElement( i );
}
static void TAG(Color3f)( GLfloat r, GLfloat g, GLfloat b )
static void GLAPIENTRY TAG(Color3f)( GLfloat r, GLfloat g, GLfloat b )
{
PRE_LOOPBACK( Color3f );
_glapi_Dispatch->Color3f( r, g, b );
}
static void TAG(Color3fv)( const GLfloat *v )
static void GLAPIENTRY TAG(Color3fv)( const GLfloat *v )
{
PRE_LOOPBACK( Color3fv );
_glapi_Dispatch->Color3fv( v );
}
static void TAG(Color3ub)( GLubyte r, GLubyte g, GLubyte b )
static void GLAPIENTRY TAG(Color3ub)( GLubyte r, GLubyte g, GLubyte b )
{
PRE_LOOPBACK( Color3ub );
_glapi_Dispatch->Color3ub( r, g, b );
}
static void TAG(Color3ubv)( const GLubyte *v )
static void GLAPIENTRY TAG(Color3ubv)( const GLubyte *v )
{
PRE_LOOPBACK( Color3ubv );
_glapi_Dispatch->Color3ubv( v );
}
static void TAG(Color4f)( GLfloat r, GLfloat g, GLfloat b, GLfloat a )
static void GLAPIENTRY TAG(Color4f)( GLfloat r, GLfloat g, GLfloat b, GLfloat a )
{
PRE_LOOPBACK( Color4f );
_glapi_Dispatch->Color4f( r, g, b, a );
}
static void TAG(Color4fv)( const GLfloat *v )
static void GLAPIENTRY TAG(Color4fv)( const GLfloat *v )
{
PRE_LOOPBACK( Color4fv );
_glapi_Dispatch->Color4fv( v );
}
static void TAG(Color4ub)( GLubyte r, GLubyte g, GLubyte b, GLubyte a )
static void GLAPIENTRY TAG(Color4ub)( GLubyte r, GLubyte g, GLubyte b, GLubyte a )
{
PRE_LOOPBACK( Color4ub );
_glapi_Dispatch->Color4ub( r, g, b, a );
}
static void TAG(Color4ubv)( const GLubyte *v )
static void GLAPIENTRY TAG(Color4ubv)( const GLubyte *v )
{
PRE_LOOPBACK( Color4ubv );
_glapi_Dispatch->Color4ubv( v );
}
static void TAG(EdgeFlag)( GLboolean e )
static void GLAPIENTRY TAG(EdgeFlag)( GLboolean e )
{
PRE_LOOPBACK( EdgeFlag );
_glapi_Dispatch->EdgeFlag( e );
}
static void TAG(EdgeFlagv)( const GLboolean *v )
static void GLAPIENTRY TAG(EdgeFlagv)( const GLboolean *v )
{
PRE_LOOPBACK( EdgeFlagv );
_glapi_Dispatch->EdgeFlagv( v );
}
static void TAG(EvalCoord1f)( GLfloat s )
static void GLAPIENTRY TAG(EvalCoord1f)( GLfloat s )
{
PRE_LOOPBACK( EvalCoord1f );
_glapi_Dispatch->EvalCoord1f( s );
}
static void TAG(EvalCoord1fv)( const GLfloat *v )
static void GLAPIENTRY TAG(EvalCoord1fv)( const GLfloat *v )
{
PRE_LOOPBACK( EvalCoord1fv );
_glapi_Dispatch->EvalCoord1fv( v );
}
static void TAG(EvalCoord2f)( GLfloat s, GLfloat t )
static void GLAPIENTRY TAG(EvalCoord2f)( GLfloat s, GLfloat t )
{
PRE_LOOPBACK( EvalCoord2f );
_glapi_Dispatch->EvalCoord2f( s, t );
}
static void TAG(EvalCoord2fv)( const GLfloat *v )
static void GLAPIENTRY TAG(EvalCoord2fv)( const GLfloat *v )
{
PRE_LOOPBACK( EvalCoord2fv );
_glapi_Dispatch->EvalCoord2fv( v );
}
static void TAG(EvalPoint1)( GLint i )
static void GLAPIENTRY TAG(EvalPoint1)( GLint i )
{
PRE_LOOPBACK( EvalPoint1 );
_glapi_Dispatch->EvalPoint1( i );
}
static void TAG(EvalPoint2)( GLint i, GLint j )
static void GLAPIENTRY TAG(EvalPoint2)( GLint i, GLint j )
{
PRE_LOOPBACK( EvalPoint2 );
_glapi_Dispatch->EvalPoint2( i, j );
}
static void TAG(FogCoordfEXT)( GLfloat f )
static void GLAPIENTRY TAG(FogCoordfEXT)( GLfloat f )
{
PRE_LOOPBACK( FogCoordfEXT );
_glapi_Dispatch->FogCoordfEXT( f );
}
static void TAG(FogCoordfvEXT)( const GLfloat *v )
static void GLAPIENTRY TAG(FogCoordfvEXT)( const GLfloat *v )
{
PRE_LOOPBACK( FogCoordfvEXT );
_glapi_Dispatch->FogCoordfvEXT( v );
}
static void TAG(Indexi)( GLint i )
static void GLAPIENTRY TAG(Indexi)( GLint i )
{
PRE_LOOPBACK( Indexi );
_glapi_Dispatch->Indexi( i );
}
static void TAG(Indexiv)( const GLint *v )
static void GLAPIENTRY TAG(Indexiv)( const GLint *v )
{
PRE_LOOPBACK( Indexiv );
_glapi_Dispatch->Indexiv( v );
}
static void TAG(Materialfv)( GLenum face, GLenum pname, const GLfloat *v )
static void GLAPIENTRY TAG(Materialfv)( GLenum face, GLenum pname, const GLfloat *v )
{
PRE_LOOPBACK( Materialfv );
_glapi_Dispatch->Materialfv( face, pname, v );
}
static void TAG(MultiTexCoord1fARB)( GLenum target, GLfloat a )
static void GLAPIENTRY TAG(MultiTexCoord1fARB)( GLenum target, GLfloat a )
{
PRE_LOOPBACK( MultiTexCoord1fARB );
_glapi_Dispatch->MultiTexCoord1fARB( target, a );
}
static void TAG(MultiTexCoord1fvARB)( GLenum target, const GLfloat *tc )
static void GLAPIENTRY TAG(MultiTexCoord1fvARB)( GLenum target, const GLfloat *tc )
{
PRE_LOOPBACK( MultiTexCoord1fvARB );
_glapi_Dispatch->MultiTexCoord1fvARB( target, tc );
}
static void TAG(MultiTexCoord2fARB)( GLenum target, GLfloat s, GLfloat t )
static void GLAPIENTRY TAG(MultiTexCoord2fARB)( GLenum target, GLfloat s, GLfloat t )
{
PRE_LOOPBACK( MultiTexCoord2fARB );
_glapi_Dispatch->MultiTexCoord2fARB( target, s, t );
}
static void TAG(MultiTexCoord2fvARB)( GLenum target, const GLfloat *tc )
static void GLAPIENTRY TAG(MultiTexCoord2fvARB)( GLenum target, const GLfloat *tc )
{
PRE_LOOPBACK( MultiTexCoord2fvARB );
_glapi_Dispatch->MultiTexCoord2fvARB( target, tc );
}
static void TAG(MultiTexCoord3fARB)( GLenum target, GLfloat s,
static void GLAPIENTRY TAG(MultiTexCoord3fARB)( GLenum target, GLfloat s,
GLfloat t, GLfloat r )
{
PRE_LOOPBACK( MultiTexCoord3fARB );
_glapi_Dispatch->MultiTexCoord3fARB( target, s, t, r );
}
static void TAG(MultiTexCoord3fvARB)( GLenum target, const GLfloat *tc )
static void GLAPIENTRY TAG(MultiTexCoord3fvARB)( GLenum target, const GLfloat *tc )
{
PRE_LOOPBACK( MultiTexCoord3fvARB );
_glapi_Dispatch->MultiTexCoord3fvARB( target, tc );
}
static void TAG(MultiTexCoord4fARB)( GLenum target, GLfloat s,
static void GLAPIENTRY TAG(MultiTexCoord4fARB)( GLenum target, GLfloat s,
GLfloat t, GLfloat r, GLfloat q )
{
PRE_LOOPBACK( MultiTexCoord4fARB );
_glapi_Dispatch->MultiTexCoord4fARB( target, s, t, r, q );
}
static void TAG(MultiTexCoord4fvARB)( GLenum target, const GLfloat *tc )
static void GLAPIENTRY TAG(MultiTexCoord4fvARB)( GLenum target, const GLfloat *tc )
{
PRE_LOOPBACK( MultiTexCoord4fvARB );
_glapi_Dispatch->MultiTexCoord4fvARB( target, tc );
}
static void TAG(Normal3f)( GLfloat x, GLfloat y, GLfloat z )
static void GLAPIENTRY TAG(Normal3f)( GLfloat x, GLfloat y, GLfloat z )
{
PRE_LOOPBACK( Normal3f );
_glapi_Dispatch->Normal3f( x, y, z );
}
static void TAG(Normal3fv)( const GLfloat *v )
static void GLAPIENTRY TAG(Normal3fv)( const GLfloat *v )
{
PRE_LOOPBACK( Normal3fv );
_glapi_Dispatch->Normal3fv( v );
}
static void TAG(SecondaryColor3fEXT)( GLfloat r, GLfloat g, GLfloat b )
static void GLAPIENTRY TAG(SecondaryColor3fEXT)( GLfloat r, GLfloat g, GLfloat b )
{
PRE_LOOPBACK( SecondaryColor3fEXT );
_glapi_Dispatch->SecondaryColor3fEXT( r, g, b );
}
static void TAG(SecondaryColor3fvEXT)( const GLfloat *v )
static void GLAPIENTRY TAG(SecondaryColor3fvEXT)( const GLfloat *v )
{
PRE_LOOPBACK( SecondaryColor3fvEXT );
_glapi_Dispatch->SecondaryColor3fvEXT( v );
}
static void TAG(SecondaryColor3ubEXT)( GLubyte r, GLubyte g, GLubyte b )
static void GLAPIENTRY TAG(SecondaryColor3ubEXT)( GLubyte r, GLubyte g, GLubyte b )
{
PRE_LOOPBACK( SecondaryColor3ubEXT );
_glapi_Dispatch->SecondaryColor3ubEXT( r, g, b );
}
static void TAG(SecondaryColor3ubvEXT)( const GLubyte *v )
static void GLAPIENTRY TAG(SecondaryColor3ubvEXT)( const GLubyte *v )
{
PRE_LOOPBACK( SecondaryColor3ubvEXT );
_glapi_Dispatch->SecondaryColor3ubvEXT( v );
}
static void TAG(TexCoord1f)( GLfloat s )
static void GLAPIENTRY TAG(TexCoord1f)( GLfloat s )
{
PRE_LOOPBACK( TexCoord1f );
_glapi_Dispatch->TexCoord1f( s );
}
static void TAG(TexCoord1fv)( const GLfloat *tc )
static void GLAPIENTRY TAG(TexCoord1fv)( const GLfloat *tc )
{
PRE_LOOPBACK( TexCoord1fv );
_glapi_Dispatch->TexCoord1fv( tc );
}
static void TAG(TexCoord2f)( GLfloat s, GLfloat t )
static void GLAPIENTRY TAG(TexCoord2f)( GLfloat s, GLfloat t )
{
PRE_LOOPBACK( TexCoord2f );
_glapi_Dispatch->TexCoord2f( s, t );
}
static void TAG(TexCoord2fv)( const GLfloat *tc )
static void GLAPIENTRY TAG(TexCoord2fv)( const GLfloat *tc )
{
PRE_LOOPBACK( TexCoord2fv );
_glapi_Dispatch->TexCoord2fv( tc );
}
static void TAG(TexCoord3f)( GLfloat s, GLfloat t, GLfloat r )
static void GLAPIENTRY TAG(TexCoord3f)( GLfloat s, GLfloat t, GLfloat r )
{
PRE_LOOPBACK( TexCoord3f );
_glapi_Dispatch->TexCoord3f( s, t, r );
}
static void TAG(TexCoord3fv)( const GLfloat *tc )
static void GLAPIENTRY TAG(TexCoord3fv)( const GLfloat *tc )
{
PRE_LOOPBACK( TexCoord3fv );
_glapi_Dispatch->TexCoord3fv( tc );
}
static void TAG(TexCoord4f)( GLfloat s, GLfloat t, GLfloat r, GLfloat q )
static void GLAPIENTRY TAG(TexCoord4f)( GLfloat s, GLfloat t, GLfloat r, GLfloat q )
{
PRE_LOOPBACK( TexCoord4f );
_glapi_Dispatch->TexCoord4f( s, t, r, q );
}
static void TAG(TexCoord4fv)( const GLfloat *tc )
static void GLAPIENTRY TAG(TexCoord4fv)( const GLfloat *tc )
{
PRE_LOOPBACK( TexCoord4fv );
_glapi_Dispatch->TexCoord4fv( tc );
}
static void TAG(Vertex2f)( GLfloat x, GLfloat y )
static void GLAPIENTRY TAG(Vertex2f)( GLfloat x, GLfloat y )
{
PRE_LOOPBACK( Vertex2f );
_glapi_Dispatch->Vertex2f( x, y );
}
static void TAG(Vertex2fv)( const GLfloat *v )
static void GLAPIENTRY TAG(Vertex2fv)( const GLfloat *v )
{
PRE_LOOPBACK( Vertex2fv );
_glapi_Dispatch->Vertex2fv( v );
}
static void TAG(Vertex3f)( GLfloat x, GLfloat y, GLfloat z )
static void GLAPIENTRY TAG(Vertex3f)( GLfloat x, GLfloat y, GLfloat z )
{
PRE_LOOPBACK( Vertex3f );
_glapi_Dispatch->Vertex3f( x, y, z );
}
static void TAG(Vertex3fv)( const GLfloat *v )
static void GLAPIENTRY TAG(Vertex3fv)( const GLfloat *v )
{
PRE_LOOPBACK( Vertex3fv );
_glapi_Dispatch->Vertex3fv( v );
}
static void TAG(Vertex4f)( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
static void GLAPIENTRY TAG(Vertex4f)( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
{
PRE_LOOPBACK( Vertex4f );
_glapi_Dispatch->Vertex4f( x, y, z, w );
}
static void TAG(Vertex4fv)( const GLfloat *v )
static void GLAPIENTRY TAG(Vertex4fv)( const GLfloat *v )
{
PRE_LOOPBACK( Vertex4fv );
_glapi_Dispatch->Vertex4fv( v );
}
static void TAG(CallList)( GLuint i )
static void GLAPIENTRY TAG(CallList)( GLuint i )
{
PRE_LOOPBACK( CallList );
_glapi_Dispatch->CallList( i );
}
static void TAG(Begin)( GLenum mode )
static void GLAPIENTRY TAG(Begin)( GLenum mode )
{
PRE_LOOPBACK( Begin );
_glapi_Dispatch->Begin( mode );
}
static void TAG(End)( void )
static void GLAPIENTRY TAG(End)( void )
{
PRE_LOOPBACK( End );
_glapi_Dispatch->End();
}
static void TAG(Rectf)( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
static void GLAPIENTRY TAG(Rectf)( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
{
PRE_LOOPBACK( Rectf );
_glapi_Dispatch->Rectf( x1, y1, x2, y2 );
}
static void TAG(DrawArrays)( GLenum mode, GLint start, GLsizei count )
static void GLAPIENTRY TAG(DrawArrays)( GLenum mode, GLint start, GLsizei count )
{
PRE_LOOPBACK( DrawArrays );
_glapi_Dispatch->DrawArrays( mode, start, count );
}
static void TAG(DrawElements)( GLenum mode, GLsizei count, GLenum type,
static void GLAPIENTRY TAG(DrawElements)( GLenum mode, GLsizei count, GLenum type,
const GLvoid *indices )
{
PRE_LOOPBACK( DrawElements );
_glapi_Dispatch->DrawElements( mode, count, type, indices );
}
static void TAG(DrawRangeElements)( GLenum mode, GLuint start,
static void GLAPIENTRY TAG(DrawRangeElements)( GLenum mode, GLuint start,
GLuint end, GLsizei count,
GLenum type, const GLvoid *indices )
{
@@ -377,26 +377,26 @@ static void TAG(DrawRangeElements)( GLenum mode, GLuint start,
_glapi_Dispatch->DrawRangeElements( mode, start, end, count, type, indices );
}
static void TAG(EvalMesh1)( GLenum mode, GLint i1, GLint i2 )
static void GLAPIENTRY TAG(EvalMesh1)( GLenum mode, GLint i1, GLint i2 )
{
PRE_LOOPBACK( EvalMesh1 );
_glapi_Dispatch->EvalMesh1( mode, i1, i2 );
}
static void TAG(EvalMesh2)( GLenum mode, GLint i1, GLint i2,
static void GLAPIENTRY TAG(EvalMesh2)( GLenum mode, GLint i1, GLint i2,
GLint j1, GLint j2 )
{
PRE_LOOPBACK( EvalMesh2 );
_glapi_Dispatch->EvalMesh2( mode, i1, i2, j1, j2 );
}
static void TAG(VertexAttrib4fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w )
static void GLAPIENTRY TAG(VertexAttrib4fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w )
{
PRE_LOOPBACK( VertexAttrib4fNV );
_glapi_Dispatch->VertexAttrib4fNV( index, x, y, z, w );
}
static void TAG(VertexAttrib4fvNV)( GLuint index, const GLfloat *v )
static void GLAPIENTRY TAG(VertexAttrib4fvNV)( GLuint index, const GLfloat *v )
{
PRE_LOOPBACK( VertexAttrib4fvNV );
_glapi_Dispatch->VertexAttrib4fvNV( index, v );
src/mesa/tnl/t_array_api.c
+3 -3
View File
@@ -117,7 +117,7 @@ static void _tnl_draw_range_elements( GLcontext *ctx, GLenum mode,
/**
* Called via the GL API dispatcher.
*/
void
void GLAPIENTRY
_tnl_DrawArrays(GLenum mode, GLint start, GLsizei count)
{
GET_CURRENT_CONTEXT(ctx);
@@ -255,7 +255,7 @@ _tnl_DrawArrays(GLenum mode, GLint start, GLsizei count)
/**
* Called via the GL API dispatcher.
*/
void
void GLAPIENTRY
_tnl_DrawRangeElements(GLenum mode,
GLuint start, GLuint end,
GLsizei count, GLenum type, const GLvoid *indices)
@@ -329,7 +329,7 @@ _tnl_DrawRangeElements(GLenum mode,
/**
* Called via the GL API dispatcher.
*/
void
void GLAPIENTRY
_tnl_DrawElements(GLenum mode, GLsizei count, GLenum type,
const GLvoid *indices)
{
src/mesa/tnl/t_array_api.h
+3 -3
View File
@@ -30,12 +30,12 @@
#include "t_context.h"
extern void _tnl_DrawArrays(GLenum mode, GLint first, GLsizei count);
extern void GLAPIENTRY _tnl_DrawArrays(GLenum mode, GLint first, GLsizei count);
extern void _tnl_DrawElements(GLenum mode, GLsizei count, GLenum type,
extern void GLAPIENTRY _tnl_DrawElements(GLenum mode, GLsizei count, GLenum type,
const GLvoid *indices);
extern void _tnl_DrawRangeElements(GLenum mode, GLuint start,
extern void GLAPIENTRY _tnl_DrawRangeElements(GLenum mode, GLuint start,
GLuint end, GLsizei count, GLenum type,
const GLvoid *indices);
src/mesa/tnl/t_eval_api.c
+2 -2
View File
@@ -51,7 +51,7 @@
* map(1,2)_vertex is disabled, and to purge those vertices from
* the vb.
*/
void
void GLAPIENTRY
_tnl_exec_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
{
GET_CURRENT_CONTEXT(ctx);
@@ -139,7 +139,7 @@ _tnl_exec_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
void
void GLAPIENTRY
_tnl_exec_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/tnl/t_eval_api.h
+2 -2
View File
@@ -33,9 +33,9 @@
/* Use _mesa_save_EvalMesh{1,2} to save these to display lists.
*/
extern void _tnl_exec_EvalMesh1( GLenum mode, GLint i1, GLint i2 );
extern void GLAPIENTRY _tnl_exec_EvalMesh1( GLenum mode, GLint i1, GLint i2 );
extern void _tnl_exec_EvalMesh2( GLenum mode, GLint i1, GLint i2,
extern void GLAPIENTRY _tnl_exec_EvalMesh2( GLenum mode, GLint i1, GLint i2,
GLint j1, GLint j2 );
void _tnl_eval_init( GLcontext *ctx );
src/mesa/tnl/t_imm_api.c
+56 -56
View File
@@ -99,7 +99,7 @@ void _tnl_flush_vertices( GLcontext *ctx, GLuint flags )
}
void
void GLAPIENTRY
_tnl_save_Begin( GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
@@ -177,7 +177,7 @@ _tnl_save_Begin( GLenum mode )
}
void
void GLAPIENTRY
_tnl_Begin( GLenum mode )
{
GET_CURRENT_CONTEXT(ctx);
@@ -382,7 +382,7 @@ _tnl_end_ctx( GLcontext *ctx )
_tnl_flush_immediate( ctx, IM );
}
void
void GLAPIENTRY
_tnl_End(void)
{
GET_CURRENT_CONTEXT(ctx);
@@ -427,13 +427,13 @@ _tnl_End(void)
IM->Flag[count] |= VERT_BIT_COLOR0; \
}
static void
static void GLAPIENTRY
_tnl_Color3f( GLfloat red, GLfloat green, GLfloat blue )
{
COLOR( red, green, blue, 1.0 );
}
static void
static void GLAPIENTRY
_tnl_Color3ub( GLubyte red, GLubyte green, GLubyte blue )
{
COLOR(UBYTE_TO_FLOAT(red),
@@ -442,13 +442,13 @@ _tnl_Color3ub( GLubyte red, GLubyte green, GLubyte blue )
1.0);
}
static void
static void GLAPIENTRY
_tnl_Color4f( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
{
COLOR( red, green, blue, alpha );
}
static void
static void GLAPIENTRY
_tnl_Color4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
{
COLOR(UBYTE_TO_FLOAT(red),
@@ -457,13 +457,13 @@ _tnl_Color4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
UBYTE_TO_FLOAT(alpha));
}
static void
static void GLAPIENTRY
_tnl_Color3fv( const GLfloat *v )
{
COLOR( v[0], v[1], v[2], 1.0 );
}
static void
static void GLAPIENTRY
_tnl_Color3ubv( const GLubyte *v )
{
COLOR(UBYTE_TO_FLOAT(v[0]),
@@ -472,13 +472,13 @@ _tnl_Color3ubv( const GLubyte *v )
1.0 );
}
static void
static void GLAPIENTRY
_tnl_Color4fv( const GLfloat *v )
{
COLOR( v[0], v[1], v[2], v[3] );
}
static void
static void GLAPIENTRY
_tnl_Color4ubv( const GLubyte *v)
{
COLOR(UBYTE_TO_FLOAT(v[0]),
@@ -502,13 +502,13 @@ _tnl_Color4ubv( const GLubyte *v)
IM->Flag[count] |= VERT_BIT_COLOR1; \
}
static void
static void GLAPIENTRY
_tnl_SecondaryColor3fEXT( GLfloat red, GLfloat green, GLfloat blue )
{
SECONDARY_COLOR( red, green, blue );
}
static void
static void GLAPIENTRY
_tnl_SecondaryColor3ubEXT( GLubyte red, GLubyte green, GLubyte blue )
{
SECONDARY_COLOR(UBYTE_TO_FLOAT(red),
@@ -516,13 +516,13 @@ _tnl_SecondaryColor3ubEXT( GLubyte red, GLubyte green, GLubyte blue )
UBYTE_TO_FLOAT(blue));
}
static void
static void GLAPIENTRY
_tnl_SecondaryColor3fvEXT( const GLfloat *v )
{
SECONDARY_COLOR( v[0], v[1], v[2] );
}
static void
static void GLAPIENTRY
_tnl_SecondaryColor3ubvEXT( const GLubyte *v )
{
SECONDARY_COLOR(UBYTE_TO_FLOAT(v[0]),
@@ -531,7 +531,7 @@ _tnl_SecondaryColor3ubvEXT( const GLubyte *v )
}
static void
static void GLAPIENTRY
_tnl_EdgeFlag( GLboolean flag )
{
GLuint count;
@@ -542,7 +542,7 @@ _tnl_EdgeFlag( GLboolean flag )
}
static void
static void GLAPIENTRY
_tnl_EdgeFlagv( const GLboolean *flag )
{
GLuint count;
@@ -553,7 +553,7 @@ _tnl_EdgeFlagv( const GLboolean *flag )
}
static void
static void GLAPIENTRY
_tnl_FogCoordfEXT( GLfloat f )
{
GET_IMMEDIATE;
@@ -563,7 +563,7 @@ _tnl_FogCoordfEXT( GLfloat f )
IM->Flag[count] |= VERT_BIT_FOG;
}
static void
static void GLAPIENTRY
_tnl_FogCoordfvEXT( const GLfloat *v )
{
GET_IMMEDIATE;
@@ -574,7 +574,7 @@ _tnl_FogCoordfvEXT( const GLfloat *v )
}
static void
static void GLAPIENTRY
_tnl_Indexi( GLint c )
{
GLuint count;
@@ -585,7 +585,7 @@ _tnl_Indexi( GLint c )
}
static void
static void GLAPIENTRY
_tnl_Indexiv( const GLint *c )
{
GLuint count;
@@ -624,14 +624,14 @@ _tnl_Indexiv( const GLint *c )
#define NORMALF NORMAL
#endif
static void
static void GLAPIENTRY
_tnl_Normal3f( GLfloat nx, GLfloat ny, GLfloat nz )
{
NORMALF(nx, ny, nz);
}
static void
static void GLAPIENTRY
_tnl_Normal3fv( const GLfloat *v )
{
NORMALF( v[0], v[1], v[2] );
@@ -703,51 +703,51 @@ _tnl_Normal3fv( const GLfloat *v )
#define TEXCOORD2F TEXCOORD2
#endif
static void
static void GLAPIENTRY
_tnl_TexCoord1f( GLfloat s )
{
TEXCOORD1(s);
}
static void
static void GLAPIENTRY
_tnl_TexCoord2f( GLfloat s, GLfloat t )
{
TEXCOORD2F(s, t);
}
static void
static void GLAPIENTRY
_tnl_TexCoord3f( GLfloat s, GLfloat t, GLfloat r )
{
TEXCOORD3(s, t, r);
}
static void
static void GLAPIENTRY
_tnl_TexCoord4f( GLfloat s, GLfloat t, GLfloat r, GLfloat q )
{
TEXCOORD4(s, t, r, q)
}
static void
static void GLAPIENTRY
_tnl_TexCoord1fv( const GLfloat *v )
{
TEXCOORD1(v[0]);
}
static void
static void GLAPIENTRY
_tnl_TexCoord2fv( const GLfloat *v )
{
TEXCOORD2F(v[0], v[1]);
}
static void
static void GLAPIENTRY
_tnl_TexCoord3fv( const GLfloat *v )
{
TEXCOORD3(v[0], v[1], v[2]);
}
static void
static void GLAPIENTRY
_tnl_TexCoord4fv( const GLfloat *v )
{
TEXCOORD4(v[0], v[1], v[2], v[3]);
@@ -845,41 +845,41 @@ _tnl_TexCoord4fv( const GLfloat *v )
static void
static void GLAPIENTRY
_tnl_Vertex2f( GLfloat x, GLfloat y )
{
GET_IMMEDIATE;
VERTEX2F( IM, x, y );
}
static void
static void GLAPIENTRY
_tnl_Vertex3f( GLfloat x, GLfloat y, GLfloat z )
{
GET_IMMEDIATE;
VERTEX3F( IM, x, y, z );
}
static void
static void GLAPIENTRY
_tnl_Vertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
{
GET_IMMEDIATE;
VERTEX4F( IM, x, y, z, w );
}
static void
static void GLAPIENTRY
_tnl_Vertex2fv( const GLfloat *v )
{
GET_IMMEDIATE;
VERTEX2F( IM, v[0], v[1] );
}
static void
static void GLAPIENTRY
_tnl_Vertex3fv( const GLfloat *v )
{
GET_IMMEDIATE;
VERTEX3F( IM, v[0], v[1], v[2] );
}
static void
static void GLAPIENTRY
_tnl_Vertex4fv( const GLfloat *v )
{
GET_IMMEDIATE;
@@ -978,49 +978,49 @@ _tnl_Vertex4fv( const GLfloat *v )
#define MULTI_TEXCOORD2F MULTI_TEXCOORD2
#endif
static void
static void GLAPIENTRY
_tnl_MultiTexCoord1fARB(GLenum target, GLfloat s)
{
MULTI_TEXCOORD1( target, s );
}
static void
static void GLAPIENTRY
_tnl_MultiTexCoord1fvARB(GLenum target, const GLfloat *v)
{
MULTI_TEXCOORD1( target, v[0] );
}
static void
static void GLAPIENTRY
_tnl_MultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t)
{
MULTI_TEXCOORD2F( target, s, t );
}
static void
static void GLAPIENTRY
_tnl_MultiTexCoord2fvARB(GLenum target, const GLfloat *v)
{
MULTI_TEXCOORD2F( target, v[0], v[1] );
}
static void
static void GLAPIENTRY
_tnl_MultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r)
{
MULTI_TEXCOORD3( target, s, t, r );
}
static void
static void GLAPIENTRY
_tnl_MultiTexCoord3fvARB(GLenum target, const GLfloat *v)
{
MULTI_TEXCOORD3( target, v[0], v[1], v[2] );
}
static void
static void GLAPIENTRY
_tnl_MultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
{
MULTI_TEXCOORD4( target, s, t, r, q );
}
static void
static void GLAPIENTRY
_tnl_MultiTexCoord4fvARB(GLenum target, const GLfloat *v)
{
MULTI_TEXCOORD4( target, v[0], v[1], v[2], v[3] );
@@ -1082,28 +1082,28 @@ _tnl_MultiTexCoord4fvARB(GLenum target, const GLfloat *v)
_tnl_flush_immediate( NULL, IM ); \
}
static void
static void GLAPIENTRY
_tnl_EvalCoord1f( GLfloat u )
{
GET_IMMEDIATE;
EVALCOORD1( IM, u );
}
static void
static void GLAPIENTRY
_tnl_EvalCoord1fv( const GLfloat *u )
{
GET_IMMEDIATE;
EVALCOORD1( IM, (GLfloat) *u );
}
static void
static void GLAPIENTRY
_tnl_EvalCoord2f( GLfloat u, GLfloat v )
{
GET_IMMEDIATE;
EVALCOORD2( IM, u, v );
}
static void
static void GLAPIENTRY
_tnl_EvalCoord2fv( const GLfloat *u )
{
GET_IMMEDIATE;
@@ -1111,7 +1111,7 @@ _tnl_EvalCoord2fv( const GLfloat *u )
}
static void
static void GLAPIENTRY
_tnl_EvalPoint1( GLint i )
{
GET_IMMEDIATE;
@@ -1119,7 +1119,7 @@ _tnl_EvalPoint1( GLint i )
}
static void
static void GLAPIENTRY
_tnl_EvalPoint2( GLint i, GLint j )
{
GET_IMMEDIATE;
@@ -1143,7 +1143,7 @@ _tnl_EvalPoint2( GLint i, GLint j )
}
static void
static void GLAPIENTRY
_tnl_ArrayElement( GLint i )
{
GET_IMMEDIATE;
@@ -1181,7 +1181,7 @@ _tnl_eval_coord2f( GLcontext *CC, GLfloat u, GLfloat v )
* NV_vertex_program
*/
static void
static void GLAPIENTRY
_tnl_VertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w )
{
if (index < VERT_ATTRIB_MAX) {
@@ -1204,7 +1204,7 @@ _tnl_VertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w
}
}
static void
static void GLAPIENTRY
_tnl_VertexAttrib4fvNV( GLuint index, const GLfloat *v )
{
if (index < VERT_ATTRIB_MAX) {
@@ -1233,7 +1233,7 @@ _tnl_VertexAttrib4fvNV( GLuint index, const GLfloat *v )
* vertices can now participate in the same immediate as regular ones,
* even in most display lists.
*/
static void
static void GLAPIENTRY
_tnl_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
{
GET_CURRENT_CONTEXT(ctx);
@@ -1247,7 +1247,7 @@ _tnl_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
}
}
static void
static void GLAPIENTRY
_tnl_Materialfv( GLenum face, GLenum pname, const GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
src/mesa/tnl/t_imm_api.h
+4 -4
View File
@@ -31,12 +31,12 @@
#include "t_context.h"
extern void _tnl_save_Begin( GLenum mode );
extern void _tnl_Begin( GLenum mode );
extern void GLAPIENTRY _tnl_save_Begin( GLenum mode );
extern void GLAPIENTRY _tnl_Begin( GLenum mode );
extern void _tnl_Begin( GLenum mode );
extern void GLAPIENTRY _tnl_Begin( GLenum mode );
extern void _tnl_End(void);
extern void GLAPIENTRY _tnl_End(void);
/* TNL-private internal functions for building higher-level operations: