diff options
| author | Adam Jackson <ajax@redhat.com> | 2020-07-16 17:29:26 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-07-23 01:23:12 +0000 |
| commit | 45d159cb4102aac7eab095c6567707779518933b (patch) | |
| tree | e4f1c1a568d10809f3ab5dee250ca7aaa1db4706 /src/glx/glxcmds.c | |
| parent | ba22f014f9db1852e6336485de4b9936edc6106c (diff) | |
glx: Fix build and warnings with -Dglx=dri -Dglx-direct=false
Acked-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5958>
Diffstat (limited to 'src/glx/glxcmds.c')
| -rw-r--r-- | src/glx/glxcmds.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 8927976f587..8766b007d73 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -1731,7 +1731,9 @@ __glXSwapIntervalSGI(int interval) { xGLXVendorPrivateReq *req; struct glx_context *gc = __glXGetCurrentContext(); +#ifdef GLX_DIRECT_RENDERING struct glx_screen *psc; +#endif Display *dpy; CARD32 *interval_ptr; CARD8 opcode; @@ -1744,9 +1746,9 @@ __glXSwapIntervalSGI(int interval) return GLX_BAD_VALUE; } +#ifdef GLX_DIRECT_RENDERING psc = GetGLXScreenConfigs( gc->currentDpy, gc->screen); -#ifdef GLX_DIRECT_RENDERING if (gc->isDirect && psc && psc->driScreen && psc->driScreen->setSwapInterval) { __GLXDRIdrawable *pdraw = @@ -1846,32 +1848,26 @@ __glXGetSwapIntervalMESA(void) static int __glXGetVideoSyncSGI(unsigned int *count) { +#ifdef GLX_DIRECT_RENDERING int64_t ust, msc, sbc; int ret; struct glx_context *gc = __glXGetCurrentContext(); struct glx_screen *psc; -#ifdef GLX_DIRECT_RENDERING __GLXDRIdrawable *pdraw; -#endif if (gc == &dummyContext) return GLX_BAD_CONTEXT; -#ifdef GLX_DIRECT_RENDERING if (!gc->isDirect) return GLX_BAD_CONTEXT; -#endif psc = GetGLXScreenConfigs(gc->currentDpy, gc->screen); -#ifdef GLX_DIRECT_RENDERING pdraw = GetGLXDRIDrawable(gc->currentDpy, gc->currentDrawable); -#endif /* FIXME: Looking at the GLX_SGI_video_sync spec in the extension registry, * FIXME: there should be a GLX encoding for this call. I can find no * FIXME: documentation for the GLX encoding. */ -#ifdef GLX_DIRECT_RENDERING if (psc && psc->driScreen && psc->driScreen->getDrawableMSC) { ret = psc->driScreen->getDrawableMSC(psc, pdraw, &ust, &msc, &sbc); *count = (unsigned) msc; @@ -1886,12 +1882,12 @@ static int __glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count) { struct glx_context *gc = __glXGetCurrentContext(); - struct glx_screen *psc; #ifdef GLX_DIRECT_RENDERING + struct glx_screen *psc; __GLXDRIdrawable *pdraw; -#endif int64_t ust, msc, sbc; int ret; +#endif if (divisor <= 0 || remainder < 0) return GLX_BAD_VALUE; @@ -1902,14 +1898,10 @@ __glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count) #ifdef GLX_DIRECT_RENDERING if (!gc->isDirect) return GLX_BAD_CONTEXT; -#endif psc = GetGLXScreenConfigs( gc->currentDpy, gc->screen); -#ifdef GLX_DIRECT_RENDERING pdraw = GetGLXDRIDrawable(gc->currentDpy, gc->currentDrawable); -#endif -#ifdef GLX_DIRECT_RENDERING if (psc && psc->driScreen && psc->driScreen->waitForMSC) { ret = psc->driScreen->waitForMSC(pdraw, 0, divisor, remainder, &ust, &msc, &sbc); @@ -2048,11 +2040,11 @@ __glXGetSyncValuesOML(Display * dpy, GLXDrawable drawable, int64_t * ust, int64_t * msc, int64_t * sbc) { struct glx_display * const priv = __glXInitialize(dpy); - int ret; #ifdef GLX_DIRECT_RENDERING + int ret; __GLXDRIdrawable *pdraw; -#endif struct glx_screen *psc; +#endif if (!priv) return False; |