diff options
| author | idr <idr> | 2004-06-11 23:17:28 +0000 |
|---|---|---|
| committer | idr <idr> | 2004-06-11 23:17:28 +0000 |
| commit | 4300f12ddcbfa0847f32ea6552a6d8089cadc781 (patch) | |
| tree | 82227e227de2c7695af6822ffe88535c42c516bc | |
| parent | c9254615bf9a774410118ab6460723ea652ccc4c (diff) | |
Warning clean-ups.trunk-20040613
| -rw-r--r-- | xc/lib/GL/glx/glxclient.h | 4 | ||||
| -rw-r--r-- | xc/lib/GL/glx/single2.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xc/lib/GL/glx/glxclient.h b/xc/lib/GL/glx/glxclient.h index e0ae017c7..e58ac94d3 100644 --- a/xc/lib/GL/glx/glxclient.h +++ b/xc/lib/GL/glx/glxclient.h @@ -815,8 +815,8 @@ extern void _XSend(Display*, const void*, long); extern void __glXInitializeVisualConfigFromTags( __GLcontextModes *config, int count, const INT32 *bp, Bool tagged_only, Bool fbconfig_style_tags ); -extern char *__glXInternalQueryServerString( Display *dpy, int opcode, - int screen, int name ); +extern char * __glXGetStringFromServer( Display * dpy, int opcode, + CARD32 glxCode, CARD32 for_whom, CARD32 name ); extern char *__glXstrdup(const char *str); diff --git a/xc/lib/GL/glx/single2.c b/xc/lib/GL/glx/single2.c index 8316d851b..dbc53aecc 100644 --- a/xc/lib/GL/glx/single2.c +++ b/xc/lib/GL/glx/single2.c @@ -870,8 +870,8 @@ version_from_string( const char * ver, const GLubyte *glGetString(GLenum name) { - __GLX_SINGLE_DECLARE_VARIABLES(); - xGLXSingleReply reply; + __GLXcontext *gc = __glXGetCurrentContext(); + Display *dpy = gc->currentDpy; GLubyte *s = NULL; if (!dpy) return 0; @@ -902,7 +902,7 @@ const GLubyte *glGetString(GLenum name) */ (void) __glXFlushRenderBuffer( gc, gc->pc ); - s = __glXGetStringFromServer( dpy, gc->majorOpcode, + s = (GLubyte *) __glXGetStringFromServer( dpy, gc->majorOpcode, X_GLsop_GetString, gc->currentContextTag, name ); if (!s) { |