aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/fbobject.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-17 16:10:59 +0200
committermarha <marha@users.sourceforge.net>2012-09-17 16:10:59 +0200
commite3c4aa34268f99562e66b43a7d9efcd16ca072e6 (patch)
tree8c827f3f78e2c2093734b68045f2a13045ca15d0 /mesalib/src/mesa/main/fbobject.c
parentb08ba56019b146786e1cde553c036dd0c4fd02e5 (diff)
downloadvcxsrv-e3c4aa34268f99562e66b43a7d9efcd16ca072e6.tar.gz
vcxsrv-e3c4aa34268f99562e66b43a7d9efcd16ca072e6.tar.bz2
vcxsrv-e3c4aa34268f99562e66b43a7d9efcd16ca072e6.zip
mesa xserver pixman git update 17 sep 2012
Diffstat (limited to 'mesalib/src/mesa/main/fbobject.c')
-rw-r--r--mesalib/src/mesa/main/fbobject.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index abc9d83a6..1736899cb 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -819,7 +819,6 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
}
}
-#if FEATURE_GL
if (_mesa_is_desktop_gl(ctx) && !ctx->Extensions.ARB_ES2_compatibility) {
/* Check that all DrawBuffers are present */
for (j = 0; j < ctx->Const.MaxDrawBuffers; j++) {
@@ -847,9 +846,6 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
}
}
}
-#else
- (void) j;
-#endif
if (numImages == 0) {
fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT;
@@ -1497,7 +1493,6 @@ renderbuffer_storage(GLenum target, GLenum internalFormat,
}
-#if FEATURE_OES_EGL_image
void GLAPIENTRY
_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
{
@@ -1528,7 +1523,6 @@ _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
ctx->Driver.EGLImageTargetRenderbufferStorage(ctx, rb, image);
}
-#endif
/**
@@ -1734,7 +1728,6 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
}
switch (target) {
-#if FEATURE_EXT_framebuffer_blit
case GL_DRAW_FRAMEBUFFER_EXT:
if (!ctx->Extensions.EXT_framebuffer_blit) {
_mesa_error(ctx, GL_INVALID_ENUM, "glBindFramebufferEXT(target)");
@@ -1751,7 +1744,6 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
bindDrawBuf = GL_FALSE;
bindReadBuf = GL_TRUE;
break;
-#endif
case GL_FRAMEBUFFER_EXT:
bindDrawBuf = GL_TRUE;
bindReadBuf = GL_TRUE;
@@ -2659,8 +2651,6 @@ _mesa_GenerateMipmapEXT(GLenum target)
}
-#if FEATURE_EXT_framebuffer_blit
-
static const struct gl_renderbuffer_attachment *
find_attachment(const struct gl_framebuffer *fb,
const struct gl_renderbuffer *rb)
@@ -3062,10 +3052,8 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
dstX0, dstY0, dstX1, dstY1,
mask, filter);
}
-#endif /* FEATURE_EXT_framebuffer_blit */
-#if FEATURE_ARB_geometry_shader4
void GLAPIENTRY
_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
GLuint texture, GLint level)
@@ -3086,7 +3074,6 @@ _mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,
"glFramebufferTextureFaceARB "
"not implemented!");
}
-#endif /* FEATURE_ARB_geometry_shader4 */
static void
invalidate_framebuffer_storage(GLenum target, GLsizei numAttachments,