-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Brian,
I'm sorry to trouble you about this patch again. These assertions are for
non-obvious assumptions in the Intel drivers that come into play
only when an experimental hardware feature (HiZ) is enabled. I'd like to
comb the i915 driver later today and clean up the HiZ-related assertions there.
So, I give my r-b to the first patch :). And I'll kill the call to
intel_framebuffer_has_hiz later today, if that's ok with you.
- --
Chad Versace
c...@chad-versace.us
On 10/07/2011 09:41 AM, Brian Paul wrote:
> From: Brian Paul <bri...@vmware.com>
>
> This previously generated unused variable warnings in non-debug builds.
> ---
> src/mesa/drivers/dri/i915/i830_vtbl.c | 3 +--
> src/mesa/drivers/dri/i915/i915_vtbl.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c
> b/src/mesa/drivers/dri/i915/i830_vtbl.c
> index 7810f56..6ea0e6f 100644
> --- a/src/mesa/drivers/dri/i915/i830_vtbl.c
> +++ b/src/mesa/drivers/dri/i915/i830_vtbl.c
> @@ -715,7 +715,6 @@ i830_update_draw_buffer(struct intel_context *intel)
> struct gl_framebuffer *fb = ctx->DrawBuffer;
> struct intel_region *colorRegions[MAX_DRAW_BUFFERS], *depthRegion = NULL;
> struct intel_renderbuffer *irbDepth = NULL, *irbStencil = NULL;
> - bool fb_has_hiz = intel_framebuffer_has_hiz(fb);
>
> if (!fb) {
> /* this can happen during the initial context initialization */
> @@ -792,7 +791,7 @@ i830_update_draw_buffer(struct intel_context *intel)
>
> /* Check for depth fallback. */
> if (irbDepth && irbDepth->region) {
> - assert(!fb_has_hiz || irbDepth->Base.Format != MESA_FORMAT_S8_Z24);
> + assert(irbDepth->Base.Format != MESA_FORMAT_S8_Z24);
> FALLBACK(intel, INTEL_FALLBACK_DEPTH_BUFFER, GL_FALSE);
> depthRegion = irbDepth->region;
> } else if (irbDepth && !irbDepth->region) {
> diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c
> b/src/mesa/drivers/dri/i915/i915_vtbl.c
> index 1e84c6d..f56aade 100644
> --- a/src/mesa/drivers/dri/i915/i915_vtbl.c
> +++ b/src/mesa/drivers/dri/i915/i915_vtbl.c
> @@ -715,7 +715,6 @@ i915_update_draw_buffer(struct intel_context *intel)
> struct gl_framebuffer *fb = ctx->DrawBuffer;
> struct intel_region *colorRegion = NULL, *depthRegion = NULL;
> struct intel_renderbuffer *irbDepth = NULL, *irbStencil = NULL;
> - bool fb_has_hiz = intel_framebuffer_has_hiz(fb);
>
> if (!fb) {
> /* this can happen during the initial context initialization */
> @@ -762,7 +761,7 @@ i915_update_draw_buffer(struct intel_context *intel)
>
> /* Check for depth fallback. */
> if (irbDepth && irbDepth->region) {
> - assert(!fb_has_hiz || irbDepth->Base.Format != MESA_FORMAT_S8_Z24);
> + assert(irbDepth->Base.Format != MESA_FORMAT_S8_Z24);
> FALLBACK(intel, INTEL_FALLBACK_DEPTH_BUFFER, GL_FALSE);
> depthRegion = irbDepth->region;
> } else if (irbDepth && !irbDepth->region) {
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQIcBAEBAgAGBQJOjzECAAoJEAIvNt057x8ib54P/34V0iK924Md7hakgxNWigCs
uBoCAGDKVdXcW/2rxL3nm1sWBnoUwco9XoDWyCZWqxn8XmtVa5o0MVr/q8cpFE/b
zVqJwuu0gh2JSf3XkuQnOcGKenkQj8B/EhvHoBLqnaJWKtEiXESPfh6LHvZlIqdP
oOoavJacx42EkJ2Tvl9pU9pHk33KcNItyxAtSJ6/fRUhvWkIJmml3xXpf356NSr+
2ubXitRf+ytRXe28O48Bk5BBZNjnR5n8v3T/iLX3izqpZYHwb4awwx/muorygpe9
QDSkxyBDdkX+7Du3kGkB9I07dOC4qd39Oe/KfMUNy/MTJd/Ae9bpw0Y8pCS7voCN
ezmDVYaY18h4ojZ3Xp2q+uvXmef43VSjQLEShVgoSxAyMuk8ZyAt4C4bexuEKOl/
CPCTdmr3oP0KLNChQgFnGhswJ02Qn9ji0ebjZ8pHr4YOXGHe7oYa5YSzF0HyZVbS
3uATZbzyouYzaagSJssFdnKSeIH8pFWF8P5lU9InpNfDD1bIyZWZXay5sSseBxVD
lKvZe2eZ9vI5g7HEdNNe2FaKSyoUEeVgklpSeSX1gwfTDkzNeeAUiyKONW7lbtUq
mEeicEBXUtFG93QywAxzrmwXR+/S06Cep/B1IknuOOj48qHRQfw/QEKrHtjJ4AnG
MFpqXmJcwYLiHu6xQvsh
=2WLL
-----END PGP SIGNATURE-----
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
