diff options
| author | Brian Paul <[email protected]> | 2012-04-20 07:58:59 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-05-01 11:39:34 -0600 |
| commit | 264b584294dc1c00c53f6a0622b7e6e55e8dce37 (patch) | |
| tree | f6a2817c5ce685c351a8157c83e45bb3b0317b81 | |
| parent | 47941bfaea6e8a60e2c31f7a2c8c233f2a10ecb1 (diff) | |
nouveau: use _mesa_is_winsys/user_fbo() helpers
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_context.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_driver.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_screen.c | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c index 48457675fc8..2625b76d14f 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_context.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c @@ -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); diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.c b/src/mesa/drivers/dri/nouveau/nouveau_driver.c index 7222f68b439..69e5cac426a 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_driver.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.c @@ -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; diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c index 7e51b94a2ff..2a15c08c679 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c @@ -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" |