From: Marek Olšák <maraeo@gmail.com>
Date: Mon, 1 Jul 2013 00:36:37 +0000 (+0200)
Subject: r600g: fix color resolve for RGBX8 and RGBX16 integer formats
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a3263cca59b463a9c49bd165226e36fdfec96d8b;p=mesa.git

r600g: fix color resolve for RGBX8 and RGBX16 integer formats

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 7a0e2561b85..ba5d4ea6e7f 100644
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -777,7 +777,7 @@ static enum pipe_format int_to_norm_format(enum pipe_format format)
 	REPLACE_FORMAT_SIGN(B10G10R10A2, U);
 	REPLACE_FORMAT(R8);
 	REPLACE_FORMAT(R8G8);
-	REPLACE_FORMAT(R8G8B8);
+	REPLACE_FORMAT(R8G8B8X8);
 	REPLACE_FORMAT(R8G8B8A8);
 	REPLACE_FORMAT(A8);
 	REPLACE_FORMAT(I8);
@@ -785,7 +785,7 @@ static enum pipe_format int_to_norm_format(enum pipe_format format)
 	REPLACE_FORMAT(L8A8);
 	REPLACE_FORMAT(R16);
 	REPLACE_FORMAT(R16G16);
-	REPLACE_FORMAT(R16G16B16);
+	REPLACE_FORMAT(R16G16B16X16);
 	REPLACE_FORMAT(R16G16B16A16);
 	REPLACE_FORMAT(A16);
 	REPLACE_FORMAT(I16);