Attachment 56836 Details for Bug 45757 – patch for bug 45727

[patch] patch for bug 45727

0001-mesa-fix-maximum-allowed-proxy-texture-size-conditio.patch (text/plain), 4.39 KB, created by Anuj Phogat on 2012-02-09 13:42:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anuj Phogat

Created: 2012-02-09 13:42:53 UTC

Size: 4.39 KB

patch

obsolete

>From ea228d97f811092b9ffcb90565184a7a8f089477 Mon Sep 17 00:00:00 2001
>From: Anuj Phogat <anuj.phogat@gmail.com>
>Date: Wed, 25 Jan 2012 19:05:45 -0800
>Subject: [PATCH] mesa: fix maximum allowed proxy texture size condition
>
>width, height parameter in glTexImage2D() includes: texture image
>width + 2 * border (if any). So when doing the texture size check
>in _mesa_test_proxy_teximage() width and height should not exceed
>maximum supported size for target texture type + 2 * border.
>i.e. 1 << (ctx->Const.MaxTextureLevels - 1) + 2 * border
>
>Texture border is anyway stripped out before it is given to intel
>or gallium drivers.
>
>This patch fixes Intel oglconform test case:
>max_values negative.textureSize.textureCube
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44970
>
>Note: This is a candidate for mesa 8.0 branch.
>
>Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
>Reviewed-by: Ian Romanick <idr@freedesktop.org>
>Reviewed-by: Brian Paul <brianp@vmware.com>
>---
> src/mesa/main/teximage.c |   22 +++++++++++-----------
> 1 files changed, 11 insertions(+), 11 deletions(-)
>
>diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
>index 25da753..e4eb7f6 100644
>--- a/src/mesa/main/teximage.c
>+++ b/src/mesa/main/teximage.c
>@@ -1179,7 +1179,7 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
>    switch (target) {
>    case GL_PROXY_TEXTURE_1D:
>       maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
>-      if (width < 2 * border || width > maxSize)
>+      if (width < 2 * border || width > 2 * border + maxSize)
>          return GL_FALSE;
>       if (level >= ctx->Const.MaxTextureLevels)
>          return GL_FALSE;
>@@ -1191,9 +1191,9 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
> 
>    case GL_PROXY_TEXTURE_2D:
>       maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
>-      if (width < 2 * border || width > maxSize)
>+      if (width < 2 * border || width > 2 * border + maxSize)
>          return GL_FALSE;
>-      if (height < 2 * border || height > maxSize)
>+      if (height < 2 * border || height > 2 * border + maxSize)
>          return GL_FALSE;
>       if (level >= ctx->Const.MaxTextureLevels)
>          return GL_FALSE;
>@@ -1207,11 +1207,11 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
> 
>    case GL_PROXY_TEXTURE_3D:
>       maxSize = 1 << (ctx->Const.Max3DTextureLevels - 1);
>-      if (width < 2 * border || width > maxSize)
>+      if (width < 2 * border || width > 2 * border + maxSize)
>          return GL_FALSE;
>-      if (height < 2 * border || height > maxSize)
>+      if (height < 2 * border || height > 2 * border + maxSize)
>          return GL_FALSE;
>-      if (depth < 2 * border || depth > maxSize)
>+      if (depth < 2 * border || depth > 2 * border + maxSize)
>          return GL_FALSE;
>       if (level >= ctx->Const.Max3DTextureLevels)
>          return GL_FALSE;
>@@ -1237,9 +1237,9 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
> 
>    case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
>       maxSize = 1 << (ctx->Const.MaxCubeTextureLevels - 1);
>-      if (width < 2 * border || width > maxSize)
>+      if (width < 2 * border || width > 2 * border + maxSize)
>          return GL_FALSE;
>-      if (height < 2 * border || height > maxSize)
>+      if (height < 2 * border || height > 2 * border + maxSize)
>          return GL_FALSE;
>       if (level >= ctx->Const.MaxCubeTextureLevels)
>          return GL_FALSE;
>@@ -1253,7 +1253,7 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
> 
>    case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
>       maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
>-      if (width < 2 * border || width > maxSize)
>+      if (width < 2 * border || width > 2 * border + maxSize)
>          return GL_FALSE;
>       if (height < 1 || height > ctx->Const.MaxArrayTextureLayers)
>          return GL_FALSE;
>@@ -1267,9 +1267,9 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
> 
>    case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
>       maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
>-      if (width < 2 * border || width > maxSize)
>+      if (width < 2 * border || width > 2 * border + maxSize)
>          return GL_FALSE;
>-      if (height < 2 * border || height > maxSize)
>+      if (height < 2 * border || height > 2 * border + maxSize)
>          return GL_FALSE;
>       if (depth < 1 || depth > ctx->Const.MaxArrayTextureLayers)
>          return GL_FALSE;
>-- 
>1.7.7.4
>

Actions: View | Splinter Review

Attachments on bug 45757: 56836 | 56865

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.