[Mesa-dev] [PATCH] radeon/r200: Fix FBO formats

smoki smoki00790 at gmail.com
Fri Jan 11 03:37:55 PST 2013


Piglit passes more fbo tests on rv280, 14/28 before and now 28/33.
Also should fix bug:
https://bugs.freedesktop.org/show_bug.cgi?id=27704
---
 src/mesa/drivers/dri/radeon/radeon_texture.c |   22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
index 4835147..78226ef 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
@@ -283,29 +283,7 @@ static gl_format radeonChoose8888TexFormat(radeonContextPtr rmesa,
 					   GLenum srcFormat,
 					   GLenum srcType, GLboolean fbo)
 {
-#if defined(RADEON_R100)
-	/* r100 can only do this */
 	return _radeon_texformat_argb8888;
-#elif defined(RADEON_R200)
-	const GLuint ui = 1;
-	const GLubyte littleEndian = *((const GLubyte *)&ui);
-
-	if (fbo)
-		return _radeon_texformat_argb8888;
-
-	if ((srcFormat == GL_RGBA && srcType == GL_UNSIGNED_INT_8_8_8_8) ||
-	    (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE && !littleEndian) ||
-	    (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_INT_8_8_8_8_REV) ||
-	    (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_BYTE && littleEndian)) {
-		return MESA_FORMAT_RGBA8888;
-	} else if ((srcFormat == GL_RGBA && srcType == GL_UNSIGNED_INT_8_8_8_8_REV) ||
-		   (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE && littleEndian) ||
-		   (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_INT_8_8_8_8) ||
-		   (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_BYTE && !littleEndian)) {
-		return MESA_FORMAT_RGBA8888_REV;
-	} else
-		return _radeon_texformat_argb8888;
-#endif
 }
 
 gl_format radeonChooseTextureFormat_mesa(struct gl_context * ctx,
-- 
1.7.10.4



More information about the mesa-dev mailing list