diff options
| author | Kristian Høgsberg <krh@hinata.boston.redhat.com> | 2007-05-15 15:17:30 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2007-10-10 18:57:57 -0400 |
| commit | ac3e838fa748c8c8a6ffc04d1ab13da71f75f103 (patch) | |
| tree | 3011280e28b9f15cf5d2a97abe588b46c4f9156c /src/glx/x11 | |
| parent | f616a263a25eda135800bea7d3a863c569b93e30 (diff) | |
Move the copySubBuffer extension over to the new mechanism.
Diffstat (limited to 'src/glx/x11')
| -rw-r--r-- | src/glx/x11/glxclient.h | 5 | ||||
| -rw-r--r-- | src/glx/x11/glxcmds.c | 6 | ||||
| -rw-r--r-- | src/glx/x11/glxext.c | 10 |
3 files changed, 17 insertions, 4 deletions
diff --git a/src/glx/x11/glxclient.h b/src/glx/x11/glxclient.h index 5697325175..2c73028239 100644 --- a/src/glx/x11/glxclient.h +++ b/src/glx/x11/glxclient.h @@ -476,6 +476,11 @@ struct __GLXscreenConfigsRec { __glxHashTable *drawHash; Display *dpy; int scr; + +#ifdef __DRI_COPY_SUB_BUFFER + __DRIcopySubBufferExtension *copySubBuffer; +#endif + #endif /** diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c index 6b8824d824..1bc5fff957 100644 --- a/src/glx/x11/glxcmds.c +++ b/src/glx/x11/glxcmds.c @@ -2498,13 +2498,13 @@ static void __glXCopySubBufferMESA(Display *dpy, GLXDrawable drawable, INT32 *x_ptr, *y_ptr, *w_ptr, *h_ptr; CARD8 opcode; -#ifdef GLX_DIRECT_RENDERING +#ifdef __DRI_COPY_SUB_BUFFER int screen; __DRIdrawable *pdraw = GetDRIDrawable( dpy, drawable, & screen ); if ( pdraw != NULL ) { __GLXscreenConfigs * const psc = GetGLXScreenConfigs( dpy, screen ); - if ( __glXExtensionBitIsEnabled( psc, MESA_copy_sub_buffer_bit ) ) { - (*pdraw->copySubBuffer)(pdraw, x, y, width, height); + if (psc->copySubBuffer != NULL) { + (*psc->copySubBuffer->copySubBuffer)(pdraw, x, y, width, height); } return; diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c index cb187717f1..d0a7a64445 100644 --- a/src/glx/x11/glxext.c +++ b/src/glx/x11/glxext.c @@ -1019,7 +1019,15 @@ static void queryExtensions(__GLXscreenConfigs *psc) extensions = psc->driScreen.getExtensions(&psc->driScreen); for (i = 0; extensions[i]; i++) { - /* Unknown extension, just ignore... */ +#ifdef __DRI_COPY_SUB_BUFFER + if (strcmp(extensions[i]->name, __DRI_COPY_SUB_BUFFER) == 0) { + psc->copySubBuffer = (__DRIcopySubBufferExtension *) extensions[i]; + __glXScrEnableExtension(&psc->driScreen, + "GLX_MESA_copy_sub_buffer"); + + } +#endif + /* Ignore unknown extensions */ } } |