diff options
| author | Brian Paul <[email protected]> | 2008-08-08 13:06:54 -0600 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-09-21 22:13:57 -0700 |
| commit | 868c09a267f3c25591075f5a9e5d54535958632f (patch) | |
| tree | 553641bc7dff341371481daa3373f5115018977a /src/mesa/main | |
| parent | 8122ab2dfd0e158a4982e1bfeb1f7a6f185b69ee (diff) | |
mesa: fix some feature tests
(cherry picked from commit 74b14fe6ddbece8bc662aac4d3b2b18d8d853486)
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/context.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index f79b129a45a..d6205fc4536 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -120,9 +120,7 @@ #include "macros.h" #include "matrix.h" #include "multisample.h" -#if FEATURE_pixel_transfer #include "pixel.h" -#endif #include "pixelstore.h" #include "points.h" #include "polygon.h" @@ -1034,11 +1032,7 @@ init_attrib_groups(GLcontext *ctx) _mesa_init_lighting( ctx ); _mesa_init_matrix( ctx ); _mesa_init_multisample( ctx ); -#if FEATURE_pixel_transfer _mesa_init_pixel( ctx ); -#else - ctx->Pixel.ReadBuffer = ctx->Visual.doubleBufferMode ? GL_BACK : GL_FRONT; -#endif _mesa_init_pixelstore( ctx ); _mesa_init_point( ctx ); _mesa_init_polygon( ctx ); diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 680dc8eed0e..4c92d1fb5a8 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -508,6 +508,7 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb) } } +#ifndef FEATURE_OES_framebuffer_object /* Check that all DrawBuffers are present */ for (j = 0; j < ctx->Const.MaxDrawBuffers; j++) { if (fb->ColorDrawBuffer[j] != GL_NONE) { @@ -533,6 +534,7 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb) return; } } +#endif if (numImages == 0) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT; |