Hi, This is a bit of a cleanup, although it does add more lines than it removes :(
We've copies of the device info fields in brw_context. Let's get rid of those and use the device info structure we have loaded at initalization. Cheers, Lionel Landwerlin (2): intel: common: break has_hiz_and_separate_stencil into 2 flags anv/i965: drop copies of gen_device_info fields into brw_context src/intel/common/gen_device_info.c | 12 ++- src/intel/common/gen_device_info.h | 3 +- src/intel/isl/isl.c | 4 +- src/intel/vulkan/genX_pipeline.c | 5 +- src/mesa/drivers/dri/i965/brw_binding_tables.c | 6 +- src/mesa/drivers/dri/i965/brw_blorp.c | 24 +++-- src/mesa/drivers/dri/i965/brw_clear.c | 8 +- src/mesa/drivers/dri/i965/brw_clip.c | 3 +- src/mesa/drivers/dri/i965/brw_clip_state.c | 7 +- src/mesa/drivers/dri/i965/brw_compute.c | 14 +-- src/mesa/drivers/dri/i965/brw_context.c | 94 ++++++++---------- src/mesa/drivers/dri/i965/brw_context.h | 18 ---- src/mesa/drivers/dri/i965/brw_cs.c | 2 +- src/mesa/drivers/dri/i965/brw_curbe.c | 4 +- src/mesa/drivers/dri/i965/brw_draw.c | 19 ++-- src/mesa/drivers/dri/i965/brw_draw_upload.c | 22 +++-- src/mesa/drivers/dri/i965/brw_ff_gs.c | 13 +-- src/mesa/drivers/dri/i965/brw_formatquery.c | 5 +- src/mesa/drivers/dri/i965/brw_gs.c | 3 +- src/mesa/drivers/dri/i965/brw_gs_state.c | 3 +- src/mesa/drivers/dri/i965/brw_link.cpp | 9 +- src/mesa/drivers/dri/i965/brw_meta_util.c | 9 +- src/mesa/drivers/dri/i965/brw_misc_state.c | 67 +++++++------ src/mesa/drivers/dri/i965/brw_performance_query.c | 14 +-- src/mesa/drivers/dri/i965/brw_pipe_control.c | 46 +++++---- src/mesa/drivers/dri/i965/brw_primitive_restart.c | 3 +- src/mesa/drivers/dri/i965/brw_program.c | 11 ++- src/mesa/drivers/dri/i965/brw_program_cache.c | 31 +++--- src/mesa/drivers/dri/i965/brw_queryobj.c | 30 ++++-- src/mesa/drivers/dri/i965/brw_sampler_state.c | 37 +++++--- src/mesa/drivers/dri/i965/brw_state_upload.c | 33 ++++--- src/mesa/drivers/dri/i965/brw_surface_formats.c | 19 ++-- src/mesa/drivers/dri/i965/brw_tcs.c | 10 +- src/mesa/drivers/dri/i965/brw_tex_layout.c | 60 ++++++++---- src/mesa/drivers/dri/i965/brw_urb.c | 6 +- src/mesa/drivers/dri/i965/brw_vs.c | 8 +- src/mesa/drivers/dri/i965/brw_wm.c | 33 ++++--- src/mesa/drivers/dri/i965/brw_wm_state.c | 2 +- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 49 ++++++---- src/mesa/drivers/dri/i965/gen6_constant_state.c | 3 +- src/mesa/drivers/dri/i965/gen6_queryobj.c | 17 +++- src/mesa/drivers/dri/i965/gen6_sol.c | 6 +- src/mesa/drivers/dri/i965/gen7_l3_state.c | 11 ++- src/mesa/drivers/dri/i965/gen7_misc_state.c | 3 +- src/mesa/drivers/dri/i965/gen7_sol_state.c | 9 +- src/mesa/drivers/dri/i965/gen7_urb.c | 13 ++- src/mesa/drivers/dri/i965/gen8_depth_state.c | 9 +- src/mesa/drivers/dri/i965/genX_state_upload.c | 11 ++- src/mesa/drivers/dri/i965/hsw_queryobj.c | 10 +- src/mesa/drivers/dri/i965/hsw_sol.c | 9 +- src/mesa/drivers/dri/i965/intel_batchbuffer.c | 61 +++++++----- src/mesa/drivers/dri/i965/intel_batchbuffer.h | 4 +- src/mesa/drivers/dri/i965/intel_blit.c | 27 +++--- src/mesa/drivers/dri/i965/intel_copy_image.c | 3 +- src/mesa/drivers/dri/i965/intel_extensions.c | 37 ++++---- src/mesa/drivers/dri/i965/intel_fbo.c | 20 ++-- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 111 +++++++++++++--------- src/mesa/drivers/dri/i965/intel_pixel_read.c | 5 +- src/mesa/drivers/dri/i965/intel_screen.c | 2 +- src/mesa/drivers/dri/i965/intel_tex.c | 3 +- src/mesa/drivers/dri/i965/intel_tex_image.c | 13 ++- src/mesa/drivers/dri/i965/intel_tex_subimage.c | 5 +- src/mesa/drivers/dri/i965/intel_tex_validate.c | 3 +- 63 files changed, 670 insertions(+), 471 deletions(-) -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
