diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-12-02 16:08:13 -0800 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-12-03 13:43:54 -0800 |
| commit | a5f19f64c3317c98b984010f144416ce768a3c0b (patch) | |
| tree | 9c9c4252a777420e52c6c72f01b77a1e6e3c6616 /src/vulkan/gen8_pipeline.c | |
| parent | e10dc002e9544500a2247e49a132e18f994f34ee (diff) | |
| download | external_mesa3d-a5f19f64c3317c98b984010f144416ce768a3c0b.zip external_mesa3d-a5f19f64c3317c98b984010f144416ce768a3c0b.tar.gz external_mesa3d-a5f19f64c3317c98b984010f144416ce768a3c0b.tar.bz2 | |
vk/0.210.0: Remove the VkShaderStage enum
This made for an unfortunately large amount of work since we were using it
fairly heavily internally. However, gl_shader_stage does basically the
same things, so it's not too bad.
Diffstat (limited to 'src/vulkan/gen8_pipeline.c')
| -rw-r--r-- | src/vulkan/gen8_pipeline.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vulkan/gen8_pipeline.c b/src/vulkan/gen8_pipeline.c index 106f82d..82a63d3 100644 --- a/src/vulkan/gen8_pipeline.c +++ b/src/vulkan/gen8_pipeline.c @@ -454,7 +454,7 @@ genX(graphics_pipeline_create)( .BindingTableEntryCount = 0, .ExpectedVertexCount = pipeline->gs_vertex_count, - .ScratchSpaceBasePointer = pipeline->scratch_start[VK_SHADER_STAGE_GEOMETRY], + .ScratchSpaceBasePointer = pipeline->scratch_start[MESA_SHADER_GEOMETRY], .PerThreadScratchSpace = ffs(gs_prog_data->base.base.total_scratch / 2048), .OutputVertexSize = gs_prog_data->output_vertex_size_hwords * 2 - 1, @@ -512,7 +512,7 @@ genX(graphics_pipeline_create)( .AccessesUAV = false, .SoftwareExceptionEnable = false, - .ScratchSpaceBasePointer = pipeline->scratch_start[VK_SHADER_STAGE_VERTEX], + .ScratchSpaceBasePointer = pipeline->scratch_start[MESA_SHADER_VERTEX], .PerThreadScratchSpace = ffs(vue_prog_data->base.total_scratch / 2048), .DispatchGRFStartRegisterForURBData = @@ -624,7 +624,7 @@ genX(graphics_pipeline_create)( .VectorMaskEnable = true, .SamplerCount = 1, - .ScratchSpaceBasePointer = pipeline->scratch_start[VK_SHADER_STAGE_FRAGMENT], + .ScratchSpaceBasePointer = pipeline->scratch_start[MESA_SHADER_FRAGMENT], .PerThreadScratchSpace = ffs(wm_prog_data->base.total_scratch / 2048), .MaximumNumberofThreadsPerPSD = 64 - num_thread_bias, @@ -709,7 +709,7 @@ VkResult genX(compute_pipeline_create)( pipeline->active_stages = 0; pipeline->total_scratch = 0; - assert(pCreateInfo->stage.stage == VK_SHADER_STAGE_COMPUTE); + assert(pCreateInfo->stage.stage == VK_SHADER_STAGE_COMPUTE_BIT); ANV_FROM_HANDLE(anv_shader_module, module, pCreateInfo->stage.module); anv_pipeline_compile_cs(pipeline, pCreateInfo, module, pCreateInfo->stage.pName); @@ -719,7 +719,7 @@ VkResult genX(compute_pipeline_create)( const struct brw_cs_prog_data *cs_prog_data = &pipeline->cs_prog_data; anv_batch_emit(&pipeline->batch, GENX(MEDIA_VFE_STATE), - .ScratchSpaceBasePointer = pipeline->scratch_start[VK_SHADER_STAGE_COMPUTE], + .ScratchSpaceBasePointer = pipeline->scratch_start[MESA_SHADER_COMPUTE], .PerThreadScratchSpace = ffs(cs_prog_data->base.total_scratch / 2048), .ScratchSpaceBasePointerHigh = 0, .StackSize = 0, |