i965: Resolve GCC sign-compare warning.
[mesa.git] / src / mesa / drivers / dri / i965 / brw_sampler_state.c
index 12aea39dc74bc4195702db10ca18738fb4e59d11..2021bb3b460f570e9bacbbfff4a9fffa0e80e814 100644 (file)
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"
+#include "intel_batchbuffer.h"
 #include "intel_mipmap_tree.h"
 
 #include "main/macros.h"
 #include "main/samplerobj.h"
 
-uint32_t
+/**
+ * Emit a 3DSTATE_SAMPLER_STATE_POINTERS_{VS,HS,GS,DS,PS} packet.
+ */
+static void
+gen7_emit_sampler_state_pointers_xs(struct brw_context *brw,
+                                    struct brw_stage_state *stage_state)
+{
+   static const uint16_t packet_headers[] = {
+      [MESA_SHADER_VERTEX] = _3DSTATE_SAMPLER_STATE_POINTERS_VS,
+      [MESA_SHADER_GEOMETRY] = _3DSTATE_SAMPLER_STATE_POINTERS_GS,
+      [MESA_SHADER_FRAGMENT] = _3DSTATE_SAMPLER_STATE_POINTERS_PS,
+   };
+
+   /* Ivybridge requires a workaround flush before VS packets. */
+   if (brw->gen == 7 && !brw->is_haswell && !brw->is_baytrail &&
+       stage_state->stage == MESA_SHADER_VERTEX) {
+      gen7_emit_vs_workaround_flush(brw);
+   }
+
+   BEGIN_BATCH(2);
+   OUT_BATCH(packet_headers[stage_state->stage] << 16 | (2 - 2));
+   OUT_BATCH(stage_state->sampler_offset);
+   ADVANCE_BATCH();
+}
+
+/**
+ * Emit a SAMPLER_STATE structure, given all the fields.
+ */
+void
+brw_emit_sampler_state(struct brw_context *brw,
+                       uint32_t *ss,
+                       uint32_t batch_offset_for_sampler_state,
+                       unsigned min_filter,
+                       unsigned mag_filter,
+                       unsigned mip_filter,
+                       unsigned max_anisotropy,
+                       unsigned address_rounding,
+                       unsigned wrap_s,
+                       unsigned wrap_t,
+                       unsigned wrap_r,
+                       unsigned min_lod,
+                       unsigned max_lod,
+                       int lod_bias,
+                       unsigned base_level,
+                       unsigned shadow_function,
+                       bool non_normalized_coordinates,
+                       uint32_t border_color_offset)
+{
+   ss[0] = BRW_SAMPLER_LOD_PRECLAMP_ENABLE |
+           SET_FIELD(base_level, BRW_SAMPLER_BASE_MIPLEVEL) |
+           SET_FIELD(mip_filter, BRW_SAMPLER_MIP_FILTER) |
+           SET_FIELD(mag_filter, BRW_SAMPLER_MAG_FILTER) |
+           SET_FIELD(min_filter, BRW_SAMPLER_MIN_FILTER);
+
+   ss[2] = border_color_offset;
+   if (brw->gen < 6) {
+      ss[2] += brw->batch.bo->offset64; /* reloc */
+      drm_intel_bo_emit_reloc(brw->batch.bo,
+                              batch_offset_for_sampler_state + 8,
+                              brw->batch.bo, border_color_offset,
+                              I915_GEM_DOMAIN_SAMPLER, 0);
+   }
+
+   ss[3] = SET_FIELD(max_anisotropy, BRW_SAMPLER_MAX_ANISOTROPY) |
+           SET_FIELD(address_rounding, BRW_SAMPLER_ADDRESS_ROUNDING);
+
+   if (brw->gen >= 7) {
+      ss[0] |= SET_FIELD(lod_bias & 0x1fff, GEN7_SAMPLER_LOD_BIAS);
+
+      if (min_filter == BRW_MAPFILTER_ANISOTROPIC)
+         ss[0] |= GEN7_SAMPLER_EWA_ANISOTROPIC_ALGORITHM;
+
+      ss[1] = SET_FIELD(min_lod, GEN7_SAMPLER_MIN_LOD) |
+              SET_FIELD(max_lod, GEN7_SAMPLER_MAX_LOD) |
+              SET_FIELD(shadow_function, GEN7_SAMPLER_SHADOW_FUNCTION);
+
+      ss[3] |= SET_FIELD(wrap_s, BRW_SAMPLER_TCX_WRAP_MODE) |
+               SET_FIELD(wrap_t, BRW_SAMPLER_TCY_WRAP_MODE) |
+               SET_FIELD(wrap_r, BRW_SAMPLER_TCZ_WRAP_MODE);
+
+      if (non_normalized_coordinates)
+         ss[3] |= GEN7_SAMPLER_NON_NORMALIZED_COORDINATES;
+   } else {
+      ss[0] |= SET_FIELD(lod_bias & 0x7ff, GEN4_SAMPLER_LOD_BIAS) |
+               SET_FIELD(shadow_function, GEN4_SAMPLER_SHADOW_FUNCTION);
+
+      if (brw->gen == 6 && min_filter != mag_filter)
+         ss[0] |= GEN6_SAMPLER_MIN_MAG_NOT_EQUAL;
+
+      ss[1] = SET_FIELD(min_lod, GEN4_SAMPLER_MIN_LOD) |
+              SET_FIELD(max_lod, GEN4_SAMPLER_MAX_LOD) |
+              SET_FIELD(wrap_s, BRW_SAMPLER_TCX_WRAP_MODE) |
+              SET_FIELD(wrap_t, BRW_SAMPLER_TCY_WRAP_MODE) |
+              SET_FIELD(wrap_r, BRW_SAMPLER_TCZ_WRAP_MODE);
+
+      if (brw->gen >= 6 && non_normalized_coordinates)
+         ss[3] |= GEN6_SAMPLER_NON_NORMALIZED_COORDINATES;
+   }
+}
+
+static uint32_t
 translate_wrap_mode(struct brw_context *brw, GLenum wrap, bool using_nearest)
 {
    switch( wrap ) {
@@ -84,61 +185,68 @@ translate_wrap_mode(struct brw_context *brw, GLenum wrap, bool using_nearest)
    }
 }
 
+/**
+ * Return true if the given wrap mode requires the border color to exist.
+ */
+static bool
+wrap_mode_needs_border_color(unsigned wrap_mode)
+{
+   return wrap_mode == BRW_TEXCOORDMODE_CLAMP_BORDER ||
+          wrap_mode == GEN8_TEXCOORDMODE_HALF_BORDER;
+}
+
 /**
  * Upload SAMPLER_BORDER_COLOR_STATE.
  */
-void
+static void
 upload_default_color(struct brw_context *brw,
-                     struct gl_sampler_object *sampler,
-                     int unit,
+                     const struct gl_sampler_object *sampler,
+                     mesa_format format, GLenum base_format,
+                     bool is_integer_format,
                      uint32_t *sdc_offset)
 {
-   struct gl_context *ctx = &brw->ctx;
-   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-   struct gl_texture_object *texObj = texUnit->_Current;
-   struct gl_texture_image *firstImage = texObj->Image[0][texObj->BaseLevel];
-   float color[4];
+   union gl_color_union color;
 
-   switch (firstImage->_BaseFormat) {
+   switch (base_format) {
    case GL_DEPTH_COMPONENT:
       /* GL specs that border color for depth textures is taken from the
        * R channel, while the hardware uses A.  Spam R into all the
        * channels for safety.
        */
-      color[0] = sampler->BorderColor.f[0];
-      color[1] = sampler->BorderColor.f[0];
-      color[2] = sampler->BorderColor.f[0];
-      color[3] = sampler->BorderColor.f[0];
+      color.ui[0] = sampler->BorderColor.ui[0];
+      color.ui[1] = sampler->BorderColor.ui[0];
+      color.ui[2] = sampler->BorderColor.ui[0];
+      color.ui[3] = sampler->BorderColor.ui[0];
       break;
    case GL_ALPHA:
-      color[0] = 0.0;
-      color[1] = 0.0;
-      color[2] = 0.0;
-      color[3] = sampler->BorderColor.f[3];
+      color.ui[0] = 0u;
+      color.ui[1] = 0u;
+      color.ui[2] = 0u;
+      color.ui[3] = sampler->BorderColor.ui[3];
       break;
    case GL_INTENSITY:
-      color[0] = sampler->BorderColor.f[0];
-      color[1] = sampler->BorderColor.f[0];
-      color[2] = sampler->BorderColor.f[0];
-      color[3] = sampler->BorderColor.f[0];
+      color.ui[0] = sampler->BorderColor.ui[0];
+      color.ui[1] = sampler->BorderColor.ui[0];
+      color.ui[2] = sampler->BorderColor.ui[0];
+      color.ui[3] = sampler->BorderColor.ui[0];
       break;
    case GL_LUMINANCE:
-      color[0] = sampler->BorderColor.f[0];
-      color[1] = sampler->BorderColor.f[0];
-      color[2] = sampler->BorderColor.f[0];
-      color[3] = 1.0;
+      color.ui[0] = sampler->BorderColor.ui[0];
+      color.ui[1] = sampler->BorderColor.ui[0];
+      color.ui[2] = sampler->BorderColor.ui[0];
+      color.ui[3] = float_as_int(1.0);
       break;
    case GL_LUMINANCE_ALPHA:
-      color[0] = sampler->BorderColor.f[0];
-      color[1] = sampler->BorderColor.f[0];
-      color[2] = sampler->BorderColor.f[0];
-      color[3] = sampler->BorderColor.f[3];
+      color.ui[0] = sampler->BorderColor.ui[0];
+      color.ui[1] = sampler->BorderColor.ui[0];
+      color.ui[2] = sampler->BorderColor.ui[0];
+      color.ui[3] = sampler->BorderColor.ui[3];
       break;
    default:
-      color[0] = sampler->BorderColor.f[0];
-      color[1] = sampler->BorderColor.f[1];
-      color[2] = sampler->BorderColor.f[2];
-      color[3] = sampler->BorderColor.f[3];
+      color.ui[0] = sampler->BorderColor.ui[0];
+      color.ui[1] = sampler->BorderColor.ui[1];
+      color.ui[2] = sampler->BorderColor.ui[2];
+      color.ui[3] = sampler->BorderColor.ui[3];
       break;
    }
 
@@ -146,19 +254,79 @@ upload_default_color(struct brw_context *brw,
     * where we've initialized the A channel to 1.0.  We also have to set
     * the border color alpha to 1.0 in that case.
     */
-   if (firstImage->_BaseFormat == GL_RGB)
-      color[3] = 1.0;
+   if (base_format == GL_RGB)
+      color.ui[3] = float_as_int(1.0);
 
    if (brw->gen >= 8) {
       /* On Broadwell, the border color is represented as four 32-bit floats,
        * integers, or unsigned values, interpreted according to the surface
-       * format.  This matches the sampler->BorderColor union exactly.  Since
-       * we use floats both here and in the above reswizzling code, we preserve
-       * the original bit pattern.  So we actually handle all three formats.
+       * format.  This matches the sampler->BorderColor union exactly; just
+       * memcpy the values.
        */
-      float *sdc = brw_state_batch(brw, AUB_TRACE_SAMPLER_DEFAULT_COLOR,
-                                   4 * 4, 64, sdc_offset);
-      COPY_4FV(sdc, color);
+      uint32_t *sdc = brw_state_batch(brw, AUB_TRACE_SAMPLER_DEFAULT_COLOR,
+                                      4 * 4, 64, sdc_offset);
+      memcpy(sdc, color.ui, 4 * 4);
+   } else if (brw->is_haswell && is_integer_format) {
+      /* Haswell's integer border color support is completely insane:
+       * SAMPLER_BORDER_COLOR_STATE is 20 DWords.  The first four are
+       * for float colors.  The next 12 DWords are MBZ and only exist to
+       * pad it out to a 64 byte cacheline boundary.  DWords 16-19 then
+       * contain integer colors; these are only used if SURFACE_STATE
+       * has the "Integer Surface Format" bit set.  Even then, the
+       * arrangement of the RGBA data devolves into madness.
+       */
+      uint32_t *sdc = brw_state_batch(brw, AUB_TRACE_SAMPLER_DEFAULT_COLOR,
+                                      20 * 4, 512, sdc_offset);
+      memset(sdc, 0, 20 * 4);
+      sdc = &sdc[16];
+
+      int bits_per_channel = _mesa_get_format_bits(format, GL_RED_BITS);
+
+      /* From the Haswell PRM, "Command Reference: Structures", Page 36:
+       * "If any color channel is missing from the surface format,
+       *  corresponding border color should be programmed as zero and if
+       *  alpha channel is missing, corresponding Alpha border color should
+       *  be programmed as 1."
+       */
+      unsigned c[4] = { 0, 0, 0, 1 };
+      for (int i = 0; i < 4; i++) {
+         if (_mesa_format_has_color_component(format, i))
+            c[i] = color.ui[i];
+      }
+
+      switch (bits_per_channel) {
+      case 8:
+         /* Copy RGBA in order. */
+         for (int i = 0; i < 4; i++)
+            ((uint8_t *) sdc)[i] = c[i];
+         break;
+      case 10:
+         /* R10G10B10A2_UINT is treated like a 16-bit format. */
+      case 16:
+         ((uint16_t *) sdc)[0] = c[0]; /* R -> DWord 0, bits 15:0  */
+         ((uint16_t *) sdc)[1] = c[1]; /* G -> DWord 0, bits 31:16 */
+         /* DWord 1 is Reserved/MBZ! */
+         ((uint16_t *) sdc)[4] = c[2]; /* B -> DWord 2, bits 15:0  */
+         ((uint16_t *) sdc)[5] = c[3]; /* A -> DWord 3, bits 31:16 */
+         break;
+      case 32:
+         if (base_format == GL_RG) {
+            /* Careful inspection of the tables reveals that for RG32 formats,
+             * the green channel needs to go where blue normally belongs.
+             */
+            sdc[0] = c[0];
+            sdc[2] = c[1];
+            sdc[3] = 1;
+         } else {
+            /* Copy RGBA in order. */
+            for (int i = 0; i < 4; i++)
+               sdc[i] = c[i];
+         }
+         break;
+      default:
+         assert(!"Invalid number of bits per channel in integer format.");
+         break;
+      }
    } else if (brw->gen == 5 || brw->gen == 6) {
       struct gen5_sampler_default_color *sdc;
 
@@ -167,42 +335,39 @@ upload_default_color(struct brw_context *brw,
 
       memset(sdc, 0, sizeof(*sdc));
 
-      UNCLAMPED_FLOAT_TO_UBYTE(sdc->ub[0], color[0]);
-      UNCLAMPED_FLOAT_TO_UBYTE(sdc->ub[1], color[1]);
-      UNCLAMPED_FLOAT_TO_UBYTE(sdc->ub[2], color[2]);
-      UNCLAMPED_FLOAT_TO_UBYTE(sdc->ub[3], color[3]);
+      UNCLAMPED_FLOAT_TO_UBYTE(sdc->ub[0], color.f[0]);
+      UNCLAMPED_FLOAT_TO_UBYTE(sdc->ub[1], color.f[1]);
+      UNCLAMPED_FLOAT_TO_UBYTE(sdc->ub[2], color.f[2]);
+      UNCLAMPED_FLOAT_TO_UBYTE(sdc->ub[3], color.f[3]);
 
-      UNCLAMPED_FLOAT_TO_USHORT(sdc->us[0], color[0]);
-      UNCLAMPED_FLOAT_TO_USHORT(sdc->us[1], color[1]);
-      UNCLAMPED_FLOAT_TO_USHORT(sdc->us[2], color[2]);
-      UNCLAMPED_FLOAT_TO_USHORT(sdc->us[3], color[3]);
+      UNCLAMPED_FLOAT_TO_USHORT(sdc->us[0], color.f[0]);
+      UNCLAMPED_FLOAT_TO_USHORT(sdc->us[1], color.f[1]);
+      UNCLAMPED_FLOAT_TO_USHORT(sdc->us[2], color.f[2]);
+      UNCLAMPED_FLOAT_TO_USHORT(sdc->us[3], color.f[3]);
 
-      UNCLAMPED_FLOAT_TO_SHORT(sdc->s[0], color[0]);
-      UNCLAMPED_FLOAT_TO_SHORT(sdc->s[1], color[1]);
-      UNCLAMPED_FLOAT_TO_SHORT(sdc->s[2], color[2]);
-      UNCLAMPED_FLOAT_TO_SHORT(sdc->s[3], color[3]);
+      UNCLAMPED_FLOAT_TO_SHORT(sdc->s[0], color.f[0]);
+      UNCLAMPED_FLOAT_TO_SHORT(sdc->s[1], color.f[1]);
+      UNCLAMPED_FLOAT_TO_SHORT(sdc->s[2], color.f[2]);
+      UNCLAMPED_FLOAT_TO_SHORT(sdc->s[3], color.f[3]);
 
-      sdc->hf[0] = _mesa_float_to_half(color[0]);
-      sdc->hf[1] = _mesa_float_to_half(color[1]);
-      sdc->hf[2] = _mesa_float_to_half(color[2]);
-      sdc->hf[3] = _mesa_float_to_half(color[3]);
+      sdc->hf[0] = _mesa_float_to_half(color.f[0]);
+      sdc->hf[1] = _mesa_float_to_half(color.f[1]);
+      sdc->hf[2] = _mesa_float_to_half(color.f[2]);
+      sdc->hf[3] = _mesa_float_to_half(color.f[3]);
 
       sdc->b[0] = sdc->s[0] >> 8;
       sdc->b[1] = sdc->s[1] >> 8;
       sdc->b[2] = sdc->s[2] >> 8;
       sdc->b[3] = sdc->s[3] >> 8;
 
-      sdc->f[0] = color[0];
-      sdc->f[1] = color[1];
-      sdc->f[2] = color[2];
-      sdc->f[3] = color[3];
+      sdc->f[0] = color.f[0];
+      sdc->f[1] = color.f[1];
+      sdc->f[2] = color.f[2];
+      sdc->f[3] = color.f[3];
    } else {
-      struct brw_sampler_default_color *sdc;
-
-      sdc = brw_state_batch(brw, AUB_TRACE_SAMPLER_DEFAULT_COLOR,
-                           sizeof(*sdc), 32, sdc_offset);
-
-      COPY_4V(sdc->color, color);
+      float *sdc = brw_state_batch(brw, AUB_TRACE_SAMPLER_DEFAULT_COLOR,
+                                  4 * 4, 32, sdc_offset);
+      memcpy(sdc, color.f, 4 * 4);
    }
 }
 
@@ -210,181 +375,182 @@ upload_default_color(struct brw_context *brw,
  * Sets the sampler state for a single unit based off of the sampler key
  * entry.
  */
-static void brw_update_sampler_state(struct brw_context *brw,
-                                    int unit,
-                                     int ss_index,
-                                     struct brw_sampler_state *sampler,
-                                     uint32_t sampler_state_table_offset,
-                                     uint32_t *sdc_offset)
+void
+brw_update_sampler_state(struct brw_context *brw,
+                         GLenum target, bool tex_cube_map_seamless,
+                         GLfloat tex_unit_lod_bias,
+                         mesa_format format, GLenum base_format,
+                         bool is_integer_format,
+                         const struct gl_sampler_object *sampler,
+                         uint32_t *sampler_state,
+                         uint32_t batch_offset_for_sampler_state)
 {
-   struct gl_context *ctx = &brw->ctx;
-   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-   struct gl_texture_object *texObj = texUnit->_Current;
-   struct gl_sampler_object *gl_sampler = _mesa_get_samplerobj(ctx, unit);
-   bool using_nearest = false;
-
-   /* These don't use samplers at all. */
-   if (texObj->Target == GL_TEXTURE_BUFFER)
-      return;
+   unsigned min_filter, mag_filter, mip_filter;
 
-   switch (gl_sampler->MinFilter) {
+   /* Select min and mip filters. */
+   switch (sampler->MinFilter) {
    case GL_NEAREST:
-      sampler->ss0.min_filter = BRW_MAPFILTER_NEAREST;
-      sampler->ss0.mip_filter = BRW_MIPFILTER_NONE;
-      using_nearest = true;
+      min_filter = BRW_MAPFILTER_NEAREST;
+      mip_filter = BRW_MIPFILTER_NONE;
       break;
    case GL_LINEAR:
-      sampler->ss0.min_filter = BRW_MAPFILTER_LINEAR;
-      sampler->ss0.mip_filter = BRW_MIPFILTER_NONE;
+      min_filter = BRW_MAPFILTER_LINEAR;
+      mip_filter = BRW_MIPFILTER_NONE;
       break;
    case GL_NEAREST_MIPMAP_NEAREST:
-      sampler->ss0.min_filter = BRW_MAPFILTER_NEAREST;
-      sampler->ss0.mip_filter = BRW_MIPFILTER_NEAREST;
+      min_filter = BRW_MAPFILTER_NEAREST;
+      mip_filter = BRW_MIPFILTER_NEAREST;
       break;
    case GL_LINEAR_MIPMAP_NEAREST:
-      sampler->ss0.min_filter = BRW_MAPFILTER_LINEAR;
-      sampler->ss0.mip_filter = BRW_MIPFILTER_NEAREST;
+      min_filter = BRW_MAPFILTER_LINEAR;
+      mip_filter = BRW_MIPFILTER_NEAREST;
       break;
    case GL_NEAREST_MIPMAP_LINEAR:
-      sampler->ss0.min_filter = BRW_MAPFILTER_NEAREST;
-      sampler->ss0.mip_filter = BRW_MIPFILTER_LINEAR;
+      min_filter = BRW_MAPFILTER_NEAREST;
+      mip_filter = BRW_MIPFILTER_LINEAR;
       break;
    case GL_LINEAR_MIPMAP_LINEAR:
-      sampler->ss0.min_filter = BRW_MAPFILTER_LINEAR;
-      sampler->ss0.mip_filter = BRW_MIPFILTER_LINEAR;
+      min_filter = BRW_MAPFILTER_LINEAR;
+      mip_filter = BRW_MIPFILTER_LINEAR;
       break;
    default:
-      break;
+      unreachable("not reached");
    }
 
-   /* Set Anisotropy:
-    */
-   if (gl_sampler->MaxAnisotropy > 1.0) {
-      sampler->ss0.min_filter = BRW_MAPFILTER_ANISOTROPIC;
-      sampler->ss0.mag_filter = BRW_MAPFILTER_ANISOTROPIC;
-
-      if (gl_sampler->MaxAnisotropy > 2.0) {
-        sampler->ss3.max_aniso = MIN2((gl_sampler->MaxAnisotropy - 2) / 2,
-                                      BRW_ANISORATIO_16);
-      }
-   }
-   else {
-      switch (gl_sampler->MagFilter) {
-      case GL_NEAREST:
-        sampler->ss0.mag_filter = BRW_MAPFILTER_NEAREST;
-        using_nearest = true;
-        break;
-      case GL_LINEAR:
-        sampler->ss0.mag_filter = BRW_MAPFILTER_LINEAR;
-        break;
-      default:
-        break;
+   /* Select mag filter. */
+   if (sampler->MagFilter == GL_LINEAR)
+      mag_filter = BRW_MAPFILTER_LINEAR;
+   else
+      mag_filter = BRW_MAPFILTER_NEAREST;
+
+   /* Enable anisotropic filtering if desired. */
+   unsigned max_anisotropy = BRW_ANISORATIO_2;
+   if (sampler->MaxAnisotropy > 1.0f) {
+      min_filter = BRW_MAPFILTER_ANISOTROPIC;
+      mag_filter = BRW_MAPFILTER_ANISOTROPIC;
+
+      if (sampler->MaxAnisotropy > 2.0f) {
+        max_anisotropy =
+            MIN2((sampler->MaxAnisotropy - 2) / 2, BRW_ANISORATIO_16);
       }
    }
 
-   sampler->ss1.r_wrap_mode = translate_wrap_mode(brw, gl_sampler->WrapR,
-                                                 using_nearest);
-   sampler->ss1.s_wrap_mode = translate_wrap_mode(brw, gl_sampler->WrapS,
-                                                 using_nearest);
-   sampler->ss1.t_wrap_mode = translate_wrap_mode(brw, gl_sampler->WrapT,
-                                                 using_nearest);
+   /* Set address rounding bits if not using nearest filtering. */
+   unsigned address_rounding = 0;
+   if (min_filter != BRW_MAPFILTER_NEAREST) {
+      address_rounding |= BRW_ADDRESS_ROUNDING_ENABLE_U_MIN |
+                          BRW_ADDRESS_ROUNDING_ENABLE_V_MIN |
+                          BRW_ADDRESS_ROUNDING_ENABLE_R_MIN;
+   }
+   if (mag_filter != BRW_MAPFILTER_NEAREST) {
+      address_rounding |= BRW_ADDRESS_ROUNDING_ENABLE_U_MAG |
+                          BRW_ADDRESS_ROUNDING_ENABLE_V_MAG |
+                          BRW_ADDRESS_ROUNDING_ENABLE_R_MAG;
+   }
 
-   if (brw->gen >= 6 &&
-       sampler->ss0.min_filter != sampler->ss0.mag_filter)
-       sampler->ss0.min_mag_neq = 1;
+   bool either_nearest =
+      sampler->MinFilter == GL_NEAREST || sampler->MagFilter == GL_NEAREST;
+   unsigned wrap_s = translate_wrap_mode(brw, sampler->WrapS, either_nearest);
+   unsigned wrap_t = translate_wrap_mode(brw, sampler->WrapT, either_nearest);
+   unsigned wrap_r = translate_wrap_mode(brw, sampler->WrapR, either_nearest);
 
-   /* Cube-maps on 965 and later must use the same wrap mode for all 3
-    * coordinate dimensions.  Futher, only CUBE and CLAMP are valid.
-    */
-   if (texObj->Target == GL_TEXTURE_CUBE_MAP ||
-       texObj->Target == GL_TEXTURE_CUBE_MAP_ARRAY) {
-      if ((ctx->Texture.CubeMapSeamless || gl_sampler->CubeMapSeamless) &&
-         (gl_sampler->MinFilter != GL_NEAREST ||
-          gl_sampler->MagFilter != GL_NEAREST)) {
-        sampler->ss1.r_wrap_mode = BRW_TEXCOORDMODE_CUBE;
-        sampler->ss1.s_wrap_mode = BRW_TEXCOORDMODE_CUBE;
-        sampler->ss1.t_wrap_mode = BRW_TEXCOORDMODE_CUBE;
+   if (target == GL_TEXTURE_CUBE_MAP ||
+       target == GL_TEXTURE_CUBE_MAP_ARRAY) {
+      /* Cube maps must use the same wrap mode for all three coordinate
+       * dimensions.  Prior to Haswell, only CUBE and CLAMP are valid.
+       */
+      if ((tex_cube_map_seamless || sampler->CubeMapSeamless) &&
+         (sampler->MinFilter != GL_NEAREST ||
+          sampler->MagFilter != GL_NEAREST)) {
+        wrap_s = BRW_TEXCOORDMODE_CUBE;
+        wrap_t = BRW_TEXCOORDMODE_CUBE;
+        wrap_r = BRW_TEXCOORDMODE_CUBE;
       } else {
-        sampler->ss1.r_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
-        sampler->ss1.s_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
-        sampler->ss1.t_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
+        wrap_s = BRW_TEXCOORDMODE_CLAMP;
+        wrap_t = BRW_TEXCOORDMODE_CLAMP;
+        wrap_r = BRW_TEXCOORDMODE_CLAMP;
       }
-   } else if (texObj->Target == GL_TEXTURE_1D) {
+   } else if (target == GL_TEXTURE_1D) {
       /* There's a bug in 1D texture sampling - it actually pays
        * attention to the wrap_t value, though it should not.
        * Override the wrap_t value here to GL_REPEAT to keep
        * any nonexistent border pixels from floating in.
        */
-      sampler->ss1.t_wrap_mode = BRW_TEXCOORDMODE_WRAP;
+      wrap_t = BRW_TEXCOORDMODE_WRAP;
    }
 
-
-   /* Set shadow function:
-    */
-   if (gl_sampler->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) {
-      /* Shadowing is "enabled" by emitting a particular sampler
-       * message (sample_c).  So need to recompile WM program when
-       * shadow comparison is enabled on each/any texture unit.
-       */
-      sampler->ss0.shadow_function =
-        intel_translate_shadow_compare_func(gl_sampler->CompareFunc);
+   /* Set shadow function. */
+   unsigned shadow_function = 0;
+   if (sampler->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) {
+      shadow_function =
+        intel_translate_shadow_compare_func(sampler->CompareFunc);
    }
 
-   /* Set LOD bias:
-    */
-   sampler->ss0.lod_bias = S_FIXED(CLAMP(texUnit->LodBias +
-                                        gl_sampler->LodBias, -16, 15), 6);
-
-   sampler->ss0.lod_preclamp = 1; /* OpenGL mode */
-   sampler->ss0.default_color_mode = 0; /* OpenGL/DX10 mode */
-
-   sampler->ss0.base_level = U_FIXED(0, 1);
-
-   sampler->ss1.max_lod = U_FIXED(CLAMP(gl_sampler->MaxLod, 0, 13), 6);
-   sampler->ss1.min_lod = U_FIXED(CLAMP(gl_sampler->MinLod, 0, 13), 6);
+   const int lod_bits = brw->gen >= 7 ? 8 : 6;
+   const unsigned min_lod = U_FIXED(CLAMP(sampler->MinLod, 0, 13), lod_bits);
+   const unsigned max_lod = U_FIXED(CLAMP(sampler->MaxLod, 0, 13), lod_bits);
+   const int lod_bias =
+      S_FIXED(CLAMP(tex_unit_lod_bias + sampler->LodBias, -16, 15), lod_bits);
+   const unsigned base_level = U_FIXED(0, 1);
 
-   /* On Gen6+, the sampler can handle non-normalized texture
-    * rectangle coordinates natively
+   /* Upload the border color if necessary.  If not, just point it at
+    * offset 0 (the start of the batch) - the color should be ignored,
+    * but that address won't fault in case something reads it anyway.
     */
-   if (brw->gen >= 6 && texObj->Target == GL_TEXTURE_RECTANGLE) {
-      sampler->ss3.non_normalized_coord = 1;
+   uint32_t border_color_offset = 0;
+   if (wrap_mode_needs_border_color(wrap_s) ||
+       wrap_mode_needs_border_color(wrap_t) ||
+       wrap_mode_needs_border_color(wrap_r)) {
+      upload_default_color(brw, sampler,
+                           format, base_format, is_integer_format,
+                           &border_color_offset);
    }
 
-   upload_default_color(brw, gl_sampler, unit, sdc_offset);
+   const bool non_normalized_coords = target == GL_TEXTURE_RECTANGLE;
+
+   brw_emit_sampler_state(brw,
+                          sampler_state,
+                          batch_offset_for_sampler_state,
+                          min_filter, mag_filter, mip_filter,
+                          max_anisotropy,
+                          address_rounding,
+                          wrap_s, wrap_t, wrap_r,
+                          min_lod, max_lod, lod_bias, base_level,
+                          shadow_function,
+                          non_normalized_coords,
+                          border_color_offset);
+}
 
-   if (brw->gen >= 6) {
-      sampler->ss2.default_color_pointer = *sdc_offset >> 5;
-   } else {
-      /* reloc */
-      sampler->ss2.default_color_pointer = (brw->batch.bo->offset64 +
-                                           *sdc_offset) >> 5;
+static void
+update_sampler_state(struct brw_context *brw,
+                     int unit,
+                     uint32_t *sampler_state,
+                     uint32_t batch_offset_for_sampler_state)
+{
+   struct gl_context *ctx = &brw->ctx;
+   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+   const struct gl_texture_object *texObj = texUnit->_Current;
+   const struct gl_sampler_object *sampler = _mesa_get_samplerobj(ctx, unit);
 
-      drm_intel_bo_emit_reloc(brw->batch.bo,
-                             sampler_state_table_offset +
-                             ss_index * sizeof(struct brw_sampler_state) +
-                             offsetof(struct brw_sampler_state, ss2),
-                             brw->batch.bo, *sdc_offset,
-                             I915_GEM_DOMAIN_SAMPLER, 0);
-   }
+   /* These don't use samplers at all. */
+   if (texObj->Target == GL_TEXTURE_BUFFER)
+      return;
 
-   if (sampler->ss0.min_filter != BRW_MAPFILTER_NEAREST)
-      sampler->ss3.address_round |= BRW_ADDRESS_ROUNDING_ENABLE_U_MIN |
-                                    BRW_ADDRESS_ROUNDING_ENABLE_V_MIN |
-                                    BRW_ADDRESS_ROUNDING_ENABLE_R_MIN;
-   if (sampler->ss0.mag_filter != BRW_MAPFILTER_NEAREST)
-      sampler->ss3.address_round |= BRW_ADDRESS_ROUNDING_ENABLE_U_MAG |
-                                    BRW_ADDRESS_ROUNDING_ENABLE_V_MAG |
-                                    BRW_ADDRESS_ROUNDING_ENABLE_R_MAG;
+   struct gl_texture_image *firstImage = texObj->Image[0][texObj->BaseLevel];
+   brw_update_sampler_state(brw, texObj->Target, ctx->Texture.CubeMapSeamless,
+                            texUnit->LodBias,
+                            firstImage->TexFormat, firstImage->_BaseFormat,
+                            texObj->_IsIntegerFormat,
+                            sampler,
+                            sampler_state, batch_offset_for_sampler_state);
 }
 
-
 static void
 brw_upload_sampler_state_table(struct brw_context *brw,
                                struct gl_program *prog,
                                struct brw_stage_state *stage_state)
 {
    struct gl_context *ctx = &brw->ctx;
-   struct brw_sampler_state *samplers;
    uint32_t sampler_count = stage_state->sampler_count;
 
    GLbitfield SamplersUsed = prog->SamplersUsed;
@@ -392,22 +558,39 @@ brw_upload_sampler_state_table(struct brw_context *brw,
    if (sampler_count == 0)
       return;
 
-   samplers = brw_state_batch(brw, AUB_TRACE_SAMPLER_STATE,
-                             sampler_count * sizeof(*samplers),
-                             32, &stage_state->sampler_offset);
-   memset(samplers, 0, sampler_count * sizeof(*samplers));
+   /* SAMPLER_STATE is 4 DWords on all platforms. */
+   const int dwords = 4;
+   const int size_in_bytes = dwords * sizeof(uint32_t);
+
+   uint32_t *sampler_state = brw_state_batch(brw, AUB_TRACE_SAMPLER_STATE,
+                                             sampler_count * size_in_bytes,
+                                             32, &stage_state->sampler_offset);
+   memset(sampler_state, 0, sampler_count * size_in_bytes);
+
+   uint32_t batch_offset_for_sampler_state = stage_state->sampler_offset;
 
    for (unsigned s = 0; s < sampler_count; s++) {
       if (SamplersUsed & (1 << s)) {
          const unsigned unit = prog->SamplerUnits[s];
-         if (ctx->Texture.Unit[unit]._Current)
-            brw_update_sampler_state(brw, unit, s, &samplers[s],
-                                     stage_state->sampler_offset,
-                                     &stage_state->sdc_offset[s]);
+         if (ctx->Texture.Unit[unit]._Current) {
+            update_sampler_state(brw, unit, sampler_state,
+                                     batch_offset_for_sampler_state);
+         }
       }
+
+      sampler_state += dwords;
+      batch_offset_for_sampler_state += size_in_bytes;
    }
 
-   brw->state.dirty.cache |= CACHE_NEW_SAMPLER;
+   if (brw->gen >= 7) {
+      /* Emit a 3DSTATE_SAMPLER_STATE_POINTERS_XS packet. */
+      gen7_emit_sampler_state_pointers_xs(brw, stage_state);
+   } else {
+      /* Flag that the sampler state table pointer has changed; later atoms
+       * will handle it.
+       */
+      brw->ctx.NewDriverState |= BRW_NEW_SAMPLER_STATE_TABLE;
+   }
 }
 
 static void
@@ -415,7 +598,7 @@ brw_upload_fs_samplers(struct brw_context *brw)
 {
    /* BRW_NEW_FRAGMENT_PROGRAM */
    struct gl_program *fs = (struct gl_program *) brw->fragment_program;
-   brw->vtbl.upload_sampler_state_table(brw, fs, &brw->wm.base);
+   brw_upload_sampler_state_table(brw, fs, &brw->wm.base);
 }
 
 const struct brw_tracked_state brw_fs_samplers = {
@@ -423,7 +606,6 @@ const struct brw_tracked_state brw_fs_samplers = {
       .mesa = _NEW_TEXTURE,
       .brw = BRW_NEW_BATCH |
              BRW_NEW_FRAGMENT_PROGRAM,
-      .cache = 0
    },
    .emit = brw_upload_fs_samplers,
 };
@@ -433,7 +615,7 @@ brw_upload_vs_samplers(struct brw_context *brw)
 {
    /* BRW_NEW_VERTEX_PROGRAM */
    struct gl_program *vs = (struct gl_program *) brw->vertex_program;
-   brw->vtbl.upload_sampler_state_table(brw, vs, &brw->vs.base);
+   brw_upload_sampler_state_table(brw, vs, &brw->vs.base);
 }
 
 
@@ -442,7 +624,6 @@ const struct brw_tracked_state brw_vs_samplers = {
       .mesa = _NEW_TEXTURE,
       .brw = BRW_NEW_BATCH |
              BRW_NEW_VERTEX_PROGRAM,
-      .cache = 0
    },
    .emit = brw_upload_vs_samplers,
 };
@@ -456,7 +637,7 @@ brw_upload_gs_samplers(struct brw_context *brw)
    if (!gs)
       return;
 
-   brw->vtbl.upload_sampler_state_table(brw, gs, &brw->gs.base);
+   brw_upload_sampler_state_table(brw, gs, &brw->gs.base);
 }
 
 
@@ -465,14 +646,6 @@ const struct brw_tracked_state brw_gs_samplers = {
       .mesa = _NEW_TEXTURE,
       .brw = BRW_NEW_BATCH |
              BRW_NEW_GEOMETRY_PROGRAM,
-      .cache = 0
    },
    .emit = brw_upload_gs_samplers,
 };
-
-
-void
-gen4_init_vtable_sampler_functions(struct brw_context *brw)
-{
-   brw->vtbl.upload_sampler_state_table = brw_upload_sampler_state_table;
-}