[igt-dev] [PATCH i-g-t v2 1/5] lib/gen7_render: include gen6_render header

[Lukasz Kalamarz]

We would like to modify genX_header in the similar manner as
we have in genX_media headers. This patch add gen6 header
to gen7 includes and also remove redefinition of two enums.

v2: fixed commit message

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/gen7_render.h | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/lib/gen7_render.h b/lib/gen7_render.h
index 2dca8b76..0c3d83cd 100644
--- a/lib/gen7_render.h
+++ b/lib/gen7_render.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include "surfaceformat.h"
+#include "gen6_render.h"
 
 #define INTEL_MASK(high, low) (((1 << ((high) - (low) + 1)) - 1) << (low))
 
@@ -1183,18 +1184,4 @@ struct gen7_cc_viewport {
 	float max_depth;
 };
 
-typedef enum {
-	SAMPLER_FILTER_NEAREST = 0,
-	SAMPLER_FILTER_BILINEAR,
-	FILTER_COUNT
-} sampler_filter_t;
-
-typedef enum {
-	SAMPLER_EXTEND_NONE = 0,
-	SAMPLER_EXTEND_REPEAT,
-	SAMPLER_EXTEND_PAD,
-	SAMPLER_EXTEND_REFLECT,
-	EXTEND_COUNT
-} sampler_extend_t;
-
 #endif
-- 
2.14.3