xserver mesa xkeyboard-config git update 30 Apr 2011

1 files changed, 5 insertions, 2 deletions

diff --git a/mesalib/src/mesa/main/texrender.c b/mesalib/src/mesa/main/texrender.c
index 2766bd6c5..4bcef9899 100644
--- a/mesalib/src/mesa/main/texrender.c
+++ b/mesalib/src/mesa/main/texrender.c
@@ -530,6 +530,7 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
 {

    struct texture_renderbuffer *trb

       = (struct texture_renderbuffer *) att->Renderbuffer;

+   GLuint unused;

 

    (void) ctx;

    ASSERT(trb);

@@ -602,8 +603,10 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
       trb->Base._BaseFormat = GL_RGBA;

       break;

    default:

-      trb->Base.DataType = CHAN_TYPE;

-      trb->Base._BaseFormat = GL_RGBA;

+      _mesa_format_to_type_and_comps(trb->TexImage->TexFormat,

+                                     &trb->Base.DataType, &unused);

+      trb->Base._BaseFormat =

+         _mesa_base_fbo_format(ctx, trb->TexImage->InternalFormat);

    }

    trb->Base.Data = trb->TexImage->Data;

 }