frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glxproxy: Silence set-but-unused-variable warnings 

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2015-12-08 15:53:35 -05:00
parent bc996fa4e3
commit 18729a211a
2 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/dmx/glxProxy/render2swap.c
View File

@ -67,7 +67,7 @@ void
__glXDispSwap_Map1f(GLbyte * pc) __glXDispSwap_Map1f(GLbyte * pc)
{ {
GLint order, k; GLint order, k;
GLfloat u1, u2, *points; GLfloat *points;
GLenum target; GLenum target;
GLint compsize; GLint compsize;
@ -81,8 +81,6 @@ __glXDispSwap_Map1f(GLbyte * pc)
target = *(GLenum *) (pc + 0); target = *(GLenum *) (pc + 0);
order = *(GLint *) (pc + 12); order = *(GLint *) (pc + 12);
u1 = *(GLfloat *) (pc + 4);
u2 = *(GLfloat *) (pc + 8);
points = (GLfloat *) (pc + 16); points = (GLfloat *) (pc + 16);
k = __glEvalComputeK(target); k = __glEvalComputeK(target);
@ -100,8 +98,8 @@ __glXDispSwap_Map1f(GLbyte * pc)
void void
__glXDispSwap_Map2f(GLbyte * pc) __glXDispSwap_Map2f(GLbyte * pc)
{ {
GLint uorder, vorder, ustride, vstride, k; GLint uorder, vorder, k;
GLfloat u1, u2, v1, v2, *points; GLfloat *points;
GLenum target; GLenum target;
GLint compsize; GLint compsize;
@ -119,15 +117,9 @@ __glXDispSwap_Map2f(GLbyte * pc)
target = *(GLenum *) (pc + 0); target = *(GLenum *) (pc + 0);
uorder = *(GLint *) (pc + 12); uorder = *(GLint *) (pc + 12);
vorder = *(GLint *) (pc + 24); vorder = *(GLint *) (pc + 24);
u1 = *(GLfloat *) (pc + 4);
u2 = *(GLfloat *) (pc + 8);
v1 = *(GLfloat *) (pc + 16);
v2 = *(GLfloat *) (pc + 20);
points = (GLfloat *) (pc + 28); points = (GLfloat *) (pc + 28);
k = __glEvalComputeK(target); k = __glEvalComputeK(target);
ustride = vorder * k;
vstride = k;
if (vorder <= 0 || uorder <= 0 || k < 0) { if (vorder <= 0 || uorder <= 0 || k < 0) {
/* Erroneous command. */ /* Erroneous command. */
@ -145,7 +137,7 @@ __glXDispSwap_Map1d(GLbyte * pc)
{ {
GLint order, k, compsize; GLint order, k, compsize;
GLenum target; GLenum target;
GLdouble u1, u2, *points; GLdouble u1, u2;
__GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
@ -177,21 +169,15 @@ __glXDispSwap_Map1d(GLbyte * pc)
** the data in the process ** the data in the process
*/ */
__GLX_MEM_COPY(pc - 4, pc, compsize * 8); __GLX_MEM_COPY(pc - 4, pc, compsize * 8);
points = (GLdouble *) (pc - 4);
} }
else {
points = (GLdouble *) pc;
}
#else
points = (GLdouble *) pc;
#endif #endif
} }
void void
__glXDispSwap_Map2d(GLbyte * pc) __glXDispSwap_Map2d(GLbyte * pc)
{ {
GLdouble u1, u2, v1, v2, *points; GLdouble u1, u2, v1, v2;
GLint uorder, vorder, ustride, vstride, k, compsize; GLint uorder, vorder, k, compsize;
GLenum target; GLenum target;
__GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_VARIABLES;
@ -222,8 +208,6 @@ __glXDispSwap_Map2d(GLbyte * pc)
__GLX_GET_DOUBLE(v2, pc + 24); __GLX_GET_DOUBLE(v2, pc + 24);
__GLX_SWAP_DOUBLE_ARRAY(pc + 44, compsize); __GLX_SWAP_DOUBLE_ARRAY(pc + 44, compsize);
pc += 44; pc += 44;
ustride = vorder * k;
vstride = k;
#ifdef __GLX_ALIGN64 #ifdef __GLX_ALIGN64
if (((unsigned long) pc) & 7) { if (((unsigned long) pc) & 7) {
@ -232,13 +216,7 @@ __glXDispSwap_Map2d(GLbyte * pc)
** the data in the process ** the data in the process
*/ */
__GLX_MEM_COPY(pc - 4, pc, compsize * 8); __GLX_MEM_COPY(pc - 4, pc, compsize * 8);
points = (GLdouble *) (pc - 4);
} }
else {
points = (GLdouble *) pc;
}
#else
points = (GLdouble *) pc;
#endif #endif
} }

3
hw/dmx/glxProxy/renderpixswap.c
View File

@ -380,12 +380,9 @@ __glXDispSwap_SeparableFilter2D(GLbyte * pc)
{ {
__GLXdispatchConvolutionFilterHeader *hdr = __GLXdispatchConvolutionFilterHeader *hdr =
(__GLXdispatchConvolutionFilterHeader *) pc; (__GLXdispatchConvolutionFilterHeader *) pc;
GLint hdrlen;
__GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_VARIABLES;
hdrlen = __GLX_PAD(__GLX_CONV_FILT_CMD_HDR_SIZE);
__GLX_SWAP_INT((GLbyte *) &hdr->rowLength); __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
__GLX_SWAP_INT((GLbyte *) &hdr->skipRows); __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
__GLX_SWAP_INT((GLbyte *) &hdr->skipPixels); __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);