From 9905481552c4d507952af520c22d054a68cdb61c Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Tue, 12 May 2015 14:25:47 -0700 Subject: vk: Add generated header for HSW and IVB (GEN75 and GEN7) --- src/vulkan/gen8_pack.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/vulkan/gen8_pack.h') diff --git a/src/vulkan/gen8_pack.h b/src/vulkan/gen8_pack.h index c15afe9b266..bc221e52089 100644 --- a/src/vulkan/gen8_pack.h +++ b/src/vulkan/gen8_pack.h @@ -32,6 +32,9 @@ #include #include +#ifndef __gen_field_functions +#define __gen_field_functions + union __gen_value { float f; uint32_t dw; @@ -74,6 +77,8 @@ __gen_float(float v) #error #define __gen_combine_address before including this file #endif +#endif + #define GEN8_3DSTATE_URB_VS_length 0x00000002 #define GEN8_3DSTATE_URB_VS_length_bias 0x00000002 #define GEN8_3DSTATE_URB_VS_header \ @@ -3480,12 +3485,12 @@ struct GEN8_3DSTATE_RASTER { #define Clockwise 0 #define CounterClockwise 1 uint32_t FrontWinding; -#define NUMRASTSAMPLES_0 0 -#define NUMRASTSAMPLES_1 1 -#define NUMRASTSAMPLES_2 2 -#define NUMRASTSAMPLES_4 3 -#define NUMRASTSAMPLES_8 4 -#define NUMRASTSAMPLES_16 5 +#define FSC_NUMRASTSAMPLES_0 0 +#define FSC_NUMRASTSAMPLES_1 1 +#define FSC_NUMRASTSAMPLES_2 2 +#define FSC_NUMRASTSAMPLES_4 3 +#define FSC_NUMRASTSAMPLES_8 4 +#define FSC_NUMRASTSAMPLES_16 5 uint32_t ForcedSampleCount; #define CULLMODE_BOTH 0 #define CULLMODE_NONE 1 @@ -8309,7 +8314,6 @@ GEN8_SAMPLER_STATE_pack(__gen_user_data *data, void * restrict dst, } /* Enum 3D_Prim_Topo_Type */ -#ifndef _3DPRIM_POINTLIST #define _3DPRIM_POINTLIST 1 #define _3DPRIM_LINELIST 2 #define _3DPRIM_LINESTRIP 3 @@ -8363,7 +8367,6 @@ GEN8_SAMPLER_STATE_pack(__gen_user_data *data, void * restrict dst, #define _3DPRIM_PATCHLIST_30 61 #define _3DPRIM_PATCHLIST_31 62 #define _3DPRIM_PATCHLIST_32 63 -#endif /* Enum 3D_Vertex_Component_Control */ #define VFCOMP_NOSTORE 0 -- cgit v1.2.3