aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glxcontext.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-12-01 17:52:55 +0000
committermarha <marha@users.sourceforge.net>2010-12-01 17:52:55 +0000
commita7f914ef9256ee2d287e77384c01181734fd3df2 (patch)
tree720e1f49b7a2aaab8a62271860d3eb78624f4939 /xorg-server/glx/glxcontext.h
parent6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03 (diff)
downloadvcxsrv-a7f914ef9256ee2d287e77384c01181734fd3df2.tar.gz
vcxsrv-a7f914ef9256ee2d287e77384c01181734fd3df2.tar.bz2
vcxsrv-a7f914ef9256ee2d287e77384c01181734fd3df2.zip
Synchronised files between glx and mesalib
Diffstat (limited to 'xorg-server/glx/glxcontext.h')
-rw-r--r--xorg-server/glx/glxcontext.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/xorg-server/glx/glxcontext.h b/xorg-server/glx/glxcontext.h
index 79bc083a8..da0fc18fb 100644
--- a/xorg-server/glx/glxcontext.h
+++ b/xorg-server/glx/glxcontext.h
@@ -37,25 +37,25 @@
typedef struct __GLXtextureFromPixmap __GLXtextureFromPixmap;
struct __GLXtextureFromPixmap {
- int (*bindTexImage) (__GLXcontext *baseContext,
+ int (*bindTexImage) (struct glx_context *baseContext,
int buffer,
__GLXdrawable *pixmap);
- int (*releaseTexImage) (__GLXcontext *baseContext,
+ int (*releaseTexImage) (struct glx_context *baseContext,
int buffer,
__GLXdrawable *pixmap);
};
-struct __GLXcontext {
- void (*destroy) (__GLXcontext *context);
- int (*makeCurrent) (__GLXcontext *context);
- int (*loseCurrent) (__GLXcontext *context);
- int (*copy) (__GLXcontext *dst,
- __GLXcontext *src,
+struct glx_context {
+ void (*destroy) (struct glx_context *context);
+ int (*makeCurrent) (struct glx_context *context);
+ int (*loseCurrent) (struct glx_context *context);
+ int (*copy) (struct glx_context *dst,
+ struct glx_context *src,
unsigned long mask);
- int (*forceCurrent) (__GLXcontext *context);
+ int (*forceCurrent) (struct glx_context *context);
- Bool (*wait) (__GLXcontext *context,
+ Bool (*wait) (struct glx_context *context,
__GLXclientState *cl,
int *error);
@@ -64,8 +64,8 @@ struct __GLXcontext {
/*
** list of context structs
*/
- __GLXcontext *last;
- __GLXcontext *next;
+ struct glx_context *last;
+ struct glx_context *next;
/*
** config struct for this context
@@ -128,6 +128,6 @@ struct __GLXcontext {
__GLXdrawable *readPriv;
};
-void __glXContextDestroy(__GLXcontext *context);
+void __glXContextDestroy(struct glx_context *context);
#endif /* !__GLX_context_h__ */