Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com>
On 2017-10-22 18:26:12, Timothy Arceri wrote: > --- > src/mesa/drivers/dri/i965/gen6_sol.c | 3 +-- > src/mesa/drivers/dri/i965/gen7_sol_state.c | 9 +++------ > src/mesa/drivers/dri/i965/intel_batchbuffer.c | 16 ++++------------ > src/mesa/drivers/dri/i965/intel_blit.c | 4 +--- > src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 10 +++------- > src/mesa/drivers/dri/i965/intel_tex_validate.c | 3 +-- > 6 files changed, 13 insertions(+), 32 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/gen6_sol.c > b/src/mesa/drivers/dri/i965/gen6_sol.c > index 53e4fd1c144..7a510940c8e 100644 > --- a/src/mesa/drivers/dri/i965/gen6_sol.c > +++ b/src/mesa/drivers/dri/i965/gen6_sol.c > @@ -386,7 +386,6 @@ brw_begin_transform_feedback(struct gl_context *ctx, > GLenum mode, > struct gl_transform_feedback_object *obj) > { > struct brw_context *brw = brw_context(ctx); > - const struct gen_device_info *devinfo = &brw->screen->devinfo; > const struct gl_program *prog; > const struct gl_transform_feedback_info *linked_xfb_info; > struct gl_transform_feedback_object *xfb_obj = > @@ -394,7 +393,7 @@ brw_begin_transform_feedback(struct gl_context *ctx, > GLenum mode, > struct brw_transform_feedback_object *brw_obj = > (struct brw_transform_feedback_object *) xfb_obj; > > - assert(devinfo->gen == 6); > + assert(brw->screen->devinfo.gen == 6); > > if (ctx->_Shader->CurrentProgram[MESA_SHADER_GEOMETRY]) { > /* BRW_NEW_GEOMETRY_PROGRAM */ > diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c > b/src/mesa/drivers/dri/i965/gen7_sol_state.c > index 7d20c267565..299e650731e 100644 > --- a/src/mesa/drivers/dri/i965/gen7_sol_state.c > +++ b/src/mesa/drivers/dri/i965/gen7_sol_state.c > @@ -42,9 +42,8 @@ gen7_begin_transform_feedback(struct gl_context *ctx, > GLenum mode, > struct brw_context *brw = brw_context(ctx); > struct brw_transform_feedback_object *brw_obj = > (struct brw_transform_feedback_object *) obj; > - const struct gen_device_info *devinfo = &brw->screen->devinfo; > > - assert(devinfo->gen == 7); > + assert(brw->screen->devinfo.gen == 7); > > /* We're about to lose the information needed to compute the number of > * vertices written during the last Begin/EndTransformFeedback section, > @@ -110,12 +109,11 @@ gen7_pause_transform_feedback(struct gl_context *ctx, > struct brw_context *brw = brw_context(ctx); > struct brw_transform_feedback_object *brw_obj = > (struct brw_transform_feedback_object *) obj; > - const struct gen_device_info *devinfo = &brw->screen->devinfo; > > /* Flush any drawing so that the counters have the right values. */ > brw_emit_mi_flush(brw); > > - assert(devinfo->gen == 7); > + assert(brw->screen->devinfo.gen == 7); > > /* Save the SOL buffer offset register values. */ > for (int i = 0; i < 4; i++) { > @@ -141,9 +139,8 @@ gen7_resume_transform_feedback(struct gl_context *ctx, > struct brw_context *brw = brw_context(ctx); > struct brw_transform_feedback_object *brw_obj = > (struct brw_transform_feedback_object *) obj; > - const struct gen_device_info *devinfo = &brw->screen->devinfo; > > - assert(devinfo->gen == 7); > + assert(brw->screen->devinfo.gen == 7); > > /* Reload the SOL buffer offset registers. */ > for (int i = 0; i < 4; i++) { > diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c > b/src/mesa/drivers/dri/i965/intel_batchbuffer.c > index c96e2827f28..1a366c78b00 100644 > --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c > +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c > @@ -1200,9 +1200,7 @@ brw_store_register_mem64(struct brw_context *brw, > void > brw_load_register_imm32(struct brw_context *brw, uint32_t reg, uint32_t imm) > { > - const struct gen_device_info *devinfo = &brw->screen->devinfo; > - > - assert(devinfo->gen >= 6); > + assert(brw->screen->devinfo.gen >= 6); > > BEGIN_BATCH(3); > OUT_BATCH(MI_LOAD_REGISTER_IMM | (3 - 2)); > @@ -1217,9 +1215,7 @@ brw_load_register_imm32(struct brw_context *brw, > uint32_t reg, uint32_t imm) > void > brw_load_register_imm64(struct brw_context *brw, uint32_t reg, uint64_t imm) > { > - const struct gen_device_info *devinfo = &brw->screen->devinfo; > - > - assert(devinfo->gen >= 6); > + assert(brw->screen->devinfo.gen >= 6); > > BEGIN_BATCH(5); > OUT_BATCH(MI_LOAD_REGISTER_IMM | (5 - 2)); > @@ -1236,9 +1232,7 @@ brw_load_register_imm64(struct brw_context *brw, > uint32_t reg, uint64_t imm) > void > brw_load_register_reg(struct brw_context *brw, uint32_t src, uint32_t dest) > { > - const struct gen_device_info *devinfo = &brw->screen->devinfo; > - > - assert(devinfo->gen >= 8 || devinfo->is_haswell); > + assert(brw->screen->devinfo.gen >= 8 || brw->screen->devinfo.is_haswell); > > BEGIN_BATCH(3); > OUT_BATCH(MI_LOAD_REGISTER_REG | (3 - 2)); > @@ -1253,9 +1247,7 @@ brw_load_register_reg(struct brw_context *brw, uint32_t > src, uint32_t dest) > void > brw_load_register_reg64(struct brw_context *brw, uint32_t src, uint32_t dest) > { > - const struct gen_device_info *devinfo = &brw->screen->devinfo; > - > - assert(devinfo->gen >= 8 || devinfo->is_haswell); > + assert(brw->screen->devinfo.gen >= 8 || brw->screen->devinfo.is_haswell); > > BEGIN_BATCH(6); > OUT_BATCH(MI_LOAD_REGISTER_REG | (3 - 2)); > diff --git a/src/mesa/drivers/dri/i965/intel_blit.c > b/src/mesa/drivers/dri/i965/intel_blit.c > index 819a3da2966..13431a7bd2a 100644 > --- a/src/mesa/drivers/dri/i965/intel_blit.c > +++ b/src/mesa/drivers/dri/i965/intel_blit.c > @@ -101,9 +101,7 @@ set_blitter_tiling(struct brw_context *brw, > bool dst_y_tiled, bool src_y_tiled, > uint32_t *__map) > { > - const struct gen_device_info *devinfo = &brw->screen->devinfo; > - > - assert(devinfo->gen >= 6); > + assert(brw->screen->devinfo.gen >= 6); > > /* Idle the blitter before we update how tiling is interpreted. */ > OUT_BATCH(MI_FLUSH_DW); > diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c > b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c > index b57290e8238..37b54b6106e 100644 > --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c > +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c > @@ -1669,9 +1669,7 @@ intel_miptree_alloc_mcs(struct brw_context *brw, > struct intel_mipmap_tree *mt, > GLuint num_samples) > { > - const struct gen_device_info *devinfo = &brw->screen->devinfo; > - > - assert(devinfo->gen >= 7); /* MCS only used on Gen7+ */ > + assert(brw->screen->devinfo.gen >= 7); /* MCS only used on Gen7+ */ > assert(mt->mcs_buf == NULL); > assert(mt->aux_usage == ISL_AUX_USAGE_MCS); > > @@ -1996,13 +1994,11 @@ intel_miptree_check_color_resolve(const struct > brw_context *brw, > const struct intel_mipmap_tree *mt, > unsigned level, unsigned layer) > { > - const struct gen_device_info *devinfo = &brw->screen->devinfo; > - > if (!mt->mcs_buf) > return; > > /* Fast color clear is supported for mipmapped surfaces only on Gen8+. */ > - assert(devinfo->gen >= 8 || > + assert(brw->screen->devinfo.gen >= 8 || > (level == 0 && mt->first_level == 0 && mt->last_level == 0)); > > /* Compression of arrayed msaa surfaces is supported. */ > @@ -2010,7 +2006,7 @@ intel_miptree_check_color_resolve(const struct > brw_context *brw, > return; > > /* Fast color clear is supported for non-msaa arrays only on Gen8+. */ > - assert(devinfo->gen >= 8 || > + assert(brw->screen->devinfo.gen >= 8 || > (layer == 0 && > mt->surf.logical_level0_px.depth == 1 && > mt->surf.logical_level0_px.array_len == 1)); > diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c > b/src/mesa/drivers/dri/i965/intel_tex_validate.c > index 552db9210e2..2b7798c940a 100644 > --- a/src/mesa/drivers/dri/i965/intel_tex_validate.c > +++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c > @@ -67,7 +67,6 @@ intel_update_max_level(struct intel_texture_object > *intelObj, > void > intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit) > { > - const struct gen_device_info *devinfo = &brw->screen->devinfo; > struct gl_context *ctx = &brw->ctx; > struct gl_texture_object *tObj = ctx->Texture.Unit[unit]._Current; > struct intel_texture_object *intelObj = intel_texture_object(tObj); > @@ -112,7 +111,7 @@ intel_finalize_mipmap_tree(struct brw_context *brw, > GLuint unit) > * > * FINISHME: Avoid doing this. > */ > - assert(!tObj->Immutable || devinfo->gen < 6); > + assert(!tObj->Immutable || brw->screen->devinfo.gen < 6); > > firstImage = intel_texture_image(tObj->Image[0][tObj->BaseLevel]); > > -- > 2.13.6 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev