xserver/hw/xgl/glxext xglglxext.c,1.2,1.3 xglglxlog.c,1.1,1.2
Dave Airlie
xserver-commit at pdx.freedesktop.org
Thu Jan 5 04:01:27 PST 2006
Committed by: airlied
Update of /cvs/xserver/xserver/hw/xgl/glxext
In directory gabe:/tmp/cvs-serv18735/hw/xgl/glxext
Modified Files:
xglglxext.c xglglxlog.c
Log Message:
switch GLX and Xgl to use Mesa's "glapitable.h"
Index: xglglxext.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glxext/xglglxext.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xglglxext.c 3 Jan 2006 09:56:22 -0000 1.2
+++ xglglxext.c 5 Jan 2006 12:01:25 -0000 1.3
@@ -37,6 +37,7 @@
#include "glxutil.h"
#include "unpack.h"
#include "g_disptab.h"
+#include "glapitable.h"
#include "glxext.h"
#include "micmap.h"
@@ -2400,6 +2401,56 @@
}
static void
+xglRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 )
+{
+ GLenum listMode;
+
+ if (cctx->list)
+ {
+ glEndList ();
+ xglStartList (XGL_LIST_OP_DRAW, GL_COMPILE);
+ glRectd (x1, y1, x2, y2);
+ glEndList ();
+
+ listMode = cctx->listMode;
+ }
+ else
+ listMode = GL_COMPILE_AND_EXECUTE;
+
+ if (listMode == GL_COMPILE_AND_EXECUTE)
+ {
+ RegionRec region;
+ BoxRec scissor, box;
+ BoxPtr pBox;
+ int nBox;
+
+ XGL_GLX_DRAW_PROLOGUE (pBox, nBox, &scissor);
+
+ while (nBox--)
+ {
+ XGL_GLX_DRAW_BOX (&box, pBox);
+
+ pBox++;
+
+ if (cctx->attrib.scissorTest)
+ XGL_GLX_INTERSECT_BOX (&box, &scissor);
+
+ if (box.x1 < box.x2 && box.y1 < box.y2)
+ {
+ XGL_GLX_SET_SCISSOR_BOX (&box);
+
+ glRectd (x1, y1, x2, y2);
+
+ XGL_GLX_DRAW_DAMAGE (&box, ®ion);
+ }
+ }
+ }
+
+ if (cctx->list)
+ xglStartList (XGL_LIST_OP_CALLS, cctx->listMode);
+}
+
+static void
xglRectdv (const GLdouble *v1,
const GLdouble *v2)
{
@@ -2451,6 +2502,13 @@
}
static void
+xglRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
+{
+ xglRectd (x1, y1, x2, y2);
+}
+
+
+static void
xglRectfv (const GLfloat *v1,
const GLfloat *v2)
{
@@ -2466,6 +2524,12 @@
}
static void
+xglRecti (GLint x1, GLint y1, GLint x2, GLint y2)
+{
+ xglRectd (x1, y1, x2, y2);
+}
+
+static void
xglRectiv (const GLint *v1,
const GLint *v2)
{
@@ -2481,6 +2545,13 @@
}
static void
+xglRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2)
+{
+ xglRectd (x1, y1, x2, y2);
+}
+
+
+static void
xglRectsv (const GLshort *v1,
const GLshort *v2)
{
@@ -3016,6 +3087,828 @@
xglGLOp (&gl);
}
+struct _glapi_table __glNativeRenderTable = {
+ xglNewList,
+ xglEndList,
+ xglCallList,
+ xglCallLists,
+ xglDeleteLists,
+ xglGenLists,
+ glListBase,
+ xglBegin,
+ xglBitmap,
+ glColor3b,
+ glColor3bv,
+ glColor3d,
+ glColor3dv,
+ glColor3f,
+ glColor3fv,
+ glColor3i,
+ glColor3iv,
+ glColor3s,
+ glColor3sv,
+ glColor3ub,
+ glColor3ubv,
+ glColor3ui,
+ glColor3uiv,
+ glColor3us,
+ glColor3usv,
+ glColor4b,
+ glColor4bv,
+ glColor4d,
+ glColor4dv,
+ glColor4f,
+ glColor4fv,
+ glColor4i,
+ glColor4iv,
+ glColor4s,
+ glColor4sv,
+ glColor4ub,
+ glColor4ubv,
+ glColor4ui,
+ glColor4uiv,
+ glColor4us,
+ glColor4usv,
+ glEdgeFlag,
+ glEdgeFlagv,
+ xglEnd,
+ glIndexd,
+ glIndexdv,
+ glIndexf,
+ glIndexfv,
+ glIndexi,
+ glIndexiv,
+ glIndexs,
+ glIndexsv,
+ glNormal3b,
+ glNormal3bv,
+ glNormal3d,
+ glNormal3dv,
+ glNormal3f,
+ glNormal3fv,
+ glNormal3i,
+ glNormal3iv,
+ glNormal3s,
+ glNormal3sv,
+ glRasterPos2d,
+ glRasterPos2dv,
+ glRasterPos2f,
+ glRasterPos2fv,
+ glRasterPos2i,
+ glRasterPos2iv,
+ glRasterPos2s,
+ glRasterPos2sv,
+ glRasterPos3d,
+ glRasterPos3dv,
+ glRasterPos3f,
+ glRasterPos3fv,
+ glRasterPos3i,
+ glRasterPos3iv,
+ glRasterPos3s,
+ glRasterPos3sv,
+ glRasterPos4d,
+ glRasterPos4dv,
+ glRasterPos4f,
+ glRasterPos4fv,
+ glRasterPos4i,
+ glRasterPos4iv,
+ glRasterPos4s,
+ glRasterPos4sv,
+ xglRectd,
+ xglRectdv,
+ xglRectf,
+ xglRectfv,
+ xglRecti,
+ xglRectiv,
+ xglRects,
+ xglRectsv,
+ glTexCoord1d,
+ glTexCoord1dv,
+ glTexCoord1f,
+ glTexCoord1fv,
+ glTexCoord1i,
+ glTexCoord1iv,
+ glTexCoord1s,
+ glTexCoord1sv,
+ glTexCoord2d,
+ glTexCoord2dv,
+ glTexCoord2f,
+ glTexCoord2fv,
+ glTexCoord2i,
+ glTexCoord2iv,
+ glTexCoord2s,
+ glTexCoord2sv,
+ glTexCoord3d,
+ glTexCoord3dv,
+ glTexCoord3f,
+ glTexCoord3fv,
+ glTexCoord3i,
+ glTexCoord3iv,
+ glTexCoord3s,
+ glTexCoord3sv,
+ glTexCoord4d,
+ glTexCoord4dv,
+ glTexCoord4f,
+ glTexCoord4fv,
+ glTexCoord4i,
+ glTexCoord4iv,
+ glTexCoord4s,
+ glTexCoord4sv,
+ glVertex2d,
+ glVertex2dv,
+ glVertex2f,
+ glVertex2fv,
+ glVertex2i,
+ glVertex2iv,
+ glVertex2s,
+ glVertex2sv,
+ glVertex3d,
+ glVertex3dv,
+ glVertex3f,
+ glVertex3fv,
+ glVertex3i,
+ glVertex3iv,
+ glVertex3s,
+ glVertex3sv,
+ glVertex4d,
+ glVertex4dv,
+ glVertex4f,
+ glVertex4fv,
+ glVertex4i,
+ glVertex4iv,
+ glVertex4s,
+ glVertex4sv,
+ glClipPlane,
+ glColorMaterial,
+ glCullFace,
+ glFogf,
+ glFogfv,
+ glFogi,
+ glFogiv,
+ glFrontFace,
+ glHint,
+ glLightf,
+ glLightfv,
+ glLighti,
+ glLightiv,
+ glLightModelf,
+ glLightModelfv,
+ glLightModeli,
+ glLightModeliv,
+ glLineStipple,
+ glLineWidth,
+ glMaterialf,
+ glMaterialfv,
+ glMateriali,
+ glMaterialiv,
+ glPointSize,
+ glPolygonMode,
+ glPolygonStipple,
+ xglScissor,
+ glShadeModel,
+ xglTexParameterf,
+ xglTexParameterfv,
+ xglTexParameteri,
+ xglTexParameteriv,
+ glTexImage1D,
+ glTexImage2D,
+ glTexEnvf,
+ glTexEnvfv,
+ glTexEnvi,
+ glTexEnviv,
+ glTexGend,
+ glTexGendv,
+ glTexGenf,
+ glTexGenfv,
+ glTexGeni,
+ glTexGeniv,
+ glFeedbackBuffer,
+ glSelectBuffer,
+ glRenderMode,
+ glInitNames,
+ glLoadName,
+ glPassThrough,
+ glPopName,
+ glPushName,
+ xglDrawBuffer,
+ xglClear,
+ glClearAccum,
+ glClearIndex,
+ glClearColor,
+ glClearStencil,
+ glClearDepth,
+ glStencilMask,
+ glColorMask,
+ glDepthMask,
+ glIndexMask,
+ xglAccum,
+ xglDisable,
+ xglEnable,
+ xglFinish,
+ xglFlush,
+ xglPopAttrib,
+ xglPushAttrib,
+ glMap1d,
+ glMap1f,
+ glMap2d,
+ glMap2f,
+ glMapGrid1d,
+ glMapGrid1f,
+ glMapGrid2d,
+ glMapGrid2f,
+ glEvalCoord1d,
+ glEvalCoord1dv,
+ glEvalCoord1f,
+ glEvalCoord1fv,
+ glEvalCoord2d,
+ glEvalCoord2dv,
+ glEvalCoord2f,
+ glEvalCoord2fv,
+ glEvalMesh1,
+ glEvalPoint1,
+ glEvalMesh2,
+ glEvalPoint2,
+ glAlphaFunc,
+ glBlendFunc,
+ glLogicOp,
+ glStencilFunc,
+ glStencilOp,
+ glDepthFunc,
+ glPixelZoom,
+ glPixelTransferf,
+ glPixelTransferi,
+ glPixelStoref,
+ glPixelStorei,
+ glPixelMapfv,
+ glPixelMapuiv,
+ glPixelMapusv,
+ xglReadBuffer,
+ xglCopyPixels,
+ xglReadPixels,
+ xglDrawPixels,
+ xglGetBooleanv,
+ glGetClipPlane,
+ xglGetDoublev,
+ xglGetError,
+ xglGetFloatv,
+ xglGetIntegerv,
+ glGetLightfv,
+ glGetLightiv,
+ glGetMapdv,
+ glGetMapfv,
+ glGetMapiv,
+ glGetMaterialfv,
+ glGetMaterialiv,
+ glGetPixelMapfv,
+ glGetPixelMapuiv,
+ glGetPixelMapusv,
+ glGetPolygonStipple,
+ xglGetString,
+ glGetTexEnvfv,
+ glGetTexEnviv,
+ glGetTexGendv,
+ glGetTexGenfv,
+ glGetTexGeniv,
+ glGetTexImage,
+ glGetTexParameterfv,
+ glGetTexParameteriv,
+ xglGetTexLevelParameterfv,
+ xglGetTexLevelParameteriv,
+ xglIsEnabled,
+ xglIsList,
+ glDepthRange,
+ glFrustum,
+ glLoadIdentity,
+ glLoadMatrixf,
+ glLoadMatrixd,
+ glMatrixMode,
+ glMultMatrixf,
+ glMultMatrixd,
+ glOrtho,
+ glPopMatrix,
+ glPushMatrix,
+ glRotated,
+ glRotatef,
+ glScaled,
+ glScalef,
+ glTranslated,
+ glTranslatef,
+ xglViewport,
+ glArrayElement,
+ xglBindTexture,
+ glColorPointer,
+ glDisableClientState,
+ xglDrawArrays,
+ xglDrawElements,
+ glEdgeFlagPointer,
+ glEnableClientState,
+ glIndexPointer,
+ glIndexub,
+ glIndexubv,
+ glInterleavedArrays,
+ glNormalPointer,
+ glPolygonOffset,
+ glTexCoordPointer,
+ glVertexPointer,
+ xglAreTexturesResident,
+ xglCopyTexImage1D,
+ xglCopyTexImage2D,
+ xglCopyTexSubImage1D,
+ xglCopyTexSubImage2D,
+ xglDeleteTextures,
+ xglGenTextures,
+ glGetPointerv,
+ xglIsTexture,
+ xglPrioritizeTextures,
+ glTexSubImage1D,
+ glTexSubImage2D,
+ glPopClientAttrib,
+ glPushClientAttrib,
+ glBlendColor,
+ glBlendEquation,
+ glDrawRangeElements,
+ glColorTable,
+ glColorTableParameterfv,
+ glColorTableParameteriv,
+ xglCopyColorTable,
+ glGetColorTable,
+ glGetColorTableParameterfv,
+ glGetColorTableParameteriv,
+ glColorSubTable,
+ xglCopyColorSubTable,
+ glConvolutionFilter1D,
+ glConvolutionFilter2D,
+ glConvolutionParameterf,
+ glConvolutionParameterfv,
+ glConvolutionParameteri,
+ glConvolutionParameteriv,
+ xglCopyConvolutionFilter1D,
+ xglCopyConvolutionFilter2D,
+ glGetConvolutionFilter,
+ glGetConvolutionParameterfv,
+ glGetConvolutionParameteriv,
+ glGetSeparableFilter,
+ glSeparableFilter2D,
+ glGetHistogram,
+ glGetHistogramParameterfv,
+ glGetHistogramParameteriv,
+ glGetMinmax,
+ glGetMinmaxParameterfv,
+ glGetMinmaxParameteriv,
+ glHistogram,
+ glMinmax,
+ glResetHistogram,
+ glResetMinmax,
+ glTexImage3D,
+ glTexSubImage3D,
+ xglCopyTexSubImage3D,
+ glActiveTextureARB,
+ glClientActiveTextureARB,
+ glMultiTexCoord1dARB,
+ glMultiTexCoord1dvARB,
+ glMultiTexCoord1fARB,
+ glMultiTexCoord1fvARB,
+ glMultiTexCoord1iARB,
+ glMultiTexCoord1ivARB,
+ glMultiTexCoord1sARB,
+ glMultiTexCoord1svARB,
+ glMultiTexCoord2dARB,
+ glMultiTexCoord2dvARB,
+ glMultiTexCoord2fARB,
+ glMultiTexCoord2fvARB,
+ glMultiTexCoord2iARB,
+ glMultiTexCoord2ivARB,
+ glMultiTexCoord2sARB,
+ glMultiTexCoord2svARB,
+ glMultiTexCoord3dARB,
+ glMultiTexCoord3dvARB,
+ glMultiTexCoord3fARB,
+ glMultiTexCoord3fvARB,
+ glMultiTexCoord3iARB,
+ glMultiTexCoord3ivARB,
+ glMultiTexCoord3sARB,
+ glMultiTexCoord3svARB,
+ glMultiTexCoord4dARB,
+ glMultiTexCoord4dvARB,
+ glMultiTexCoord4fARB,
+ glMultiTexCoord4fvARB,
+ glMultiTexCoord4iARB,
+ glMultiTexCoord4ivARB,
+ glMultiTexCoord4sARB,
+ glMultiTexCoord4svARB,
+ glLoadTransposeMatrixfARB,
+ glLoadTransposeMatrixdARB,
+ glMultTransposeMatrixfARB,
+ glMultTransposeMatrixdARB,
+ glSampleCoverageARB,
+ glDrawBuffersARB,
+ glPolygonOffsetEXT,
+ glGetTexFilterFuncSGIS,
+ glTexFilterFuncSGIS,
+ glGetHistogramEXT,
+ glGetHistogramParameterfvEXT,
+ glGetHistogramParameterivEXT,
+ glGetMinmaxEXT,
+ glGetMinmaxParameterfvEXT,
+ glGetMinmaxParameterivEXT,
+ glGetConvolutionFilterEXT,
+ glGetConvolutionParameterfvEXT,
+ glGetConvolutionParameterivEXT,
+ glGetSeparableFilterEXT,
+ glGetColorTableSGI,
+ glGetColorTableParameterfvSGI,
+ glGetColorTableParameterivSGI,
+ glPixelTexGenSGIX,
+ glPixelTexGenParameteriSGIS,
+ glPixelTexGenParameterivSGIS,
+ glPixelTexGenParameterfSGIS,
+ glPixelTexGenParameterfvSGIS,
+ glGetPixelTexGenParameterivSGIS,
+ glGetPixelTexGenParameterfvSGIS,
+ glTexImage4DSGIS,
+ glTexSubImage4DSGIS,
+ glAreTexturesResidentEXT,
+ glGenTexturesEXT,
+ glIsTextureEXT,
+ glDetailTexFuncSGIS,
+ glGetDetailTexFuncSGIS,
+ glSharpenTexFuncSGIS,
+ glGetSharpenTexFuncSGIS,
+ glSampleMaskSGIS,
+ glSamplePatternSGIS,
+ glColorPointerEXT,
+ glEdgeFlagPointerEXT,
+ glIndexPointerEXT,
+ glNormalPointerEXT,
+ glTexCoordPointerEXT,
+ glVertexPointerEXT,
+ glSpriteParameterfSGIX,
+ glSpriteParameterfvSGIX,
+ glSpriteParameteriSGIX,
+ glSpriteParameterivSGIX,
+ glPointParameterfEXT,
+ glPointParameterfvEXT,
+ glGetInstrumentsSGIX,
+ glInstrumentsBufferSGIX,
+ glPollInstrumentsSGIX,
+ glReadInstrumentsSGIX,
+ glStartInstrumentsSGIX,
+ glStopInstrumentsSGIX,
+ glFrameZoomSGIX,
+ glTagSampleBufferSGIX,
+ glReferencePlaneSGIX,
+ glFlushRasterSGIX,
+ glGetListParameterfvSGIX,
+ glGetListParameterivSGIX,
+ glListParameterfSGIX,
+ glListParameterfvSGIX,
+ glListParameteriSGIX,
+ glListParameterivSGIX,
+ glFragmentColorMaterialSGIX,
+ glFragmentLightfSGIX,
+ glFragmentLightfvSGIX,
+ glFragmentLightiSGIX,
+ glFragmentLightivSGIX,
+ glFragmentLightModelfSGIX,
+ glFragmentLightModelfvSGIX,
+ glFragmentLightModeliSGIX,
+ glFragmentLightModelivSGIX,
+ glFragmentMaterialfSGIX,
+ glFragmentMaterialfvSGIX,
+ glFragmentMaterialiSGIX,
+ glFragmentMaterialivSGIX,
+ glGetFragmentLightfvSGIX,
+ glGetFragmentLightivSGIX,
+ glGetFragmentMaterialfvSGIX,
+ glGetFragmentMaterialivSGIX,
+ glLightEnviSGIX,
+ glVertexWeightfEXT,
+ glVertexWeightfvEXT,
+ glVertexWeightPointerEXT,
+ glFlushVertexArrayRangeNV,
+ glVertexArrayRangeNV,
+ glCombinerParameterfvNV,
+ glCombinerParameterfNV,
+ glCombinerParameterivNV,
+ glCombinerParameteriNV,
+ glCombinerInputNV,
+ glCombinerOutputNV,
+ glFinalCombinerInputNV,
+ glGetCombinerInputParameterfvNV,
+ glGetCombinerInputParameterivNV,
+ glGetCombinerOutputParameterfvNV,
+ glGetCombinerOutputParameterivNV,
+ glGetFinalCombinerInputParameterfvNV,
+ glGetFinalCombinerInputParameterivNV,
+ glResizeBuffersMESA,
+ glWindowPos2dMESA,
+ glWindowPos2dvMESA,
+ glWindowPos2fMESA,
+ glWindowPos2fvMESA,
+ glWindowPos2iMESA,
+ glWindowPos2ivMESA,
+ glWindowPos2sMESA,
+ glWindowPos2svMESA,
+ glWindowPos3dMESA,
+ glWindowPos3dvMESA,
+ glWindowPos3fMESA,
+ glWindowPos3fvMESA,
+ glWindowPos3iMESA,
+ glWindowPos3ivMESA,
+ glWindowPos3sMESA,
+ glWindowPos3svMESA,
+ glWindowPos4dMESA,
+ glWindowPos4dvMESA,
+ glWindowPos4fMESA,
+ glWindowPos4fvMESA,
+ glWindowPos4iMESA,
+ glWindowPos4ivMESA,
+ glWindowPos4sMESA,
+ glWindowPos4svMESA,
+ glBlendFuncSeparateEXT,
+ glIndexMaterialEXT,
+ glIndexFuncEXT,
+ glLockArraysEXT,
+ glUnlockArraysEXT,
+ glCullParameterdvEXT,
+ glCullParameterfvEXT,
+ glHintPGI,
+ glFogCoordfEXT,
+ glFogCoordfvEXT,
+ glFogCoorddEXT,
+ glFogCoorddvEXT,
+ glFogCoordPointerEXT,
+ glGetColorTableEXT,
+ glGetColorTableParameterivEXT,
+ glGetColorTableParameterfvEXT,
+ glTbufferMask3DFX,
+ glCompressedTexImage3DARB,
+ glCompressedTexImage2DARB,
+ glCompressedTexImage1DARB,
+ glCompressedTexSubImage3DARB,
+ glCompressedTexSubImage2DARB,
+ glCompressedTexSubImage1DARB,
+ glGetCompressedTexImageARB,
+ glSecondaryColor3bEXT,
+ glSecondaryColor3bvEXT,
+ glSecondaryColor3dEXT,
+ glSecondaryColor3dvEXT,
+ glSecondaryColor3fEXT,
+ glSecondaryColor3fvEXT,
+ glSecondaryColor3iEXT,
+ glSecondaryColor3ivEXT,
+ glSecondaryColor3sEXT,
+ glSecondaryColor3svEXT,
+ glSecondaryColor3ubEXT,
+ glSecondaryColor3ubvEXT,
+ glSecondaryColor3uiEXT,
+ glSecondaryColor3uivEXT,
+ glSecondaryColor3usEXT,
+ glSecondaryColor3usvEXT,
+ glSecondaryColorPointerEXT,
+ glAreProgramsResidentNV,
+ glBindProgramNV,
+ glDeleteProgramsNV,
+ glExecuteProgramNV,
+ glGenProgramsNV,
+ glGetProgramParameterdvNV,
+ glGetProgramParameterfvNV,
+ glGetProgramivNV,
+ glGetProgramStringNV,
+ glGetTrackMatrixivNV,
+ glGetVertexAttribdvARB,
+ glGetVertexAttribfvARB,
+ glGetVertexAttribivARB,
+ glGetVertexAttribPointervNV,
+ glIsProgramNV,
+ glLoadProgramNV,
+ glProgramParameter4dNV,
+ glProgramParameter4dvNV,
+ glProgramParameter4fNV,
+ glProgramParameter4fvNV,
+ glProgramParameters4dvNV,
+ glProgramParameters4fvNV,
+ glRequestResidentProgramsNV,
+ glTrackMatrixNV,
+ glVertexAttribPointerNV,
+ glVertexAttrib1dARB,
+ glVertexAttrib1dvARB,
+ glVertexAttrib1fARB,
+ glVertexAttrib1fvARB,
+ glVertexAttrib1sARB,
+ glVertexAttrib1svARB,
+ glVertexAttrib2dARB,
+ glVertexAttrib2dvARB,
+ glVertexAttrib2fARB,
+ glVertexAttrib2fvARB,
+ glVertexAttrib2sARB,
+ glVertexAttrib2svARB,
+ glVertexAttrib3dARB,
+ glVertexAttrib3dvARB,
+ glVertexAttrib3fARB,
+ glVertexAttrib3fvARB,
+ glVertexAttrib3sARB,
+ glVertexAttrib3svARB,
+ glVertexAttrib4dARB,
+ glVertexAttrib4dvARB,
+ glVertexAttrib4fARB,
+ glVertexAttrib4fvARB,
+ glVertexAttrib4sARB,
+ glVertexAttrib4svARB,
+ glVertexAttrib4NubARB,
+ glVertexAttrib4NubvARB,
+ glVertexAttribs1dvNV,
+ glVertexAttribs1fvNV,
+ glVertexAttribs1svNV,
+ glVertexAttribs2dvNV,
+ glVertexAttribs2fvNV,
+ glVertexAttribs2svNV,
+ glVertexAttribs3dvNV,
+ glVertexAttribs3fvNV,
+ glVertexAttribs3svNV,
+ glVertexAttribs4dvNV,
+ glVertexAttribs4fvNV,
+ glVertexAttribs4svNV,
+ glVertexAttribs4ubvNV,
+ glPointParameteriNV,
+ glPointParameterivNV,
+ glMultiDrawArraysEXT,
+ glMultiDrawElementsEXT,
+ glActiveStencilFaceEXT,
+ glDeleteFencesNV,
+ glGenFencesNV,
+ glIsFenceNV,
+ glTestFenceNV,
+ glGetFenceivNV,
+ glFinishFenceNV,
+ glSetFenceNV,
+ glVertexAttrib4bvARB,
+ glVertexAttrib4ivARB,
+ glVertexAttrib4ubvARB,
+ glVertexAttrib4usvARB,
+ glVertexAttrib4uivARB,
+ glVertexAttrib4NbvARB,
+ glVertexAttrib4NsvARB,
+ glVertexAttrib4NivARB,
+ glVertexAttrib4NusvARB,
+ glVertexAttrib4NuivARB,
+ glVertexAttribPointerARB,
+ glEnableVertexAttribArrayARB,
+ glDisableVertexAttribArrayARB,
+ glProgramStringARB,
+ glProgramEnvParameter4dARB,
+ glProgramEnvParameter4dvARB,
+ glProgramEnvParameter4fARB,
+ glProgramEnvParameter4fvARB,
+ glProgramLocalParameter4dARB,
+ glProgramLocalParameter4dvARB,
+ glProgramLocalParameter4fARB,
+ glProgramLocalParameter4fvARB,
+ glGetProgramEnvParameterdvARB,
+ glGetProgramEnvParameterfvARB,
+ glGetProgramLocalParameterdvARB,
+ glGetProgramLocalParameterfvARB,
+ glGetProgramivARB,
+ glGetProgramStringARB,
+ glProgramNamedParameter4fNV,
+ glProgramNamedParameter4dNV,
+ glProgramNamedParameter4fvNV,
+ glProgramNamedParameter4dvNV,
+ glGetProgramNamedParameterfvNV,
+ glGetProgramNamedParameterdvNV,
+ glBindBufferARB,
+ glBufferDataARB,
+ glBufferSubDataARB,
+ glDeleteBuffersARB,
+ glGenBuffersARB,
+ glGetBufferParameterivARB,
+ glGetBufferPointervARB,
+ glGetBufferSubDataARB,
+ glIsBufferARB,
+ glMapBufferARB,
+ glUnmapBufferARB,
+ glDepthBoundsEXT,
+ glGenQueriesARB,
+ glDeleteQueriesARB,
+ glIsQueryARB,
+ glBeginQueryARB,
+ glEndQueryARB,
+ glGetQueryivARB,
+ glGetQueryObjectivARB,
+ glGetQueryObjectuivARB,
+ glMultiModeDrawArraysIBM,
+ glMultiModeDrawElementsIBM,
+ glBlendEquationSeparateEXT,
+ glDeleteObjectARB,
+ glGetHandleARB,
+ glDetachObjectARB,
+ glCreateShaderObjectARB,
+ glShaderSourceARB,
+ glCompileShaderARB,
+ glCreateProgramObjectARB,
+ glAttachObjectARB,
+ glLinkProgramARB,
+ glUseProgramObjectARB,
+ glValidateProgramARB,
+ glUniform1fARB,
+ glUniform2fARB,
+ glUniform3fARB,
+ glUniform4fARB,
+ glUniform1iARB,
+ glUniform2iARB,
+ glUniform3iARB,
+ glUniform4iARB,
+ glUniform1fvARB,
+ glUniform2fvARB,
+ glUniform3fvARB,
+ glUniform4fvARB,
+ glUniform1ivARB,
+ glUniform2ivARB,
+ glUniform3ivARB,
+ glUniform4ivARB,
+ glUniformMatrix2fvARB,
+ glUniformMatrix3fvARB,
+ glUniformMatrix4fvARB,
+ glGetObjectParameterfvARB,
+ glGetObjectParameterivARB,
+ glGetInfoLogARB,
+ glGetAttachedObjectsARB,
+ glGetUniformLocationARB,
+ glGetActiveUniformARB,
+ glGetUniformfvARB,
+ glGetUniformivARB,
+ glGetShaderSourceARB,
+ glBindAttribLocationARB,
+ glGetActiveAttribARB,
+ glGetAttribLocationARB,
+ glGetVertexAttribdvNV,
+ glGetVertexAttribfvNV,
+ glGetVertexAttribivNV,
+ glVertexAttrib1dNV,
+ glVertexAttrib1dvNV,
+ glVertexAttrib1fNV,
+ glVertexAttrib1fvNV,
+ glVertexAttrib1sNV,
+ glVertexAttrib1svNV,
+ glVertexAttrib2dNV,
+ glVertexAttrib2dvNV,
+ glVertexAttrib2fNV,
+ glVertexAttrib2fvNV,
+ glVertexAttrib2sNV,
+ glVertexAttrib2svNV,
+ glVertexAttrib3dNV,
+ glVertexAttrib3dvNV,
+ glVertexAttrib3fNV,
+ glVertexAttrib3fvNV,
+ glVertexAttrib3sNV,
+ glVertexAttrib3svNV,
+ glVertexAttrib4dNV,
+ glVertexAttrib4dvNV,
+ glVertexAttrib4fNV,
+ glVertexAttrib4fvNV,
+ glVertexAttrib4sNV,
+ glVertexAttrib4svNV,
+ glVertexAttrib4ubNV,
+ glVertexAttrib4ubvNV,
+ glGenFragmentShadersATI,
+ glBindFragmentShaderATI,
+ glDeleteFragmentShaderATI,
+ glBeginFragmentShaderATI,
+ glEndFragmentShaderATI,
+ glPassTexCoordATI,
+ glSampleMapATI,
+ glColorFragmentOp1ATI,
+ glColorFragmentOp2ATI,
+ glColorFragmentOp3ATI,
+ glAlphaFragmentOp1ATI,
+ glAlphaFragmentOp2ATI,
+ glAlphaFragmentOp3ATI,
+ glSetFragmentShaderConstantATI,
+ glIsRenderbufferEXT,
+ glBindRenderbufferEXT,
+ glDeleteRenderbuffersEXT,
+ glGenRenderbuffersEXT,
+ glRenderbufferStorageEXT,
+ glGetRenderbufferParameterivEXT,
+ glIsFramebufferEXT,
+ glBindFramebufferEXT,
+ glDeleteFramebuffersEXT,
+ glGenFramebuffersEXT,
+ glCheckFramebufferStatusEXT,
+ glFramebufferTexture1DEXT,
+ glFramebufferTexture2DEXT,
+ glFramebufferTexture3DEXT,
+ glFramebufferRenderbufferEXT,
+ glGetFramebufferAttachmentParameterivEXT,
+ glGenerateMipmapEXT,
+ glStencilFuncSeparate,
+ glStencilOpSeparate,
+ glStencilMaskSeparate,
+ glGetQueryObjecti64vEXT,
+ glGetQueryObjectui64vEXT,
+};
+
+#if 0
__glProcTable __glNativeRenderTable = {
xglNewList,
xglEndList,
@@ -3316,6 +4209,7 @@
glTexSubImage3D,
xglCopyTexSubImage3D
};
+#endif
/* GL_ARB_multitexture */
static void
@@ -3912,7 +4806,7 @@
glitz_context_make_current (cctx->context, cctx->pDrawBuffer->drawable);
- GlxSetRenderTables (&__glNativeRenderTable, &cctx->glRenderTableEXT);
+ GlxSetRenderTables (&__glNativeRenderTable);
}
static void
@@ -4014,7 +4908,7 @@
__GLinterface *iface = pContext->mIface;
GlxFlushContextCache ();
- GlxSetRenderTables (0, 0);
+ GlxSetRenderTables (0);
if (!iface)
return GL_TRUE;
@@ -4527,7 +5421,7 @@
cctx = NULL;
GlxFlushContextCache ();
- GlxSetRenderTables (0, 0);
+ GlxSetRenderTables (0);
}
}
Index: xglglxlog.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glxext/xglglxlog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xglglxlog.c 3 Jan 2006 09:56:22 -0000 1.1
+++ xglglxlog.c 5 Jan 2006 12:01:25 -0000 1.2
@@ -25,11 +25,11 @@
#include "xglglx.h"
#include "xglglxext.h"
+#include "glapitable.h"
#ifndef NGLXEXTLOG
-static __glProcTable *nativeRenderTable = 0;
-static __glProcTableEXT *nativeRenderTableEXT = 0;
+static struct _glapi_table *nativeRenderTable = 0;
static FILE *logFp = 0;
@@ -3345,14 +3345,14 @@
logActiveTextureARB (GLenum texture)
{
fprintf (logFp, "glActiveTextureARB (0x%x)\n", texture);
- (*nativeRenderTableEXT->ActiveTextureARB) (texture);
+ (*nativeRenderTable->ActiveTextureARB) (texture);
}
static void
logClientActiveTextureARB (GLenum texture)
{
fprintf (logFp, "glClientActiveTextureARB (0x%x)\n", texture);
- (*nativeRenderTableEXT->ClientActiveTextureARB) (texture);
+ (*nativeRenderTable->ClientActiveTextureARB) (texture);
}
static void
@@ -3362,7 +3362,7 @@
vCnt[multiTexCoord1dvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord1dvARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord1dvARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord1dvARB) (target, v);
}
static void
@@ -3372,7 +3372,7 @@
vCnt[multiTexCoord1fvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord1fvARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord1fvARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord1fvARB) (target, v);
}
static void
@@ -3382,7 +3382,7 @@
vCnt[multiTexCoord1ivIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord1ivARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord1ivARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord1ivARB) (target, v);
}
static void
@@ -3392,7 +3392,7 @@
vCnt[multiTexCoord1svIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord1svARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord1svARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord1svARB) (target, v);
}
static void
@@ -3402,7 +3402,7 @@
vCnt[multiTexCoord2dvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord2dvARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord2dvARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord2dvARB) (target, v);
}
static void
@@ -3412,7 +3412,7 @@
vCnt[multiTexCoord2fvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord2fvARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord2fvARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord2fvARB) (target, v);
}
static void
@@ -3422,7 +3422,7 @@
vCnt[multiTexCoord2ivIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord2ivARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord2ivARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord2ivARB) (target, v);
}
static void
@@ -3432,7 +3432,7 @@
vCnt[multiTexCoord2svIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord2svARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord2svARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord2svARB) (target, v);
}
static void
@@ -3442,7 +3442,7 @@
vCnt[multiTexCoord3dvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord3dvARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord3dvARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord3dvARB) (target, v);
}
static void
@@ -3452,7 +3452,7 @@
vCnt[multiTexCoord3fvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord3fvARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord3fvARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord3fvARB) (target, v);
}
static void
@@ -3462,7 +3462,7 @@
vCnt[multiTexCoord3ivIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord3ivARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord3ivARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord3ivARB) (target, v);
}
static void
@@ -3472,7 +3472,7 @@
vCnt[multiTexCoord3svIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord3svARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord3svARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord3svARB) (target, v);
}
static void
@@ -3482,7 +3482,7 @@
vCnt[multiTexCoord4dvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord4dvARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord4dvARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord4dvARB) (target, v);
}
static void
@@ -3492,7 +3492,7 @@
vCnt[multiTexCoord4fvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord4fvARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord4fvARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord4fvARB) (target, v);
}
static void
@@ -3502,7 +3502,7 @@
vCnt[multiTexCoord4ivIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord4ivARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord4ivARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord4ivARB) (target, v);
}
static void
@@ -3512,7 +3512,7 @@
vCnt[multiTexCoord4svIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glMultiTexCoord4svARB (0x%x, %p)\n", target, v);
- (*nativeRenderTableEXT->MultiTexCoord4svARB) (target, v);
+ (*nativeRenderTable->MultiTexCoord4svARB) (target, v);
}
@@ -3523,7 +3523,7 @@
GLboolean invert)
{
fprintf (logFp, "glSampleCoverageARB (%f, %d)\n", value, invert);
- (*nativeRenderTableEXT->SampleCoverageARB) (value, invert);
+ (*nativeRenderTable->SampleCoverageARB) (value, invert);
}
@@ -3536,7 +3536,7 @@
{
fprintf (logFp, "glAreTexturesResidentEXT (%d, %p, %p)\n",
n, textures, residences);
- return (*nativeRenderTableEXT->AreTexturesResidentEXT) (n, textures,
+ return (*nativeRenderTable->AreTexturesResidentEXT) (n, textures,
residences);
}
static void
@@ -3544,14 +3544,14 @@
GLuint *textures)
{
fprintf (logFp, "glGenTexturesEXT (%d, %p)\n", n, textures);
- (*nativeRenderTableEXT->GenTexturesEXT) (n, textures);
+ (*nativeRenderTable->GenTexturesEXT) (n, textures);
}
static GLboolean
logIsTextureEXT (GLuint texture)
{
fprintf (logFp, "glIsTextureEXT (%d)\n", texture);
- return (*nativeRenderTableEXT->IsTextureEXT) (texture);
+ return (*nativeRenderTable->IsTextureEXT) (texture);
}
@@ -3562,14 +3562,14 @@
GLboolean invert)
{
fprintf (logFp, "glSampleMaskSGIS (%f, %d)\n", value, invert);
- (*nativeRenderTableEXT->SampleMaskSGIS) (value, invert);
+ (*nativeRenderTable->SampleMaskSGIS) (value, invert);
}
static void
logSamplePatternSGIS (GLenum pattern)
{
fprintf (logFp, "glSamplePatternSGIS (0x%x)\n", pattern);
- (*nativeRenderTableEXT->SamplePatternSGIS) (pattern);
+ (*nativeRenderTable->SamplePatternSGIS) (pattern);
}
@@ -3580,7 +3580,7 @@
GLfloat param)
{
fprintf (logFp, "glPointParameterfEXT (0x%x, %f)\n", pname, param);
- (*nativeRenderTableEXT->PointParameterfEXT) (pname, param);
+ (*nativeRenderTable->PointParameterfEXT) (pname, param);
}
static void
@@ -3588,7 +3588,7 @@
const GLfloat *params)
{
fprintf (logFp, "glPointParameterfvEXT (0x%x, %p)\n", pname, params);
- (*nativeRenderTableEXT->PointParameterfvEXT) (pname, params);
+ (*nativeRenderTable->PointParameterfvEXT) (pname, params);
}
@@ -3600,7 +3600,7 @@
GLfloat z)
{
fprintf (logFp, "glWindowPos3fMESA (%f, %f, %f)\n", x, y, z);
- (*nativeRenderTableEXT->WindowPos3fMESA) (x, y, z);
+ (*nativeRenderTable->WindowPos3fMESA) (x, y, z);
}
@@ -3614,7 +3614,7 @@
{
fprintf (logFp, "glBlendFuncSeparateEXT (0x%x, 0x%x, 0x%x, 0x%x)\n",
sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
- (*nativeRenderTableEXT->BlendFuncSeparateEXT) (sfactorRGB,
+ (*nativeRenderTable->BlendFuncSeparateEXT) (sfactorRGB,
dfactorRGB,
sfactorAlpha,
dfactorAlpha);
@@ -3629,7 +3629,7 @@
vCnt[fogCoordfvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glFogCoordfvEXT (%p)\n", coord);
- (*nativeRenderTableEXT->FogCoordfvEXT) (coord);
+ (*nativeRenderTable->FogCoordfvEXT) (coord);
}
static void
@@ -3638,7 +3638,7 @@
vCnt[fogCoorddvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glFogCoorddvEXT (%p)\n", coord);
- (*nativeRenderTableEXT->FogCoorddvEXT) (coord);
+ (*nativeRenderTable->FogCoorddvEXT) (coord);
}
static void
@@ -3648,7 +3648,7 @@
{
fprintf (logFp, "glFogCoordPointerEXT (0x%x, %d, %p)\n",
type, stride, pointer);
- (*nativeRenderTableEXT->FogCoordPointerEXT) (type, stride, pointer);
+ (*nativeRenderTable->FogCoordPointerEXT) (type, stride, pointer);
}
@@ -3660,7 +3660,7 @@
vCnt[secondaryColor3bvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glSecondaryColor3bvEXT (%p)\n", v);
- (*nativeRenderTableEXT->SecondaryColor3bvEXT) (v);
+ (*nativeRenderTable->SecondaryColor3bvEXT) (v);
}
static void
@@ -3669,7 +3669,7 @@
vCnt[secondaryColor3dvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glSecondaryColor3dvEXT (%p)\n", v);
- (*nativeRenderTableEXT->SecondaryColor3dvEXT) (v);
+ (*nativeRenderTable->SecondaryColor3dvEXT) (v);
}
static void
@@ -3678,7 +3678,7 @@
vCnt[secondaryColor3fvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glSecondaryColor3fvEXT (%p)\n", v);
- (*nativeRenderTableEXT->SecondaryColor3fvEXT) (v);
+ (*nativeRenderTable->SecondaryColor3fvEXT) (v);
}
static void
@@ -3687,7 +3687,7 @@
vCnt[secondaryColor3ivIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glSecondaryColor3ivEXT (%p)\n", v);
- (*nativeRenderTableEXT->SecondaryColor3ivEXT) (v);
+ (*nativeRenderTable->SecondaryColor3ivEXT) (v);
}
static void
@@ -3696,7 +3696,7 @@
vCnt[secondaryColor3svIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glSecondaryColor3svEXT (%p)\n", v);
- (*nativeRenderTableEXT->SecondaryColor3svEXT) (v);
+ (*nativeRenderTable->SecondaryColor3svEXT) (v);
}
static void
@@ -3705,7 +3705,7 @@
vCnt[secondaryColor3ubvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glSecondaryColor3ubvEXT (%p)\n", v);
- (*nativeRenderTableEXT->SecondaryColor3ubvEXT) (v);
+ (*nativeRenderTable->SecondaryColor3ubvEXT) (v);
}
static void
@@ -3714,7 +3714,7 @@
vCnt[secondaryColor3uivIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glSecondaryColor3uivEXT (%p)\n", v);
- (*nativeRenderTableEXT->SecondaryColor3uivEXT) (v);
+ (*nativeRenderTable->SecondaryColor3uivEXT) (v);
}
static void
@@ -3723,7 +3723,7 @@
vCnt[secondaryColor3usvIndex].n++;
if (logVertexAttribs)
fprintf (logFp, "glSecondaryColor3usvEXT (%p)\n", v);
- (*nativeRenderTableEXT->SecondaryColor3usvEXT) (v);
+ (*nativeRenderTable->SecondaryColor3usvEXT) (v);
}
static void
@@ -3734,7 +3734,7 @@
{
fprintf (logFp, "glSecondaryColorPointerEXT (%d, 0x%x, %d, %p)\n",
size, type, stride, pointer);
- (*nativeRenderTableEXT->SecondaryColorPointerEXT) (size, type,
+ (*nativeRenderTable->SecondaryColorPointerEXT) (size, type,
stride, pointer);
}
@@ -3746,7 +3746,7 @@
GLint param)
{
fprintf (logFp, "glPointParameteriNV (0x%x, %d)\n", pname, param);
- (*nativeRenderTableEXT->PointParameteriNV) (pname, param);
+ (*nativeRenderTable->PointParameteriNV) (pname, param);
}
static void
@@ -3754,7 +3754,7 @@
const GLint *params)
{
fprintf (logFp, "glPointParameterivNV (0x%x, %p)\n", pname, params);
- (*nativeRenderTableEXT->PointParameterivNV) (pname, params);
+ (*nativeRenderTable->PointParameterivNV) (pname, params);
}
@@ -3764,7 +3764,7 @@
logActiveStencilFaceEXT (GLenum face)
{
fprintf (logFp, "glActiveStencilFaceEXT (0x%x)\n", face);
- (*nativeRenderTableEXT->ActiveStencilFaceEXT) (face);
+ (*nativeRenderTable->ActiveStencilFaceEXT) (face);
}
@@ -3774,7 +3774,7 @@
logIsRenderbufferEXT (GLuint renderbuffer)
{
fprintf (logFp, "glIsRenderbufferEXT (%d)\n", renderbuffer);
- return (*nativeRenderTableEXT->IsRenderbufferEXT) (renderbuffer);
+ return (*nativeRenderTable->IsRenderbufferEXT) (renderbuffer);
}
static void
@@ -3783,7 +3783,7 @@
{
fprintf (logFp, "glBindRenderbufferEXT (0x%x, %d)\n",
target, renderbuffer);
- (*nativeRenderTableEXT->BindRenderbufferEXT) (target, renderbuffer);
+ (*nativeRenderTable->BindRenderbufferEXT) (target, renderbuffer);
}
static void
@@ -3791,7 +3791,7 @@
const GLuint *renderbuffers)
{
fprintf (logFp, "glDeleteRenderbuffersEXT (%d, %p)\n", n, renderbuffers);
- (*nativeRenderTableEXT->DeleteRenderbuffersEXT) (n, renderbuffers);
+ (*nativeRenderTable->DeleteRenderbuffersEXT) (n, renderbuffers);
}
static void
@@ -3799,7 +3799,7 @@
GLuint *renderbuffers)
{
fprintf (logFp, "glGenRenderbuffersEXT (%d, %p)\n", n, renderbuffers);
- (*nativeRenderTableEXT->GenRenderbuffersEXT) (n, renderbuffers);
+ (*nativeRenderTable->GenRenderbuffersEXT) (n, renderbuffers);
}
static void
@@ -3810,7 +3810,7 @@
{
fprintf (logFp, "glRenderbufferStorageEXT (0x%x, 0x%x, %d, %d)\n",
target, internalformat, width, height);
- (*nativeRenderTableEXT->RenderbufferStorageEXT) (target,
+ (*nativeRenderTable->RenderbufferStorageEXT) (target,
internalformat,
width, height);
}
@@ -3822,7 +3822,7 @@
{
fprintf (logFp, "glGetRenderbufferParameterivEXT (0x%x, 0x%x, %p)\n",
target, pname, params);
- (*nativeRenderTableEXT->GetRenderbufferParameterivEXT) (target,
+ (*nativeRenderTable->GetRenderbufferParameterivEXT) (target,
pname,
params);
}
@@ -3831,7 +3831,7 @@
logIsFramebufferEXT (GLuint framebuffer)
{
fprintf (logFp, "glIsFramebufferEXT (%d)\n", framebuffer);
- return (*nativeRenderTableEXT->IsFramebufferEXT) (framebuffer);
+ return (*nativeRenderTable->IsFramebufferEXT) (framebuffer);
}
static void
@@ -3839,7 +3839,7 @@
GLuint framebuffer)
{
fprintf (logFp, "glBindFramebufferEXT (0x%x, %d)\n", target, framebuffer);
- (*nativeRenderTableEXT->BindFramebufferEXT) (target, framebuffer);
+ (*nativeRenderTable->BindFramebufferEXT) (target, framebuffer);
}
static void
@@ -3847,7 +3847,7 @@
const GLuint *framebuffers)
{
fprintf (logFp, "glDeleteFramebuffersEXT (%d, %p)\n", n, framebuffers);
- (*nativeRenderTableEXT->DeleteFramebuffersEXT) (n, framebuffers);
+ (*nativeRenderTable->DeleteFramebuffersEXT) (n, framebuffers);
}
static void
@@ -3855,14 +3855,14 @@
GLuint *framebuffers)
{
fprintf (logFp, "glGenFramebuffersEXT (%d, %p)\n", n, framebuffers);
- (*nativeRenderTableEXT->GenFramebuffersEXT) (n, framebuffers);
+ (*nativeRenderTable->GenFramebuffersEXT) (n, framebuffers);
}
static GLenum
logCheckFramebufferStatusEXT (GLenum target)
{
fprintf (logFp, "glCheckFramebufferStatusEXT (0x%x)\n", target);
- return (*nativeRenderTableEXT->CheckFramebufferStatusEXT) (target);
+ return (*nativeRenderTable->CheckFramebufferStatusEXT) (target);
}
static void
@@ -3874,7 +3874,7 @@
{
fprintf (logFp, "glFramebufferTexture1DEXT (0x%x, 0x%x, 0x%x, %d, %d)\n",
target, attachment, textarget, texture, level);
- (*nativeRenderTableEXT->FramebufferTexture1DEXT) (target, attachment,
+ (*nativeRenderTable->FramebufferTexture1DEXT) (target, attachment,
textarget, texture,
level);
}
@@ -3888,7 +3888,7 @@
{
fprintf (logFp, "glFramebufferTexture2DEXT (0x%x, 0x%x, 0x%x, %d, %d)\n",
target, attachment, textarget, texture, level);
- (*nativeRenderTableEXT->FramebufferTexture2DEXT) (target, attachment,
+ (*nativeRenderTable->FramebufferTexture2DEXT) (target, attachment,
textarget, texture,
level);
}
@@ -3904,7 +3904,7 @@
fprintf (logFp, "glFramebufferTexture3DEXT (0x%x, 0x%x, 0x%x, "
"%d, %d, %d)\n", target, attachment, textarget, texture,
level, zoffset);
- (*nativeRenderTableEXT->FramebufferTexture3DEXT) (target, attachment,
+ (*nativeRenderTable->FramebufferTexture3DEXT) (target, attachment,
textarget, texture,
level, zoffset);
}
@@ -3917,7 +3917,7 @@
{
fprintf (logFp, "glFramebufferRenderbufferEXT (0x%x, 0x%x, 0x%x, %d)\n",
target, attachment, buffertarget, renderbuffer);
- (*nativeRenderTableEXT->FramebufferRenderbufferEXT) (target,
+ (*nativeRenderTable->FramebufferRenderbufferEXT) (target,
attachment,
buffertarget,
renderbuffer);
@@ -3931,7 +3931,7 @@
{
fprintf (logFp, "glGetFramebufferAttachmentParameterivEXT (0x%x, "
"0x%x, 0x%x, %p)\n", target, attach, pname, params);
- (*nativeRenderTableEXT->GetFramebufferAttachmentParameterivEXT) (target,
+ (*nativeRenderTable->GetFramebufferAttachmentParameterivEXT) (target,
attach,
pname,
params);
@@ -3941,7 +3941,7 @@
logGenerateMipmapEXT (GLenum target)
{
fprintf (logFp, "glGenerateMipmapEXT (0x%x)\n", target);
- (*nativeRenderTableEXT->GenerateMipmapEXT) (target);
+ (*nativeRenderTable->GenerateMipmapEXT) (target);
}
__glProcTableEXT __logRenderTableEXT = {
@@ -4010,8 +4010,7 @@
static Bool isCurrent = FALSE;
static void (*flushContextCache) (void);
-static void (*setRenderTables) (__glProcTable *table,
- __glProcTableEXT *tableEXT);
+static void (*setRenderTables) (struct _glapi_table *table);
static void
GlxLogFlushContextCache (void)
@@ -4026,25 +4025,22 @@
}
static void
-GlxLogSetRenderTables (__glProcTable *table,
- __glProcTableEXT *tableEXT)
+GlxLogSetRenderTables (struct _glapi_table *table)
{
nativeRenderTable = table;
- nativeRenderTableEXT = tableEXT;
- if (table && tableEXT)
+ if (table)
{
fprintf (logFp, "FORCE CURRENT\n");
isCurrent = TRUE;
- nativeRenderTable = table;
- nativeRenderTableEXT = tableEXT;
+ nativeRenderTable = table;
- (*setRenderTables) (&__logRenderTable, &__logRenderTableEXT);
+ (*setRenderTables) (&__logRenderTable);
}
else
{
- (*setRenderTables) (0, 0);
+ (*setRenderTables) (0);
}
}
More information about the xserver-commit
mailing list