gallium: remove uses_kill field from softpipe_shader

diff --git a/src/gallium/drivers/softpipe/sp_quad.c b/src/gallium/drivers/softpipe/sp_quad.c
index 0aaf94021f8759cf5996695f8238cd5921e4b256..8603c1a3677d984a89d4a290623f609b2f9eb966 100644 (file)
--- 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 b1070e185a2501967b5d62a5c4a0a69e0c355356..895976467c5a057417c8fc78d859808fba58066d 100644 (file)
--- 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 2715dca0f0956862139d12cd324e39e3960af67b..eb641ed321df964bedc555b93de8c153451cdbc6 100644 (file)
--- 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;
 }