diff options
Diffstat (limited to 'xorg-server/glx/glxdri.c')
| -rw-r--r-- | xorg-server/glx/glxdri.c | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c index 2c0406d70..bd04fcd13 100644 --- a/xorg-server/glx/glxdri.c +++ b/xorg-server/glx/glxdri.c @@ -94,7 +94,7 @@ struct __GLXDRIscreen { };
struct __GLXDRIcontext {
- struct glx_context base;
+ __GLXcontext base;
__DRIcontext *driContext;
XID hwContextID;
};
@@ -287,7 +287,7 @@ __glXDRIdrawableCopySubBuffer(__GLXdrawable *basePrivate, }
static void
-__glXDRIcontextDestroy(struct glx_context *baseContext)
+__glXDRIcontextDestroy(__GLXcontext *baseContext)
{
__GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
__GLXDRIscreen *screen = (__GLXDRIscreen *) context->base.pGlxScreen;
@@ -305,7 +305,7 @@ __glXDRIcontextDestroy(struct glx_context *baseContext) }
static int
-__glXDRIcontextMakeCurrent(struct glx_context *baseContext)
+__glXDRIcontextMakeCurrent(__GLXcontext *baseContext)
{
__GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
__GLXDRIscreen *screen = (__GLXDRIscreen *) context->base.pGlxScreen;
@@ -318,7 +318,7 @@ __glXDRIcontextMakeCurrent(struct glx_context *baseContext) }
static int
-__glXDRIcontextLoseCurrent(struct glx_context *baseContext)
+__glXDRIcontextLoseCurrent(__GLXcontext *baseContext)
{
__GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
__GLXDRIscreen *screen = (__GLXDRIscreen *) context->base.pGlxScreen;
@@ -327,7 +327,7 @@ __glXDRIcontextLoseCurrent(struct glx_context *baseContext) }
static int
-__glXDRIcontextCopy(struct glx_context *baseDst, struct glx_context *baseSrc,
+__glXDRIcontextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc,
unsigned long mask)
{
__GLXDRIcontext *dst = (__GLXDRIcontext *) baseDst;
@@ -338,19 +338,6 @@ __glXDRIcontextCopy(struct glx_context *baseDst, struct glx_context *baseSrc, src->driContext, mask);
}
-static int
-__glXDRIcontextForceCurrent(struct glx_context *baseContext)
-{
- __GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
- __GLXDRIdrawable *draw = (__GLXDRIdrawable *) baseContext->drawPriv;
- __GLXDRIdrawable *read = (__GLXDRIdrawable *) baseContext->readPriv;
- __GLXDRIscreen *screen = (__GLXDRIscreen *) context->base.pGlxScreen;
-
- return (*screen->core->bindContext)(context->driContext,
- draw->driDrawable,
- read->driDrawable);
-}
-
static void
glxFillAlphaChannel (CARD32 *pixels, CARD32 rowstride, int width, int height)
{
@@ -397,7 +384,7 @@ testTexOffset(__GLXDRIscreen * const screen, PixmapPtr pPixmap) */
static int
-__glXDRIbindTexImage(struct glx_context *baseContext,
+__glXDRIbindTexImage(__GLXcontext *baseContext,
int buffer,
__GLXdrawable *glxPixmap)
{
@@ -580,7 +567,7 @@ nooverride: }
static int
-__glXDRIreleaseTexImage(struct glx_context *baseContext,
+__glXDRIreleaseTexImage(__GLXcontext *baseContext,
int buffer,
__GLXdrawable *pixmap)
{
@@ -612,10 +599,10 @@ __glXDRIscreenDestroy(__GLXscreen *baseScreen) free(screen);
}
-static struct glx_context *
+static __GLXcontext *
__glXDRIscreenCreateContext(__GLXscreen *baseScreen,
__GLXconfig *glxConfig,
- struct glx_context *baseShareContext)
+ __GLXcontext *baseShareContext)
{
__GLXDRIscreen *screen = (__GLXDRIscreen *) baseScreen;
__GLXDRIcontext *context, *shareContext;
@@ -644,7 +631,6 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen, context->base.makeCurrent = __glXDRIcontextMakeCurrent;
context->base.loseCurrent = __glXDRIcontextLoseCurrent;
context->base.copy = __glXDRIcontextCopy;
- context->base.forceCurrent = __glXDRIcontextForceCurrent;
context->base.textureFromPixmap = &__glXDRItextureFromPixmap;
/* Find the requested X visual */
|