X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fnouveau%2Fnv04_surface.c;h=968c05f6593d8fbc5f39dfc99add5615ba53fed1;hb=73bf8f3d6b6b571175c5ce324b44fef26915875f;hp=c83907170514b46ef8617c2591ab864962b1cb32;hpb=ef145ba4ded6aafb28e3bda02fb348e6b8bff12a;p=mesa.git

diff --git a/src/mesa/drivers/dri/nouveau/nv04_surface.c b/src/mesa/drivers/dri/nouveau/nv04_surface.c
index c8390717051..968c05f6593 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_surface.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_surface.c
@@ -37,24 +37,24 @@ static inline int
 swzsurf_format(mesa_format format)
 {
 	switch (format) {
-	case MESA_FORMAT_A8:
-	case MESA_FORMAT_L8:
-	case MESA_FORMAT_I8:
-	case MESA_FORMAT_RGB332:
+	case MESA_FORMAT_A_UNORM8:
+	case MESA_FORMAT_L_UNORM8:
+	case MESA_FORMAT_I_UNORM8:
+	case MESA_FORMAT_B2G3R3_UNORM:
 		return NV04_SWIZZLED_SURFACE_FORMAT_COLOR_Y8;
 
-	case MESA_FORMAT_RGB565:
-	case MESA_FORMAT_RGB565_REV:
-	case MESA_FORMAT_ARGB4444:
-	case MESA_FORMAT_ARGB4444_REV:
-	case MESA_FORMAT_ARGB1555:
-	case MESA_FORMAT_RGBA5551:
-	case MESA_FORMAT_ARGB1555_REV:
-	case MESA_FORMAT_AL88:
-	case MESA_FORMAT_AL88_REV:
+	case MESA_FORMAT_B5G6R5_UNORM:
+	case MESA_FORMAT_R5G6B5_UNORM:
+	case MESA_FORMAT_B4G4R4A4_UNORM:
+	case MESA_FORMAT_A4R4G4B4_UNORM:
+	case MESA_FORMAT_B5G5R5A1_UNORM:
+	case MESA_FORMAT_A1B5G5R5_UNORM:
+	case MESA_FORMAT_A1R5G5B5_UNORM:
+	case MESA_FORMAT_L8A8_UNORM:
+	case MESA_FORMAT_A8L8_UNORM:
 	case MESA_FORMAT_YCBCR:
 	case MESA_FORMAT_YCBCR_REV:
-	case MESA_FORMAT_Z16:
+	case MESA_FORMAT_Z_UNORM16:
 		return NV04_SWIZZLED_SURFACE_FORMAT_COLOR_R5G6B5;
 
 	case MESA_FORMAT_A8B8G8R8_UNORM:
@@ -62,9 +62,9 @@ swzsurf_format(mesa_format format)
 	case MESA_FORMAT_B8G8R8X8_UNORM:
 	case MESA_FORMAT_B8G8R8A8_UNORM:
 	case MESA_FORMAT_A8R8G8B8_UNORM:
-	case MESA_FORMAT_S8_Z24:
-	case MESA_FORMAT_Z24_S8:
-	case MESA_FORMAT_Z32:
+	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;
 
 	default:
@@ -76,24 +76,24 @@ static inline int
 surf2d_format(mesa_format format)
 {
 	switch (format) {
-	case MESA_FORMAT_A8:
-	case MESA_FORMAT_L8:
-	case MESA_FORMAT_I8:
-	case MESA_FORMAT_RGB332:
+	case MESA_FORMAT_A_UNORM8:
+	case MESA_FORMAT_L_UNORM8:
+	case MESA_FORMAT_I_UNORM8:
+	case MESA_FORMAT_B2G3R3_UNORM:
 		return NV04_CONTEXT_SURFACES_2D_FORMAT_Y8;
 
-	case MESA_FORMAT_RGB565:
-	case MESA_FORMAT_RGB565_REV:
-	case MESA_FORMAT_ARGB4444:
-	case MESA_FORMAT_ARGB4444_REV:
-	case MESA_FORMAT_ARGB1555:
-	case MESA_FORMAT_RGBA5551:
-	case MESA_FORMAT_ARGB1555_REV:
-	case MESA_FORMAT_AL88:
-	case MESA_FORMAT_AL88_REV:
+	case MESA_FORMAT_B5G6R5_UNORM:
+	case MESA_FORMAT_R5G6B5_UNORM:
+	case MESA_FORMAT_B4G4R4A4_UNORM:
+	case MESA_FORMAT_A4R4G4B4_UNORM:
+	case MESA_FORMAT_B5G5R5A1_UNORM:
+	case MESA_FORMAT_A1B5G5R5_UNORM:
+	case MESA_FORMAT_A1R5G5B5_UNORM:
+	case MESA_FORMAT_L8A8_UNORM:
+	case MESA_FORMAT_A8L8_UNORM:
 	case MESA_FORMAT_YCBCR:
 	case MESA_FORMAT_YCBCR_REV:
-	case MESA_FORMAT_Z16:
+	case MESA_FORMAT_Z_UNORM16:
 		return NV04_CONTEXT_SURFACES_2D_FORMAT_R5G6B5;
 
 	case MESA_FORMAT_A8B8G8R8_UNORM:
@@ -101,9 +101,9 @@ surf2d_format(mesa_format format)
 	case MESA_FORMAT_B8G8R8X8_UNORM:
 	case MESA_FORMAT_B8G8R8A8_UNORM:
 	case MESA_FORMAT_A8R8G8B8_UNORM:
-	case MESA_FORMAT_S8_Z24:
-	case MESA_FORMAT_Z24_S8:
-	case MESA_FORMAT_Z32:
+	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;
 
 	default:
@@ -115,24 +115,24 @@ static inline int
 rect_format(mesa_format format)
 {
 	switch (format) {
-	case MESA_FORMAT_A8:
-	case MESA_FORMAT_L8:
-	case MESA_FORMAT_I8:
-	case MESA_FORMAT_RGB332:
+	case MESA_FORMAT_A_UNORM8:
+	case MESA_FORMAT_L_UNORM8:
+	case MESA_FORMAT_I_UNORM8:
+	case MESA_FORMAT_B2G3R3_UNORM:
 		return NV04_GDI_RECTANGLE_TEXT_COLOR_FORMAT_A8R8G8B8;
 
-	case MESA_FORMAT_RGB565:
-	case MESA_FORMAT_RGB565_REV:
-	case MESA_FORMAT_ARGB4444:
-	case MESA_FORMAT_ARGB4444_REV:
-	case MESA_FORMAT_ARGB1555:
-	case MESA_FORMAT_RGBA5551:
-	case MESA_FORMAT_ARGB1555_REV:
-	case MESA_FORMAT_AL88:
-	case MESA_FORMAT_AL88_REV:
+	case MESA_FORMAT_B5G6R5_UNORM:
+	case MESA_FORMAT_R5G6B5_UNORM:
+	case MESA_FORMAT_B4G4R4A4_UNORM:
+	case MESA_FORMAT_A4R4G4B4_UNORM:
+	case MESA_FORMAT_B5G5R5A1_UNORM:
+	case MESA_FORMAT_A1B5G5R5_UNORM:
+	case MESA_FORMAT_A1R5G5B5_UNORM:
+	case MESA_FORMAT_L8A8_UNORM:
+	case MESA_FORMAT_A8L8_UNORM:
 	case MESA_FORMAT_YCBCR:
 	case MESA_FORMAT_YCBCR_REV:
-	case MESA_FORMAT_Z16:
+	case MESA_FORMAT_Z_UNORM16:
 		return NV04_GDI_RECTANGLE_TEXT_COLOR_FORMAT_A16R5G6B5;
 
 	case MESA_FORMAT_A8B8G8R8_UNORM:
@@ -140,9 +140,9 @@ rect_format(mesa_format format)
 	case MESA_FORMAT_B8G8R8X8_UNORM:
 	case MESA_FORMAT_B8G8R8A8_UNORM:
 	case MESA_FORMAT_A8R8G8B8_UNORM:
-	case MESA_FORMAT_S8_Z24:
-	case MESA_FORMAT_Z24_S8:
-	case MESA_FORMAT_Z32:
+	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;
 
 	default:
@@ -154,24 +154,24 @@ static inline int
 sifm_format(mesa_format format)
 {
 	switch (format) {
-	case MESA_FORMAT_A8:
-	case MESA_FORMAT_L8:
-	case MESA_FORMAT_I8:
-	case MESA_FORMAT_RGB332:
+	case MESA_FORMAT_A_UNORM8:
+	case MESA_FORMAT_L_UNORM8:
+	case MESA_FORMAT_I_UNORM8:
+	case MESA_FORMAT_B2G3R3_UNORM:
 		return NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_AY8;
 
-	case MESA_FORMAT_RGB565:
-	case MESA_FORMAT_RGB565_REV:
-	case MESA_FORMAT_ARGB4444:
-	case MESA_FORMAT_ARGB4444_REV:
-	case MESA_FORMAT_ARGB1555:
-	case MESA_FORMAT_RGBA5551:
-	case MESA_FORMAT_ARGB1555_REV:
-	case MESA_FORMAT_AL88:
-	case MESA_FORMAT_AL88_REV:
+	case MESA_FORMAT_B5G6R5_UNORM:
+	case MESA_FORMAT_R5G6B5_UNORM:
+	case MESA_FORMAT_B4G4R4A4_UNORM:
+	case MESA_FORMAT_A4R4G4B4_UNORM:
+	case MESA_FORMAT_B5G5R5A1_UNORM:
+	case MESA_FORMAT_A1B5G5R5_UNORM:
+	case MESA_FORMAT_A1R5G5B5_UNORM:
+	case MESA_FORMAT_L8A8_UNORM:
+	case MESA_FORMAT_A8L8_UNORM:
 	case MESA_FORMAT_YCBCR:
 	case MESA_FORMAT_YCBCR_REV:
-	case MESA_FORMAT_Z16:
+	case MESA_FORMAT_Z_UNORM16:
 		return NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_R5G6B5;
 
 	case MESA_FORMAT_A8B8G8R8_UNORM:
@@ -179,9 +179,9 @@ sifm_format(mesa_format format)
 	case MESA_FORMAT_B8G8R8X8_UNORM:
 	case MESA_FORMAT_B8G8R8A8_UNORM:
 	case MESA_FORMAT_A8R8G8B8_UNORM:
-	case MESA_FORMAT_S8_Z24:
-	case MESA_FORMAT_Z24_S8:
-	case MESA_FORMAT_Z32:
+	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;
 
 	default: