Attachment 35409 Details for Bug 27924 – a patch to try.

[patch] a patch to try.

st_cb_texture.c.patch (text/plain), 1.17 KB, created by Brian Paul on 2010-05-04 06:59:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2010-05-04 06:59:43 UTC

Size: 1.17 KB

patch

obsolete

>diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
>index ed8eb29..9d26bcc 100644
>--- a/src/mesa/state_tracker/st_cb_texture.c
>+++ b/src/mesa/state_tracker/st_cb_texture.c
>@@ -275,12 +275,9 @@ guess_and_alloc_texture(struct st_context *st,
>    height = stImage->base.Height2;
>    depth = stImage->base.Depth2;
> 
>-   assert(width > 0);
>-   assert(height > 0);
>-   assert(depth > 0);
>-
>    /* Depending on the image's size, we can't always make a guess here.
>     */
>+#if 0
>    if (level > 0) {
>       if ( (dims >= 1 && width == 1) ||
>            (dims >= 2 && height == 1) ||
>@@ -290,6 +287,7 @@ guess_and_alloc_texture(struct st_context *st,
>          return;
>       }
>    }
>+#endif
> 
>    /* grow the image size until we hit level = 0 */
>    while (level > 0) {
>@@ -300,10 +298,15 @@ guess_and_alloc_texture(struct st_context *st,
>       if (depth != 1)
>          depth <<= 1;
>       level--;
>-   }      
>+   }
> 
>    assert(level == 0);
> 
>+   if (width == 0 || height == 0 || depth == 0) {
>+      /* no texture needed */
>+      return;
>+   }
>+
>    /* At this point, (width x height x depth) is the expected size of
>     * the level=0 mipmap image.
>     */

Actions: View | Splinter Review

Attachments on bug 27924: 35359 | 35409

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.