i965/nir: Do not scalarize phis in non-scalar setups

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

diff --git a/src/mesa/drivers/dri/nouveau/nv04_surface.c b/src/mesa/drivers/dri/nouveau/nv04_surface.c
index f2fc83e0577353707f461651857b0004430f2fcd..968c05f6593d8fbc5f39dfc99add5615ba53fed1 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv04_surface.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_surface.c
@@ -62,7 +62,7 @@ swzsurf_format(mesa_format format)
        case MESA_FORMAT_B8G8R8X8_UNORM:
        case MESA_FORMAT_B8G8R8A8_UNORM:
        case MESA_FORMAT_A8R8G8B8_UNORM:
-       case MESA_FORMAT_Z24_UNORM_X8_UINT:
+       case MESA_FORMAT_Z24_UNORM_S8_UINT:
        case MESA_FORMAT_S8_UINT_Z24_UNORM:
        case MESA_FORMAT_Z_UNORM32:
                return NV04_SWIZZLED_SURFACE_FORMAT_COLOR_A8R8G8B8;
@@ -101,7 +101,7 @@ surf2d_format(mesa_format format)
        case MESA_FORMAT_B8G8R8X8_UNORM:
        case MESA_FORMAT_B8G8R8A8_UNORM:
        case MESA_FORMAT_A8R8G8B8_UNORM:
-       case MESA_FORMAT_Z24_UNORM_X8_UINT:
+       case MESA_FORMAT_Z24_UNORM_S8_UINT:
        case MESA_FORMAT_S8_UINT_Z24_UNORM:
        case MESA_FORMAT_Z_UNORM32:
                return NV04_CONTEXT_SURFACES_2D_FORMAT_Y32;
@@ -140,7 +140,7 @@ rect_format(mesa_format format)
        case MESA_FORMAT_B8G8R8X8_UNORM:
        case MESA_FORMAT_B8G8R8A8_UNORM:
        case MESA_FORMAT_A8R8G8B8_UNORM:
-       case MESA_FORMAT_Z24_UNORM_X8_UINT:
+       case MESA_FORMAT_Z24_UNORM_S8_UINT:
        case MESA_FORMAT_S8_UINT_Z24_UNORM:
        case MESA_FORMAT_Z_UNORM32:
                return NV04_GDI_RECTANGLE_TEXT_COLOR_FORMAT_A8R8G8B8;
@@ -179,7 +179,7 @@ sifm_format(mesa_format format)
        case MESA_FORMAT_B8G8R8X8_UNORM:
        case MESA_FORMAT_B8G8R8A8_UNORM:
        case MESA_FORMAT_A8R8G8B8_UNORM:
-       case MESA_FORMAT_Z24_UNORM_X8_UINT:
+       case MESA_FORMAT_Z24_UNORM_S8_UINT:
        case MESA_FORMAT_S8_UINT_Z24_UNORM:
        case MESA_FORMAT_Z_UNORM32:
                return NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_A8R8G8B8;