diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-01-20 14:34:28 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-01-20 14:37:33 +0000 |
| commit | f0d8f5d377460bb7da82546e8304252312e97147 (patch) | |
| tree | bc9dbefdaebeac210b4a09d3daa2383fc8284581 | |
| parent | 0286ddbd67d3b2585ffa3deccb7eeb674cd7a3e0 (diff) | |
sna/gen3: Set bo to NULL for render_fill_one
It had to happen, I missed one! From fc9531fc2df.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/gen2_render.c | 1 | ||||
| -rw-r--r-- | src/sna/gen3_render.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c index 6981576e..d75a4122 100644 --- a/src/sna/gen2_render.c +++ b/src/sna/gen2_render.c @@ -2218,6 +2218,7 @@ gen2_render_composite_spans(struct sna *sna, else if (tmp->base.src.is_affine) tmp->prim_emit = gen2_emit_composite_spans_primitive_affine_source; } + tmp->base.mask.bo = NULL; tmp->base.floats_per_rect = 3*tmp->base.floats_per_vertex; tmp->box = gen2_render_composite_spans_box; diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c index ad42fc78..f749afb4 100644 --- a/src/sna/gen3_render.c +++ b/src/sna/gen3_render.c @@ -1979,6 +1979,7 @@ gen3_init_solid(struct sna_composite_channel *channel, uint32_t color) else if (color == 0xffffffff) channel->u.gen3.type = SHADER_WHITE; + channel->bo = NULL; channel->is_opaque = (color & 0xff000000) == 0xff000000; channel->is_affine = 1; channel->alpha_fixup = 0; @@ -4321,6 +4322,7 @@ gen3_render_fill_one(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo, gen3_init_solid(&tmp.src, sna_rgba_for_color(color, dst->drawable.depth)); + tmp.mask.bo = NULL; tmp.mask.u.gen3.type = SHADER_NONE; tmp.u.gen3.num_constants = 0; |