Attachment 13402 Details for Bug 13839 – patch to fix byte vs pixel issue in 3d texture offset calculation

[patch] patch to fix byte vs pixel issue in 3d texture offset calculation

intel_3dtex_fix.diff (text/plain), 1.69 KB, created by Roland Scheidegger on 2007-12-28 15:14:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Scheidegger

Created: 2007-12-28 15:14:40 UTC

Size: 1.69 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
>index 7637585..97a82fe 100644
>--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
>+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
>@@ -358,7 +358,7 @@ intel_miptree_image_data(struct intel_co
> 	 height /= 4;
>       intel_region_data(intel,
> 			dst->region,
>-			dst_offset + dst_depth_offset[i], /* dst_offset */
>+			dst_offset + dst_depth_offset[i] * dst->cpp, /* dst_offset */
> 			0, 0,                             /* dstx, dsty */
> 			src,
> 			src_row_pitch,
>@@ -395,10 +395,10 @@ intel_miptree_image_copy(struct intel_co
> 
>    for (i = 0; i < depth; i++) {
>       intel_region_copy(intel,
>-                        dst->region, dst_offset + dst_depth_offset[i],
>+                        dst->region, dst_offset + dst_depth_offset[i] * dst->cpp,
>                         0,
>                         0,
>-                        src->region, src_offset + src_depth_offset[i],
>+                        src->region, src_offset + src_depth_offset[i] * src->cpp,
>                         0, 0, width, height);
>    }
> 
>diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
>index 968eec4..e3b31f9 100644
>--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
>+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
>@@ -73,6 +73,7 @@ struct intel_mipmap_level
>     * are going to be so diverse that there is no unified way to
>     * compute the offsets of depth/cube images within a mipmap level,
>     * so have to store them as a lookup table:
>+    * NOTE level_offset is a byte offset, but the image_offsets are _pixel_ offsets!!!
>     */
>    GLuint *image_offset;
> };

Actions: View | Splinter Review

Attachments on bug 13839: 13402

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.