gallium: michel's patch to rework texture/sampler binding interface

Bind all the samplers/textures at once rather than piecemeal.
This is easier for drivers to understand.

5 files changed, 33 insertions, 25 deletions

diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
index 92263cb6881..1000f98ffc0 100644
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -120,10 +120,11 @@ update_samplers(struct st_context *st)
    const struct st_fragment_program *fs = st->fp;
    GLuint su;
 
+   st->state.num_samplers = 0;
+
    /* loop over sampler units (aka tex image units) */
    for (su = 0; su < st->ctx->Const.MaxTextureImageUnits; su++) {
       struct pipe_sampler_state sampler;
-      const struct cso_sampler *cso;
 
       memset(&sampler, 0, sizeof(sampler));
 
@@ -168,17 +169,16 @@ update_samplers(struct st_context *st)
                = st_compare_func_to_pipe(texobj->CompareFunc);
          }
 
+         st->state.num_samplers = su + 1;
+
          /* XXX more sampler state here */
       }
 
-      cso = st_cached_sampler_state(st, &sampler);
-
-      if (cso != st->state.sampler[su]) {
-         /* state has changed */
-         st->state.sampler[su] = cso;
-         st->pipe->bind_sampler_state(st->pipe, su, cso->data);
-      }
+      st->state.sampler[su] = st_cached_sampler_state(st, &sampler)->data;
    }
+
+   st->pipe->bind_sampler_states(st->pipe, st->state.num_samplers,
+                                 st->state.sampler);
 }
 
 
diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
index 697d2cdfb44..e53a897637c 100644
--- a/src/mesa/state_tracker/st_atom_texture.c
+++ b/src/mesa/state_tracker/st_atom_texture.c
@@ -37,6 +37,7 @@
 #include "st_texture.h"
 #include "st_cb_texture.h"
 #include "pipe/p_context.h"
+#include "pipe/p_inlines.h"
 
 
 /**
@@ -51,6 +52,8 @@ update_textures(struct st_context *st)
    struct gl_fragment_program *fprog = st->ctx->FragmentProgram._Current;
    GLuint unit;
 
+   st->state.num_textures = 0;
+
    for (unit = 0; unit < st->ctx->Const.MaxTextureCoordUnits; unit++) {
       const GLuint su = fprog->Base.SamplerUnits[unit];
       struct gl_texture_object *texObj = st->ctx->Texture.Unit[su]._Current;
@@ -62,6 +65,8 @@ update_textures(struct st_context *st)
 
          retval = st_finalize_texture(st->ctx, st->pipe, texObj, &flush);
          /* XXX retval indicates whether there's a texture border */
+
+         st->state.num_textures = unit + 1;
       }
 
       /* XXX: need to ensure that textures are unbound/removed from
@@ -70,18 +75,16 @@ update_textures(struct st_context *st)
        */
 
       pt = st_get_stobj_texture(stObj);
-
-      if (st->state.sampler_texture[unit] != pt) {
-         st->state.sampler_texture[unit] = pt;
-         st->pipe->set_sampler_texture(st->pipe, unit, pt);
-      }
+      pipe_texture_reference(&st->state.sampler_texture[unit], pt);
 
       if (stObj && stObj->dirtyData) {
          st->pipe->texture_update(st->pipe, pt);
          stObj->dirtyData = GL_FALSE;
       }
-
    }
+
+   st->pipe->set_sampler_textures(st->pipe, st->state.num_textures,
+                                  st->state.sampler_texture);
 }
 
 
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 65c9fda9cb6..dee4c4132a4 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -641,7 +641,6 @@ draw_textured_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
                    const GLfloat *color,
                    GLboolean invertTex)
 {
-   const GLuint unit = 0;
    struct pipe_context *pipe = ctx->st->pipe;
    GLfloat x0, y0, x1, y1;
    GLuint maxSize;
@@ -684,7 +683,7 @@ draw_textured_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
       sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST;
       sampler.normalized_coords = 1;
       cso = st_cached_sampler_state(ctx->st, &sampler);
-      pipe->bind_sampler_state(pipe, unit, cso->data);
+      pipe->bind_sampler_states(pipe, 1, (void**)&cso->data);
    }
 
    /* viewport state: viewport matching window dims */
@@ -705,7 +704,7 @@ draw_textured_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
 
    /* texture state: */
    {
-      pipe->set_sampler_texture(pipe, unit, pt);
+      pipe->set_sampler_textures(pipe, 1, &pt);
    }
 
    /* Compute window coords (y=0=bottom) with pixel zoom.
@@ -727,8 +726,10 @@ draw_textured_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
    pipe->bind_rasterizer_state(pipe, ctx->st->state.rasterizer->data);
    pipe->bind_fs_state(pipe, ctx->st->state.fs->data);
    pipe->bind_vs_state(pipe, ctx->st->state.vs->cso->data);
-   pipe->set_sampler_texture(pipe, unit, ctx->st->state.sampler_texture[unit]);
-   pipe->bind_sampler_state(pipe, unit, ctx->st->state.sampler[unit]->data);
+   pipe->set_sampler_textures(pipe, ctx->st->state.num_textures,
+                              ctx->st->state.sampler_texture);
+   pipe->bind_sampler_states(pipe, ctx->st->state.num_samplers,
+                             ctx->st->state.sampler);
    pipe->set_viewport_state(pipe, &ctx->st->state.viewport);
 }
 
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 1fbf9721e79..897a5109b7e 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -76,7 +76,7 @@ struct st_context
    struct {
       const struct cso_alpha_test      *alpha_test;
       const struct cso_blend           *blend;
-      const struct cso_sampler         *sampler[PIPE_MAX_SAMPLERS];
+      void                             *sampler[PIPE_MAX_SAMPLERS];
       const struct cso_depth_stencil_alpha   *depth_stencil;
       const struct cso_rasterizer      *rasterizer;
       const struct cso_fragment_shader *fs;
@@ -90,6 +90,9 @@ struct st_context
       struct pipe_poly_stipple poly_stipple;
       struct pipe_scissor_state scissor;
       struct pipe_viewport_state viewport;
+
+      GLuint num_samplers;
+      GLuint num_textures;
    } state;
 
    struct {
diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c
index 841d77abbc7..3723e26d45d 100644
--- a/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/src/mesa/state_tracker/st_gen_mipmap.c
@@ -284,7 +284,7 @@ st_render_mipmap(struct st_context *st,
        */
       sampler.min_lod = sampler.max_lod = srcLevel;
       sampler_cso = pipe->create_sampler_state(pipe, &sampler);
-      pipe->bind_sampler_state(pipe, 0, sampler_cso);
+      pipe->bind_sampler_states(pipe, 1, &sampler_cso);
 
       simple_viewport(pipe, pt->width[dstLevel], pt->height[dstLevel]);
 
@@ -293,7 +293,7 @@ st_render_mipmap(struct st_context *st,
        * the right mipmap level.
        */
       /*pt->first_level = srcLevel;*/
-      pipe->set_sampler_texture(pipe, 0, pt);
+      pipe->set_sampler_textures(pipe, 1, &pt);
 
       draw_quad(st->ctx);
 
@@ -310,9 +310,10 @@ st_render_mipmap(struct st_context *st,
       pipe->bind_fs_state(pipe, st->state.fs->data);
    if (st->state.vs)
       pipe->bind_vs_state(pipe, st->state.vs->cso->data);
-   if (st->state.sampler[0])
-      pipe->bind_sampler_state(pipe, 0, st->state.sampler[0]->data);
-   pipe->set_sampler_texture(pipe, 0, st->state.sampler_texture[0]);
+   pipe->bind_sampler_states(pipe, st->state.num_samplers,
+                             st->state.sampler);
+   pipe->set_sampler_textures(pipe, st->state.num_textures,
+                              st->state.sampler_texture);
    pipe->set_viewport_state(pipe, &st->state.viewport);
 
    return TRUE;