mesa: fix some feature tests

This commit is contained in:
Brian Paul 2008-08-08 13:06:54 -06:00
parent 966e199e40
commit 74b14fe6dd
2 changed files with 2 additions and 6 deletions

View File

@ -120,9 +120,7 @@
#include "macros.h" #include "macros.h"
#include "matrix.h" #include "matrix.h"
#include "multisample.h" #include "multisample.h"
#if FEATURE_pixel_transfer
#include "pixel.h" #include "pixel.h"
#endif
#include "pixelstore.h" #include "pixelstore.h"
#include "points.h" #include "points.h"
#include "polygon.h" #include "polygon.h"
@ -1035,11 +1033,7 @@ init_attrib_groups(GLcontext *ctx)
_mesa_init_lighting( ctx ); _mesa_init_lighting( ctx );
_mesa_init_matrix( ctx ); _mesa_init_matrix( ctx );
_mesa_init_multisample( ctx ); _mesa_init_multisample( ctx );
#if FEATURE_pixel_transfer
_mesa_init_pixel( ctx ); _mesa_init_pixel( ctx );
#else
ctx->Pixel.ReadBuffer = ctx->Visual.doubleBufferMode ? GL_BACK : GL_FRONT;
#endif
_mesa_init_pixelstore( ctx ); _mesa_init_pixelstore( ctx );
_mesa_init_point( ctx ); _mesa_init_point( ctx );
_mesa_init_polygon( ctx ); _mesa_init_polygon( ctx );

View File

@ -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 */ /* Check that all DrawBuffers are present */
for (j = 0; j < ctx->Const.MaxDrawBuffers; j++) { for (j = 0; j < ctx->Const.MaxDrawBuffers; j++) {
if (fb->ColorDrawBuffer[j] != GL_NONE) { if (fb->ColorDrawBuffer[j] != GL_NONE) {
@ -533,6 +534,7 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
return; return;
} }
} }
#endif
if (numImages == 0) { if (numImages == 0) {
fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT; fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT;