projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r600
/
r700_clear.c
diff --git
a/src/mesa/drivers/dri/r600/r700_clear.c
b/src/mesa/drivers/dri/r600/r700_clear.c
index e84be3862217da6e18c37a74c8572a23978c0a1c..98bfdd0937ccd6e0362ed3908f7fbeb012a4fe31 100644
(file)
--- a/
src/mesa/drivers/dri/r600/r700_clear.c
+++ b/
src/mesa/drivers/dri/r600/r700_clear.c
@@
-31,6
+31,7
@@
#include "main/imports.h"
#include "main/mtypes.h"
#include "main/enums.h"
#include "main/imports.h"
#include "main/mtypes.h"
#include "main/enums.h"
+#include "swrast/swrast.h"
#include "radeon_lock.h"
#include "r600_context.h"
#include "radeon_lock.h"
#include "r600_context.h"
@@
-45,21
+46,21
@@
static GLboolean r700ClearFast(context_t *context, GLbitfield mask)
return GL_FALSE;
}
return GL_FALSE;
}
-#define R600_NEWPRIM( rmesa ) \
- do { \
- if ( rmesa->radeon.dma.flush ) \
- rmesa->radeon.dma.flush( rmesa->radeon.glCtx ); \
- } while (0)
-
void r700Clear(GLcontext * ctx, GLbitfield mask)
{
context_t *context = R700_CONTEXT(ctx);
void r700Clear(GLcontext * ctx, GLbitfield mask)
{
context_t *context = R700_CONTEXT(ctx);
- __DRIdrawable
Private
*dPriv = radeon_get_drawable(&context->radeon);
- const GLuint colorMask = *((GLuint *) & ctx->Color.ColorMask);
+ __DRIdrawable *dPriv = radeon_get_drawable(&context->radeon);
+ const GLuint colorMask = *((GLuint *) & ctx->Color.ColorMask
[0]
);
GLbitfield swrast_mask = 0, tri_mask = 0;
int i;
struct gl_framebuffer *fb = ctx->DrawBuffer;
GLbitfield swrast_mask = 0, tri_mask = 0;
int i;
struct gl_framebuffer *fb = ctx->DrawBuffer;
+ radeon_print(RADEON_RENDER, RADEON_VERBOSE, "%s %x\n", __func__, mask);
+
+ if (mask & (BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_FRONT_RIGHT)) {
+ context->radeon.front_buffer_dirty = GL_TRUE;
+ }
+
if( GL_TRUE == r700ClearFast(context, mask) )
{
return;
if( GL_TRUE == r700ClearFast(context, mask) )
{
return;
@@
-111,8
+112,7
@@
void r700Clear(GLcontext * ctx, GLbitfield mask)
}
if (swrast_mask) {
}
if (swrast_mask) {
- if (RADEON_DEBUG & DEBUG_FALLBACKS)
- fprintf(stderr, "%s: swrast clear, mask: %x\n",
+ radeon_print(RADEON_FALLBACKS, RADEON_IMPORTANT, "%s: swrast clear, mask: %x\n",
__FUNCTION__, swrast_mask);
_swrast_Clear(ctx, swrast_mask);
}
__FUNCTION__, swrast_mask);
_swrast_Clear(ctx, swrast_mask);
}