fixes from XFree86 trunk

5 files changed, 39 insertions, 39 deletions

diff --git a/xc/lib/GL/glx/Imakefile b/xc/lib/GL/glx/Imakefile
index 041672a29..9cadeeb11 100644
--- a/xc/lib/GL/glx/Imakefile
+++ b/xc/lib/GL/glx/Imakefile
@@ -94,7 +94,7 @@ LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/mesa/sparc)
 		vertarr.o \
 	        xfont.o
 
-     GLX_DEFS = GlxDefines
+     GLX_DEFS = GlxDefines VidModeExtensionDefines
 
 #ifdef i386Architecture
       ASM_DIR = x86
diff --git a/xc/lib/GL/glx/g_render.c b/xc/lib/GL/glx/g_render.c
index 3442df37a..6212c5fb9 100644
--- a/xc/lib/GL/glx/g_render.c
+++ b/xc/lib/GL/glx/g_render.c
@@ -194,8 +194,8 @@
    void __indirect_gl ## name (GLenum pname, const type * v) \
    { \
       __GLX_DECLARE_VARIABLES(); \
-      compsize = __gl ## name ## _size(pname); \
       __GLX_LOAD_VARIABLES(); \
+      compsize = __gl ## name ## _size(pname); \
       cmdlen = 4 + RENDER_SIZE(type, compsize); \
       __GLX_BEGIN(rop, cmdlen); \
       __GLX_PUT_LONG(4, pname); \
@@ -1843,8 +1843,8 @@ void glFogf(GLenum pname, GLfloat param)
 void glFogfv(GLenum pname, const GLfloat *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glFogfv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glFogfv_size(pname);
 	cmdlen = 8+compsize*4;
 	__GLX_BEGIN(X_GLrop_Fogfv,cmdlen);
 	__GLX_PUT_LONG(4,pname);
@@ -1865,8 +1865,8 @@ void glFogi(GLenum pname, GLint param)
 void glFogiv(GLenum pname, const GLint *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glFogiv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glFogiv_size(pname);
 	cmdlen = 8+compsize*4;
 	__GLX_BEGIN(X_GLrop_Fogiv,cmdlen);
 	__GLX_PUT_LONG(4,pname);
@@ -1907,8 +1907,8 @@ void glLightf(GLenum light, GLenum pname, GLfloat param)
 void glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glLightfv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glLightfv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_Lightfv,cmdlen);
 	__GLX_PUT_LONG(4,light);
@@ -1931,8 +1931,8 @@ void glLighti(GLenum light, GLenum pname, GLint param)
 void glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glLightiv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glLightiv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_Lightiv,cmdlen);
 	__GLX_PUT_LONG(4,light);
@@ -1954,8 +1954,8 @@ void glLightModelf(GLenum pname, GLfloat param)
 void glLightModelfv(GLenum pname, const GLfloat *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glLightModelfv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glLightModelfv_size(pname);
 	cmdlen = 8+compsize*4;
 	__GLX_BEGIN(X_GLrop_LightModelfv,cmdlen);
 	__GLX_PUT_LONG(4,pname);
@@ -1976,8 +1976,8 @@ void glLightModeli(GLenum pname, GLint param)
 void glLightModeliv(GLenum pname, const GLint *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glLightModeliv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glLightModeliv_size(pname);
 	cmdlen = 8+compsize*4;
 	__GLX_BEGIN(X_GLrop_LightModeliv,cmdlen);
 	__GLX_PUT_LONG(4,pname);
@@ -2018,8 +2018,8 @@ void glMaterialf(GLenum face, GLenum pname, GLfloat param)
 void glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glMaterialfv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glMaterialfv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_Materialfv,cmdlen);
 	__GLX_PUT_LONG(4,face);
@@ -2042,8 +2042,8 @@ void glMateriali(GLenum face, GLenum pname, GLint param)
 void glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glMaterialiv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glMaterialiv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_Materialiv,cmdlen);
 	__GLX_PUT_LONG(4,face);
@@ -2106,8 +2106,8 @@ void glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 void glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glTexParameterfv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glTexParameterfv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_TexParameterfv,cmdlen);
 	__GLX_PUT_LONG(4,target);
@@ -2130,8 +2130,8 @@ void glTexParameteri(GLenum target, GLenum pname, GLint param)
 void glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glTexParameteriv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glTexParameteriv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_TexParameteriv,cmdlen);
 	__GLX_PUT_LONG(4,target);
@@ -2154,8 +2154,8 @@ void glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 void glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glTexEnvfv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glTexEnvfv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_TexEnvfv,cmdlen);
 	__GLX_PUT_LONG(4,target);
@@ -2178,8 +2178,8 @@ void glTexEnvi(GLenum target, GLenum pname, GLint param)
 void glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glTexEnviv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glTexEnviv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_TexEnviv,cmdlen);
 	__GLX_PUT_LONG(4,target);
@@ -2202,8 +2202,8 @@ void glTexGend(GLenum coord, GLenum pname, GLdouble param)
 void glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glTexGendv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glTexGendv_size(pname);
 	cmdlen = 12+compsize*8;
 	__GLX_BEGIN(X_GLrop_TexGendv,cmdlen);
 	__GLX_PUT_LONG(4,coord);
@@ -2226,8 +2226,8 @@ void glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 void glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glTexGenfv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glTexGenfv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_TexGenfv,cmdlen);
 	__GLX_PUT_LONG(4,coord);
@@ -2250,8 +2250,8 @@ void glTexGeni(GLenum coord, GLenum pname, GLint param)
 void glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glTexGeniv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glTexGeniv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_TexGeniv,cmdlen);
 	__GLX_PUT_LONG(4,coord);
@@ -3044,8 +3044,8 @@ void glBlendEquation(GLenum mode)
 void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glColorTableParameterfv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glColorTableParameterfv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_ColorTableParameterfv,cmdlen);
 	__GLX_PUT_LONG(4,target);
@@ -3057,8 +3057,8 @@ void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glColorTableParameteriv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glColorTableParameteriv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_ColorTableParameteriv,cmdlen);
 	__GLX_PUT_LONG(4,target);
@@ -3107,8 +3107,8 @@ void glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 void glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glConvolutionParameterfv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glConvolutionParameterfv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_ConvolutionParameterfv,cmdlen);
 	__GLX_PUT_LONG(4,target);
@@ -3131,8 +3131,8 @@ void glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 void glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
 	__GLX_DECLARE_VARIABLES();
-	compsize = __glConvolutionParameteriv_size(pname);
 	__GLX_LOAD_VARIABLES();
+	compsize = __glConvolutionParameteriv_size(pname);
 	cmdlen = 12+compsize*4;
 	__GLX_BEGIN(X_GLrop_ConvolutionParameteriv,cmdlen);
 	__GLX_PUT_LONG(4,target);
@@ -3608,12 +3608,12 @@ void glLoadTransposeMatrixfARB(const GLfloat *m)
 	__GLX_DECLARE_VARIABLES();
         GLfloat t[16];
         int i, j;
+	__GLX_LOAD_VARIABLES();
         for (i = 0; i < 4; i++) {
             for (j = 0; j < 4; j++) {
                 t[i*4+j] = m[j*4+i];
              }
          }
-	__GLX_LOAD_VARIABLES();
 	__GLX_BEGIN(X_GLrop_LoadMatrixf,68);
 	__GLX_PUT_FLOAT_ARRAY(4,t,16);
 	__GLX_END(68);
@@ -3624,12 +3624,12 @@ void glMultTransposeMatrixfARB(const GLfloat *m)
 	__GLX_DECLARE_VARIABLES();
         GLfloat t[16];
         int i, j;
+	__GLX_LOAD_VARIABLES();
         for (i = 0; i < 4; i++) {
             for (j = 0; j < 4; j++) {
                 t[i*4+j] = m[j*4+i];
              }
          }
-	__GLX_LOAD_VARIABLES();
 	__GLX_BEGIN(X_GLrop_MultMatrixf,68);
 	__GLX_PUT_FLOAT_ARRAY(4,t,16);
 	__GLX_END(68);
@@ -3640,12 +3640,12 @@ void glLoadTransposeMatrixdARB(const GLdouble *m)
 	__GLX_DECLARE_VARIABLES();
         GLdouble t[16];
         int i, j;
+	__GLX_LOAD_VARIABLES();
         for (i = 0; i < 4; i++) {
             for (j = 0; j < 4; j++) {
                 t[i*4+j] = m[j*4+i];
              }
          }
-	__GLX_LOAD_VARIABLES();
 	__GLX_BEGIN(X_GLrop_LoadMatrixd,132);
 	__GLX_PUT_DOUBLE_ARRAY(4,t,16);
 	__GLX_END(132);
@@ -3656,12 +3656,12 @@ void glMultTransposeMatrixdARB(const GLdouble *m)
 	__GLX_DECLARE_VARIABLES();
         GLdouble t[16];
         int i, j;
+	__GLX_LOAD_VARIABLES();
         for (i = 0; i < 4; i++) {
             for (j = 0; j < 4; j++) {
                 t[i*4+j] = m[j*4+i];
              }
          }
-	__GLX_LOAD_VARIABLES();
 	__GLX_BEGIN(X_GLrop_MultMatrixd,132);
 	__GLX_PUT_DOUBLE_ARRAY(4,t,16);
 	__GLX_END(132);
diff --git a/xc/lib/GL/glx/glxcmds.c b/xc/lib/GL/glx/glxcmds.c
index 557471393..35c59e893 100644
--- a/xc/lib/GL/glx/glxcmds.c
+++ b/xc/lib/GL/glx/glxcmds.c
@@ -2518,7 +2518,7 @@ Bool GLX_PREFIX(glXGetSyncValuesOML)(Display *dpy, GLXDrawable drawable,
 Bool GLX_PREFIX(glXGetMscRateOML)(Display * dpy, GLXDrawable drawable,
 				  int32_t * numerator, int32_t * denominator)
 {
-#if defined( GLX_DIRECT_RENDERING )
+#if defined( GLX_DIRECT_RENDERING ) && defined( XF86VIDMODE )
    __GLXdisplayPrivate * const priv = __glXInitialize(dpy);
 
 
diff --git a/xc/lib/GL/glx/render2.c b/xc/lib/GL/glx/render2.c
index 5e8b8cacf..97dd3c676 100644
--- a/xc/lib/GL/glx/render2.c
+++ b/xc/lib/GL/glx/render2.c
@@ -46,10 +46,10 @@
 void glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
     __GLX_DECLARE_VARIABLES();
+    __GLX_LOAD_VARIABLES();
 
     compsize = __glCallLists_size(n,type);
     cmdlen = __GLX_PAD(12 + compsize);
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) return;
 
     if (cmdlen <= gc->maxSmallRenderCommandSize) {
diff --git a/xc/lib/GL/glx/renderpix.c b/xc/lib/GL/glx/renderpix.c
index 971d4767a..045258766 100644
--- a/xc/lib/GL/glx/renderpix.c
+++ b/xc/lib/GL/glx/renderpix.c
@@ -113,9 +113,9 @@ void glPolygonStipple(const GLubyte *mask)
 {
     __GLX_DECLARE_VARIABLES();
 
+    __GLX_LOAD_VARIABLES();
     compsize = __glImageSize(32, 32, 1, GL_COLOR_INDEX, GL_BITMAP);
     cmdlen = __GLX_PAD(__GLX_POLYGONSTIPPLE_CMD_HDR_SIZE + compsize);
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) return;
 
     __GLX_BEGIN(X_GLrop_PolygonStipple,cmdlen);
@@ -132,9 +132,9 @@ void glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig,
 {
     __GLX_DECLARE_VARIABLES();
 
+    __GLX_LOAD_VARIABLES();
     compsize = __glImageSize(width, height, 1, GL_COLOR_INDEX, GL_BITMAP);
     cmdlen = __GLX_PAD(__GLX_BITMAP_CMD_HDR_SIZE + compsize);
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) return;
 
     if (cmdlen <= gc->maxSmallRenderCommandSize) {
@@ -184,13 +184,13 @@ void glTexImage1D(GLenum target, GLint level, GLint components,
 {
     __GLX_DECLARE_VARIABLES();
 
+    __GLX_LOAD_VARIABLES();
     if (target == GL_PROXY_TEXTURE_1D) {
 	compsize = 0;
     } else {
 	compsize = __glImageSize(width, 1, 1, format, type);
     }
     cmdlen = __GLX_PAD(__GLX_TEXIMAGE_CMD_HDR_SIZE + compsize);
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) return;
 
     if (cmdlen <= gc->maxSmallRenderCommandSize) {
@@ -260,6 +260,7 @@ void glTexImage2D(GLenum target, GLint level, GLint components,
 {
     __GLX_DECLARE_VARIABLES();
 
+    __GLX_LOAD_VARIABLES();
     if (target == GL_PROXY_TEXTURE_2D ||
         target == GL_PROXY_TEXTURE_CUBE_MAP_ARB) {
 	compsize = 0;
@@ -267,7 +268,6 @@ void glTexImage2D(GLenum target, GLint level, GLint components,
 	compsize = __glImageSize(width, height, 1, format, type);
     }
     cmdlen = __GLX_PAD(__GLX_TEXIMAGE_CMD_HDR_SIZE + compsize);
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) return;
 
     if (cmdlen <= gc->maxSmallRenderCommandSize) {
@@ -337,9 +337,9 @@ void glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type,
 {
     __GLX_DECLARE_VARIABLES();
 
+    __GLX_LOAD_VARIABLES();
     compsize = __glImageSize(width, height, 1, format, type);
     cmdlen = __GLX_PAD(__GLX_DRAWPIXELS_CMD_HDR_SIZE + compsize);
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) return;
 
     if (cmdlen <= gc->maxSmallRenderCommandSize) {
@@ -386,6 +386,7 @@ static void __glx_TexSubImage1D2D(GLshort opcode, GLenum target, GLint level,
 {
     __GLX_DECLARE_VARIABLES();
 
+    __GLX_LOAD_VARIABLES();
     if (image == NULL) {
 	compsize = 0;
     } else {
@@ -393,7 +394,6 @@ static void __glx_TexSubImage1D2D(GLshort opcode, GLenum target, GLint level,
     }
 
     cmdlen = __GLX_PAD(__GLX_TEXSUBIMAGE_CMD_HDR_SIZE + compsize);
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) return;
 
     if (cmdlen <= gc->maxSmallRenderCommandSize) {
@@ -472,6 +472,7 @@ void glColorTable(GLenum target, GLenum internalformat, GLsizei width,
 {
     __GLX_DECLARE_VARIABLES();
 
+    __GLX_LOAD_VARIABLES();
     switch (target) {
 	case GL_PROXY_TEXTURE_1D:
 	case GL_PROXY_TEXTURE_2D:
@@ -487,7 +488,6 @@ void glColorTable(GLenum target, GLenum internalformat, GLsizei width,
 	    break;
     }
     cmdlen = __GLX_PAD(__GLX_COLOR_TABLE_CMD_HDR_SIZE + compsize);
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) {
 	 return;
     }
@@ -536,9 +536,9 @@ void glColorSubTable(GLenum target, GLsizei start, GLsizei count,
 {
     __GLX_DECLARE_VARIABLES();
 
+    __GLX_LOAD_VARIABLES();
     compsize = __glImageSize(count, 1, 1, format, type);
     cmdlen = __GLX_PAD(__GLX_COLOR_SUBTABLE_CMD_HDR_SIZE + compsize);
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) {
 	 return;
     }
@@ -590,9 +590,9 @@ static void __glx_ConvolutionFilter1D2D(GLshort opcode, GLint dim,
 {
     __GLX_DECLARE_VARIABLES();
 
+    __GLX_LOAD_VARIABLES();
     compsize = __glImageSize(width, height, 1, format, type);
     cmdlen = __GLX_PAD(__GLX_CONV_FILT_CMD_HDR_SIZE + compsize);
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) return;
 
     if (cmdlen <= gc->maxSmallRenderCommandSize) {
@@ -662,6 +662,7 @@ void glSeparableFilter2D(GLenum target, GLenum internalformat,
     __GLX_DECLARE_VARIABLES();
     GLuint compsize2, hdrlen, totalhdrlen, image1len, image2len;
 
+    __GLX_LOAD_VARIABLES();
     compsize = __glImageSize(width, 1, 1, format, type);
     compsize2 = __glImageSize(height, 1, 1, format, type);
     totalhdrlen = __GLX_PAD(__GLX_CONV_FILT_CMD_HDR_SIZE);
@@ -669,7 +670,6 @@ void glSeparableFilter2D(GLenum target, GLenum internalformat,
     image1len = __GLX_PAD(compsize);
     image2len = __GLX_PAD(compsize2);
     cmdlen = totalhdrlen + image1len + image2len;
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) return;
 
     if (cmdlen <= gc->maxSmallRenderCommandSize) {
@@ -749,13 +749,13 @@ void glTexImage3D(GLenum target, GLint level, GLint internalformat,
 {
     __GLX_DECLARE_VARIABLES();
 
+    __GLX_LOAD_VARIABLES();
     if ((target == GL_PROXY_TEXTURE_3D) || (image == NULL)) {
 	compsize = 0;
     } else {
 	compsize = __glImageSize(width, height, depth, format, type);
     }
     cmdlen = __GLX_PAD(__GLX_TEXIMAGE_3D_CMD_HDR_SIZE + compsize);
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) return;
 
     if (cmdlen <= gc->maxSmallRenderCommandSize) {
@@ -828,13 +828,13 @@ void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
 {
     __GLX_DECLARE_VARIABLES();
 
+    __GLX_LOAD_VARIABLES();
     if (image == NULL) {
 	compsize = 0;
     } else {
         compsize = __glImageSize(width, height, depth, format, type);
     }
     cmdlen = __GLX_PAD(__GLX_TEXSUBIMAGE_3D_CMD_HDR_SIZE + compsize);
-    __GLX_LOAD_VARIABLES();
     if (!gc->currentDpy) return;
 
     if (cmdlen <= gc->maxSmallRenderCommandSize) {