summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300/r300_state.c
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2010-04-11 10:15:12 +0200
committerMarek Olšák <maraeo@gmail.com>2010-04-11 19:29:31 +0200
commit6eae8e4482b6d5e3d46e10473b05f16381736a5a (patch)
tree93d97efabee49a97a9eb8d1f1ee43bac8abcce6a /src/gallium/drivers/r300/r300_state.c
parent69019afa67d66cf3e5d2b4d5b286bf2ac1bd87af (diff)
r300g: use a dummy replacement vertex shader if the shader compilation fails
Diffstat (limited to 'src/gallium/drivers/r300/r300_state.c')
-rw-r--r--src/gallium/drivers/r300/r300_state.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index 7a5db5ac61..51c47770fe 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -1290,10 +1290,13 @@ static void* r300_create_vs_state(struct pipe_context* pipe,
struct r300_context* r300 = r300_context(pipe);
struct r300_vertex_shader* vs = CALLOC_STRUCT(r300_vertex_shader);
- r300_vertex_shader_common_init(vs, shader);
+
+ /* Copy state directly into shader. */
+ vs->state = *shader;
+ vs->state.tokens = tgsi_dup_tokens(shader->tokens);
if (r300->screen->caps.has_tcl) {
- r300_translate_vertex_shader(r300, vs);
+ r300_translate_vertex_shader(r300, vs, vs->state.tokens);
} else {
vs->draw_vs = draw_create_vertex_shader(r300->draw, shader);
}