fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-13 19:00:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

EXT_tfp updates

Browse source
This commit is contained in:
David Reveman 2006-04-09 11:24:06 +00:00
parent 67538c92bf
commit dd75fbade4
4 changed files with 44 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2006-04-09 David Reveman <davidr@novell.com>
* GL/glx/glxvisuals.c (init_visuals): Set EXT_tfp attributes properly.
* GL/glx/glxserver.h: More temporary EXT_tfp defines.
* GL/glx/glxcmds.c (__glXCreateARGBConfig): Set EXT_tfp attributes.
(DoGetFBConfigs): Add GLX_DRAWABLE_TYPE and EXT_tfp attributes.
(DoGetDrawableAttributes): Remove Y_INVERTED.
2006-04-08 David Reveman <davidr@novell.com>
* hw/xgl/xglsync.c (xglSyncSurface): Add very useful optimization

24
GL/glx/glxcmds.c
View file

@ -1065,10 +1065,18 @@ __glXCreateARGBConfig(__GLXscreen *screen)
modes->depthBits = 0;
modes->haveStencilBuffer = FALSE;
modes->stencilBits = 0;
modes->bindToTextureRgb = FALSE;
modes->bindToTextureRgba = TRUE;
modes->bindToMipmapTexture = TRUE;
modes->bindToTextureTargets =
GLX_TEXTURE_1D_BIT_EXT | GLX_TEXTURE_2D_BIT_EXT |
GLX_TEXTURE_RECTANGLE_BIT_EXT;
modes->yInverted = FALSE;
}
#define __GLX_TOTAL_FBCONFIG_ATTRIBS (28)
#define __GLX_TOTAL_FBCONFIG_ATTRIBS (34)
#define __GLX_FBCONFIG_ATTRIBS_LENGTH (__GLX_TOTAL_FBCONFIG_ATTRIBS * 2)
/**
* Send the set of GLXFBConfigs to the client. There is not currently
@ -1128,6 +1136,7 @@ int DoGetFBConfigs(__GLXclientState *cl, unsigned screen, GLboolean do_swap)
WRITE_PAIR( GLX_VISUAL_ID, modes->visualID );
WRITE_PAIR( GLX_FBCONFIG_ID, modes->visualID );
WRITE_PAIR( GLX_DRAWABLE_TYPE, modes->drawableType );
WRITE_PAIR( GLX_X_RENDERABLE, GL_TRUE );
WRITE_PAIR( GLX_RGBA, modes->rgbMode );
@ -1161,6 +1170,13 @@ int DoGetFBConfigs(__GLXclientState *cl, unsigned screen, GLboolean do_swap)
WRITE_PAIR( GLX_TRANSPARENT_ALPHA_VALUE, modes->transparentAlpha );
WRITE_PAIR( GLX_TRANSPARENT_INDEX_VALUE, modes->transparentIndex );
WRITE_PAIR( GLX_SWAP_METHOD_OML, modes->swapMethod );
WRITE_PAIR( GLX_BIND_TO_TEXTURE_RGB_EXT, modes->bindToTextureRgb );
WRITE_PAIR( GLX_BIND_TO_TEXTURE_RGBA_EXT, modes->bindToTextureRgba );
WRITE_PAIR( GLX_BIND_TO_MIPMAP_TEXTURE_EXT,
modes->bindToMipmapTexture );
WRITE_PAIR( GLX_BIND_TO_TEXTURE_TARGETS_EXT,
modes->bindToTextureTargets );
WRITE_PAIR( GLX_Y_INVERTED_EXT, modes->yInverted );
if ( do_swap ) {
__GLX_SWAP_INT_ARRAY(buf, __GLX_FBCONFIG_ATTRIBS_LENGTH);
@ -1646,7 +1662,7 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId)
__GLXpixmap *glxPixmap;
__GLXscreen *glxScreen;
xGLXGetDrawableAttributesReply reply;
CARD32 attributes[4];
CARD32 attributes[2];
int numAttribs;
glxPixmap = (__GLXpixmap *)LookupIDByType(drawId, __glXPixmapRes);
@ -1655,7 +1671,7 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId)
return __glXBadPixmap;
}
numAttribs = 2;
numAttribs = 1;
reply.length = numAttribs << 1;
reply.type = X_Reply;
reply.sequenceNumber = client->sequence;
@ -1663,8 +1679,6 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId)
attributes[0] = GLX_TEXTURE_TARGET_EXT;
attributes[1] = GLX_NO_TEXTURE_EXT;
attributes[2] = GLX_Y_INVERTED_EXT;
attributes[3] = GL_FALSE;
glxScreen = glxPixmap->pGlxScreen;
if (glxScreen->textureFromPixmap)

9
GL/glx/glxserver.h
View file

@ -69,7 +69,14 @@
#define GLX_TEXTURE_RECTANGLE_EXT 0x6003
#define GLX_NO_TEXTURE_EXT 0x6004
#define GLX_FRONT_LEFT_EXT 0x6005
#define GLX_Y_INVERTED_EXT 0x6006
#define GLX_TEXTURE_FORMAT_EXT 0x6006
#define GLX_TEXTURE_FORMAT_RGB_EXT 0x6007
#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x6008
#define GLX_Y_INVERTED_EXT 0x6009
#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x600A
#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x600B
#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x600C
#define GLX_MIPMAP_TEXTURE_EXT 0x600D
#endif
/* For glxscreens.h */

7
GL/glx/glxvisuals.c
View file

@ -361,9 +361,16 @@ static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
modes->blueBits + modes->alphaBits)
: rootDepth;
modes->bindToTextureRgb = (is_rgb) ? GL_TRUE : GL_FALSE;
modes->bindToTextureRgba = GL_FALSE;
#ifdef COMPOSITE
if (pVisual[i].nplanes == 32)
{
modes->bindToTextureRgb = GL_FALSE;
modes->bindToTextureRgba = (is_rgb) ? GL_TRUE : GL_FALSE;
modes->visualRating = GLX_NON_CONFORMANT_CONFIG;
}
#endif
}