llvmpipe: s/lpfs/shader/

diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index c3ecd77830b4d1d73c8011843fb568d2d74e223c..bb9b82b2accc6519a55b6ef92cb236a9b1d5d572 100644 (file)
--- 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 272c9269eaef3d55ff586ab69211c7a7a612b1fb..593cd4de6beefa5fdf2a1e82e600fc55578fe21a 100644 (file)
--- 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;