diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-30 20:51:05 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-30 20:51:05 +0000 |
| commit | 70a13fe295183aeea369adcb94f2d67e69fab387 (patch) | |
| tree | d707644ab424d0517a879b9784a543a899e1ae20 /xorg-server/glx/glxdriswrast.c | |
| parent | 9b51ee5bcf948185cfcba0600b3da2d241339174 (diff) | |
| parent | 140242b0d4aed1d595d6565d088d9567c456d6b4 (diff) | |
| download | vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.tar.gz vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.tar.bz2 vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/glx/glxdriswrast.c')
| -rw-r--r-- | xorg-server/glx/glxdriswrast.c | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/xorg-server/glx/glxdriswrast.c b/xorg-server/glx/glxdriswrast.c index 59a202b16..519b136e4 100644 --- a/xorg-server/glx/glxdriswrast.c +++ b/xorg-server/glx/glxdriswrast.c @@ -74,7 +74,7 @@ struct __GLXDRIscreen { };
struct __GLXDRIcontext {
- struct glx_context base;
+ __GLXcontext base;
__DRIcontext *driContext;
};
@@ -127,7 +127,7 @@ __glXDRIdrawableCopySubBuffer(__GLXdrawable *basePrivate, }
static void
-__glXDRIcontextDestroy(struct glx_context *baseContext)
+__glXDRIcontextDestroy(__GLXcontext *baseContext)
{
__GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
__GLXDRIscreen *screen = (__GLXDRIscreen *) context->base.pGlxScreen;
@@ -138,7 +138,7 @@ __glXDRIcontextDestroy(struct glx_context *baseContext) }
static int
-__glXDRIcontextMakeCurrent(struct glx_context *baseContext)
+__glXDRIcontextMakeCurrent(__GLXcontext *baseContext)
{
__GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
__GLXDRIdrawable *draw = (__GLXDRIdrawable *) baseContext->drawPriv;
@@ -151,7 +151,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;
@@ -160,7 +160,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;
@@ -171,23 +171,10 @@ __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);
-}
-
#ifdef __DRI_TEX_BUFFER
static int
-__glXDRIbindTexImage(struct glx_context *baseContext,
+__glXDRIbindTexImage(__GLXcontext *baseContext,
int buffer,
__GLXdrawable *glxPixmap)
{
@@ -214,7 +201,7 @@ __glXDRIbindTexImage(struct glx_context *baseContext, }
static int
-__glXDRIreleaseTexImage(struct glx_context *baseContext,
+__glXDRIreleaseTexImage(__GLXcontext *baseContext,
int buffer,
__GLXdrawable *pixmap)
{
@@ -225,7 +212,7 @@ __glXDRIreleaseTexImage(struct glx_context *baseContext, #else
static int
-__glXDRIbindTexImage(struct glx_context *baseContext,
+__glXDRIbindTexImage(__GLXcontext *baseContext,
int buffer,
__GLXdrawable *glxPixmap)
{
@@ -233,7 +220,7 @@ __glXDRIbindTexImage(struct glx_context *baseContext, }
static int
-__glXDRIreleaseTexImage(struct glx_context *baseContext,
+__glXDRIreleaseTexImage(__GLXcontext *baseContext,
int buffer,
__GLXdrawable *pixmap)
{
@@ -265,10 +252,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;
@@ -290,7 +277,6 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen, context->base.makeCurrent = __glXDRIcontextMakeCurrent;
context->base.loseCurrent = __glXDRIcontextLoseCurrent;
context->base.copy = __glXDRIcontextCopy;
- context->base.forceCurrent = __glXDRIcontextForceCurrent;
context->base.textureFromPixmap = &__glXDRItextureFromPixmap;
context->driContext =
|