Attachment 36235 Details for Bug 26428 – fix calculation of compressed mipmaps

[patch] fix calculation of compressed mipmaps

0002-drm-radeon-r100-r200-fix-calculation-of-compressed.patch (text/plain), 2.79 KB, created by Roland Scheidegger on 2010-06-12 07:42:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Scheidegger

Created: 2010-06-12 07:42:32 UTC

Size: 2.79 KB

patch

obsolete

>From ea8eef96cbb3d3825942e052f48e6a012ae18bf0 Mon Sep 17 00:00:00 2001
>From: Roland Scheidegger <sroland@vmware.com>
>Date: Sat, 12 Jun 2010 16:34:12 +0200
>Subject: [PATCH] drm/radeon/r100/r200: fix calculation of compressed cube maps
>
>This needs similar handling to other compressed textures.
>
>Signed-off-by: sroland@vmware.com
>---
> drivers/gpu/drm/radeon/r100.c |   58 ++++++++++++++++++++++-------------------
> 1 files changed, 31 insertions(+), 27 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
>index cf89aa2..79eebb8 100644
>--- a/drivers/gpu/drm/radeon/r100.c
>+++ b/drivers/gpu/drm/radeon/r100.c
>@@ -3147,33 +3147,6 @@ static inline void r100_cs_track_texture_print(struct r100_cs_track_texture *t)
> 	DRM_ERROR("compress format            %d\n", t->compress_format);
> }
> 
>-static int r100_cs_track_cube(struct radeon_device *rdev,
>-			      struct r100_cs_track *track, unsigned idx)
>-{
>-	unsigned face, w, h;
>-	struct radeon_bo *cube_robj;
>-	unsigned long size;
>-
>-	for (face = 0; face < 5; face++) {
>-		cube_robj = track->textures[idx].cube_info[face].robj;
>-		w = track->textures[idx].cube_info[face].width;
>-		h = track->textures[idx].cube_info[face].height;
>-
>-		size = w * h;
>-		size *= track->textures[idx].cpp;
>-
>-		size += track->textures[idx].cube_info[face].offset;
>-
>-		if (size > radeon_bo_size(cube_robj)) {
>-			DRM_ERROR("Cube texture offset greater than object size %lu %lu\n",
>-				  size, radeon_bo_size(cube_robj));
>-			r100_cs_track_texture_print(&track->textures[idx]);
>-			return -1;
>-		}
>-	}
>-	return 0;
>-}
>-
> static int r100_track_compress_size(int compress_format, int w, int h)
> {
> 	int block_width, block_height, block_bytes;
>@@ -3204,6 +3177,37 @@ static int r100_track_compress_size(int compress_format, int w, int h)
> 	return sz;
> }
> 
>+static int r100_cs_track_cube(struct radeon_device *rdev,
>+			      struct r100_cs_track *track, unsigned idx)
>+{
>+	unsigned face, w, h;
>+	struct radeon_bo *cube_robj;
>+	unsigned long size;
>+	unsigned compress_format = track->textures[idx].compress_format;
>+
>+	for (face = 0; face < 5; face++) {
>+		cube_robj = track->textures[idx].cube_info[face].robj;
>+		w = track->textures[idx].cube_info[face].width;
>+		h = track->textures[idx].cube_info[face].height;
>+
>+		if (compress_format) {
>+			size = r100_track_compress_size(compress_format, w, h);
>+		} else
>+			size = w * h;
>+		size *= track->textures[idx].cpp;
>+
>+		size += track->textures[idx].cube_info[face].offset;
>+
>+		if (size > radeon_bo_size(cube_robj)) {
>+			DRM_ERROR("Cube texture offset greater than object size %lu %lu\n",
>+				  size, radeon_bo_size(cube_robj));
>+			r100_cs_track_texture_print(&track->textures[idx]);
>+			return -1;
>+		}
>+	}
>+	return 0;
>+}
>+
> static int r100_cs_track_texture_check(struct radeon_device *rdev,
> 				       struct r100_cs_track *track)
> {
>-- 
>1.5.2.4
>

Actions: View | Splinter Review

Attachments on bug 26428: 33069 | 33070 | 33071 | 33072 | 33082 | 36234 | 36235

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.