i965: Use new vtable entries for surface state updating functions.

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

diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
index 4741e7655eba316431e04b139a6753b74deb3ae8..b4730c4582c73d23bf01153182ef4930d19ecb5e 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
@@ -166,48 +166,6 @@ gen7_create_constant_surface(struct brw_context *brw,
                           I915_GEM_DOMAIN_SAMPLER, 0);
 }
 
-/**
- * Updates surface / buffer for fragment shader constant buffer, if
- * one is required.
- *
- * This consumes the state updates for the constant buffer, and produces
- * BRW_NEW_WM_SURFACES to get picked up by brw_prepare_wm_surfaces for
- * inclusion in the binding table.
- */
-static void upload_wm_constant_surface(struct brw_context *brw)
-{
-   GLuint surf = SURF_INDEX_FRAG_CONST_BUFFER;
-   struct brw_fragment_program *fp =
-      (struct brw_fragment_program *) brw->fragment_program;
-   const struct gl_program_parameter_list *params =
-      fp->program.Base.Parameters;
-
-   /* If there's no constant buffer, then no surface BO is needed to point at
-    * it.
-    */
-   if (brw->wm.const_bo == 0) {
-      if (brw->wm.surf_offset[surf]) {
-        brw->state.dirty.brw |= BRW_NEW_WM_SURFACES;
-        brw->wm.surf_offset[surf] = 0;
-      }
-      return;
-   }
-
-   gen7_create_constant_surface(brw, brw->wm.const_bo, params->NumParameters,
-                               &brw->wm.surf_offset[surf]);
-   brw->state.dirty.brw |= BRW_NEW_WM_SURFACES;
-}
-
-const struct brw_tracked_state gen7_wm_constant_surface = {
-   .dirty = {
-      .mesa = 0,
-      .brw = (BRW_NEW_WM_CONSTBUF |
-             BRW_NEW_BATCH),
-      .cache = 0
-   },
-   .emit = upload_wm_constant_surface,
-};
-
 static void
 gen7_update_null_renderbuffer_surface(struct brw_context *brw, unsigned unit)
 {
@@ -302,89 +260,14 @@ gen7_update_renderbuffer_surface(struct brw_context *brw,
                           I915_GEM_DOMAIN_RENDER);
 }
 
-static void
-prepare_wm_surfaces(struct brw_context *brw)
-{
-   struct gl_context *ctx = &brw->intel.ctx;
-   int i;
-   int nr_surfaces = 0;
-
-   if (ctx->DrawBuffer->_NumColorDrawBuffers >= 1) {
-      for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
-        nr_surfaces = SURF_INDEX_DRAW(i) + 1;
-      }
-   }
-
-   if (brw->wm.const_bo) {
-      nr_surfaces = SURF_INDEX_FRAG_CONST_BUFFER + 1;
-   }
-
-   for (i = 0; i < BRW_MAX_TEX_UNIT; i++) {
-      const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
-
-      if (texUnit->_ReallyEnabled) {
-        nr_surfaces = SURF_INDEX_TEXTURE(i) + 1;
-      }
-   }
-
-   /* Have to update this in our prepare, since the unit's prepare
-    * relies on it.
-    */
-   if (brw->wm.nr_surfaces != nr_surfaces) {
-      brw->wm.nr_surfaces = nr_surfaces;
-      brw->state.dirty.brw |= BRW_NEW_NR_WM_SURFACES;
-   }
-}
-
-/**
- * Constructs the set of surface state objects pointed to by the
- * binding table.
- */
-static void
-upload_wm_surfaces(struct brw_context *brw)
+void
+gen7_init_vtable_surface_functions(struct brw_context *brw)
 {
-   struct gl_context *ctx = &brw->intel.ctx;
-   GLuint i;
-
-   /* _NEW_BUFFERS | _NEW_COLOR */
-   /* Update surfaces for drawing buffers */
-   if (ctx->DrawBuffer->_NumColorDrawBuffers >= 1) {
-      for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
-        if (intel_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[i])) {
-           gen7_update_renderbuffer_surface(brw,
-              ctx->DrawBuffer->_ColorDrawBuffers[i], i);
-        } else {
-           gen7_update_null_renderbuffer_surface(brw, i);
-        }
-      }
-   } else {
-      gen7_update_null_renderbuffer_surface(brw, 0);
-   }
-
-   /* Update surfaces for textures */
-   for (i = 0; i < BRW_MAX_TEX_UNIT; i++) {
-      const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
-      const GLuint surf = SURF_INDEX_TEXTURE(i);
-
-      /* _NEW_TEXTURE */
-      if (texUnit->_ReallyEnabled) {
-        gen7_update_texture_surface(ctx, i);
-      } else {
-         brw->wm.surf_offset[surf] = 0;
-      }
-   }
+   struct intel_context *intel = &brw->intel;
 
-   brw->state.dirty.brw |= BRW_NEW_WM_SURFACES;
+   intel->vtbl.update_texture_surface = gen7_update_texture_surface;
+   intel->vtbl.update_renderbuffer_surface = gen7_update_renderbuffer_surface;
+   intel->vtbl.update_null_renderbuffer_surface =
+      gen7_update_null_renderbuffer_surface;
+   intel->vtbl.create_constant_surface = gen7_create_constant_surface;
 }
-
-const struct brw_tracked_state gen7_wm_surfaces = {
-   .dirty = {
-      .mesa = (_NEW_COLOR |
-               _NEW_TEXTURE |
-               _NEW_BUFFERS),
-      .brw = BRW_NEW_BATCH,
-      .cache = 0
-   },
-   .prepare = prepare_wm_surfaces,
-   .emit = upload_wm_surfaces,
-};