1 files changed, 14 insertions, 14 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index 370cb11648e..5e975661b14 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -225,10 +225,10 @@ brw_populate_sampler_prog_key_data(struct gl_context *ctx,
          /* Haswell handles texture swizzling as surface format overrides
           * (except for GL_ALPHA); all other platforms need MOVs in the shader.
           */
-         if (alpha_depth || (devinfo->gen < 8 && !devinfo->is_haswell))
+         if (alpha_depth || (devinfo->ver < 8 && !devinfo->is_haswell))
             key->swizzles[s] = brw_get_texture_swizzle(ctx, t);
 
-         if (devinfo->gen < 8 &&
+         if (devinfo->ver < 8 &&
              sampler->Attrib.MinFilter != GL_NEAREST &&
              sampler->Attrib.MagFilter != GL_NEAREST) {
             if (sampler->Attrib.WrapS == GL_CLAMP)
@@ -240,7 +240,7 @@ brw_populate_sampler_prog_key_data(struct gl_context *ctx,
          }
 
          /* gather4 for RG32* is broken in multiple ways on Gen7. */
-         if (devinfo->gen == 7 && prog->info.uses_texture_gather) {
+         if (devinfo->ver == 7 && prog->info.uses_texture_gather) {
             switch (img->InternalFormat) {
             case GL_RG32I:
             case GL_RG32UI: {
@@ -278,7 +278,7 @@ brw_populate_sampler_prog_key_data(struct gl_context *ctx,
          /* Gen6's gather4 is broken for UINT/SINT; we treat them as
           * UNORM/FLOAT instead and fix it in the shader.
           */
-         if (devinfo->gen == 6 && prog->info.uses_texture_gather) {
+         if (devinfo->ver == 6 && prog->info.uses_texture_gather) {
             key->gen6_gather_wa[s] = gen6_gather_workaround(img->InternalFormat);
          }
 
@@ -293,14 +293,14 @@ brw_populate_sampler_prog_key_data(struct gl_context *ctx,
           * compressed. These don't need ld2dms sampling along with mcs fetch.
           */
          if (intel_tex->mt->aux_usage == ISL_AUX_USAGE_MCS) {
-            assert(devinfo->gen >= 7);
+            assert(devinfo->ver >= 7);
             assert(intel_tex->mt->surf.samples > 1);
             assert(intel_tex->mt->aux_buf);
             assert(intel_tex->mt->surf.msaa_layout == ISL_MSAA_LAYOUT_ARRAY);
             key->compressed_multisample_layout_mask |= 1 << s;
 
             if (intel_tex->mt->surf.samples >= 16) {
-               assert(devinfo->gen >= 9);
+               assert(devinfo->ver >= 9);
                key->msaa_16 |= 1 << s;
             }
          }
@@ -405,7 +405,7 @@ brw_wm_populate_key(struct brw_context *brw, struct brw_wm_prog_key *key)
 
    /* Build the index for table lookup
     */
-   if (devinfo->gen < 6) {
+   if (devinfo->ver < 6) {
       struct brw_renderbuffer *depth_irb =
          brw_get_renderbuffer(ctx->DrawBuffer, BUFFER_DEPTH);
 
@@ -470,7 +470,7 @@ brw_wm_populate_key(struct brw_context *brw, struct brw_wm_prog_key *key)
       prog->info.uses_fddx_fddy &&
       ctx->Hint.FragmentShaderDerivative == GL_NICEST;
 
-   if (devinfo->gen < 6)
+   if (devinfo->ver < 6)
       key->stats_wm = brw->stats_wm;
 
    /* _NEW_LIGHT */
@@ -513,7 +513,7 @@ brw_wm_populate_key(struct brw_context *brw, struct brw_wm_prog_key *key)
    key->ignore_sample_mask_out = !key->multisample_fbo;
 
    /* BRW_NEW_VUE_MAP_GEOM_OUT */
-   if (devinfo->gen < 6 || util_bitcount64(prog->info.inputs_read &
+   if (devinfo->ver < 6 || util_bitcount64(prog->info.inputs_read &
                                              BRW_FS_VARYING_INPUT_MASK) > 16) {
       key->input_slots_valid = brw->vue_map_geom_out.slots_valid;
    }
@@ -524,7 +524,7 @@ brw_wm_populate_key(struct brw_context *brw, struct brw_wm_prog_key *key)
     * like GL requires.  Fix that by building the alpha test into the
     * shader, and we'll skip enabling the fixed function alpha test.
     */
-   if (devinfo->gen < 6 && ctx->DrawBuffer->_NumColorDrawBuffers > 1 &&
+   if (devinfo->ver < 6 && ctx->DrawBuffer->_NumColorDrawBuffers > 1 &&
        ctx->Color.AlphaEnabled) {
       key->alpha_test_func = ctx->Color.AlphaFunc;
       key->alpha_test_ref = ctx->Color.AlphaRef;
@@ -576,7 +576,7 @@ brw_wm_populate_default_key(const struct brw_compiler *compiler,
 
    uint64_t outputs_written = prog->info.outputs_written;
 
-   if (devinfo->gen < 6) {
+   if (devinfo->ver < 6) {
       if (prog->info.fs.uses_discard)
          key->iz_lookup |= BRW_WM_IZ_PS_KILL_ALPHATEST_BIT;
 
@@ -588,7 +588,7 @@ brw_wm_populate_default_key(const struct brw_compiler *compiler,
       key->iz_lookup |= BRW_WM_IZ_DEPTH_WRITE_ENABLE_BIT;
    }
 
-   if (devinfo->gen < 6 || util_bitcount64(prog->info.inputs_read &
+   if (devinfo->ver < 6 || util_bitcount64(prog->info.inputs_read &
                                              BRW_FS_VARYING_INPUT_MASK) > 16) {
       key->input_slots_valid = prog->info.inputs_read | VARYING_BIT_POS;
    }
@@ -599,7 +599,7 @@ brw_wm_populate_default_key(const struct brw_compiler *compiler,
            BITFIELD64_BIT(FRAG_RESULT_SAMPLE_MASK)));
 
    /* Whether reads from the framebuffer should behave coherently. */
-   key->coherent_fb_fetch = devinfo->gen >= 9;
+   key->coherent_fb_fetch = devinfo->ver >= 9;
 }
 
 bool
@@ -621,7 +621,7 @@ brw_fs_precompile(struct gl_context *ctx, struct gl_program *prog)
    struct brw_stage_prog_data *old_prog_data = brw->wm.base.prog_data;
 
    struct brw_vue_map vue_map;
-   if (devinfo->gen < 6) {
+   if (devinfo->ver < 6) {
       brw_compute_vue_map(&brw->screen->devinfo, &vue_map,
                           prog->info.inputs_read | VARYING_BIT_POS,
                           false, 1);