forked from pool/xorg-x11-server
82 lines
2.6 KiB
Diff
82 lines
2.6 KiB
Diff
|
From ce0cf92a76cb220a89b10b8f6b0a57c5cf69a97f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ian Romanick <ian.d.romanick@intel.com>
|
||
|
|
Date: Fri, 16 Dec 2011 14:42:51 -0800
|
||
|
|
Subject: [PATCH 10/11] glx: Make several functions available outside the glxcmds.c compilation unit
|
||
|
|
|
||
|
|
validGlxScreen, validGlxFBConfig, validGlxContext, and
|
||
|
|
__glXdirectContextCreate will soon be used by createcontext.c.
|
||
|
|
|
||
|
|
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
|
||
|
|
Reviewed-by: Dave Airlie <airlied@redhat.com>
|
||
|
|
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
|
||
|
|
---
|
||
|
|
glx/glxcmds.c | 8 ++++----
|
||
|
|
glx/glxcontext.h | 13 +++++++++++++
|
||
|
|
2 files changed, 17 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
|
||
|
|
index d9d2201..d483bbf 100644
|
||
|
|
--- a/glx/glxcmds.c
|
||
|
|
+++ b/glx/glxcmds.c
|
||
|
|
@@ -50,7 +50,7 @@
|
||
|
|
#include "indirect_table.h"
|
||
|
|
#include "indirect_util.h"
|
||
|
|
|
||
|
|
-static int
|
||
|
|
+_X_HIDDEN int
|
||
|
|
validGlxScreen(ClientPtr client, int screen, __GLXscreen ** pGlxScreen,
|
||
|
|
int *err)
|
||
|
|
{
|
||
|
|
@@ -67,7 +67,7 @@ validGlxScreen(ClientPtr client, int screen, __GLXscreen ** pGlxScreen,
|
||
|
|
return TRUE;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int
|
||
|
|
+_X_HIDDEN int
|
||
|
|
validGlxFBConfig(ClientPtr client, __GLXscreen * pGlxScreen, XID id,
|
||
|
|
__GLXconfig ** config, int *err)
|
||
|
|
{
|
||
|
|
@@ -131,7 +131,7 @@ validGlxFBConfigForWindow(ClientPtr client, __GLXconfig * config,
|
||
|
|
return TRUE;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int
|
||
|
|
+_X_HIDDEN int
|
||
|
|
validGlxContext(ClientPtr client, XID id, int access_mode,
|
||
|
|
__GLXcontext ** context, int *err)
|
||
|
|
{
|
||
|
|
@@ -200,7 +200,7 @@ __glXdirectContextDestroy(__GLXcontext * context)
|
||
|
|
free(context);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static __GLXcontext *
|
||
|
|
+_X_HIDDEN __GLXcontext *
|
||
|
|
__glXdirectContextCreate(__GLXscreen * screen,
|
||
|
|
__GLXconfig * modes, __GLXcontext * shareContext)
|
||
|
|
{
|
||
|
|
diff --git a/glx/glxcontext.h b/glx/glxcontext.h
|
||
|
|
index ef2c4db..b803a7f 100644
|
||
|
|
--- a/glx/glxcontext.h
|
||
|
|
+++ b/glx/glxcontext.h
|
||
|
|
@@ -121,4 +121,17 @@ struct __GLXcontext {
|
||
|
|
|
||
|
|
void __glXContextDestroy(__GLXcontext * context);
|
||
|
|
|
||
|
|
+extern int validGlxScreen(ClientPtr client, int screen,
|
||
|
|
+ __GLXscreen ** pGlxScreen, int *err);
|
||
|
|
+
|
||
|
|
+extern int validGlxFBConfig(ClientPtr client, __GLXscreen * pGlxScreen,
|
||
|
|
+ XID id, __GLXconfig ** config, int *err);
|
||
|
|
+
|
||
|
|
+extern int validGlxContext(ClientPtr client, XID id, int access_mode,
|
||
|
|
+ __GLXcontext ** context, int *err);
|
||
|
|
+
|
||
|
|
+extern __GLXcontext *__glXdirectContextCreate(__GLXscreen * screen,
|
||
|
|
+ __GLXconfig * modes,
|
||
|
|
+ __GLXcontext * shareContext);
|
||
|
|
+
|
||
|
|
#endif /* !__GLX_context_h__ */
|
||
|
|
--
|
||
|
|
1.7.3.4
|
||
|
|
|