These are mostly from Paul's cs branch, rebased, and all of Paul's patches are r-b me. (Leaving only patch 6 needing an r-b.)
No piglit changes seen on gen7. git://people.freedesktop.org/~jljusten/mesa cs-for-upstream Jordan Justen (1): i965: Convert brw state dirty bits to 64-bits Paul Berry (7): i965: Create a macro for setting a dirty bit. i965: Create a macro for setting all dirty bits. i965: Create a macro for checking a dirty bit. i965: Modify dirty bit handling to support 2 pipelines. i965: Modify state upload to allow 2 different sets of state atoms. main/cs: Add gl_context::ComputeProgram i965/cs: Add BRW_NEW_COMPUTE_PROGRAM state flag. src/mesa/drivers/dri/i965/brw_binding_tables.c | 2 +- src/mesa/drivers/dri/i965/brw_blorp.cpp | 4 +- src/mesa/drivers/dri/i965/brw_cc.c | 4 +- src/mesa/drivers/dri/i965/brw_clip_state.c | 2 +- src/mesa/drivers/dri/i965/brw_context.h | 79 +++++++++++++++++++- src/mesa/drivers/dri/i965/brw_curbe.c | 2 +- src/mesa/drivers/dri/i965/brw_draw.c | 20 ++--- src/mesa/drivers/dri/i965/brw_draw_upload.c | 4 +- src/mesa/drivers/dri/i965/brw_gs.c | 2 +- src/mesa/drivers/dri/i965/brw_gs_state.c | 2 +- src/mesa/drivers/dri/i965/brw_interpolation_map.c | 2 +- src/mesa/drivers/dri/i965/brw_meta_fast_clear.c | 9 +-- src/mesa/drivers/dri/i965/brw_misc_state.c | 4 +- src/mesa/drivers/dri/i965/brw_program.c | 10 +-- src/mesa/drivers/dri/i965/brw_queryobj.c | 4 +- src/mesa/drivers/dri/i965/brw_sampler_state.c | 2 +- src/mesa/drivers/dri/i965/brw_sf_state.c | 4 +- src/mesa/drivers/dri/i965/brw_state.h | 4 +- src/mesa/drivers/dri/i965/brw_state_cache.c | 13 ++-- src/mesa/drivers/dri/i965/brw_state_upload.c | 91 ++++++++++++++--------- src/mesa/drivers/dri/i965/brw_urb.c | 2 +- src/mesa/drivers/dri/i965/brw_vec4_gs.c | 6 +- src/mesa/drivers/dri/i965/brw_vs.c | 4 +- src/mesa/drivers/dri/i965/brw_vs_state.c | 2 +- src/mesa/drivers/dri/i965/brw_vs_surface_state.c | 4 +- src/mesa/drivers/dri/i965/brw_wm_state.c | 2 +- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 8 +- src/mesa/drivers/dri/i965/gen6_sol.c | 6 +- src/mesa/drivers/dri/i965/gen6_viewport_state.c | 4 +- src/mesa/drivers/dri/i965/gen7_urb.c | 2 +- src/mesa/drivers/dri/i965/gen8_depth_state.c | 2 +- src/mesa/drivers/dri/i965/gen8_misc_state.c | 2 +- src/mesa/drivers/dri/i965/intel_batchbuffer.c | 4 +- src/mesa/drivers/dri/i965/intel_buffer_objects.c | 2 +- src/mesa/main/mtypes.h | 20 +++++ 35 files changed, 221 insertions(+), 113 deletions(-) -- 2.1.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
