summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorBrian <brian@i915.localnet.net>2008-02-27 15:06:55 -0700
committerBrian <brian@i915.localnet.net>2008-02-27 15:11:57 -0700
commitc66ec5c7a2966df3e3456dfca3eb17c294b30dd5 (patch)
tree99bb7c3aa345b0b8d88e21ac53b6b7d7f7bd9dd0 /src/gallium
parentfb40c5a9c7dc91c03f80780e0a09be0cade98705 (diff)
gallium: remove uses_kill field from softpipe_shader
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/softpipe/sp_quad.c2
-rw-r--r--src/gallium/drivers/softpipe/sp_state.h2
-rw-r--r--src/gallium/drivers/softpipe/sp_state_fs.c3
3 files changed, 1 insertions, 6 deletions
diff --git a/src/gallium/drivers/softpipe/sp_quad.c b/src/gallium/drivers/softpipe/sp_quad.c
index 0aaf94021f..8603c1a367 100644
--- a/src/gallium/drivers/softpipe/sp_quad.c
+++ b/src/gallium/drivers/softpipe/sp_quad.c
@@ -60,7 +60,7 @@ sp_build_quad_pipeline(struct softpipe_context *sp)
sp->depth_stencil->depth.enabled &&
sp->framebuffer.zsbuf &&
!sp->depth_stencil->alpha.enabled &&
- !sp->fs->uses_kill &&
+ !sp->fs->info.uses_kill &&
!sp->fs->info.writes_z;
/* build up the pipeline in reverse order... */
diff --git a/src/gallium/drivers/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
index b1070e185a..895976467c 100644
--- a/src/gallium/drivers/softpipe/sp_state.h
+++ b/src/gallium/drivers/softpipe/sp_state.h
@@ -66,8 +66,6 @@ struct sp_fragment_shader {
struct tgsi_shader_info info;
- boolean uses_kill;
-
void (*prepare)( const struct sp_fragment_shader *shader,
struct tgsi_exec_machine *machine,
struct tgsi_sampler *samplers);
diff --git a/src/gallium/drivers/softpipe/sp_state_fs.c b/src/gallium/drivers/softpipe/sp_state_fs.c
index 2715dca0f0..eb641ed321 100644
--- a/src/gallium/drivers/softpipe/sp_state_fs.c
+++ b/src/gallium/drivers/softpipe/sp_state_fs.c
@@ -64,9 +64,6 @@ softpipe_create_fs_state(struct pipe_context *pipe,
/* get/save the summary info for this shader */
tgsi_scan_shader(templ->tokens, &state->info);
- /* convenience field */
- state->uses_kill = (state->info.opcode_count[TGSI_OPCODE_KIL] ||
- state->info.opcode_count[TGSI_OPCODE_KILP]);
return state;
}