From 45c0f60999587ed29a7a9b81f09950dd8f58fb49 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 16 Jun 2016 14:58:25 -0700 Subject: 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 Cc: "12.0" --- src/intel/vulkan/gen8_pipeline.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/intel/vulkan/gen8_pipeline.c') 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 = -- cgit v1.1