summaryrefslogtreecommitdiff
path: root/src/glx
diff options
context:
space:
mode:
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/indirect.c41
-rw-r--r--src/glx/indirect.h5
-rw-r--r--src/glx/single2.c4
-rw-r--r--src/glx/singlepix.c16
4 files changed, 27 insertions, 39 deletions
diff --git a/src/glx/indirect.c b/src/glx/indirect.c
index 2b09c1c3b5..49938a167a 100644
--- a/src/glx/indirect.c
+++ b/src/glx/indirect.c
@@ -30,7 +30,6 @@
#include "indirect.h"
#include "glxclient.h"
#include "indirect_size.h"
-#include "glapidispatch.h"
#include "glapi.h"
#include "glthread.h"
#include <GL/glxproto.h>
@@ -5200,7 +5199,7 @@ glDeleteTexturesEXT(GLsizei n, const GLuint * textures)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_DeleteTextures(GET_DISPATCH(), (n, textures));
+ GET_DISPATCH()->DeleteTextures(n, textures);
} else
#endif
{
@@ -5271,7 +5270,7 @@ glGenTexturesEXT(GLsizei n, GLuint * textures)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GenTextures(GET_DISPATCH(), (n, textures));
+ GET_DISPATCH()->GenTextures(n, textures);
} else
#endif
{
@@ -5336,7 +5335,7 @@ glIsTextureEXT(GLuint texture)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- return CALL_IsTexture(GET_DISPATCH(), (texture));
+ return GET_DISPATCH()->IsTexture(texture);
} else
#endif
{
@@ -5652,7 +5651,7 @@ glGetColorTableEXT(GLenum target, GLenum format, GLenum type, GLvoid * table)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetColorTable(GET_DISPATCH(), (target, format, type, table));
+ GET_DISPATCH()->GetColorTable(target, format, type, table);
} else
#endif
{
@@ -5728,8 +5727,7 @@ glGetColorTableParameterfvEXT(GLenum target, GLenum pname, GLfloat * params)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetColorTableParameterfv(GET_DISPATCH(),
- (target, pname, params));
+ GET_DISPATCH()->GetColorTableParameterfv(target, pname, params);
} else
#endif
{
@@ -5801,8 +5799,7 @@ glGetColorTableParameterivEXT(GLenum target, GLenum pname, GLint * params)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetColorTableParameteriv(GET_DISPATCH(),
- (target, pname, params));
+ GET_DISPATCH()->GetColorTableParameteriv(target, pname, params);
} else
#endif
{
@@ -6127,8 +6124,7 @@ gl_dispatch_stub_356(GLenum target, GLenum format, GLenum type,
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetConvolutionFilter(GET_DISPATCH(),
- (target, format, type, image));
+ GET_DISPATCH()->GetConvolutionFilter(target, format, type, image);
} else
#endif
{
@@ -6205,8 +6201,7 @@ gl_dispatch_stub_357(GLenum target, GLenum pname, GLfloat * params)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetConvolutionParameterfv(GET_DISPATCH(),
- (target, pname, params));
+ GET_DISPATCH()->GetConvolutionParameterfv(target, pname, params);
} else
#endif
{
@@ -6278,8 +6273,7 @@ gl_dispatch_stub_358(GLenum target, GLenum pname, GLint * params)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetConvolutionParameteriv(GET_DISPATCH(),
- (target, pname, params));
+ GET_DISPATCH()->GetConvolutionParameteriv(target, pname, params);
} else
#endif
{
@@ -6358,8 +6352,7 @@ gl_dispatch_stub_361(GLenum target, GLboolean reset, GLenum format,
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetHistogram(GET_DISPATCH(),
- (target, reset, format, type, values));
+ GET_DISPATCH()->GetHistogram(target, reset, format, type, values);
} else
#endif
{
@@ -6435,7 +6428,7 @@ gl_dispatch_stub_362(GLenum target, GLenum pname, GLfloat * params)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetHistogramParameterfv(GET_DISPATCH(), (target, pname, params));
+ GET_DISPATCH()->GetHistogramParameterfv(target, pname, params);
} else
#endif
{
@@ -6506,7 +6499,7 @@ gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetHistogramParameteriv(GET_DISPATCH(), (target, pname, params));
+ GET_DISPATCH()->GetHistogramParameteriv(target, pname, params);
} else
#endif
{
@@ -6581,7 +6574,7 @@ gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format,
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetMinmax(GET_DISPATCH(), (target, reset, format, type, values));
+ GET_DISPATCH()->GetMinmax(target, reset, format, type, values);
} else
#endif
{
@@ -6655,7 +6648,7 @@ gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetMinmaxParameterfv(GET_DISPATCH(), (target, pname, params));
+ GET_DISPATCH()->GetMinmaxParameterfv(target, pname, params);
} else
#endif
{
@@ -6723,7 +6716,7 @@ gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetMinmaxParameteriv(GET_DISPATCH(), (target, pname, params));
+ GET_DISPATCH()->GetMinmaxParameteriv(target, pname, params);
} else
#endif
{
@@ -9268,7 +9261,7 @@ __indirect_glLoadProgramNV(GLenum target, GLuint id, GLsizei len,
#define X_GLrop_ProgramParameters4dvNV 4187
void
-__indirect_glProgramParameters4dvNV(GLenum target, GLuint index, GLuint num,
+__indirect_glProgramParameters4dvNV(GLenum target, GLuint index, GLsizei num,
const GLdouble * params)
{
struct glx_context *const gc = __glXGetCurrentContext();
@@ -9292,7 +9285,7 @@ __indirect_glProgramParameters4dvNV(GLenum target, GLuint index, GLuint num,
#define X_GLrop_ProgramParameters4fvNV 4186
void
-__indirect_glProgramParameters4fvNV(GLenum target, GLuint index, GLuint num,
+__indirect_glProgramParameters4fvNV(GLenum target, GLuint index, GLsizei num,
const GLfloat * params)
{
struct glx_context *const gc = __glXGetCurrentContext();
diff --git a/src/glx/indirect.h b/src/glx/indirect.h
index 282de75c40..f3222077bf 100644
--- a/src/glx/indirect.h
+++ b/src/glx/indirect.h
@@ -440,6 +440,7 @@ extern HIDDEN void __indirect_glGetConvolutionParameteriv(GLenum target, GLenum
extern HIDDEN void gl_dispatch_stub_358(GLenum target, GLenum pname, GLint * params);
extern HIDDEN void __indirect_glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span);
extern HIDDEN void gl_dispatch_stub_359(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span);
+#define gl_dispatch_stub_GetSeparableFilterEXT gl_dispatch_stub_359
extern HIDDEN void __indirect_glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * row, const GLvoid * column);
extern HIDDEN void __indirect_glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
extern HIDDEN void gl_dispatch_stub_361(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
@@ -640,8 +641,8 @@ extern HIDDEN void __indirect_glGetVertexAttribfvNV(GLuint index, GLenum pname,
extern HIDDEN void __indirect_glGetVertexAttribivNV(GLuint index, GLenum pname, GLint * params);
extern HIDDEN GLboolean __indirect_glIsProgramNV(GLuint program);
extern HIDDEN void __indirect_glLoadProgramNV(GLenum target, GLuint id, GLsizei len, const GLubyte * program);
-extern HIDDEN void __indirect_glProgramParameters4dvNV(GLenum target, GLuint index, GLuint num, const GLdouble * params);
-extern HIDDEN void __indirect_glProgramParameters4fvNV(GLenum target, GLuint index, GLuint num, const GLfloat * params);
+extern HIDDEN void __indirect_glProgramParameters4dvNV(GLenum target, GLuint index, GLsizei num, const GLdouble * params);
+extern HIDDEN void __indirect_glProgramParameters4fvNV(GLenum target, GLuint index, GLsizei num, const GLfloat * params);
extern HIDDEN void __indirect_glRequestResidentProgramsNV(GLsizei n, const GLuint * ids);
extern HIDDEN void __indirect_glTrackMatrixNV(GLenum target, GLuint address, GLenum matrix, GLenum transform);
extern HIDDEN void __indirect_glVertexAttrib1dNV(GLuint index, GLdouble x);
diff --git a/src/glx/single2.c b/src/glx/single2.c
index 318d18e555..66281fa9c9 100644
--- a/src/glx/single2.c
+++ b/src/glx/single2.c
@@ -36,7 +36,6 @@
#include "indirect.h"
#include "indirect_vertex_array.h"
#include "glapitable.h"
-#include "glapidispatch.h"
#include "glapi.h"
#ifdef USE_XCB
#include <xcb/xcb.h>
@@ -944,8 +943,7 @@ glAreTexturesResidentEXT(GLsizei n, const GLuint * textures,
struct glx_context *const gc = __glXGetCurrentContext();
if (gc->isDirect) {
- return CALL_AreTexturesResident(GET_DISPATCH(),
- (n, textures, residences));
+ return GET_DISPATCH()->AreTexturesResident(n, textures, residences);
}
else {
struct glx_context *const gc = __glXGetCurrentContext();
diff --git a/src/glx/singlepix.c b/src/glx/singlepix.c
index b61f26b2f3..d8a71664d0 100644
--- a/src/glx/singlepix.c
+++ b/src/glx/singlepix.c
@@ -31,10 +31,8 @@
#include "packsingle.h"
#include "indirect.h"
#include "glapitable.h"
-#include "glapidispatch.h"
#include "glapi.h"
#include "glthread.h"
-#include "glapioffsets.h"
#include <GL/glxproto.h>
void
@@ -110,19 +108,17 @@ __indirect_glGetSeparableFilter(GLenum target, GLenum format, GLenum type,
}
-#define CONCAT(a,b) a ## b
-#define NAME(o) CONCAT(gl_dispatch_stub_, o)
-
-void NAME(_gloffset_GetSeparableFilter) (GLenum target, GLenum format,
- GLenum type, GLvoid * row,
- GLvoid * column, GLvoid * span)
+/* it is defined to gl_dispatch_stub_NNN in indirect.h */
+void gl_dispatch_stub_GetSeparableFilterEXT (GLenum target, GLenum format,
+ GLenum type, GLvoid * row,
+ GLvoid * column, GLvoid * span)
{
struct glx_context *const gc = __glXGetCurrentContext();
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
if (gc->isDirect) {
- CALL_GetSeparableFilter(GET_DISPATCH(),
- (target, format, type, row, column, span));
+ GET_DISPATCH()->GetSeparableFilter(target, format, type,
+ row, column, span);
return;
}
else
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-31 17:51:33 +0000