Attachment 25977 Details for Bug 21227 – Clip size after allocating the texture

[patch] Clip size after allocating the texture

0001-intel-Clip-to-window-after-calling-Driver.TexImage2D.patch (text/plain), 1.95 KB, created by Ian Romanick on 2009-05-18 13:30:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Romanick

Created: 2009-05-18 13:30:08 UTC

Size: 1.95 KB

patch

obsolete

>From c314445b64bdb5905453209df14b60fee476c80d Mon Sep 17 00:00:00 2001
>From: Ian Romanick <ian.d.romanick@intel.com>
>Date: Mon, 18 May 2009 13:26:16 -0700
>Subject: [PATCH] intel: Clip to window after calling Driver.TexImage2D
>
>This prevents the width / height from being clipped to the window size before
>the texture is allocated.  This matches intelCopyTexImage1D.
>
>This should fix bug #21227
>
>Signed-off-by: Ian Romanick <ian.romanick@intel.com>
>---
> src/mesa/drivers/dri/intel/intel_tex_copy.c |   17 ++++++++---------
> 1 files changed, 8 insertions(+), 9 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c b/src/mesa/drivers/dri/intel/intel_tex_copy.c
>index 7c2b26e..a25626a 100644
>--- a/src/mesa/drivers/dri/intel/intel_tex_copy.c
>+++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c
>@@ -231,6 +231,14 @@ intelCopyTexImage2D(GLcontext * ctx, GLenum target, GLint level,
>    if (border)
>       goto fail;
> 
>+   /* Setup or redefine the texture object, mipmap tree and texture
>+    * image.  Don't populate yet.
>+    */
>+   ctx->Driver.TexImage2D(ctx, target, level, internalFormat,
>+                          width, height, border,
>+                          GL_RGBA, CHAN_TYPE, NULL,
>+                          &ctx->DefaultPacking, texObj, texImage);
>+
>    srcx = x;
>    srcy = y;
>    dstx = 0;
>@@ -241,15 +249,6 @@ intelCopyTexImage2D(GLcontext * ctx, GLenum target, GLint level,
> 				   &width, &height))
>       return;
> 
>-   /* Setup or redefine the texture object, mipmap tree and texture
>-    * image.  Don't populate yet.  
>-    */
>-   ctx->Driver.TexImage2D(ctx, target, level, internalFormat,
>-                          width, height, border,
>-                          GL_RGBA, CHAN_TYPE, NULL,
>-                          &ctx->DefaultPacking, texObj, texImage);
>-
>-
>    if (!do_copy_texsubimage(intel_context(ctx), target,
>                             intel_texture_image(texImage),
>                             internalFormat, 0, 0, x, y, width, height))
>-- 
>1.6.3
>

Actions: View | Splinter Review

Attachments on bug 21227: 25944 | 25977

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.