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

GLX: Implement support for TTM BO based TFP when available.

This commit is contained in:
Kristian Høgsberg 2008-02-14 22:20:56 -05:00
parent 879515b139
commit 0ffb6a3ad0
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
GL/glx/glxdri2.c
View File

@ -75,6 +75,7 @@ struct __GLXDRIscreen {
__DRIcopySubBufferExtension *copySubBuffer; __DRIcopySubBufferExtension *copySubBuffer;
__DRIswapControlExtension *swapControl; __DRIswapControlExtension *swapControl;
__DRItexBufferExtension *texBuffer;
unsigned char glx_enable_bits[__GLX_EXT_BYTES]; unsigned char glx_enable_bits[__GLX_EXT_BYTES];
}; };
@ -213,6 +214,55 @@ __glXDRIcontextForceCurrent(__GLXcontext *baseContext)
&read->driDrawable); &read->driDrawable);
} }
#ifdef __DRI_TEX_BUFFER
#define isPowerOfTwo(n) (((n) & ((n) - 1 )) == 0)
static int
__glXDRIbindTexImage(__GLXcontext *baseContext,
int buffer,
__GLXdrawable *glxPixmap)
{
ScreenPtr pScreen = glxPixmap->pDraw->pScreen;
__GLXDRIscreen * const screen = (__GLXDRIscreen *) glxGetScreen(pScreen);
PixmapPtr pixmap;
__GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
unsigned int flags;
int w, h, target;
if (screen->texBuffer == NULL)
return Success;
pixmap = (PixmapPtr) glxPixmap->pDraw;
w = pixmap->drawable.width;
h = pixmap->drawable.height;
if (!isPowerOfTwo(w) || !isPowerOfTwo(h))
target = GL_TEXTURE_RECTANGLE_ARB;
else
target = GL_TEXTURE_2D;
screen->texBuffer->setTexBuffer(&context->driContext,
target,
DRI2GetPixmapHandle(pixmap, &flags),
pixmap->drawable.depth,
pixmap->devKind,
h);
return Success;
}
static int
__glXDRIreleaseTexImage(__GLXcontext *baseContext,
int buffer,
__GLXdrawable *pixmap)
{
/* FIXME: Just unbind the texture? */
return Success;
}
#else
static int static int
__glXDRIbindTexImage(__GLXcontext *baseContext, __glXDRIbindTexImage(__GLXcontext *baseContext,
int buffer, int buffer,
@ -229,6 +279,8 @@ __glXDRIreleaseTexImage(__GLXcontext *baseContext,
return Success; return Success;
} }
#endif
static __GLXtextureFromPixmap __glXDRItextureFromPixmap = { static __GLXtextureFromPixmap __glXDRItextureFromPixmap = {
__glXDRIbindTexImage, __glXDRIbindTexImage,
__glXDRIreleaseTexImage __glXDRIreleaseTexImage
@ -434,6 +486,14 @@ initializeExtensions(__GLXDRIscreen *screen)
LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n"); LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");
} }
#endif #endif
#ifdef __DRI_TEX_BUFFER
if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) {
screen->texBuffer = (__DRItexBufferExtension *) extensions[i];
/* GLX_EXT_texture_from_pixmap is always enabled. */
LogMessage(X_INFO, "AIGLX: GLX_EXT_texture_from_pixmap backed by buffer objects\n");
}
#endif
/* Ignore unknown extensions */ /* Ignore unknown extensions */
} }
} }

8
hw/xfree86/dri2/dri2.c
View File

@ -348,6 +348,14 @@ DRI2Connect(ScreenPtr pScreen, int *fd, const char **driverName,
return TRUE; return TRUE;
} }
unsigned int
DRI2GetPixmapHandle(PixmapPtr pPixmap, unsigned int *flags)
{
DRI2ScreenPtr ds = DRI2GetScreen(pPixmap->drawable.pScreen);
return ds->getPixmapHandle(pPixmap, flags);
}
static void * static void *
DRI2SetupSAREA(ScreenPtr pScreen, size_t driverSareaSize) DRI2SetupSAREA(ScreenPtr pScreen, size_t driverSareaSize)
{ {

3
hw/xfree86/dri2/dri2.h
View File

@ -62,6 +62,9 @@ Bool DRI2Connect(ScreenPtr pScreen,
int *ddxPatch, int *ddxPatch,
unsigned int *sareaHandle); unsigned int *sareaHandle);
unsigned int DRI2GetPixmapHandle(PixmapPtr pPixmap,
unsigned int *flags);
void DRI2Lock(ScreenPtr pScreen); void DRI2Lock(ScreenPtr pScreen);
void DRI2Unlock(ScreenPtr pScreen); void DRI2Unlock(ScreenPtr pScreen);