On Tue, Dec 1, 2015 at 12:19 AM, Jordan Justen
<jordan.l.jus...@intel.com> wrote:
> From: Francisco Jerez <curroje...@riseup.net>
>
> Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com>
With or without the REG_MASK suggestion in patch 10, patches 1-16:
Reviewed-by: Kristian Høgsberg <k...@bitplanet.net>
> ---
> src/mesa/drivers/dri/i965/brw_context.h | 4 ++--
> src/mesa/drivers/dri/i965/brw_state_upload.c | 4 ++++
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_context.h
> b/src/mesa/drivers/dri/i965/brw_context.h
> index 48024c6..de9e039 100644
> --- a/src/mesa/drivers/dri/i965/brw_context.h
> +++ b/src/mesa/drivers/dri/i965/brw_context.h
> @@ -1172,8 +1172,8 @@ struct brw_context
> } perfmon;
>
> int num_atoms[BRW_NUM_PIPELINES];
> - const struct brw_tracked_state render_atoms[60];
> - const struct brw_tracked_state compute_atoms[9];
> + const struct brw_tracked_state render_atoms[61];
> + const struct brw_tracked_state compute_atoms[10];
>
> /* If (INTEL_DEBUG & DEBUG_BATCH) */
> struct {
> diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c
> b/src/mesa/drivers/dri/i965/brw_state_upload.c
> index 3d14d65..9ad40d2 100644
> --- a/src/mesa/drivers/dri/i965/brw_state_upload.c
> +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
> @@ -186,6 +186,7 @@ static const struct brw_tracked_state
> *gen7_render_atoms[] =
> &brw_cc_vp,
> &gen7_sf_clip_viewport,
>
> + &gen7_l3_state,
> &gen7_push_constant_space,
> &gen7_urb,
> &gen6_blend_state, /* must do before cc unit */
> @@ -257,6 +258,7 @@ static const struct brw_tracked_state
> *gen7_render_atoms[] =
> static const struct brw_tracked_state *gen7_compute_atoms[] =
> {
> &brw_state_base_address,
> + &gen7_l3_state,
> &brw_cs_image_surfaces,
> &gen7_cs_push_constants,
> &brw_cs_pull_constants,
> @@ -275,6 +277,7 @@ static const struct brw_tracked_state
> *gen8_render_atoms[] =
> &brw_cc_vp,
> &gen8_sf_clip_viewport,
>
> + &gen7_l3_state,
> &gen7_push_constant_space,
> &gen7_urb,
> &gen8_blend_state,
> @@ -352,6 +355,7 @@ static const struct brw_tracked_state
> *gen8_render_atoms[] =
> static const struct brw_tracked_state *gen8_compute_atoms[] =
> {
> &gen8_state_base_address,
> + &gen7_l3_state,
> &brw_cs_image_surfaces,
> &gen7_cs_push_constants,
> &brw_cs_pull_constants,
> --
> 2.6.2
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
