diff options
| author | Eric Anholt <eric@anholt.net> | 2013-12-16 10:52:19 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-12-30 23:10:34 -0800 |
| commit | 295d41fa2aa97b74c1b9ffd7ef4ccf52f3e97dde (patch) | |
| tree | a65bbc6eb752cd3c7e0cf28a6106673b1912d493 /glx | |
| parent | 4ab1a2797ba366179f8a2e621334dd45df2a5a65 (diff) | |
glx: unifdef swrast dri_interface.h values from Mesa 7.1.
We can't remove all the ifdefs (__DRI_TEX_BUFFER_VERSION) because
configure.ac is only checking for that version of Mesa in the absence
of dri2.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'glx')
| -rw-r--r-- | glx/glxdriswrast.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c index cbc109a6d..6fa328831 100644 --- a/glx/glxdriswrast.c +++ b/glx/glxdriswrast.c @@ -170,8 +170,6 @@ __glXDRIcontextCopy(__GLXcontext * baseDst, __GLXcontext * baseSrc, src->driContext, mask); } -#ifdef __DRI_TEX_BUFFER - static int __glXDRIbindTexImage(__GLXcontext * baseContext, int buffer, __GLXdrawable * glxPixmap) @@ -205,24 +203,6 @@ __glXDRIreleaseTexImage(__GLXcontext * baseContext, return Success; } -#else - -static int -__glXDRIbindTexImage(__GLXcontext * baseContext, - int buffer, __GLXdrawable * glxPixmap) -{ - return Success; -} - -static int -__glXDRIreleaseTexImage(__GLXcontext * baseContext, - int buffer, __GLXdrawable * pixmap) -{ - return Success; -} - -#endif - static __GLXtextureFromPixmap __glXDRItextureFromPixmap = { __glXDRIbindTexImage, __glXDRIreleaseTexImage @@ -407,20 +387,17 @@ initializeExtensions(__GLXDRIscreen * screen) extensions = screen->core->getExtensions(screen->driScreen); for (i = 0; extensions[i]; i++) { -#ifdef __DRI_COPY_SUB_BUFFER if (strcmp(extensions[i]->name, __DRI_COPY_SUB_BUFFER) == 0) { screen->copySubBuffer = (const __DRIcopySubBufferExtension *) extensions[i]; /* GLX_MESA_copy_sub_buffer is always enabled. */ } -#endif -#ifdef __DRI_TEX_BUFFER if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) { screen->texBuffer = (const __DRItexBufferExtension *) extensions[i]; /* GLX_EXT_texture_from_pixmap is always enabled. */ } -#endif + /* Ignore unknown extensions */ } } |