Attachment 626301 Details for Bug 862400 – The quoted patches (plus another one) adapted to 8.0.4-1.fc17

[patch] The quoted patches (plus another one) adapted to 8.0.4-1.fc17

mesa-8.0.4-texture-fix.patch (text/plain), 3.42 KB, created by Zoltan Boszormenyi on 2012-10-12 21:39:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zoltan Boszormenyi

Created: 2012-10-12 21:39:51 UTC

Size: 3.42 KB

patch

obsolete

>--- Mesa-8.0.4/src/mesa/main/teximage.c.old	2012-10-12 15:46:01.000000000 +0200
>+++ Mesa-8.0.4/src/mesa/main/teximage.c	2012-10-12 15:52:29.746586990 +0200
>@@ -2600,25 +2600,27 @@
> 
>                /* Give the texture to the driver.  <pixels> may be null. */
>                ASSERT(ctx->Driver.TexImage3D);
>-               switch (dims) {
>-               case 1:
>-                  ctx->Driver.TexImage1D(ctx, texImage, internalFormat,
>+               if (width > 0 && height > 0 && depth > 0) {
>+                 switch (dims) {
>+                 case 1:
>+                    ctx->Driver.TexImage1D(ctx, texImage, internalFormat,
>                                          width, border, format,
>                                          type, pixels, unpack);
>-                  break;
>-               case 2:
>-                  ctx->Driver.TexImage2D(ctx, texImage, internalFormat,
>+                    break;
>+                 case 2:
>+                    ctx->Driver.TexImage2D(ctx, texImage, internalFormat,
>                                          width, height, border, format,
>                                          type, pixels, unpack);
>-                  break;
>-               case 3:
>-                  ctx->Driver.TexImage3D(ctx, texImage, internalFormat,
>+                    break;
>+                 case 3:
>+                    ctx->Driver.TexImage3D(ctx, texImage, internalFormat,
>                                          width, height, depth, border, format,
>                                          type, pixels, unpack);
>-                  break;
>-               default:
>-                  _mesa_problem(ctx, "invalid dims=%u in teximage()", dims);
>-               }
>+                    break;
>+                 default:
>+                    _mesa_problem(ctx, "invalid dims=%u in teximage()", dims);
>+                 }
>+	       }
> 
>                check_gen_mipmap(ctx, target, texObj, level);
> 
>@@ -3280,26 +3282,6 @@
>       return GL_INVALID_VALUE;
>    }
> 
>-   /* check image size against compression block size */
>-   {
>-      gl_format texFormat =
>-         ctx->Driver.ChooseTextureFormat(ctx, proxy_format,
>-					 choose_format, choose_type);
>-      GLuint bw, bh;
>-
>-      _mesa_get_format_block_size(texFormat, &bw, &bh);
>-      if ((width > bw && width % bw > 0) ||
>-          (height > bh && height % bh > 0)) {
>-         /*
>-          * Per GL_ARB_texture_compression:  GL_INVALID_OPERATION is
>-          * generated [...] if any parameter combinations are not
>-          * supported by the specific compressed internal format. 
>-          */
>-         *reason = "invalid width or height for compression format";
>-         return GL_INVALID_OPERATION;
>-      }
>-   }
>-
>    /* check image sizes */
>    if (!ctx->Driver.TestProxyTexImage(ctx, proxyTarget, level,
> 				      proxy_format, choose_format,
>--- Mesa-8.0.4/src/mesa/main/texstore.c.old	2012-10-12 15:52:50.827716387 +0200
>+++ Mesa-8.0.4/src/mesa/main/texstore.c	2012-10-12 15:53:46.274103246 +0200
>@@ -4789,12 +4789,6 @@
> 
>    _mesa_get_format_block_size(texFormat, &bw, &bh);
> 
>-   /* these should have been caught sooner */
>-   ASSERT((width % bw) == 0 || width < bw);
>-   ASSERT((height % bh) == 0 || height < bh);
>-   ASSERT((xoffset % bw) == 0);
>-   ASSERT((yoffset % bh) == 0);
>-
>    /* get pointer to src pixels (may be in a pbo which we'll map here) */
>    data = _mesa_validate_pbo_compressed_teximage(ctx, imageSize, data,
>                                                  &ctx->Unpack,

Actions: View | Diff

Attachments on bug 862400: 626301