summaryrefslogtreecommitdiff
path: root/src/gallium/state_trackers/vega/shader.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-01-25 14:46:17 -0700
committerBrian Paul <brianp@vmware.com>2010-01-25 14:46:17 -0700
commit9b22427911ad27efc1f36faee9462c6082d0417c (patch)
tree12e5a6c336e4ca2a71b754120dfcc183f09ae58c /src/gallium/state_trackers/vega/shader.c
parent7e7f8815fbfa21ab2397e673fa19c36603bc7a51 (diff)
parent6749310d3f60df70ad8f82db986871ab9496793b (diff)
Merge branch 'mesa_7_7_branch'
Conflicts: src/mesa/drivers/dri/intel/intel_screen.c src/mesa/drivers/dri/intel/intel_swapbuffers.c src/mesa/drivers/dri/r300/r300_emit.c src/mesa/drivers/dri/r300/r300_ioctl.c src/mesa/drivers/dri/r300/r300_tex.c src/mesa/drivers/dri/r300/r300_texstate.c
Diffstat (limited to 'src/gallium/state_trackers/vega/shader.c')
-rw-r--r--src/gallium/state_trackers/vega/shader.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/vega/shader.c b/src/gallium/state_trackers/vega/shader.c
index bd5ae79e55..8e59d53dc7 100644
--- a/src/gallium/state_trackers/vega/shader.c
+++ b/src/gallium/state_trackers/vega/shader.c
@@ -135,8 +135,8 @@ static VGint blend_bind_samplers(struct vg_context *ctx,
textures[2] = stfb->blend_texture;
if (!samplers[0] || !textures[0]) {
- samplers[1] = samplers[2];
- textures[1] = textures[2];
+ samplers[0] = samplers[2];
+ textures[0] = textures[2];
}
if (!samplers[1] || !textures[1]) {
samplers[1] = samplers[0];