From 1d40e6ade8042a851e9ac758ab023ad3aa9d7817 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kristian=20H=C3=B8gsberg?= <kristian.h.kristensen@intel.com>
Date: Mon, 18 May 2015 17:00:52 -0700
Subject: [PATCH] vk: Update generated header files

This fixes a problem where register addresses where incorrectly shifted.
---
 src/vulkan/gen75_pack.h | 12 ++++++------
 src/vulkan/gen7_pack.h  |  8 ++++----
 src/vulkan/gen8_pack.h  | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/vulkan/gen75_pack.h b/src/vulkan/gen75_pack.h
index f01fdb07156..ed4ab2e52c6 100644
--- a/src/vulkan/gen75_pack.h
+++ b/src/vulkan/gen75_pack.h
@@ -193,7 +193,7 @@ GEN75_MI_STORE_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[1] =
-      __gen_field(values->RegisterAddress, 2, 22) |
+      __gen_offset(values->RegisterAddress, 2, 22) |
       0;
 
    uint32_t dw2 =
@@ -5616,7 +5616,7 @@ GEN75_MI_LOAD_REGISTER_IMM_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[1] =
-      __gen_field(values->RegisterOffset, 2, 22) |
+      __gen_offset(values->RegisterOffset, 2, 22) |
       0;
 
    dw[2] =
@@ -5657,7 +5657,7 @@ GEN75_MI_LOAD_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[1] =
-      __gen_field(values->RegisterAddress, 2, 22) |
+      __gen_offset(values->RegisterAddress, 2, 22) |
       0;
 
    uint32_t dw2 =
@@ -5696,11 +5696,11 @@ GEN75_MI_LOAD_REGISTER_REG_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[1] =
-      __gen_field(values->SourceRegisterAddress, 2, 22) |
+      __gen_offset(values->SourceRegisterAddress, 2, 22) |
       0;
 
    dw[2] =
-      __gen_field(values->DestinationRegisterAddress, 2, 22) |
+      __gen_offset(values->DestinationRegisterAddress, 2, 22) |
       0;
 
 }
@@ -6447,7 +6447,7 @@ GEN75_MI_URB_CLEAR_pack(__gen_user_data *data, void * restrict dst,
 
    dw[1] =
       __gen_field(values->URBClearLength, 16, 29) |
-      __gen_field(values->URBAddress, 0, 14) |
+      __gen_offset(values->URBAddress, 0, 14) |
       0;
 
 }
diff --git a/src/vulkan/gen7_pack.h b/src/vulkan/gen7_pack.h
index 5350e3a18a4..ef56e97539d 100644
--- a/src/vulkan/gen7_pack.h
+++ b/src/vulkan/gen7_pack.h
@@ -151,7 +151,7 @@ GEN7_MI_STORE_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[1] =
-      __gen_field(values->RegisterAddress, 2, 22) |
+      __gen_offset(values->RegisterAddress, 2, 22) |
       0;
 
    uint32_t dw2 =
@@ -4811,7 +4811,7 @@ GEN7_MI_LOAD_REGISTER_IMM_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[1] =
-      __gen_field(values->RegisterOffset, 2, 22) |
+      __gen_offset(values->RegisterOffset, 2, 22) |
       0;
 
    dw[2] =
@@ -4852,7 +4852,7 @@ GEN7_MI_LOAD_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[1] =
-      __gen_field(values->RegisterAddress, 2, 22) |
+      __gen_offset(values->RegisterAddress, 2, 22) |
       0;
 
    uint32_t dw2 =
@@ -5248,7 +5248,7 @@ GEN7_MI_URB_CLEAR_pack(__gen_user_data *data, void * restrict dst,
 
    dw[1] =
       __gen_field(values->URBClearLength, 16, 28) |
-      __gen_field(values->URBAddress, 0, 13) |
+      __gen_offset(values->URBAddress, 0, 13) |
       0;
 
 }
diff --git a/src/vulkan/gen8_pack.h b/src/vulkan/gen8_pack.h
index bc221e52089..68dcf34c493 100644
--- a/src/vulkan/gen8_pack.h
+++ b/src/vulkan/gen8_pack.h
@@ -399,11 +399,11 @@ GEN8_MI_LOAD_REGISTER_REG_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[1] =
-      __gen_field(values->SourceRegisterAddress, 2, 22) |
+      __gen_offset(values->SourceRegisterAddress, 2, 22) |
       0;
 
    dw[2] =
-      __gen_field(values->DestinationRegisterAddress, 2, 22) |
+      __gen_offset(values->DestinationRegisterAddress, 2, 22) |
       0;
 
 }
@@ -536,7 +536,7 @@ GEN8_MI_STORE_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[1] =
-      __gen_field(values->RegisterAddress, 2, 22) |
+      __gen_offset(values->RegisterAddress, 2, 22) |
       0;
 
    uint32_t dw2 =
@@ -6351,7 +6351,7 @@ GEN8_MI_LOAD_REGISTER_IMM_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[1] =
-      __gen_field(values->RegisterOffset, 2, 22) |
+      __gen_offset(values->RegisterOffset, 2, 22) |
       0;
 
    dw[2] =
@@ -6392,7 +6392,7 @@ GEN8_MI_LOAD_REGISTER_MEM_pack(__gen_user_data *data, void * restrict dst,
       0;
 
    dw[1] =
-      __gen_field(values->RegisterAddress, 2, 22) |
+      __gen_offset(values->RegisterAddress, 2, 22) |
       0;
 
    uint32_t dw2 =
@@ -7107,7 +7107,7 @@ GEN8_MI_URB_CLEAR_pack(__gen_user_data *data, void * restrict dst,
 
    dw[1] =
       __gen_field(values->URBClearLength, 16, 29) |
-      __gen_field(values->URBAddress, 0, 14) |
+      __gen_offset(values->URBAddress, 0, 14) |
       0;
 
 }
-- 
2.30.2