projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: Move gallium's PIPE_FORMAT utils to /util/format/
[mesa.git]
/
src
/
gallium
/
drivers
/
r300
/
r300_blit.c
diff --git
a/src/gallium/drivers/r300/r300_blit.c
b/src/gallium/drivers/r300/r300_blit.c
index 01fccfbe7edf523d985e94d375e1cba6ac149eb2..33344982c1ea53e1dd983fa1065902e96b3a82be 100644
(file)
--- a/
src/gallium/drivers/r300/r300_blit.c
+++ b/
src/gallium/drivers/r300/r300_blit.c
@@
-25,7
+25,7
@@
#include "r300_texture.h"
#include "r300_reg.h"
#include "r300_texture.h"
#include "r300_reg.h"
-#include "util/u_format.h"
+#include "util/
format/
u_format.h"
#include "util/u_half.h"
#include "util/u_pack_color.h"
#include "util/u_surface.h"
#include "util/u_half.h"
#include "util/u_pack_color.h"
#include "util/u_surface.h"
@@
-366,7
+366,8
@@
static void r300_clear(struct pipe_context* pipe,
/* Clear using the blitter. */
r300_blitter_begin(r300, R300_CLEAR);
util_blitter_clear(r300->blitter, width, height, 1,
/* Clear using the blitter. */
r300_blitter_begin(r300, R300_CLEAR);
util_blitter_clear(r300->blitter, width, height, 1,
- buffers, color, depth, stencil);
+ buffers, color, depth, stencil,
+ util_framebuffer_get_num_samples(fb) > 1);
r300_blitter_end(r300);
} else if (r300->zmask_clear.dirty ||
r300->hiz_clear.dirty ||
r300_blitter_end(r300);
} else if (r300->zmask_clear.dirty ||
r300->hiz_clear.dirty ||
@@
-382,7
+383,7
@@
static void r300_clear(struct pipe_context* pipe,
r300_get_num_cs_end_dwords(r300);
/* Reserve CS space. */
r300_get_num_cs_end_dwords(r300);
/* Reserve CS space. */
- if (!r300->rws->cs_check_space(r300->cs, dwords)) {
+ if (!r300->rws->cs_check_space(r300->cs, dwords
, false
)) {
r300_flush(&r300->context, PIPE_FLUSH_ASYNC, NULL);
}
r300_flush(&r300->context, PIPE_FLUSH_ASYNC, NULL);
}