[Mesa-dev] [PATCH] i915: Fix build since hiz merge.

[Chad Versace]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 11/22/2011 01:04 PM, Eric Anholt wrote:
> ---
> 
> There are regressions that look hiz-related on gm45 as well.  On 915,
> while this gets things building, it'still in bad shape.  Glean
> pixelformats, for example, segfaults at:
> 
> 759	      colorRegion = irb ? irb->mt->region : NULL;
> 
> of i915_vtbl.c.  Tossing in some assertion, it's that irb->mt is NULL.
> 
>  src/mesa/drivers/dri/i915/Makefile.sources    |    1 +
>  src/mesa/drivers/dri/i915/i830_state.c        |    3 ++-
>  src/mesa/drivers/dri/i915/i830_vtbl.c         |   19 ++++++++++---------
>  src/mesa/drivers/dri/i915/i915_tex_layout.c   |   12 ++++++------
>  src/mesa/drivers/dri/i915/i915_vtbl.c         |   17 +++++++++--------
>  src/mesa/drivers/dri/i915/intel_resolve_map.c |    1 +
>  6 files changed, 29 insertions(+), 24 deletions(-)
>  create mode 120000 src/mesa/drivers/dri/i915/intel_resolve_map.c



All these build fixes look correct to me.
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

As for the assertion failures, replacing conditions like
  ir && irb->mt->region
with
  irb && irb->mt && irb->mt->region
might be sufficient to reinstate correct behaviour. It was
sufficient for i965.

If you don't get around to fixing the i915 regressions today,
I can work on them when I'm at my home office tomorrow.

- ----
Chad Versace
chad.versace at linux.intel.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJOzBfZAAoJEAIvNt057x8iuIgQAJaGaozy3x6/xtbynTaWm7Oy
VDbHNdoPRAng9Xu6SXm0e3MoKKHVbPnK+eFgX+lEzuw5SBquTz6ctifH6Y9l+/3w
tDJFU2FT4LyAL2JGdm9svWQeKpCj42jzHeiiw4uUaTcUepXBrcj4F9Mhme5tQHsa
ovaRLfTDAiKkxpX08NMr0ptX96lrazDsSGtQWe3yaoPsjwog/FNmOdeM4G3e+CVS
36a5Y4Fc8fxeeQ4Ib9zHgHVvNIyorQ/cCZlW+ODRuf6Pf2v5VjG7XxkAjshxZneU
e/a5yEdtT5jdwiGJqWZ4RU2NPcvD8q7jZAkoJJRyRKk146XV9Vhe1qWEQAKj2xRE
C4IqD/KCO4QFzQlB6PTFFAiWejkN/xISr8MqeJUy1XAc09GMkaYkNATifWn8SDOo
4RfSFVcB8NYa5i21EoSIMfeQtLwbJ35dsftbIIaEF715DwrVqN0noWVjbm3zagSx
Z/iiq/kyfldFW28VHeZyaQO59+P+kVM9B8VzDPDe8OyZy7gtBaVeIVpfqigPdQGT
1XgfD6t+Fb6He1oMtmzupmzqEYDvcygAzESe9zkJ+0iVbXyjo7iueMfptiJB4a+W
rz+RZhhnBwb7CxJqa0SjsmOvYXC+Bny21+8lXBGBJ8iFmTfBKaC4/Xht2nOOJ6lj
iRFF5YXLxS8gzjdA0ziD
=cqOY
-----END PGP SIGNATURE-----