vk: Undo relocs for scratch bos

1 files changed, 12 insertions, 30 deletions

diff --git a/src/vulkan/gen7_pack.h b/src/vulkan/gen7_pack.h
index 88780322540..75f193891d6 100644
--- a/src/vulkan/gen7_pack.h
+++ b/src/vulkan/gen7_pack.h
@@ -1521,7 +1521,7 @@ struct GEN7_3DSTATE_DS {
    uint32_t                                     FloatingPointMode;
    uint32_t                                     IllegalOpcodeExceptionEnable;
    uint32_t                                     SoftwareExceptionEnable;
-   __gen_address_type                           ScratchSpaceBasePointer;
+   uint32_t                                     ScratchSpaceBasePointer;
    uint32_t                                     PerThreadScratchSpace;
    uint32_t                                     DispatchGRFStartRegisterForURBData;
    uint32_t                                     PatchURBEntryReadLength;
@@ -1561,14 +1561,11 @@ GEN7_3DSTATE_DS_pack(__gen_user_data *data, void * restrict dst,
       __gen_field(values->SoftwareExceptionEnable, 7, 7) |
       0;
 
-   uint32_t dw3 =
+   dw[3] =
       __gen_offset(values->ScratchSpaceBasePointer, 10, 31) |
       __gen_field(values->PerThreadScratchSpace, 0, 3) |
       0;
 
-   dw[3] =
-      __gen_combine_address(data, &dw[3], values->ScratchSpaceBasePointer, dw3);
-
    dw[4] =
       __gen_field(values->DispatchGRFStartRegisterForURBData, 20, 24) |
       __gen_field(values->PatchURBEntryReadLength, 11, 17) |
@@ -1621,7 +1618,7 @@ struct GEN7_3DSTATE_GS {
    uint32_t                                     IllegalOpcodeExceptionEnable;
    uint32_t                                     MaskStackExceptionEnable;
    uint32_t                                     SoftwareExceptionEnable;
-   __gen_address_type                           ScratchSpaceBasePointer;
+   uint32_t                                     ScratchSpaceBasePointer;
    uint32_t                                     PerThreadScratchSpace;
    uint32_t                                     OutputVertexSize;
    uint32_t                                     OutputTopology;
@@ -1680,14 +1677,11 @@ GEN7_3DSTATE_GS_pack(__gen_user_data *data, void * restrict dst,
       __gen_field(values->SoftwareExceptionEnable, 7, 7) |
       0;
 
-   uint32_t dw3 =
+   dw[3] =
       __gen_offset(values->ScratchSpaceBasePointer, 10, 31) |
       __gen_field(values->PerThreadScratchSpace, 0, 3) |
       0;
 
-   dw[3] =
-      __gen_combine_address(data, &dw[3], values->ScratchSpaceBasePointer, dw3);
-
    dw[4] =
       __gen_field(values->OutputVertexSize, 23, 28) |
       __gen_field(values->OutputTopology, 17, 22) |
@@ -1800,7 +1794,7 @@ struct GEN7_3DSTATE_HS {
    uint32_t                                     StatisticsEnable;
    uint32_t                                     InstanceCount;
    uint32_t                                     KernelStartPointer;
-   __gen_address_type                           ScratchSpaceBasePointer;
+   uint32_t                                     ScratchSpaceBasePointer;
    uint32_t                                     PerThreadScratchSpace;
    uint32_t                                     SingleProgramFlow;
 #define     Dmask                                              0
@@ -1846,14 +1840,11 @@ GEN7_3DSTATE_HS_pack(__gen_user_data *data, void * restrict dst,
       __gen_offset(values->KernelStartPointer, 6, 31) |
       0;
 
-   uint32_t dw4 =
+   dw[4] =
       __gen_offset(values->ScratchSpaceBasePointer, 10, 31) |
       __gen_field(values->PerThreadScratchSpace, 0, 3) |
       0;
 
-   dw[4] =
-      __gen_combine_address(data, &dw[4], values->ScratchSpaceBasePointer, dw4);
-
    dw[5] =
       __gen_field(values->SingleProgramFlow, 27, 27) |
       __gen_field(values->VectorMaskEnable, 26, 26) |
@@ -2217,7 +2208,7 @@ struct GEN7_3DSTATE_PS {
    uint32_t                                     IllegalOpcodeExceptionEnable;
    uint32_t                                     MaskStackExceptionEnable;
    uint32_t                                     SoftwareExceptionEnable;
-   __gen_address_type                           ScratchSpaceBasePointer;
+   uint32_t                                     ScratchSpaceBasePointer;
    uint32_t                                     PerThreadScratchSpace;
    uint32_t                                     MaximumNumberofThreads;
    uint32_t                                     PushConstantEnable;
@@ -2271,14 +2262,11 @@ GEN7_3DSTATE_PS_pack(__gen_user_data *data, void * restrict dst,
       __gen_field(values->SoftwareExceptionEnable, 7, 7) |
       0;
 
-   uint32_t dw3 =
+   dw[3] =
       __gen_offset(values->ScratchSpaceBasePointer, 10, 31) |
       __gen_field(values->PerThreadScratchSpace, 0, 3) |
       0;
 
-   dw[3] =
-      __gen_combine_address(data, &dw[3], values->ScratchSpaceBasePointer, dw3);
-
    dw[4] =
       __gen_field(values->MaximumNumberofThreads, 24, 31) |
       __gen_field(values->PushConstantEnable, 11, 11) |
@@ -3927,7 +3915,7 @@ struct GEN7_3DSTATE_VS {
    uint32_t                                     FloatingPointMode;
    uint32_t                                     IllegalOpcodeExceptionEnable;
    uint32_t                                     SoftwareExceptionEnable;
-   __gen_address_type                           ScratchSpaceBaseOffset;
+   uint32_t                                     ScratchSpaceBaseOffset;
    uint32_t                                     PerThreadScratchSpace;
    uint32_t                                     DispatchGRFStartRegisterforURBData;
    uint32_t                                     VertexURBEntryReadLength;
@@ -3966,14 +3954,11 @@ GEN7_3DSTATE_VS_pack(__gen_user_data *data, void * restrict dst,
       __gen_field(values->SoftwareExceptionEnable, 7, 7) |
       0;
 
-   uint32_t dw3 =
+   dw[3] =
       __gen_offset(values->ScratchSpaceBaseOffset, 10, 31) |
       __gen_field(values->PerThreadScratchSpace, 0, 3) |
       0;
 
-   dw[3] =
-      __gen_combine_address(data, &dw[3], values->ScratchSpaceBaseOffset, dw3);
-
    dw[4] =
       __gen_field(values->DispatchGRFStartRegisterforURBData, 20, 24) |
       __gen_field(values->VertexURBEntryReadLength, 11, 16) |
@@ -4699,7 +4684,7 @@ struct GEN7_MEDIA_VFE_STATE {
    uint32_t                                     MediaCommandOpcode;
    uint32_t                                     SubOpcode;
    uint32_t                                     DwordLength;
-   __gen_address_type                           ScratchSpaceBasePointer;
+   uint32_t                                     ScratchSpaceBasePointer;
    uint32_t                                     PerThreadScratchSpace;
    uint32_t                                     MaximumNumberofThreads;
    uint32_t                                     NumberofURBEntries;
@@ -4754,14 +4739,11 @@ GEN7_MEDIA_VFE_STATE_pack(__gen_user_data *data, void * restrict dst,
       __gen_field(values->DwordLength, 0, 15) |
       0;
 
-   uint32_t dw1 =
+   dw[1] =
       __gen_offset(values->ScratchSpaceBasePointer, 10, 31) |
       __gen_field(values->PerThreadScratchSpace, 0, 3) |
       0;
 
-   dw[1] =
-      __gen_combine_address(data, &dw[1], values->ScratchSpaceBasePointer, dw1);
-
    dw[2] =
       __gen_field(values->MaximumNumberofThreads, 16, 31) |
       __gen_field(values->NumberofURBEntries, 8, 15) |