summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-09-13 18:37:01 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2011-09-13 18:37:01 +0100
commit83961051789e418f6022096b1ed2302cb2f05e5b (patch)
tree5c4ebc01b65851fca459425a1b9d5e2d910d9882
parent34c03f22158d8fc1ec2fc56cb5e87f74e42d9a8f (diff)
sna/gen3: Reset the shader after playing video
Another piece of state we zap without marking as dirty when playing video. Reported-by: Paul Neumann <paul104x@yahoo.de> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40842 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/gen3_render.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index 429d504e..045178cf 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -1642,7 +1642,7 @@ gen3_render_reset(struct sna *sna)
state->last_blend = 0;
state->last_constants = 0;
state->last_sampler = 0;
- state->last_shader = 0;
+ state->last_shader = -1;
state->last_diffuse = 0xcc00ffee;
state->last_specular = 0xcc00ffee;
@@ -2812,6 +2812,7 @@ gen3_emit_video_state(struct sna *sna,
sna->render_state.gen3.last_blend = 0;
sna->render_state.gen3.last_sampler = 0;
sna->render_state.gen3.floats_per_vertex = 4;
+ sna->render_state.gen3.last_shader = -1;
if (!is_planar_fourcc(frame->id)) {
OUT_BATCH(_3DSTATE_PIXEL_SHADER_CONSTANTS | 4);