Ah you are correct, this is no longer needed in the push branch. We can
drop this one from the series as its a nop, please ignore thanks for
spotting it.
On 2016-03-22 02:43, Marek Olšák wrote:
Does this fix anything even? The blitter always binds something, thus
this should have no effect.
Marek
On Sat, Mar 19, 2016 at 7:41 AM, Edward O'Callaghan
<eocallag...@alterapraxis.com> wrote:
Signed-off-by: Edward O'Callaghan <eocallag...@alterapraxis.com>
---
src/gallium/auxiliary/util/u_blitter.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/gallium/auxiliary/util/u_blitter.c
b/src/gallium/auxiliary/util/u_blitter.c
index 43fbd8e..c4a32e8 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -1566,11 +1566,13 @@ void util_blitter_blit_generic(struct
blitter_context *blitter,
/* Initialize framebuffer state. */
fb_state.width = dst->width;
fb_state.height = dst->height;
- fb_state.nr_cbufs = blit_depth || blit_stencil ? 0 : 1;
fb_state.cbufs[0] = NULL;
fb_state.zsbuf = NULL;
if (blit_depth || blit_stencil) {
+ fb_state.nr_cbufs = 0;
+ fb_state.layers = 0;
+ fb_state.samples = 1;
pipe->bind_blend_state(pipe, ctx->blend[0][0]);
if (blit_depth && blit_stencil) {
@@ -1594,6 +1596,7 @@ void util_blitter_blit_generic(struct
blitter_context *blitter,
}
} else {
+ fb_state.nr_cbufs = 1;
unsigned colormask = mask & PIPE_MASK_RGBA;
pipe->bind_blend_state(pipe,
ctx->blend[colormask][alpha_blend]);
--
2.5.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
