[Mesa-dev] [PATCH 2/2] mesa: use DECL_GLAPIENTRY macro
Samuel Pitoiset
samuel.pitoiset at gmail.com
Wed Jun 7 13:29:40 UTC 2017
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
src/mesa/main/blend.h | 22 ++-----
src/mesa/main/blit.h | 38 ++++-------
src/mesa/main/bufferobj.h | 148 ++++++++++++-----------------------------
src/mesa/main/compute.h | 31 +++------
src/mesa/main/copyimage.h | 20 ++----
src/mesa/main/fbobject.h | 70 ++++++--------------
src/mesa/main/pipelineobj.h | 17 ++---
src/mesa/main/scissor.h | 27 ++------
src/mesa/main/shaderapi.h | 5 +-
src/mesa/main/shaderimage.h | 20 ++----
src/mesa/main/teximage.h | 156 +++++++++++++++-----------------------------
src/mesa/main/texstate.h | 6 +-
src/mesa/main/varray.h | 148 ++++++++++++-----------------------------
13 files changed, 209 insertions(+), 499 deletions(-)
diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h
index 54b9ce6e1b..803e347d9b 100644
--- a/src/mesa/main/blend.h
+++ b/src/mesa/main/blend.h
@@ -49,19 +49,12 @@ _mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA );
-extern void GLAPIENTRY
-_mesa_BlendFunciARB_no_error(GLuint buf, GLenum sfactor, GLenum dfactor);
-extern void GLAPIENTRY
-_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor);
+DECL_GLAPIENTRY(void, BlendFunciARB, GLuint buf, GLenum sfactor, GLenum dfactor);
-extern void GLAPIENTRY
-_mesa_BlendFuncSeparateiARB_no_error(GLuint buf, GLenum sfactorRGB,
- GLenum dfactorRGB, GLenum sfactorA,
- GLenum dfactorA);
-extern void GLAPIENTRY
-_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
- GLenum sfactorA, GLenum dfactorA);
+DECL_GLAPIENTRY(void, BlendFuncSeparateiARB, GLuint buf, GLenum sfactorRGB,
+ GLenum dfactorRGB, GLenum sfactorA,
+ GLenum dfactorA);
extern void GLAPIENTRY
@@ -76,11 +69,8 @@ extern void GLAPIENTRY
_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA );
-extern void GLAPIENTRY
-_mesa_BlendEquationSeparateiARB_no_error(GLuint buf, GLenum modeRGB,
- GLenum modeA);
-extern void GLAPIENTRY
-_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA);
+DECL_GLAPIENTRY(void, BlendEquationSeparateiARB, GLuint buf, GLenum modeRGB,
+ GLenum modeA);
extern void GLAPIENTRY
diff --git a/src/mesa/main/blit.h b/src/mesa/main/blit.h
index 39021e7be6..172bb31271 100644
--- a/src/mesa/main/blit.h
+++ b/src/mesa/main/blit.h
@@ -34,31 +34,17 @@ _mesa_regions_overlap(int srcX0, int srcY0,
int dstX0, int dstY0,
int dstX1, int dstY1);
-void GLAPIENTRY
-_mesa_BlitFramebuffer_no_error(GLint srcX0, GLint srcY0, GLint srcX1,
- GLint srcY1, GLint dstX0, GLint dstY0,
- GLint dstX1, GLint dstY1,
- GLbitfield mask, GLenum filter);
-
-extern void GLAPIENTRY
-_mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
- GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
- GLbitfield mask, GLenum filter);
-
-void GLAPIENTRY
-_mesa_BlitNamedFramebuffer_no_error(GLuint readFramebuffer,
- GLuint drawFramebuffer,
- GLint srcX0, GLint srcY0,
- GLint srcX1, GLint srcY1,
- GLint dstX0, GLint dstY0,
- GLint dstX1, GLint dstY1,
- GLbitfield mask, GLenum filter);
-
-extern void GLAPIENTRY
-_mesa_BlitNamedFramebuffer(GLuint readFramebuffer, GLuint drawFramebuffer,
- GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
- GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
- GLbitfield mask, GLenum filter);
-
+DECL_GLAPIENTRY(void, BlitFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1,
+ GLint srcY1, GLint dstX0, GLint dstY0,
+ GLint dstX1, GLint dstY1,
+ GLbitfield mask, GLenum filter);
+
+DECL_GLAPIENTRY(void, BlitNamedFramebuffer, GLuint readFramebuffer,
+ GLuint drawFramebuffer,
+ GLint srcX0, GLint srcY0,
+ GLint srcX1, GLint srcY1,
+ GLint dstX0, GLint dstY0,
+ GLint dstX1, GLint dstY1,
+ GLbitfield mask, GLenum filter);
#endif /* BLIT_H */
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 44342840a8..64a875fa2a 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -155,11 +155,7 @@ _mesa_ClearBufferSubData_sw(struct gl_context *ctx,
/*
* API functions
*/
-void GLAPIENTRY
-_mesa_BindBuffer_no_error(GLenum target, GLuint buffer);
-
-void GLAPIENTRY
-_mesa_BindBuffer(GLenum target, GLuint buffer);
+DECL_GLAPIENTRY(void, BindBuffer, GLenum target, GLuint buffer);
void GLAPIENTRY
_mesa_DeleteBuffers(GLsizei n, const GLuint * buffer);
@@ -173,19 +169,11 @@ _mesa_CreateBuffers(GLsizei n, GLuint *buffers);
GLboolean GLAPIENTRY
_mesa_IsBuffer(GLuint buffer);
-void GLAPIENTRY
-_mesa_BufferStorage_no_error(GLenum target, GLsizeiptr size,
- const GLvoid *data, GLbitfield flags);
-void GLAPIENTRY
-_mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
- GLbitfield flags);
+DECL_GLAPIENTRY(void, BufferStorage, GLenum target, GLsizeiptr size,
+ const GLvoid *data, GLbitfield flags);
-void GLAPIENTRY
-_mesa_NamedBufferStorage_no_error(GLuint buffer, GLsizeiptr size,
- const GLvoid *data, GLbitfield flags);
-void GLAPIENTRY
-_mesa_NamedBufferStorage(GLuint buffer, GLsizeiptr size, const GLvoid *data,
- GLbitfield flags);
+DECL_GLAPIENTRY(void, NamedBufferStorage, GLuint buffer, GLsizeiptr size,
+ const GLvoid *data, GLbitfield flags);
void GLAPIENTRY
_mesa_BufferData(GLenum target, GLsizeiptr size,
@@ -195,19 +183,11 @@ void GLAPIENTRY
_mesa_NamedBufferData(GLuint buffer, GLsizeiptr size,
const GLvoid *data, GLenum usage);
-void GLAPIENTRY
-_mesa_BufferSubData_no_error(GLenum target, GLintptr offset,
- GLsizeiptr size, const GLvoid *data);
-void GLAPIENTRY
-_mesa_BufferSubData(GLenum target, GLintptr offset,
- GLsizeiptr size, const GLvoid *data);
+DECL_GLAPIENTRY(void, BufferSubData, GLenum target, GLintptr offset,
+ GLsizeiptr size, const GLvoid *data);
-void GLAPIENTRY
-_mesa_NamedBufferSubData_no_error(GLuint buffer, GLintptr offset,
- GLsizeiptr size, const GLvoid *data);
-void GLAPIENTRY
-_mesa_NamedBufferSubData(GLuint buffer, GLintptr offset,
- GLsizeiptr size, const GLvoid *data);
+DECL_GLAPIENTRY(void, NamedBufferSubData, GLuint buffer, GLintptr offset,
+ GLsizeiptr size, const GLvoid *data);
void GLAPIENTRY
_mesa_GetBufferSubData(GLenum target, GLintptr offset,
@@ -239,15 +219,9 @@ _mesa_ClearNamedBufferSubData(GLuint buffer, GLenum internalformat,
GLenum format, GLenum type,
const GLvoid *data);
-GLboolean GLAPIENTRY
-_mesa_UnmapBuffer_no_error(GLenum target);
-GLboolean GLAPIENTRY
-_mesa_UnmapBuffer(GLenum target);
+DECL_GLAPIENTRY(GLboolean, UnmapBuffer, GLenum target);
-GLboolean GLAPIENTRY
-_mesa_UnmapNamedBuffer_no_error(GLuint buffer);
-GLboolean GLAPIENTRY
-_mesa_UnmapNamedBuffer(GLuint buffer);
+DECL_GLAPIENTRY(GLboolean, UnmapNamedBuffer, GLuint buffer);
void GLAPIENTRY
_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params);
@@ -268,68 +242,37 @@ _mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params);
void GLAPIENTRY
_mesa_GetNamedBufferPointerv(GLuint buffer, GLenum pname, GLvoid **params);
-void GLAPIENTRY
-_mesa_CopyBufferSubData_no_error(GLenum readTarget, GLenum writeTarget,
- GLintptr readOffset, GLintptr writeOffset,
- GLsizeiptr size);
-void GLAPIENTRY
-_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
- GLintptr readOffset, GLintptr writeOffset,
- GLsizeiptr size);
+DECL_GLAPIENTRY(void, CopyBufferSubData, GLenum readTarget, GLenum writeTarget,
+ GLintptr readOffset,
+ GLintptr writeOffset, GLsizeiptr size);
-void GLAPIENTRY
-_mesa_CopyNamedBufferSubData_no_error(GLuint readBuffer, GLuint writeBuffer,
- GLintptr readOffset,
- GLintptr writeOffset, GLsizeiptr size);
-void GLAPIENTRY
-_mesa_CopyNamedBufferSubData(GLuint readBuffer, GLuint writeBuffer,
- GLintptr readOffset, GLintptr writeOffset,
- GLsizeiptr size);
-
-void * GLAPIENTRY
-_mesa_MapBufferRange_no_error(GLenum target, GLintptr offset,
- GLsizeiptr length, GLbitfield access);
-void * GLAPIENTRY
-_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
- GLbitfield access);
-
-void * GLAPIENTRY
-_mesa_MapNamedBufferRange_no_error(GLuint buffer, GLintptr offset,
- GLsizeiptr length, GLbitfield access);
-void * GLAPIENTRY
-_mesa_MapNamedBufferRange(GLuint buffer, GLintptr offset, GLsizeiptr length,
- GLbitfield access);
-
-void * GLAPIENTRY
-_mesa_MapBuffer_no_error(GLenum target, GLenum access);
-void * GLAPIENTRY
-_mesa_MapBuffer(GLenum target, GLenum access);
-
-void * GLAPIENTRY
-_mesa_MapNamedBuffer_no_error(GLuint buffer, GLenum access);
-void * GLAPIENTRY
-_mesa_MapNamedBuffer(GLuint buffer, GLenum access);
+DECL_GLAPIENTRY(void, CopyNamedBufferSubData, GLuint readBuffer,
+ GLuint writeBuffer,
+ GLintptr readOffset,
+ GLintptr writeOffset,
+ GLsizeiptr size);
-void GLAPIENTRY
-_mesa_FlushMappedBufferRange_no_error(GLenum target, GLintptr offset,
- GLsizeiptr length);
-void GLAPIENTRY
-_mesa_FlushMappedBufferRange(GLenum target,
- GLintptr offset, GLsizeiptr length);
+DECL_GLAPIENTRY(void *, MapBufferRange, GLenum target, GLintptr offset,
+ GLsizeiptr length, GLbitfield access);
-void GLAPIENTRY
-_mesa_FlushMappedNamedBufferRange_no_error(GLuint buffer, GLintptr offset,
- GLsizeiptr length);
-void GLAPIENTRY
-_mesa_FlushMappedNamedBufferRange(GLuint buffer, GLintptr offset,
- GLsizeiptr length);
+DECL_GLAPIENTRY(void *, MapNamedBufferRange, GLuint buffer, GLintptr offset,
+ GLsizeiptr length,
+ GLbitfield access);
-void GLAPIENTRY
-_mesa_BindBufferRange_no_error(GLenum target, GLuint index, GLuint buffer,
- GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY
-_mesa_BindBufferRange(GLenum target, GLuint index,
- GLuint buffer, GLintptr offset, GLsizeiptr size);
+DECL_GLAPIENTRY(void *, MapBuffer, GLenum target, GLenum access);
+
+DECL_GLAPIENTRY(void *, MapNamedBuffer, GLuint buffer, GLenum access);
+
+DECL_GLAPIENTRY(void, FlushMappedBufferRange, GLenum target, GLintptr offset,
+ GLsizeiptr length);
+
+DECL_GLAPIENTRY(void, FlushMappedNamedBufferRange, GLuint buffer,
+ GLintptr offset,
+ GLsizeiptr length);
+
+DECL_GLAPIENTRY(void, BindBufferRange, GLenum target, GLuint index,
+ GLuint buffer, GLintptr offset,
+ GLsizeiptr size);
void GLAPIENTRY
_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer);
@@ -342,19 +285,10 @@ void GLAPIENTRY
_mesa_BindBuffersBase(GLenum target, GLuint first, GLsizei count,
const GLuint *buffers);
-void GLAPIENTRY
-_mesa_InvalidateBufferSubData_no_error(GLuint buffer, GLintptr offset,
- GLsizeiptr length);
-
-void GLAPIENTRY
-_mesa_InvalidateBufferSubData(GLuint buffer, GLintptr offset,
- GLsizeiptr length);
-
-void GLAPIENTRY
-_mesa_InvalidateBufferData_no_error(GLuint buffer);
+DECL_GLAPIENTRY(void, InvalidateBufferSubData, GLuint buffer, GLintptr offset,
+ GLsizeiptr length);
-void GLAPIENTRY
-_mesa_InvalidateBufferData(GLuint buffer);
+DECL_GLAPIENTRY(void, InvalidateBufferData, GLuint buffer);
void GLAPIENTRY
_mesa_BufferPageCommitmentARB(GLenum target, GLintptr offset, GLsizeiptr size,
diff --git a/src/mesa/main/compute.h b/src/mesa/main/compute.h
index bfb3223d07..bf434ac254 100644
--- a/src/mesa/main/compute.h
+++ b/src/mesa/main/compute.h
@@ -27,29 +27,16 @@
#include "glheader.h"
-extern void GLAPIENTRY
-_mesa_DispatchCompute_no_error(GLuint num_groups_x, GLuint num_groups_y,
- GLuint num_groups_z);
-extern void GLAPIENTRY
-_mesa_DispatchCompute(GLuint num_groups_x,
- GLuint num_groups_y,
- GLuint num_groups_z);
+DECL_GLAPIENTRY(void, DispatchCompute, GLuint num_groups_x, GLuint num_groups_y,
+ GLuint num_groups_z);
-extern void GLAPIENTRY
-_mesa_DispatchComputeIndirect_no_error(GLintptr indirect);
-extern void GLAPIENTRY
-_mesa_DispatchComputeIndirect(GLintptr indirect);
+DECL_GLAPIENTRY(void, DispatchComputeIndirect, GLintptr indirect);
-extern void GLAPIENTRY
-_mesa_DispatchComputeGroupSizeARB_no_error(GLuint num_groups_x,
- GLuint num_groups_y,
- GLuint num_groups_z,
- GLuint group_size_x,
- GLuint group_size_y,
- GLuint group_size_z);
-extern void GLAPIENTRY
-_mesa_DispatchComputeGroupSizeARB(GLuint num_groups_x, GLuint num_groups_y,
- GLuint num_groups_z, GLuint group_size_x,
- GLuint group_size_y, GLuint group_size_z);
+DECL_GLAPIENTRY(void, DispatchComputeGroupSizeARB, GLuint num_groups_x,
+ GLuint num_groups_y,
+ GLuint num_groups_z,
+ GLuint group_size_x,
+ GLuint group_size_y,
+ GLuint group_size_z);
#endif
diff --git a/src/mesa/main/copyimage.h b/src/mesa/main/copyimage.h
index ea2f15b435..184b73b4e1 100644
--- a/src/mesa/main/copyimage.h
+++ b/src/mesa/main/copyimage.h
@@ -35,19 +35,13 @@
extern "C" {
#endif
-void GLAPIENTRY
-_mesa_CopyImageSubData_no_error(GLuint srcName, GLenum srcTarget, GLint srcLevel,
- GLint srcX, GLint srcY, GLint srcZ,
- GLuint destName, GLenum destTarget, GLint destLevel,
- GLint destX, GLint destY, GLint destZ,
- GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-
-extern void GLAPIENTRY
-_mesa_CopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel,
- GLint srcX, GLint srcY, GLint srcZ,
- GLuint destName, GLenum destTarget, GLint destLevel,
- GLint destX, GLint destY, GLint destZ,
- GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+DECL_GLAPIENTRY(void, CopyImageSubData, GLuint srcName, GLenum srcTarget,
+ GLint srcLevel, GLint srcX, GLint srcY,
+ GLint srcZ, GLuint destName,
+ GLenum destTarget, GLint destLevel,
+ GLint destX, GLint destY, GLint destZ,
+ GLsizei srcWidth, GLsizei srcHeight,
+ GLsizei srcDepth);
#ifdef __cplusplus
}
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 1c9056dae7..793f458cba 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -215,61 +215,33 @@ _mesa_CheckFramebufferStatus(GLenum target);
extern GLenum GLAPIENTRY
_mesa_CheckNamedFramebufferStatus(GLuint framebuffer, GLenum target);
-extern void GLAPIENTRY
-_mesa_FramebufferTexture1D_no_error(GLenum target, GLenum attachment,
- GLenum textarget, GLuint texture,
- GLint level);
-extern void GLAPIENTRY
-_mesa_FramebufferTexture1D(GLenum target, GLenum attachment,
- GLenum textarget, GLuint texture, GLint level);
+DECL_GLAPIENTRY(void, FramebufferTexture1D, GLenum target, GLenum attachment,
+ GLenum textarget, GLuint texture,
+ GLint level);
-extern void GLAPIENTRY
-_mesa_FramebufferTexture2D_no_error(GLenum target, GLenum attachment,
- GLenum textarget, GLuint texture,
- GLint level);
-extern void GLAPIENTRY
-_mesa_FramebufferTexture2D(GLenum target, GLenum attachment,
- GLenum textarget, GLuint texture, GLint level);
+DECL_GLAPIENTRY(void, FramebufferTexture2D, GLenum target, GLenum attachment,
+ GLenum textarget, GLuint texture,
+ GLint level);
-extern void GLAPIENTRY
-_mesa_FramebufferTexture3D_no_error(GLenum target, GLenum attachment,
- GLenum textarget, GLuint texture,
- GLint level, GLint layer);
-extern void GLAPIENTRY
-_mesa_FramebufferTexture3D(GLenum target, GLenum attachment,
- GLenum textarget, GLuint texture,
- GLint level, GLint layer);
+DECL_GLAPIENTRY(void, FramebufferTexture3D, GLenum target, GLenum attachment,
+ GLenum textarget, GLuint texture,
+ GLint level, GLint layer);
-extern void GLAPIENTRY
-_mesa_FramebufferTextureLayer_no_error(GLenum target, GLenum attachment,
- GLuint texture, GLint level,
- GLint layer);
-extern void GLAPIENTRY
-_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
- GLuint texture, GLint level, GLint layer);
+DECL_GLAPIENTRY(void, FramebufferTextureLayer, GLenum target, GLenum attachment,
+ GLuint texture, GLint level,
+ GLint layer);
-extern void GLAPIENTRY
-_mesa_NamedFramebufferTextureLayer_no_error(GLuint framebuffer,
- GLenum attachment,
- GLuint texture, GLint level,
- GLint layer);
-extern void GLAPIENTRY
-_mesa_NamedFramebufferTextureLayer(GLuint framebuffer, GLenum attachment,
- GLuint texture, GLint level, GLint layer);
+DECL_GLAPIENTRY(void, NamedFramebufferTextureLayer, GLuint framebuffer,
+ GLenum attachment,
+ GLuint texture, GLint level,
+ GLint layer);
-extern void GLAPIENTRY
-_mesa_FramebufferTexture_no_error(GLenum target, GLenum attachment,
- GLuint texture, GLint level);
-extern void GLAPIENTRY
-_mesa_FramebufferTexture(GLenum target, GLenum attachment,
- GLuint texture, GLint level);
+DECL_GLAPIENTRY(void, FramebufferTexture, GLenum target, GLenum attachment,
+ GLuint texture, GLint level);
-extern void GLAPIENTRY
-_mesa_NamedFramebufferTexture_no_error(GLuint framebuffer, GLenum attachment,
- GLuint texture, GLint level);
-extern void GLAPIENTRY
-_mesa_NamedFramebufferTexture(GLuint framebuffer, GLenum attachment,
- GLuint texture, GLint level);
+DECL_GLAPIENTRY(void, NamedFramebufferTexture, GLuint framebuffer,
+ GLenum attachment,
+ GLuint texture, GLint level);
extern void GLAPIENTRY
_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment,
diff --git a/src/mesa/main/pipelineobj.h b/src/mesa/main/pipelineobj.h
index 1bf6b71316..1300861828 100644
--- a/src/mesa/main/pipelineobj.h
+++ b/src/mesa/main/pipelineobj.h
@@ -71,21 +71,12 @@ _mesa_validate_program_pipeline(struct gl_context * ctx,
struct gl_pipeline_object *pipe);
-void GLAPIENTRY
-_mesa_UseProgramStages_no_error(GLuint pipeline, GLbitfield stages,
- GLuint prog);
-extern void GLAPIENTRY
-_mesa_UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program);
+DECL_GLAPIENTRY(void, UseProgramStages, GLuint pipeline, GLbitfield stages,
+ GLuint prog);
-void GLAPIENTRY
-_mesa_ActiveShaderProgram_no_error(GLuint pipeline, GLuint program);
-extern void GLAPIENTRY
-_mesa_ActiveShaderProgram(GLuint pipeline, GLuint program);
+DECL_GLAPIENTRY(void, ActiveShaderProgram, GLuint pipeline, GLuint program);
-void GLAPIENTRY
-_mesa_BindProgramPipeline_no_error(GLuint pipeline);
-extern void GLAPIENTRY
-_mesa_BindProgramPipeline(GLuint pipeline);
+DECL_GLAPIENTRY(void, BindProgramPipeline, GLuint pipeline);
extern void GLAPIENTRY
_mesa_DeleteProgramPipelines(GLsizei n, const GLuint *pipelines);
diff --git a/src/mesa/main/scissor.h b/src/mesa/main/scissor.h
index 264873eaf1..29c02e41c9 100644
--- a/src/mesa/main/scissor.h
+++ b/src/mesa/main/scissor.h
@@ -31,30 +31,15 @@
struct gl_context;
-void GLAPIENTRY
-_mesa_Scissor_no_error(GLint x, GLint y, GLsizei width, GLsizei height);
+DECL_GLAPIENTRY(void, Scissor, GLint x, GLint y, GLsizei width, GLsizei height);
-extern void GLAPIENTRY
-_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height );
-
-void GLAPIENTRY
-_mesa_ScissorArrayv_no_error(GLuint first, GLsizei count, const GLint * v);
-
-extern void GLAPIENTRY
-_mesa_ScissorArrayv(GLuint first, GLsizei count, const GLint * v);
+DECL_GLAPIENTRY(void, ScissorArrayv, GLuint first, GLsizei count,
+ const GLint * v);
-void GLAPIENTRY
-_mesa_ScissorIndexed_no_error(GLuint index, GLint left, GLint bottom,
- GLsizei width, GLsizei height);
+DECL_GLAPIENTRY(void, ScissorIndexed, GLuint index, GLint left, GLint bottom,
+ GLsizei width, GLsizei height);
-extern void GLAPIENTRY
-_mesa_ScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
-
-void GLAPIENTRY
-_mesa_ScissorIndexedv_no_error(GLuint index, const GLint * v);
-
-extern void GLAPIENTRY
-_mesa_ScissorIndexedv(GLuint index, const GLint * v);
+DECL_GLAPIENTRY(void, ScissorIndexedv, GLuint index, const GLint * v);
extern void GLAPIENTRY
_mesa_WindowRectanglesEXT(GLenum mode, GLsizei count, const GLint *box);
diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h
index 0a28185177..ebbe265e2c 100644
--- a/src/mesa/main/shaderapi.h
+++ b/src/mesa/main/shaderapi.h
@@ -127,10 +127,7 @@ _mesa_LinkProgram(GLuint programObj);
extern void GLAPIENTRY
_mesa_ShaderSource(GLuint, GLsizei, const GLchar* const *, const GLint *);
-void GLAPIENTRY
-_mesa_UseProgram_no_error(GLuint);
-extern void GLAPIENTRY
-_mesa_UseProgram(GLuint);
+DECL_GLAPIENTRY(void, UseProgram, GLuint);
extern void GLAPIENTRY
_mesa_ValidateProgram(GLuint);
diff --git a/src/mesa/main/shaderimage.h b/src/mesa/main/shaderimage.h
index 6a9e3d67e9..c5e62cf5ae 100644
--- a/src/mesa/main/shaderimage.h
+++ b/src/mesa/main/shaderimage.h
@@ -79,22 +79,12 @@ _mesa_init_image_units(struct gl_context *ctx);
GLboolean
_mesa_is_image_unit_valid(struct gl_context *ctx, struct gl_image_unit *u);
-void GLAPIENTRY
-_mesa_BindImageTexture_no_error(GLuint unit, GLuint texture, GLint level,
- GLboolean layered, GLint layer, GLenum access,
- GLenum format);
+DECL_GLAPIENTRY(void, BindImageTexture, GLuint unit, GLuint texture, GLint level,
+ GLboolean layered, GLint layer, GLenum access,
+ GLenum format);
-void GLAPIENTRY
-_mesa_BindImageTexture(GLuint unit, GLuint texture, GLint level,
- GLboolean layered, GLint layer, GLenum access,
- GLenum format);
-
-void GLAPIENTRY
-_mesa_BindImageTextures_no_error(GLuint first, GLsizei count,
- const GLuint *textures);
-
-void GLAPIENTRY
-_mesa_BindImageTextures(GLuint first, GLsizei count, const GLuint *textures);
+DECL_GLAPIENTRY(void, BindImageTextures, GLuint first, GLsizei count,
+ const GLuint *textures);
#ifdef __cplusplus
}
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 295e35abb1..23da0d69c1 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -271,38 +271,22 @@ _mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalformat,
extern void GLAPIENTRY
_mesa_EGLImageTargetTexture2DOES( GLenum target, GLeglImageOES image );
-void GLAPIENTRY
-_mesa_TexSubImage1D_no_error(GLenum target, GLint level, GLint xoffset,
- GLsizei width,
- GLenum format, GLenum type,
- const GLvoid *pixels);
+DECL_GLAPIENTRY(void, TexSubImage1D, GLenum target, GLint level, GLint xoffset,
+ GLsizei width, GLenum format, GLenum type,
+ const GLvoid *pixels);
-extern void GLAPIENTRY
-_mesa_TexSubImage1D( GLenum target, GLint level, GLint xoffset,
- GLsizei width,
- GLenum format, GLenum type,
- const GLvoid *pixels );
+DECL_GLAPIENTRY(void, TexSubImage2D, GLenum target, GLint level,
+ GLint xoffset, GLint yoffset,
+ GLsizei width, GLsizei height,
+ GLenum format, GLenum type,
+ const GLvoid *pixels);
-void GLAPIENTRY
-_mesa_TexSubImage2D_no_error(GLenum target, GLint level,
- GLint xoffset, GLint yoffset,
- GLsizei width, GLsizei height,
- GLenum format, GLenum type,
- const GLvoid *pixels);
-
-extern void GLAPIENTRY
-_mesa_TexSubImage2D( GLenum target, GLint level,
- GLint xoffset, GLint yoffset,
- GLsizei width, GLsizei height,
- GLenum format, GLenum type,
- const GLvoid *pixels );
-
-void GLAPIENTRY
-_mesa_TexSubImage3D_no_error(GLenum target, GLint level,
- GLint xoffset, GLint yoffset, GLint zoffset,
- GLsizei width, GLsizei height, GLsizei depth,
- GLenum format, GLenum type,
- const GLvoid *pixels);
+DECL_GLAPIENTRY(void, TexSubImage3D, GLenum target, GLint level,
+ GLint xoffset, GLint yoffset,
+ GLint zoffset, GLsizei width,
+ GLsizei height, GLsizei depth,
+ GLenum format, GLenum type,
+ const GLvoid *pixels);
extern void GLAPIENTRY
_mesa_TexSubImage3D( GLenum target, GLint level,
@@ -405,78 +389,46 @@ _mesa_CompressedTexImage3D(GLenum target, GLint level,
GLsizei imageSize, const GLvoid *data);
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage1D_no_error(GLenum target, GLint level,
- GLint xoffset, GLsizei width,
- GLenum format, GLsizei imageSize,
- const GLvoid *data);
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset,
- GLsizei width, GLenum format,
- GLsizei imageSize, const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage1D_no_error(GLuint texture, GLint level,
- GLint xoffset, GLsizei width,
- GLenum format, GLsizei imageSize,
- const GLvoid *data);
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage1D(GLuint texture, GLint level, GLint xoffset,
- GLsizei width, GLenum format,
- GLsizei imageSize, const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage2D_no_error(GLenum target, GLint level,
- GLint xoffset, GLint yoffset,
- GLsizei width, GLsizei height,
- GLenum format, GLsizei imageSize,
- const GLvoid *data);
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
- GLint yoffset, GLsizei width, GLsizei height,
- GLenum format, GLsizei imageSize,
- const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage2D_no_error(GLuint texture, GLint level,
- GLint xoffset, GLint yoffset,
- GLsizei width, GLsizei height,
- GLenum format, GLsizei imageSize,
- const GLvoid *data);
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage2D(GLuint texture, GLint level, GLint xoffset,
- GLint yoffset,
- GLsizei width, GLsizei height,
- GLenum format, GLsizei imageSize,
- const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage3D_no_error(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 GLAPIENTRY
-_mesa_CompressedTexSubImage3D(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 GLAPIENTRY
-_mesa_CompressedTextureSubImage3D_no_error(GLuint texture, GLint level,
- GLint xoffset, GLint yoffset,
- GLint zoffset, GLsizei width,
- GLsizei height, GLsizei depth,
- GLenum format, GLsizei imageSize,
- const GLvoid *data);
-extern void GLAPIENTRY
-_mesa_CompressedTextureSubImage3D(GLuint texture, GLint level, GLint xoffset,
- GLint yoffset, GLint zoffset,
- GLsizei width, GLsizei height,
- GLsizei depth,
- GLenum format, GLsizei imageSize,
- const GLvoid *data);
+DECL_GLAPIENTRY(void, CompressedTexSubImage1D, GLenum target, GLint level,
+ GLint xoffset, GLsizei width,
+ GLenum format, GLsizei imageSize,
+ const GLvoid *data);
+
+DECL_GLAPIENTRY(void, CompressedTextureSubImage1D, GLuint texture, GLint level,
+ GLint xoffset, GLsizei width,
+ GLenum format,
+ GLsizei imageSize,
+ const GLvoid *data);
+
+DECL_GLAPIENTRY(void, CompressedTexSubImage2D, GLenum target, GLint level,
+ GLint xoffset, GLint yoffset,
+ GLsizei width, GLsizei height,
+ GLenum format, GLsizei imageSize,
+ const GLvoid *data);
+
+DECL_GLAPIENTRY(void, CompressedTextureSubImage2D, GLuint texture, GLint level,
+ GLint xoffset, GLint yoffset,
+ GLsizei width,
+ GLsizei height,
+ GLenum format,
+ GLsizei imageSize,
+ const GLvoid *data);
+
+DECL_GLAPIENTRY(void, CompressedTexSubImage3D, GLenum target, GLint level,
+ GLint xoffset, GLint yoffset,
+ GLint zoffset, GLsizei width,
+ GLsizei height, GLsizei depth,
+ GLenum format, GLsizei imageSize,
+ const GLvoid *data);
+
+DECL_GLAPIENTRY(void, CompressedTextureSubImage3D, GLuint texture, GLint level,
+ GLint xoffset, GLint yoffset,
+ GLint zoffset, GLsizei width,
+ GLsizei height,
+ GLsizei depth,
+ GLenum format,
+ GLsizei imageSize,
+ const GLvoid *data);
extern void GLAPIENTRY
_mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer);
diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index 7c74329a64..47db5517b0 100644
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -77,11 +77,7 @@ _mesa_print_texunit_state( struct gl_context *ctx, GLuint unit );
*/
/*@{*/
-extern void GLAPIENTRY
-_mesa_ActiveTexture_no_error( GLenum target );
-
-extern void GLAPIENTRY
-_mesa_ActiveTexture( GLenum target );
+DECL_GLAPIENTRY(void, ActiveTexture, GLenum target);
extern void GLAPIENTRY
_mesa_ClientActiveTexture( GLenum target );
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index 43b9fe905e..2bbb45321b 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -108,43 +108,22 @@ _mesa_bind_vertex_buffer(struct gl_context *ctx,
struct gl_buffer_object *vbo,
GLintptr offset, GLsizei stride);
-extern void GLAPIENTRY
-_mesa_VertexPointer_no_error(GLint size, GLenum type, GLsizei stride,
- const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride,
- const GLvoid *ptr);
-
-extern void GLAPIENTRY
-_mesa_NormalPointer_no_error(GLenum type, GLsizei stride, const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
+DECL_GLAPIENTRY(void, VertexPointer, GLint size, GLenum type, GLsizei stride,
+ const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_ColorPointer_no_error(GLint size, GLenum type, GLsizei stride,
- const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_IndexPointer_no_error(GLenum type, GLsizei stride, const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
+DECL_GLAPIENTRY(void, NormalPointer, GLenum type, GLsizei stride,
+ const GLvoid *ptr);
+DECL_GLAPIENTRY(void, ColorPointer, GLint size, GLenum type, GLsizei stride,
+ const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_TexCoordPointer_no_error(GLint size, GLenum type, GLsizei stride,
- const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
- const GLvoid *ptr);
+DECL_GLAPIENTRY(void, IndexPointer, GLenum type, GLsizei stride,
+ const GLvoid *ptr);
+DECL_GLAPIENTRY(void, TexCoordPointer, GLint size, GLenum type, GLsizei stride,
+ const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_EdgeFlagPointer_no_error(GLsizei stride, const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr);
+DECL_GLAPIENTRY(void, EdgeFlagPointer, GLsizei stride, const GLvoid *ptr);
extern void GLAPIENTRY
@@ -175,50 +154,26 @@ _mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
extern void GLAPIENTRY
_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);
-extern void GLAPIENTRY
-_mesa_FogCoordPointer_no_error(GLenum type, GLsizei stride,
- const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
+DECL_GLAPIENTRY(void, FogCoordPointer, GLenum type, GLsizei stride,
+ const GLvoid *ptr);
+DECL_GLAPIENTRY(void, SecondaryColorPointer, GLint size, GLenum type,
+ GLsizei stride, const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_SecondaryColorPointer_no_error(GLint size, GLenum type,
- GLsizei stride, const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_SecondaryColorPointer(GLint size, GLenum type,
- GLsizei stride, const GLvoid *ptr);
+DECL_GLAPIENTRY(void, PointSizePointerOES, GLenum type, GLsizei stride,
+ const GLvoid *ptr);
+DECL_GLAPIENTRY(void, VertexAttribPointer, GLuint index, GLint size,
+ GLenum type, GLboolean normalized,
+ GLsizei stride, const GLvoid *pointer);
-extern void GLAPIENTRY
-_mesa_PointSizePointerOES_no_error(GLenum type, GLsizei stride,
- const GLvoid *ptr);
-extern void GLAPIENTRY
-_mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr);
+DECL_GLAPIENTRY(void, VertexAttribIPointer, GLuint index, GLint size,
+ GLenum type, GLsizei stride,
+ const GLvoid *ptr);
-
-extern void GLAPIENTRY
-_mesa_VertexAttribPointer_no_error(GLuint index, GLint size, GLenum type,
- GLboolean normalized, GLsizei stride,
- const GLvoid *pointer);
-extern void GLAPIENTRY
-_mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type,
- GLboolean normalized, GLsizei stride,
- const GLvoid *pointer);
-
-void GLAPIENTRY
-_mesa_VertexAttribIPointer_no_error(GLuint index, GLint size, GLenum type,
- GLsizei stride, const GLvoid *ptr);
-void GLAPIENTRY
-_mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
- GLsizei stride, const GLvoid *ptr);
-
-extern void GLAPIENTRY
-_mesa_VertexAttribLPointer_no_error(GLuint index, GLint size, GLenum type,
- GLsizei stride, const GLvoid *pointer);
-extern void GLAPIENTRY
-_mesa_VertexAttribLPointer(GLuint index, GLint size, GLenum type,
- GLsizei stride, const GLvoid *pointer);
+DECL_GLAPIENTRY(void, VertexAttribLPointer, GLuint index, GLint size,
+ GLenum type, GLsizei stride,
+ const GLvoid *pointer);
extern void GLAPIENTRY
_mesa_EnableVertexAttribArray(GLuint index);
@@ -338,10 +293,7 @@ _mesa_DrawTransformFeedback(GLenum mode, GLuint name);
extern void GLAPIENTRY
_mesa_PrimitiveRestartIndex(GLuint index);
-extern void GLAPIENTRY
-_mesa_VertexAttribDivisor_no_error(GLuint index, GLuint divisor);
-extern void GLAPIENTRY
-_mesa_VertexAttribDivisor(GLuint index, GLuint divisor);
+DECL_GLAPIENTRY(void, VertexAttribDivisor, GLuint index, GLuint divisor);
static inline unsigned
_mesa_primitive_restart_index(const struct gl_context *ctx,
@@ -360,40 +312,24 @@ _mesa_primitive_restart_index(const struct gl_context *ctx,
return ctx->Array.RestartIndex;
}
-extern void GLAPIENTRY
-_mesa_BindVertexBuffer_no_error(GLuint bindingIndex, GLuint buffer,
- GLintptr offset, GLsizei stride);
-extern void GLAPIENTRY
-_mesa_BindVertexBuffer(GLuint bindingIndex, GLuint buffer, GLintptr offset,
- GLsizei stride);
-
-void GLAPIENTRY
-_mesa_VertexArrayVertexBuffer_no_error(GLuint vaobj, GLuint bindingIndex,
- GLuint buffer, GLintptr offset,
- GLsizei stride);
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexBuffer(GLuint vaobj, GLuint bindingIndex, GLuint buffer,
- GLintptr offset, GLsizei stride);
+DECL_GLAPIENTRY(void, BindVertexBuffer, GLuint bindingIndex, GLuint buffer,
+ GLintptr offset, GLsizei stride);
-void GLAPIENTRY
-_mesa_BindVertexBuffers_no_error(GLuint first, GLsizei count,
- const GLuint *buffers, const GLintptr *offsets,
- const GLsizei *strides);
+DECL_GLAPIENTRY(void, VertexArrayVertexBuffer, GLuint vaobj,
+ GLuint bindingIndex,
+ GLuint buffer, GLintptr offset,
+ GLsizei stride);
-extern void GLAPIENTRY
-_mesa_BindVertexBuffers(GLuint first, GLsizei count, const GLuint *buffers,
- const GLintptr *offsets, const GLsizei *strides);
+DECL_GLAPIENTRY(void, BindVertexBuffers, GLuint first, GLsizei count,
+ const GLuint *buffers,
+ const GLintptr *offsets,
+ const GLsizei *strides);
-void GLAPIENTRY
-_mesa_VertexArrayVertexBuffers_no_error(GLuint vaobj, GLuint first,
- GLsizei count, const GLuint *buffers,
- const GLintptr *offsets,
- const GLsizei *strides);
-
-extern void GLAPIENTRY
-_mesa_VertexArrayVertexBuffers(GLuint vaobj, GLuint first, GLsizei count,
- const GLuint *buffers,
- const GLintptr *offsets, const GLsizei *strides);
+DECL_GLAPIENTRY(void, VertexArrayVertexBuffers, GLuint vaobj, GLuint first,
+ GLsizei count,
+ const GLuint *buffers,
+ const GLintptr *offsets,
+ const GLsizei *strides);
extern void GLAPIENTRY
_mesa_VertexAttribFormat(GLuint attribIndex, GLint size, GLenum type,
--
2.13.0
More information about the mesa-dev
mailing list