i965/cs: Emit texture surfaces to enable CS sampling

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>

diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 41ba7696d405e5c6b5b5455d4c3f752ed0bde89d..0318a3fb229c8c01c9366948e25d95111b8fe007 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1517,7 +1517,7 @@ struct brw_context
 
    int num_atoms[BRW_NUM_PIPELINES];
    const struct brw_tracked_state render_atoms[60];
-   const struct brw_tracked_state compute_atoms[5];
+   const struct brw_tracked_state compute_atoms[6];
 
    /* If (INTEL_DEBUG & DEBUG_BATCH) */
    struct {

diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index 01c090014e4449027dba7356fa72d3c1cd13d574..14627d5231bda3cf036c3aa289cf692a37276dcb 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -260,6 +260,7 @@ static const struct brw_tracked_state *gen7_compute_atoms[] =
    &brw_cs_image_surfaces,
    &gen7_cs_push_constants,
    &brw_cs_abo_surfaces,
+   &brw_texture_surfaces,
    &brw_cs_state,
 };
 
@@ -351,6 +352,7 @@ static const struct brw_tracked_state *gen8_compute_atoms[] =
    &brw_cs_image_surfaces,
    &gen7_cs_push_constants,
    &brw_cs_abo_surfaces,
+   &brw_texture_surfaces,
    &brw_cs_state,
 };