Mesa (master): llvmpipe: Move the opaque flag computation into the variant.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed May 12 16:27:29 UTC 2010
Module: Mesa
Branch: master
Commit: 10fdbb9298489e9dfb2ecec0662abe29da5b6239
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=10fdbb9298489e9dfb2ecec0662abe29da5b6239
Author: José Fonseca <jfonseca at vmware.com>
Date: Wed May 12 17:12:59 2010 +0100
llvmpipe: Move the opaque flag computation into the variant.
---
src/gallium/drivers/llvmpipe/lp_state.h | 2 ++
src/gallium/drivers/llvmpipe/lp_state_fs.c | 27 +++++++++++++--------------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_state.h b/src/gallium/drivers/llvmpipe/lp_state.h
index 848cb49..7377844 100644
--- a/src/gallium/drivers/llvmpipe/lp_state.h
+++ b/src/gallium/drivers/llvmpipe/lp_state.h
@@ -87,6 +87,8 @@ struct lp_fragment_shader_variant
{
struct lp_fragment_shader_variant_key key;
+ boolean opaque;
+
LLVMValueRef function[2];
lp_jit_frag_func jit_function[2];
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 09a680b..429aaab 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -965,6 +965,18 @@ generate_variant(struct llvmpipe_context *lp,
generate_fragment(lp, shader, variant, 0);
generate_fragment(lp, shader, variant, 1);
+ /* TODO: most of these can be relaxed, in particular the colormask */
+ variant->opaque =
+ !key->blend.logicop_enable &&
+ !key->blend.rt[0].blend_enable &&
+ key->blend.rt[0].colormask == 0xf &&
+ !key->stencil[0].enabled &&
+ !key->alpha.enabled &&
+ !key->depth.enabled &&
+ !key->scissor &&
+ !shader->info.uses_kill
+ ? TRUE : FALSE;
+
/* insert new variant into linked list */
variant->next = shader->variants;
shader->variants = variant;
@@ -1215,7 +1227,6 @@ llvmpipe_update_fs(struct llvmpipe_context *lp)
struct lp_fragment_shader *shader = lp->fs;
struct lp_fragment_shader_variant_key key;
struct lp_fragment_shader_variant *variant;
- boolean opaque;
make_variant_key(lp, shader, &key);
@@ -1240,22 +1251,10 @@ llvmpipe_update_fs(struct llvmpipe_context *lp)
LP_COUNT_ADD(nr_llvm_compiles, 2); /* emit vs. omit in/out test */
}
- /* TODO: put this in the variant */
- /* TODO: most of these can be relaxed, in particular the colormask */
- opaque = !key.blend.logicop_enable &&
- !key.blend.rt[0].blend_enable &&
- key.blend.rt[0].colormask == 0xf &&
- !key.stencil[0].enabled &&
- !key.alpha.enabled &&
- !key.depth.enabled &&
- !key.scissor &&
- !shader->info.uses_kill
- ? TRUE : FALSE;
-
lp_setup_set_fs_functions(lp->setup,
variant->jit_function[RAST_WHOLE],
variant->jit_function[RAST_EDGE_TEST],
- opaque);
+ variant->opaque);
}
More information about the mesa-commit
mailing list