freedreno: update generated headers / a4xx fmt rename

Signed-off-by: Rob Clark <[email protected]>

2 files changed, 120 insertions, 120 deletions

diff --git a/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h b/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
index ef125779efb..bf49527cd9b 100644
--- a/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
+++ b/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
@@ -14,7 +14,7 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  10551 bytes, from 2014-11-13 22:44:30)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  15076 bytes, from 2014-12-01 22:40:01)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  64344 bytes, from 2014-12-03 14:14:54)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (  49200 bytes, from 2014-12-03 14:14:54)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (  49060 bytes, from 2014-12-03 22:36:15)
 
 Copyright (C) 2013-2014 by the following authors:
 - Rob Clark <[email protected]> (robclark)
@@ -63,73 +63,73 @@ enum a4xx_rb_blend_opcode {
 };
 
 enum a4xx_vtx_fmt {
-	VFMT4_FLOAT_32 = 1,
-	VFMT4_FLOAT_32_32 = 2,
-	VFMT4_FLOAT_32_32_32 = 3,
-	VFMT4_FLOAT_32_32_32_32 = 4,
-	VFMT4_FLOAT_16 = 5,
-	VFMT4_FLOAT_16_16 = 6,
-	VFMT4_FLOAT_16_16_16 = 7,
-	VFMT4_FLOAT_16_16_16_16 = 8,
-	VFMT4_FIXED_32 = 9,
-	VFMT4_FIXED_32_32 = 10,
-	VFMT4_FIXED_32_32_32 = 11,
-	VFMT4_FIXED_32_32_32_32 = 12,
-	VFMT4_SHORT_16 = 16,
-	VFMT4_SHORT_16_16 = 17,
-	VFMT4_SHORT_16_16_16 = 18,
-	VFMT4_SHORT_16_16_16_16 = 19,
-	VFMT4_USHORT_16 = 20,
-	VFMT4_USHORT_16_16 = 21,
-	VFMT4_USHORT_16_16_16 = 22,
-	VFMT4_USHORT_16_16_16_16 = 23,
-	VFMT4_NORM_SHORT_16 = 24,
-	VFMT4_NORM_SHORT_16_16 = 25,
-	VFMT4_NORM_SHORT_16_16_16 = 26,
-	VFMT4_NORM_SHORT_16_16_16_16 = 27,
-	VFMT4_NORM_USHORT_16 = 28,
-	VFMT4_NORM_USHORT_16_16 = 29,
-	VFMT4_NORM_USHORT_16_16_16 = 30,
-	VFMT4_NORM_USHORT_16_16_16_16 = 31,
-	VFMT4_UBYTE_8 = 40,
-	VFMT4_UBYTE_8_8 = 41,
-	VFMT4_UBYTE_8_8_8 = 42,
-	VFMT4_UBYTE_8_8_8_8 = 43,
-	VFMT4_NORM_UBYTE_8 = 44,
-	VFMT4_NORM_UBYTE_8_8 = 45,
-	VFMT4_NORM_UBYTE_8_8_8 = 46,
-	VFMT4_NORM_UBYTE_8_8_8_8 = 47,
-	VFMT4_BYTE_8 = 48,
-	VFMT4_BYTE_8_8 = 49,
-	VFMT4_BYTE_8_8_8 = 50,
-	VFMT4_BYTE_8_8_8_8 = 51,
-	VFMT4_NORM_BYTE_8 = 52,
-	VFMT4_NORM_BYTE_8_8 = 53,
-	VFMT4_NORM_BYTE_8_8_8 = 54,
-	VFMT4_NORM_BYTE_8_8_8_8 = 55,
-	VFMT4_UINT_10_10_10_2 = 60,
-	VFMT4_NORM_UINT_10_10_10_2 = 61,
-	VFMT4_INT_10_10_10_2 = 62,
-	VFMT4_NORM_INT_10_10_10_2 = 63,
+	VFMT4_32_FLOAT = 1,
+	VFMT4_32_32_FLOAT = 2,
+	VFMT4_32_32_32_FLOAT = 3,
+	VFMT4_32_32_32_32_FLOAT = 4,
+	VFMT4_16_FLOAT = 5,
+	VFMT4_16_16_FLOAT = 6,
+	VFMT4_16_16_16_FLOAT = 7,
+	VFMT4_16_16_16_16_FLOAT = 8,
+	VFMT4_32_FIXED = 9,
+	VFMT4_32_32_FIXED = 10,
+	VFMT4_32_32_32_FIXED = 11,
+	VFMT4_32_32_32_32_FIXED = 12,
+	VFMT4_16_SINT = 16,
+	VFMT4_16_16_SINT = 17,
+	VFMT4_16_16_16_SINT = 18,
+	VFMT4_16_16_16_16_SINT = 19,
+	VFMT4_16_UINT = 20,
+	VFMT4_16_16_UINT = 21,
+	VFMT4_16_16_16_UINT = 22,
+	VFMT4_16_16_16_16_UINT = 23,
+	VFMT4_16_SNORM = 24,
+	VFMT4_16_16_SNORM = 25,
+	VFMT4_16_16_16_SNORM = 26,
+	VFMT4_16_16_16_16_SNORM = 27,
+	VFMT4_16_UNORM = 28,
+	VFMT4_16_16_UNORM = 29,
+	VFMT4_16_16_16_UNORM = 30,
+	VFMT4_16_16_16_16_UNORM = 31,
+	VFMT4_8_UINT = 40,
+	VFMT4_8_8_UINT = 41,
+	VFMT4_8_8_8_UINT = 42,
+	VFMT4_8_8_8_8_UINT = 43,
+	VFMT4_8_UNORM = 44,
+	VFMT4_8_8_UNORM = 45,
+	VFMT4_8_8_8_UNORM = 46,
+	VFMT4_8_8_8_8_UNORM = 47,
+	VFMT4_8_SINT = 48,
+	VFMT4_8_8_SINT = 49,
+	VFMT4_8_8_8_SINT = 50,
+	VFMT4_8_8_8_8_SINT = 51,
+	VFMT4_8_SNORM = 52,
+	VFMT4_8_8_SNORM = 53,
+	VFMT4_8_8_8_SNORM = 54,
+	VFMT4_8_8_8_8_SNORM = 55,
+	VFMT4_10_10_10_2_UINT = 60,
+	VFMT4_10_10_10_2_UNORM = 61,
+	VFMT4_10_10_10_2_SINT = 62,
+	VFMT4_10_10_10_2_SNORM = 63,
 };
 
 enum a4xx_tex_fmt {
-	TFMT4_NORM_USHORT_565 = 11,
-	TFMT4_NORM_USHORT_5551 = 10,
-	TFMT4_NORM_USHORT_4444 = 8,
-	TFMT4_NORM_UINT_X8Z24 = 71,
-	TFMT4_NORM_UINT_2_10_10_10 = 33,
-	TFMT4_NORM_UINT_A8 = 3,
-	TFMT4_NORM_UINT_L8_A8 = 13,
-	TFMT4_NORM_UINT_8 = 4,
-	TFMT4_NORM_UINT_8_8 = 14,
-	TFMT4_NORM_UINT_8_8_8_8 = 28,
-	TFMT4_FLOAT_16 = 20,
-	TFMT4_FLOAT_16_16 = 40,
-	TFMT4_FLOAT_16_16_16_16 = 53,
-	TFMT4_FLOAT_32 = 43,
-	TFMT4_FLOAT_32_32 = 56,
-	TFMT4_FLOAT_32_32_32_32 = 63,
+	TFMT4_5_6_5_UNORM = 11,
+	TFMT4_5_5_5_1_UNORM = 10,
+	TFMT4_4_4_4_4_UNORM = 8,
+	TFMT4_X8Z24_UNORM = 71,
+	TFMT4_10_10_10_2_UNORM = 33,
+	TFMT4_A8_UNORM = 3,
+	TFMT4_L8_A8_UNORM = 13,
+	TFMT4_8_UNORM = 4,
+	TFMT4_8_8_UNORM = 14,
+	TFMT4_8_8_8_8_UNORM = 28,
+	TFMT4_16_FLOAT = 20,
+	TFMT4_16_16_FLOAT = 40,
+	TFMT4_16_16_16_16_FLOAT = 53,
+	TFMT4_32_FLOAT = 43,
+	TFMT4_32_32_FLOAT = 56,
+	TFMT4_32_32_32_32_FLOAT = 63,
 };
 
 enum a4xx_depth_format {
diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_util.c b/src/gallium/drivers/freedreno/a4xx/fd4_util.c
index 000206ac7b7..2dd0e7f278a 100644
--- a/src/gallium/drivers/freedreno/a4xx/fd4_util.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_util.c
@@ -38,177 +38,177 @@ fd4_pipe2vtx(enum pipe_format format)
 	switch (format) {
 	/* 8-bit buffers. */
 	case PIPE_FORMAT_R8_UNORM:
-		return VFMT4_NORM_UBYTE_8;
+		return VFMT4_8_UNORM;
 
 	case PIPE_FORMAT_R8_SNORM:
-		return VFMT4_NORM_BYTE_8;
+		return VFMT4_8_SNORM;
 
 	case PIPE_FORMAT_R8_UINT:
 	case PIPE_FORMAT_R8_USCALED:
-		return VFMT4_UBYTE_8;
+		return VFMT4_8_UINT;
 
 	case PIPE_FORMAT_R8_SINT:
 	case PIPE_FORMAT_R8_SSCALED:
-		return VFMT4_BYTE_8;
+		return VFMT4_8_SINT;
 
 	/* 16-bit buffers. */
 	case PIPE_FORMAT_R16_UNORM:
 	case PIPE_FORMAT_Z16_UNORM:
-		return VFMT4_NORM_USHORT_16;
+		return VFMT4_16_UNORM;
 
 	case PIPE_FORMAT_R16_SNORM:
-		return VFMT4_NORM_SHORT_16;
+		return VFMT4_16_SNORM;
 
 	case PIPE_FORMAT_R16_UINT:
 	case PIPE_FORMAT_R16_USCALED:
-		return VFMT4_USHORT_16;
+		return VFMT4_16_UINT;
 
 	case PIPE_FORMAT_R16_SINT:
 	case PIPE_FORMAT_R16_SSCALED:
-		return VFMT4_SHORT_16;
+		return VFMT4_16_SINT;
 
 	case PIPE_FORMAT_R16_FLOAT:
-		return VFMT4_FLOAT_16;
+		return VFMT4_16_FLOAT;
 
 	case PIPE_FORMAT_R8G8_UNORM:
-		return VFMT4_NORM_UBYTE_8_8;
+		return VFMT4_8_8_UNORM;
 
 	case PIPE_FORMAT_R8G8_SNORM:
-		return VFMT4_NORM_BYTE_8_8;
+		return VFMT4_8_8_SNORM;
 
 	case PIPE_FORMAT_R8G8_UINT:
 	case PIPE_FORMAT_R8G8_USCALED:
-		return VFMT4_UBYTE_8_8;
+		return VFMT4_8_8_UINT;
 
 	case PIPE_FORMAT_R8G8_SINT:
 	case PIPE_FORMAT_R8G8_SSCALED:
-		return VFMT4_BYTE_8_8;
+		return VFMT4_8_8_SINT;
 
 	/* 24-bit buffers. */
 	case PIPE_FORMAT_R8G8B8_UNORM:
-		return VFMT4_NORM_UBYTE_8_8_8;
+		return VFMT4_8_8_8_UNORM;
 
 	case PIPE_FORMAT_R8G8B8_SNORM:
-		return VFMT4_NORM_BYTE_8_8_8;
+		return VFMT4_8_8_8_SNORM;
 
 	case PIPE_FORMAT_R8G8B8_UINT:
 	case PIPE_FORMAT_R8G8B8_USCALED:
-		return VFMT4_UBYTE_8_8_8;
+		return VFMT4_8_8_8_UINT;
 
 	case PIPE_FORMAT_R8G8B8_SINT:
 	case PIPE_FORMAT_R8G8B8_SSCALED:
-		return VFMT4_BYTE_8_8_8;
+		return VFMT4_8_8_8_SINT;
 
 	/* 32-bit buffers. */
 	case PIPE_FORMAT_A8B8G8R8_UNORM:
 	case PIPE_FORMAT_A8R8G8B8_UNORM:
 	case PIPE_FORMAT_B8G8R8A8_UNORM:
 	case PIPE_FORMAT_R8G8B8A8_UNORM:
-		return VFMT4_NORM_UBYTE_8_8_8_8;
+		return VFMT4_8_8_8_8_UNORM;
 
 	case PIPE_FORMAT_R8G8B8A8_SNORM:
-		return VFMT4_NORM_BYTE_8_8_8_8;
+		return VFMT4_8_8_8_8_SNORM;
 
 	case PIPE_FORMAT_R8G8B8A8_UINT:
 	case PIPE_FORMAT_R8G8B8A8_USCALED:
-		return VFMT4_UBYTE_8_8_8_8;
+		return VFMT4_8_8_8_8_UINT;
 
 	case PIPE_FORMAT_R8G8B8A8_SINT:
 	case PIPE_FORMAT_R8G8B8A8_SSCALED:
-		return VFMT4_BYTE_8_8_8_8;
+		return VFMT4_8_8_8_8_SINT;
 
 	case PIPE_FORMAT_R16G16_SSCALED:
 	case PIPE_FORMAT_R16G16_SINT:
-		return VFMT4_SHORT_16_16;
+		return VFMT4_16_16_SINT;
 
 	case PIPE_FORMAT_R16G16_FLOAT:
-		return VFMT4_FLOAT_16_16;
+		return VFMT4_16_16_FLOAT;
 
 	case PIPE_FORMAT_R16G16_UINT:
 	case PIPE_FORMAT_R16G16_USCALED:
-		return VFMT4_USHORT_16_16;
+		return VFMT4_16_16_UINT;
 
 	case PIPE_FORMAT_R16G16_UNORM:
-		return VFMT4_NORM_USHORT_16_16;
+		return VFMT4_16_16_UNORM;
 
 	case PIPE_FORMAT_R16G16_SNORM:
-		return VFMT4_NORM_SHORT_16_16;
+		return VFMT4_16_16_SNORM;
 
 	case PIPE_FORMAT_R10G10B10A2_UNORM:
-		return VFMT4_NORM_UINT_10_10_10_2;
+		return VFMT4_10_10_10_2_UNORM;
 
 	case PIPE_FORMAT_R10G10B10A2_SNORM:
-		return VFMT4_NORM_INT_10_10_10_2;
+		return VFMT4_10_10_10_2_SNORM;
 
 	case PIPE_FORMAT_R10G10B10A2_UINT:
 	case PIPE_FORMAT_R10G10B10A2_USCALED:
-		return VFMT4_UINT_10_10_10_2;
+		return VFMT4_10_10_10_2_UINT;
 
 	case PIPE_FORMAT_R10G10B10A2_SSCALED:
-		return VFMT4_INT_10_10_10_2;
+		return VFMT4_10_10_10_2_SINT;
 
 	/* 48-bit buffers. */
 	case PIPE_FORMAT_R16G16B16_FLOAT:
-		return VFMT4_FLOAT_16_16_16;
+		return VFMT4_16_16_16_FLOAT;
 
 	case PIPE_FORMAT_R16G16B16_SINT:
 	case PIPE_FORMAT_R16G16B16_SSCALED:
-		return VFMT4_SHORT_16_16_16;
+		return VFMT4_16_16_16_SINT;
 
 	case PIPE_FORMAT_R16G16B16_UINT:
 	case PIPE_FORMAT_R16G16B16_USCALED:
-		return VFMT4_USHORT_16_16_16;
+		return VFMT4_16_16_16_UINT;
 
 	case PIPE_FORMAT_R16G16B16_SNORM:
-		return VFMT4_NORM_SHORT_16_16_16;
+		return VFMT4_16_16_16_SNORM;
 
 	case PIPE_FORMAT_R16G16B16_UNORM:
-		return VFMT4_NORM_USHORT_16_16_16;
+		return VFMT4_16_16_16_UNORM;
 
 	case PIPE_FORMAT_R32_FLOAT:
 	case PIPE_FORMAT_Z32_FLOAT:
-		return VFMT4_FLOAT_32;
+		return VFMT4_32_FLOAT;
 
 	case PIPE_FORMAT_R32_FIXED:
-		return VFMT4_FIXED_32;
+		return VFMT4_32_FIXED;
 
 	/* 64-bit buffers. */
 	case PIPE_FORMAT_R16G16B16A16_UNORM:
-		return VFMT4_NORM_USHORT_16_16_16_16;
+		return VFMT4_16_16_16_16_UNORM;
 
 	case PIPE_FORMAT_R16G16B16A16_SNORM:
-		return VFMT4_NORM_SHORT_16_16_16_16;
+		return VFMT4_16_16_16_16_SNORM;
 
 	case PIPE_FORMAT_R16G16B16A16_UINT:
 	case PIPE_FORMAT_R16G16B16A16_USCALED:
-		return VFMT4_USHORT_16_16_16_16;
+		return VFMT4_16_16_16_16_UINT;
 
 	case PIPE_FORMAT_R16G16B16A16_SINT:
 	case PIPE_FORMAT_R16G16B16A16_SSCALED:
-		return VFMT4_SHORT_16_16_16_16;
+		return VFMT4_16_16_16_16_SINT;
 
 	case PIPE_FORMAT_R32G32_FLOAT:
-		return VFMT4_FLOAT_32_32;
+		return VFMT4_32_32_FLOAT;
 
 	case PIPE_FORMAT_R32G32_FIXED:
-		return VFMT4_FIXED_32_32;
+		return VFMT4_32_32_FIXED;
 
 	case PIPE_FORMAT_R16G16B16A16_FLOAT:
-		return VFMT4_FLOAT_16_16_16_16;
+		return VFMT4_16_16_16_16_FLOAT;
 
 	/* 96-bit buffers. */
 	case PIPE_FORMAT_R32G32B32_FLOAT:
-		return VFMT4_FLOAT_32_32_32;
+		return VFMT4_32_32_32_FLOAT;
 
 	case PIPE_FORMAT_R32G32B32_FIXED:
-		return VFMT4_FIXED_32_32_32;
+		return VFMT4_32_32_32_FIXED;
 
 	/* 128-bit buffers. */
 	case PIPE_FORMAT_R32G32B32A32_FLOAT:
-		return VFMT4_FLOAT_32_32_32_32;
+		return VFMT4_32_32_32_32_FLOAT;
 
 	case PIPE_FORMAT_R32G32B32A32_FIXED:
-		return VFMT4_FIXED_32_32_32_32;
+		return VFMT4_32_32_32_32_FIXED;
 
 /* TODO probably need gles3 blob drivers to find the 32bit int formats:
 	case PIPE_FORMAT_R32G32B32A32_SNORM:
@@ -244,10 +244,10 @@ fd4_pipe2tex(enum pipe_format format)
 	case PIPE_FORMAT_L8_UNORM:
 	case PIPE_FORMAT_A8_UNORM:
 	case PIPE_FORMAT_I8_UNORM:
-		return TFMT4_NORM_UINT_8;
+		return TFMT4_8_UNORM;
 
 	case PIPE_FORMAT_R8G8_UNORM:
-		return TFMT4_NORM_UINT_8_8;
+		return TFMT4_8_8_UNORM;
 
 	case PIPE_FORMAT_B8G8R8A8_UNORM:
 	case PIPE_FORMAT_B8G8R8X8_UNORM:
@@ -257,24 +257,24 @@ fd4_pipe2tex(enum pipe_format format)
 	case PIPE_FORMAT_B8G8R8X8_SRGB:
 	case PIPE_FORMAT_R8G8B8A8_SRGB:
 	case PIPE_FORMAT_R8G8B8X8_SRGB:
-		return TFMT4_NORM_UINT_8_8_8_8;
+		return TFMT4_8_8_8_8_UNORM;
 
 	case PIPE_FORMAT_Z24X8_UNORM:
-		return TFMT4_NORM_UINT_X8Z24;
+		return TFMT4_X8Z24_UNORM;
 
 	case PIPE_FORMAT_Z24_UNORM_S8_UINT:
-		return TFMT4_NORM_UINT_8_8_8_8;
+		return TFMT4_8_8_8_8_UNORM;
 
 //	case PIPE_FORMAT_Z16_UNORM:
 //		return TFMT4_NORM_UINT_8_8;
 //
 	case PIPE_FORMAT_R16G16B16A16_FLOAT:
 	case PIPE_FORMAT_R16G16B16X16_FLOAT:
-		return TFMT4_FLOAT_16_16_16_16;
+		return TFMT4_16_16_16_16_FLOAT;
 
 	case PIPE_FORMAT_R32G32B32A32_FLOAT:
 	case PIPE_FORMAT_R32G32B32X32_FLOAT:
-		return TFMT4_FLOAT_32_32_32_32;
+		return TFMT4_32_32_32_32_FLOAT;
 
 	// TODO add more..