Merge remote branch 'origin/master' into gallium_draw_llvm

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_fbo.c

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
index c5fb0151b35ad03768739e28736bdb2b4040ddd6..2ec3dc92420c0e6480296e2157ba9a77e022a74e 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
@@ -72,7 +72,7 @@ set_renderbuffer_format(struct gl_renderbuffer *rb, GLenum internalFormat)
        case GL_DEPTH24_STENCIL8_EXT:
                rb->_BaseFormat  = GL_DEPTH_STENCIL;
                rb->Format = MESA_FORMAT_Z24_S8;
-               rb->DataType = GL_UNSIGNED_INT;
+               rb->DataType = GL_UNSIGNED_INT_24_8_EXT;
                s->cpp = 4;
                break;
        default:
@@ -142,7 +142,6 @@ nouveau_renderbuffer_dri_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
        rb->Width = width;
        rb->Height = height;
 
-       context_dirty(ctx, FRAMEBUFFER);
        return GL_TRUE;
 }
 
@@ -216,6 +215,8 @@ get_tex_format(struct gl_texture_image *ti)
        switch (ti->TexFormat) {
        case MESA_FORMAT_ARGB8888:
                return GL_RGBA8;
+       case MESA_FORMAT_XRGB8888:
+               return GL_RGB8;
        case MESA_FORMAT_RGB565:
                return GL_RGB5;
        default: