swrast: add dri2ConfigQueryExtension to the correct extension list

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

diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
index 1c1f86297feaf0f3d0edcd1b610a12c361c68fcd..cc6b6b06196af17c555fcebb111c6acde06d23ef 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
@@ -36,15 +36,15 @@ static inline unsigned
 get_rt_format(mesa_format format)
 {
        switch (format) {
-       case MESA_FORMAT_XRGB8888:
+       case MESA_FORMAT_B8G8R8X8_UNORM:
                return NV20_3D_RT_FORMAT_COLOR_X8R8G8B8;
-       case MESA_FORMAT_ARGB8888:
+       case MESA_FORMAT_B8G8R8A8_UNORM:
                return NV20_3D_RT_FORMAT_COLOR_A8R8G8B8;
-       case MESA_FORMAT_RGB565:
+       case MESA_FORMAT_B5G6R5_UNORM:
                return NV20_3D_RT_FORMAT_COLOR_R5G6B5;
-       case MESA_FORMAT_Z16:
+       case MESA_FORMAT_Z_UNORM16:
                return NV20_3D_RT_FORMAT_DEPTH_Z16;
-       case MESA_FORMAT_Z24_S8:
+       case MESA_FORMAT_S8_UINT_Z24_UNORM:
                return NV20_3D_RT_FORMAT_DEPTH_Z24S8;
        default:
                assert(0);
@@ -117,7 +117,7 @@ nv20_emit_framebuffer(struct gl_context *ctx, int emit)
                if (context_chipset(ctx) >= 0x25)
                        setup_hierz_buffer(ctx);
        } else {
-               rt_format |= get_rt_format(MESA_FORMAT_Z24_S8);
+               rt_format |= get_rt_format(MESA_FORMAT_S8_UINT_Z24_UNORM);
                zeta_pitch = rt_pitch;
        }
 
@@ -128,6 +128,7 @@ nv20_emit_framebuffer(struct gl_context *ctx, int emit)
        /* Recompute the viewport/scissor state. */
        context_dirty(ctx, VIEWPORT);
        context_dirty(ctx, SCISSOR);
+       context_dirty(ctx, DEPTH);
 }
 
 void