[igt-dev] [PATCH i-g-t 5/5] lib/gen9_render: Header cleanup

Lukasz Kalamarz lukasz.kalamarz at intel.com
Fri Jun 8 11:38:55 UTC 2018


This patch cleans gen9 header from a duplicate definition
and it dependency.

Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz at intel.com>
Cc: Katarzyna Dec <katarzyna.dec at intel.com>
Cc: Antonio Argenziano <antonio.argenziano at intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
Cc: Ewelina Musial <ewelina.musial at intel.com>
---
 lib/gen9_render.h     | 1 -
 lib/rendercopy_gen9.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/gen9_render.h b/lib/gen9_render.h
index aac620a0..90f56053 100644
--- a/lib/gen9_render.h
+++ b/lib/gen9_render.h
@@ -3,7 +3,6 @@
 
 #include "gen8_render.h"
 
-#define GEN7_3DSTATE_VF				GEN6_3D(3, 0, 0x0c)
 #define GEN9_3DSTATE_COMPONENT_PACKING		GEN6_3D(3, 0, 0x55)
 
 #define GEN9_SBE_ACTIVE_COMPONENT_NONE		0
diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
index eaf7f17e..0157ced9 100644
--- a/lib/rendercopy_gen9.c
+++ b/lib/rendercopy_gen9.c
@@ -846,7 +846,7 @@ static void gen8_emit_vf_topology(struct intel_batchbuffer *batch)
 /* Vertex elements MUST be defined before this according to spec */
 static void gen8_emit_primitive(struct intel_batchbuffer *batch, uint32_t offset)
 {
-	OUT_BATCH(GEN7_3DSTATE_VF | (2 - 2));
+	OUT_BATCH(GEN8_3DSTATE_VF | (2 - 2));
 	OUT_BATCH(0);
 
 	OUT_BATCH(GEN8_3DSTATE_VF_INSTANCING | (3 - 2));
-- 
2.14.3



More information about the igt-dev mailing list