[igt-dev] [PATCH i-g-t v2 3/3] libs: Removal of duplicated SURFACEFORMAT definitions

Lukasz Kalamarz lukasz.kalamarz at intel.com
Fri May 25 07:15:34 UTC 2018


Patch is removing all duplicated definitions of
SURFACEFORMAT from few lib headers

Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz at intel.com>
Cc: Katarzyna Dec <katarzyna.dec at intel.com>
Cc: Radoslaw Szwichtenberg <radoslaw.szwichtenberg at intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
---
 lib/gen6_render.h | 168 ------------------------------------------------------
 lib/gen7_media.h  | 165 -----------------------------------------------------
 lib/gen7_render.h | 168 ------------------------------------------------------
 lib/gen8_media.h  | 165 -----------------------------------------------------
 4 files changed, 666 deletions(-)

diff --git a/lib/gen6_render.h b/lib/gen6_render.h
index 6aa20b62..8f0beda2 100644
--- a/lib/gen6_render.h
+++ b/lib/gen6_render.h
@@ -517,174 +517,6 @@
 #define GEN6_STENCILOP_DECR	6
 #define GEN6_STENCILOP_INVERT	7
 
-#define GEN6_SURFACE_MIPMAPLAYOUT_BELOW		0
-#define GEN6_SURFACE_MIPMAPLAYOUT_RIGHT		1
-
-#define GEN6_SURFACEFORMAT_R32G32B32A32_FLOAT		0x000
-#define GEN6_SURFACEFORMAT_R32G32B32A32_SINT		0x001
-#define GEN6_SURFACEFORMAT_R32G32B32A32_UINT		0x002
-#define GEN6_SURFACEFORMAT_R32G32B32A32_UNORM		0x003
-#define GEN6_SURFACEFORMAT_R32G32B32A32_SNORM		0x004
-#define GEN6_SURFACEFORMAT_R64G64_FLOAT			0x005
-#define GEN6_SURFACEFORMAT_R32G32B32X32_FLOAT		0x006
-#define GEN6_SURFACEFORMAT_R32G32B32A32_SSCALED		0x007
-#define GEN6_SURFACEFORMAT_R32G32B32A32_USCALED		0x008
-#define GEN6_SURFACEFORMAT_R32G32B32_FLOAT		0x040
-#define GEN6_SURFACEFORMAT_R32G32B32_SINT		0x041
-#define GEN6_SURFACEFORMAT_R32G32B32_UINT		0x042
-#define GEN6_SURFACEFORMAT_R32G32B32_UNORM		0x043
-#define GEN6_SURFACEFORMAT_R32G32B32_SNORM		0x044
-#define GEN6_SURFACEFORMAT_R32G32B32_SSCALED		0x045
-#define GEN6_SURFACEFORMAT_R32G32B32_USCALED		0x046
-#define GEN6_SURFACEFORMAT_R16G16B16A16_UNORM		0x080
-#define GEN6_SURFACEFORMAT_R16G16B16A16_SNORM		0x081
-#define GEN6_SURFACEFORMAT_R16G16B16A16_SINT		0x082
-#define GEN6_SURFACEFORMAT_R16G16B16A16_UINT		0x083
-#define GEN6_SURFACEFORMAT_R16G16B16A16_FLOAT		0x084
-#define GEN6_SURFACEFORMAT_R32G32_FLOAT			0x085
-#define GEN6_SURFACEFORMAT_R32G32_SINT			0x086
-#define GEN6_SURFACEFORMAT_R32G32_UINT			0x087
-#define GEN6_SURFACEFORMAT_R32_FLOAT_X8X24_TYPELESS	0x088
-#define GEN6_SURFACEFORMAT_X32_TYPELESS_G8X24_UINT	0x089
-#define GEN6_SURFACEFORMAT_L32A32_FLOAT			0x08A
-#define GEN6_SURFACEFORMAT_R32G32_UNORM			0x08B
-#define GEN6_SURFACEFORMAT_R32G32_SNORM			0x08C
-#define GEN6_SURFACEFORMAT_R64_FLOAT			0x08D
-#define GEN6_SURFACEFORMAT_R16G16B16X16_UNORM		0x08E
-#define GEN6_SURFACEFORMAT_R16G16B16X16_FLOAT		0x08F
-#define GEN6_SURFACEFORMAT_A32X32_FLOAT			0x090
-#define GEN6_SURFACEFORMAT_L32X32_FLOAT			0x091
-#define GEN6_SURFACEFORMAT_I32X32_FLOAT			0x092
-#define GEN6_SURFACEFORMAT_R16G16B16A16_SSCALED		0x093
-#define GEN6_SURFACEFORMAT_R16G16B16A16_USCALED		0x094
-#define GEN6_SURFACEFORMAT_R32G32_SSCALED		0x095
-#define GEN6_SURFACEFORMAT_R32G32_USCALED		0x096
-#define GEN6_SURFACEFORMAT_B8G8R8A8_UNORM		0x0C0
-#define GEN6_SURFACEFORMAT_B8G8R8A8_UNORM_SRGB		0x0C1
-#define GEN6_SURFACEFORMAT_R10G10B10A2_UNORM		0x0C2
-#define GEN6_SURFACEFORMAT_R10G10B10A2_UNORM_SRGB	0x0C3
-#define GEN6_SURFACEFORMAT_R10G10B10A2_UINT		0x0C4
-#define GEN6_SURFACEFORMAT_R10G10B10_SNORM_A2_UNORM	0x0C5
-#define GEN6_SURFACEFORMAT_R8G8B8A8_UNORM		0x0C7
-#define GEN6_SURFACEFORMAT_R8G8B8A8_UNORM_SRGB		0x0C8
-#define GEN6_SURFACEFORMAT_R8G8B8A8_SNORM		0x0C9
-#define GEN6_SURFACEFORMAT_R8G8B8A8_SINT		0x0CA
-#define GEN6_SURFACEFORMAT_R8G8B8A8_UINT		0x0CB
-#define GEN6_SURFACEFORMAT_R16G16_UNORM			0x0CC
-#define GEN6_SURFACEFORMAT_R16G16_SNORM			0x0CD
-#define GEN6_SURFACEFORMAT_R16G16_SINT			0x0CE
-#define GEN6_SURFACEFORMAT_R16G16_UINT			0x0CF
-#define GEN6_SURFACEFORMAT_R16G16_FLOAT			0x0D0
-#define GEN6_SURFACEFORMAT_B10G10R10A2_UNORM		0x0D1
-#define GEN6_SURFACEFORMAT_B10G10R10A2_UNORM_SRGB	0x0D2
-#define GEN6_SURFACEFORMAT_R11G11B10_FLOAT		0x0D3
-#define GEN6_SURFACEFORMAT_R32_SINT			0x0D6
-#define GEN6_SURFACEFORMAT_R32_UINT			0x0D7
-#define GEN6_SURFACEFORMAT_R32_FLOAT			0x0D8
-#define GEN6_SURFACEFORMAT_R24_UNORM_X8_TYPELESS	0x0D9
-#define GEN6_SURFACEFORMAT_X24_TYPELESS_G8_UINT		0x0DA
-#define GEN6_SURFACEFORMAT_L16A16_UNORM			0x0DF
-#define GEN6_SURFACEFORMAT_I24X8_UNORM			0x0E0
-#define GEN6_SURFACEFORMAT_L24X8_UNORM			0x0E1
-#define GEN6_SURFACEFORMAT_A24X8_UNORM			0x0E2
-#define GEN6_SURFACEFORMAT_I32_FLOAT			0x0E3
-#define GEN6_SURFACEFORMAT_L32_FLOAT			0x0E4
-#define GEN6_SURFACEFORMAT_A32_FLOAT			0x0E5
-#define GEN6_SURFACEFORMAT_B8G8R8X8_UNORM		0x0E9
-#define GEN6_SURFACEFORMAT_B8G8R8X8_UNORM_SRGB		0x0EA
-#define GEN6_SURFACEFORMAT_R8G8B8X8_UNORM		0x0EB
-#define GEN6_SURFACEFORMAT_R8G8B8X8_UNORM_SRGB		0x0EC
-#define GEN6_SURFACEFORMAT_R9G9B9E5_SHAREDEXP		0x0ED
-#define GEN6_SURFACEFORMAT_B10G10R10X2_UNORM		0x0EE
-#define GEN6_SURFACEFORMAT_L16A16_FLOAT			0x0F0
-#define GEN6_SURFACEFORMAT_R32_UNORM			0x0F1
-#define GEN6_SURFACEFORMAT_R32_SNORM			0x0F2
-#define GEN6_SURFACEFORMAT_R10G10B10X2_USCALED		0x0F3
-#define GEN6_SURFACEFORMAT_R8G8B8A8_SSCALED		0x0F4
-#define GEN6_SURFACEFORMAT_R8G8B8A8_USCALED		0x0F5
-#define GEN6_SURFACEFORMAT_R16G16_SSCALED		0x0F6
-#define GEN6_SURFACEFORMAT_R16G16_USCALED		0x0F7
-#define GEN6_SURFACEFORMAT_R32_SSCALED			0x0F8
-#define GEN6_SURFACEFORMAT_R32_USCALED			0x0F9
-#define GEN6_SURFACEFORMAT_B5G6R5_UNORM			0x100
-#define GEN6_SURFACEFORMAT_B5G6R5_UNORM_SRGB		0x101
-#define GEN6_SURFACEFORMAT_B5G5R5A1_UNORM		0x102
-#define GEN6_SURFACEFORMAT_B5G5R5A1_UNORM_SRGB		0x103
-#define GEN6_SURFACEFORMAT_B4G4R4A4_UNORM		0x104
-#define GEN6_SURFACEFORMAT_B4G4R4A4_UNORM_SRGB		0x105
-#define GEN6_SURFACEFORMAT_R8G8_UNORM			0x106
-#define GEN6_SURFACEFORMAT_R8G8_SNORM			0x107
-#define GEN6_SURFACEFORMAT_R8G8_SINT			0x108
-#define GEN6_SURFACEFORMAT_R8G8_UINT			0x109
-#define GEN6_SURFACEFORMAT_R16_UNORM			0x10A
-#define GEN6_SURFACEFORMAT_R16_SNORM			0x10B
-#define GEN6_SURFACEFORMAT_R16_SINT			0x10C
-#define GEN6_SURFACEFORMAT_R16_UINT			0x10D
-#define GEN6_SURFACEFORMAT_R16_FLOAT			0x10E
-#define GEN6_SURFACEFORMAT_I16_UNORM			0x111
-#define GEN6_SURFACEFORMAT_L16_UNORM			0x112
-#define GEN6_SURFACEFORMAT_A16_UNORM			0x113
-#define GEN6_SURFACEFORMAT_L8A8_UNORM			0x114
-#define GEN6_SURFACEFORMAT_I16_FLOAT			0x115
-#define GEN6_SURFACEFORMAT_L16_FLOAT			0x116
-#define GEN6_SURFACEFORMAT_A16_FLOAT			0x117
-#define GEN6_SURFACEFORMAT_R5G5_SNORM_B6_UNORM		0x119
-#define GEN6_SURFACEFORMAT_B5G5R5X1_UNORM		0x11A
-#define GEN6_SURFACEFORMAT_B5G5R5X1_UNORM_SRGB		0x11B
-#define GEN6_SURFACEFORMAT_R8G8_SSCALED			0x11C
-#define GEN6_SURFACEFORMAT_R8G8_USCALED			0x11D
-#define GEN6_SURFACEFORMAT_R16_SSCALED			0x11E
-#define GEN6_SURFACEFORMAT_R16_USCALED			0x11F
-#define GEN6_SURFACEFORMAT_R8_UNORM			0x140
-#define GEN6_SURFACEFORMAT_R8_SNORM			0x141
-#define GEN6_SURFACEFORMAT_R8_SINT			0x142
-#define GEN6_SURFACEFORMAT_R8_UINT			0x143
-#define GEN6_SURFACEFORMAT_A8_UNORM			0x144
-#define GEN6_SURFACEFORMAT_I8_UNORM			0x145
-#define GEN6_SURFACEFORMAT_L8_UNORM			0x146
-#define GEN6_SURFACEFORMAT_P4A4_UNORM			0x147
-#define GEN6_SURFACEFORMAT_A4P4_UNORM			0x148
-#define GEN6_SURFACEFORMAT_R8_SSCALED			0x149
-#define GEN6_SURFACEFORMAT_R8_USCALED			0x14A
-#define GEN6_SURFACEFORMAT_R1_UINT			0x181
-#define GEN6_SURFACEFORMAT_YCRCB_NORMAL			0x182
-#define GEN6_SURFACEFORMAT_YCRCB_SWAPUVY		0x183
-#define GEN6_SURFACEFORMAT_BC1_UNORM			0x186
-#define GEN6_SURFACEFORMAT_BC2_UNORM			0x187
-#define GEN6_SURFACEFORMAT_BC3_UNORM			0x188
-#define GEN6_SURFACEFORMAT_BC4_UNORM			0x189
-#define GEN6_SURFACEFORMAT_BC5_UNORM			0x18A
-#define GEN6_SURFACEFORMAT_BC1_UNORM_SRGB		0x18B
-#define GEN6_SURFACEFORMAT_BC2_UNORM_SRGB		0x18C
-#define GEN6_SURFACEFORMAT_BC3_UNORM_SRGB		0x18D
-#define GEN6_SURFACEFORMAT_MONO8			0x18E
-#define GEN6_SURFACEFORMAT_YCRCB_SWAPUV			0x18F
-#define GEN6_SURFACEFORMAT_YCRCB_SWAPY			0x190
-#define GEN6_SURFACEFORMAT_DXT1_RGB			0x191
-#define GEN6_SURFACEFORMAT_FXT1				0x192
-#define GEN6_SURFACEFORMAT_R8G8B8_UNORM			0x193
-#define GEN6_SURFACEFORMAT_R8G8B8_SNORM			0x194
-#define GEN6_SURFACEFORMAT_R8G8B8_SSCALED		0x195
-#define GEN6_SURFACEFORMAT_R8G8B8_USCALED		0x196
-#define GEN6_SURFACEFORMAT_R64G64B64A64_FLOAT		0x197
-#define GEN6_SURFACEFORMAT_R64G64B64_FLOAT		0x198
-#define GEN6_SURFACEFORMAT_BC4_SNORM			0x199
-#define GEN6_SURFACEFORMAT_BC5_SNORM			0x19A
-#define GEN6_SURFACEFORMAT_R16G16B16_UNORM		0x19C
-#define GEN6_SURFACEFORMAT_R16G16B16_SNORM		0x19D
-#define GEN6_SURFACEFORMAT_R16G16B16_SSCALED		0x19E
-#define GEN6_SURFACEFORMAT_R16G16B16_USCALED		0x19F
-
-#define GEN6_SURFACERETURNFORMAT_FLOAT32	0
-#define GEN6_SURFACERETURNFORMAT_S1		1
-
-#define GEN6_SURFACE_1D		0
-#define GEN6_SURFACE_2D		1
-#define GEN6_SURFACE_3D		2
-#define GEN6_SURFACE_CUBE	3
-#define GEN6_SURFACE_BUFFER	4
-#define GEN6_SURFACE_NULL	7
-
 #define GEN6_BORDER_COLOR_MODE_DEFAULT	0
 #define GEN6_BORDER_COLOR_MODE_LEGACY	1
 
diff --git a/lib/gen7_media.h b/lib/gen7_media.h
index 572be4f5..e81b5523 100644
--- a/lib/gen7_media.h
+++ b/lib/gen7_media.h
@@ -4,171 +4,6 @@
 #include <stdint.h>
 #include "surfaceformat.h"
 
-#define GEN7_SURFACEFORMAT_R32G32B32A32_FLOAT             0x000
-#define GEN7_SURFACEFORMAT_R32G32B32A32_SINT              0x001
-#define GEN7_SURFACEFORMAT_R32G32B32A32_UINT              0x002
-#define GEN7_SURFACEFORMAT_R32G32B32A32_UNORM             0x003
-#define GEN7_SURFACEFORMAT_R32G32B32A32_SNORM             0x004
-#define GEN7_SURFACEFORMAT_R64G64_FLOAT                   0x005
-#define GEN7_SURFACEFORMAT_R32G32B32X32_FLOAT             0x006
-#define GEN7_SURFACEFORMAT_R32G32B32A32_SSCALED           0x007
-#define GEN7_SURFACEFORMAT_R32G32B32A32_USCALED           0x008
-#define GEN7_SURFACEFORMAT_R32G32B32_FLOAT                0x040
-#define GEN7_SURFACEFORMAT_R32G32B32_SINT                 0x041
-#define GEN7_SURFACEFORMAT_R32G32B32_UINT                 0x042
-#define GEN7_SURFACEFORMAT_R32G32B32_UNORM                0x043
-#define GEN7_SURFACEFORMAT_R32G32B32_SNORM                0x044
-#define GEN7_SURFACEFORMAT_R32G32B32_SSCALED              0x045
-#define GEN7_SURFACEFORMAT_R32G32B32_USCALED              0x046
-#define GEN7_SURFACEFORMAT_R16G16B16A16_UNORM             0x080
-#define GEN7_SURFACEFORMAT_R16G16B16A16_SNORM             0x081
-#define GEN7_SURFACEFORMAT_R16G16B16A16_SINT              0x082
-#define GEN7_SURFACEFORMAT_R16G16B16A16_UINT              0x083
-#define GEN7_SURFACEFORMAT_R16G16B16A16_FLOAT             0x084
-#define GEN7_SURFACEFORMAT_R32G32_FLOAT                   0x085
-#define GEN7_SURFACEFORMAT_R32G32_SINT                    0x086
-#define GEN7_SURFACEFORMAT_R32G32_UINT                    0x087
-#define GEN7_SURFACEFORMAT_R32_FLOAT_X8X24_TYPELESS       0x088
-#define GEN7_SURFACEFORMAT_X32_TYPELESS_G8X24_UINT        0x089
-#define GEN7_SURFACEFORMAT_L32A32_FLOAT                   0x08A
-#define GEN7_SURFACEFORMAT_R32G32_UNORM                   0x08B
-#define GEN7_SURFACEFORMAT_R32G32_SNORM                   0x08C
-#define GEN7_SURFACEFORMAT_R64_FLOAT                      0x08D
-#define GEN7_SURFACEFORMAT_R16G16B16X16_UNORM             0x08E
-#define GEN7_SURFACEFORMAT_R16G16B16X16_FLOAT             0x08F
-#define GEN7_SURFACEFORMAT_A32X32_FLOAT                   0x090
-#define GEN7_SURFACEFORMAT_L32X32_FLOAT                   0x091
-#define GEN7_SURFACEFORMAT_I32X32_FLOAT                   0x092
-#define GEN7_SURFACEFORMAT_R16G16B16A16_SSCALED           0x093
-#define GEN7_SURFACEFORMAT_R16G16B16A16_USCALED           0x094
-#define GEN7_SURFACEFORMAT_R32G32_SSCALED                 0x095
-#define GEN7_SURFACEFORMAT_R32G32_USCALED                 0x096
-#define GEN7_SURFACEFORMAT_B8G8R8A8_UNORM                 0x0C0
-#define GEN7_SURFACEFORMAT_B8G8R8A8_UNORM_SRGB            0x0C1
-#define GEN7_SURFACEFORMAT_R10G10B10A2_UNORM              0x0C2
-#define GEN7_SURFACEFORMAT_R10G10B10A2_UNORM_SRGB         0x0C3
-#define GEN7_SURFACEFORMAT_R10G10B10A2_UINT               0x0C4
-#define GEN7_SURFACEFORMAT_R10G10B10_SNORM_A2_UNORM       0x0C5
-#define GEN7_SURFACEFORMAT_R8G8B8A8_UNORM                 0x0C7
-#define GEN7_SURFACEFORMAT_R8G8B8A8_UNORM_SRGB            0x0C8
-#define GEN7_SURFACEFORMAT_R8G8B8A8_SNORM                 0x0C9
-#define GEN7_SURFACEFORMAT_R8G8B8A8_SINT                  0x0CA
-#define GEN7_SURFACEFORMAT_R8G8B8A8_UINT                  0x0CB
-#define GEN7_SURFACEFORMAT_R16G16_UNORM                   0x0CC
-#define GEN7_SURFACEFORMAT_R16G16_SNORM                   0x0CD
-#define GEN7_SURFACEFORMAT_R16G16_SINT                    0x0CE
-#define GEN7_SURFACEFORMAT_R16G16_UINT                    0x0CF
-#define GEN7_SURFACEFORMAT_R16G16_FLOAT                   0x0D0
-#define GEN7_SURFACEFORMAT_B10G10R10A2_UNORM              0x0D1
-#define GEN7_SURFACEFORMAT_B10G10R10A2_UNORM_SRGB         0x0D2
-#define GEN7_SURFACEFORMAT_R11G11B10_FLOAT                0x0D3
-#define GEN7_SURFACEFORMAT_R32_SINT                       0x0D6
-#define GEN7_SURFACEFORMAT_R32_UINT                       0x0D7
-#define GEN7_SURFACEFORMAT_R32_FLOAT                      0x0D8
-#define GEN7_SURFACEFORMAT_R24_UNORM_X8_TYPELESS          0x0D9
-#define GEN7_SURFACEFORMAT_X24_TYPELESS_G8_UINT           0x0DA
-#define GEN7_SURFACEFORMAT_L16A16_UNORM                   0x0DF
-#define GEN7_SURFACEFORMAT_I24X8_UNORM                    0x0E0
-#define GEN7_SURFACEFORMAT_L24X8_UNORM                    0x0E1
-#define GEN7_SURFACEFORMAT_A24X8_UNORM                    0x0E2
-#define GEN7_SURFACEFORMAT_I32_FLOAT                      0x0E3
-#define GEN7_SURFACEFORMAT_L32_FLOAT                      0x0E4
-#define GEN7_SURFACEFORMAT_A32_FLOAT                      0x0E5
-#define GEN7_SURFACEFORMAT_B8G8R8X8_UNORM                 0x0E9
-#define GEN7_SURFACEFORMAT_B8G8R8X8_UNORM_SRGB            0x0EA
-#define GEN7_SURFACEFORMAT_R8G8B8X8_UNORM                 0x0EB
-#define GEN7_SURFACEFORMAT_R8G8B8X8_UNORM_SRGB            0x0EC
-#define GEN7_SURFACEFORMAT_R9G9B9E5_SHAREDEXP             0x0ED
-#define GEN7_SURFACEFORMAT_B10G10R10X2_UNORM              0x0EE
-#define GEN7_SURFACEFORMAT_L16A16_FLOAT                   0x0F0
-#define GEN7_SURFACEFORMAT_R32_UNORM                      0x0F1
-#define GEN7_SURFACEFORMAT_R32_SNORM                      0x0F2
-#define GEN7_SURFACEFORMAT_R10G10B10X2_USCALED            0x0F3
-#define GEN7_SURFACEFORMAT_R8G8B8A8_SSCALED               0x0F4
-#define GEN7_SURFACEFORMAT_R8G8B8A8_USCALED               0x0F5
-#define GEN7_SURFACEFORMAT_R16G16_SSCALED                 0x0F6
-#define GEN7_SURFACEFORMAT_R16G16_USCALED                 0x0F7
-#define GEN7_SURFACEFORMAT_R32_SSCALED                    0x0F8
-#define GEN7_SURFACEFORMAT_R32_USCALED                    0x0F9
-#define GEN7_SURFACEFORMAT_B5G6R5_UNORM                   0x100
-#define GEN7_SURFACEFORMAT_B5G6R5_UNORM_SRGB              0x101
-#define GEN7_SURFACEFORMAT_B5G5R5A1_UNORM                 0x102
-#define GEN7_SURFACEFORMAT_B5G5R5A1_UNORM_SRGB            0x103
-#define GEN7_SURFACEFORMAT_B4G4R4A4_UNORM                 0x104
-#define GEN7_SURFACEFORMAT_B4G4R4A4_UNORM_SRGB            0x105
-#define GEN7_SURFACEFORMAT_R8G8_UNORM                     0x106
-#define GEN7_SURFACEFORMAT_R8G8_SNORM                     0x107
-#define GEN7_SURFACEFORMAT_R8G8_SINT                      0x108
-#define GEN7_SURFACEFORMAT_R8G8_UINT                      0x109
-#define GEN7_SURFACEFORMAT_R16_UNORM                      0x10A
-#define GEN7_SURFACEFORMAT_R16_SNORM                      0x10B
-#define GEN7_SURFACEFORMAT_R16_SINT                       0x10C
-#define GEN7_SURFACEFORMAT_R16_UINT                       0x10D
-#define GEN7_SURFACEFORMAT_R16_FLOAT                      0x10E
-#define GEN7_SURFACEFORMAT_I16_UNORM                      0x111
-#define GEN7_SURFACEFORMAT_L16_UNORM                      0x112
-#define GEN7_SURFACEFORMAT_A16_UNORM                      0x113
-#define GEN7_SURFACEFORMAT_L8A8_UNORM                     0x114
-#define GEN7_SURFACEFORMAT_I16_FLOAT                      0x115
-#define GEN7_SURFACEFORMAT_L16_FLOAT                      0x116
-#define GEN7_SURFACEFORMAT_A16_FLOAT                      0x117
-#define GEN7_SURFACEFORMAT_R5G5_SNORM_B6_UNORM            0x119
-#define GEN7_SURFACEFORMAT_B5G5R5X1_UNORM                 0x11A
-#define GEN7_SURFACEFORMAT_B5G5R5X1_UNORM_SRGB            0x11B
-#define GEN7_SURFACEFORMAT_R8G8_SSCALED                   0x11C
-#define GEN7_SURFACEFORMAT_R8G8_USCALED                   0x11D
-#define GEN7_SURFACEFORMAT_R16_SSCALED                    0x11E
-#define GEN7_SURFACEFORMAT_R16_USCALED                    0x11F
-#define GEN7_SURFACEFORMAT_R8_UNORM                       0x140
-#define GEN7_SURFACEFORMAT_R8_SNORM                       0x141
-#define GEN7_SURFACEFORMAT_R8_SINT                        0x142
-#define GEN7_SURFACEFORMAT_R8_UINT                        0x143
-#define GEN7_SURFACEFORMAT_A8_UNORM                       0x144
-#define GEN7_SURFACEFORMAT_I8_UNORM                       0x145
-#define GEN7_SURFACEFORMAT_L8_UNORM                       0x146
-#define GEN7_SURFACEFORMAT_P4A4_UNORM                     0x147
-#define GEN7_SURFACEFORMAT_A4P4_UNORM                     0x148
-#define GEN7_SURFACEFORMAT_R8_SSCALED                     0x149
-#define GEN7_SURFACEFORMAT_R8_USCALED                     0x14A
-#define GEN7_SURFACEFORMAT_R1_UINT                        0x181
-#define GEN7_SURFACEFORMAT_YCRCB_NORMAL                   0x182
-#define GEN7_SURFACEFORMAT_YCRCB_SWAPUVY                  0x183
-#define GEN7_SURFACEFORMAT_BC1_UNORM                      0x186
-#define GEN7_SURFACEFORMAT_BC2_UNORM                      0x187
-#define GEN7_SURFACEFORMAT_BC3_UNORM                      0x188
-#define GEN7_SURFACEFORMAT_BC4_UNORM                      0x189
-#define GEN7_SURFACEFORMAT_BC5_UNORM                      0x18A
-#define GEN7_SURFACEFORMAT_BC1_UNORM_SRGB                 0x18B
-#define GEN7_SURFACEFORMAT_BC2_UNORM_SRGB                 0x18C
-#define GEN7_SURFACEFORMAT_BC3_UNORM_SRGB                 0x18D
-#define GEN7_SURFACEFORMAT_MONO8                          0x18E
-#define GEN7_SURFACEFORMAT_YCRCB_SWAPUV                   0x18F
-#define GEN7_SURFACEFORMAT_YCRCB_SWAPY                    0x190
-#define GEN7_SURFACEFORMAT_DXT1_RGB                       0x191
-#define GEN7_SURFACEFORMAT_FXT1                           0x192
-#define GEN7_SURFACEFORMAT_R8G8B8_UNORM                   0x193
-#define GEN7_SURFACEFORMAT_R8G8B8_SNORM                   0x194
-#define GEN7_SURFACEFORMAT_R8G8B8_SSCALED                 0x195
-#define GEN7_SURFACEFORMAT_R8G8B8_USCALED                 0x196
-#define GEN7_SURFACEFORMAT_R64G64B64A64_FLOAT             0x197
-#define GEN7_SURFACEFORMAT_R64G64B64_FLOAT                0x198
-#define GEN7_SURFACEFORMAT_BC4_SNORM                      0x199
-#define GEN7_SURFACEFORMAT_BC5_SNORM                      0x19A
-#define GEN7_SURFACEFORMAT_R16G16B16_UNORM                0x19C
-#define GEN7_SURFACEFORMAT_R16G16B16_SNORM                0x19D
-#define GEN7_SURFACEFORMAT_R16G16B16_SSCALED              0x19E
-#define GEN7_SURFACEFORMAT_R16G16B16_USCALED              0x19F
-
-#define GEN7_SURFACERETURNFORMAT_FLOAT32  	0
-#define GEN7_SURFACERETURNFORMAT_S1       	1
-
-#define GEN7_SURFACE_1D				0
-#define GEN7_SURFACE_2D				1
-#define GEN7_SURFACE_3D				2
-#define GEN7_SURFACE_CUBE			3
-#define GEN7_SURFACE_BUFFER			4
-#define GEN7_SURFACE_NULL			7
-
 #define GEN7_FLOATING_POINT_IEEE_754		0
 #define GEN7_FLOATING_POINT_NON_IEEE_754	1
 
diff --git a/lib/gen7_render.h b/lib/gen7_render.h
index fd8878dc..2dca8b76 100644
--- a/lib/gen7_render.h
+++ b/lib/gen7_render.h
@@ -486,174 +486,6 @@
 #define GEN7_STENCILOP_DECR               6
 #define GEN7_STENCILOP_INVERT             7
 
-#define GEN7_SURFACE_MIPMAPLAYOUT_BELOW   0
-#define GEN7_SURFACE_MIPMAPLAYOUT_RIGHT   1
-
-#define GEN7_SURFACEFORMAT_R32G32B32A32_FLOAT             0x000
-#define GEN7_SURFACEFORMAT_R32G32B32A32_SINT              0x001
-#define GEN7_SURFACEFORMAT_R32G32B32A32_UINT              0x002
-#define GEN7_SURFACEFORMAT_R32G32B32A32_UNORM             0x003
-#define GEN7_SURFACEFORMAT_R32G32B32A32_SNORM             0x004
-#define GEN7_SURFACEFORMAT_R64G64_FLOAT                   0x005
-#define GEN7_SURFACEFORMAT_R32G32B32X32_FLOAT             0x006
-#define GEN7_SURFACEFORMAT_R32G32B32A32_SSCALED           0x007
-#define GEN7_SURFACEFORMAT_R32G32B32A32_USCALED           0x008
-#define GEN7_SURFACEFORMAT_R32G32B32_FLOAT                0x040
-#define GEN7_SURFACEFORMAT_R32G32B32_SINT                 0x041
-#define GEN7_SURFACEFORMAT_R32G32B32_UINT                 0x042
-#define GEN7_SURFACEFORMAT_R32G32B32_UNORM                0x043
-#define GEN7_SURFACEFORMAT_R32G32B32_SNORM                0x044
-#define GEN7_SURFACEFORMAT_R32G32B32_SSCALED              0x045
-#define GEN7_SURFACEFORMAT_R32G32B32_USCALED              0x046
-#define GEN7_SURFACEFORMAT_R16G16B16A16_UNORM             0x080
-#define GEN7_SURFACEFORMAT_R16G16B16A16_SNORM             0x081
-#define GEN7_SURFACEFORMAT_R16G16B16A16_SINT              0x082
-#define GEN7_SURFACEFORMAT_R16G16B16A16_UINT              0x083
-#define GEN7_SURFACEFORMAT_R16G16B16A16_FLOAT             0x084
-#define GEN7_SURFACEFORMAT_R32G32_FLOAT                   0x085
-#define GEN7_SURFACEFORMAT_R32G32_SINT                    0x086
-#define GEN7_SURFACEFORMAT_R32G32_UINT                    0x087
-#define GEN7_SURFACEFORMAT_R32_FLOAT_X8X24_TYPELESS       0x088
-#define GEN7_SURFACEFORMAT_X32_TYPELESS_G8X24_UINT        0x089
-#define GEN7_SURFACEFORMAT_L32A32_FLOAT                   0x08A
-#define GEN7_SURFACEFORMAT_R32G32_UNORM                   0x08B
-#define GEN7_SURFACEFORMAT_R32G32_SNORM                   0x08C
-#define GEN7_SURFACEFORMAT_R64_FLOAT                      0x08D
-#define GEN7_SURFACEFORMAT_R16G16B16X16_UNORM             0x08E
-#define GEN7_SURFACEFORMAT_R16G16B16X16_FLOAT             0x08F
-#define GEN7_SURFACEFORMAT_A32X32_FLOAT                   0x090
-#define GEN7_SURFACEFORMAT_L32X32_FLOAT                   0x091
-#define GEN7_SURFACEFORMAT_I32X32_FLOAT                   0x092
-#define GEN7_SURFACEFORMAT_R16G16B16A16_SSCALED           0x093
-#define GEN7_SURFACEFORMAT_R16G16B16A16_USCALED           0x094
-#define GEN7_SURFACEFORMAT_R32G32_SSCALED                 0x095
-#define GEN7_SURFACEFORMAT_R32G32_USCALED                 0x096
-#define GEN7_SURFACEFORMAT_B8G8R8A8_UNORM                 0x0C0
-#define GEN7_SURFACEFORMAT_B8G8R8A8_UNORM_SRGB            0x0C1
-#define GEN7_SURFACEFORMAT_R10G10B10A2_UNORM              0x0C2
-#define GEN7_SURFACEFORMAT_R10G10B10A2_UNORM_SRGB         0x0C3
-#define GEN7_SURFACEFORMAT_R10G10B10A2_UINT               0x0C4
-#define GEN7_SURFACEFORMAT_R10G10B10_SNORM_A2_UNORM       0x0C5
-#define GEN7_SURFACEFORMAT_R8G8B8A8_UNORM                 0x0C7
-#define GEN7_SURFACEFORMAT_R8G8B8A8_UNORM_SRGB            0x0C8
-#define GEN7_SURFACEFORMAT_R8G8B8A8_SNORM                 0x0C9
-#define GEN7_SURFACEFORMAT_R8G8B8A8_SINT                  0x0CA
-#define GEN7_SURFACEFORMAT_R8G8B8A8_UINT                  0x0CB
-#define GEN7_SURFACEFORMAT_R16G16_UNORM                   0x0CC
-#define GEN7_SURFACEFORMAT_R16G16_SNORM                   0x0CD
-#define GEN7_SURFACEFORMAT_R16G16_SINT                    0x0CE
-#define GEN7_SURFACEFORMAT_R16G16_UINT                    0x0CF
-#define GEN7_SURFACEFORMAT_R16G16_FLOAT                   0x0D0
-#define GEN7_SURFACEFORMAT_B10G10R10A2_UNORM              0x0D1
-#define GEN7_SURFACEFORMAT_B10G10R10A2_UNORM_SRGB         0x0D2
-#define GEN7_SURFACEFORMAT_R11G11B10_FLOAT                0x0D3
-#define GEN7_SURFACEFORMAT_R32_SINT                       0x0D6
-#define GEN7_SURFACEFORMAT_R32_UINT                       0x0D7
-#define GEN7_SURFACEFORMAT_R32_FLOAT                      0x0D8
-#define GEN7_SURFACEFORMAT_R24_UNORM_X8_TYPELESS          0x0D9
-#define GEN7_SURFACEFORMAT_X24_TYPELESS_G8_UINT           0x0DA
-#define GEN7_SURFACEFORMAT_L16A16_UNORM                   0x0DF
-#define GEN7_SURFACEFORMAT_I24X8_UNORM                    0x0E0
-#define GEN7_SURFACEFORMAT_L24X8_UNORM                    0x0E1
-#define GEN7_SURFACEFORMAT_A24X8_UNORM                    0x0E2
-#define GEN7_SURFACEFORMAT_I32_FLOAT                      0x0E3
-#define GEN7_SURFACEFORMAT_L32_FLOAT                      0x0E4
-#define GEN7_SURFACEFORMAT_A32_FLOAT                      0x0E5
-#define GEN7_SURFACEFORMAT_B8G8R8X8_UNORM                 0x0E9
-#define GEN7_SURFACEFORMAT_B8G8R8X8_UNORM_SRGB            0x0EA
-#define GEN7_SURFACEFORMAT_R8G8B8X8_UNORM                 0x0EB
-#define GEN7_SURFACEFORMAT_R8G8B8X8_UNORM_SRGB            0x0EC
-#define GEN7_SURFACEFORMAT_R9G9B9E5_SHAREDEXP             0x0ED
-#define GEN7_SURFACEFORMAT_B10G10R10X2_UNORM              0x0EE
-#define GEN7_SURFACEFORMAT_L16A16_FLOAT                   0x0F0
-#define GEN7_SURFACEFORMAT_R32_UNORM                      0x0F1
-#define GEN7_SURFACEFORMAT_R32_SNORM                      0x0F2
-#define GEN7_SURFACEFORMAT_R10G10B10X2_USCALED            0x0F3
-#define GEN7_SURFACEFORMAT_R8G8B8A8_SSCALED               0x0F4
-#define GEN7_SURFACEFORMAT_R8G8B8A8_USCALED               0x0F5
-#define GEN7_SURFACEFORMAT_R16G16_SSCALED                 0x0F6
-#define GEN7_SURFACEFORMAT_R16G16_USCALED                 0x0F7
-#define GEN7_SURFACEFORMAT_R32_SSCALED                    0x0F8
-#define GEN7_SURFACEFORMAT_R32_USCALED                    0x0F9
-#define GEN7_SURFACEFORMAT_B5G6R5_UNORM                   0x100
-#define GEN7_SURFACEFORMAT_B5G6R5_UNORM_SRGB              0x101
-#define GEN7_SURFACEFORMAT_B5G5R5A1_UNORM                 0x102
-#define GEN7_SURFACEFORMAT_B5G5R5A1_UNORM_SRGB            0x103
-#define GEN7_SURFACEFORMAT_B4G4R4A4_UNORM                 0x104
-#define GEN7_SURFACEFORMAT_B4G4R4A4_UNORM_SRGB            0x105
-#define GEN7_SURFACEFORMAT_R8G8_UNORM                     0x106
-#define GEN7_SURFACEFORMAT_R8G8_SNORM                     0x107
-#define GEN7_SURFACEFORMAT_R8G8_SINT                      0x108
-#define GEN7_SURFACEFORMAT_R8G8_UINT                      0x109
-#define GEN7_SURFACEFORMAT_R16_UNORM                      0x10A
-#define GEN7_SURFACEFORMAT_R16_SNORM                      0x10B
-#define GEN7_SURFACEFORMAT_R16_SINT                       0x10C
-#define GEN7_SURFACEFORMAT_R16_UINT                       0x10D
-#define GEN7_SURFACEFORMAT_R16_FLOAT                      0x10E
-#define GEN7_SURFACEFORMAT_I16_UNORM                      0x111
-#define GEN7_SURFACEFORMAT_L16_UNORM                      0x112
-#define GEN7_SURFACEFORMAT_A16_UNORM                      0x113
-#define GEN7_SURFACEFORMAT_L8A8_UNORM                     0x114
-#define GEN7_SURFACEFORMAT_I16_FLOAT                      0x115
-#define GEN7_SURFACEFORMAT_L16_FLOAT                      0x116
-#define GEN7_SURFACEFORMAT_A16_FLOAT                      0x117
-#define GEN7_SURFACEFORMAT_R5G5_SNORM_B6_UNORM            0x119
-#define GEN7_SURFACEFORMAT_B5G5R5X1_UNORM                 0x11A
-#define GEN7_SURFACEFORMAT_B5G5R5X1_UNORM_SRGB            0x11B
-#define GEN7_SURFACEFORMAT_R8G8_SSCALED                   0x11C
-#define GEN7_SURFACEFORMAT_R8G8_USCALED                   0x11D
-#define GEN7_SURFACEFORMAT_R16_SSCALED                    0x11E
-#define GEN7_SURFACEFORMAT_R16_USCALED                    0x11F
-#define GEN7_SURFACEFORMAT_R8_UNORM                       0x140
-#define GEN7_SURFACEFORMAT_R8_SNORM                       0x141
-#define GEN7_SURFACEFORMAT_R8_SINT                        0x142
-#define GEN7_SURFACEFORMAT_R8_UINT                        0x143
-#define GEN7_SURFACEFORMAT_A8_UNORM                       0x144
-#define GEN7_SURFACEFORMAT_I8_UNORM                       0x145
-#define GEN7_SURFACEFORMAT_L8_UNORM                       0x146
-#define GEN7_SURFACEFORMAT_P4A4_UNORM                     0x147
-#define GEN7_SURFACEFORMAT_A4P4_UNORM                     0x148
-#define GEN7_SURFACEFORMAT_R8_SSCALED                     0x149
-#define GEN7_SURFACEFORMAT_R8_USCALED                     0x14A
-#define GEN7_SURFACEFORMAT_R1_UINT                        0x181
-#define GEN7_SURFACEFORMAT_YCRCB_NORMAL                   0x182
-#define GEN7_SURFACEFORMAT_YCRCB_SWAPUVY                  0x183
-#define GEN7_SURFACEFORMAT_BC1_UNORM                      0x186
-#define GEN7_SURFACEFORMAT_BC2_UNORM                      0x187
-#define GEN7_SURFACEFORMAT_BC3_UNORM                      0x188
-#define GEN7_SURFACEFORMAT_BC4_UNORM                      0x189
-#define GEN7_SURFACEFORMAT_BC5_UNORM                      0x18A
-#define GEN7_SURFACEFORMAT_BC1_UNORM_SRGB                 0x18B
-#define GEN7_SURFACEFORMAT_BC2_UNORM_SRGB                 0x18C
-#define GEN7_SURFACEFORMAT_BC3_UNORM_SRGB                 0x18D
-#define GEN7_SURFACEFORMAT_MONO8                          0x18E
-#define GEN7_SURFACEFORMAT_YCRCB_SWAPUV                   0x18F
-#define GEN7_SURFACEFORMAT_YCRCB_SWAPY                    0x190
-#define GEN7_SURFACEFORMAT_DXT1_RGB                       0x191
-#define GEN7_SURFACEFORMAT_FXT1                           0x192
-#define GEN7_SURFACEFORMAT_R8G8B8_UNORM                   0x193
-#define GEN7_SURFACEFORMAT_R8G8B8_SNORM                   0x194
-#define GEN7_SURFACEFORMAT_R8G8B8_SSCALED                 0x195
-#define GEN7_SURFACEFORMAT_R8G8B8_USCALED                 0x196
-#define GEN7_SURFACEFORMAT_R64G64B64A64_FLOAT             0x197
-#define GEN7_SURFACEFORMAT_R64G64B64_FLOAT                0x198
-#define GEN7_SURFACEFORMAT_BC4_SNORM                      0x199
-#define GEN7_SURFACEFORMAT_BC5_SNORM                      0x19A
-#define GEN7_SURFACEFORMAT_R16G16B16_UNORM                0x19C
-#define GEN7_SURFACEFORMAT_R16G16B16_SNORM                0x19D
-#define GEN7_SURFACEFORMAT_R16G16B16_SSCALED              0x19E
-#define GEN7_SURFACEFORMAT_R16G16B16_USCALED              0x19F
-
-#define GEN7_SURFACERETURNFORMAT_FLOAT32  0
-#define GEN7_SURFACERETURNFORMAT_S1       1
-
-#define GEN7_SURFACE_1D      0
-#define GEN7_SURFACE_2D      1
-#define GEN7_SURFACE_3D      2
-#define GEN7_SURFACE_CUBE    3
-#define GEN7_SURFACE_BUFFER  4
-#define GEN7_SURFACE_NULL    7
-
 #define GEN7_BORDER_COLOR_MODE_DEFAULT	0
 #define GEN7_BORDER_COLOR_MODE_LEGACY	1
 
diff --git a/lib/gen8_media.h b/lib/gen8_media.h
index d4f29cdf..16437941 100644
--- a/lib/gen8_media.h
+++ b/lib/gen8_media.h
@@ -4,171 +4,6 @@
 #include <stdint.h>
 #include "surfaceformat.h"
 
-#define GEN8_SURFACEFORMAT_R32G32B32A32_FLOAT             0x000
-#define GEN8_SURFACEFORMAT_R32G32B32A32_SINT              0x001
-#define GEN8_SURFACEFORMAT_R32G32B32A32_UINT              0x002
-#define GEN8_SURFACEFORMAT_R32G32B32A32_UNORM             0x003
-#define GEN8_SURFACEFORMAT_R32G32B32A32_SNORM             0x004
-#define GEN8_SURFACEFORMAT_R64G64_FLOAT                   0x005
-#define GEN8_SURFACEFORMAT_R32G32B32X32_FLOAT             0x006
-#define GEN8_SURFACEFORMAT_R32G32B32A32_SSCALED           0x007
-#define GEN8_SURFACEFORMAT_R32G32B32A32_USCALED           0x008
-#define GEN8_SURFACEFORMAT_R32G32B32_FLOAT                0x040
-#define GEN8_SURFACEFORMAT_R32G32B32_SINT                 0x041
-#define GEN8_SURFACEFORMAT_R32G32B32_UINT                 0x042
-#define GEN8_SURFACEFORMAT_R32G32B32_UNORM                0x043
-#define GEN8_SURFACEFORMAT_R32G32B32_SNORM                0x044
-#define GEN8_SURFACEFORMAT_R32G32B32_SSCALED              0x045
-#define GEN8_SURFACEFORMAT_R32G32B32_USCALED              0x046
-#define GEN8_SURFACEFORMAT_R16G16B16A16_UNORM             0x080
-#define GEN8_SURFACEFORMAT_R16G16B16A16_SNORM             0x081
-#define GEN8_SURFACEFORMAT_R16G16B16A16_SINT              0x082
-#define GEN8_SURFACEFORMAT_R16G16B16A16_UINT              0x083
-#define GEN8_SURFACEFORMAT_R16G16B16A16_FLOAT             0x084
-#define GEN8_SURFACEFORMAT_R32G32_FLOAT                   0x085
-#define GEN8_SURFACEFORMAT_R32G32_SINT                    0x086
-#define GEN8_SURFACEFORMAT_R32G32_UINT                    0x087
-#define GEN8_SURFACEFORMAT_R32_FLOAT_X8X24_TYPELESS       0x088
-#define GEN8_SURFACEFORMAT_X32_TYPELESS_G8X24_UINT        0x089
-#define GEN8_SURFACEFORMAT_L32A32_FLOAT                   0x08A
-#define GEN8_SURFACEFORMAT_R32G32_UNORM                   0x08B
-#define GEN8_SURFACEFORMAT_R32G32_SNORM                   0x08C
-#define GEN8_SURFACEFORMAT_R64_FLOAT                      0x08D
-#define GEN8_SURFACEFORMAT_R16G16B16X16_UNORM             0x08E
-#define GEN8_SURFACEFORMAT_R16G16B16X16_FLOAT             0x08F
-#define GEN8_SURFACEFORMAT_A32X32_FLOAT                   0x090
-#define GEN8_SURFACEFORMAT_L32X32_FLOAT                   0x091
-#define GEN8_SURFACEFORMAT_I32X32_FLOAT                   0x092
-#define GEN8_SURFACEFORMAT_R16G16B16A16_SSCALED           0x093
-#define GEN8_SURFACEFORMAT_R16G16B16A16_USCALED           0x094
-#define GEN8_SURFACEFORMAT_R32G32_SSCALED                 0x095
-#define GEN8_SURFACEFORMAT_R32G32_USCALED                 0x096
-#define GEN8_SURFACEFORMAT_B8G8R8A8_UNORM                 0x0C0
-#define GEN8_SURFACEFORMAT_B8G8R8A8_UNORM_SRGB            0x0C1
-#define GEN8_SURFACEFORMAT_R10G10B10A2_UNORM              0x0C2
-#define GEN8_SURFACEFORMAT_R10G10B10A2_UNORM_SRGB         0x0C3
-#define GEN8_SURFACEFORMAT_R10G10B10A2_UINT               0x0C4
-#define GEN8_SURFACEFORMAT_R10G10B10_SNORM_A2_UNORM       0x0C5
-#define GEN8_SURFACEFORMAT_R8G8B8A8_UNORM                 0x0C7
-#define GEN8_SURFACEFORMAT_R8G8B8A8_UNORM_SRGB            0x0C8
-#define GEN8_SURFACEFORMAT_R8G8B8A8_SNORM                 0x0C9
-#define GEN8_SURFACEFORMAT_R8G8B8A8_SINT                  0x0CA
-#define GEN8_SURFACEFORMAT_R8G8B8A8_UINT                  0x0CB
-#define GEN8_SURFACEFORMAT_R16G16_UNORM                   0x0CC
-#define GEN8_SURFACEFORMAT_R16G16_SNORM                   0x0CD
-#define GEN8_SURFACEFORMAT_R16G16_SINT                    0x0CE
-#define GEN8_SURFACEFORMAT_R16G16_UINT                    0x0CF
-#define GEN8_SURFACEFORMAT_R16G16_FLOAT                   0x0D0
-#define GEN8_SURFACEFORMAT_B10G10R10A2_UNORM              0x0D1
-#define GEN8_SURFACEFORMAT_B10G10R10A2_UNORM_SRGB         0x0D2
-#define GEN8_SURFACEFORMAT_R11G11B10_FLOAT                0x0D3
-#define GEN8_SURFACEFORMAT_R32_SINT                       0x0D6
-#define GEN8_SURFACEFORMAT_R32_UINT                       0x0D7
-#define GEN8_SURFACEFORMAT_R32_FLOAT                      0x0D8
-#define GEN8_SURFACEFORMAT_R24_UNORM_X8_TYPELESS          0x0D9
-#define GEN8_SURFACEFORMAT_X24_TYPELESS_G8_UINT           0x0DA
-#define GEN8_SURFACEFORMAT_L16A16_UNORM                   0x0DF
-#define GEN8_SURFACEFORMAT_I24X8_UNORM                    0x0E0
-#define GEN8_SURFACEFORMAT_L24X8_UNORM                    0x0E1
-#define GEN8_SURFACEFORMAT_A24X8_UNORM                    0x0E2
-#define GEN8_SURFACEFORMAT_I32_FLOAT                      0x0E3
-#define GEN8_SURFACEFORMAT_L32_FLOAT                      0x0E4
-#define GEN8_SURFACEFORMAT_A32_FLOAT                      0x0E5
-#define GEN8_SURFACEFORMAT_B8G8R8X8_UNORM                 0x0E9
-#define GEN8_SURFACEFORMAT_B8G8R8X8_UNORM_SRGB            0x0EA
-#define GEN8_SURFACEFORMAT_R8G8B8X8_UNORM                 0x0EB
-#define GEN8_SURFACEFORMAT_R8G8B8X8_UNORM_SRGB            0x0EC
-#define GEN8_SURFACEFORMAT_R9G9B9E5_SHAREDEXP             0x0ED
-#define GEN8_SURFACEFORMAT_B10G10R10X2_UNORM              0x0EE
-#define GEN8_SURFACEFORMAT_L16A16_FLOAT                   0x0F0
-#define GEN8_SURFACEFORMAT_R32_UNORM                      0x0F1
-#define GEN8_SURFACEFORMAT_R32_SNORM                      0x0F2
-#define GEN8_SURFACEFORMAT_R10G10B10X2_USCALED            0x0F3
-#define GEN8_SURFACEFORMAT_R8G8B8A8_SSCALED               0x0F4
-#define GEN8_SURFACEFORMAT_R8G8B8A8_USCALED               0x0F5
-#define GEN8_SURFACEFORMAT_R16G16_SSCALED                 0x0F6
-#define GEN8_SURFACEFORMAT_R16G16_USCALED                 0x0F7
-#define GEN8_SURFACEFORMAT_R32_SSCALED                    0x0F8
-#define GEN8_SURFACEFORMAT_R32_USCALED                    0x0F9
-#define GEN8_SURFACEFORMAT_B5G6R5_UNORM                   0x100
-#define GEN8_SURFACEFORMAT_B5G6R5_UNORM_SRGB              0x101
-#define GEN8_SURFACEFORMAT_B5G5R5A1_UNORM                 0x102
-#define GEN8_SURFACEFORMAT_B5G5R5A1_UNORM_SRGB            0x103
-#define GEN8_SURFACEFORMAT_B4G4R4A4_UNORM                 0x104
-#define GEN8_SURFACEFORMAT_B4G4R4A4_UNORM_SRGB            0x105
-#define GEN8_SURFACEFORMAT_R8G8_UNORM                     0x106
-#define GEN8_SURFACEFORMAT_R8G8_SNORM                     0x107
-#define GEN8_SURFACEFORMAT_R8G8_SINT                      0x108
-#define GEN8_SURFACEFORMAT_R8G8_UINT                      0x109
-#define GEN8_SURFACEFORMAT_R16_UNORM                      0x10A
-#define GEN8_SURFACEFORMAT_R16_SNORM                      0x10B
-#define GEN8_SURFACEFORMAT_R16_SINT                       0x10C
-#define GEN8_SURFACEFORMAT_R16_UINT                       0x10D
-#define GEN8_SURFACEFORMAT_R16_FLOAT                      0x10E
-#define GEN8_SURFACEFORMAT_I16_UNORM                      0x111
-#define GEN8_SURFACEFORMAT_L16_UNORM                      0x112
-#define GEN8_SURFACEFORMAT_A16_UNORM                      0x113
-#define GEN8_SURFACEFORMAT_L8A8_UNORM                     0x114
-#define GEN8_SURFACEFORMAT_I16_FLOAT                      0x115
-#define GEN8_SURFACEFORMAT_L16_FLOAT                      0x116
-#define GEN8_SURFACEFORMAT_A16_FLOAT                      0x117
-#define GEN8_SURFACEFORMAT_R5G5_SNORM_B6_UNORM            0x119
-#define GEN8_SURFACEFORMAT_B5G5R5X1_UNORM                 0x11A
-#define GEN8_SURFACEFORMAT_B5G5R5X1_UNORM_SRGB            0x11B
-#define GEN8_SURFACEFORMAT_R8G8_SSCALED                   0x11C
-#define GEN8_SURFACEFORMAT_R8G8_USCALED                   0x11D
-#define GEN8_SURFACEFORMAT_R16_SSCALED                    0x11E
-#define GEN8_SURFACEFORMAT_R16_USCALED                    0x11F
-#define GEN8_SURFACEFORMAT_R8_UNORM                       0x140
-#define GEN8_SURFACEFORMAT_R8_SNORM                       0x141
-#define GEN8_SURFACEFORMAT_R8_SINT                        0x142
-#define GEN8_SURFACEFORMAT_R8_UINT                        0x143
-#define GEN8_SURFACEFORMAT_A8_UNORM                       0x144
-#define GEN8_SURFACEFORMAT_I8_UNORM                       0x145
-#define GEN8_SURFACEFORMAT_L8_UNORM                       0x146
-#define GEN8_SURFACEFORMAT_P4A4_UNORM                     0x147
-#define GEN8_SURFACEFORMAT_A4P4_UNORM                     0x148
-#define GEN8_SURFACEFORMAT_R8_SSCALED                     0x149
-#define GEN8_SURFACEFORMAT_R8_USCALED                     0x14A
-#define GEN8_SURFACEFORMAT_R1_UINT                        0x181
-#define GEN8_SURFACEFORMAT_YCRCB_NORMAL                   0x182
-#define GEN8_SURFACEFORMAT_YCRCB_SWAPUVY                  0x183
-#define GEN8_SURFACEFORMAT_BC1_UNORM                      0x186
-#define GEN8_SURFACEFORMAT_BC2_UNORM                      0x187
-#define GEN8_SURFACEFORMAT_BC3_UNORM                      0x188
-#define GEN8_SURFACEFORMAT_BC4_UNORM                      0x189
-#define GEN8_SURFACEFORMAT_BC5_UNORM                      0x18A
-#define GEN8_SURFACEFORMAT_BC1_UNORM_SRGB                 0x18B
-#define GEN8_SURFACEFORMAT_BC2_UNORM_SRGB                 0x18C
-#define GEN8_SURFACEFORMAT_BC3_UNORM_SRGB                 0x18D
-#define GEN8_SURFACEFORMAT_MONO8                          0x18E
-#define GEN8_SURFACEFORMAT_YCRCB_SWAPUV                   0x18F
-#define GEN8_SURFACEFORMAT_YCRCB_SWAPY                    0x190
-#define GEN8_SURFACEFORMAT_DXT1_RGB                       0x191
-#define GEN8_SURFACEFORMAT_FXT1                           0x192
-#define GEN8_SURFACEFORMAT_R8G8B8_UNORM                   0x193
-#define GEN8_SURFACEFORMAT_R8G8B8_SNORM                   0x194
-#define GEN8_SURFACEFORMAT_R8G8B8_SSCALED                 0x195
-#define GEN8_SURFACEFORMAT_R8G8B8_USCALED                 0x196
-#define GEN8_SURFACEFORMAT_R64G64B64A64_FLOAT             0x197
-#define GEN8_SURFACEFORMAT_R64G64B64_FLOAT                0x198
-#define GEN8_SURFACEFORMAT_BC4_SNORM                      0x199
-#define GEN8_SURFACEFORMAT_BC5_SNORM                      0x19A
-#define GEN8_SURFACEFORMAT_R16G16B16_UNORM                0x19C
-#define GEN8_SURFACEFORMAT_R16G16B16_SNORM                0x19D
-#define GEN8_SURFACEFORMAT_R16G16B16_SSCALED              0x19E
-#define GEN8_SURFACEFORMAT_R16G16B16_USCALED              0x19F
-
-#define GEN8_SURFACERETURNFORMAT_FLOAT32  	0
-#define GEN8_SURFACERETURNFORMAT_S1       	1
-
-#define GEN8_SURFACE_1D				0
-#define GEN8_SURFACE_2D				1
-#define GEN8_SURFACE_3D				2
-#define GEN8_SURFACE_CUBE			3
-#define GEN8_SURFACE_BUFFER			4
-#define GEN8_SURFACE_NULL			7
-
 #define GEN8_FLOATING_POINT_IEEE_754		0
 #define GEN8_FLOATING_POINT_NON_IEEE_754	1
 
-- 
2.14.3



More information about the igt-dev mailing list