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>
This commit is contained in:
parent
4ab1a2797b
commit
295d41fa2a
|
@ -170,8 +170,6 @@ __glXDRIcontextCopy(__GLXcontext * baseDst, __GLXcontext * baseSrc,
|
||||||
src->driContext, mask);
|
src->driContext, mask);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __DRI_TEX_BUFFER
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
__glXDRIbindTexImage(__GLXcontext * baseContext,
|
__glXDRIbindTexImage(__GLXcontext * baseContext,
|
||||||
int buffer, __GLXdrawable * glxPixmap)
|
int buffer, __GLXdrawable * glxPixmap)
|
||||||
|
@ -205,24 +203,6 @@ __glXDRIreleaseTexImage(__GLXcontext * baseContext,
|
||||||
return Success;
|
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 = {
|
static __GLXtextureFromPixmap __glXDRItextureFromPixmap = {
|
||||||
__glXDRIbindTexImage,
|
__glXDRIbindTexImage,
|
||||||
__glXDRIreleaseTexImage
|
__glXDRIreleaseTexImage
|
||||||
|
@ -407,20 +387,17 @@ initializeExtensions(__GLXDRIscreen * screen)
|
||||||
extensions = screen->core->getExtensions(screen->driScreen);
|
extensions = screen->core->getExtensions(screen->driScreen);
|
||||||
|
|
||||||
for (i = 0; extensions[i]; i++) {
|
for (i = 0; extensions[i]; i++) {
|
||||||
#ifdef __DRI_COPY_SUB_BUFFER
|
|
||||||
if (strcmp(extensions[i]->name, __DRI_COPY_SUB_BUFFER) == 0) {
|
if (strcmp(extensions[i]->name, __DRI_COPY_SUB_BUFFER) == 0) {
|
||||||
screen->copySubBuffer =
|
screen->copySubBuffer =
|
||||||
(const __DRIcopySubBufferExtension *) extensions[i];
|
(const __DRIcopySubBufferExtension *) extensions[i];
|
||||||
/* GLX_MESA_copy_sub_buffer is always enabled. */
|
/* GLX_MESA_copy_sub_buffer is always enabled. */
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __DRI_TEX_BUFFER
|
|
||||||
if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) {
|
if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) {
|
||||||
screen->texBuffer = (const __DRItexBufferExtension *) extensions[i];
|
screen->texBuffer = (const __DRItexBufferExtension *) extensions[i];
|
||||||
/* GLX_EXT_texture_from_pixmap is always enabled. */
|
/* GLX_EXT_texture_from_pixmap is always enabled. */
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
/* Ignore unknown extensions */
|
/* Ignore unknown extensions */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user