Mesa (master): r600g: fix color resolve for RGBX8 and RGBX16 integer formats

[Marek Olšák]

Module: Mesa
Branch: master
Commit: a3263cca59b463a9c49bd165226e36fdfec96d8b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3263cca59b463a9c49bd165226e36fdfec96d8b

Author: Marek Olšák <maraeo at gmail.com>
Date:   Mon Jul  1 02:36:37 2013 +0200

r600g: fix color resolve for RGBX8 and RGBX16 integer formats

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

---

 src/gallium/drivers/r600/r600_blit.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 7a0e256..ba5d4ea 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);