diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-01 17:52:55 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-01 17:52:55 +0000 |
| commit | a7f914ef9256ee2d287e77384c01181734fd3df2 (patch) | |
| tree | 720e1f49b7a2aaab8a62271860d3eb78624f4939 /xorg-server/glx/glxdri.c | |
| parent | 6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03 (diff) | |
| download | vcxsrv-a7f914ef9256ee2d287e77384c01181734fd3df2.tar.gz vcxsrv-a7f914ef9256ee2d287e77384c01181734fd3df2.tar.bz2 vcxsrv-a7f914ef9256ee2d287e77384c01181734fd3df2.zip | |
Synchronised files between glx and mesalib
Diffstat (limited to 'xorg-server/glx/glxdri.c')
| -rw-r--r-- | xorg-server/glx/glxdri.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c index 31721987f..faa0cb978 100644 --- a/xorg-server/glx/glxdri.c +++ b/xorg-server/glx/glxdri.c @@ -94,7 +94,7 @@ struct __GLXDRIscreen { };
struct __GLXDRIcontext {
- __GLXcontext base;
+ struct glx_context base;
__DRIcontext *driContext;
XID hwContextID;
};
@@ -287,7 +287,7 @@ __glXDRIdrawableCopySubBuffer(__GLXdrawable *basePrivate, }
static void
-__glXDRIcontextDestroy(__GLXcontext *baseContext)
+__glXDRIcontextDestroy(struct glx_context *baseContext)
{
__GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
__GLXDRIscreen *screen = (__GLXDRIscreen *) context->base.pGlxScreen;
@@ -305,7 +305,7 @@ __glXDRIcontextDestroy(__GLXcontext *baseContext) }
static int
-__glXDRIcontextMakeCurrent(__GLXcontext *baseContext)
+__glXDRIcontextMakeCurrent(struct glx_context *baseContext)
{
__GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
__GLXDRIscreen *screen = (__GLXDRIscreen *) context->base.pGlxScreen;
@@ -318,7 +318,7 @@ __glXDRIcontextMakeCurrent(__GLXcontext *baseContext) }
static int
-__glXDRIcontextLoseCurrent(__GLXcontext *baseContext)
+__glXDRIcontextLoseCurrent(struct glx_context *baseContext)
{
__GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
__GLXDRIscreen *screen = (__GLXDRIscreen *) context->base.pGlxScreen;
@@ -327,7 +327,7 @@ __glXDRIcontextLoseCurrent(__GLXcontext *baseContext) }
static int
-__glXDRIcontextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc,
+__glXDRIcontextCopy(struct glx_context *baseDst, struct glx_context *baseSrc,
unsigned long mask)
{
__GLXDRIcontext *dst = (__GLXDRIcontext *) baseDst;
@@ -339,7 +339,7 @@ __glXDRIcontextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, }
static int
-__glXDRIcontextForceCurrent(__GLXcontext *baseContext)
+__glXDRIcontextForceCurrent(struct glx_context *baseContext)
{
__GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
__GLXDRIdrawable *draw = (__GLXDRIdrawable *) baseContext->drawPriv;
@@ -397,7 +397,7 @@ testTexOffset(__GLXDRIscreen * const screen, PixmapPtr pPixmap) */
static int
-__glXDRIbindTexImage(__GLXcontext *baseContext,
+__glXDRIbindTexImage(struct glx_context *baseContext,
int buffer,
__GLXdrawable *glxPixmap)
{
@@ -580,7 +580,7 @@ nooverride: }
static int
-__glXDRIreleaseTexImage(__GLXcontext *baseContext,
+__glXDRIreleaseTexImage(struct glx_context *baseContext,
int buffer,
__GLXdrawable *pixmap)
{
@@ -612,10 +612,10 @@ __glXDRIscreenDestroy(__GLXscreen *baseScreen) free(screen);
}
-static __GLXcontext *
+static struct glx_context *
__glXDRIscreenCreateContext(__GLXscreen *baseScreen,
__GLXconfig *glxConfig,
- __GLXcontext *baseShareContext)
+ struct glx_context *baseShareContext)
{
__GLXDRIscreen *screen = (__GLXDRIscreen *) baseScreen;
__GLXDRIcontext *context, *shareContext;
|