i965/gs: Add a case to brwNewProgram() for geometry shaders.

[mesa.git] / src / mesa / drivers / dri / i965 / gen7_sampler_state.c

diff --git a/src/mesa/drivers/dri/i965/gen7_sampler_state.c b/src/mesa/drivers/dri/i965/gen7_sampler_state.c
index 45bee7850c2dc6dc4aa64a394b702f2914524284..193b5b12752d9a7731befd574696746b5b6516fa 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen7_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_sampler_state.c
@@ -186,33 +186,27 @@ gen7_update_sampler_state(struct brw_context *brw, int unit, int ss_index,
 
 static void
 gen7_upload_sampler_state_table(struct brw_context *brw,
-                                uint32_t *sampler_count,
+                                struct gl_program *prog,
+                                uint32_t sampler_count,
                                 uint32_t *sst_offset,
                                 uint32_t *sdc_offset)
 {
    struct gl_context *ctx = &brw->ctx;
    struct gen7_sampler_state *samplers;
 
-   /* BRW_NEW_VERTEX_PROGRAM and BRW_NEW_FRAGMENT_PROGRAM */
-   struct gl_program *vs = (struct gl_program *) brw->vertex_program;
-   struct gl_program *fs = (struct gl_program *) brw->fragment_program;
+   GLbitfield SamplersUsed = prog->SamplersUsed;
 
-   GLbitfield SamplersUsed = vs->SamplersUsed | fs->SamplersUsed;
-
-   *sampler_count = _mesa_fls(SamplersUsed);
-
-   if (*sampler_count == 0)
+   if (sampler_count == 0)
       return;
 
    samplers = brw_state_batch(brw, AUB_TRACE_SAMPLER_STATE,
-                             *sampler_count * sizeof(*samplers),
+                             sampler_count * sizeof(*samplers),
                              32, sst_offset);
-   memset(samplers, 0, *sampler_count * sizeof(*samplers));
+   memset(samplers, 0, sampler_count * sizeof(*samplers));
 
-   for (unsigned s = 0; s < brw->wm.sampler_count; s++) {
+   for (unsigned s = 0; s < sampler_count; s++) {
       if (SamplersUsed & (1 << s)) {
-         const unsigned unit = (fs->SamplersUsed & (1 << s)) ?
-            fs->SamplerUnits[s] : vs->SamplerUnits[s];
+         const unsigned unit = prog->SamplerUnits[s];
          if (ctx->Texture.Unit[unit]._ReallyEnabled)
             gen7_update_sampler_state(brw, unit, s, &samplers[s],
                                       &sdc_offset[s]);
@@ -222,27 +216,8 @@ gen7_upload_sampler_state_table(struct brw_context *brw,
    brw->state.dirty.cache |= CACHE_NEW_SAMPLER;
 }
 
-static void
-gen7_upload_samplers(struct brw_context *brw)
+void
+gen7_init_vtable_sampler_functions(struct brw_context *brw)
 {
-   gen7_upload_sampler_state_table(brw,
-                                   &brw->wm.sampler_count,
-                                   &brw->wm.sampler_offset,
-                                   brw->wm.sdc_offset);
-
-   gen7_upload_sampler_state_table(brw,
-                                   &brw->vs.sampler_count,
-                                   &brw->vs.sampler_offset,
-                                   brw->vs.sdc_offset);
+   brw->vtbl.upload_sampler_state_table = gen7_upload_sampler_state_table;
 }
-
-const struct brw_tracked_state gen7_samplers = {
-   .dirty = {
-      .mesa = _NEW_TEXTURE,
-      .brw = BRW_NEW_BATCH |
-             BRW_NEW_VERTEX_PROGRAM |
-             BRW_NEW_FRAGMENT_PROGRAM,
-      .cache = 0
-   },
-   .emit = gen7_upload_samplers,
-};