summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300/r300_state_derived.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:30 +0200
commit69019afa67d66cf3e5d2b4d5b286bf2ac1bd87af (patch)
tree437d663675d9c2ef38488b95938e0eb007bb6cf9 /src/gallium/drivers/r300/r300_state_derived.c
parentbd09fce27119548cb91cc2aa9ced6a7347aefc3a (diff)
r300g: use a dummy replacement fragment shader if the shader compilation fails
Better than killing an application.
Diffstat (limited to 'src/gallium/drivers/r300/r300_state_derived.c')
-rw-r--r--src/gallium/drivers/r300/r300_state_derived.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index 10e854dac9..1b4c2457d5 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -376,7 +376,7 @@ static void r300_update_derived_shader_state(struct r300_context* r300)
{
struct r300_vertex_shader* vs = r300->vs_state.state;
- r300_update_rs_block(r300, &vs->outputs, &r300->fs->inputs);
+ r300_update_rs_block(r300, &vs->outputs, &r300->fs->shader->inputs);
}
static boolean r300_dsa_writes_depth_stencil(struct r300_dsa_state* dsa)
@@ -437,7 +437,7 @@ static void r300_update_ztop(struct r300_context* r300)
/* ZS writes */
if (r300_dsa_writes_depth_stencil(r300->dsa_state.state) &&
(r300_dsa_alpha_test_enabled(r300->dsa_state.state) ||/* (1) */
- r300->fs->info.uses_kill)) { /* (2) */
+ r300->fs->shader->info.uses_kill)) { /* (2) */
ztop_state->z_buffer_top = R300_ZTOP_DISABLE;
} else if (r300_fragment_shader_writes_depth(r300->fs)) { /* (5) */
ztop_state->z_buffer_top = R300_ZTOP_DISABLE;