i965/nir: Don't support gl_FrontFacing as an input variable

[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 81e7d62971f7e7f9581c88cfab204a12616fe0e6..6c479f5f0c637c1ea0700479eaa8380b130624d1 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
@@ -44,23 +44,23 @@ set_renderbuffer_format(struct gl_renderbuffer *rb, GLenum internalFormat)
        case GL_RGB:
        case GL_RGB8:
                rb->_BaseFormat  = GL_RGB;
-               rb->Format = MESA_FORMAT_XRGB8888;
+               rb->Format = MESA_FORMAT_B8G8R8X8_UNORM;
                s->cpp = 4;
                break;
        case GL_RGBA:
        case GL_RGBA8:
                rb->_BaseFormat  = GL_RGBA;
-               rb->Format = MESA_FORMAT_ARGB8888;
+               rb->Format = MESA_FORMAT_B8G8R8A8_UNORM;
                s->cpp = 4;
                break;
        case GL_RGB5:
                rb->_BaseFormat  = GL_RGB;
-               rb->Format = MESA_FORMAT_RGB565;
+               rb->Format = MESA_FORMAT_B5G6R5_UNORM;
                s->cpp = 2;
                break;
        case GL_DEPTH_COMPONENT16:
                rb->_BaseFormat  = GL_DEPTH_COMPONENT;
-               rb->Format = MESA_FORMAT_Z16;
+               rb->Format = MESA_FORMAT_Z_UNORM16;
                s->cpp = 2;
                break;
        case GL_DEPTH_COMPONENT:
@@ -68,7 +68,7 @@ set_renderbuffer_format(struct gl_renderbuffer *rb, GLenum internalFormat)
        case GL_STENCIL_INDEX8_EXT:
        case GL_DEPTH24_STENCIL8_EXT:
                rb->_BaseFormat  = GL_DEPTH_STENCIL;
-               rb->Format = MESA_FORMAT_Z24_S8;
+               rb->Format = MESA_FORMAT_S8_UINT_Z24_UNORM;
                s->cpp = 4;
                break;
        default:
@@ -265,19 +265,20 @@ static void
 nouveau_finish_render_texture(struct gl_context *ctx,
                              struct gl_renderbuffer *rb)
 {
-       texture_dirty(rb->TexImage->TexObject);
+       if (rb && rb->TexImage)
+               texture_dirty(rb->TexImage->TexObject);
 }
 
 static int
-validate_format_bpp(gl_format format)
+validate_format_bpp(mesa_format format)
 {
        switch (format) {
-       case MESA_FORMAT_XRGB8888:
-       case MESA_FORMAT_ARGB8888:
-       case MESA_FORMAT_Z24_S8:
+       case MESA_FORMAT_B8G8R8X8_UNORM:
+       case MESA_FORMAT_B8G8R8A8_UNORM:
+       case MESA_FORMAT_S8_UINT_Z24_UNORM:
                return 32;
-       case MESA_FORMAT_RGB565:
-       case MESA_FORMAT_Z16:
+       case MESA_FORMAT_B5G6R5_UNORM:
+       case MESA_FORMAT_Z_UNORM16:
                return 16;
        default:
                return 0;