Mesa (master): radeon: Fix KMS on big endian.

[Michel Dänzer]

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

Author: Michel Dänzer <daenzer at vmware.com>
Date:   Sun Aug 30 12:37:10 2009 +0200

radeon: Fix KMS on big endian.

---

 src/mesa/drivers/dri/radeon/radeon_fbo.c    |   10 +++++-----
 src/mesa/drivers/dri/radeon/radeon_screen.c |   11 ++++-------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c b/src/mesa/drivers/dri/radeon/radeon_fbo.c
index 1a9ec6d..79171bc 100644
--- a/src/mesa/drivers/dri/radeon/radeon_fbo.c
+++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c
@@ -394,33 +394,33 @@ radeon_update_wrapper(GLcontext *ctx, struct radeon_renderbuffer *rrb,
 {
 	int retry = 0;
 restart:
-	if (texImage->TexFormat == &_mesa_texformat_argb8888) {
+	if (texImage->TexFormat == _dri_texformat_argb8888) {
 		rrb->cpp = 4;
 		rrb->base._ActualFormat = GL_RGBA8;
 		rrb->base._BaseFormat = GL_RGBA;
 		rrb->base.DataType = GL_UNSIGNED_BYTE;
 		DBG("Render to RGBA8 texture OK\n");
 	}
-	else if (texImage->TexFormat == &_mesa_texformat_rgb565) {
+	else if (texImage->TexFormat == _dri_texformat_rgb565) {
 		rrb->cpp = 2;
 		rrb->base._ActualFormat = GL_RGB5;
 		rrb->base._BaseFormat = GL_RGB;
 		rrb->base.DataType = GL_UNSIGNED_BYTE;
 		DBG("Render to RGB5 texture OK\n");
 	}
-	else if (texImage->TexFormat == &_mesa_texformat_argb1555) {
+	else if (texImage->TexFormat == _dri_texformat_argb1555) {
 		rrb->cpp = 2;
 		rrb->base._ActualFormat = GL_RGB5_A1;
 		rrb->base._BaseFormat = GL_RGBA;
 		rrb->base.DataType = GL_UNSIGNED_BYTE;
 		DBG("Render to ARGB1555 texture OK\n");
 	}
-	else if (texImage->TexFormat == &_mesa_texformat_argb4444) {
+	else if (texImage->TexFormat == _dri_texformat_argb4444) {
 		rrb->cpp = 2;
 		rrb->base._ActualFormat = GL_RGBA4;
 		rrb->base._BaseFormat = GL_RGBA;
 		rrb->base.DataType = GL_UNSIGNED_BYTE;
-		DBG("Render to ARGB1555 texture OK\n");
+		DBG("Render to ARGB4444 texture OK\n");
 	}
 	else if (texImage->TexFormat == &_mesa_texformat_z16) {
 		rrb->cpp = 2;
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index e8b2dc8..0f8775c 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -1686,8 +1686,8 @@ radeonInitScreen(__DRIscreenPrivate *psp)
 static const
 __DRIconfig **radeonInitScreen2(__DRIscreenPrivate *psp)
 {
-   GLenum fb_format[3];
-   GLenum fb_type[3];
+   GLenum fb_format[2];
+   GLenum fb_type[2];
    /* GLX_SWAP_COPY_OML is only supported because the Intel driver doesn't
     * support pageflipping at all.
     */
@@ -1735,11 +1735,8 @@ __DRIconfig **radeonInitScreen2(__DRIscreenPrivate *psp)
    fb_format[0] = GL_RGB;
    fb_type[0] = GL_UNSIGNED_SHORT_5_6_5;
 
-   fb_format[1] = GL_BGR;
-   fb_type[1] = GL_UNSIGNED_INT_8_8_8_8_REV;
-
-   fb_format[2] = GL_BGRA;
-   fb_type[2] = GL_UNSIGNED_INT_8_8_8_8_REV;
+   fb_format[1] = GL_BGRA;
+   fb_type[1] = GL_UNSIGNED_INT_8_8_8_8/*_REV*/;
 
    for (color = 0; color < ARRAY_SIZE(fb_format); color++) {
       __DRIconfig **new_configs;