KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "g3dvl: Preserve previously rendered components for MC output." 

This reverts commit b56daf71d2.

The bug is actually in softpipe's blend and writemask interaction.
This commit is contained in:
Younes Manton 2011-07-21 13:53:34 -04:00
parent 50e32fefb1
commit a87afba505
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/auxiliary/vl/vl_mc.c
View File

@ -591,7 +591,7 @@ vl_mc_set_surface(struct vl_mc_buffer *buffer, struct pipe_surface *surface)
}
static void
prepare_pipe_4_rendering(struct vl_mc_buffer *buffer, unsigned component, unsigned mask)
prepare_pipe_4_rendering(struct vl_mc_buffer *buffer, unsigned mask)
{
struct vl_mc *renderer;
@ -600,7 +600,7 @@ prepare_pipe_4_rendering(struct vl_mc_buffer *buffer, unsigned component, unsign
renderer = buffer->renderer;
renderer->pipe->bind_rasterizer_state(renderer->pipe, renderer->rs_state);
if (buffer->surface_cleared || component > 0)
if (buffer->surface_cleared)
renderer->pipe->bind_blend_state(renderer->pipe, renderer->blend_add[mask]);
else
renderer->pipe->bind_blend_state(renderer->pipe, renderer->blend_clear[mask]);
@ -616,7 +616,7 @@ vl_mc_render_ref(struct vl_mc_buffer *buffer, struct pipe_sampler_view *ref)
assert(buffer && ref);
prepare_pipe_4_rendering(buffer, 0, PIPE_MASK_R | PIPE_MASK_G | PIPE_MASK_B);
prepare_pipe_4_rendering(buffer, PIPE_MASK_R | PIPE_MASK_G | PIPE_MASK_B);
renderer = buffer->renderer;
@ -644,7 +644,7 @@ vl_mc_render_ycbcr(struct vl_mc_buffer *buffer, unsigned component, unsigned num
if (num_instances == 0)
return;
prepare_pipe_4_rendering(buffer, component, mask);
prepare_pipe_4_rendering(buffer, mask);
renderer = buffer->renderer;