Module: Mesa
Branch: master
Commit: 9953586af2254f83a610d4cd284f52f37fa18b98
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9953586af2254f83a610d4cd284f52f37fa18b98
Author: Marek Olšák <marek.ol...@amd.com>
Date: Tue Feb 24 23:15:59 2015 +0100
r300g: fix a crash when resolving into an sRGB texture
Cc: 10.5 10.4 <mesa-sta...@lists.freedesktop.org>
---
src/gallium/drivers/r300/r300_texture.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_texture.c
b/src/gallium/drivers/r300/r300_texture.c
index e85a818..6c01c0d 100644
--- a/src/gallium/drivers/r300/r300_texture.c
+++ b/src/gallium/drivers/r300/r300_texture.c
@@ -938,14 +938,16 @@ static void r300_texture_setup_fb_state(struct
r300_surface *surf)
surf->pitch_zmask = tex->tex.zmask_stride_in_pixels[level];
surf->pitch_hiz = tex->tex.hiz_stride_in_pixels[level];
} else {
+ enum pipe_format format = util_format_linear(surf->base.format);
+
surf->pitch =
stride |
- r300_translate_colorformat(surf->base.format) |
+ r300_translate_colorformat(format) |
R300_COLOR_TILE(tex->tex.macrotile[level]) |
R300_COLOR_MICROTILE(tex->tex.microtile);
- surf->format = r300_translate_out_fmt(surf->base.format);
+ surf->format = r300_translate_out_fmt(format);
surf->colormask_swizzle =
- r300_translate_colormask_swizzle(surf->base.format);
+ r300_translate_colormask_swizzle(format);
surf->pitch_cmask = tex->tex.cmask_stride_in_pixels;
}
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
