* [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header
@ 2018-05-25 7:15 Lukasz Kalamarz
2018-05-25 7:15 ` [igt-dev] [PATCH i-g-t v2 2/3] lib: Rename all surfaceformat calls in libs Lukasz Kalamarz
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Lukasz Kalamarz @ 2018-05-25 7:15 UTC (permalink / raw)
To: igt-dev
In several header files surface formats definitions were
duplicated. To decrease amount of duplicated code in igt
new lib was created.
v2: Drop GEN_ from registers definition
Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
Cc: Katarzyna Dec <katarzyna.dec@intel.com>
Cc: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
lib/Makefile.sources | 1 +
lib/gen6_render.h | 1 +
lib/gen7_media.h | 1 +
lib/gen7_render.h | 1 +
lib/gen8_media.h | 1 +
lib/surfaceformat.h | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 192 insertions(+)
create mode 100644 lib/surfaceformat.h
diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index fbd8844b..042c1d3b 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -80,6 +80,7 @@ lib_source_list = \
rendercopy_gen8.c \
rendercopy_gen9.c \
rendercopy.h \
+ surfaceformat.h \
sw_sync.c \
sw_sync.h \
intel_reg_map.c \
diff --git a/lib/gen6_render.h b/lib/gen6_render.h
index 967e6c65..6aa20b62 100644
--- a/lib/gen6_render.h
+++ b/lib/gen6_render.h
@@ -2,6 +2,7 @@
#define GEN6_RENDER_H
#include <stdint.h>
+#include "surfaceformat.h"
#define GEN6_3D(Pipeline,Opcode,Subopcode) ((3 << 29) | \
((Pipeline) << 27) | \
diff --git a/lib/gen7_media.h b/lib/gen7_media.h
index 91294d23..572be4f5 100644
--- a/lib/gen7_media.h
+++ b/lib/gen7_media.h
@@ -2,6 +2,7 @@
#define GEN7_MEDIA_H
#include <stdint.h>
+#include "surfaceformat.h"
#define GEN7_SURFACEFORMAT_R32G32B32A32_FLOAT 0x000
#define GEN7_SURFACEFORMAT_R32G32B32A32_SINT 0x001
diff --git a/lib/gen7_render.h b/lib/gen7_render.h
index 7a6dc055..fd8878dc 100644
--- a/lib/gen7_render.h
+++ b/lib/gen7_render.h
@@ -2,6 +2,7 @@
#define GEN7_RENDER_H
#include <stdint.h>
+#include "surfaceformat.h"
#define INTEL_MASK(high, low) (((1 << ((high) - (low) + 1)) - 1) << (low))
diff --git a/lib/gen8_media.h b/lib/gen8_media.h
index 15cd7992..d4f29cdf 100644
--- a/lib/gen8_media.h
+++ b/lib/gen8_media.h
@@ -2,6 +2,7 @@
#define GEN8_MEDIA_H
#include <stdint.h>
+#include "surfaceformat.h"
#define GEN8_SURFACEFORMAT_R32G32B32A32_FLOAT 0x000
#define GEN8_SURFACEFORMAT_R32G32B32A32_SINT 0x001
diff --git a/lib/surfaceformat.h b/lib/surfaceformat.h
new file mode 100644
index 00000000..5d7ed2ca
--- /dev/null
+++ b/lib/surfaceformat.h
@@ -0,0 +1,187 @@
+#ifndef SURFACEFORMAT_H
+#define SURFACEFORMAT_H
+
+#include <stdint.h>
+
+#define SURFACEFORMAT_R32G32B32A32_FLOAT 0x000
+#define SURFACEFORMAT_R32G32B32A32_SINT 0x001
+#define SURFACEFORMAT_R32G32B32A32_UINT 0x002
+#define SURFACEFORMAT_R32G32B32A32_UNORM 0x003
+#define SURFACEFORMAT_R32G32B32A32_SNORM 0x004
+#define SURFACEFORMAT_R64G64_FLOAT 0x005
+#define SURFACEFORMAT_R32G32B32X32_FLOAT 0x006
+#define SURFACEFORMAT_R32G32B32A32_SSCALED 0x007
+#define SURFACEFORMAT_R32G32B32A32_USCALED 0x008
+
+
+#define SURFACEFORMAT_R32G32B32_FLOAT 0x040
+#define SURFACEFORMAT_R32G32B32_SINT 0x041
+#define SURFACEFORMAT_R32G32B32_UINT 0x042
+#define SURFACEFORMAT_R32G32B32_UNORM 0x043
+#define SURFACEFORMAT_R32G32B32_SNORM 0x044
+#define SURFACEFORMAT_R32G32B32_SSCALED 0x045
+#define SURFACEFORMAT_R32G32B32_USCALED 0x046
+
+#define SURFACEFORMAT_R16G16B16A16_UNORM 0x080
+#define SURFACEFORMAT_R16G16B16A16_SNORM 0x081
+#define SURFACEFORMAT_R16G16B16A16_SINT 0x082
+#define SURFACEFORMAT_R16G16B16A16_UINT 0x083
+#define SURFACEFORMAT_R16G16B16A16_FLOAT 0x084
+#define SURFACEFORMAT_R32G32_FLOAT 0x085
+#define SURFACEFORMAT_R32G32_SINT 0x086
+#define SURFACEFORMAT_R32G32_UINT 0x087
+#define SURFACEFORMAT_R32_FLOAT_X8X24_TYPELESS 0x088
+#define SURFACEFORMAT_X32_TYPELESS_G8X24_UINT 0x089
+#define SURFACEFORMAT_L32A32_FLOAT 0x08A
+#define SURFACEFORMAT_R32G32_UNORM 0x08B
+#define SURFACEFORMAT_R32G32_SNORM 0x08C
+#define SURFACEFORMAT_R64_FLOAT 0x08D
+#define SURFACEFORMAT_R16G16B16X16_UNORM 0x08E
+#define SURFACEFORMAT_R16G16B16X16_FLOAT 0x08F
+
+#define SURFACEFORMAT_A32X32_FLOAT 0x090
+#define SURFACEFORMAT_L32X32_FLOAT 0x091
+#define SURFACEFORMAT_I32X32_FLOAT 0x092
+#define SURFACEFORMAT_R16G16B16A16_SSCALED 0x093
+#define SURFACEFORMAT_R16G16B16A16_USCALED 0x094
+#define SURFACEFORMAT_R32G32_SSCALED 0x095
+#define SURFACEFORMAT_R32G32_USCALED 0x096
+
+#define SURFACEFORMAT_B8G8R8A8_UNORM 0x0C0
+#define SURFACEFORMAT_B8G8R8A8_UNORM_SRGB 0x0C1
+#define SURFACEFORMAT_R10G10B10A2_UNORM 0x0C2
+#define SURFACEFORMAT_R10G10B10A2_UNORM_SRGB 0x0C3
+#define SURFACEFORMAT_R10G10B10A2_UINT 0x0C4
+#define SURFACEFORMAT_R10G10B10_SNORM_A2_UNORM 0x0C5
+#define SURFACEFORMAT_R8G8B8A8_UNORM 0x0C7
+#define SURFACEFORMAT_R8G8B8A8_UNORM_SRGB 0x0C8
+#define SURFACEFORMAT_R8G8B8A8_SNORM 0x0C9
+#define SURFACEFORMAT_R8G8B8A8_SINT 0x0CA
+#define SURFACEFORMAT_R8G8B8A8_UINT 0x0CB
+#define SURFACEFORMAT_R16G16_UNORM 0x0CC
+#define SURFACEFORMAT_R16G16_SNORM 0x0CD
+#define SURFACEFORMAT_R16G16_SINT 0x0CE
+#define SURFACEFORMAT_R16G16_UINT 0x0CF
+
+#define SURFACEFORMAT_R16G16_FLOAT 0x0D0
+#define SURFACEFORMAT_B10G10R10A2_UNORM 0x0D1
+#define SURFACEFORMAT_B10G10R10A2_UNORM_SRGB 0x0D2
+#define SURFACEFORMAT_R11G11B10_FLOAT 0x0D3
+#define SURFACEFORMAT_R32_SINT 0x0D6
+#define SURFACEFORMAT_R32_UINT 0x0D7
+#define SURFACEFORMAT_R32_FLOAT 0x0D8
+#define SURFACEFORMAT_R24_UNORM_X8_TYPELESS 0x0D9
+#define SURFACEFORMAT_X24_TYPELESS_G8_UINT 0x0DA
+#define SURFACEFORMAT_L16A16_UNORM 0x0DF
+
+#define SURFACEFORMAT_I24X8_UNORM 0x0E0
+#define SURFACEFORMAT_L24X8_UNORM 0x0E1
+#define SURFACEFORMAT_A24X8_UNORM 0x0E2
+#define SURFACEFORMAT_I32_FLOAT 0x0E3
+#define SURFACEFORMAT_L32_FLOAT 0x0E4
+#define SURFACEFORMAT_A32_FLOAT 0x0E5
+#define SURFACEFORMAT_B8G8R8X8_UNORM 0x0E9
+#define SURFACEFORMAT_B8G8R8X8_UNORM_SRGB 0x0EA
+#define SURFACEFORMAT_R8G8B8X8_UNORM 0x0EB
+#define SURFACEFORMAT_R8G8B8X8_UNORM_SRGB 0x0EC
+#define SURFACEFORMAT_R9G9B9E5_SHAREDEXP 0x0ED
+#define SURFACEFORMAT_B10G10R10X2_UNORM 0x0EE
+
+#define SURFACEFORMAT_L16A16_FLOAT 0x0F0
+#define SURFACEFORMAT_R32_UNORM 0x0F1
+#define SURFACEFORMAT_R32_SNORM 0x0F2
+#define SURFACEFORMAT_R10G10B10X2_USCALED 0x0F3
+#define SURFACEFORMAT_R8G8B8A8_SSCALED 0x0F4
+#define SURFACEFORMAT_R8G8B8A8_USCALED 0x0F5
+#define SURFACEFORMAT_R16G16_SSCALED 0x0F6
+#define SURFACEFORMAT_R16G16_USCALED 0x0F7
+#define SURFACEFORMAT_R32_SSCALED 0x0F8
+#define SURFACEFORMAT_R32_USCALED 0x0F9
+
+#define SURFACEFORMAT_B5G6R5_UNORM 0x100
+#define SURFACEFORMAT_B5G6R5_UNORM_SRGB 0x101
+#define SURFACEFORMAT_B5G5R5A1_UNORM 0x102
+#define SURFACEFORMAT_B5G5R5A1_UNORM_SRGB 0x103
+#define SURFACEFORMAT_B4G4R4A4_UNORM 0x104
+#define SURFACEFORMAT_B4G4R4A4_UNORM_SRGB 0x105
+#define SURFACEFORMAT_R8G8_UNORM 0x106
+#define SURFACEFORMAT_R8G8_SNORM 0x107
+#define SURFACEFORMAT_R8G8_SINT 0x108
+#define SURFACEFORMAT_R8G8_UINT 0x109
+#define SURFACEFORMAT_R16_FLOAT 0x10E
+#define SURFACEFORMAT_R16_SINT 0x10C
+#define SURFACEFORMAT_R16_SNORM 0x10B
+#define SURFACEFORMAT_R16_UINT 0x10D
+#define SURFACEFORMAT_R16_UNORM 0x10A
+
+#define SURFACEFORMAT_I16_UNORM 0x111
+#define SURFACEFORMAT_L16_UNORM 0x112
+#define SURFACEFORMAT_A16_UNORM 0x113
+#define SURFACEFORMAT_L8A8_UNORM 0x114
+#define SURFACEFORMAT_I16_FLOAT 0x115
+#define SURFACEFORMAT_L16_FLOAT 0x116
+#define SURFACEFORMAT_A16_FLOAT 0x117
+#define SURFACEFORMAT_R5G5_SNORM_B6_UNORM 0x119
+#define SURFACEFORMAT_B5G5R5X1_UNORM 0x11A
+#define SURFACEFORMAT_B5G5R5X1_UNORM_SRGB 0x11B
+#define SURFACEFORMAT_R8G8_SSCALED 0x11C
+#define SURFACEFORMAT_R8G8_USCALED 0x11D
+#define SURFACEFORMAT_R16_SSCALED 0x11E
+#define SURFACEFORMAT_R16_USCALED 0x11F
+
+#define SURFACEFORMAT_R8_UNORM 0x140
+#define SURFACEFORMAT_R8_SNORM 0x141
+#define SURFACEFORMAT_R8_SINT 0x142
+#define SURFACEFORMAT_R8_UINT 0x143
+#define SURFACEFORMAT_A8_UNORM 0x144
+#define SURFACEFORMAT_I8_UNORM 0x145
+#define SURFACEFORMAT_L8_UNORM 0x146
+#define SURFACEFORMAT_P4A4_UNORM 0x147
+#define SURFACEFORMAT_A4P4_UNORM 0x148
+#define SURFACEFORMAT_R8_SSCALED 0x149
+#define SURFACEFORMAT_R8_USCALED 0x14A
+
+#define SURFACEFORMAT_R1_UINT 0x181
+#define SURFACEFORMAT_YCRCB_NORMAL 0x182
+#define SURFACEFORMAT_YCRCB_SWAPUVY 0x183
+#define SURFACEFORMAT_BC1_UNORM 0x186
+#define SURFACEFORMAT_BC2_UNORM 0x187
+#define SURFACEFORMAT_BC3_UNORM 0x188
+#define SURFACEFORMAT_BC4_UNORM 0x189
+#define SURFACEFORMAT_BC5_UNORM 0x18A
+#define SURFACEFORMAT_BC1_UNORM_SRGB 0x18B
+#define SURFACEFORMAT_BC2_UNORM_SRGB 0x18C
+#define SURFACEFORMAT_BC3_UNORM_SRGB 0x18D
+#define SURFACEFORMAT_MONO8 0x18E
+#define SURFACEFORMAT_YCRCB_SWAPUV 0x18F
+
+#define SURFACEFORMAT_YCRCB_SWAPY 0x190
+#define SURFACEFORMAT_DXT1_RGB 0x191
+#define SURFACEFORMAT_FXT1 0x192
+#define SURFACEFORMAT_R8G8B8_UNORM 0x193
+#define SURFACEFORMAT_R8G8B8_SNORM 0x194
+#define SURFACEFORMAT_R8G8B8_SSCALED 0x195
+#define SURFACEFORMAT_R8G8B8_USCALED 0x196
+#define SURFACEFORMAT_R64G64B64A64_FLOAT 0x197
+#define SURFACEFORMAT_R64G64B64_FLOAT 0x198
+#define SURFACEFORMAT_BC4_SNORM 0x199
+#define SURFACEFORMAT_BC5_SNORM 0x19A
+#define SURFACEFORMAT_R16G16B16_UNORM 0x19C
+#define SURFACEFORMAT_R16G16B16_SNORM 0x19D
+#define SURFACEFORMAT_R16G16B16_SSCALED 0x19E
+#define SURFACEFORMAT_R16G16B16_USCALED 0x19F
+
+#define SURFACERETURNFORMAT_FLOAT32 0
+#define SURFACERETURNFORMAT_S1 1
+
+#define SURFACE_1D 0
+#define SURFACE_2D 1
+#define SURFACE_3D 2
+#define SURFACE_CUBE 3
+#define SURFACE_BUFFER 4
+#define SURFACE_NULL 7
+
+#define SURFACE_MIPMAPLAYOUT_BELOW 0
+#define SURFACE_MIPMAPLAYOUT_RIGHT 1
+
+#endif
--
2.14.3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [igt-dev] [PATCH i-g-t v2 2/3] lib: Rename all surfaceformat calls in libs
2018-05-25 7:15 [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header Lukasz Kalamarz
@ 2018-05-25 7:15 ` Lukasz Kalamarz
2018-05-25 7:23 ` Katarzyna Dec
2018-05-25 7:15 ` [igt-dev] [PATCH i-g-t v2 3/3] libs: Removal of duplicated SURFACEFORMAT definitions Lukasz Kalamarz
` (4 subsequent siblings)
5 siblings, 1 reply; 8+ messages in thread
From: Lukasz Kalamarz @ 2018-05-25 7:15 UTC (permalink / raw)
To: igt-dev
This patch is renaming all surfaceformat registers to use
names introduced in surfaceformat.h instead of using
per gen definitions
v2: Droppen GEN_ from register names. Applied that to
other libs.
Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
Cc: Katarzyna Dec <katarzyna.dec@intel.com>
Cc: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
lib/gpu_cmds.c | 8 ++++----
lib/rendercopy_gen6.c | 16 ++++++++--------
lib/rendercopy_gen7.c | 14 +++++++-------
lib/rendercopy_gen8.c | 12 ++++++------
lib/rendercopy_gen9.c | 12 ++++++------
tools/null_state_gen/intel_renderstate_gen6.c | 8 ++++----
tools/null_state_gen/intel_renderstate_gen7.c | 8 ++++----
7 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/lib/gpu_cmds.c b/lib/gpu_cmds.c
index d02877f4..323b03f6 100644
--- a/lib/gpu_cmds.c
+++ b/lib/gpu_cmds.c
@@ -72,7 +72,7 @@ gen7_fill_surface_state(struct intel_batchbuffer *batch,
ss = intel_batchbuffer_subdata_alloc(batch, sizeof(*ss), 64);
offset = intel_batchbuffer_subdata_offset(batch, ss);
- ss->ss0.surface_type = GEN7_SURFACE_2D;
+ ss->ss0.surface_type = SURFACE_2D;
ss->ss0.surface_format = format;
ss->ss0.render_cache_read_write = 1;
@@ -111,10 +111,10 @@ gen7_fill_binding_table(struct intel_batchbuffer *batch,
offset = intel_batchbuffer_subdata_offset(batch, binding_table);
if (IS_GEN7(batch->devid))
binding_table[0] = gen7_fill_surface_state(batch, dst,
- GEN7_SURFACEFORMAT_R8_UNORM, 1);
+ SURFACEFORMAT_R8_UNORM, 1);
else
binding_table[0] = gen8_fill_surface_state(batch, dst,
- GEN8_SURFACEFORMAT_R8_UNORM, 1);
+ SURFACEFORMAT_R8_UNORM, 1);
return offset;
}
@@ -353,7 +353,7 @@ gen8_fill_surface_state(struct intel_batchbuffer *batch,
ss = intel_batchbuffer_subdata_alloc(batch, sizeof(*ss), 64);
offset = intel_batchbuffer_subdata_offset(batch, ss);
- ss->ss0.surface_type = GEN8_SURFACE_2D;
+ ss->ss0.surface_type = SURFACE_2D;
ss->ss0.surface_format = format;
ss->ss0.render_cache_read_write = 1;
ss->ss0.vertical_alignment = 1; /* align 4 */
diff --git a/lib/rendercopy_gen6.c b/lib/rendercopy_gen6.c
index 38f8ab26..031d864b 100644
--- a/lib/rendercopy_gen6.c
+++ b/lib/rendercopy_gen6.c
@@ -87,10 +87,10 @@ gen6_bind_buf(struct intel_batchbuffer *batch, struct igt_buf *buf,
}
ss = intel_batchbuffer_subdata_alloc(batch, sizeof(*ss), 32);
- ss->ss0.surface_type = GEN6_SURFACE_2D;
+ ss->ss0.surface_type = SURFACE_2D;
ss->ss0.surface_format = format;
- ss->ss0.data_return_format = GEN6_SURFACERETURNFORMAT_FLOAT32;
+ ss->ss0.data_return_format = SURFACERETURNFORMAT_FLOAT32;
ss->ss0.color_blend = 1;
ss->ss1.base_addr = buf->bo->offset;
@@ -119,9 +119,9 @@ gen6_bind_surfaces(struct intel_batchbuffer *batch,
binding_table = intel_batchbuffer_subdata_alloc(batch, 32, 32);
binding_table[0] =
- gen6_bind_buf(batch, dst, GEN6_SURFACEFORMAT_B8G8R8A8_UNORM, 1);
+ gen6_bind_buf(batch, dst, SURFACEFORMAT_B8G8R8A8_UNORM, 1);
binding_table[1] =
- gen6_bind_buf(batch, src, GEN6_SURFACEFORMAT_B8G8R8A8_UNORM, 0);
+ gen6_bind_buf(batch, src, SURFACEFORMAT_B8G8R8A8_UNORM, 0);
return intel_batchbuffer_subdata_offset(batch, binding_table);
}
@@ -238,7 +238,7 @@ static void
gen6_emit_null_depth_buffer(struct intel_batchbuffer *batch)
{
OUT_BATCH(GEN6_3DSTATE_DEPTH_BUFFER | (7 - 2));
- OUT_BATCH(GEN6_SURFACE_NULL << GEN6_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
+ OUT_BATCH(SURFACE_NULL << GEN6_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
GEN6_DEPTHFORMAT_D32_FLOAT << GEN6_3DSTATE_DEPTH_BUFFER_FORMAT_SHIFT);
OUT_BATCH(0);
OUT_BATCH(0);
@@ -362,7 +362,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch)
OUT_BATCH(GEN6_3DSTATE_VERTEX_ELEMENTS | (2 * 3 + 1 - 2));
OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
- GEN6_SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
0 << VE0_OFFSET_SHIFT);
OUT_BATCH(GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_0_SHIFT |
GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_1_SHIFT |
@@ -371,7 +371,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch)
/* x,y */
OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
- GEN6_SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
0 << VE0_OFFSET_SHIFT); /* offsets vb in bytes */
OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
@@ -380,7 +380,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch)
/* u0, v0 */
OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
- GEN6_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
4 << VE0_OFFSET_SHIFT); /* offset vb in bytes */
OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c
index 73513279..82e33288 100644
--- a/lib/rendercopy_gen7.c
+++ b/lib/rendercopy_gen7.c
@@ -75,7 +75,7 @@ gen7_bind_buf(struct intel_batchbuffer *batch,
ss = intel_batchbuffer_subdata_alloc(batch, 8 * sizeof(*ss), 32);
- ss[0] = (GEN7_SURFACE_2D << GEN7_SURFACE_TYPE_SHIFT |
+ ss[0] = (SURFACE_2D << GEN7_SURFACE_TYPE_SHIFT |
gen7_tiling_bits(buf->tiling) |
format << GEN7_SURFACE_FORMAT_SHIFT);
ss[1] = buf->bo->offset;
@@ -105,7 +105,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch)
((2 * (1 + 2)) + 1 - 2));
OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID |
- GEN7_SURFACEFORMAT_R32G32B32A32_FLOAT << GEN7_VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R32G32B32A32_FLOAT << GEN7_VE0_FORMAT_SHIFT |
0 << GEN7_VE0_OFFSET_SHIFT);
OUT_BATCH(GEN7_VFCOMPONENT_STORE_0 << GEN7_VE1_VFCOMPONENT_0_SHIFT |
@@ -115,7 +115,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch)
/* x,y */
OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID |
- GEN7_SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
0 << GEN7_VE0_OFFSET_SHIFT); /* offsets vb in bytes */
OUT_BATCH(GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_0_SHIFT |
GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_1_SHIFT |
@@ -124,7 +124,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch)
/* s,t */
OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID |
- GEN7_SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
4 << GEN7_VE0_OFFSET_SHIFT); /* offset vb in bytes */
OUT_BATCH(GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_0_SHIFT |
GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_1_SHIFT |
@@ -187,9 +187,9 @@ gen7_bind_surfaces(struct intel_batchbuffer *batch,
binding_table = intel_batchbuffer_subdata_alloc(batch, 8, 32);
binding_table[0] =
- gen7_bind_buf(batch, dst, GEN7_SURFACEFORMAT_B8G8R8A8_UNORM, 1);
+ gen7_bind_buf(batch, dst, SURFACEFORMAT_B8G8R8A8_UNORM, 1);
binding_table[1] =
- gen7_bind_buf(batch, src, GEN7_SURFACEFORMAT_B8G8R8A8_UNORM, 0);
+ gen7_bind_buf(batch, src, SURFACEFORMAT_B8G8R8A8_UNORM, 0);
return intel_batchbuffer_subdata_offset(batch, binding_table);
}
@@ -476,7 +476,7 @@ static void
gen7_emit_null_depth_buffer(struct intel_batchbuffer *batch)
{
OUT_BATCH(GEN7_3DSTATE_DEPTH_BUFFER | (7 - 2));
- OUT_BATCH(GEN7_SURFACE_NULL << GEN7_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
+ OUT_BATCH(SURFACE_NULL << GEN7_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
GEN7_DEPTHFORMAT_D32_FLOAT << GEN7_3DSTATE_DEPTH_BUFFER_FORMAT_SHIFT);
OUT_BATCH(0); /* disable depth, stencil and hiz */
OUT_BATCH(0);
diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c
index f1e4e002..b60d18a7 100644
--- a/lib/rendercopy_gen8.c
+++ b/lib/rendercopy_gen8.c
@@ -164,7 +164,7 @@ gen8_bind_buf(struct intel_batchbuffer *batch,
offset = intel_batchbuffer_subdata_offset(batch, ss);
annotation_add_state(aub, AUB_TRACE_SURFACE_STATE, offset, sizeof(*ss));
- ss->ss0.surface_type = GEN6_SURFACE_2D;
+ ss->ss0.surface_type = SURFACE_2D;
ss->ss0.surface_format = format;
ss->ss0.render_cache_read_write = 1;
ss->ss0.vertical_alignment = 1; /* align 4 */
@@ -208,10 +208,10 @@ gen8_bind_surfaces(struct intel_batchbuffer *batch,
binding_table[0] =
gen8_bind_buf(batch, aub,
- dst, GEN6_SURFACEFORMAT_B8G8R8A8_UNORM, 1);
+ dst, SURFACEFORMAT_B8G8R8A8_UNORM, 1);
binding_table[1] =
gen8_bind_buf(batch, aub,
- src, GEN6_SURFACEFORMAT_B8G8R8A8_UNORM, 0);
+ src, SURFACEFORMAT_B8G8R8A8_UNORM, 0);
return offset;
}
@@ -321,7 +321,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch) {
* We don't really know or care what they do.
*/
OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
- GEN6_SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
0 << VE0_OFFSET_SHIFT); /* we specify 0, but it's really does not exist */
OUT_BATCH(GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_0_SHIFT |
GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_1_SHIFT |
@@ -335,7 +335,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch) {
* for doing this though.
*/
OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
- GEN6_SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
0 << VE0_OFFSET_SHIFT); /* offsets vb in bytes */
OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
@@ -347,7 +347,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch) {
* from the source buffer.
*/
OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
- GEN6_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
4 << VE0_OFFSET_SHIFT); /* offset vb in bytes */
OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
index 42b12eb5..ea69b95f 100644
--- a/lib/rendercopy_gen9.c
+++ b/lib/rendercopy_gen9.c
@@ -163,7 +163,7 @@ gen8_bind_buf(struct intel_batchbuffer *batch, struct igt_buf *buf,
annotation_add_state(&aub_annotations, AUB_TRACE_SURFACE_STATE,
offset, sizeof(*ss));
- ss->ss0.surface_type = GEN6_SURFACE_2D;
+ ss->ss0.surface_type = SURFACE_2D;
ss->ss0.surface_format = format;
ss->ss0.render_cache_read_write = 1;
ss->ss0.vertical_alignment = 1; /* align 4 */
@@ -206,9 +206,9 @@ gen8_bind_surfaces(struct intel_batchbuffer *batch,
offset, 8);
binding_table[0] =
- gen8_bind_buf(batch, dst, GEN6_SURFACEFORMAT_B8G8R8A8_UNORM, 1);
+ gen8_bind_buf(batch, dst, SURFACEFORMAT_B8G8R8A8_UNORM, 1);
binding_table[1] =
- gen8_bind_buf(batch, src, GEN6_SURFACEFORMAT_B8G8R8A8_UNORM, 0);
+ gen8_bind_buf(batch, src, SURFACEFORMAT_B8G8R8A8_UNORM, 0);
return offset;
}
@@ -315,7 +315,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch) {
* We don't really know or care what they do.
*/
OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
- GEN6_SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
0 << VE0_OFFSET_SHIFT); /* we specify 0, but it's really does not exist */
OUT_BATCH(GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_0_SHIFT |
GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_1_SHIFT |
@@ -329,7 +329,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch) {
* for doing this though.
*/
OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
- GEN6_SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
0 << VE0_OFFSET_SHIFT); /* offsets vb in bytes */
OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
@@ -341,7 +341,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch) {
* from the source buffer.
*/
OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
- GEN6_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
4 << VE0_OFFSET_SHIFT); /* offset vb in bytes */
OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
diff --git a/tools/null_state_gen/intel_renderstate_gen6.c b/tools/null_state_gen/intel_renderstate_gen6.c
index 5c1b7f97..13b1e92e 100644
--- a/tools/null_state_gen/intel_renderstate_gen6.c
+++ b/tools/null_state_gen/intel_renderstate_gen6.c
@@ -190,7 +190,7 @@ static void
gen6_emit_null_depth_buffer(struct intel_batchbuffer *batch)
{
OUT_BATCH(GEN6_3DSTATE_DEPTH_BUFFER | (7 - 2));
- OUT_BATCH(GEN6_SURFACE_NULL << GEN6_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
+ OUT_BATCH(SURFACE_NULL << GEN6_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
GEN6_DEPTHFORMAT_D32_FLOAT << GEN6_3DSTATE_DEPTH_BUFFER_FORMAT_SHIFT);
OUT_BATCH(0);
OUT_BATCH(0);
@@ -314,7 +314,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch)
OUT_BATCH(GEN6_3DSTATE_VERTEX_ELEMENTS | (2 * 3 + 1 - 2));
OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
- GEN6_SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
0 << VE0_OFFSET_SHIFT);
OUT_BATCH(GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_0_SHIFT |
GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_1_SHIFT |
@@ -323,7 +323,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch)
/* x,y */
OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
- GEN6_SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
0 << VE0_OFFSET_SHIFT); /* offsets vb in bytes */
OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
@@ -332,7 +332,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch)
/* u0, v0 */
OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
- GEN6_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
4 << VE0_OFFSET_SHIFT); /* offset vb in bytes */
OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
diff --git a/tools/null_state_gen/intel_renderstate_gen7.c b/tools/null_state_gen/intel_renderstate_gen7.c
index df20bc25..ea5cfc29 100644
--- a/tools/null_state_gen/intel_renderstate_gen7.c
+++ b/tools/null_state_gen/intel_renderstate_gen7.c
@@ -53,7 +53,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch)
((2 * (1 + 2)) + 1 - 2));
OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID |
- GEN7_SURFACEFORMAT_R32G32B32A32_FLOAT <<
+ SURFACEFORMAT_R32G32B32A32_FLOAT <<
GEN7_VE0_FORMAT_SHIFT |
0 << GEN7_VE0_OFFSET_SHIFT);
@@ -64,7 +64,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch)
/* x,y */
OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID |
- GEN7_SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
0 << GEN7_VE0_OFFSET_SHIFT); /* offsets vb in bytes */
OUT_BATCH(GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_0_SHIFT |
GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_1_SHIFT |
@@ -73,7 +73,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch)
/* s,t */
OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID |
- GEN7_SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
+ SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
4 << GEN7_VE0_OFFSET_SHIFT); /* offset vb in bytes */
OUT_BATCH(GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_0_SHIFT |
GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_1_SHIFT |
@@ -401,7 +401,7 @@ static void
gen7_emit_null_depth_buffer(struct intel_batchbuffer *batch)
{
OUT_BATCH(GEN7_3DSTATE_DEPTH_BUFFER | (7 - 2));
- OUT_BATCH(GEN7_SURFACE_NULL << GEN7_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
+ OUT_BATCH(SURFACE_NULL << GEN7_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
GEN7_DEPTHFORMAT_D32_FLOAT <<
GEN7_3DSTATE_DEPTH_BUFFER_FORMAT_SHIFT);
OUT_BATCH(0); /* disable depth, stencil and hiz */
--
2.14.3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [igt-dev] [PATCH i-g-t v2 3/3] libs: Removal of duplicated SURFACEFORMAT definitions
2018-05-25 7:15 [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header Lukasz Kalamarz
2018-05-25 7:15 ` [igt-dev] [PATCH i-g-t v2 2/3] lib: Rename all surfaceformat calls in libs Lukasz Kalamarz
@ 2018-05-25 7:15 ` Lukasz Kalamarz
2018-05-25 7:22 ` [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header Katarzyna Dec
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Lukasz Kalamarz @ 2018-05-25 7:15 UTC (permalink / raw)
To: igt-dev
Patch is removing all duplicated definitions of
SURFACEFORMAT from few lib headers
Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
Cc: Katarzyna Dec <katarzyna.dec@intel.com>
Cc: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@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
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header
2018-05-25 7:15 [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header Lukasz Kalamarz
2018-05-25 7:15 ` [igt-dev] [PATCH i-g-t v2 2/3] lib: Rename all surfaceformat calls in libs Lukasz Kalamarz
2018-05-25 7:15 ` [igt-dev] [PATCH i-g-t v2 3/3] libs: Removal of duplicated SURFACEFORMAT definitions Lukasz Kalamarz
@ 2018-05-25 7:22 ` Katarzyna Dec
2018-05-25 7:41 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/3] " Patchwork
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Katarzyna Dec @ 2018-05-25 7:22 UTC (permalink / raw)
To: Lukasz Kalamarz; +Cc: igt-dev
On Fri, May 25, 2018 at 09:15:32AM +0200, Lukasz Kalamarz wrote:
> In several header files surface formats definitions were
> duplicated. To decrease amount of duplicated code in igt
> new lib was created.
>
> v2: Drop GEN_ from registers definition
>
Much better! :) Thanks!
> Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
Reviewed-by: Katarzyna Dec <katarzyna.dec@intel.com>
> Cc: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> ---
> lib/Makefile.sources | 1 +
> lib/gen6_render.h | 1 +
> lib/gen7_media.h | 1 +
> lib/gen7_render.h | 1 +
> lib/gen8_media.h | 1 +
> lib/surfaceformat.h | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 6 files changed, 192 insertions(+)
> create mode 100644 lib/surfaceformat.h
>
> diff --git a/lib/Makefile.sources b/lib/Makefile.sources
> index fbd8844b..042c1d3b 100644
> --- a/lib/Makefile.sources
> +++ b/lib/Makefile.sources
> @@ -80,6 +80,7 @@ lib_source_list = \
> rendercopy_gen8.c \
> rendercopy_gen9.c \
> rendercopy.h \
> + surfaceformat.h \
> sw_sync.c \
> sw_sync.h \
> intel_reg_map.c \
> diff --git a/lib/gen6_render.h b/lib/gen6_render.h
> index 967e6c65..6aa20b62 100644
> --- a/lib/gen6_render.h
> +++ b/lib/gen6_render.h
> @@ -2,6 +2,7 @@
> #define GEN6_RENDER_H
>
> #include <stdint.h>
> +#include "surfaceformat.h"
>
> #define GEN6_3D(Pipeline,Opcode,Subopcode) ((3 << 29) | \
> ((Pipeline) << 27) | \
> diff --git a/lib/gen7_media.h b/lib/gen7_media.h
> index 91294d23..572be4f5 100644
> --- a/lib/gen7_media.h
> +++ b/lib/gen7_media.h
> @@ -2,6 +2,7 @@
> #define GEN7_MEDIA_H
>
> #include <stdint.h>
> +#include "surfaceformat.h"
>
> #define GEN7_SURFACEFORMAT_R32G32B32A32_FLOAT 0x000
> #define GEN7_SURFACEFORMAT_R32G32B32A32_SINT 0x001
> diff --git a/lib/gen7_render.h b/lib/gen7_render.h
> index 7a6dc055..fd8878dc 100644
> --- a/lib/gen7_render.h
> +++ b/lib/gen7_render.h
> @@ -2,6 +2,7 @@
> #define GEN7_RENDER_H
>
> #include <stdint.h>
> +#include "surfaceformat.h"
>
> #define INTEL_MASK(high, low) (((1 << ((high) - (low) + 1)) - 1) << (low))
>
> diff --git a/lib/gen8_media.h b/lib/gen8_media.h
> index 15cd7992..d4f29cdf 100644
> --- a/lib/gen8_media.h
> +++ b/lib/gen8_media.h
> @@ -2,6 +2,7 @@
> #define GEN8_MEDIA_H
>
> #include <stdint.h>
> +#include "surfaceformat.h"
>
> #define GEN8_SURFACEFORMAT_R32G32B32A32_FLOAT 0x000
> #define GEN8_SURFACEFORMAT_R32G32B32A32_SINT 0x001
> diff --git a/lib/surfaceformat.h b/lib/surfaceformat.h
> new file mode 100644
> index 00000000..5d7ed2ca
> --- /dev/null
> +++ b/lib/surfaceformat.h
> @@ -0,0 +1,187 @@
> +#ifndef SURFACEFORMAT_H
> +#define SURFACEFORMAT_H
> +
> +#include <stdint.h>
> +
> +#define SURFACEFORMAT_R32G32B32A32_FLOAT 0x000
> +#define SURFACEFORMAT_R32G32B32A32_SINT 0x001
> +#define SURFACEFORMAT_R32G32B32A32_UINT 0x002
> +#define SURFACEFORMAT_R32G32B32A32_UNORM 0x003
> +#define SURFACEFORMAT_R32G32B32A32_SNORM 0x004
> +#define SURFACEFORMAT_R64G64_FLOAT 0x005
> +#define SURFACEFORMAT_R32G32B32X32_FLOAT 0x006
> +#define SURFACEFORMAT_R32G32B32A32_SSCALED 0x007
> +#define SURFACEFORMAT_R32G32B32A32_USCALED 0x008
> +
> +
> +#define SURFACEFORMAT_R32G32B32_FLOAT 0x040
> +#define SURFACEFORMAT_R32G32B32_SINT 0x041
> +#define SURFACEFORMAT_R32G32B32_UINT 0x042
> +#define SURFACEFORMAT_R32G32B32_UNORM 0x043
> +#define SURFACEFORMAT_R32G32B32_SNORM 0x044
> +#define SURFACEFORMAT_R32G32B32_SSCALED 0x045
> +#define SURFACEFORMAT_R32G32B32_USCALED 0x046
> +
> +#define SURFACEFORMAT_R16G16B16A16_UNORM 0x080
> +#define SURFACEFORMAT_R16G16B16A16_SNORM 0x081
> +#define SURFACEFORMAT_R16G16B16A16_SINT 0x082
> +#define SURFACEFORMAT_R16G16B16A16_UINT 0x083
> +#define SURFACEFORMAT_R16G16B16A16_FLOAT 0x084
> +#define SURFACEFORMAT_R32G32_FLOAT 0x085
> +#define SURFACEFORMAT_R32G32_SINT 0x086
> +#define SURFACEFORMAT_R32G32_UINT 0x087
> +#define SURFACEFORMAT_R32_FLOAT_X8X24_TYPELESS 0x088
> +#define SURFACEFORMAT_X32_TYPELESS_G8X24_UINT 0x089
> +#define SURFACEFORMAT_L32A32_FLOAT 0x08A
> +#define SURFACEFORMAT_R32G32_UNORM 0x08B
> +#define SURFACEFORMAT_R32G32_SNORM 0x08C
> +#define SURFACEFORMAT_R64_FLOAT 0x08D
> +#define SURFACEFORMAT_R16G16B16X16_UNORM 0x08E
> +#define SURFACEFORMAT_R16G16B16X16_FLOAT 0x08F
> +
> +#define SURFACEFORMAT_A32X32_FLOAT 0x090
> +#define SURFACEFORMAT_L32X32_FLOAT 0x091
> +#define SURFACEFORMAT_I32X32_FLOAT 0x092
> +#define SURFACEFORMAT_R16G16B16A16_SSCALED 0x093
> +#define SURFACEFORMAT_R16G16B16A16_USCALED 0x094
> +#define SURFACEFORMAT_R32G32_SSCALED 0x095
> +#define SURFACEFORMAT_R32G32_USCALED 0x096
> +
> +#define SURFACEFORMAT_B8G8R8A8_UNORM 0x0C0
> +#define SURFACEFORMAT_B8G8R8A8_UNORM_SRGB 0x0C1
> +#define SURFACEFORMAT_R10G10B10A2_UNORM 0x0C2
> +#define SURFACEFORMAT_R10G10B10A2_UNORM_SRGB 0x0C3
> +#define SURFACEFORMAT_R10G10B10A2_UINT 0x0C4
> +#define SURFACEFORMAT_R10G10B10_SNORM_A2_UNORM 0x0C5
> +#define SURFACEFORMAT_R8G8B8A8_UNORM 0x0C7
> +#define SURFACEFORMAT_R8G8B8A8_UNORM_SRGB 0x0C8
> +#define SURFACEFORMAT_R8G8B8A8_SNORM 0x0C9
> +#define SURFACEFORMAT_R8G8B8A8_SINT 0x0CA
> +#define SURFACEFORMAT_R8G8B8A8_UINT 0x0CB
> +#define SURFACEFORMAT_R16G16_UNORM 0x0CC
> +#define SURFACEFORMAT_R16G16_SNORM 0x0CD
> +#define SURFACEFORMAT_R16G16_SINT 0x0CE
> +#define SURFACEFORMAT_R16G16_UINT 0x0CF
> +
> +#define SURFACEFORMAT_R16G16_FLOAT 0x0D0
> +#define SURFACEFORMAT_B10G10R10A2_UNORM 0x0D1
> +#define SURFACEFORMAT_B10G10R10A2_UNORM_SRGB 0x0D2
> +#define SURFACEFORMAT_R11G11B10_FLOAT 0x0D3
> +#define SURFACEFORMAT_R32_SINT 0x0D6
> +#define SURFACEFORMAT_R32_UINT 0x0D7
> +#define SURFACEFORMAT_R32_FLOAT 0x0D8
> +#define SURFACEFORMAT_R24_UNORM_X8_TYPELESS 0x0D9
> +#define SURFACEFORMAT_X24_TYPELESS_G8_UINT 0x0DA
> +#define SURFACEFORMAT_L16A16_UNORM 0x0DF
> +
> +#define SURFACEFORMAT_I24X8_UNORM 0x0E0
> +#define SURFACEFORMAT_L24X8_UNORM 0x0E1
> +#define SURFACEFORMAT_A24X8_UNORM 0x0E2
> +#define SURFACEFORMAT_I32_FLOAT 0x0E3
> +#define SURFACEFORMAT_L32_FLOAT 0x0E4
> +#define SURFACEFORMAT_A32_FLOAT 0x0E5
> +#define SURFACEFORMAT_B8G8R8X8_UNORM 0x0E9
> +#define SURFACEFORMAT_B8G8R8X8_UNORM_SRGB 0x0EA
> +#define SURFACEFORMAT_R8G8B8X8_UNORM 0x0EB
> +#define SURFACEFORMAT_R8G8B8X8_UNORM_SRGB 0x0EC
> +#define SURFACEFORMAT_R9G9B9E5_SHAREDEXP 0x0ED
> +#define SURFACEFORMAT_B10G10R10X2_UNORM 0x0EE
> +
> +#define SURFACEFORMAT_L16A16_FLOAT 0x0F0
> +#define SURFACEFORMAT_R32_UNORM 0x0F1
> +#define SURFACEFORMAT_R32_SNORM 0x0F2
> +#define SURFACEFORMAT_R10G10B10X2_USCALED 0x0F3
> +#define SURFACEFORMAT_R8G8B8A8_SSCALED 0x0F4
> +#define SURFACEFORMAT_R8G8B8A8_USCALED 0x0F5
> +#define SURFACEFORMAT_R16G16_SSCALED 0x0F6
> +#define SURFACEFORMAT_R16G16_USCALED 0x0F7
> +#define SURFACEFORMAT_R32_SSCALED 0x0F8
> +#define SURFACEFORMAT_R32_USCALED 0x0F9
> +
> +#define SURFACEFORMAT_B5G6R5_UNORM 0x100
> +#define SURFACEFORMAT_B5G6R5_UNORM_SRGB 0x101
> +#define SURFACEFORMAT_B5G5R5A1_UNORM 0x102
> +#define SURFACEFORMAT_B5G5R5A1_UNORM_SRGB 0x103
> +#define SURFACEFORMAT_B4G4R4A4_UNORM 0x104
> +#define SURFACEFORMAT_B4G4R4A4_UNORM_SRGB 0x105
> +#define SURFACEFORMAT_R8G8_UNORM 0x106
> +#define SURFACEFORMAT_R8G8_SNORM 0x107
> +#define SURFACEFORMAT_R8G8_SINT 0x108
> +#define SURFACEFORMAT_R8G8_UINT 0x109
> +#define SURFACEFORMAT_R16_FLOAT 0x10E
> +#define SURFACEFORMAT_R16_SINT 0x10C
> +#define SURFACEFORMAT_R16_SNORM 0x10B
> +#define SURFACEFORMAT_R16_UINT 0x10D
> +#define SURFACEFORMAT_R16_UNORM 0x10A
> +
> +#define SURFACEFORMAT_I16_UNORM 0x111
> +#define SURFACEFORMAT_L16_UNORM 0x112
> +#define SURFACEFORMAT_A16_UNORM 0x113
> +#define SURFACEFORMAT_L8A8_UNORM 0x114
> +#define SURFACEFORMAT_I16_FLOAT 0x115
> +#define SURFACEFORMAT_L16_FLOAT 0x116
> +#define SURFACEFORMAT_A16_FLOAT 0x117
> +#define SURFACEFORMAT_R5G5_SNORM_B6_UNORM 0x119
> +#define SURFACEFORMAT_B5G5R5X1_UNORM 0x11A
> +#define SURFACEFORMAT_B5G5R5X1_UNORM_SRGB 0x11B
> +#define SURFACEFORMAT_R8G8_SSCALED 0x11C
> +#define SURFACEFORMAT_R8G8_USCALED 0x11D
> +#define SURFACEFORMAT_R16_SSCALED 0x11E
> +#define SURFACEFORMAT_R16_USCALED 0x11F
> +
> +#define SURFACEFORMAT_R8_UNORM 0x140
> +#define SURFACEFORMAT_R8_SNORM 0x141
> +#define SURFACEFORMAT_R8_SINT 0x142
> +#define SURFACEFORMAT_R8_UINT 0x143
> +#define SURFACEFORMAT_A8_UNORM 0x144
> +#define SURFACEFORMAT_I8_UNORM 0x145
> +#define SURFACEFORMAT_L8_UNORM 0x146
> +#define SURFACEFORMAT_P4A4_UNORM 0x147
> +#define SURFACEFORMAT_A4P4_UNORM 0x148
> +#define SURFACEFORMAT_R8_SSCALED 0x149
> +#define SURFACEFORMAT_R8_USCALED 0x14A
> +
> +#define SURFACEFORMAT_R1_UINT 0x181
> +#define SURFACEFORMAT_YCRCB_NORMAL 0x182
> +#define SURFACEFORMAT_YCRCB_SWAPUVY 0x183
> +#define SURFACEFORMAT_BC1_UNORM 0x186
> +#define SURFACEFORMAT_BC2_UNORM 0x187
> +#define SURFACEFORMAT_BC3_UNORM 0x188
> +#define SURFACEFORMAT_BC4_UNORM 0x189
> +#define SURFACEFORMAT_BC5_UNORM 0x18A
> +#define SURFACEFORMAT_BC1_UNORM_SRGB 0x18B
> +#define SURFACEFORMAT_BC2_UNORM_SRGB 0x18C
> +#define SURFACEFORMAT_BC3_UNORM_SRGB 0x18D
> +#define SURFACEFORMAT_MONO8 0x18E
> +#define SURFACEFORMAT_YCRCB_SWAPUV 0x18F
> +
> +#define SURFACEFORMAT_YCRCB_SWAPY 0x190
> +#define SURFACEFORMAT_DXT1_RGB 0x191
> +#define SURFACEFORMAT_FXT1 0x192
> +#define SURFACEFORMAT_R8G8B8_UNORM 0x193
> +#define SURFACEFORMAT_R8G8B8_SNORM 0x194
> +#define SURFACEFORMAT_R8G8B8_SSCALED 0x195
> +#define SURFACEFORMAT_R8G8B8_USCALED 0x196
> +#define SURFACEFORMAT_R64G64B64A64_FLOAT 0x197
> +#define SURFACEFORMAT_R64G64B64_FLOAT 0x198
> +#define SURFACEFORMAT_BC4_SNORM 0x199
> +#define SURFACEFORMAT_BC5_SNORM 0x19A
> +#define SURFACEFORMAT_R16G16B16_UNORM 0x19C
> +#define SURFACEFORMAT_R16G16B16_SNORM 0x19D
> +#define SURFACEFORMAT_R16G16B16_SSCALED 0x19E
> +#define SURFACEFORMAT_R16G16B16_USCALED 0x19F
> +
> +#define SURFACERETURNFORMAT_FLOAT32 0
> +#define SURFACERETURNFORMAT_S1 1
> +
> +#define SURFACE_1D 0
> +#define SURFACE_2D 1
> +#define SURFACE_3D 2
> +#define SURFACE_CUBE 3
> +#define SURFACE_BUFFER 4
> +#define SURFACE_NULL 7
> +
> +#define SURFACE_MIPMAPLAYOUT_BELOW 0
> +#define SURFACE_MIPMAPLAYOUT_RIGHT 1
> +
> +#endif
> --
> 2.14.3
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2 2/3] lib: Rename all surfaceformat calls in libs
2018-05-25 7:15 ` [igt-dev] [PATCH i-g-t v2 2/3] lib: Rename all surfaceformat calls in libs Lukasz Kalamarz
@ 2018-05-25 7:23 ` Katarzyna Dec
0 siblings, 0 replies; 8+ messages in thread
From: Katarzyna Dec @ 2018-05-25 7:23 UTC (permalink / raw)
To: Lukasz Kalamarz; +Cc: igt-dev
On Fri, May 25, 2018 at 09:15:33AM +0200, Lukasz Kalamarz wrote:
> This patch is renaming all surfaceformat registers to use
> names introduced in surfaceformat.h instead of using
> per gen definitions
>
> v2: Droppen GEN_ from register names. Applied that to
> other libs.
There is something weird about 'droppen' word.
With that fixed - r-b from me :)
Kasia
>
> Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
> Cc: Katarzyna Dec <katarzyna.dec@intel.com>
> Cc: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> ---
> lib/gpu_cmds.c | 8 ++++----
> lib/rendercopy_gen6.c | 16 ++++++++--------
> lib/rendercopy_gen7.c | 14 +++++++-------
> lib/rendercopy_gen8.c | 12 ++++++------
> lib/rendercopy_gen9.c | 12 ++++++------
> tools/null_state_gen/intel_renderstate_gen6.c | 8 ++++----
> tools/null_state_gen/intel_renderstate_gen7.c | 8 ++++----
> 7 files changed, 39 insertions(+), 39 deletions(-)
>
> diff --git a/lib/gpu_cmds.c b/lib/gpu_cmds.c
> index d02877f4..323b03f6 100644
> --- a/lib/gpu_cmds.c
> +++ b/lib/gpu_cmds.c
> @@ -72,7 +72,7 @@ gen7_fill_surface_state(struct intel_batchbuffer *batch,
> ss = intel_batchbuffer_subdata_alloc(batch, sizeof(*ss), 64);
> offset = intel_batchbuffer_subdata_offset(batch, ss);
>
> - ss->ss0.surface_type = GEN7_SURFACE_2D;
> + ss->ss0.surface_type = SURFACE_2D;
> ss->ss0.surface_format = format;
> ss->ss0.render_cache_read_write = 1;
>
> @@ -111,10 +111,10 @@ gen7_fill_binding_table(struct intel_batchbuffer *batch,
> offset = intel_batchbuffer_subdata_offset(batch, binding_table);
> if (IS_GEN7(batch->devid))
> binding_table[0] = gen7_fill_surface_state(batch, dst,
> - GEN7_SURFACEFORMAT_R8_UNORM, 1);
> + SURFACEFORMAT_R8_UNORM, 1);
> else
> binding_table[0] = gen8_fill_surface_state(batch, dst,
> - GEN8_SURFACEFORMAT_R8_UNORM, 1);
> + SURFACEFORMAT_R8_UNORM, 1);
>
> return offset;
> }
> @@ -353,7 +353,7 @@ gen8_fill_surface_state(struct intel_batchbuffer *batch,
> ss = intel_batchbuffer_subdata_alloc(batch, sizeof(*ss), 64);
> offset = intel_batchbuffer_subdata_offset(batch, ss);
>
> - ss->ss0.surface_type = GEN8_SURFACE_2D;
> + ss->ss0.surface_type = SURFACE_2D;
> ss->ss0.surface_format = format;
> ss->ss0.render_cache_read_write = 1;
> ss->ss0.vertical_alignment = 1; /* align 4 */
> diff --git a/lib/rendercopy_gen6.c b/lib/rendercopy_gen6.c
> index 38f8ab26..031d864b 100644
> --- a/lib/rendercopy_gen6.c
> +++ b/lib/rendercopy_gen6.c
> @@ -87,10 +87,10 @@ gen6_bind_buf(struct intel_batchbuffer *batch, struct igt_buf *buf,
> }
>
> ss = intel_batchbuffer_subdata_alloc(batch, sizeof(*ss), 32);
> - ss->ss0.surface_type = GEN6_SURFACE_2D;
> + ss->ss0.surface_type = SURFACE_2D;
> ss->ss0.surface_format = format;
>
> - ss->ss0.data_return_format = GEN6_SURFACERETURNFORMAT_FLOAT32;
> + ss->ss0.data_return_format = SURFACERETURNFORMAT_FLOAT32;
> ss->ss0.color_blend = 1;
> ss->ss1.base_addr = buf->bo->offset;
>
> @@ -119,9 +119,9 @@ gen6_bind_surfaces(struct intel_batchbuffer *batch,
> binding_table = intel_batchbuffer_subdata_alloc(batch, 32, 32);
>
> binding_table[0] =
> - gen6_bind_buf(batch, dst, GEN6_SURFACEFORMAT_B8G8R8A8_UNORM, 1);
> + gen6_bind_buf(batch, dst, SURFACEFORMAT_B8G8R8A8_UNORM, 1);
> binding_table[1] =
> - gen6_bind_buf(batch, src, GEN6_SURFACEFORMAT_B8G8R8A8_UNORM, 0);
> + gen6_bind_buf(batch, src, SURFACEFORMAT_B8G8R8A8_UNORM, 0);
>
> return intel_batchbuffer_subdata_offset(batch, binding_table);
> }
> @@ -238,7 +238,7 @@ static void
> gen6_emit_null_depth_buffer(struct intel_batchbuffer *batch)
> {
> OUT_BATCH(GEN6_3DSTATE_DEPTH_BUFFER | (7 - 2));
> - OUT_BATCH(GEN6_SURFACE_NULL << GEN6_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
> + OUT_BATCH(SURFACE_NULL << GEN6_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
> GEN6_DEPTHFORMAT_D32_FLOAT << GEN6_3DSTATE_DEPTH_BUFFER_FORMAT_SHIFT);
> OUT_BATCH(0);
> OUT_BATCH(0);
> @@ -362,7 +362,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch)
> OUT_BATCH(GEN6_3DSTATE_VERTEX_ELEMENTS | (2 * 3 + 1 - 2));
>
> OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
> - GEN6_SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
> 0 << VE0_OFFSET_SHIFT);
> OUT_BATCH(GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_0_SHIFT |
> GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_1_SHIFT |
> @@ -371,7 +371,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch)
>
> /* x,y */
> OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
> - GEN6_SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
> 0 << VE0_OFFSET_SHIFT); /* offsets vb in bytes */
> OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
> GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
> @@ -380,7 +380,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch)
>
> /* u0, v0 */
> OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
> - GEN6_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
> 4 << VE0_OFFSET_SHIFT); /* offset vb in bytes */
> OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
> GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
> diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c
> index 73513279..82e33288 100644
> --- a/lib/rendercopy_gen7.c
> +++ b/lib/rendercopy_gen7.c
> @@ -75,7 +75,7 @@ gen7_bind_buf(struct intel_batchbuffer *batch,
>
> ss = intel_batchbuffer_subdata_alloc(batch, 8 * sizeof(*ss), 32);
>
> - ss[0] = (GEN7_SURFACE_2D << GEN7_SURFACE_TYPE_SHIFT |
> + ss[0] = (SURFACE_2D << GEN7_SURFACE_TYPE_SHIFT |
> gen7_tiling_bits(buf->tiling) |
> format << GEN7_SURFACE_FORMAT_SHIFT);
> ss[1] = buf->bo->offset;
> @@ -105,7 +105,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch)
> ((2 * (1 + 2)) + 1 - 2));
>
> OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID |
> - GEN7_SURFACEFORMAT_R32G32B32A32_FLOAT << GEN7_VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R32G32B32A32_FLOAT << GEN7_VE0_FORMAT_SHIFT |
> 0 << GEN7_VE0_OFFSET_SHIFT);
>
> OUT_BATCH(GEN7_VFCOMPONENT_STORE_0 << GEN7_VE1_VFCOMPONENT_0_SHIFT |
> @@ -115,7 +115,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch)
>
> /* x,y */
> OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID |
> - GEN7_SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
> 0 << GEN7_VE0_OFFSET_SHIFT); /* offsets vb in bytes */
> OUT_BATCH(GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_0_SHIFT |
> GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_1_SHIFT |
> @@ -124,7 +124,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch)
>
> /* s,t */
> OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID |
> - GEN7_SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
> 4 << GEN7_VE0_OFFSET_SHIFT); /* offset vb in bytes */
> OUT_BATCH(GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_0_SHIFT |
> GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_1_SHIFT |
> @@ -187,9 +187,9 @@ gen7_bind_surfaces(struct intel_batchbuffer *batch,
> binding_table = intel_batchbuffer_subdata_alloc(batch, 8, 32);
>
> binding_table[0] =
> - gen7_bind_buf(batch, dst, GEN7_SURFACEFORMAT_B8G8R8A8_UNORM, 1);
> + gen7_bind_buf(batch, dst, SURFACEFORMAT_B8G8R8A8_UNORM, 1);
> binding_table[1] =
> - gen7_bind_buf(batch, src, GEN7_SURFACEFORMAT_B8G8R8A8_UNORM, 0);
> + gen7_bind_buf(batch, src, SURFACEFORMAT_B8G8R8A8_UNORM, 0);
>
> return intel_batchbuffer_subdata_offset(batch, binding_table);
> }
> @@ -476,7 +476,7 @@ static void
> gen7_emit_null_depth_buffer(struct intel_batchbuffer *batch)
> {
> OUT_BATCH(GEN7_3DSTATE_DEPTH_BUFFER | (7 - 2));
> - OUT_BATCH(GEN7_SURFACE_NULL << GEN7_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
> + OUT_BATCH(SURFACE_NULL << GEN7_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
> GEN7_DEPTHFORMAT_D32_FLOAT << GEN7_3DSTATE_DEPTH_BUFFER_FORMAT_SHIFT);
> OUT_BATCH(0); /* disable depth, stencil and hiz */
> OUT_BATCH(0);
> diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c
> index f1e4e002..b60d18a7 100644
> --- a/lib/rendercopy_gen8.c
> +++ b/lib/rendercopy_gen8.c
> @@ -164,7 +164,7 @@ gen8_bind_buf(struct intel_batchbuffer *batch,
> offset = intel_batchbuffer_subdata_offset(batch, ss);
> annotation_add_state(aub, AUB_TRACE_SURFACE_STATE, offset, sizeof(*ss));
>
> - ss->ss0.surface_type = GEN6_SURFACE_2D;
> + ss->ss0.surface_type = SURFACE_2D;
> ss->ss0.surface_format = format;
> ss->ss0.render_cache_read_write = 1;
> ss->ss0.vertical_alignment = 1; /* align 4 */
> @@ -208,10 +208,10 @@ gen8_bind_surfaces(struct intel_batchbuffer *batch,
>
> binding_table[0] =
> gen8_bind_buf(batch, aub,
> - dst, GEN6_SURFACEFORMAT_B8G8R8A8_UNORM, 1);
> + dst, SURFACEFORMAT_B8G8R8A8_UNORM, 1);
> binding_table[1] =
> gen8_bind_buf(batch, aub,
> - src, GEN6_SURFACEFORMAT_B8G8R8A8_UNORM, 0);
> + src, SURFACEFORMAT_B8G8R8A8_UNORM, 0);
>
> return offset;
> }
> @@ -321,7 +321,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch) {
> * We don't really know or care what they do.
> */
> OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
> - GEN6_SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
> 0 << VE0_OFFSET_SHIFT); /* we specify 0, but it's really does not exist */
> OUT_BATCH(GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_0_SHIFT |
> GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_1_SHIFT |
> @@ -335,7 +335,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch) {
> * for doing this though.
> */
> OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
> - GEN6_SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
> 0 << VE0_OFFSET_SHIFT); /* offsets vb in bytes */
> OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
> GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
> @@ -347,7 +347,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch) {
> * from the source buffer.
> */
> OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
> - GEN6_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
> 4 << VE0_OFFSET_SHIFT); /* offset vb in bytes */
> OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
> GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
> diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
> index 42b12eb5..ea69b95f 100644
> --- a/lib/rendercopy_gen9.c
> +++ b/lib/rendercopy_gen9.c
> @@ -163,7 +163,7 @@ gen8_bind_buf(struct intel_batchbuffer *batch, struct igt_buf *buf,
> annotation_add_state(&aub_annotations, AUB_TRACE_SURFACE_STATE,
> offset, sizeof(*ss));
>
> - ss->ss0.surface_type = GEN6_SURFACE_2D;
> + ss->ss0.surface_type = SURFACE_2D;
> ss->ss0.surface_format = format;
> ss->ss0.render_cache_read_write = 1;
> ss->ss0.vertical_alignment = 1; /* align 4 */
> @@ -206,9 +206,9 @@ gen8_bind_surfaces(struct intel_batchbuffer *batch,
> offset, 8);
>
> binding_table[0] =
> - gen8_bind_buf(batch, dst, GEN6_SURFACEFORMAT_B8G8R8A8_UNORM, 1);
> + gen8_bind_buf(batch, dst, SURFACEFORMAT_B8G8R8A8_UNORM, 1);
> binding_table[1] =
> - gen8_bind_buf(batch, src, GEN6_SURFACEFORMAT_B8G8R8A8_UNORM, 0);
> + gen8_bind_buf(batch, src, SURFACEFORMAT_B8G8R8A8_UNORM, 0);
>
> return offset;
> }
> @@ -315,7 +315,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch) {
> * We don't really know or care what they do.
> */
> OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
> - GEN6_SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
> 0 << VE0_OFFSET_SHIFT); /* we specify 0, but it's really does not exist */
> OUT_BATCH(GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_0_SHIFT |
> GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_1_SHIFT |
> @@ -329,7 +329,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch) {
> * for doing this though.
> */
> OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
> - GEN6_SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
> 0 << VE0_OFFSET_SHIFT); /* offsets vb in bytes */
> OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
> GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
> @@ -341,7 +341,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch) {
> * from the source buffer.
> */
> OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
> - GEN6_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
> 4 << VE0_OFFSET_SHIFT); /* offset vb in bytes */
> OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
> GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
> diff --git a/tools/null_state_gen/intel_renderstate_gen6.c b/tools/null_state_gen/intel_renderstate_gen6.c
> index 5c1b7f97..13b1e92e 100644
> --- a/tools/null_state_gen/intel_renderstate_gen6.c
> +++ b/tools/null_state_gen/intel_renderstate_gen6.c
> @@ -190,7 +190,7 @@ static void
> gen6_emit_null_depth_buffer(struct intel_batchbuffer *batch)
> {
> OUT_BATCH(GEN6_3DSTATE_DEPTH_BUFFER | (7 - 2));
> - OUT_BATCH(GEN6_SURFACE_NULL << GEN6_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
> + OUT_BATCH(SURFACE_NULL << GEN6_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
> GEN6_DEPTHFORMAT_D32_FLOAT << GEN6_3DSTATE_DEPTH_BUFFER_FORMAT_SHIFT);
> OUT_BATCH(0);
> OUT_BATCH(0);
> @@ -314,7 +314,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch)
> OUT_BATCH(GEN6_3DSTATE_VERTEX_ELEMENTS | (2 * 3 + 1 - 2));
>
> OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
> - GEN6_SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R32G32B32A32_FLOAT << VE0_FORMAT_SHIFT |
> 0 << VE0_OFFSET_SHIFT);
> OUT_BATCH(GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_0_SHIFT |
> GEN6_VFCOMPONENT_STORE_0 << VE1_VFCOMPONENT_1_SHIFT |
> @@ -323,7 +323,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch)
>
> /* x,y */
> OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
> - GEN6_SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R16G16_SSCALED << VE0_FORMAT_SHIFT |
> 0 << VE0_OFFSET_SHIFT); /* offsets vb in bytes */
> OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
> GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
> @@ -332,7 +332,7 @@ gen6_emit_vertex_elements(struct intel_batchbuffer *batch)
>
> /* u0, v0 */
> OUT_BATCH(0 << VE0_VERTEX_BUFFER_INDEX_SHIFT | VE0_VALID |
> - GEN6_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT |
> 4 << VE0_OFFSET_SHIFT); /* offset vb in bytes */
> OUT_BATCH(GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT |
> GEN6_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT |
> diff --git a/tools/null_state_gen/intel_renderstate_gen7.c b/tools/null_state_gen/intel_renderstate_gen7.c
> index df20bc25..ea5cfc29 100644
> --- a/tools/null_state_gen/intel_renderstate_gen7.c
> +++ b/tools/null_state_gen/intel_renderstate_gen7.c
> @@ -53,7 +53,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch)
> ((2 * (1 + 2)) + 1 - 2));
>
> OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID |
> - GEN7_SURFACEFORMAT_R32G32B32A32_FLOAT <<
> + SURFACEFORMAT_R32G32B32A32_FLOAT <<
> GEN7_VE0_FORMAT_SHIFT |
> 0 << GEN7_VE0_OFFSET_SHIFT);
>
> @@ -64,7 +64,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch)
>
> /* x,y */
> OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID |
> - GEN7_SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
> 0 << GEN7_VE0_OFFSET_SHIFT); /* offsets vb in bytes */
> OUT_BATCH(GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_0_SHIFT |
> GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_1_SHIFT |
> @@ -73,7 +73,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch)
>
> /* s,t */
> OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID |
> - GEN7_SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
> + SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT |
> 4 << GEN7_VE0_OFFSET_SHIFT); /* offset vb in bytes */
> OUT_BATCH(GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_0_SHIFT |
> GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_1_SHIFT |
> @@ -401,7 +401,7 @@ static void
> gen7_emit_null_depth_buffer(struct intel_batchbuffer *batch)
> {
> OUT_BATCH(GEN7_3DSTATE_DEPTH_BUFFER | (7 - 2));
> - OUT_BATCH(GEN7_SURFACE_NULL << GEN7_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
> + OUT_BATCH(SURFACE_NULL << GEN7_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT |
> GEN7_DEPTHFORMAT_D32_FLOAT <<
> GEN7_3DSTATE_DEPTH_BUFFER_FORMAT_SHIFT);
> OUT_BATCH(0); /* disable depth, stencil and hiz */
> --
> 2.14.3
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/3] lib/surfacestate: Creating surfaceformat header
2018-05-25 7:15 [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header Lukasz Kalamarz
` (2 preceding siblings ...)
2018-05-25 7:22 ` [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header Katarzyna Dec
@ 2018-05-25 7:41 ` Patchwork
2018-05-25 9:58 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2018-06-05 6:46 ` [igt-dev] [PATCH i-g-t v2 1/3] " Katarzyna Dec
5 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-05-25 7:41 UTC (permalink / raw)
To: Lukasz Kalamarz; +Cc: igt-dev
== Series Details ==
Series: series starting with [i-g-t,v2,1/3] lib/surfacestate: Creating surfaceformat header
URL : https://patchwork.freedesktop.org/series/43756/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4227 -> IGTPW_1397 =
== Summary - WARNING ==
Minor unknown changes coming with IGTPW_1397 need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_1397, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/43756/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in IGTPW_1397:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: SKIP -> PASS
== Known issues ==
Here are the changes found in IGTPW_1397 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_chamelium@dp-edid-read:
fi-kbl-7500u: PASS -> FAIL (fdo#103841)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-cnl-psr: PASS -> DMESG-WARN (fdo#104951)
==== Possible fixes ====
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-hsw-4770: FAIL (fdo#100368) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
== Participating hosts (44 -> 38) ==
Missing (6): fi-ilk-m540 fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-skl-6700hq
== Build changes ==
* IGT: IGT_4495 -> IGTPW_1397
* Piglit: piglit_4495 -> None
CI_DRM_4227: a8727d3fe03770e4d523468dfbc487dfe01597d3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_1397: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1397/
IGT_4495: 71c7a5740913d2618f44bca252669efe8a84f4c9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4495: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1397/issues.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,v2,1/3] lib/surfacestate: Creating surfaceformat header
2018-05-25 7:15 [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header Lukasz Kalamarz
` (3 preceding siblings ...)
2018-05-25 7:41 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/3] " Patchwork
@ 2018-05-25 9:58 ` Patchwork
2018-06-05 6:46 ` [igt-dev] [PATCH i-g-t v2 1/3] " Katarzyna Dec
5 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-05-25 9:58 UTC (permalink / raw)
To: Lukasz Kalamarz; +Cc: igt-dev
== Series Details ==
Series: series starting with [i-g-t,v2,1/3] lib/surfacestate: Creating surfaceformat header
URL : https://patchwork.freedesktop.org/series/43756/
State : success
== Summary ==
= CI Bug Log - changes from IGT_4495_full -> IGTPW_1397_full =
== Summary - WARNING ==
Minor unknown changes coming with IGTPW_1397_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_1397_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/43756/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in IGTPW_1397_full:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_schedule@deep-bsd1:
shard-kbl: SKIP -> PASS +1
== Known issues ==
Here are the changes found in IGTPW_1397_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@flip-vs-expired-vblank:
shard-glk: PASS -> FAIL (fdo#102887)
igt@kms_flip@plain-flip-ts-check-interruptible:
shard-glk: PASS -> FAIL (fdo#100368) +1
igt@kms_flip_tiling@flip-to-y-tiled:
shard-glk: PASS -> FAIL (fdo#104724, fdo#103822)
igt@kms_rotation_crc@sprite-rotation-180:
shard-snb: PASS -> FAIL (fdo#104724, fdo#103925)
igt@testdisplay:
shard-glk: PASS -> INCOMPLETE (k.org#198133, fdo#103359)
==== Possible fixes ====
igt@drv_selftest@live_gtt:
shard-kbl: INCOMPLETE (fdo#103665) -> PASS
igt@drv_selftest@live_hangcheck:
shard-apl: DMESG-FAIL (fdo#106560) -> PASS
igt@gem_ppgtt@blt-vs-render-ctxn:
shard-kbl: INCOMPLETE (fdo#106023, fdo#103665) -> PASS
igt@kms_atomic_transition@1x-modeset-transitions-nonblocking:
shard-glk: FAIL (fdo#105703) -> PASS
{igt@kms_available_modes_crc@available_mode_test_crc}:
shard-snb: FAIL (fdo#106641) -> PASS
igt@kms_flip@2x-flip-vs-expired-vblank:
shard-glk: FAIL (fdo#102887) -> PASS +1
igt@kms_flip@plain-flip-ts-check:
shard-hsw: FAIL (fdo#100368) -> PASS
igt@kms_setmode@basic:
shard-kbl: FAIL (fdo#99912) -> PASS
==== Warnings ====
igt@drv_selftest@live_gtt:
shard-glk: FAIL -> INCOMPLETE (k.org#198133, fdo#103359)
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105703 https://bugs.freedesktop.org/show_bug.cgi?id=105703
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106641 https://bugs.freedesktop.org/show_bug.cgi?id=106641
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* IGT: IGT_4495 -> IGTPW_1397
* Linux: CI_DRM_4225 -> CI_DRM_4227
* Piglit: piglit_4495 -> None
CI_DRM_4225: 88ca72d89921db7a46dfb1492e2059e04a7b6c5e @ git://anongit.freedesktop.org/gfx-ci/linux
CI_DRM_4227: a8727d3fe03770e4d523468dfbc487dfe01597d3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_1397: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1397/
IGT_4495: 71c7a5740913d2618f44bca252669efe8a84f4c9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4495: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1397/shards.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header
2018-05-25 7:15 [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header Lukasz Kalamarz
` (4 preceding siblings ...)
2018-05-25 9:58 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
@ 2018-06-05 6:46 ` Katarzyna Dec
5 siblings, 0 replies; 8+ messages in thread
From: Katarzyna Dec @ 2018-06-05 6:46 UTC (permalink / raw)
To: Lukasz Kalamarz; +Cc: igt-dev
On Fri, May 25, 2018 at 09:15:32AM +0200, Lukasz Kalamarz wrote:
Thanks for the patches Lukasz!
Pushed :)
Kasia
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-06-05 6:46 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-25 7:15 [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header Lukasz Kalamarz
2018-05-25 7:15 ` [igt-dev] [PATCH i-g-t v2 2/3] lib: Rename all surfaceformat calls in libs Lukasz Kalamarz
2018-05-25 7:23 ` Katarzyna Dec
2018-05-25 7:15 ` [igt-dev] [PATCH i-g-t v2 3/3] libs: Removal of duplicated SURFACEFORMAT definitions Lukasz Kalamarz
2018-05-25 7:22 ` [igt-dev] [PATCH i-g-t v2 1/3] lib/surfacestate: Creating surfaceformat header Katarzyna Dec
2018-05-25 7:41 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/3] " Patchwork
2018-05-25 9:58 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2018-06-05 6:46 ` [igt-dev] [PATCH i-g-t v2 1/3] " Katarzyna Dec
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.