From 7669af4462359062a52d4b3d1f77c88cc293fb42 Mon Sep 17 00:00:00 2001 From: Lukasz Kalamarz Date: Tue, 12 Jun 2018 14:09:59 +0200 Subject: lib/gen7_render: include gen6_render header We would like to modify genX_header in the similar manner as we have in genX_media headers. This patch adds gen6 header to gen7 includes and also removes redefinition of two enums. v2: fixed commit message v3: fixed typos in commit msg Signed-off-by: Lukasz Kalamarz Cc: Katarzyna Dec Cc: Antonio Argenziano Cc: Daniele Ceraolo Spurio Cc: Ewelina Musial Reviewed-by: Katarzyna Dec --- lib/gen7_render.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'lib/gen7_render.h') 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 #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 -- cgit v1.2.3