llvmpipe: remove some unneeded shader structure fields

This commit is contained in:
Brian Paul 2010-04-28 13:39:55 -06:00
parent ac6725b8f9
commit a7e2470843
2 changed files with 2 additions and 9 deletions

View File

@ -85,8 +85,6 @@ struct lp_fragment_shader_variant_key
struct lp_fragment_shader_variant
{
struct lp_fragment_shader *shader;
struct lp_fragment_shader_variant_key key;
LLVMValueRef function[2];
@ -109,8 +107,6 @@ struct lp_fragment_shader
struct tgsi_shader_info info;
struct lp_fragment_shader_variant *variants;
struct lp_fragment_shader_variant *current;
};

View File

@ -937,7 +937,6 @@ generate_variant(struct llvmpipe_context *lp,
if(!variant)
return NULL;
variant->shader = shader;
memcpy(&variant->key, key, sizeof *key);
generate_fragment(lp, shader, variant, 0);
@ -1166,8 +1165,6 @@ llvmpipe_update_fs(struct llvmpipe_context *lp)
LP_COUNT_ADD(nr_llvm_compiles, 2); /* emit vs. omit in/out test */
}
shader->current = variant;
/* TODO: put this in the variant */
/* TODO: most of these can be relaxed, in particular the colormask */
opaque = !key.blend.logicop_enable &&
@ -1181,7 +1178,7 @@ llvmpipe_update_fs(struct llvmpipe_context *lp)
? TRUE : FALSE;
lp_setup_set_fs_functions(lp->setup,
shader->current->jit_function[RAST_WHOLE],
shader->current->jit_function[RAST_EDGE_TEST],
variant->jit_function[RAST_WHOLE],
variant->jit_function[RAST_EDGE_TEST],
opaque);
}