nouveau: use _mesa_is_winsys/user_fbo() helpers

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Brian Paul 2012-04-20 07:58:59 -06:00
parent 47941bfaea
commit 264b584294
3 changed files with 7 additions and 3 deletions

View file

@ -33,6 +33,7 @@
#include "main/dd.h"
#include "main/framebuffer.h"
#include "main/fbobject.h"
#include "main/light.h"
#include "main/state.h"
#include "main/version.h"
@ -396,11 +397,11 @@ nouveau_validate_framebuffer(struct gl_context *ctx)
__DRIdrawable *dri_draw = dri_ctx->driDrawablePriv;
__DRIdrawable *dri_read = dri_ctx->driReadablePriv;
if (ctx->DrawBuffer->Name == 0)
if (_mesa_is_winsys_fbo(ctx->DrawBuffer))
validate_framebuffer(dri_ctx, dri_draw,
&dri_ctx->dri2.draw_stamp);
if (ctx->ReadBuffer->Name == 0)
if (_mesa_is_winsys_fbo(ctx->ReadBuffer))
validate_framebuffer(dri_ctx, dri_read,
&dri_ctx->dri2.read_stamp);

View file

@ -25,6 +25,8 @@
*/
#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/fbobject.h"
#include "nouveau_driver.h"
#include "nouveau_context.h"
@ -61,7 +63,7 @@ nouveau_flush(struct gl_context *ctx)
PUSH_KICK(push);
if (ctx->DrawBuffer->Name == 0 &&
if (_mesa_is_winsys_fbo(ctx->DrawBuffer) &&
ctx->DrawBuffer->_ColorDrawBufferIndexes[0] == BUFFER_FRONT_LEFT) {
__DRIscreen *screen = nctx->screen->dri_screen;
__DRIdri2LoaderExtension *dri2 = screen->dri2.loader;

View file

@ -33,6 +33,7 @@
#include "nv20_driver.h"
#include "main/framebuffer.h"
#include "main/fbobject.h"
#include "main/renderbuffer.h"
#include "swrast/s_renderbuffer.h"