diff options
| author | Jason Ekstrand <[email protected]> | 2016-02-20 09:08:27 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-02-20 09:09:28 -0800 |
| commit | 371b4a5b33a13f35fa7783510d2d90685a9a2e8a (patch) | |
| tree | e621abce65fefe7eae5af2417ef6c137c14a4324 /src/intel/vulkan/genX_pipeline.c | |
| parent | 0d76aa94855462cbd6094897d3de831d15d23297 (diff) | |
anv: Switch over to the macros in genxml
Diffstat (limited to 'src/intel/vulkan/genX_pipeline.c')
| -rw-r--r-- | src/intel/vulkan/genX_pipeline.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 54ec8307d02..41a5d0f889c 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -23,15 +23,8 @@ #include "anv_private.h" -#if (ANV_GEN == 9) -# include "genxml/gen9_pack.h" -#elif (ANV_GEN == 8) -# include "genxml/gen8_pack.h" -#elif (ANV_IS_HASWELL) -# include "genxml/gen75_pack.h" -#elif (ANV_GEN == 7) -# include "genxml/gen7_pack.h" -#endif +#include "genxml/gen_macros.h" +#include "genxml/genX_pack.h" VkResult genX(compute_pipeline_create)( @@ -94,19 +87,19 @@ genX(compute_pipeline_create)( anv_batch_emit(&pipeline->batch, GENX(MEDIA_VFE_STATE), .ScratchSpaceBasePointer = pipeline->scratch_start[MESA_SHADER_COMPUTE], .PerThreadScratchSpace = ffs(cs_prog_data->base.total_scratch / 2048), -#if ANV_GEN > 7 +#if GEN_GEN > 7 .ScratchSpaceBasePointerHigh = 0, .StackSize = 0, #else .GPGPUMode = true, #endif .MaximumNumberofThreads = device->info.max_cs_threads - 1, - .NumberofURBEntries = ANV_GEN <= 7 ? 0 : 2, + .NumberofURBEntries = GEN_GEN <= 7 ? 0 : 2, .ResetGatewayTimer = true, -#if ANV_GEN <= 8 +#if GEN_GEN <= 8 .BypassGatewayControl = true, #endif - .URBEntryAllocationSize = ANV_GEN <= 7 ? 0 : 2, + .URBEntryAllocationSize = GEN_GEN <= 7 ? 0 : 2, .CURBEAllocationSize = 0); struct brw_cs_prog_data *prog_data = &pipeline->cs_prog_data; |