diff options
author | José Fonseca <jfonseca@vmware.com> | 2010-01-06 13:52:22 +0000 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2010-01-06 13:52:22 +0000 |
commit | e32487b8a13a9efabb0359a9dde33e074e905e82 (patch) | |
tree | fbfdb33273371a5faec1de4ff97b803766eacf63 /src/gallium/drivers/svga/svga_state_vs.c | |
parent | aaf7ecfd816f82fef314f4f772cc53bc0ced553e (diff) | |
parent | 5b64d94390e4805e1634f0c8b5e3156e12b8b872 (diff) |
Merge remote branch 'origin/mesa_7_7_branch'
Conflicts:
configs/default
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/mesa/main/version.h
Diffstat (limited to 'src/gallium/drivers/svga/svga_state_vs.c')
-rw-r--r-- | src/gallium/drivers/svga/svga_state_vs.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/gallium/drivers/svga/svga_state_vs.c b/src/gallium/drivers/svga/svga_state_vs.c index 7e34c0a980..ae1e77e7d4 100644 --- a/src/gallium/drivers/svga/svga_state_vs.c +++ b/src/gallium/drivers/svga/svga_state_vs.c @@ -150,16 +150,13 @@ static int emit_hw_vs( struct svga_context *svga, } if (result != svga->state.hw_draw.vs) { - if (id != svga->state.hw_draw.shader_id[PIPE_SHADER_VERTEX]) { - ret = SVGA3D_SetShader(svga->swc, - SVGA3D_SHADERTYPE_VS, - id ); - if (ret) - return ret; - } + ret = SVGA3D_SetShader(svga->swc, + SVGA3D_SHADERTYPE_VS, + id ); + if (ret) + return ret; svga->dirty |= SVGA_NEW_VS_RESULT; - svga->state.hw_draw.shader_id[PIPE_SHADER_VERTEX] = id; svga->state.hw_draw.vs = result; } |