aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/teximage.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-17 16:16:11 +0200
committermarha <marha@users.sourceforge.net>2012-09-17 16:16:11 +0200
commitc72f683c50e774b21967f0121245a286539fa555 (patch)
treefa5e86f04a33b8bcebf937d1966052ccf1fefbeb /mesalib/src/mesa/main/teximage.c
parent86fb7e4a298199b30bd16565569a9b3dfe7a1f11 (diff)
parente3c4aa34268f99562e66b43a7d9efcd16ca072e6 (diff)
downloadvcxsrv-c72f683c50e774b21967f0121245a286539fa555.tar.gz
vcxsrv-c72f683c50e774b21967f0121245a286539fa555.tar.bz2
vcxsrv-c72f683c50e774b21967f0121245a286539fa555.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
-rw-r--r--mesalib/src/mesa/main/teximage.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 02bd87ac6..da8fbcd32 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -311,7 +311,6 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )
}
}
-#if FEATURE_EXT_texture_sRGB
if (ctx->Extensions.EXT_texture_sRGB) {
switch (internalFormat) {
case GL_SRGB_EXT:
@@ -338,7 +337,6 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )
; /* fallthrough */
}
}
-#endif /* FEATURE_EXT_texture_sRGB */
if (ctx->Version >= 30 ||
ctx->Extensions.EXT_texture_integer) {
@@ -3134,7 +3132,6 @@ _mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalFormat,
}
-#if FEATURE_OES_EGL_image
void GLAPIENTRY
_mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
{
@@ -3189,7 +3186,6 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
_mesa_unlock_texture(ctx, texObj);
}
-#endif