From 1d5f4f46dae0fd809cec593683bb89dc745e15ae Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 14 Mar 2017 16:22:00 -0700 Subject: [PATCH] genxml: Make MI_STORE_DATA_IMM have a single 64-bit data field This is way more convenient than having two separate dword fields. Reviewed-By: Lionel Landwerlin --- src/intel/genxml/gen6.xml | 3 +-- src/intel/genxml/gen7.xml | 3 +-- src/intel/genxml/gen75.xml | 3 +-- src/intel/genxml/gen8.xml | 3 +-- src/intel/genxml/gen9.xml | 3 +-- src/intel/vulkan/genX_query.c | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml index 396d53601dc..da3f64d3f0b 100644 --- a/src/intel/genxml/gen6.xml +++ b/src/intel/genxml/gen6.xml @@ -1806,8 +1806,7 @@ - - + diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml index 7ef3158657a..3f3b1882218 100644 --- a/src/intel/genxml/gen7.xml +++ b/src/intel/genxml/gen7.xml @@ -2317,8 +2317,7 @@ - - + diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml index 75d9d980d25..91fe02f048f 100644 --- a/src/intel/genxml/gen75.xml +++ b/src/intel/genxml/gen75.xml @@ -2710,8 +2710,7 @@ - - + diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml index c3830ebed0f..f9899c68423 100644 --- a/src/intel/genxml/gen8.xml +++ b/src/intel/genxml/gen8.xml @@ -2981,8 +2981,7 @@ - - + diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml index e98559ac73f..bfe49320b03 100644 --- a/src/intel/genxml/gen9.xml +++ b/src/intel/genxml/gen9.xml @@ -3256,8 +3256,7 @@ - - + diff --git a/src/intel/vulkan/genX_query.c b/src/intel/vulkan/genX_query.c index 41122a437f3..2bbca66cebc 100644 --- a/src/intel/vulkan/genX_query.c +++ b/src/intel/vulkan/genX_query.c @@ -283,8 +283,7 @@ void genX(CmdResetQueryPool)( .bo = &pool->bo, .offset = (firstQuery + i) * pool->stride, }; - sdm.DataDWord0 = 0; - sdm.DataDWord1 = 0; + sdm.ImmediateData = 0; } } } -- 2.30.2