summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-06-21 14:11:15 +0100
committerJosé Fonseca <jfonseca@vmware.com>2010-06-21 14:11:15 +0100
commit197636814e4e523b98d3e25d918d589ef61b8aca (patch)
tree2130aa40a8c292ac0e629b07d13b74623b9533c4
parentd82f6253331abf09ca714b844b1a9179ed8050b3 (diff)
llvmpipe: s/lpfs/shader/
-rw-r--r--src/gallium/drivers/llvmpipe/lp_state_fs.c8
-rw-r--r--src/gallium/drivers/llvmpipe/lp_state_fs.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index c3ecd77830b..bb9b82b2acc 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -938,7 +938,7 @@ generate_variant(struct llvmpipe_context *lp,
if(!variant)
return NULL;
- variant->lpfs = shader;
+ variant->shader = shader;
variant->list_item_global.base = variant;
variant->list_item_local.base = variant;
variant->no = shader->variants_created++;
@@ -1035,8 +1035,8 @@ remove_shader_variant(struct llvmpipe_context *lp,
if (gallivm_debug & GALLIVM_DEBUG_IR) {
debug_printf("llvmpipe: del fs #%u var #%u v created #%u v cached #%u v total cached #%u\n",
- variant->lpfs->no, variant->no, variant->lpfs->variants_created,
- variant->lpfs->variants_cached, lp->nr_fs_variants);
+ variant->shader->no, variant->no, variant->shader->variants_created,
+ variant->shader->variants_cached, lp->nr_fs_variants);
}
for (i = 0; i < Elements(variant->function); i++) {
if (variant->function[i]) {
@@ -1047,7 +1047,7 @@ remove_shader_variant(struct llvmpipe_context *lp,
}
}
remove_from_list(&variant->list_item_local);
- variant->lpfs->variants_cached--;
+ variant->shader->variants_cached--;
remove_from_list(&variant->list_item_global);
lp->nr_fs_variants--;
FREE(variant);
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.h b/src/gallium/drivers/llvmpipe/lp_state_fs.h
index 272c9269eae..593cd4de6be 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.h
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.h
@@ -73,7 +73,6 @@ struct lp_fs_variant_list_item
struct lp_fragment_shader_variant
{
struct lp_fragment_shader_variant_key key;
- struct lp_fragment_shader *lpfs;
boolean opaque;
@@ -82,6 +81,7 @@ struct lp_fragment_shader_variant
lp_jit_frag_func jit_function[2];
struct lp_fs_variant_list_item list_item_global, list_item_local;
+ struct lp_fragment_shader *shader;
/* For debugging/profiling purposes */
unsigned no;