andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GLX: Purge some glxint.h usage in glxcmds.c

Browse Source 
This is related to d0b249f1c5 in the 1.4 branch and was ok'd by krh
This commit is contained in:
Jeremy Huddleston 2009-05-29 14:27:46 -07:00
parent 032173f693
commit e587436cf2
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
glx/glxcmds.c
View File

@ -870,6 +870,14 @@ int __glXDisp_CopyContext(__GLXclientState *cl, GLbyte *pc)
return Success; return Success;
} }
enum {
GLX_VIS_CONFIG_UNPAIRED = 18,
GLX_VIS_CONFIG_PAIRED = 20
};
enum {
GLX_VIS_CONFIG_TOTAL = GLX_VIS_CONFIG_UNPAIRED + GLX_VIS_CONFIG_PAIRED
};
int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte *pc) int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
{ {
@ -878,7 +886,7 @@ int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
xGLXGetVisualConfigsReply reply; xGLXGetVisualConfigsReply reply;
__GLXscreen *pGlxScreen; __GLXscreen *pGlxScreen;
__GLXconfig *modes; __GLXconfig *modes;
CARD32 buf[__GLX_TOTAL_CONFIG]; CARD32 buf[GLX_VIS_CONFIG_TOTAL];
int p, i, err; int p, i, err;
__GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
@ -887,8 +895,8 @@ int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
return err; return err;
reply.numVisuals = pGlxScreen->numVisuals; reply.numVisuals = pGlxScreen->numVisuals;
reply.numProps = __GLX_TOTAL_CONFIG; reply.numProps = GLX_VIS_CONFIG_TOTAL;
reply.length = (reply.numVisuals * __GLX_SIZE_CARD32 * __GLX_TOTAL_CONFIG) >> 2; reply.length = (reply.numVisuals * __GLX_SIZE_CARD32 * GLX_VIS_CONFIG_TOTAL) >> 2;
reply.type = X_Reply; reply.type = X_Reply;
reply.sequenceNumber = client->sequence; reply.sequenceNumber = client->sequence;
@ -926,6 +934,8 @@ int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
buf[p++] = modes->stencilBits; buf[p++] = modes->stencilBits;
buf[p++] = modes->numAuxBuffers; buf[p++] = modes->numAuxBuffers;
buf[p++] = modes->level; buf[p++] = modes->level;
assert(p == GLX_VIS_CONFIG_UNPAIRED);
/* /*
** Add token/value pairs for extensions. ** Add token/value pairs for extensions.
*/ */
@ -950,11 +960,11 @@ int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
buf[p++] = 0; /* copy over visualSelectGroup (GLX_VISUAL_SELECT_GROUP_SGIX)? */ buf[p++] = 0; /* copy over visualSelectGroup (GLX_VISUAL_SELECT_GROUP_SGIX)? */
buf[p++] = 0; buf[p++] = 0;
assert(p == GLX_VIS_CONFIG_TOTAL);
if (client->swapped) { if (client->swapped) {
__GLX_SWAP_INT_ARRAY(buf, __GLX_TOTAL_CONFIG); __GLX_SWAP_INT_ARRAY(buf, p);
} }
WriteToClient(client, __GLX_SIZE_CARD32 * __GLX_TOTAL_CONFIG, WriteToClient(client, __GLX_SIZE_CARD32 * p, (char *)buf);
(char *)buf);
} }
return Success; return Success;
} }