llvmpipe: combine vertex/fragment sampler state into an array

This will allow code consolidation in the next patch.

Reviewed-by: José Fonseca <jfonseca@vmware.com>

1 files changed, 22 insertions, 22 deletions

diff --git a/src/gallium/drivers/llvmpipe/lp_state_sampler.c b/src/gallium/drivers/llvmpipe/lp_state_sampler.c
index df9fb89..1451538 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_sampler.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_sampler.c
@@ -74,18 +74,18 @@ llvmpipe_bind_sampler_states(struct pipe_context *pipe,
    assert(num <= PIPE_MAX_SAMPLERS);
 
    /* Check for no-op */
-   if (num == llvmpipe->num_samplers &&
-       !memcmp(llvmpipe->sampler, sampler, num * sizeof(void *)))
+   if (num == llvmpipe->num_samplers[PIPE_SHADER_FRAGMENT] &&
+       !memcmp(llvmpipe->samplers[PIPE_SHADER_FRAGMENT], sampler, num * sizeof(void *)))
       return;
 
    draw_flush(llvmpipe->draw);
 
    for (i = 0; i < num; ++i)
-      llvmpipe->sampler[i] = sampler[i];
+      llvmpipe->samplers[PIPE_SHADER_FRAGMENT][i] = sampler[i];
    for (i = num; i < PIPE_MAX_SAMPLERS; ++i)
-      llvmpipe->sampler[i] = NULL;
+      llvmpipe->samplers[PIPE_SHADER_FRAGMENT][i] = NULL;
 
-   llvmpipe->num_samplers = num;
+   llvmpipe->num_samplers[PIPE_SHADER_FRAGMENT] = num;
 
    llvmpipe->dirty |= LP_NEW_SAMPLER;
 }
@@ -102,22 +102,22 @@ llvmpipe_bind_vertex_sampler_states(struct pipe_context *pipe,
    assert(num_samplers <= PIPE_MAX_VERTEX_SAMPLERS);
 
    /* Check for no-op */
-   if (num_samplers == llvmpipe->num_vertex_samplers &&
-       !memcmp(llvmpipe->vertex_samplers, samplers, num_samplers * sizeof(void *)))
+   if (num_samplers == llvmpipe->num_samplers[PIPE_SHADER_VERTEX] &&
+       !memcmp(llvmpipe->samplers[PIPE_SHADER_VERTEX], samplers, num_samplers * sizeof(void *)))
       return;
 
    draw_flush(llvmpipe->draw);
 
    for (i = 0; i < num_samplers; ++i)
-      llvmpipe->vertex_samplers[i] = samplers[i];
+      llvmpipe->samplers[PIPE_SHADER_VERTEX][i] = samplers[i];
    for (i = num_samplers; i < PIPE_MAX_VERTEX_SAMPLERS; ++i)
-      llvmpipe->vertex_samplers[i] = NULL;
+      llvmpipe->samplers[PIPE_SHADER_VERTEX][i] = NULL;
 
-   llvmpipe->num_vertex_samplers = num_samplers;
+   llvmpipe->num_samplers[PIPE_SHADER_VERTEX] = num_samplers;
 
    draw_set_samplers(llvmpipe->draw,
-                     llvmpipe->vertex_samplers,
-                     llvmpipe->num_vertex_samplers);
+                     llvmpipe->samplers[PIPE_SHADER_VERTEX],
+                     llvmpipe->num_samplers[PIPE_SHADER_VERTEX]);
 
    llvmpipe->dirty |= LP_NEW_SAMPLER;
 }
@@ -141,8 +141,8 @@ llvmpipe_set_fragment_sampler_views(struct pipe_context *pipe,
    assert(num <= PIPE_MAX_SAMPLERS);
 
    /* Check for no-op */
-   if (num == llvmpipe->num_fragment_sampler_views &&
-       !memcmp(llvmpipe->fragment_sampler_views, views, num * sizeof(struct pipe_sampler_view *)))
+   if (num == llvmpipe->num_sampler_views[PIPE_SHADER_FRAGMENT] &&
+       !memcmp(llvmpipe->sampler_views[PIPE_SHADER_FRAGMENT], views, num * sizeof(struct pipe_sampler_view *)))
       return;
 
    draw_flush(llvmpipe->draw);
@@ -150,10 +150,10 @@ llvmpipe_set_fragment_sampler_views(struct pipe_context *pipe,
    for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
       struct pipe_sampler_view *view = i < num ? views[i] : NULL;
 
-      pipe_sampler_view_reference(&llvmpipe->fragment_sampler_views[i], view);
+      pipe_sampler_view_reference(&llvmpipe->sampler_views[PIPE_SHADER_FRAGMENT][i], view);
    }
 
-   llvmpipe->num_fragment_sampler_views = num;
+   llvmpipe->num_sampler_views[PIPE_SHADER_FRAGMENT] = num;
 
    llvmpipe->dirty |= LP_NEW_SAMPLER_VIEW;
 }
@@ -170,8 +170,8 @@ llvmpipe_set_vertex_sampler_views(struct pipe_context *pipe,
    assert(num <= PIPE_MAX_VERTEX_SAMPLERS);
 
    /* Check for no-op */
-   if (num == llvmpipe->num_vertex_sampler_views &&
-       !memcmp(llvmpipe->vertex_sampler_views, views, num * sizeof(struct pipe_sampler_view *))) {
+   if (num == llvmpipe->num_sampler_views[PIPE_SHADER_VERTEX] &&
+       !memcmp(llvmpipe->sampler_views[PIPE_SHADER_VERTEX], views, num * sizeof(struct pipe_sampler_view *))) {
       return;
    }
 
@@ -180,14 +180,14 @@ llvmpipe_set_vertex_sampler_views(struct pipe_context *pipe,
    for (i = 0; i < PIPE_MAX_VERTEX_SAMPLERS; i++) {
       struct pipe_sampler_view *view = i < num ? views[i] : NULL;
 
-      pipe_sampler_view_reference(&llvmpipe->vertex_sampler_views[i], view);
+      pipe_sampler_view_reference(&llvmpipe->sampler_views[PIPE_SHADER_VERTEX][i], view);
    }
 
-   llvmpipe->num_vertex_sampler_views = num;
+   llvmpipe->num_sampler_views[PIPE_SHADER_VERTEX] = num;
 
    draw_set_sampler_views(llvmpipe->draw,
-                          llvmpipe->vertex_sampler_views,
-                          llvmpipe->num_vertex_sampler_views);
+                          llvmpipe->sampler_views[PIPE_SHADER_VERTEX],
+                          llvmpipe->num_sampler_views[PIPE_SHADER_VERTEX]);
 
    llvmpipe->dirty |= LP_NEW_SAMPLER_VIEW;
 }