diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-06-16 14:58:25 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-06-22 12:39:42 -0700 |
| commit | 45c0f60999587ed29a7a9b81f09950dd8f58fb49 (patch) | |
| tree | 682f931b356642206724a5e794cbf336e2d6ae9c /src/intel/vulkan/gen8_pipeline.c | |
| parent | 966bed17c1a04854b4a422d90de81744556204b6 (diff) | |
| download | external_mesa3d-45c0f60999587ed29a7a9b81f09950dd8f58fb49.zip external_mesa3d-45c0f60999587ed29a7a9b81f09950dd8f58fb49.tar.gz external_mesa3d-45c0f60999587ed29a7a9b81f09950dd8f58fb49.tar.bz2 | |
genxml: Make ScratchSpaceBasePointer an address instead of an offset
While we're here, we also fixup MEDIA_VFE_STATE and rename the field in
3DSTATE_VS on gen6-7.5 to be consistent with the others.
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Cc: "12.0" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/intel/vulkan/gen8_pipeline.c')
| -rw-r--r-- | src/intel/vulkan/gen8_pipeline.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/intel/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c index 2a96be0..53fca2b 100644 --- a/src/intel/vulkan/gen8_pipeline.c +++ b/src/intel/vulkan/gen8_pipeline.c @@ -360,7 +360,10 @@ genX(graphics_pipeline_create)( gs.BindingTableEntryCount = 0; gs.ExpectedVertexCount = gs_prog_data->vertices_in; - gs.ScratchSpaceBasePointer = pipeline->scratch_start[MESA_SHADER_GEOMETRY]; + gs.ScratchSpaceBasePointer = (struct anv_address) { + .bo = NULL, + .offset = pipeline->scratch_start[MESA_SHADER_GEOMETRY], + }; gs.PerThreadScratchSpace = scratch_space(&gs_prog_data->base.base); gs.OutputVertexSize = gs_prog_data->output_vertex_size_hwords * 2 - 1; gs.OutputTopology = gs_prog_data->output_topology; @@ -427,7 +430,10 @@ genX(graphics_pipeline_create)( vs.AccessesUAV = false; vs.SoftwareExceptionEnable = false; - vs.ScratchSpaceBasePointer = pipeline->scratch_start[MESA_SHADER_VERTEX], + vs.ScratchSpaceBasePointer = (struct anv_address) { + .bo = NULL, + .offset = pipeline->scratch_start[MESA_SHADER_VERTEX], + }; vs.PerThreadScratchSpace = scratch_space(&vs_prog_data->base.base); vs.DispatchGRFStartRegisterForURBData = @@ -476,7 +482,10 @@ genX(graphics_pipeline_create)( ps.MaximumNumberofThreadsPerPSD = 64 - num_thread_bias; - ps.ScratchSpaceBasePointer = pipeline->scratch_start[MESA_SHADER_FRAGMENT]; + ps.ScratchSpaceBasePointer = (struct anv_address) { + .bo = NULL, + .offset = pipeline->scratch_start[MESA_SHADER_FRAGMENT], + }; ps.PerThreadScratchSpace = scratch_space(&wm_prog_data->base); ps.DispatchGRFStartRegisterForConstantSetupData0 = |