This patch adds emulation for instructions protected by User-Mode
Instruction Prevention (currently implemented by AMD Ryzen 3000 CPUs and
some rare Intel CPUs).
Changes from previous patch: an access violation exception is now raised
if the emulated instruction tries to write to an invalid memory address,
tests were added for this behavior, and all tests are now in
exception.c.
Brendan Shanks (2):
ntdll: Add emulation for UMIP instructions.
ntdll/tests: Add tests for UMIP instructions.
dlls/ntdll/Makefile.in | 1 +
dlls/ntdll/signal_i386.c | 19 +
dlls/ntdll/signal_x86_64.c | 19 +
dlls/ntdll/tests/exception.c | 375 +++++++++++++++++
dlls/ntdll/umip.c | 780 +++++++++++++++++++++++++++++++++++
dlls/ntdll/umip.h | 21 +
6 files changed, 1215 insertions(+)
create mode 100644 dlls/ntdll/umip.c
create mode 100644 dlls/ntdll/umip.h
--
2.23.0
4
9
Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com>
---
po/fi.po | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/po/fi.po b/po/fi.po
index 77152ebd9e..962af5547a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -621,7 +621,7 @@ msgstr "&Muokatut värit:"
#: comdlg32.rc:289
msgid "|S&olid"
-msgstr ""
+msgstr "|&Tasainen"
#: comdlg32.rc:290
msgid "&Red:"
@@ -658,11 +658,9 @@ msgid "&Define Custom Colors >>"
msgstr "M&äärittele väri >>"
#: comdlg32.rc:312
-#, fuzzy
-#| msgid "&No"
msgctxt "Solid"
msgid "&o"
-msgstr "&Ei"
+msgstr "&T"
#: comdlg32.rc:318 regedit.rc:275 regedit.rc:285
msgid "Find"
--
2.24.0
1
0
[PATCH v2] dmstyle: Improved tracing of the DMUS_OBJECTDESC structure.
by Michael Stefaniuc 21 Nov '19
by Michael Stefaniuc 21 Nov '19
21 Nov '19
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
v2: .git/rebase-apply/patch:84: new blank line at EOF.
dlls/dmstyle/dmutils.c | 54 ++++++++++++++++++++++++------------------
dlls/dmstyle/dmutils.h | 2 +-
dlls/dmstyle/style.c | 2 +-
3 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c
index 0432e76f9f..fd3abe5209 100644
--- a/dlls/dmstyle/dmutils.c
+++ b/dlls/dmstyle/dmutils.c
@@ -40,6 +40,7 @@
#include "dmutils.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmfile);
+WINE_DECLARE_DEBUG_CHANNEL(dmime);
HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) {
@@ -197,7 +198,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
TRACE("** DM Reference Begin of Load ***\n");
TRACE("With Desc:\n");
- debugstr_DMUS_OBJECTDESC(&ref_desc);
+ dump_DMUS_OBJECTDESC(&ref_desc);
{
LPDIRECTMUSICGETLOADER pGetLoader = NULL;
@@ -484,26 +485,33 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) {
return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags));
}
-const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) {
- if (pDesc) {
- char buffer[1024], *ptr = buffer;
-
- ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc);
- ptr += sprintf(ptr, " - dwSize = 0x%08X\n", pDesc->dwSize);
- ptr += sprintf(ptr, " - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData));
- if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass));
- if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject));
- if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate));
- if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion));
- if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName));
- if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory));
- if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName));
- if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n",
- wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData);
- if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream);
-
- return wine_dbg_sprintf("%s", buffer);
- } else {
- return wine_dbg_sprintf("(NULL)");
- }
+void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc)
+{
+ if (!TRACE_ON(dmime))
+ return;
+
+ if (pDesc) {
+ TRACE_(dmime)("DMUS_OBJECTDESC (%p):", pDesc);
+ TRACE_(dmime)(" - dwSize = 0x%08X\n", pDesc->dwSize);
+ TRACE_(dmime)(" - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData));
+ if (pDesc->dwValidData & DMUS_OBJ_CLASS)
+ TRACE_(dmime)(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass));
+ if (pDesc->dwValidData & DMUS_OBJ_OBJECT)
+ TRACE_(dmime)(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject));
+ if (pDesc->dwValidData & DMUS_OBJ_DATE)
+ TRACE_(dmime)(" - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate));
+ if (pDesc->dwValidData & DMUS_OBJ_VERSION)
+ TRACE_(dmime)(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion));
+ if (pDesc->dwValidData & DMUS_OBJ_NAME)
+ TRACE_(dmime)(" - wszName = %s\n", debugstr_w(pDesc->wszName));
+ if (pDesc->dwValidData & DMUS_OBJ_CATEGORY)
+ TRACE_(dmime)(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory));
+ if (pDesc->dwValidData & DMUS_OBJ_FILENAME)
+ TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName));
+ if (pDesc->dwValidData & DMUS_OBJ_MEMORY)
+ TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength),
+ pDesc->pbMemData);
+ if (pDesc->dwValidData & DMUS_OBJ_STREAM)
+ TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream);
+ }
}
diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h
index e2902875dc..f2b469806f 100644
--- a/dlls/dmstyle/dmutils.h
+++ b/dlls/dmstyle/dmutils.h
@@ -58,6 +58,6 @@ extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN;
extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN;
/* dump whole DMUS_OBJECTDESC struct */
-extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN;
+extern void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) DECLSPEC_HIDDEN;
#endif /* __WINE_DMUTILS_H */
diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index b3a3b83f39..4e84a3edc3 100644
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -234,7 +234,7 @@ static HRESULT WINAPI style_IDirectMusicObject_ParseDescriptor(IDirectMusicObjec
desc->guidClass = CLSID_DirectMusicStyle;
desc->dwValidData |= DMUS_OBJ_CLASS;
- TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc));
+ dump_DMUS_OBJECTDESC(desc);
return S_OK;
}
--
2.20.1
1
0
Rework of this patch to fix bug
https://www.winehq.org/pipermail/wine-devel/2019-November/153658.html
Original commit message:
From: post(a)arntzen-software.no
Use EXT_descriptor_indexing's UPDATE_AFTER_BIND feature to support
semantics required by RS 1.0 VOLATILE descriptors. We implement this by
deferring all updates of desciptor sets until Submit time.
This is fine, as command buffers cannot be executed simultaneously on
D3D12, so at Submit time, we know that the command buffer is not being
executed on the GPU, and updating descriptors for multiple submissions
is correct.
If EXT_descriptor_indexing is not available, the fallback is the older
method, which matches RS 1.1 STATIC descriptor model.
Signed-off-by: Sveinar Søpler <cybermax(a)dexter.no>
---
v3: Remove some .orig files created by git "fuzz"
---
libs/vkd3d/command.c | 359 +++++++++++++++++++++++++++++--------
libs/vkd3d/device.c | 20 ++-
libs/vkd3d/state.c | 22 +++
libs/vkd3d/vkd3d_private.h | 19 +-
tests/d3d12.c | 2 +-
5 files changed, 339 insertions(+), 83 deletions(-)
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 297054b..8d8ba1d 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -1341,7 +1341,7 @@ static VkDescriptorPool
d3d12_command_allocator_allocate_descriptor_pool(
{
pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
pool_desc.pNext = NULL;
- pool_desc.flags = 0;
+ pool_desc.flags = device->vk_info.EXT_descriptor_indexing ?
VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT : 0;
pool_desc.maxSets = 512;
pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes);
pool_desc.pPoolSizes = pool_sizes;
@@ -1865,6 +1865,10 @@ static void
d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li
if (!state)
return;
+ /* Each pipeline state has its own set layout for UAV counters
+ * based on their implicit usage in the shader.
+ * Binding a different pipeline state means having to re-remit
+ * UAV counters in a new descriptor set (and layout). */
if (state->uav_counter_mask)
{
struct vkd3d_pipeline_bindings *bindings =
&list->pipeline_bindings[state->vk_bind_point];
@@ -2209,6 +2213,7 @@ static ULONG STDMETHODCALLTYPE
d3d12_command_list_Release(ID3D12GraphicsCommandL
if (list->allocator)
d3d12_command_allocator_free_command_buffer(list->allocator, list);
+ vkd3d_free(list->descriptor_updates);
vkd3d_free(list);
d3d12_device_release(device);
@@ -2347,6 +2352,9 @@ static void d3d12_command_list_reset_state(struct
d3d12_command_list *list,
list->state = NULL;
+ /* Recycle deferred descriptor update memory if possible. */
+ list->descriptor_updates_count = 0;
+
memset(list->so_counter_buffers, 0, sizeof(list->so_counter_buffers));
memset(list->so_counter_buffer_offsets, 0,
sizeof(list->so_counter_buffer_offsets));
@@ -2566,15 +2574,54 @@ static void
d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li
* time in between. Thus, the contents must not be altered (overwritten
* by an update command, or freed) between when the command is recorded
* and when the command completes executing on the queue."
+ *
+ * Even if we have descriptor indexing and UPDATE_AFTER_BIND,
+ * we need at the very least a new descriptor set.
*/
bindings->descriptor_set =
d3d12_command_allocator_allocate_descriptor_set(list->allocator,
root_signature->vk_set_layout);
+
bindings->in_use = false;
bindings->descriptor_table_dirty_mask |=
bindings->descriptor_table_active_mask &
root_signature->descriptor_table_mask;
bindings->push_descriptor_dirty_mask |=
bindings->push_descriptor_active_mask &
root_signature->push_descriptor_mask;
}
+static void d3d12_command_list_prepare_uav_counter_descriptors(struct
d3d12_command_list *list,
+ VkPipelineBindPoint bind_point)
+{
+ struct vkd3d_pipeline_bindings *bindings =
&list->pipeline_bindings[bind_point];
+
+ if (bindings->uav_counter_descriptor_set && !bindings->uav_counter_in_use)
+ return;
+
+ /* We cannot modify bound descriptor sets. We need a new descriptor set if
+ * we are about to update resource bindings.
+ *
+ * The Vulkan spec says:
+ *
+ * "The descriptor set contents bound by a call to
+ * vkCmdBindDescriptorSets may be consumed during host execution of the
+ * command, or during shader execution of the resulting draws, or any
+ * time in between. Thus, the contents must not be altered (overwritten
+ * by an update command, or freed) between when the command is recorded
+ * and when the command completes executing on the queue."
+ *
+ * Even if we have descriptor indexing and UPDATE_AFTER_BIND,
+ * we need at the very least a new descriptor set.
+ */
+
+ if (list->state->uav_counter_mask)
+ {
+ bindings->uav_counter_descriptor_set =
d3d12_command_allocator_allocate_descriptor_set(list->allocator,
+ list->state->vk_set_layout);
+ }
+ else
+ bindings->uav_counter_descriptor_set = VK_NULL_HANDLE;
+
+ bindings->uav_counter_in_use = false;
+}
+
static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet
*vk_descriptor_write,
VkDescriptorImageInfo *vk_image_info, const struct d3d12_desc *descriptor,
uint32_t descriptor_range_magic, VkDescriptorSet vk_descriptor_set,
@@ -2643,26 +2690,61 @@ static bool
vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des
return true;
}
-static void d3d12_command_list_update_descriptor_table(struct
d3d12_command_list *list,
- VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc
*base_descriptor)
+static void d3d12_command_list_defer_update_descriptor_table(struct
d3d12_command_list *list,
+ VkPipelineBindPoint bind_point, uint64_t table_mask, bool uav)
{
+ const struct d3d12_desc *base_descriptor;
+ unsigned i;
+ struct d3d12_deferred_descriptor_set_update *update;
struct vkd3d_pipeline_bindings *bindings =
&list->pipeline_bindings[bind_point];
- struct VkWriteDescriptorSet descriptor_writes[24],
*current_descriptor_write;
- const struct d3d12_root_signature *root_signature =
bindings->root_signature;
+
+ for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i)
+ {
+ if (table_mask & ((uint64_t)1 << i))
+ {
+ if ((base_descriptor =
d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i])))
+ {
+ vkd3d_array_reserve((void **)&list->descriptor_updates,
&list->descriptor_updates_size,
+ list->descriptor_updates_count + 1, sizeof(*list->descriptor_updates));
+ update = &list->descriptor_updates[list->descriptor_updates_count];
+
+ update->base_descriptor = base_descriptor;
+ update->index = i;
+ update->root_signature = bindings->root_signature;
+ update->descriptor_set = uav ? bindings->uav_counter_descriptor_set :
bindings->descriptor_set;
+ update->uav = uav;
+ list->descriptor_updates_count++;
+ }
+ else
+ WARN("Descriptor table %u is not set.\n", i);
+ }
+ }
+}
+
+static void d3d12_command_list_resolve_descriptor_table_uav(struct
d3d12_command_list *list,
+ const struct d3d12_deferred_descriptor_set_update *update)
+{
+ const struct d3d12_root_signature *root_signature =
update->root_signature;
const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
- struct VkDescriptorImageInfo image_infos[24], *current_image_info;
const struct d3d12_root_descriptor_table *descriptor_table;
const struct d3d12_root_descriptor_table_range *range;
VkDevice vk_device = list->device->vk_device;
- unsigned int i, j, descriptor_count;
- struct d3d12_desc *descriptor;
-
- descriptor_table = root_signature_get_descriptor_table(root_signature,
index);
+ unsigned int i, j;
+ unsigned int uav_counter_count;
+ const struct d3d12_desc *descriptor;
+ VkWriteDescriptorSet
vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS];
+ VkBufferView
vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS];
+ VkDescriptorSet vk_descriptor_set;
+ const struct d3d12_desc *base_descriptor = update->base_descriptor;
+ descriptor_table = root_signature_get_descriptor_table(root_signature,
update->index);
descriptor = base_descriptor;
- descriptor_count = 0;
- current_descriptor_write = descriptor_writes;
- current_image_info = image_infos;
+
+ vk_descriptor_set = update->descriptor_set;
+ if (!vk_descriptor_set)
+ return;
+
+ /* FIXME: There should be a smarter way than scanning through all the
descriptor table ranges for this. */
for (i = 0; i < descriptor_table->range_count; ++i)
{
range = &descriptor_table->ranges[i];
@@ -2676,20 +2758,74 @@ static void
d3d12_command_list_update_descriptor_table(struct d3d12_command_list
{
unsigned int register_idx = range->base_register_idx + j;
- /* Track UAV counters. */
+ /* Fish out UAV counters. */
if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV
- && register_idx < ARRAY_SIZE(bindings->vk_uav_counter_views))
+ && register_idx < ARRAY_SIZE(vk_uav_counter_views))
{
VkBufferView vk_counter_view = descriptor->magic ==
VKD3D_DESCRIPTOR_MAGIC_UAV
- ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE;
- if (bindings->vk_uav_counter_views[register_idx] != vk_counter_view)
- bindings->uav_counter_dirty_mask |= 1u << register_idx;
- bindings->vk_uav_counter_views[register_idx] = vk_counter_view;
+ ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE;
+ vk_uav_counter_views[register_idx] = vk_counter_view;
}
+ }
+ }
+
+ uav_counter_count = vkd3d_popcount(list->state->uav_counter_mask);
+ assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes));
+ for (i = 0; i < uav_counter_count; ++i)
+ {
+ const struct vkd3d_shader_uav_counter_binding *uav_counter =
&list->state->uav_counters[i];
+ assert(vk_uav_counter_views[uav_counter->register_index]);
+
+ vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+ vk_descriptor_writes[i].pNext = NULL;
+ vk_descriptor_writes[i].dstSet = vk_descriptor_set;
+ vk_descriptor_writes[i].dstBinding = uav_counter->binding.binding;
+ vk_descriptor_writes[i].dstArrayElement = 0;
+ vk_descriptor_writes[i].descriptorCount = 1;
+ vk_descriptor_writes[i].descriptorType =
VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
+ vk_descriptor_writes[i].pImageInfo = NULL;
+ vk_descriptor_writes[i].pBufferInfo = NULL;
+ vk_descriptor_writes[i].pTexelBufferView =
&vk_uav_counter_views[uav_counter->register_index];
+ }
+
+ VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count,
vk_descriptor_writes, 0, NULL));
+}
+
+static void d3d12_command_list_resolve_descriptor_table_normal(struct
d3d12_command_list *list,
+ const struct d3d12_deferred_descriptor_set_update *update)
+{
+ const struct d3d12_root_descriptor_table *descriptor_table;
+ struct VkWriteDescriptorSet descriptor_writes[24],
*current_descriptor_write;
+ struct VkDescriptorImageInfo image_infos[24], *current_image_info;
+ const struct d3d12_root_signature *root_signature =
update->root_signature;
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ const struct d3d12_root_descriptor_table_range *range;
+ VkDevice vk_device = list->device->vk_device;
+ unsigned int i, j, descriptor_count;
+ const struct d3d12_desc *descriptor;
+ const struct d3d12_desc *base_descriptor = update->base_descriptor;
+
+ descriptor_table = root_signature_get_descriptor_table(root_signature,
update->index);
+
+ descriptor = update->base_descriptor;
+ descriptor_count = 0;
+ current_descriptor_write = descriptor_writes;
+ current_image_info = image_infos;
+ for (i = 0; i < descriptor_table->range_count; ++i)
+ {
+ range = &descriptor_table->ranges[i];
+
+ if (range->offset != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND)
+ {
+ descriptor = base_descriptor + range->offset;
+ }
+
+ for (j = 0; j < range->descriptor_count; ++j, ++descriptor)
+ {
if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write,
- current_image_info, descriptor, range->descriptor_magic,
- bindings->descriptor_set, range->binding, j))
+ current_image_info, descriptor, range->descriptor_magic,
+ update->descriptor_set, range->binding, j))
continue;
++descriptor_count;
@@ -2709,6 +2845,52 @@ static void
d3d12_command_list_update_descriptor_table(struct d3d12_command_list
VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count,
descriptor_writes, 0, NULL));
}
+static void d3d12_command_list_resolve_descriptor_table(struct
d3d12_command_list *list,
+ const struct d3d12_deferred_descriptor_set_update *update)
+{
+ if (update->uav)
+ d3d12_command_list_resolve_descriptor_table_uav(list, update);
+ else
+ d3d12_command_list_resolve_descriptor_table_normal(list, update);
+}
+
+static void d3d12_command_list_resolve_descriptor_tables(struct
d3d12_command_list *list)
+{
+ unsigned i;
+ for (i = 0; i < list->descriptor_updates_count; i++)
+ d3d12_command_list_resolve_descriptor_table(list,
&list->descriptor_updates[i]);
+}
+
+static void d3d12_command_list_update_descriptor_table(struct
d3d12_command_list *list,
+ VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc
*base_descriptor)
+{
+ struct d3d12_deferred_descriptor_set_update update;
+ struct vkd3d_pipeline_bindings *bindings =
&list->pipeline_bindings[bind_point];
+ const struct d3d12_root_signature *root_signature =
bindings->root_signature;
+
+ update.descriptor_set = bindings->descriptor_set;
+ update.index = index;
+ update.root_signature = root_signature;
+ update.base_descriptor = base_descriptor;
+ update.uav = false;
+ d3d12_command_list_resolve_descriptor_table_normal(list, &update);
+}
+
+static void
d3d12_command_list_update_uav_counter_descriptor_table(struct
d3d12_command_list *list,
+ VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc
*base_descriptor)
+{
+ struct d3d12_deferred_descriptor_set_update update;
+ struct vkd3d_pipeline_bindings *bindings =
&list->pipeline_bindings[bind_point];
+ const struct d3d12_root_signature *root_signature =
bindings->root_signature;
+
+ update.descriptor_set = bindings->uav_counter_descriptor_set;
+ update.index = index;
+ update.root_signature = root_signature;
+ update.base_descriptor = base_descriptor;
+ update.uav = true;
+ d3d12_command_list_resolve_descriptor_table_uav(list, &update);
+}
+
static bool
vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet
*vk_descriptor_write,
const struct d3d12_root_parameter *root_parameter, VkDescriptorSet
vk_descriptor_set,
VkBufferView *vk_buffer_view, const VkDescriptorBufferInfo *vk_buffer_info)
@@ -2813,55 +2995,6 @@ done:
vkd3d_free(buffer_infos);
}
-static void d3d12_command_list_update_uav_counter_descriptors(struct
d3d12_command_list *list,
- VkPipelineBindPoint bind_point)
-{
- VkWriteDescriptorSet
vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS];
- struct vkd3d_pipeline_bindings *bindings =
&list->pipeline_bindings[bind_point];
- const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
- const struct d3d12_pipeline_state *state = list->state;
- VkDevice vk_device = list->device->vk_device;
- VkDescriptorSet vk_descriptor_set;
- unsigned int uav_counter_count;
- unsigned int i;
-
- if (!state || !(state->uav_counter_mask &
bindings->uav_counter_dirty_mask))
- return;
-
- uav_counter_count = vkd3d_popcount(state->uav_counter_mask);
- assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes));
-
- vk_descriptor_set =
d3d12_command_allocator_allocate_descriptor_set(list->allocator,
state->vk_set_layout);
- if (!vk_descriptor_set)
- return;
-
- for (i = 0; i < uav_counter_count; ++i)
- {
- const struct vkd3d_shader_uav_counter_binding *uav_counter =
&state->uav_counters[i];
- const VkBufferView *vk_uav_counter_views = bindings->vk_uav_counter_views;
-
- assert(vk_uav_counter_views[uav_counter->register_index]);
-
- vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
- vk_descriptor_writes[i].pNext = NULL;
- vk_descriptor_writes[i].dstSet = vk_descriptor_set;
- vk_descriptor_writes[i].dstBinding = uav_counter->binding.binding;
- vk_descriptor_writes[i].dstArrayElement = 0;
- vk_descriptor_writes[i].descriptorCount = 1;
- vk_descriptor_writes[i].descriptorType =
VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
- vk_descriptor_writes[i].pImageInfo = NULL;
- vk_descriptor_writes[i].pBufferInfo = NULL;
- vk_descriptor_writes[i].pTexelBufferView =
&vk_uav_counter_views[uav_counter->register_index];
- }
-
- VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count,
vk_descriptor_writes, 0, NULL));
-
- VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point,
- state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0,
NULL));
-
- bindings->uav_counter_dirty_mask = 0;
-}
-
static void d3d12_command_list_update_descriptors(struct
d3d12_command_list *list,
VkPipelineBindPoint bind_point)
{
@@ -2874,31 +3007,86 @@ static void
d3d12_command_list_update_descriptors(struct d3d12_command_list *lis
if (!rs || !rs->vk_set_layout)
return;
+ if ((bindings->descriptor_table_active_mask |
bindings->push_descriptor_dirty_mask |
+ (list->state->uav_counter_mask & bindings->uav_counter_dirty_mask)) == 0)
+ {
+ /* Nothing is dirty, so just return early. */
+ return;
+ }
+
if (bindings->descriptor_table_dirty_mask ||
bindings->push_descriptor_dirty_mask)
d3d12_command_list_prepare_descriptors(list, bind_point);
+ if (list->state->uav_counter_mask & bindings->uav_counter_dirty_mask)
+ d3d12_command_list_prepare_uav_counter_descriptors(list, bind_point);
- for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i)
+ if (list->device->vk_info.EXT_descriptor_indexing)
+ {
+ d3d12_command_list_defer_update_descriptor_table(list, bind_point,
bindings->descriptor_table_dirty_mask,
+ false);
+ }
+ else
{
- if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i))
+ /* FIXME: FOR_EACH_BIT */
+ for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i)
{
- if ((base_descriptor =
d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i])))
- d3d12_command_list_update_descriptor_table(list, bind_point, i,
base_descriptor);
- else
- WARN("Descriptor table %u is not set.\n", i);
+ if (bindings->descriptor_table_dirty_mask & ((uint64_t) 1 << i))
+ {
+ if ((base_descriptor =
d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i])))
+ d3d12_command_list_update_descriptor_table(list, bind_point, i,
base_descriptor);
+ else
+ WARN("Descriptor table %u is not set.\n", i);
+ }
}
}
bindings->descriptor_table_dirty_mask = 0;
+ /* Need to go through all descriptor tables here in the root signature,
+ * not just descriptor_table_dirty_mask. Binding a different shader may
not invalidate descriptor tables,
+ * but it may invalidate the UAV counter set. */
+ if (bindings->uav_counter_dirty_mask)
+ {
+ if (list->device->vk_info.EXT_descriptor_indexing)
+ {
+ d3d12_command_list_defer_update_descriptor_table(list, bind_point,
bindings->descriptor_table_active_mask,
+ true);
+ }
+ else
+ {
+ /* FIXME: FOR_EACH_BIT */
+ for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); i++)
+ {
+ if (bindings->descriptor_table_active_mask & ((uint64_t) 1 << i))
+ {
+ if ((base_descriptor =
d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i])))
+ d3d12_command_list_update_uav_counter_descriptor_table(list,
bind_point, i, base_descriptor);
+ else
+ WARN("Descriptor table %u is not set.\n", i);
+ }
+ }
+ }
+ }
+ bindings->uav_counter_dirty_mask = 0;
+
d3d12_command_list_update_push_descriptors(list, bind_point);
- if (bindings->descriptor_set)
+ /* Don't rebind the same descriptor set as long as we're in same
pipeline layout. */
+ if (bindings->descriptor_set && bindings->descriptor_set !=
bindings->descriptor_set_bound)
{
VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point,
rs->vk_pipeline_layout, rs->main_set, 1, &bindings->descriptor_set, 0,
NULL));
bindings->in_use = true;
+ bindings->descriptor_set_bound = bindings->descriptor_set;
}
- d3d12_command_list_update_uav_counter_descriptors(list, bind_point);
+ /* Don't rebind the same descriptor set as long as we're in same
pipeline layout. */
+ if (bindings->uav_counter_descriptor_set &&
+ bindings->uav_counter_descriptor_set !=
bindings->uav_counter_descriptor_set_bound)
+ {
+ VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point,
+ list->state->vk_pipeline_layout, list->state->set_index, 1,
&bindings->uav_counter_descriptor_set, 0, NULL));
+ bindings->uav_counter_in_use = true;
+ bindings->uav_counter_descriptor_set_bound =
bindings->uav_counter_descriptor_set;
+ }
}
static bool d3d12_command_list_update_compute_state(struct
d3d12_command_list *list)
@@ -4054,6 +4242,11 @@ static void
d3d12_command_list_set_root_signature(struct d3d12_command_list *lis
bindings->root_signature = root_signature;
d3d12_command_list_invalidate_root_parameters(list, bind_point);
+
+ bindings->uav_counter_descriptor_set = VK_NULL_HANDLE;
+ bindings->descriptor_set_bound = VK_NULL_HANDLE;
+ bindings->uav_counter_descriptor_set_bound = VK_NULL_HANDLE;
+
}
static void STDMETHODCALLTYPE
d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList1
*iface,
@@ -5422,6 +5615,9 @@ static HRESULT d3d12_command_list_init(struct
d3d12_command_list *list, struct d
d3d12_device_add_ref(list->device = device);
list->allocator = allocator;
+ list->descriptor_updates = NULL;
+ list->descriptor_updates_count = 0;
+ list->descriptor_updates_size = 0;
if (SUCCEEDED(hr =
d3d12_command_allocator_allocate_command_buffer(allocator, list)))
{
@@ -5659,6 +5855,13 @@ static void STDMETHODCALLTYPE
d3d12_command_queue_ExecuteCommandLists(ID3D12Comm
return;
}
+ /* Descriptors in root signature in 1.0 are VOLATILE by default, so
+ * the descriptor heap only need to be valid right before we submit
them to the GPU.
+ * If we have EXT_descriptor_indexing enabled with UpdateAfterBind, we
update
+ * descriptor sets here rather than while we're recording the command
buffer.
+ * For each submission of the command buffer, we can modify the
descriptor heap as we please. */
+ d3d12_command_list_resolve_descriptor_tables(cmd_list);
+
buffers[i] = cmd_list->vk_command_buffer;
}
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 0624318..0a29988 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -1436,11 +1436,25 @@ static HRESULT vkd3d_init_device_caps(struct
d3d12_device *device,
}
if (vulkan_info->EXT_descriptor_indexing && descriptor_indexing
- && (descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind
- || descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind
+ && descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind
+ && descriptor_indexing->descriptorBindingSampledImageUpdateAfterBind
+ && descriptor_indexing->descriptorBindingStorageImageUpdateAfterBind
+ &&
descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind)
+ {
+ TRACE("Enabling VK_EXT_descriptor_indexing for volatile descriptor
updates.\n");
+ }
+ else
+ {
+ WARN("VK_EXT_descriptor indexing not supported in sufficient capacity.
Volatile descriptor updates will not work.\n");
+ vulkan_info->EXT_descriptor_indexing = false;
+ }
+
+ if (vulkan_info->EXT_descriptor_indexing && descriptor_indexing
+ && (descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind
|| descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind
+ || descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind
|| descriptor_indexing->descriptorBindingStorageTexelBufferUpdateAfterBind)
- &&
!physical_device_info->descriptor_indexing_properties.robustBufferAccessUpdateAfterBind)
+ &&
!physical_device_info->descriptor_indexing_properties.robustBufferAccessUpdateAfterBind)
{
WARN("Disabling robust buffer access for the update after bind feature.\n");
features->robustBufferAccess = VK_FALSE;
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index a321fa4..50cff1f 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -745,21 +745,43 @@ static HRESULT
vkd3d_create_descriptor_set_layout(struct d3d12_device *device,
VkDescriptorSetLayoutCreateFlags flags, unsigned int binding_count,
const VkDescriptorSetLayoutBinding *bindings, VkDescriptorSetLayout
*set_layout)
{
+ unsigned int i;
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
VkDescriptorSetLayoutCreateInfo set_desc;
VkResult vr;
+ VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_info;
+ VkDescriptorBindingFlagsEXT *binding_flags = NULL;
set_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
set_desc.pNext = NULL;
set_desc.flags = flags;
set_desc.bindingCount = binding_count;
set_desc.pBindings = bindings;
+
+ if (!(flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR)
&& device->vk_info.EXT_descriptor_indexing)
+ {
+ set_desc.flags |=
VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT;
+ flags_info.sType =
VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT;
+ flags_info.pNext = NULL;
+ flags_info.bindingCount = binding_count;
+ binding_flags = vkd3d_malloc(sizeof(*binding_flags) * binding_count);
+ for (i = 0; i < binding_count; i++)
+ {
+ binding_flags[i] = VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT |
+ VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT_EXT;
+ }
+ flags_info.pBindingFlags = binding_flags;
+ set_desc.pNext = &flags_info;
+ }
+
if ((vr = VK_CALL(vkCreateDescriptorSetLayout(device->vk_device,
&set_desc, NULL, set_layout))) < 0)
{
WARN("Failed to create Vulkan descriptor set layout, vr %d.\n", vr);
+ vkd3d_free(binding_flags);
return hresult_from_vk_result(vr);
}
+ vkd3d_free(binding_flags);
return S_OK;
}
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 84b5ff2..9dd0973 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -896,13 +896,16 @@ struct vkd3d_pipeline_bindings
const struct d3d12_root_signature *root_signature;
VkDescriptorSet descriptor_set;
+ VkDescriptorSet uav_counter_descriptor_set;
+ VkDescriptorSet descriptor_set_bound;
+ VkDescriptorSet uav_counter_descriptor_set_bound;
bool in_use;
+ bool uav_counter_in_use;
D3D12_GPU_DESCRIPTOR_HANDLE descriptor_tables[D3D12_MAX_ROOT_COST];
uint64_t descriptor_table_dirty_mask;
uint64_t descriptor_table_active_mask;
- VkBufferView
vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS];
uint8_t uav_counter_dirty_mask;
/* Needed when VK_KHR_push_descriptor is not available. */
@@ -911,6 +914,16 @@ struct vkd3d_pipeline_bindings
uint32_t push_descriptor_active_mask;
};
+struct d3d12_deferred_descriptor_set_update
+{
+ const struct d3d12_desc *base_descriptor;
+ unsigned int index;
+
+ const struct d3d12_root_signature *root_signature;
+ VkDescriptorSet descriptor_set;
+ bool uav;
+};
+
/* ID3D12CommandList */
struct d3d12_command_list
{
@@ -954,6 +967,10 @@ struct d3d12_command_list
VkBuffer so_counter_buffers[D3D12_SO_BUFFER_SLOT_COUNT];
VkDeviceSize so_counter_buffer_offsets[D3D12_SO_BUFFER_SLOT_COUNT];
+ struct d3d12_deferred_descriptor_set_update *descriptor_updates;
+ size_t descriptor_updates_size;
+ size_t descriptor_updates_count;
+
struct vkd3d_private_store private_store;
};
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 5284138..2c5d4be 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -16177,7 +16177,7 @@ static void
test_update_descriptor_heap_after_closing_command_list(void)
D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
get_texture_readback_with_command_list(context.render_target, 0, &rb,
queue, command_list);
value = get_readback_uint(&rb, 0, 0, 0);
- todo ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value);
+ ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value);
release_resource_readback(&rb);
ID3D12DescriptorHeap_Release(cpu_heap);
--
2.17.1
2
2
21 Nov '19
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
dlls/kernel32/tests/comm.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c
index 97da932d6cb..a43a290947f 100644
--- a/dlls/kernel32/tests/comm.c
+++ b/dlls/kernel32/tests/comm.c
@@ -907,7 +907,6 @@ static void test_waittxempty(void)
S(U(ovl_write)).Offset = 0;
S(U(ovl_write)).OffsetHigh = 0;
ovl_write.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
- before = GetTickCount();
SetLastError(0xdeadbeef);
res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write);
ok((!res && GetLastError() == ERROR_IO_PENDING) || (res && bytes == sizeof(tbuf)),
--
2.20.1
2
2
[PATCH] urlmon/tests: CoInternetCombineIUri() is buggy on Windows 10 1607 to 1709.
by Francois Gouget 21 Nov '19
by Francois Gouget 21 Nov '19
21 Nov '19
It does not check the relative path and thus will accept non-sensical %
codes. This is fixed in Windows 10 1809.
Signed-off-by: Francois Gouget <fgouget(a)free.fr>
---
dlls/urlmon/tests/uri.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index 9d6af349dcc..017bc3e1956 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -10584,7 +10584,8 @@ static void test_CoInternetCombineIUri(void) {
hr = pCoInternetCombineIUri(base, relative, uri_combine_tests[i].combine_flags, &result, 0);
todo_wine_if(uri_combine_tests[i].todo)
- ok(hr == uri_combine_tests[i].expected,
+ ok(hr == uri_combine_tests[i].expected ||
+ broken(hr == S_OK && uri_combine_tests[i].expected == E_INVALIDARG) /* win10 1607 to 1709 */,
"Error: CoInternetCombineIUri returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].\n",
hr, uri_combine_tests[i]. expected, i);
if(SUCCEEDED(hr) && uri_combine_tests[i].expected) {
--
2.20.1
2
1
21 Nov '19
This behavior goes back to at least Windows XP.
Note that Wine depends on MoveToEx() returning the old point.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
dlls/gdi32/tests/metafile.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c
index 6adafa37b82..3920b8c0c43 100644
--- a/dlls/gdi32/tests/metafile.c
+++ b/dlls/gdi32/tests/metafile.c
@@ -2262,16 +2262,15 @@ static void test_mf_Graphics(void)
ok( ret, "MoveToEx error %d.\n", GetLastError());
ret = LineTo(hdcMetafile, 2, 2);
ok( ret, "LineTo error %d.\n", GetLastError());
+ oldpoint.x = oldpoint.y = 11235;
ret = MoveToEx(hdcMetafile, 1, 1, &oldpoint);
ok( ret, "MoveToEx error %d.\n", GetLastError());
-
-/* oldpoint gets garbage under Win XP, so the following test would
- * work under Wine but fails under Windows:
- *
- * ok((oldpoint.x == 2) && (oldpoint.y == 2),
- * "MoveToEx: (x, y) = (%ld, %ld), should be (2, 2).\n",
- * oldpoint.x, oldpoint.y);
- */
+ /* Windows 9x and older may have returned oldpoint as per the
+ * documentation, but it stopped doing so with Windows XP.
+ */
+ ok(broken(oldpoint.x == 11235 && oldpoint.y == 11235),
+ "MoveToEx: oldpoint = (%d, %d), should be (11235, 11235).\n",
+ oldpoint.x, oldpoint.y);
ret = Ellipse(hdcMetafile, 0, 0, 2, 2);
ok( ret, "Ellipse error %d.\n", GetLastError());
--
2.20.1
2
2
[PATCH] userenv/tests: Windows 10 1809 changed GetUserProfileDirectory().
by Francois Gouget 21 Nov '19
by Francois Gouget 21 Nov '19
21 Nov '19
It is no longer possible to get the required buffer size in the ANSI
version, and the Unicode one requires a NULL buffer.
Signed-off-by: Francois Gouget <fgouget(a)free.fr>
---
dlls/userenv/tests/userenv.c | 42 +++++++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 12 deletions(-)
diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c
index f6cfcc79ecd..a91edeef260 100644
--- a/dlls/userenv/tests/userenv.c
+++ b/dlls/userenv/tests/userenv.c
@@ -303,7 +303,7 @@ static void test_get_profiles_dir(void)
static void test_get_user_profile_dir(void)
{
BOOL ret;
- DWORD error, len;
+ DWORD error, len, len2;
HANDLE token;
char *dirA;
WCHAR *dirW;
@@ -351,18 +351,23 @@ static void test_get_user_profile_dir(void)
ret = GetUserProfileDirectoryA( token, dirA, &len );
error = GetLastError();
ok(!ret, "expected failure\n");
- ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error);
- ok(len, "expected len > 0\n");
- HeapFree( GetProcessHeap(), 0, dirA );
-
- dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len );
- SetLastError( 0xdeadbeef );
- ret = GetUserProfileDirectoryA( token, dirA, &len );
- ok(ret, "expected success %u\n", GetLastError());
- ok(len, "expected len > 0\n");
- ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenA( dirA ), len );
- trace("%s\n", dirA);
HeapFree( GetProcessHeap(), 0, dirA );
+ if (error == ERROR_INSUFFICIENT_BUFFER)
+ {
+ ok(len, "expected len > 0\n");
+
+ dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len );
+ SetLastError( 0xdeadbeef );
+ ret = GetUserProfileDirectoryA( token, dirA, &len );
+ ok(ret, "expected success %u\n", GetLastError());
+ ok(len, "expected len > 0\n");
+ ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenA( dirA ), len );
+ trace("%s\n", dirA);
+ HeapFree( GetProcessHeap(), 0, dirA );
+ }
+ else
+ ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */,
+ "unexpected error %u\n", error);
SetLastError( 0xdeadbeef );
ret = GetUserProfileDirectoryW( NULL, NULL, NULL );
@@ -400,6 +405,19 @@ static void test_get_user_profile_dir(void)
ok(lstrlenW( dirW ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenW( dirW ), len );
HeapFree( GetProcessHeap(), 0, dirW );
+ len2 = 0;
+ dirW = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 32 * sizeof(WCHAR) );
+ SetLastError( 0xdeadbeef );
+ ret = GetUserProfileDirectoryW( token, dirW, &len2 );
+ error = GetLastError();
+ ok(!ret, "expected failure\n");
+ HeapFree( GetProcessHeap(), 0, dirW );
+ if (error == ERROR_INSUFFICIENT_BUFFER)
+ ok(len2 == len, "expected %d, got %d\n", len, len2);
+ else
+ ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */,
+ "unexpected error %u\n", error);
+
CloseHandle( token );
}
--
2.20.1
1
0
[PATCH] comctl32/tests: Trace the iteration counter when a tooltips test fails.
by Francois Gouget 21 Nov '19
by Francois Gouget 21 Nov '19
21 Nov '19
Signed-off-by: Francois Gouget <fgouget(a)free.fr>
---
Whenever a failure happens in a test case loop, the failure messages
MUST include sufficient information to identify the test case. The
simplest way to ensure this is to include the loop index in the message.
Note that in this case the ExpectedCalls value is not enough to identify
a specific test case.
See also bug 48091.
https://bugs.winehq.org/show_bug.cgi?id=48091
dlls/comctl32/tests/tooltips.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c
index 0cb7afd6880..082d8403b54 100644
--- a/dlls/comctl32/tests/tooltips.c
+++ b/dlls/comctl32/tests/tooltips.c
@@ -197,7 +197,7 @@ static void test_customdraw(void) {
50, 50,
300, 300,
NULL, NULL, NULL, 0);
- ok(parent != NULL, "Creation of main window failed\n");
+ ok(parent != NULL, "%d) Creation of main window failed\n", iterationNumber);
/* Make it show */
ShowWindow(parent, SW_SHOWNORMAL);
@@ -209,7 +209,7 @@ static void test_customdraw(void) {
CW_USEDEFAULT, CW_USEDEFAULT,
CW_USEDEFAULT, CW_USEDEFAULT,
parent, NULL, GetModuleHandleA(NULL), 0);
- ok(hwndTip != NULL, "Creation of tooltip window failed\n");
+ ok(hwndTip != NULL, "%d) Creation of tooltip window failed\n", iterationNumber);
/* Set up parms for the wndproc to handle */
CD_Stages = 0;
@@ -230,7 +230,7 @@ static void test_customdraw(void) {
toolInfo.lParam = 0xdeadbeef;
GetClientRect (parent, &toolInfo.rect);
ret = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo);
- ok(ret, "Failed to add the tool.\n");
+ ok(ret, "%d) Failed to add the tool.\n", iterationNumber);
/* Make tooltip appear quickly */
SendMessageA(hwndTip, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1,0));
@@ -245,23 +245,23 @@ static void test_customdraw(void) {
/* Check CustomDraw results */
ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls ||
broken(CD_Stages == (expectedResults[iterationNumber].ExpectedCalls & ~TEST_CDDS_POSTPAINT)), /* nt4 */
- "CustomDraw run %d stages %x, expected %x\n", iterationNumber, CD_Stages,
+ "%d) CustomDraw stages %x, expected %x\n", iterationNumber, CD_Stages,
expectedResults[iterationNumber].ExpectedCalls);
}
ret = SendMessageA(hwndTip, TTM_GETCURRENTTOOLA, 0, 0);
- ok(ret, "Failed to get current tool %#lx.\n", ret);
+ ok(ret, "%d) Failed to get current tool %#lx.\n", iterationNumber, ret);
memset(&toolInfo, 0xcc, sizeof(toolInfo));
toolInfo.cbSize = sizeof(toolInfo);
toolInfo.lpszText = NULL;
toolInfo.lpReserved = (void *)0xdeadbeef;
SendMessageA(hwndTip, TTM_GETCURRENTTOOLA, 0, (LPARAM)&toolInfo);
- ok(toolInfo.hwnd == parent, "Unexpected hwnd %p.\n", toolInfo.hwnd);
- ok(toolInfo.hinst == GetModuleHandleA(NULL), "Unexpected hinst %p.\n", toolInfo.hinst);
- ok(toolInfo.uId == 0x1234abcd, "Unexpected uId %lx.\n", toolInfo.uId);
- ok(toolInfo.lParam == 0, "Unexpected lParam %lx.\n", toolInfo.lParam);
- ok(toolInfo.lpReserved == (void *)0xdeadbeef, "Unexpected lpReserved %p.\n", toolInfo.lpReserved);
+ ok(toolInfo.hwnd == parent, "%d) Unexpected hwnd %p.\n", iterationNumber, toolInfo.hwnd);
+ ok(toolInfo.hinst == GetModuleHandleA(NULL), "%d) Unexpected hinst %p.\n", iterationNumber, toolInfo.hinst);
+ ok(toolInfo.uId == 0x1234abcd, "%d) Unexpected uId %lx.\n", iterationNumber, toolInfo.uId);
+ ok(toolInfo.lParam == 0, "%d) Unexpected lParam %lx.\n", iterationNumber, toolInfo.lParam);
+ ok(toolInfo.lpReserved == (void *)0xdeadbeef, "%d) Unexpected lpReserved %p.\n", iterationNumber, toolInfo.lpReserved);
/* Clean up */
DestroyWindow(hwndTip);
--
2.20.1
1
0
[PATCH] kernel32/tests: Fix the lcid and expected value in a codepage ok() call.
by Francois Gouget 21 Nov '19
by Francois Gouget 21 Nov '19
21 Nov '19
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
dlls/kernel32/tests/codepage.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c
index 8b6584415cc..8fcc575a29e 100644
--- a/dlls/kernel32/tests/codepage.c
+++ b/dlls/kernel32/tests/codepage.c
@@ -1126,7 +1126,7 @@ static void test_threadcp(void)
cp = 0xdeadbeef;
GetLocaleInfoA(lcids[i].lcid, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, (LPSTR)&cp, sizeof(cp));
- ok(cp == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cp, lcids[i].threadcp, cp);
+ ok(cp == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cp, lcids[i].lcid, lcids[i].threadcp);
/* GetCPInfoEx/GetCPInfo - CP_ACP */
SetLastError(0xdeadbeef);
--
2.20.1
1
0
21 Nov '19
Signed-off-by: Francois Gouget <fgouget(a)free.fr>
---
dlls/ntdll/heap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index e8ac1ffa7a8..d7232b47d66 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -882,7 +882,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
if (!address)
{
if (!commitSize) commitSize = COMMIT_MASK + 1;
- totalSize = min( totalSize, 0xffff0000 ); /* don't allow a heap larger than 4Gb */
+ totalSize = min( totalSize, 0xffff0000 ); /* don't allow a heap larger than 4GB */
if (totalSize < commitSize) totalSize = commitSize;
if (flags & HEAP_SHARED) commitSize = totalSize; /* always commit everything in a shared heap */
commitSize = min( totalSize, (commitSize + COMMIT_MASK) & ~COMMIT_MASK );
--
2.20.1
1
0
Signed-off-by: Jeff Smith <whydoubt(a)gmail.com>
---
dlls/msvcrt/tests/time.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c
index 5df8951c15..e53083c561 100644
--- a/dlls/msvcrt/tests/time.c
+++ b/dlls/msvcrt/tests/time.c
@@ -678,6 +678,9 @@ static void test_strftime(void)
{ "%X", "0", 0, 0, "m", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }},
{ "%X", "00", 0, 0, "mm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }},
{ "%X", "m00", 0, 0, "mmm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE},
+ { "%X", "0", 0, 0, "s", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }},
+ { "%X", "00", 0, 0, "ss", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }},
+ { "%X", "s00", 0, 0, "sss", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE},
{ "%X", "t", 0, 0, "t", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE},
{ "%X", "tam", 0, 0, "tt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE},
{ "%X", "tam", 0, 0, "ttttttttt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE},
--
2.23.0
2
9
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
include/raserror.h | 272 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 272 insertions(+)
diff --git a/include/raserror.h b/include/raserror.h
index 549b42423cf9..3462f012cf6c 100644
--- a/include/raserror.h
+++ b/include/raserror.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2008 Stefan Leichter
+ * Copyright (C) 2019 Vijay Kiran Kamuju
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,11 +21,282 @@
#define __WINE_RASERROR_H
#define RASBASE 600
+#define PENDING (RASBASE+0)
+#define ERROR_INVALID_PORT_HANDLE (RASBASE+1)
+#define ERROR_PORT_ALREADY_OPEN (RASBASE+2)
#define ERROR_BUFFER_TOO_SMALL (RASBASE+3)
+#define ERROR_WRONG_INFO_SPECIFIED (RASBASE+4)
+#define ERROR_CANNOT_SET_PORT_INFO (RASBASE+5)
+#define ERROR_PORT_NOT_CONNECTED (RASBASE+6)
+#define ERROR_EVENT_INVALID (RASBASE+7)
+#define ERROR_DEVICE_DOES_NOT_EXIST (RASBASE+8)
+#define ERROR_DEVICETYPE_DOES_NOT_EXIST (RASBASE+9)
#define ERROR_BUFFER_INVALID (RASBASE+10)
+#define ERROR_ROUTE_NOT_AVAILABLE (RASBASE+11)
+#define ERROR_ROUTE_NOT_ALLOCATED (RASBASE+12)
+#define ERROR_INVALID_COMPRESSION_SPECIFIED (RASBASE+13)
+#define ERROR_OUT_OF_BUFFERS (RASBASE+14)
+#define ERROR_PORT_NOT_FOUND (RASBASE+15)
+#define ERROR_ASYNC_REQUEST_PENDING (RASBASE+16)
+#define ERROR_ALREADY_DISCONNECTING (RASBASE+17)
+#define ERROR_PORT_NOT_OPEN (RASBASE+18)
+#define ERROR_PORT_DISCONNECTED (RASBASE+19)
+#define ERROR_NO_ENDPOINTS (RASBASE+20)
+#define ERROR_CANNOT_OPEN_PHONEBOOK (RASBASE+21)
+#define ERROR_CANNOT_LOAD_PHONEBOOK (RASBASE+22)
+#define ERROR_CANNOT_FIND_PHONEBOOK_ENTRY (RASBASE+23)
+#define ERROR_CANNOT_WRITE_PHONEBOOK (RASBASE+24)
+#define ERROR_CORRUPT_PHONEBOOK (RASBASE+25)
+#define ERROR_CANNOT_LOAD_STRING (RASBASE+26)
+#define ERROR_KEY_NOT_FOUND (RASBASE+27)
+#define ERROR_DISCONNECTION (RASBASE+28)
+#define ERROR_REMOTE_DISCONNECTION (RASBASE+29)
+#define ERROR_HARDWARE_FAILURE (RASBASE+30)
+#define ERROR_USER_DISCONNECTION (RASBASE+31)
#define ERROR_INVALID_SIZE (RASBASE+32)
+#define ERROR_PORT_NOT_AVAILABLE (RASBASE+33)
+#define ERROR_CANNOT_PROJECT_CLIENT (RASBASE+34)
#define ERROR_UNKNOWN (RASBASE+35)
+#define ERROR_WRONG_DEVICE_ATTACHED (RASBASE+36)
+#define ERROR_BAD_STRING (RASBASE+37)
+#define ERROR_REQUEST_TIMEOUT (RASBASE+38)
+#define ERROR_CANNOT_GET_LANA (RASBASE+39)
+#define ERROR_NETBIOS_ERROR (RASBASE+40)
+#define ERROR_SERVER_OUT_OF_RESOURCES (RASBASE+41)
+#define ERROR_NAME_EXISTS_ON_NET (RASBASE+42)
+#define ERROR_SERVER_GENERAL_NET_FAILURE (RASBASE+43)
+#define WARNING_MSG_ALIAS_NOT_ADDED (RASBASE+44)
+#define ERROR_AUTH_INTERNAL (RASBASE+45)
+#define ERROR_RESTRICTED_LOGON_HOURS (RASBASE+46)
+#define ERROR_ACCT_DISABLED (RASBASE+47)
+#define ERROR_PASSWD_EXPIRED (RASBASE+48)
+#define ERROR_NO_DIALIN_PERMISSION (RASBASE+49)
+#define ERROR_SERVER_NOT_RESPONDING (RASBASE+50)
+#define ERROR_FROM_DEVICE (RASBASE+51)
+#define ERROR_UNRECOGNIZED_RESPONSE (RASBASE+52)
+#define ERROR_MACRO_NOT_FOUND (RASBASE+53)
+#define ERROR_MACRO_NOT_DEFINED (RASBASE+54)
+#define ERROR_MESSAGE_MACRO_NOT_FOUND (RASBASE+55)
+#define ERROR_DEFAULTOFF_MACRO_NOT_FOUND (RASBASE+56)
+#define ERROR_FILE_COULD_NOT_BE_OPENED (RASBASE+57)
+#define ERROR_DEVICENAME_TOO_LONG (RASBASE+58)
+#define ERROR_DEVICENAME_NOT_FOUND (RASBASE+59)
+#define ERROR_NO_RESPONSES (RASBASE+60)
+#define ERROR_NO_COMMAND_FOUND (RASBASE+61)
+#define ERROR_WRONG_KEY_SPECIFIED (RASBASE+62)
+#define ERROR_UNKNOWN_DEVICE_TYPE (RASBASE+63)
+#define ERROR_ALLOCATING_MEMORY (RASBASE+64)
+#define ERROR_PORT_NOT_CONFIGURED (RASBASE+65)
+#define ERROR_DEVICE_NOT_READY (RASBASE+66)
+#define ERROR_READING_INI_FILE (RASBASE+67)
+#define ERROR_NO_CONNECTION (RASBASE+68)
+#define ERROR_BAD_USAGE_IN_INI_FILE (RASBASE+69)
+#define ERROR_READING_SECTIONNAME (RASBASE+70)
+#define ERROR_READING_DEVICETYPE (RASBASE+71)
+#define ERROR_READING_DEVICENAME (RASBASE+72)
+#define ERROR_READING_USAGE (RASBASE+73)
+#define ERROR_READING_MAXCONNECTBPS (RASBASE+74)
+#define ERROR_READING_MAXCARRIERBPS (RASBASE+75)
+#define ERROR_LINE_BUSY (RASBASE+76)
+#define ERROR_VOICE_ANSWER (RASBASE+77)
+#define ERROR_NO_ANSWER (RASBASE+78)
+#define ERROR_NO_CARRIER (RASBASE+79)
+#define ERROR_NO_DIALTONE (RASBASE+80)
+#define ERROR_IN_COMMAND (RASBASE+81)
+#define ERROR_WRITING_SECTIONNAME (RASBASE+82)
+#define ERROR_WRITING_DEVICETYPE (RASBASE+83)
+#define ERROR_WRITING_DEVICENAME (RASBASE+84)
+#define ERROR_WRITING_MAXCONNECTBPS (RASBASE+85)
+#define ERROR_WRITING_MAXCARRIERBPS (RASBASE+86)
+#define ERROR_WRITING_USAGE (RASBASE+87)
+#define ERROR_WRITING_DEFAULTOFF (RASBASE+88)
+#define ERROR_READING_DEFAULTOFF (RASBASE+89)
+#define ERROR_EMPTY_INI_FILE (RASBASE+90)
+#define ERROR_AUTHENTICATION_FAILURE (RASBASE+91)
+#define ERROR_PORT_OR_DEVICE (RASBASE+92)
+#define ERROR_NOT_BINARY_MACRO (RASBASE+93)
+#define ERROR_DCB_NOT_FOUND (RASBASE+94)
#define ERROR_STATE_MACHINES_NOT_STARTED (RASBASE+95)
+#define ERROR_STATE_MACHINES_ALREADY_STARTED (RASBASE+96)
+#define ERROR_PARTIAL_RESPONSE_LOOPING (RASBASE+97)
+#define ERROR_UNKNOWN_RESPONSE_KEY (RASBASE+98)
+#define ERROR_RECV_BUF_FULL (RASBASE+99)
+#define ERROR_CMD_TOO_LONG (RASBASE+100)
+#define ERROR_UNSUPPORTED_BPS (RASBASE+101)
+#define ERROR_UNEXPECTED_RESPONSE (RASBASE+102)
+#define ERROR_INTERACTIVE_MODE (RASBASE+103)
+#define ERROR_BAD_CALLBACK_NUMBER (RASBASE+104)
+#define ERROR_INVALID_AUTH_STATE (RASBASE+105)
+#define ERROR_WRITING_INITBPS (RASBASE+106)
+#define ERROR_X25_DIAGNOSTIC (RASBASE+107)
+#define ERROR_ACCT_EXPIRED (RASBASE+108)
+#define ERROR_CHANGING_PASSWORD (RASBASE+109)
+#define ERROR_OVERRUN (RASBASE+110)
#define ERROR_RASMAN_CANNOT_INITIALIZE (RASBASE+111)
+#define ERROR_BIPLEX_PORT_NOT_AVAILABLE (RASBASE+112)
+#define ERROR_NO_ACTIVE_ISDN_LINES (RASBASE+113)
+#define ERROR_NO_ISDN_CHANNELS_AVAILABLE (RASBASE+114)
+#define ERROR_TOO_MANY_LINE_ERRORS (RASBASE+115)
+#define ERROR_IP_CONFIGURATION (RASBASE+116)
+#define ERROR_NO_IP_ADDRESSES (RASBASE+117)
+#define ERROR_PPP_TIMEOUT (RASBASE+118)
+#define ERROR_PPP_REMOTE_TERMINATED (RASBASE+119)
+#define ERROR_PPP_NO_PROTOCOLS_CONFIGURED (RASBASE+120)
+#define ERROR_PPP_NO_RESPONSE (RASBASE+121)
+#define ERROR_PPP_INVALID_PACKET (RASBASE+122)
+#define ERROR_PHONE_NUMBER_TOO_LONG (RASBASE+123)
+#define ERROR_IPXCP_NO_DIALOUT_CONFIGURED (RASBASE+124)
+#define ERROR_IPXCP_NO_DIALIN_CONFIGURED (RASBASE+125)
+#define ERROR_IPXCP_DIALOUT_ALREADY_ACTIVE (RASBASE+126)
+#define ERROR_ACCESSING_TCPCFGDLL (RASBASE+127)
+#define ERROR_NO_IP_RAS_ADAPTER (RASBASE+128)
+#define ERROR_SLIP_REQUIRES_IP (RASBASE+129)
+#define ERROR_PROJECTION_NOT_COMPLETE (RASBASE+130)
+#define ERROR_PROTOCOL_NOT_CONFIGURED (RASBASE+131)
+#define ERROR_PPP_NOT_CONVERGING (RASBASE+132)
+#define ERROR_PPP_CP_REJECTED (RASBASE+133)
+#define ERROR_PPP_LCP_TERMINATED (RASBASE+134)
+#define ERROR_PPP_REQUIRED_ADDRESS_REJECTED (RASBASE+135)
+#define ERROR_PPP_NCP_TERMINATED (RASBASE+136)
+#define ERROR_PPP_LOOPBACK_DETECTED (RASBASE+137)
+#define ERROR_PPP_NO_ADDRESS_ASSIGNED (RASBASE+138)
+#define ERROR_CANNOT_USE_LOGON_CREDENTIALS (RASBASE+139)
+#define ERROR_TAPI_CONFIGURATION (RASBASE+140)
+#define ERROR_NO_LOCAL_ENCRYPTION (RASBASE+141)
+#define ERROR_NO_REMOTE_ENCRYPTION (RASBASE+142)
+#define ERROR_REMOTE_REQUIRES_ENCRYPTION (RASBASE+143)
+#define ERROR_IPXCP_NET_NUMBER_CONFLICT (RASBASE+144)
+#define ERROR_INVALID_SMM (RASBASE+145)
+#define ERROR_SMM_UNINITIALIZED (RASBASE+146)
+#define ERROR_NO_MAC_FOR_PORT (RASBASE+147)
+#define ERROR_SMM_TIMEOUT (RASBASE+148)
+#define ERROR_BAD_PHONE_NUMBER (RASBASE+149)
+#define ERROR_WRONG_MODULE (RASBASE+150)
+#define ERROR_INVALID_CALLBACK_NUMBER (RASBASE+151)
+#define ERROR_SCRIPT_SYNTAX (RASBASE+152)
+#define ERROR_HANGUP_FAILED (RASBASE+153)
+#define ERROR_BUNDLE_NOT_FOUND (RASBASE+154)
+#define ERROR_CANNOT_DO_CUSTOMDIAL (RASBASE+155)
+#define ERROR_DIAL_ALREADY_IN_PROGRESS (RASBASE+156)
+#define ERROR_RASAUTO_CANNOT_INITIALIZE (RASBASE+157)
+#define ERROR_CONNECTION_ALREADY_SHARED (RASBASE+158)
+#define ERROR_SHARING_CHANGE_FAILED (RASBASE+159)
+#define ERROR_SHARING_ROUTER_INSTALL (RASBASE+160)
+#define ERROR_SHARE_CONNECTION_FAILED (RASBASE+161)
+#define ERROR_SHARING_PRIVATE_INSTALL (RASBASE+162)
+#define ERROR_CANNOT_SHARE_CONNECTION (RASBASE+163)
+#define ERROR_NO_SMART_CARD_READER (RASBASE+164)
+#define ERROR_SHARING_ADDRESS_EXISTS (RASBASE+165)
+#define ERROR_NO_CERTIFICATE (RASBASE+166)
+#define ERROR_SHARING_MULTIPLE_ADDRESSES (RASBASE+167)
+#define ERROR_FAILED_TO_ENCRYPT (RASBASE+168)
+#define ERROR_BAD_ADDRESS_SPECIFIED (RASBASE+169)
+#define ERROR_CONNECTION_REJECT (RASBASE+170)
+#define ERROR_CONGESTION (RASBASE+171)
+#define ERROR_INCOMPATIBLE (RASBASE+172)
+#define ERROR_NUMBERCHANGED (RASBASE+173)
+#define ERROR_TEMPFAILURE (RASBASE+174)
+#define ERROR_BLOCKED (RASBASE+175)
+#define ERROR_DONOTDISTURB (RASBASE+176)
+#define ERROR_OUTOFORDER (RASBASE+177)
+#define ERROR_UNABLE_TO_AUTHENTICATE_SERVER (RASBASE+178)
+#define ERROR_SMART_CARD_REQUIRED (RASBASE+179)
+#define ERROR_INVALID_FUNCTION_FOR_ENTRY (RASBASE+180)
+#define ERROR_CERT_FOR_ENCRYPTION_NOT_FOUND (RASBASE+181)
+#define ERROR_SHARING_RRAS_CONFLICT (RASBASE+182)
+#define ERROR_SHARING_NO_PRIVATE_LAN (RASBASE+183)
+#define ERROR_NO_DIFF_USER_AT_LOGON (RASBASE+184)
+#define ERROR_NO_REG_CERT_AT_LOGON (RASBASE+185)
+#define ERROR_OAKLEY_NO_CERT (RASBASE+186)
+#define ERROR_OAKLEY_AUTH_FAIL (RASBASE+187)
+#define ERROR_OAKLEY_ATTRIB_FAIL (RASBASE+188)
+#define ERROR_OAKLEY_GENERAL_PROCESSING (RASBASE+189)
+#define ERROR_OAKLEY_NO_PEER_CERT (RASBASE+190)
+#define ERROR_OAKLEY_NO_POLICY (RASBASE+191)
+#define ERROR_OAKLEY_TIMED_OUT (RASBASE+192)
+#define ERROR_OAKLEY_ERROR (RASBASE+193)
+#define ERROR_UNKNOWN_FRAMED_PROTOCOL (RASBASE+194)
+#define ERROR_WRONG_TUNNEL_TYPE (RASBASE+195)
+#define ERROR_UNKNOWN_SERVICE_TYPE (RASBASE+196)
+#define ERROR_CONNECTING_DEVICE_NOT_FOUND (RASBASE+197)
+#define ERROR_NO_EAPTLS_CERTIFICATE (RASBASE+198)
+#define ERROR_SHARING_HOST_ADDRESS_CONFLICT (RASBASE+199)
+#define ERROR_AUTOMATIC_VPN_FAILED (RASBASE+200)
+#define ERROR_VALIDATING_SERVER_CERT (RASBASE+201)
+#define ERROR_READING_SCARD (RASBASE+202)
+#define ERROR_INVALID_PEAP_COOKIE_CONFIG (RASBASE+203)
+#define ERROR_INVALID_PEAP_COOKIE_USER (RASBASE+204)
+#define ERROR_INVALID_MSCHAPV2_CONFIG (RASBASE+205)
+#define ERROR_VPN_GRE_BLOCKED (RASBASE+206)
+#define ERROR_VPN_DISCONNECT (RASBASE+207)
+#define ERROR_VPN_REFUSED (RASBASE+208)
+#define ERROR_VPN_TIMEOUT (RASBASE+209)
+#define ERROR_VPN_BAD_CERT (RASBASE+210)
+#define ERROR_VPN_BAD_PSK (RASBASE+211)
+#define ERROR_SERVER_POLICY (RASBASE+212)
+#define ERROR_BROADBAND_ACTIVE (RASBASE+213)
+#define ERROR_BROADBAND_NO_NIC (RASBASE+214)
+#define ERROR_BROADBAND_TIMEOUT (RASBASE+215)
+#define ERROR_FEATURE_DEPRECATED (RASBASE+216)
+#define ERROR_CANNOT_DELETE (RASBASE+217)
+#define ERROR_RASQEC_RESOURCE_CREATION_FAILED (RASBASE+218)
+#define ERROR_RASQEC_NAPAGENT_NOT_ENABLED (RASBASE+219)
+#define ERROR_RASQEC_NAPAGENT_NOT_CONNECTED (RASBASE+220)
+#define ERROR_RASQEC_CONN_DOESNOTEXIST (RASBASE+221)
+#define ERROR_RASQEC_TIMEOUT (RASBASE+222)
+#define ERROR_PEAP_CRYPTOBINDING_INVALID (RASBASE+223)
+#define ERROR_PEAP_CRYPTOBINDING_NOTRECEIVED (RASBASE+224)
+#define ERROR_INVALID_VPNSTRATEGY (RASBASE+225)
+#define ERROR_EAPTLS_CACHE_CREDENTIALS_INVALID (RASBASE+226)
+#define ERROR_IPSEC_SERVICE_STOPPED (RASBASE+227)
+#define ERROR_IDLE_TIMEOUT (RASBASE+228)
+#define ERROR_LINK_FAILURE (RASBASE+229)
+#define ERROR_USER_LOGOFF (RASBASE+230)
+#define ERROR_FAST_USER_SWITCH (RASBASE+231)
+#define ERROR_HIBERNATION (RASBASE+232)
+#define ERROR_SYSTEM_SUSPENDED (RASBASE+233)
+#define ERROR_RASMAN_SERVICE_STOPPED (RASBASE+234)
+#define ERROR_INVALID_SERVER_CERT (RASBASE+235)
+#define ERROR_NOT_NAP_CAPABLE (RASBASE+236)
+#define ERROR_INVALID_TUNNELID (RASBASE+237)
+#define ERROR_UPDATECONNECTION_REQUEST_IN_PROCESS (RASBASE+238)
+#define ERROR_PROTOCOL_ENGINE_DISABLED (RASBASE+239)
+#define ERROR_INTERNAL_ADDRESS_FAILURE (RASBASE+240)
+#define ERROR_FAILED_CP_REQUIRED (RASBASE+241)
+#define ERROR_TS_UNACCEPTABLE (RASBASE+242)
+#define ERROR_MOBIKE_DISABLED (RASBASE+243)
+#define ERROR_CANNOT_INITIATE_MOBIKE_UPDATE (RASBASE+244)
+#define ERROR_PEAP_SERVER_REJECTED_CLIENT_TLV (RASBASE+245)
+#define ERROR_INVALID_PREFERENCES (RASBASE+246)
+#define ERROR_EAPTLS_SCARD_CACHE_CREDENTIALS_INVALID (RASBASE+247)
+#define ERROR_SSTP_COOKIE_SET_FAILURE (RASBASE+248)
+#define ERROR_INVALID_PEAP_COOKIE_ATTRIBUTES (RASBASE+249)
+#define ERROR_EAP_METHOD_NOT_INSTALLED (RASBASE+250)
+#define ERROR_EAP_METHOD_DOES_NOT_SUPPORT_SSO (RASBASE+251)
+#define ERROR_EAP_METHOD_OPERATION_NOT_SUPPORTED (RASBASE+252)
+#define ERROR_EAP_USER_CERT_INVALID (RASBASE+253)
+#define ERROR_EAP_USER_CERT_EXPIRED (RASBASE+254)
+#define ERROR_EAP_USER_CERT_REVOKED (RASBASE+255)
+#define ERROR_EAP_USER_CERT_OTHER_ERROR (RASBASE+256)
+#define ERROR_EAP_SERVER_CERT_INVALID (RASBASE+257)
+#define ERROR_EAP_SERVER_CERT_EXPIRED (RASBASE+258)
+#define ERROR_EAP_SERVER_CERT_REVOKED (RASBASE+259)
+#define ERROR_EAP_SERVER_CERT_OTHER_ERROR (RASBASE+260)
+#define ERROR_EAP_USER_ROOT_CERT_NOT_FOUND (RASBASE+261)
+#define ERROR_EAP_USER_ROOT_CERT_INVALID (RASBASE+262)
+#define ERROR_EAP_USER_ROOT_CERT_EXPIRED (RASBASE+263)
+#define ERROR_EAP_SERVER_ROOT_CERT_NOT_FOUND (RASBASE+264)
+#define ERROR_EAP_SERVER_ROOT_CERT_INVALID (RASBASE+265)
+#define ERROR_EAP_SERVER_ROOT_CERT_NAME_REQUIRED (RASBASE+266)
+#define ERROR_PEAP_IDENTITY_MISMATCH (RASBASE+267)
+#define ERROR_DNSNAME_NOT_RESOLVABLE (RASBASE+268)
+#define ERROR_EAPTLS_PASSWD_INVALID (RASBASE+269)
+#define ERROR_IKEV2_PSK_INTERFACE_ALREADY_EXISTS (RASBASE+270)
+#define ERROR_INVALID_DESTINATION_IP (RASBASE+271)
+#define ERROR_INVALID_INTERFACE_CONFIG (RASBASE+272)
+#define RASBASEEND (RASBASE+272)
+#define ERROR_VPN_PLUGIN_GENERIC (RASBASE+273)
+#define ERROR_SSO_CERT_MISSING (RASBASE+274)
+#define ERROR_DEVICE_COMPLIANCE (RASBASE+275)
#endif
--
2.21.0
1
0
[PATCH] gdi32/tests: Remove the D3DKMTCreateDCFromMemory test with Width = 0.
by Sven Baars 21 Nov '19
by Sven Baars 21 Nov '19
21 Nov '19
This test fails with STATUS_INVALID_PARAMETER on Windows 7+.
Signed-off-by: Sven Baars <sven.wine(a)gmail.com>
---
This supersedes 173429.
dlls/gdi32/tests/bitmap.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c
index c1651b5a2b..8fe160546c 100644
--- a/dlls/gdi32/tests/bitmap.c
+++ b/dlls/gdi32/tests/bitmap.c
@@ -5780,20 +5780,6 @@ static void test_D3DKMTCreateDCFromMemory( void )
test_data[i].name, create_desc.hBitmap);
create_desc.Height = 7;
- create_desc.Width = 0;
- status = pD3DKMTCreateDCFromMemory( &create_desc );
- ok(status == test_data[i].status, "%s: Got unexpected status %#x, expected %#x.\n",
- test_data[i].name, status, test_data[i].status);
- if (status == STATUS_SUCCESS)
- {
- destroy_desc.hDc = create_desc.hDc;
- destroy_desc.hBitmap = create_desc.hBitmap;
- status = pD3DKMTDestroyDCFromMemory( &destroy_desc );
- ok(status == STATUS_SUCCESS, "%s: Got unexpected status %#x.\n", test_data[i].name, status);
- create_desc.hDc = (void *)0x010baade;
- create_desc.hBitmap = (void *)0x020baade;
- }
-
create_desc.Pitch = 0;
status = pD3DKMTCreateDCFromMemory( &create_desc );
ok(status == STATUS_INVALID_PARAMETER, "%s: Got unexpected status %#x.\n",
--
2.17.1
2
1
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47991
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/comctl32/rebar.c | 6 ++++--
dlls/comctl32/tests/rebar.c | 21 ++++++++++++++++++++-
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 8c667a192b..6bca2f1818 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -1298,8 +1298,8 @@ static int REBAR_SetBandsHeight(const REBAR_INFO *infoPtr, INT iBeginBand, INT i
REBAR_BAND *lpBand;
int yMaxHeight = 0;
int yPos = yStart;
- int row = REBAR_GetBand(infoPtr, iBeginBand)->iRow;
- int i;
+ int row, i;
+
for (i = iBeginBand; i < iEndBand; i = next_visible(infoPtr, i))
{
lpBand = REBAR_GetBand(infoPtr, i);
@@ -1308,6 +1308,8 @@ static int REBAR_SetBandsHeight(const REBAR_INFO *infoPtr, INT iBeginBand, INT i
}
TRACE("Bands [%d; %d) height: %d\n", iBeginBand, iEndBand, yMaxHeight);
+ row = iBeginBand < iEndBand ? REBAR_GetBand(infoPtr, iBeginBand)->iRow : 0;
+
for (i = iBeginBand; i < iEndBand; i = next_visible(infoPtr, i))
{
lpBand = REBAR_GetBand(infoPtr, i);
diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c
index 3b1be77497..6c82295d40 100644
--- a/dlls/comctl32/tests/rebar.c
+++ b/dlls/comctl32/tests/rebar.c
@@ -499,6 +499,7 @@ static void test_layout(void)
REBARBANDINFOA rbi;
HIMAGELIST himl;
REBARINFO ri;
+ int count;
rbsize_results_init();
@@ -660,9 +661,27 @@ static void test_layout(void)
SendMessageA(hRebar, RB_INSERTBANDA, -1, (LPARAM)&rbi);
check_sizes();
- rbsize_results_free();
DestroyWindow(hRebar);
pImageList_Destroy(himl);
+
+ /* One hidden band. */
+ hRebar = create_rebar_control();
+
+ rbi.cbSize = REBARBANDINFOA_V6_SIZE;
+ rbi.fMask = RBBIM_STYLE | RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD;
+ rbi.fStyle = RBBS_HIDDEN;
+ rbi.cx = 200;
+ rbi.cxMinChild = 100;
+ rbi.cyMinChild = 30;
+ rbi.hwndChild = NULL;
+
+ SendMessageA(hRebar, RB_INSERTBANDA, -1, (LPARAM)&rbi);
+ count = SendMessageA(hRebar, RB_GETROWCOUNT, 0, 0);
+ ok(!count, "Unexpected row count %d.\n", count);
+
+ DestroyWindow(hRebar);
+
+ rbsize_results_free();
}
#if 0 /* use this to generate more tests */
--
2.24.0
1
0
[PATCH] kernelbase: When enumerating calendars initialize optional to 0.
by Dmitry Timoshkov 21 Nov '19
by Dmitry Timoshkov 21 Nov '19
21 Nov '19
This fixes regression introduced by 42ed9797b1929fc5917bd967f7062cab953fab55.
Without this patch Internal_EnumCalendarInfo() goes into infinite loop when
asked to enumerate particular calendar id.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/kernelbase/locale.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index 4ec5016b3f..073d759936 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -173,7 +173,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc,
BOOL exex, LPARAM lparam )
{
WCHAR buffer[256];
- DWORD optional;
+ DWORD optional = 0;
INT ret;
if (!proc)
--
2.20.1
1
0
[PATCH v2 1/6] quartz/tests: Add some tests for allocator negotiation on the VMR7.
by Zebediah Figura 21 Nov '19
by Zebediah Figura 21 Nov '19
21 Nov '19
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
dlls/quartz/tests/vmr7.c | 56 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c
index 73017290fb..fdd493c089 100644
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -960,6 +960,56 @@ static void testfilter_init(struct testfilter *filter)
strmbase_source_init(&filter->source, &testsource_vtbl, &filter->filter, L"", &testsource_ops);
}
+static void test_allocator(IMemInputPin *input)
+{
+ IMemAllocator *req_allocator, *ret_allocator;
+ ALLOCATOR_PROPERTIES props, req_props;
+ HRESULT hr;
+
+ hr = IMemInputPin_GetAllocatorRequirements(input, &props);
+ ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr);
+
+ hr = IMemInputPin_GetAllocator(input, &ret_allocator);
+ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ if (hr == S_OK)
+ {
+ hr = IMemAllocator_GetProperties(ret_allocator, &props);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(!props.cBuffers, "Got %d buffers.\n", props.cBuffers);
+ ok(!props.cbBuffer, "Got size %d.\n", props.cbBuffer);
+ ok(!props.cbAlign, "Got alignment %d.\n", props.cbAlign);
+ ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix);
+
+ hr = IMemInputPin_NotifyAllocator(input, ret_allocator, TRUE);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ req_props.cBuffers = 1;
+ req_props.cbBuffer = 32 * 16 * 4;
+ req_props.cbAlign = 1;
+ req_props.cbPrefix = 0;
+ hr = IMemAllocator_SetProperties(ret_allocator, &req_props, &props);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(props.cBuffers == 1, "Got %d buffers.\n", props.cBuffers);
+ ok(props.cbBuffer == 32 * 16 * 4, "Got size %d.\n", props.cbBuffer);
+ ok(props.cbAlign == 1, "Got alignment %d.\n", props.cbAlign);
+ ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix);
+
+ IMemAllocator_Release(ret_allocator);
+ }
+
+ hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE);
+ todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr);
+
+ CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IMemAllocator, (void **)&req_allocator);
+
+ hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE);
+ todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr);
+
+ IMemAllocator_Release(req_allocator);
+}
+
static void test_connect_pin(void)
{
VIDEOINFOHEADER vih =
@@ -981,6 +1031,7 @@ static void test_connect_pin(void)
IBaseFilter *filter = create_vmr7(VMRMode_Windowed);
IFilterGraph2 *graph = create_graph();
struct testfilter source;
+ IMemInputPin *input;
AM_MEDIA_TYPE mt;
IPin *pin, *peer;
unsigned int i;
@@ -1073,6 +1124,10 @@ static void test_connect_pin(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n");
+ IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input);
+
+ test_allocator(input);
+
hr = IFilterGraph2_Disconnect(graph, pin);
ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IFilterGraph2_Disconnect(graph, pin);
@@ -1088,6 +1143,7 @@ static void test_connect_pin(void)
hr = IPin_ConnectionMediaType(pin, &mt);
ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr);
+ IMemInputPin_Release(input);
IPin_Release(pin);
ref = IFilterGraph2_Release(graph);
ok(!ref, "Got outstanding refcount %d.\n", ref);
--
2.24.0
2
7
[PATCH 1/6] quartz/tests: Add some tests for allocator negotiation on the VMR7.
by Zebediah Figura 21 Nov '19
by Zebediah Figura 21 Nov '19
21 Nov '19
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
dlls/quartz/tests/vmr7.c | 56 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c
index 73017290fb..fdd493c089 100644
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -960,6 +960,56 @@ static void testfilter_init(struct testfilter *filter)
strmbase_source_init(&filter->source, &testsource_vtbl, &filter->filter, L"", &testsource_ops);
}
+static void test_allocator(IMemInputPin *input)
+{
+ IMemAllocator *req_allocator, *ret_allocator;
+ ALLOCATOR_PROPERTIES props, req_props;
+ HRESULT hr;
+
+ hr = IMemInputPin_GetAllocatorRequirements(input, &props);
+ ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr);
+
+ hr = IMemInputPin_GetAllocator(input, &ret_allocator);
+ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ if (hr == S_OK)
+ {
+ hr = IMemAllocator_GetProperties(ret_allocator, &props);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(!props.cBuffers, "Got %d buffers.\n", props.cBuffers);
+ ok(!props.cbBuffer, "Got size %d.\n", props.cbBuffer);
+ ok(!props.cbAlign, "Got alignment %d.\n", props.cbAlign);
+ ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix);
+
+ hr = IMemInputPin_NotifyAllocator(input, ret_allocator, TRUE);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ req_props.cBuffers = 1;
+ req_props.cbBuffer = 32 * 16 * 4;
+ req_props.cbAlign = 1;
+ req_props.cbPrefix = 0;
+ hr = IMemAllocator_SetProperties(ret_allocator, &req_props, &props);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(props.cBuffers == 1, "Got %d buffers.\n", props.cBuffers);
+ ok(props.cbBuffer == 32 * 16 * 4, "Got size %d.\n", props.cbBuffer);
+ ok(props.cbAlign == 1, "Got alignment %d.\n", props.cbAlign);
+ ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix);
+
+ IMemAllocator_Release(ret_allocator);
+ }
+
+ hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE);
+ todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr);
+
+ CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IMemAllocator, (void **)&req_allocator);
+
+ hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE);
+ todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr);
+
+ IMemAllocator_Release(req_allocator);
+}
+
static void test_connect_pin(void)
{
VIDEOINFOHEADER vih =
@@ -981,6 +1031,7 @@ static void test_connect_pin(void)
IBaseFilter *filter = create_vmr7(VMRMode_Windowed);
IFilterGraph2 *graph = create_graph();
struct testfilter source;
+ IMemInputPin *input;
AM_MEDIA_TYPE mt;
IPin *pin, *peer;
unsigned int i;
@@ -1073,6 +1124,10 @@ static void test_connect_pin(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n");
+ IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input);
+
+ test_allocator(input);
+
hr = IFilterGraph2_Disconnect(graph, pin);
ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IFilterGraph2_Disconnect(graph, pin);
@@ -1088,6 +1143,7 @@ static void test_connect_pin(void)
hr = IPin_ConnectionMediaType(pin, &mt);
ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr);
+ IMemInputPin_Release(input);
IPin_Release(pin);
ref = IFilterGraph2_Release(graph);
ok(!ref, "Got outstanding refcount %d.\n", ref);
--
2.24.0
2
9
21 Nov '19
Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>
---
I'd prefer we get a sign-off or feedback from Dmitry before committing
this if possible.
On current Windows 10, QueryCapability leaves the stream position at 0,
causing the stream position test to fail, as well as a later test
showing native fails when the stream position isn't at the start.
I figure Windows has shown every possible behavior, so there's no point
in testing the position, but we should set it to show that
CreateDecoderFromStream still cares about the stream position.
dlls/windowscodecs/tests/tiffformat.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c
index 2f9a0ca65f0..861e620e44d 100644
--- a/dlls/windowscodecs/tests/tiffformat.c
+++ b/dlls/windowscodecs/tests/tiffformat.c
@@ -405,7 +405,6 @@ static void test_QueryCapability(void)
WICBitmapDecoderCapabilityCanDecodeSomeImages;
DWORD capability;
LARGE_INTEGER pos;
- ULARGE_INTEGER cur_pos;
UINT frame_count;
stream = create_stream(&tiff_1bpp_data, sizeof(tiff_1bpp_data));
@@ -442,11 +441,9 @@ static void test_QueryCapability(void)
ok(hr == S_OK, "GetFrame error %#x\n", hr);
IWICBitmapFrameDecode_Release(frame);
- pos.QuadPart = 0;
- hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos);
+ pos.QuadPart = 5;
+ hr = IStream_Seek(stream, pos, SEEK_SET, NULL);
ok(hr == S_OK, "IStream_Seek error %#x\n", hr);
- ok(cur_pos.QuadPart > 4 && cur_pos.QuadPart < sizeof(tiff_1bpp_data),
- "current stream pos is at %x/%x\n", cur_pos.u.LowPart, cur_pos.u.HighPart);
hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability);
ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr);
@@ -456,6 +453,7 @@ static void test_QueryCapability(void)
IWICBitmapDecoder_Release(decoder);
+ /* CreateDecoderFromStream fails if seeked past the start */
hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder);
todo_wine
ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr);
--
2.17.1
2
1
[PATCH] dmstyle: Improved tracing of the DMUS_OBJECTDESC structure.
by Alistair Leslie-Hughes 21 Nov '19
by Alistair Leslie-Hughes 21 Nov '19
21 Nov '19
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
dlls/dmstyle/dmutils.c | 55 ++++++++++++++++++++++++------------------
dlls/dmstyle/dmutils.h | 2 +-
dlls/dmstyle/style.c | 2 +-
3 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c
index 0432e76f9f..e9adda9127 100644
--- a/dlls/dmstyle/dmutils.c
+++ b/dlls/dmstyle/dmutils.c
@@ -40,6 +40,7 @@
#include "dmutils.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmfile);
+WINE_DECLARE_DEBUG_CHANNEL(dmime);
HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) {
@@ -197,7 +198,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
TRACE("** DM Reference Begin of Load ***\n");
TRACE("With Desc:\n");
- debugstr_DMUS_OBJECTDESC(&ref_desc);
+ dump_DMUS_OBJECTDESC(&ref_desc);
{
LPDIRECTMUSICGETLOADER pGetLoader = NULL;
@@ -484,26 +485,34 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) {
return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags));
}
-const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) {
- if (pDesc) {
- char buffer[1024], *ptr = buffer;
-
- ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc);
- ptr += sprintf(ptr, " - dwSize = 0x%08X\n", pDesc->dwSize);
- ptr += sprintf(ptr, " - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData));
- if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass));
- if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject));
- if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate));
- if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion));
- if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName));
- if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory));
- if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName));
- if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n",
- wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData);
- if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream);
-
- return wine_dbg_sprintf("%s", buffer);
- } else {
- return wine_dbg_sprintf("(NULL)");
- }
+void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc)
+{
+ if (!TRACE_ON(dmime))
+ return;
+
+ if (pDesc) {
+ TRACE_(dmime)("DMUS_OBJECTDESC (%p):", pDesc);
+ TRACE_(dmime)(" - dwSize = 0x%08X\n", pDesc->dwSize);
+ TRACE_(dmime)(" - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData));
+ if (pDesc->dwValidData & DMUS_OBJ_CLASS)
+ TRACE_(dmime)(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass));
+ if (pDesc->dwValidData & DMUS_OBJ_OBJECT)
+ TRACE_(dmime)(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject));
+ if (pDesc->dwValidData & DMUS_OBJ_DATE)
+ TRACE_(dmime)(" - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate));
+ if (pDesc->dwValidData & DMUS_OBJ_VERSION)
+ TRACE_(dmime)(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion));
+ if (pDesc->dwValidData & DMUS_OBJ_NAME)
+ TRACE_(dmime)(" - wszName = %s\n", debugstr_w(pDesc->wszName));
+ if (pDesc->dwValidData & DMUS_OBJ_CATEGORY)
+ TRACE_(dmime)(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory));
+ if (pDesc->dwValidData & DMUS_OBJ_FILENAME)
+ TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName));
+ if (pDesc->dwValidData & DMUS_OBJ_MEMORY)
+ TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength),
+ pDesc->pbMemData);
+ if (pDesc->dwValidData & DMUS_OBJ_STREAM)
+ TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream);
+ }
}
+
diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h
index e2902875dc..f2b469806f 100644
--- a/dlls/dmstyle/dmutils.h
+++ b/dlls/dmstyle/dmutils.h
@@ -58,6 +58,6 @@ extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN;
extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN;
/* dump whole DMUS_OBJECTDESC struct */
-extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN;
+extern void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) DECLSPEC_HIDDEN;
#endif /* __WINE_DMUTILS_H */
diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index b3a3b83f39..4e84a3edc3 100644
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -234,7 +234,7 @@ static HRESULT WINAPI style_IDirectMusicObject_ParseDescriptor(IDirectMusicObjec
desc->guidClass = CLSID_DirectMusicStyle;
desc->dwValidData |= DMUS_OBJ_CLASS;
- TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc));
+ dump_DMUS_OBJECTDESC(desc);
return S_OK;
}
--
2.17.1
1
0
From: Sveinar Søpler <cybermax(a)dexter.no>
Rework of this patch to fix bug https://www.winehq.org/pipermail/wine-devel/2019-November/153658.html
Original commit message:
From: post(a)arntzen-software.no
Use EXT_descriptor_indexing's UPDATE_AFTER_BIND feature to support
semantics required by RS 1.0 VOLATILE descriptors. We implement this by
deferring all updates of desciptor sets until Submit time.
This is fine, as command buffers cannot be executed simultaneously on
D3D12, so at Submit time, we know that the command buffer is not being
executed on the GPU, and updating descriptors for multiple submissions
is correct.
If EXT_descriptor_indexing is not available, the fallback is the older
method, which matches RS 1.1 STATIC descriptor model.
Signed-off-by: Sveinar Søpler <cybermax(a)dexter.no>
---
libs/vkd3d/command.c | 359 +-
libs/vkd3d/command.c.orig | 6249 ++++++
libs/vkd3d/device.c | 20 +-
libs/vkd3d/state.c | 22 +
libs/vkd3d/vkd3d_private.h | 19 +-
libs/vkd3d/vkd3d_private.h.orig | 1299 ++
tests/d3d12.c | 2 +-
tests/d3d12.c.orig | 32850 ++++++++++++++++++++++++++++++
8 files changed, 40737 insertions(+), 83 deletions(-)
create mode 100644 libs/vkd3d/command.c.orig
create mode 100644 libs/vkd3d/vkd3d_private.h.orig
create mode 100644 tests/d3d12.c.orig
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 297054b..8d8ba1d 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -1341,7 +1341,7 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool(
{
pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
pool_desc.pNext = NULL;
- pool_desc.flags = 0;
+ pool_desc.flags = device->vk_info.EXT_descriptor_indexing ? VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT : 0;
pool_desc.maxSets = 512;
pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes);
pool_desc.pPoolSizes = pool_sizes;
@@ -1865,6 +1865,10 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li
if (!state)
return;
+ /* Each pipeline state has its own set layout for UAV counters
+ * based on their implicit usage in the shader.
+ * Binding a different pipeline state means having to re-remit
+ * UAV counters in a new descriptor set (and layout). */
if (state->uav_counter_mask)
{
struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[state->vk_bind_point];
@@ -2209,6 +2213,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL
if (list->allocator)
d3d12_command_allocator_free_command_buffer(list->allocator, list);
+ vkd3d_free(list->descriptor_updates);
vkd3d_free(list);
d3d12_device_release(device);
@@ -2347,6 +2352,9 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list,
list->state = NULL;
+ /* Recycle deferred descriptor update memory if possible. */
+ list->descriptor_updates_count = 0;
+
memset(list->so_counter_buffers, 0, sizeof(list->so_counter_buffers));
memset(list->so_counter_buffer_offsets, 0, sizeof(list->so_counter_buffer_offsets));
@@ -2566,15 +2574,54 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li
* time in between. Thus, the contents must not be altered (overwritten
* by an update command, or freed) between when the command is recorded
* and when the command completes executing on the queue."
+ *
+ * Even if we have descriptor indexing and UPDATE_AFTER_BIND,
+ * we need at the very least a new descriptor set.
*/
bindings->descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator,
root_signature->vk_set_layout);
+
bindings->in_use = false;
bindings->descriptor_table_dirty_mask |= bindings->descriptor_table_active_mask & root_signature->descriptor_table_mask;
bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask & root_signature->push_descriptor_mask;
}
+static void d3d12_command_list_prepare_uav_counter_descriptors(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point)
+{
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+
+ if (bindings->uav_counter_descriptor_set && !bindings->uav_counter_in_use)
+ return;
+
+ /* We cannot modify bound descriptor sets. We need a new descriptor set if
+ * we are about to update resource bindings.
+ *
+ * The Vulkan spec says:
+ *
+ * "The descriptor set contents bound by a call to
+ * vkCmdBindDescriptorSets may be consumed during host execution of the
+ * command, or during shader execution of the resulting draws, or any
+ * time in between. Thus, the contents must not be altered (overwritten
+ * by an update command, or freed) between when the command is recorded
+ * and when the command completes executing on the queue."
+ *
+ * Even if we have descriptor indexing and UPDATE_AFTER_BIND,
+ * we need at the very least a new descriptor set.
+ */
+
+ if (list->state->uav_counter_mask)
+ {
+ bindings->uav_counter_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator,
+ list->state->vk_set_layout);
+ }
+ else
+ bindings->uav_counter_descriptor_set = VK_NULL_HANDLE;
+
+ bindings->uav_counter_in_use = false;
+}
+
static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_descriptor_write,
VkDescriptorImageInfo *vk_image_info, const struct d3d12_desc *descriptor,
uint32_t descriptor_range_magic, VkDescriptorSet vk_descriptor_set,
@@ -2643,26 +2690,61 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des
return true;
}
-static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list *list,
- VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor)
+static void d3d12_command_list_defer_update_descriptor_table(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point, uint64_t table_mask, bool uav)
{
+ const struct d3d12_desc *base_descriptor;
+ unsigned i;
+ struct d3d12_deferred_descriptor_set_update *update;
struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
- struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write;
- const struct d3d12_root_signature *root_signature = bindings->root_signature;
+
+ for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i)
+ {
+ if (table_mask & ((uint64_t)1 << i))
+ {
+ if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i])))
+ {
+ vkd3d_array_reserve((void **)&list->descriptor_updates, &list->descriptor_updates_size,
+ list->descriptor_updates_count + 1, sizeof(*list->descriptor_updates));
+ update = &list->descriptor_updates[list->descriptor_updates_count];
+
+ update->base_descriptor = base_descriptor;
+ update->index = i;
+ update->root_signature = bindings->root_signature;
+ update->descriptor_set = uav ? bindings->uav_counter_descriptor_set : bindings->descriptor_set;
+ update->uav = uav;
+ list->descriptor_updates_count++;
+ }
+ else
+ WARN("Descriptor table %u is not set.\n", i);
+ }
+ }
+}
+
+static void d3d12_command_list_resolve_descriptor_table_uav(struct d3d12_command_list *list,
+ const struct d3d12_deferred_descriptor_set_update *update)
+{
+ const struct d3d12_root_signature *root_signature = update->root_signature;
const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
- struct VkDescriptorImageInfo image_infos[24], *current_image_info;
const struct d3d12_root_descriptor_table *descriptor_table;
const struct d3d12_root_descriptor_table_range *range;
VkDevice vk_device = list->device->vk_device;
- unsigned int i, j, descriptor_count;
- struct d3d12_desc *descriptor;
-
- descriptor_table = root_signature_get_descriptor_table(root_signature, index);
+ unsigned int i, j;
+ unsigned int uav_counter_count;
+ const struct d3d12_desc *descriptor;
+ VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS];
+ VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS];
+ VkDescriptorSet vk_descriptor_set;
+ const struct d3d12_desc *base_descriptor = update->base_descriptor;
+ descriptor_table = root_signature_get_descriptor_table(root_signature, update->index);
descriptor = base_descriptor;
- descriptor_count = 0;
- current_descriptor_write = descriptor_writes;
- current_image_info = image_infos;
+
+ vk_descriptor_set = update->descriptor_set;
+ if (!vk_descriptor_set)
+ return;
+
+ /* FIXME: There should be a smarter way than scanning through all the descriptor table ranges for this. */
for (i = 0; i < descriptor_table->range_count; ++i)
{
range = &descriptor_table->ranges[i];
@@ -2676,20 +2758,74 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list
{
unsigned int register_idx = range->base_register_idx + j;
- /* Track UAV counters. */
+ /* Fish out UAV counters. */
if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV
- && register_idx < ARRAY_SIZE(bindings->vk_uav_counter_views))
+ && register_idx < ARRAY_SIZE(vk_uav_counter_views))
{
VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV
- ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE;
- if (bindings->vk_uav_counter_views[register_idx] != vk_counter_view)
- bindings->uav_counter_dirty_mask |= 1u << register_idx;
- bindings->vk_uav_counter_views[register_idx] = vk_counter_view;
+ ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE;
+ vk_uav_counter_views[register_idx] = vk_counter_view;
}
+ }
+ }
+
+ uav_counter_count = vkd3d_popcount(list->state->uav_counter_mask);
+ assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes));
+ for (i = 0; i < uav_counter_count; ++i)
+ {
+ const struct vkd3d_shader_uav_counter_binding *uav_counter = &list->state->uav_counters[i];
+ assert(vk_uav_counter_views[uav_counter->register_index]);
+
+ vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+ vk_descriptor_writes[i].pNext = NULL;
+ vk_descriptor_writes[i].dstSet = vk_descriptor_set;
+ vk_descriptor_writes[i].dstBinding = uav_counter->binding.binding;
+ vk_descriptor_writes[i].dstArrayElement = 0;
+ vk_descriptor_writes[i].descriptorCount = 1;
+ vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
+ vk_descriptor_writes[i].pImageInfo = NULL;
+ vk_descriptor_writes[i].pBufferInfo = NULL;
+ vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index];
+ }
+
+ VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL));
+}
+
+static void d3d12_command_list_resolve_descriptor_table_normal(struct d3d12_command_list *list,
+ const struct d3d12_deferred_descriptor_set_update *update)
+{
+ const struct d3d12_root_descriptor_table *descriptor_table;
+ struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write;
+ struct VkDescriptorImageInfo image_infos[24], *current_image_info;
+ const struct d3d12_root_signature *root_signature = update->root_signature;
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ const struct d3d12_root_descriptor_table_range *range;
+ VkDevice vk_device = list->device->vk_device;
+ unsigned int i, j, descriptor_count;
+ const struct d3d12_desc *descriptor;
+ const struct d3d12_desc *base_descriptor = update->base_descriptor;
+
+ descriptor_table = root_signature_get_descriptor_table(root_signature, update->index);
+
+ descriptor = update->base_descriptor;
+ descriptor_count = 0;
+ current_descriptor_write = descriptor_writes;
+ current_image_info = image_infos;
+ for (i = 0; i < descriptor_table->range_count; ++i)
+ {
+ range = &descriptor_table->ranges[i];
+
+ if (range->offset != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND)
+ {
+ descriptor = base_descriptor + range->offset;
+ }
+
+ for (j = 0; j < range->descriptor_count; ++j, ++descriptor)
+ {
if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write,
- current_image_info, descriptor, range->descriptor_magic,
- bindings->descriptor_set, range->binding, j))
+ current_image_info, descriptor, range->descriptor_magic,
+ update->descriptor_set, range->binding, j))
continue;
++descriptor_count;
@@ -2709,6 +2845,52 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list
VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL));
}
+static void d3d12_command_list_resolve_descriptor_table(struct d3d12_command_list *list,
+ const struct d3d12_deferred_descriptor_set_update *update)
+{
+ if (update->uav)
+ d3d12_command_list_resolve_descriptor_table_uav(list, update);
+ else
+ d3d12_command_list_resolve_descriptor_table_normal(list, update);
+}
+
+static void d3d12_command_list_resolve_descriptor_tables(struct d3d12_command_list *list)
+{
+ unsigned i;
+ for (i = 0; i < list->descriptor_updates_count; i++)
+ d3d12_command_list_resolve_descriptor_table(list, &list->descriptor_updates[i]);
+}
+
+static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor)
+{
+ struct d3d12_deferred_descriptor_set_update update;
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+ const struct d3d12_root_signature *root_signature = bindings->root_signature;
+
+ update.descriptor_set = bindings->descriptor_set;
+ update.index = index;
+ update.root_signature = root_signature;
+ update.base_descriptor = base_descriptor;
+ update.uav = false;
+ d3d12_command_list_resolve_descriptor_table_normal(list, &update);
+}
+
+static void d3d12_command_list_update_uav_counter_descriptor_table(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor)
+{
+ struct d3d12_deferred_descriptor_set_update update;
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+ const struct d3d12_root_signature *root_signature = bindings->root_signature;
+
+ update.descriptor_set = bindings->uav_counter_descriptor_set;
+ update.index = index;
+ update.root_signature = root_signature;
+ update.base_descriptor = base_descriptor;
+ update.uav = true;
+ d3d12_command_list_resolve_descriptor_table_uav(list, &update);
+}
+
static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *vk_descriptor_write,
const struct d3d12_root_parameter *root_parameter, VkDescriptorSet vk_descriptor_set,
VkBufferView *vk_buffer_view, const VkDescriptorBufferInfo *vk_buffer_info)
@@ -2813,55 +2995,6 @@ done:
vkd3d_free(buffer_infos);
}
-static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list,
- VkPipelineBindPoint bind_point)
-{
- VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS];
- struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
- const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
- const struct d3d12_pipeline_state *state = list->state;
- VkDevice vk_device = list->device->vk_device;
- VkDescriptorSet vk_descriptor_set;
- unsigned int uav_counter_count;
- unsigned int i;
-
- if (!state || !(state->uav_counter_mask & bindings->uav_counter_dirty_mask))
- return;
-
- uav_counter_count = vkd3d_popcount(state->uav_counter_mask);
- assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes));
-
- vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout);
- if (!vk_descriptor_set)
- return;
-
- for (i = 0; i < uav_counter_count; ++i)
- {
- const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i];
- const VkBufferView *vk_uav_counter_views = bindings->vk_uav_counter_views;
-
- assert(vk_uav_counter_views[uav_counter->register_index]);
-
- vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
- vk_descriptor_writes[i].pNext = NULL;
- vk_descriptor_writes[i].dstSet = vk_descriptor_set;
- vk_descriptor_writes[i].dstBinding = uav_counter->binding.binding;
- vk_descriptor_writes[i].dstArrayElement = 0;
- vk_descriptor_writes[i].descriptorCount = 1;
- vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
- vk_descriptor_writes[i].pImageInfo = NULL;
- vk_descriptor_writes[i].pBufferInfo = NULL;
- vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index];
- }
-
- VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL));
-
- VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point,
- state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL));
-
- bindings->uav_counter_dirty_mask = 0;
-}
-
static void d3d12_command_list_update_descriptors(struct d3d12_command_list *list,
VkPipelineBindPoint bind_point)
{
@@ -2874,31 +3007,86 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis
if (!rs || !rs->vk_set_layout)
return;
+ if ((bindings->descriptor_table_active_mask | bindings->push_descriptor_dirty_mask |
+ (list->state->uav_counter_mask & bindings->uav_counter_dirty_mask)) == 0)
+ {
+ /* Nothing is dirty, so just return early. */
+ return;
+ }
+
if (bindings->descriptor_table_dirty_mask || bindings->push_descriptor_dirty_mask)
d3d12_command_list_prepare_descriptors(list, bind_point);
+ if (list->state->uav_counter_mask & bindings->uav_counter_dirty_mask)
+ d3d12_command_list_prepare_uav_counter_descriptors(list, bind_point);
- for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i)
+ if (list->device->vk_info.EXT_descriptor_indexing)
+ {
+ d3d12_command_list_defer_update_descriptor_table(list, bind_point, bindings->descriptor_table_dirty_mask,
+ false);
+ }
+ else
{
- if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i))
+ /* FIXME: FOR_EACH_BIT */
+ for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i)
{
- if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i])))
- d3d12_command_list_update_descriptor_table(list, bind_point, i, base_descriptor);
- else
- WARN("Descriptor table %u is not set.\n", i);
+ if (bindings->descriptor_table_dirty_mask & ((uint64_t) 1 << i))
+ {
+ if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i])))
+ d3d12_command_list_update_descriptor_table(list, bind_point, i, base_descriptor);
+ else
+ WARN("Descriptor table %u is not set.\n", i);
+ }
}
}
bindings->descriptor_table_dirty_mask = 0;
+ /* Need to go through all descriptor tables here in the root signature,
+ * not just descriptor_table_dirty_mask. Binding a different shader may not invalidate descriptor tables,
+ * but it may invalidate the UAV counter set. */
+ if (bindings->uav_counter_dirty_mask)
+ {
+ if (list->device->vk_info.EXT_descriptor_indexing)
+ {
+ d3d12_command_list_defer_update_descriptor_table(list, bind_point, bindings->descriptor_table_active_mask,
+ true);
+ }
+ else
+ {
+ /* FIXME: FOR_EACH_BIT */
+ for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); i++)
+ {
+ if (bindings->descriptor_table_active_mask & ((uint64_t) 1 << i))
+ {
+ if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i])))
+ d3d12_command_list_update_uav_counter_descriptor_table(list, bind_point, i, base_descriptor);
+ else
+ WARN("Descriptor table %u is not set.\n", i);
+ }
+ }
+ }
+ }
+ bindings->uav_counter_dirty_mask = 0;
+
d3d12_command_list_update_push_descriptors(list, bind_point);
- if (bindings->descriptor_set)
+ /* Don't rebind the same descriptor set as long as we're in same pipeline layout. */
+ if (bindings->descriptor_set && bindings->descriptor_set != bindings->descriptor_set_bound)
{
VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point,
rs->vk_pipeline_layout, rs->main_set, 1, &bindings->descriptor_set, 0, NULL));
bindings->in_use = true;
+ bindings->descriptor_set_bound = bindings->descriptor_set;
}
- d3d12_command_list_update_uav_counter_descriptors(list, bind_point);
+ /* Don't rebind the same descriptor set as long as we're in same pipeline layout. */
+ if (bindings->uav_counter_descriptor_set &&
+ bindings->uav_counter_descriptor_set != bindings->uav_counter_descriptor_set_bound)
+ {
+ VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point,
+ list->state->vk_pipeline_layout, list->state->set_index, 1, &bindings->uav_counter_descriptor_set, 0, NULL));
+ bindings->uav_counter_in_use = true;
+ bindings->uav_counter_descriptor_set_bound = bindings->uav_counter_descriptor_set;
+ }
}
static bool d3d12_command_list_update_compute_state(struct d3d12_command_list *list)
@@ -4054,6 +4242,11 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis
bindings->root_signature = root_signature;
d3d12_command_list_invalidate_root_parameters(list, bind_point);
+
+ bindings->uav_counter_descriptor_set = VK_NULL_HANDLE;
+ bindings->descriptor_set_bound = VK_NULL_HANDLE;
+ bindings->uav_counter_descriptor_set_bound = VK_NULL_HANDLE;
+
}
static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList1 *iface,
@@ -5422,6 +5615,9 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d
d3d12_device_add_ref(list->device = device);
list->allocator = allocator;
+ list->descriptor_updates = NULL;
+ list->descriptor_updates_count = 0;
+ list->descriptor_updates_size = 0;
if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list)))
{
@@ -5659,6 +5855,13 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm
return;
}
+ /* Descriptors in root signature in 1.0 are VOLATILE by default, so
+ * the descriptor heap only need to be valid right before we submit them to the GPU.
+ * If we have EXT_descriptor_indexing enabled with UpdateAfterBind, we update
+ * descriptor sets here rather than while we're recording the command buffer.
+ * For each submission of the command buffer, we can modify the descriptor heap as we please. */
+ d3d12_command_list_resolve_descriptor_tables(cmd_list);
+
buffers[i] = cmd_list->vk_command_buffer;
}
diff --git a/libs/vkd3d/command.c.orig b/libs/vkd3d/command.c.orig
new file mode 100644
index 0000000..297054b
--- /dev/null
+++ b/libs/vkd3d/command.c.orig
@@ -0,0 +1,6249 @@
+/*
+ * Copyright 2016 Józef Kucia for CodeWeavers
+ * Copyright 2016 Henri Verbeet for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "vkd3d_private.h"
+
+static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence);
+
+HRESULT vkd3d_queue_create(struct d3d12_device *device,
+ uint32_t family_index, const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ struct vkd3d_queue *object;
+ int rc;
+
+ if (!(object = vkd3d_malloc(sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ if ((rc = pthread_mutex_init(&object->mutex, NULL)))
+ {
+ ERR("Failed to initialize mutex, error %d.\n", rc);
+ vkd3d_free(object);
+ return hresult_from_errno(rc);
+ }
+
+ object->completed_sequence_number = 0;
+ object->submitted_sequence_number = 0;
+
+ object->vk_family_index = family_index;
+ object->vk_queue_flags = properties->queueFlags;
+ object->timestamp_bits = properties->timestampValidBits;
+
+ object->semaphores = NULL;
+ object->semaphores_size = 0;
+ object->semaphore_count = 0;
+
+ memset(object->old_vk_semaphores, 0, sizeof(object->old_vk_semaphores));
+
+ VK_CALL(vkGetDeviceQueue(device->vk_device, family_index, 0, &object->vk_queue));
+
+ TRACE("Created queue %p for queue family index %u.\n", object, family_index);
+
+ *queue = object;
+
+ return S_OK;
+}
+
+void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ unsigned int i;
+ int rc;
+
+ if ((rc = pthread_mutex_lock(&queue->mutex)))
+ ERR("Failed to lock mutex, error %d.\n", rc);
+
+ for (i = 0; i < queue->semaphore_count; ++i)
+ VK_CALL(vkDestroySemaphore(device->vk_device, queue->semaphores[i].vk_semaphore, NULL));
+
+ vkd3d_free(queue->semaphores);
+
+ for (i = 0; i < ARRAY_SIZE(queue->old_vk_semaphores); ++i)
+ {
+ if (queue->old_vk_semaphores[i])
+ VK_CALL(vkDestroySemaphore(device->vk_device, queue->old_vk_semaphores[i], NULL));
+ }
+
+ if (!rc)
+ pthread_mutex_unlock(&queue->mutex);
+
+ pthread_mutex_destroy(&queue->mutex);
+ vkd3d_free(queue);
+}
+
+VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue)
+{
+ int rc;
+
+ TRACE("queue %p.\n", queue);
+
+ if ((rc = pthread_mutex_lock(&queue->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return VK_NULL_HANDLE;
+ }
+
+ assert(queue->vk_queue);
+ return queue->vk_queue;
+}
+
+void vkd3d_queue_release(struct vkd3d_queue *queue)
+{
+ TRACE("queue %p.\n", queue);
+
+ pthread_mutex_unlock(&queue->mutex);
+}
+
+static VkResult vkd3d_queue_wait_idle(struct vkd3d_queue *queue,
+ const struct vkd3d_vk_device_procs *vk_procs)
+{
+ VkQueue vk_queue;
+ VkResult vr;
+
+ if ((vk_queue = vkd3d_queue_acquire(queue)))
+ {
+ vr = VK_CALL(vkQueueWaitIdle(vk_queue));
+ vkd3d_queue_release(queue);
+
+ if (vr < 0)
+ WARN("Failed to wait for queue, vr %d.\n", vr);
+ }
+ else
+ {
+ ERR("Failed to acquire queue %p.\n", queue);
+ vr = VK_ERROR_OUT_OF_HOST_MEMORY;
+ }
+
+ return vr;
+}
+
+static void vkd3d_queue_update_sequence_number(struct vkd3d_queue *queue,
+ uint64_t sequence_number, struct d3d12_device *device)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ unsigned int destroyed_semaphore_count = 0;
+ uint64_t completed_sequence_number;
+ VkSemaphore vk_semaphore;
+ unsigned int i, j;
+ int rc;
+
+ if ((rc = pthread_mutex_lock(&queue->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return;
+ }
+
+ completed_sequence_number = queue->completed_sequence_number;
+ queue->completed_sequence_number = max(sequence_number, queue->completed_sequence_number);
+
+ TRACE("Queue %p sequence number %"PRIu64" -> %"PRIu64".\n",
+ queue, completed_sequence_number, queue->completed_sequence_number);
+
+ for (i = 0; i < queue->semaphore_count; ++i)
+ {
+ if (queue->semaphores[i].sequence_number > queue->completed_sequence_number)
+ break;
+
+ vk_semaphore = queue->semaphores[i].vk_semaphore;
+
+ /* Try to store the Vulkan semaphore for reuse. */
+ for (j = 0; j < ARRAY_SIZE(queue->old_vk_semaphores); ++j)
+ {
+ if (queue->old_vk_semaphores[j] == VK_NULL_HANDLE)
+ {
+ queue->old_vk_semaphores[j] = vk_semaphore;
+ vk_semaphore = VK_NULL_HANDLE;
+ break;
+ }
+ }
+
+ if (!vk_semaphore)
+ continue;
+
+ VK_CALL(vkDestroySemaphore(device->vk_device, vk_semaphore, NULL));
+ ++destroyed_semaphore_count;
+ }
+ if (i > 0)
+ {
+ queue->semaphore_count -= i;
+ memmove(queue->semaphores, &queue->semaphores[i], queue->semaphore_count * sizeof(*queue->semaphores));
+ }
+
+ if (destroyed_semaphore_count)
+ TRACE("Destroyed %u Vulkan semaphores.\n", destroyed_semaphore_count);
+
+ pthread_mutex_unlock(&queue->mutex);
+}
+
+static uint64_t vkd3d_queue_reset_sequence_number_locked(struct vkd3d_queue *queue)
+{
+ unsigned int i;
+
+ WARN("Ressetting sequence number for queue %p.\n", queue);
+
+ queue->completed_sequence_number = 0;
+ queue->submitted_sequence_number = 1;
+
+ for (i = 0; i < queue->semaphore_count; ++i)
+ queue->semaphores[i].sequence_number = queue->submitted_sequence_number;
+
+ return queue->submitted_sequence_number;
+}
+
+static VkResult vkd3d_queue_create_vk_semaphore_locked(struct vkd3d_queue *queue,
+ struct d3d12_device *device, VkSemaphore *vk_semaphore)
+{
+ const struct vkd3d_vk_device_procs *vk_procs;
+ VkSemaphoreCreateInfo semaphore_info;
+ unsigned int i;
+ VkResult vr;
+
+ *vk_semaphore = VK_NULL_HANDLE;
+
+ for (i = 0; i < ARRAY_SIZE(queue->old_vk_semaphores); ++i)
+ {
+ if ((*vk_semaphore = queue->old_vk_semaphores[i]))
+ {
+ queue->old_vk_semaphores[i] = VK_NULL_HANDLE;
+ break;
+ }
+ }
+
+ if (*vk_semaphore)
+ return VK_SUCCESS;
+
+ vk_procs = &device->vk_procs;
+
+ semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
+ semaphore_info.pNext = NULL;
+ semaphore_info.flags = 0;
+ if ((vr = VK_CALL(vkCreateSemaphore(device->vk_device, &semaphore_info, NULL, vk_semaphore))) < 0)
+ {
+ WARN("Failed to create Vulkan semaphore, vr %d.\n", vr);
+ *vk_semaphore = VK_NULL_HANDLE;
+ }
+
+ return vr;
+}
+
+/* Fence worker thread */
+static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker,
+ VkFence vk_fence, struct d3d12_fence *fence, uint64_t value,
+ struct vkd3d_queue *queue, uint64_t queue_sequence_number)
+{
+ struct vkd3d_waiting_fence *waiting_fence;
+ int rc;
+
+ TRACE("worker %p, fence %p, value %#"PRIx64".\n", worker, fence, value);
+
+ if ((rc = pthread_mutex_lock(&worker->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return hresult_from_errno(rc);
+ }
+
+ if (!vkd3d_array_reserve((void **)&worker->enqueued_fences, &worker->enqueued_fences_size,
+ worker->enqueued_fence_count + 1, sizeof(*worker->enqueued_fences)))
+ {
+ ERR("Failed to add GPU fence.\n");
+ pthread_mutex_unlock(&worker->mutex);
+ return E_OUTOFMEMORY;
+ }
+
+ worker->enqueued_fences[worker->enqueued_fence_count].vk_fence = vk_fence;
+ waiting_fence = &worker->enqueued_fences[worker->enqueued_fence_count].waiting_fence;
+ waiting_fence->fence = fence;
+ waiting_fence->value = value;
+ waiting_fence->queue = queue;
+ waiting_fence->queue_sequence_number = queue_sequence_number;
+ ++worker->enqueued_fence_count;
+
+ InterlockedIncrement(&fence->pending_worker_operation_count);
+
+ pthread_cond_signal(&worker->cond);
+ pthread_mutex_unlock(&worker->mutex);
+
+ return S_OK;
+}
+
+static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, struct d3d12_fence *fence)
+{
+ LONG count;
+ int rc;
+
+ if (!(count = atomic_add_fetch(&fence->pending_worker_operation_count, 0)))
+ return;
+
+ WARN("Waiting for %u pending fence operations (fence %p).\n", count, fence);
+
+ if ((rc = pthread_mutex_lock(&worker->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return;
+ }
+
+ while ((count = atomic_add_fetch(&fence->pending_worker_operation_count, 0)))
+ {
+ TRACE("Still waiting for %u pending fence operations (fence %p).\n", count, fence);
+
+ worker->pending_fence_destruction = true;
+ pthread_cond_signal(&worker->cond);
+
+ pthread_cond_wait(&worker->fence_destruction_cond, &worker->mutex);
+ }
+
+ TRACE("Removed fence %p.\n", fence);
+
+ pthread_mutex_unlock(&worker->mutex);
+}
+
+static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_worker *worker)
+{
+ unsigned int i;
+ size_t count;
+ bool ret;
+
+ if (!worker->enqueued_fence_count)
+ return;
+
+ count = worker->fence_count + worker->enqueued_fence_count;
+
+ ret = vkd3d_array_reserve((void **)&worker->vk_fences, &worker->vk_fences_size,
+ count, sizeof(*worker->vk_fences));
+ ret &= vkd3d_array_reserve((void **)&worker->fences, &worker->fences_size,
+ count, sizeof(*worker->fences));
+ if (!ret)
+ {
+ ERR("Failed to reserve memory.\n");
+ return;
+ }
+
+ for (i = 0; i < worker->enqueued_fence_count; ++i)
+ {
+ struct vkd3d_enqueued_fence *current = &worker->enqueued_fences[i];
+
+ worker->vk_fences[worker->fence_count] = current->vk_fence;
+ worker->fences[worker->fence_count] = current->waiting_fence;
+ ++worker->fence_count;
+ }
+ assert(worker->fence_count == count);
+ worker->enqueued_fence_count = 0;
+}
+
+static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker)
+{
+ struct d3d12_device *device = worker->device;
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ unsigned int i, j;
+ VkFence vk_fence;
+ HRESULT hr;
+ int vr;
+
+ if (!worker->fence_count)
+ return;
+
+ vr = VK_CALL(vkWaitForFences(device->vk_device,
+ worker->fence_count, worker->vk_fences, VK_FALSE, ~(uint64_t)0));
+ if (vr == VK_TIMEOUT)
+ return;
+ if (vr != VK_SUCCESS)
+ {
+ ERR("Failed to wait for Vulkan fences, vr %d.\n", vr);
+ return;
+ }
+
+ for (i = 0, j = 0; i < worker->fence_count; ++i)
+ {
+ vk_fence = worker->vk_fences[i];
+ if (!(vr = VK_CALL(vkGetFenceStatus(device->vk_device, vk_fence))))
+ {
+ struct vkd3d_waiting_fence *current = &worker->fences[i];
+
+ TRACE("Signaling fence %p value %#"PRIx64".\n", current->fence, current->value);
+ if (FAILED(hr = d3d12_fence_signal(current->fence, current->value, vk_fence)))
+ ERR("Failed to signal D3D12 fence, hr %#x.\n", hr);
+
+ InterlockedDecrement(¤t->fence->pending_worker_operation_count);
+
+ vkd3d_queue_update_sequence_number(current->queue, current->queue_sequence_number, device);
+ continue;
+ }
+
+ if (vr != VK_NOT_READY)
+ ERR("Failed to get Vulkan fence status, vr %d.\n", vr);
+
+ if (i != j)
+ {
+ worker->vk_fences[j] = worker->vk_fences[i];
+ worker->fences[j] = worker->fences[i];
+ }
+ ++j;
+ }
+ worker->fence_count = j;
+}
+
+static void *vkd3d_fence_worker_main(void *arg)
+{
+ struct vkd3d_fence_worker *worker = arg;
+ int rc;
+
+ vkd3d_set_thread_name("vkd3d_fence");
+
+ for (;;)
+ {
+ vkd3d_wait_for_gpu_fences(worker);
+
+ if (!worker->fence_count || atomic_add_fetch(&worker->enqueued_fence_count, 0))
+ {
+ if ((rc = pthread_mutex_lock(&worker->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ break;
+ }
+
+ if (worker->pending_fence_destruction)
+ {
+ pthread_cond_broadcast(&worker->fence_destruction_cond);
+ worker->pending_fence_destruction = false;
+ }
+
+ if (worker->enqueued_fence_count)
+ {
+ vkd3d_fence_worker_move_enqueued_fences_locked(worker);
+ }
+ else
+ {
+ if (worker->should_exit)
+ {
+ pthread_mutex_unlock(&worker->mutex);
+ break;
+ }
+
+ if ((rc = pthread_cond_wait(&worker->cond, &worker->mutex)))
+ {
+ ERR("Failed to wait on condition variable, error %d.\n", rc);
+ pthread_mutex_unlock(&worker->mutex);
+ break;
+ }
+ }
+
+ pthread_mutex_unlock(&worker->mutex);
+ }
+ }
+
+ return NULL;
+}
+
+HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker,
+ struct d3d12_device *device)
+{
+ HRESULT hr;
+ int rc;
+
+ TRACE("worker %p.\n", worker);
+
+ worker->should_exit = false;
+ worker->pending_fence_destruction = false;
+ worker->device = device;
+
+ worker->enqueued_fence_count = 0;
+ worker->enqueued_fences = NULL;
+ worker->enqueued_fences_size = 0;
+
+ worker->fence_count = 0;
+
+ worker->vk_fences = NULL;
+ worker->vk_fences_size = 0;
+ worker->fences = NULL;
+ worker->fences_size = 0;
+
+ if ((rc = pthread_mutex_init(&worker->mutex, NULL)))
+ {
+ ERR("Failed to initialize mutex, error %d.\n", rc);
+ return hresult_from_errno(rc);
+ }
+
+ if ((rc = pthread_cond_init(&worker->cond, NULL)))
+ {
+ ERR("Failed to initialize condition variable, error %d.\n", rc);
+ pthread_mutex_destroy(&worker->mutex);
+ return hresult_from_errno(rc);
+ }
+
+ if ((rc = pthread_cond_init(&worker->fence_destruction_cond, NULL)))
+ {
+ ERR("Failed to initialize condition variable, error %d.\n", rc);
+ pthread_mutex_destroy(&worker->mutex);
+ pthread_cond_destroy(&worker->cond);
+ return hresult_from_errno(rc);
+ }
+
+ if (FAILED(hr = vkd3d_create_thread(device->vkd3d_instance,
+ vkd3d_fence_worker_main, worker, &worker->thread)))
+ {
+ pthread_mutex_destroy(&worker->mutex);
+ pthread_cond_destroy(&worker->cond);
+ pthread_cond_destroy(&worker->fence_destruction_cond);
+ }
+
+ return hr;
+}
+
+HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker,
+ struct d3d12_device *device)
+{
+ HRESULT hr;
+ int rc;
+
+ TRACE("worker %p.\n", worker);
+
+ if ((rc = pthread_mutex_lock(&worker->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return hresult_from_errno(rc);
+ }
+
+ worker->should_exit = true;
+ pthread_cond_signal(&worker->cond);
+
+ pthread_mutex_unlock(&worker->mutex);
+
+ if (FAILED(hr = vkd3d_join_thread(device->vkd3d_instance, &worker->thread)))
+ return hr;
+
+ pthread_mutex_destroy(&worker->mutex);
+ pthread_cond_destroy(&worker->cond);
+ pthread_cond_destroy(&worker->fence_destruction_cond);
+
+ vkd3d_free(worker->enqueued_fences);
+ vkd3d_free(worker->vk_fences);
+ vkd3d_free(worker->fences);
+
+ return S_OK;
+}
+
+static const struct d3d12_root_parameter *root_signature_get_parameter(
+ const struct d3d12_root_signature *root_signature, unsigned int index)
+{
+ assert(index < root_signature->parameter_count);
+ return &root_signature->parameters[index];
+}
+
+static const struct d3d12_root_descriptor_table *root_signature_get_descriptor_table(
+ const struct d3d12_root_signature *root_signature, unsigned int index)
+{
+ const struct d3d12_root_parameter *p = root_signature_get_parameter(root_signature, index);
+ assert(p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE);
+ return &p->u.descriptor_table;
+}
+
+static const struct d3d12_root_constant *root_signature_get_32bit_constants(
+ const struct d3d12_root_signature *root_signature, unsigned int index)
+{
+ const struct d3d12_root_parameter *p = root_signature_get_parameter(root_signature, index);
+ assert(p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS);
+ return &p->u.constant;
+}
+
+static const struct d3d12_root_parameter *root_signature_get_root_descriptor(
+ const struct d3d12_root_signature *root_signature, unsigned int index)
+{
+ const struct d3d12_root_parameter *p = root_signature_get_parameter(root_signature, index);
+ assert(p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV
+ || p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV
+ || p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_UAV);
+ return p;
+}
+
+/* ID3D12Fence */
+static struct d3d12_fence *impl_from_ID3D12Fence(ID3D12Fence *iface)
+{
+ return CONTAINING_RECORD(iface, struct d3d12_fence, ID3D12Fence_iface);
+}
+
+static VkResult d3d12_fence_create_vk_fence(struct d3d12_fence *fence, VkFence *vk_fence)
+{
+ const struct vkd3d_vk_device_procs *vk_procs;
+ struct d3d12_device *device = fence->device;
+ VkFenceCreateInfo fence_info;
+ unsigned int i;
+ VkResult vr;
+ int rc;
+
+ *vk_fence = VK_NULL_HANDLE;
+
+ if ((rc = pthread_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ goto create_fence;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(fence->old_vk_fences); ++i)
+ {
+ if ((*vk_fence = fence->old_vk_fences[i]))
+ {
+ fence->old_vk_fences[i] = VK_NULL_HANDLE;
+ break;
+ }
+ }
+
+ pthread_mutex_unlock(&fence->mutex);
+
+ if (*vk_fence)
+ return VK_SUCCESS;
+
+create_fence:
+ vk_procs = &device->vk_procs;
+
+ fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
+ fence_info.pNext = NULL;
+ fence_info.flags = 0;
+ if ((vr = VK_CALL(vkCreateFence(device->vk_device, &fence_info, NULL, vk_fence))) < 0)
+ {
+ WARN("Failed to create Vulkan fence, vr %d.\n", vr);
+ *vk_fence = VK_NULL_HANDLE;
+ }
+
+ return vr;
+}
+
+static void d3d12_fence_garbage_collect_vk_semaphores_locked(struct d3d12_fence *fence,
+ bool destroy_all)
+{
+ struct d3d12_device *device = fence->device;
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ struct vkd3d_signaled_semaphore *current, *p;
+ unsigned int semaphore_count;
+
+ semaphore_count = fence->semaphore_count;
+ if (!destroy_all && semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS)
+ return;
+
+ LIST_FOR_EACH_ENTRY_SAFE(current, p, &fence->semaphores, struct vkd3d_signaled_semaphore, entry)
+ {
+ if (!destroy_all && fence->semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS)
+ break;
+
+ /* The semaphore doesn't have a pending signal operation if the fence
+ * was signaled. */
+ if ((current->vk_fence || current->is_acquired) && !destroy_all)
+ continue;
+
+ if (current->vk_fence)
+ WARN("Destroying potentially pending semaphore.\n");
+ assert(!current->is_acquired);
+
+ VK_CALL(vkDestroySemaphore(device->vk_device, current->vk_semaphore, NULL));
+ list_remove(¤t->entry);
+ vkd3d_free(current);
+
+ --fence->semaphore_count;
+ }
+
+ if (semaphore_count != fence->semaphore_count)
+ TRACE("Destroyed %u Vulkan semaphores.\n", semaphore_count - fence->semaphore_count);
+}
+
+static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence)
+{
+ const struct vkd3d_vk_device_procs *vk_procs;
+ struct d3d12_device *device = fence->device;
+ unsigned int i;
+ int rc;
+
+ if ((rc = pthread_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return;
+ }
+
+ vk_procs = &device->vk_procs;
+
+ for (i = 0; i < ARRAY_SIZE(fence->old_vk_fences); ++i)
+ {
+ if (fence->old_vk_fences[i])
+ VK_CALL(vkDestroyFence(device->vk_device, fence->old_vk_fences[i], NULL));
+ fence->old_vk_fences[i] = VK_NULL_HANDLE;
+ }
+
+ d3d12_fence_garbage_collect_vk_semaphores_locked(fence, true);
+
+ pthread_mutex_unlock(&fence->mutex);
+}
+
+static struct vkd3d_signaled_semaphore *d3d12_fence_acquire_vk_semaphore(struct d3d12_fence *fence,
+ uint64_t value, uint64_t *completed_value)
+{
+ struct vkd3d_signaled_semaphore *semaphore;
+ struct vkd3d_signaled_semaphore *current;
+ uint64_t semaphore_value;
+ int rc;
+
+ TRACE("fence %p, value %#"PRIx64".\n", fence, value);
+
+ if ((rc = pthread_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return VK_NULL_HANDLE;
+ }
+
+ semaphore = NULL;
+ semaphore_value = ~(uint64_t)0;
+
+ LIST_FOR_EACH_ENTRY(current, &fence->semaphores, struct vkd3d_signaled_semaphore, entry)
+ {
+ /* Prefer a semaphore with the smallest value. */
+ if (!current->is_acquired && current->value >= value && semaphore_value >= current->value)
+ {
+ semaphore = current;
+ semaphore_value = current->value;
+ }
+ if (semaphore_value == value)
+ break;
+ }
+
+ if (semaphore)
+ semaphore->is_acquired = true;
+
+ *completed_value = fence->value;
+
+ pthread_mutex_unlock(&fence->mutex);
+
+ return semaphore;
+}
+
+static void d3d12_fence_remove_vk_semaphore(struct d3d12_fence *fence, struct vkd3d_signaled_semaphore *semaphore)
+{
+ int rc;
+
+ if ((rc = pthread_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return;
+ }
+
+ assert(semaphore->is_acquired);
+
+ list_remove(&semaphore->entry);
+ vkd3d_free(semaphore);
+
+ --fence->semaphore_count;
+
+ pthread_mutex_unlock(&fence->mutex);
+}
+
+static void d3d12_fence_release_vk_semaphore(struct d3d12_fence *fence, struct vkd3d_signaled_semaphore *semaphore)
+{
+ int rc;
+
+ if ((rc = pthread_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return;
+ }
+
+ assert(semaphore->is_acquired);
+ semaphore->is_acquired = false;
+
+ pthread_mutex_unlock(&fence->mutex);
+}
+
+static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence,
+ VkSemaphore vk_semaphore, VkFence vk_fence, uint64_t value)
+{
+ struct vkd3d_signaled_semaphore *semaphore;
+ HRESULT hr = S_OK;
+ int rc;
+
+ TRACE("fence %p, value %#"PRIx64".\n", fence, value);
+
+ if (!(semaphore = vkd3d_malloc(sizeof(*semaphore))))
+ {
+ ERR("Failed to add semaphore.\n");
+ return E_OUTOFMEMORY;
+ }
+
+ if ((rc = pthread_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ vkd3d_free(semaphore);
+ return E_FAIL;
+ }
+
+ d3d12_fence_garbage_collect_vk_semaphores_locked(fence, false);
+
+ semaphore->value = value;
+ semaphore->vk_semaphore = vk_semaphore;
+ semaphore->vk_fence = vk_fence;
+ semaphore->is_acquired = false;
+
+ list_add_tail(&fence->semaphores, &semaphore->entry);
+ ++fence->semaphore_count;
+
+ pthread_mutex_unlock(&fence->mutex);
+
+ return hr;
+}
+
+static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence)
+{
+ struct d3d12_device *device = fence->device;
+ struct vkd3d_signaled_semaphore *current;
+ unsigned int i, j;
+ int rc;
+
+ if ((rc = pthread_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return hresult_from_errno(rc);
+ }
+
+ fence->value = value;
+
+ for (i = 0, j = 0; i < fence->event_count; ++i)
+ {
+ struct vkd3d_waiting_event *current = &fence->events[i];
+
+ if (current->value <= value)
+ {
+ fence->device->signal_event(current->event);
+ }
+ else
+ {
+ if (i != j)
+ fence->events[j] = *current;
+ ++j;
+ }
+ }
+ fence->event_count = j;
+
+ if (vk_fence)
+ {
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+
+ LIST_FOR_EACH_ENTRY(current, &fence->semaphores, struct vkd3d_signaled_semaphore, entry)
+ {
+ if (current->vk_fence == vk_fence)
+ current->vk_fence = VK_NULL_HANDLE;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(fence->old_vk_fences); ++i)
+ {
+ if (fence->old_vk_fences[i] == VK_NULL_HANDLE)
+ {
+ fence->old_vk_fences[i] = vk_fence;
+ VK_CALL(vkResetFences(device->vk_device, 1, &vk_fence));
+ vk_fence = VK_NULL_HANDLE;
+ break;
+ }
+ }
+ if (vk_fence)
+ VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL));
+ }
+
+ pthread_mutex_unlock(&fence->mutex);
+
+ return S_OK;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_fence_QueryInterface(ID3D12Fence *iface,
+ REFIID riid, void **object)
+{
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
+
+ if (IsEqualGUID(riid, &IID_ID3D12Fence)
+ || IsEqualGUID(riid, &IID_ID3D12Pageable)
+ || IsEqualGUID(riid, &IID_ID3D12DeviceChild)
+ || IsEqualGUID(riid, &IID_ID3D12Object)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
+ ID3D12Fence_AddRef(iface);
+ *object = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
+ *object = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d3d12_fence_AddRef(ID3D12Fence *iface)
+{
+ struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
+ ULONG refcount = InterlockedIncrement(&fence->refcount);
+
+ TRACE("%p increasing refcount to %u.\n", fence, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface)
+{
+ struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
+ ULONG refcount = InterlockedDecrement(&fence->refcount);
+ int rc;
+
+ TRACE("%p decreasing refcount to %u.\n", fence, refcount);
+
+ if (!refcount)
+ {
+ struct d3d12_device *device = fence->device;
+
+ vkd3d_private_store_destroy(&fence->private_store);
+
+ vkd3d_fence_worker_remove_fence(&device->fence_worker, fence);
+
+ d3d12_fence_destroy_vk_objects(fence);
+
+ vkd3d_free(fence->events);
+ if ((rc = pthread_mutex_destroy(&fence->mutex)))
+ ERR("Failed to destroy mutex, error %d.\n", rc);
+ vkd3d_free(fence);
+
+ d3d12_device_release(device);
+ }
+
+ return refcount;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_fence_GetPrivateData(ID3D12Fence *iface,
+ REFGUID guid, UINT *data_size, void *data)
+{
+ struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
+
+ TRACE("iface %p, guid %s, data_size %p, data %p.\n",
+ iface, debugstr_guid(guid), data_size, data);
+
+ return vkd3d_get_private_data(&fence->private_store, guid, data_size, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_fence_SetPrivateData(ID3D12Fence *iface,
+ REFGUID guid, UINT data_size, const void *data)
+{
+ struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
+
+ TRACE("iface %p, guid %s, data_size %u, data %p.\n",
+ iface, debugstr_guid(guid), data_size, data);
+
+ return vkd3d_set_private_data(&fence->private_store, guid, data_size, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_fence_SetPrivateDataInterface(ID3D12Fence *iface,
+ REFGUID guid, const IUnknown *data)
+{
+ struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
+
+ TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
+
+ return vkd3d_set_private_data_interface(&fence->private_store, guid, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_fence_SetName(ID3D12Fence *iface, const WCHAR *name)
+{
+ struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
+
+ TRACE("iface %p, name %s.\n", iface, debugstr_w(name, fence->device->wchar_size));
+
+ return name ? S_OK : E_INVALIDARG;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_fence_GetDevice(ID3D12Fence *iface, REFIID iid, void **device)
+{
+ struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
+
+ TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device);
+
+ return d3d12_device_query_interface(fence->device, iid, device);
+}
+
+static UINT64 STDMETHODCALLTYPE d3d12_fence_GetCompletedValue(ID3D12Fence *iface)
+{
+ struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
+ uint64_t completed_value;
+ int rc;
+
+ TRACE("iface %p.\n", iface);
+
+ if ((rc = pthread_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return 0;
+ }
+ completed_value = fence->value;
+ pthread_mutex_unlock(&fence->mutex);
+ return completed_value;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *iface,
+ UINT64 value, HANDLE event)
+{
+ struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
+ unsigned int i;
+ int rc;
+
+ TRACE("iface %p, value %#"PRIx64", event %p.\n", iface, value, event);
+
+ if ((rc = pthread_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return hresult_from_errno(rc);
+ }
+
+ if (value <= fence->value)
+ {
+ fence->device->signal_event(event);
+ pthread_mutex_unlock(&fence->mutex);
+ return S_OK;
+ }
+
+ for (i = 0; i < fence->event_count; ++i)
+ {
+ struct vkd3d_waiting_event *current = &fence->events[i];
+ if (current->value == value && current->event == event)
+ {
+ WARN("Event completion for (%p, %#"PRIx64") is already in the list.\n",
+ event, value);
+ pthread_mutex_unlock(&fence->mutex);
+ return S_OK;
+ }
+ }
+
+ if (!vkd3d_array_reserve((void **)&fence->events, &fence->events_size,
+ fence->event_count + 1, sizeof(*fence->events)))
+ {
+ WARN("Failed to add event.\n");
+ pthread_mutex_unlock(&fence->mutex);
+ return E_OUTOFMEMORY;
+ }
+
+ fence->events[fence->event_count].value = value;
+ fence->events[fence->event_count].event = event;
+ ++fence->event_count;
+
+ pthread_mutex_unlock(&fence->mutex);
+ return S_OK;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_fence_Signal(ID3D12Fence *iface, UINT64 value)
+{
+ struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
+
+ TRACE("iface %p, value %#"PRIx64".\n", iface, value);
+
+ return d3d12_fence_signal(fence, value, VK_NULL_HANDLE);
+}
+
+static const struct ID3D12FenceVtbl d3d12_fence_vtbl =
+{
+ /* IUnknown methods */
+ d3d12_fence_QueryInterface,
+ d3d12_fence_AddRef,
+ d3d12_fence_Release,
+ /* ID3D12Object methods */
+ d3d12_fence_GetPrivateData,
+ d3d12_fence_SetPrivateData,
+ d3d12_fence_SetPrivateDataInterface,
+ d3d12_fence_SetName,
+ /* ID3D12DeviceChild methods */
+ d3d12_fence_GetDevice,
+ /* ID3D12Fence methods */
+ d3d12_fence_GetCompletedValue,
+ d3d12_fence_SetEventOnCompletion,
+ d3d12_fence_Signal,
+};
+
+static struct d3d12_fence *unsafe_impl_from_ID3D12Fence(ID3D12Fence *iface)
+{
+ if (!iface)
+ return NULL;
+ assert(iface->lpVtbl == &d3d12_fence_vtbl);
+ return impl_from_ID3D12Fence(iface);
+}
+
+static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device,
+ UINT64 initial_value, D3D12_FENCE_FLAGS flags)
+{
+ HRESULT hr;
+ int rc;
+
+ fence->ID3D12Fence_iface.lpVtbl = &d3d12_fence_vtbl;
+ fence->refcount = 1;
+
+ fence->value = initial_value;
+
+ if ((rc = pthread_mutex_init(&fence->mutex, NULL)))
+ {
+ ERR("Failed to initialize mutex, error %d.\n", rc);
+ return hresult_from_errno(rc);
+ }
+
+ if (flags)
+ FIXME("Ignoring flags %#x.\n", flags);
+
+ fence->events = NULL;
+ fence->events_size = 0;
+ fence->event_count = 0;
+
+ list_init(&fence->semaphores);
+ fence->semaphore_count = 0;
+
+ memset(fence->old_vk_fences, 0, sizeof(fence->old_vk_fences));
+
+ fence->pending_worker_operation_count = 0;
+
+ if (FAILED(hr = vkd3d_private_store_init(&fence->private_store)))
+ {
+ pthread_mutex_destroy(&fence->mutex);
+ return hr;
+ }
+
+ d3d12_device_add_ref(fence->device = device);
+
+ return S_OK;
+}
+
+HRESULT d3d12_fence_create(struct d3d12_device *device,
+ uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence)
+{
+ struct d3d12_fence *object;
+
+ if (!(object = vkd3d_malloc(sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ d3d12_fence_init(object, device, initial_value, flags);
+
+ TRACE("Created fence %p.\n", object);
+
+ *fence = object;
+
+ return S_OK;
+}
+
+/* Command buffers */
+static void d3d12_command_list_mark_as_invalid(struct d3d12_command_list *list,
+ const char *message, ...)
+{
+ va_list args;
+
+ va_start(args, message);
+ WARN("Command list %p is invalid: \"%s\".\n", list, vkd3d_dbg_vsprintf(message, args));
+ va_end(args);
+
+ list->is_valid = false;
+}
+
+static HRESULT d3d12_command_list_begin_command_buffer(struct d3d12_command_list *list)
+{
+ struct d3d12_device *device = list->device;
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ VkCommandBufferBeginInfo begin_info;
+ VkResult vr;
+
+ begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
+ begin_info.pNext = NULL;
+ begin_info.flags = 0;
+ begin_info.pInheritanceInfo = NULL;
+
+ if ((vr = VK_CALL(vkBeginCommandBuffer(list->vk_command_buffer, &begin_info))) < 0)
+ {
+ WARN("Failed to begin command buffer, vr %d.\n", vr);
+ return hresult_from_vk_result(vr);
+ }
+
+ list->is_recording = true;
+ list->is_valid = true;
+
+ return S_OK;
+}
+
+static HRESULT d3d12_command_allocator_allocate_command_buffer(struct d3d12_command_allocator *allocator,
+ struct d3d12_command_list *list)
+{
+ struct d3d12_device *device = allocator->device;
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ VkCommandBufferAllocateInfo command_buffer_info;
+ VkResult vr;
+ HRESULT hr;
+
+ TRACE("allocator %p, list %p.\n", allocator, list);
+
+ if (allocator->current_command_list)
+ {
+ WARN("Command allocator is already in use.\n");
+ return E_INVALIDARG;
+ }
+
+ command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
+ command_buffer_info.pNext = NULL;
+ command_buffer_info.commandPool = allocator->vk_command_pool;
+ command_buffer_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+ command_buffer_info.commandBufferCount = 1;
+
+ if ((vr = VK_CALL(vkAllocateCommandBuffers(device->vk_device, &command_buffer_info,
+ &list->vk_command_buffer))) < 0)
+ {
+ WARN("Failed to allocate Vulkan command buffer, vr %d.\n", vr);
+ return hresult_from_vk_result(vr);
+ }
+
+ list->vk_queue_flags = allocator->vk_queue_flags;
+
+ if (FAILED(hr = d3d12_command_list_begin_command_buffer(list)))
+ {
+ VK_CALL(vkFreeCommandBuffers(device->vk_device, allocator->vk_command_pool,
+ 1, &list->vk_command_buffer));
+ return hr;
+ }
+
+ allocator->current_command_list = list;
+
+ return S_OK;
+}
+
+static void d3d12_command_allocator_free_command_buffer(struct d3d12_command_allocator *allocator,
+ struct d3d12_command_list *list)
+{
+ struct d3d12_device *device = allocator->device;
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+
+ TRACE("allocator %p, list %p.\n", allocator, list);
+
+ if (allocator->current_command_list == list)
+ allocator->current_command_list = NULL;
+
+ if (!vkd3d_array_reserve((void **)&allocator->command_buffers, &allocator->command_buffers_size,
+ allocator->command_buffer_count + 1, sizeof(*allocator->command_buffers)))
+ {
+ WARN("Failed to add command buffer.\n");
+ VK_CALL(vkFreeCommandBuffers(device->vk_device, allocator->vk_command_pool,
+ 1, &list->vk_command_buffer));
+ return;
+ }
+
+ allocator->command_buffers[allocator->command_buffer_count++] = list->vk_command_buffer;
+}
+
+static bool d3d12_command_allocator_add_render_pass(struct d3d12_command_allocator *allocator, VkRenderPass pass)
+{
+ if (!vkd3d_array_reserve((void **)&allocator->passes, &allocator->passes_size,
+ allocator->pass_count + 1, sizeof(*allocator->passes)))
+ return false;
+
+ allocator->passes[allocator->pass_count++] = pass;
+
+ return true;
+}
+
+static bool d3d12_command_allocator_add_framebuffer(struct d3d12_command_allocator *allocator,
+ VkFramebuffer framebuffer)
+{
+ if (!vkd3d_array_reserve((void **)&allocator->framebuffers, &allocator->framebuffers_size,
+ allocator->framebuffer_count + 1, sizeof(*allocator->framebuffers)))
+ return false;
+
+ allocator->framebuffers[allocator->framebuffer_count++] = framebuffer;
+
+ return true;
+}
+
+static bool d3d12_command_allocator_add_descriptor_pool(struct d3d12_command_allocator *allocator,
+ VkDescriptorPool pool)
+{
+ if (!vkd3d_array_reserve((void **)&allocator->descriptor_pools, &allocator->descriptor_pools_size,
+ allocator->descriptor_pool_count + 1, sizeof(*allocator->descriptor_pools)))
+ return false;
+
+ allocator->descriptor_pools[allocator->descriptor_pool_count++] = pool;
+
+ return true;
+}
+
+static bool d3d12_command_allocator_add_view(struct d3d12_command_allocator *allocator,
+ struct vkd3d_view *view)
+{
+ if (!vkd3d_array_reserve((void **)&allocator->views, &allocator->views_size,
+ allocator->view_count + 1, sizeof(*allocator->views)))
+ return false;
+
+ vkd3d_view_incref(view);
+ allocator->views[allocator->view_count++] = view;
+
+ return true;
+}
+
+static bool d3d12_command_allocator_add_buffer_view(struct d3d12_command_allocator *allocator,
+ VkBufferView view)
+{
+ if (!vkd3d_array_reserve((void **)&allocator->buffer_views, &allocator->buffer_views_size,
+ allocator->buffer_view_count + 1, sizeof(*allocator->buffer_views)))
+ return false;
+
+ allocator->buffer_views[allocator->buffer_view_count++] = view;
+
+ return true;
+}
+
+static bool d3d12_command_allocator_add_transfer_buffer(struct d3d12_command_allocator *allocator,
+ const struct vkd3d_buffer *buffer)
+{
+ if (!vkd3d_array_reserve((void **)&allocator->transfer_buffers, &allocator->transfer_buffers_size,
+ allocator->transfer_buffer_count + 1, sizeof(*allocator->transfer_buffers)))
+ return false;
+
+ allocator->transfer_buffers[allocator->transfer_buffer_count++] = *buffer;
+
+ return true;
+}
+
+static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool(
+ struct d3d12_command_allocator *allocator)
+{
+ static const VkDescriptorPoolSize pool_sizes[] =
+ {
+ {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1024},
+ {VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, 1024},
+ {VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, 1024},
+ {VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, 1024},
+ {VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1024},
+ {VK_DESCRIPTOR_TYPE_SAMPLER, 1024},
+ };
+ struct d3d12_device *device = allocator->device;
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ struct VkDescriptorPoolCreateInfo pool_desc;
+ VkDevice vk_device = device->vk_device;
+ VkDescriptorPool vk_pool;
+ VkResult vr;
+
+ if (allocator->free_descriptor_pool_count > 0)
+ {
+ vk_pool = allocator->free_descriptor_pools[allocator->free_descriptor_pool_count - 1];
+ allocator->free_descriptor_pools[allocator->free_descriptor_pool_count - 1] = VK_NULL_HANDLE;
+ --allocator->free_descriptor_pool_count;
+ }
+ else
+ {
+ pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
+ pool_desc.pNext = NULL;
+ pool_desc.flags = 0;
+ pool_desc.maxSets = 512;
+ pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes);
+ pool_desc.pPoolSizes = pool_sizes;
+ if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0)
+ {
+ ERR("Failed to create descriptor pool, vr %d.\n", vr);
+ return VK_NULL_HANDLE;
+ }
+ }
+
+ if (!(d3d12_command_allocator_add_descriptor_pool(allocator, vk_pool)))
+ {
+ ERR("Failed to add descriptor pool.\n");
+ VK_CALL(vkDestroyDescriptorPool(vk_device, vk_pool, NULL));
+ return VK_NULL_HANDLE;
+ }
+
+ return vk_pool;
+}
+
+static VkDescriptorSet d3d12_command_allocator_allocate_descriptor_set(
+ struct d3d12_command_allocator *allocator, VkDescriptorSetLayout vk_set_layout)
+{
+ struct d3d12_device *device = allocator->device;
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ struct VkDescriptorSetAllocateInfo set_desc;
+ VkDevice vk_device = device->vk_device;
+ VkDescriptorSet vk_descriptor_set;
+ VkResult vr;
+
+ if (!allocator->vk_descriptor_pool)
+ allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator);
+ if (!allocator->vk_descriptor_pool)
+ return VK_NULL_HANDLE;
+
+ set_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+ set_desc.pNext = NULL;
+ set_desc.descriptorPool = allocator->vk_descriptor_pool;
+ set_desc.descriptorSetCount = 1;
+ set_desc.pSetLayouts = &vk_set_layout;
+ if ((vr = VK_CALL(vkAllocateDescriptorSets(vk_device, &set_desc, &vk_descriptor_set))) >= 0)
+ return vk_descriptor_set;
+
+ allocator->vk_descriptor_pool = VK_NULL_HANDLE;
+ if (vr == VK_ERROR_FRAGMENTED_POOL || vr == VK_ERROR_OUT_OF_POOL_MEMORY_KHR)
+ allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator);
+ if (!allocator->vk_descriptor_pool)
+ {
+ ERR("Failed to allocate descriptor set, vr %d.\n", vr);
+ return VK_NULL_HANDLE;
+ }
+
+ set_desc.descriptorPool = allocator->vk_descriptor_pool;
+ if ((vr = VK_CALL(vkAllocateDescriptorSets(vk_device, &set_desc, &vk_descriptor_set))) < 0)
+ {
+ FIXME("Failed to allocate descriptor set from a new pool, vr %d.\n", vr);
+ return VK_NULL_HANDLE;
+ }
+
+ return vk_descriptor_set;
+}
+
+static void d3d12_command_list_allocator_destroyed(struct d3d12_command_list *list)
+{
+ TRACE("list %p.\n", list);
+
+ list->allocator = NULL;
+ list->vk_command_buffer = VK_NULL_HANDLE;
+}
+
+static void vkd3d_buffer_destroy(struct vkd3d_buffer *buffer, struct d3d12_device *device)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+
+ VK_CALL(vkFreeMemory(device->vk_device, buffer->vk_memory, NULL));
+ VK_CALL(vkDestroyBuffer(device->vk_device, buffer->vk_buffer, NULL));
+}
+
+static void d3d12_command_allocator_free_resources(struct d3d12_command_allocator *allocator,
+ bool keep_reusable_resources)
+{
+ struct d3d12_device *device = allocator->device;
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ unsigned int i, j;
+
+ allocator->vk_descriptor_pool = VK_NULL_HANDLE;
+
+ if (keep_reusable_resources)
+ {
+ if (vkd3d_array_reserve((void **)&allocator->free_descriptor_pools,
+ &allocator->free_descriptor_pools_size,
+ allocator->free_descriptor_pool_count + allocator->descriptor_pool_count,
+ sizeof(*allocator->free_descriptor_pools)))
+ {
+ for (i = 0, j = allocator->free_descriptor_pool_count; i < allocator->descriptor_pool_count; ++i, ++j)
+ {
+ VK_CALL(vkResetDescriptorPool(device->vk_device, allocator->descriptor_pools[i], 0));
+ allocator->free_descriptor_pools[j] = allocator->descriptor_pools[i];
+ }
+ allocator->free_descriptor_pool_count += allocator->descriptor_pool_count;
+ allocator->descriptor_pool_count = 0;
+ }
+ }
+ else
+ {
+ for (i = 0; i < allocator->free_descriptor_pool_count; ++i)
+ {
+ VK_CALL(vkDestroyDescriptorPool(device->vk_device, allocator->free_descriptor_pools[i], NULL));
+ }
+ allocator->free_descriptor_pool_count = 0;
+ }
+
+ for (i = 0; i < allocator->transfer_buffer_count; ++i)
+ {
+ vkd3d_buffer_destroy(&allocator->transfer_buffers[i], device);
+ }
+ allocator->transfer_buffer_count = 0;
+
+ for (i = 0; i < allocator->buffer_view_count; ++i)
+ {
+ VK_CALL(vkDestroyBufferView(device->vk_device, allocator->buffer_views[i], NULL));
+ }
+ allocator->buffer_view_count = 0;
+
+ for (i = 0; i < allocator->view_count; ++i)
+ {
+ vkd3d_view_decref(allocator->views[i], device);
+ }
+ allocator->view_count = 0;
+
+ for (i = 0; i < allocator->descriptor_pool_count; ++i)
+ {
+ VK_CALL(vkDestroyDescriptorPool(device->vk_device, allocator->descriptor_pools[i], NULL));
+ }
+ allocator->descriptor_pool_count = 0;
+
+ for (i = 0; i < allocator->framebuffer_count; ++i)
+ {
+ VK_CALL(vkDestroyFramebuffer(device->vk_device, allocator->framebuffers[i], NULL));
+ }
+ allocator->framebuffer_count = 0;
+
+ for (i = 0; i < allocator->pass_count; ++i)
+ {
+ VK_CALL(vkDestroyRenderPass(device->vk_device, allocator->passes[i], NULL));
+ }
+ allocator->pass_count = 0;
+}
+
+/* ID3D12CommandAllocator */
+static inline struct d3d12_command_allocator *impl_from_ID3D12CommandAllocator(ID3D12CommandAllocator *iface)
+{
+ return CONTAINING_RECORD(iface, struct d3d12_command_allocator, ID3D12CommandAllocator_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_QueryInterface(ID3D12CommandAllocator *iface,
+ REFIID riid, void **object)
+{
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
+
+ if (IsEqualGUID(riid, &IID_ID3D12CommandAllocator)
+ || IsEqualGUID(riid, &IID_ID3D12Pageable)
+ || IsEqualGUID(riid, &IID_ID3D12DeviceChild)
+ || IsEqualGUID(riid, &IID_ID3D12Object)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
+ ID3D12CommandAllocator_AddRef(iface);
+ *object = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
+ *object = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d3d12_command_allocator_AddRef(ID3D12CommandAllocator *iface)
+{
+ struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface);
+ ULONG refcount = InterlockedIncrement(&allocator->refcount);
+
+ TRACE("%p increasing refcount to %u.\n", allocator, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllocator *iface)
+{
+ struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface);
+ ULONG refcount = InterlockedDecrement(&allocator->refcount);
+
+ TRACE("%p decreasing refcount to %u.\n", allocator, refcount);
+
+ if (!refcount)
+ {
+ struct d3d12_device *device = allocator->device;
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+
+ vkd3d_private_store_destroy(&allocator->private_store);
+
+ if (allocator->current_command_list)
+ d3d12_command_list_allocator_destroyed(allocator->current_command_list);
+
+ d3d12_command_allocator_free_resources(allocator, false);
+ vkd3d_free(allocator->transfer_buffers);
+ vkd3d_free(allocator->buffer_views);
+ vkd3d_free(allocator->views);
+ vkd3d_free(allocator->descriptor_pools);
+ vkd3d_free(allocator->free_descriptor_pools);
+ vkd3d_free(allocator->framebuffers);
+ vkd3d_free(allocator->passes);
+
+ /* All command buffers are implicitly freed when a pool is destroyed. */
+ vkd3d_free(allocator->command_buffers);
+ VK_CALL(vkDestroyCommandPool(device->vk_device, allocator->vk_command_pool, NULL));
+
+ vkd3d_free(allocator);
+
+ d3d12_device_release(device);
+ }
+
+ return refcount;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_GetPrivateData(ID3D12CommandAllocator *iface,
+ REFGUID guid, UINT *data_size, void *data)
+{
+ struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface);
+
+ TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data);
+
+ return vkd3d_get_private_data(&allocator->private_store, guid, data_size, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetPrivateData(ID3D12CommandAllocator *iface,
+ REFGUID guid, UINT data_size, const void *data)
+{
+ struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface);
+
+ TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data);
+
+ return vkd3d_set_private_data(&allocator->private_store, guid, data_size, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetPrivateDataInterface(ID3D12CommandAllocator *iface,
+ REFGUID guid, const IUnknown *data)
+{
+ struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface);
+
+ TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
+
+ return vkd3d_set_private_data_interface(&allocator->private_store, guid, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetName(ID3D12CommandAllocator *iface, const WCHAR *name)
+{
+ struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface);
+
+ TRACE("iface %p, name %s.\n", iface, debugstr_w(name, allocator->device->wchar_size));
+
+ return vkd3d_set_vk_object_name(allocator->device, (uint64_t)allocator->vk_command_pool,
+ VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT, name);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_GetDevice(ID3D12CommandAllocator *iface, REFIID iid, void **device)
+{
+ struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface);
+
+ TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device);
+
+ return d3d12_device_query_interface(allocator->device, iid, device);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_Reset(ID3D12CommandAllocator *iface)
+{
+ struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+ struct d3d12_command_list *list;
+ struct d3d12_device *device;
+ VkResult vr;
+
+ TRACE("iface %p.\n", iface);
+
+ if ((list = allocator->current_command_list))
+ {
+ if (list->is_recording)
+ {
+ WARN("A command list using this allocator is in the recording state.\n");
+ return E_FAIL;
+ }
+
+ TRACE("Resetting command list %p.\n", list);
+ }
+
+ device = allocator->device;
+ vk_procs = &device->vk_procs;
+
+ d3d12_command_allocator_free_resources(allocator, true);
+ if (allocator->command_buffer_count)
+ {
+ VK_CALL(vkFreeCommandBuffers(device->vk_device, allocator->vk_command_pool,
+ allocator->command_buffer_count, allocator->command_buffers));
+ allocator->command_buffer_count = 0;
+ }
+
+ /* The intent here is to recycle memory, so do not use RELEASE_RESOURCES_BIT here. */
+ if ((vr = VK_CALL(vkResetCommandPool(device->vk_device, allocator->vk_command_pool, 0))))
+ {
+ WARN("Resetting command pool failed, vr %d.\n", vr);
+ return hresult_from_vk_result(vr);
+ }
+
+ return S_OK;
+}
+
+static const struct ID3D12CommandAllocatorVtbl d3d12_command_allocator_vtbl =
+{
+ /* IUnknown methods */
+ d3d12_command_allocator_QueryInterface,
+ d3d12_command_allocator_AddRef,
+ d3d12_command_allocator_Release,
+ /* ID3D12Object methods */
+ d3d12_command_allocator_GetPrivateData,
+ d3d12_command_allocator_SetPrivateData,
+ d3d12_command_allocator_SetPrivateDataInterface,
+ d3d12_command_allocator_SetName,
+ /* ID3D12DeviceChild methods */
+ d3d12_command_allocator_GetDevice,
+ /* ID3D12CommandAllocator methods */
+ d3d12_command_allocator_Reset,
+};
+
+static struct d3d12_command_allocator *unsafe_impl_from_ID3D12CommandAllocator(ID3D12CommandAllocator *iface)
+{
+ if (!iface)
+ return NULL;
+ assert(iface->lpVtbl == &d3d12_command_allocator_vtbl);
+ return impl_from_ID3D12CommandAllocator(iface);
+}
+
+struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device,
+ D3D12_COMMAND_LIST_TYPE type)
+{
+ switch (type)
+ {
+ case D3D12_COMMAND_LIST_TYPE_DIRECT:
+ return device->direct_queue;
+ case D3D12_COMMAND_LIST_TYPE_COMPUTE:
+ return device->compute_queue;
+ case D3D12_COMMAND_LIST_TYPE_COPY:
+ return device->copy_queue;
+ default:
+ FIXME("Unhandled command list type %#x.\n", type);
+ return NULL;
+ }
+}
+
+static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allocator,
+ struct d3d12_device *device, D3D12_COMMAND_LIST_TYPE type)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ VkCommandPoolCreateInfo command_pool_info;
+ struct vkd3d_queue *queue;
+ VkResult vr;
+ HRESULT hr;
+
+ if (FAILED(hr = vkd3d_private_store_init(&allocator->private_store)))
+ return hr;
+
+ if (!(queue = d3d12_device_get_vkd3d_queue(device, type)))
+ queue = device->direct_queue;
+
+ allocator->ID3D12CommandAllocator_iface.lpVtbl = &d3d12_command_allocator_vtbl;
+ allocator->refcount = 1;
+
+ allocator->type = type;
+ allocator->vk_queue_flags = queue->vk_queue_flags;
+
+ command_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
+ command_pool_info.pNext = NULL;
+ /* Do not use RESET_COMMAND_BUFFER_BIT. This allows the CommandPool to be a D3D12-style command pool.
+ * Memory is owned by the pool and CommandBuffers become lightweight handles,
+ * assuming a half-decent driver implementation. */
+ command_pool_info.flags = 0;
+ command_pool_info.queueFamilyIndex = queue->vk_family_index;
+
+ if ((vr = VK_CALL(vkCreateCommandPool(device->vk_device, &command_pool_info, NULL,
+ &allocator->vk_command_pool))) < 0)
+ {
+ WARN("Failed to create Vulkan command pool, vr %d.\n", vr);
+ vkd3d_private_store_destroy(&allocator->private_store);
+ return hresult_from_vk_result(vr);
+ }
+
+ allocator->vk_descriptor_pool = VK_NULL_HANDLE;
+
+ allocator->free_descriptor_pools = NULL;
+ allocator->free_descriptor_pools_size = 0;
+ allocator->free_descriptor_pool_count = 0;
+
+ allocator->passes = NULL;
+ allocator->passes_size = 0;
+ allocator->pass_count = 0;
+
+ allocator->framebuffers = NULL;
+ allocator->framebuffers_size = 0;
+ allocator->framebuffer_count = 0;
+
+ allocator->descriptor_pools = NULL;
+ allocator->descriptor_pools_size = 0;
+ allocator->descriptor_pool_count = 0;
+
+ allocator->views = NULL;
+ allocator->views_size = 0;
+ allocator->view_count = 0;
+
+ allocator->buffer_views = NULL;
+ allocator->buffer_views_size = 0;
+ allocator->buffer_view_count = 0;
+
+ allocator->transfer_buffers = NULL;
+ allocator->transfer_buffers_size = 0;
+ allocator->transfer_buffer_count = 0;
+
+ allocator->command_buffers = NULL;
+ allocator->command_buffers_size = 0;
+ allocator->command_buffer_count = 0;
+
+ allocator->current_command_list = NULL;
+
+ d3d12_device_add_ref(allocator->device = device);
+
+ return S_OK;
+}
+
+HRESULT d3d12_command_allocator_create(struct d3d12_device *device,
+ D3D12_COMMAND_LIST_TYPE type, struct d3d12_command_allocator **allocator)
+{
+ struct d3d12_command_allocator *object;
+ HRESULT hr;
+
+ if (!(D3D12_COMMAND_LIST_TYPE_DIRECT <= type && type <= D3D12_COMMAND_LIST_TYPE_COPY))
+ {
+ WARN("Invalid type %#x.\n", type);
+ return E_INVALIDARG;
+ }
+
+ if (!(object = vkd3d_malloc(sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ if (FAILED(hr = d3d12_command_allocator_init(object, device, type)))
+ {
+ vkd3d_free(object);
+ return hr;
+ }
+
+ TRACE("Created command allocator %p.\n", object);
+
+ *allocator = object;
+
+ return S_OK;
+}
+
+/* ID3D12CommandList */
+static inline struct d3d12_command_list *impl_from_ID3D12GraphicsCommandList1(ID3D12GraphicsCommandList1 *iface)
+{
+ return CONTAINING_RECORD(iface, struct d3d12_command_list, ID3D12GraphicsCommandList1_iface);
+}
+
+static void d3d12_command_list_invalidate_current_framebuffer(struct d3d12_command_list *list)
+{
+ list->current_framebuffer = VK_NULL_HANDLE;
+}
+
+static void d3d12_command_list_invalidate_current_pipeline(struct d3d12_command_list *list)
+{
+ list->current_pipeline = VK_NULL_HANDLE;
+}
+
+static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list *list)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+
+ if (list->xfb_enabled)
+ {
+ VK_CALL(vkCmdEndTransformFeedbackEXT(list->vk_command_buffer, 0, ARRAY_SIZE(list->so_counter_buffers),
+ list->so_counter_buffers, list->so_counter_buffer_offsets));
+ }
+
+ if (list->current_render_pass)
+ VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer));
+
+ list->current_render_pass = VK_NULL_HANDLE;
+
+ if (list->xfb_enabled)
+ {
+ VkMemoryBarrier vk_barrier;
+
+ /* We need a barrier between pause and resume. */
+ vk_barrier.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
+ vk_barrier.pNext = NULL;
+ vk_barrier.srcAccessMask = VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT;
+ vk_barrier.dstAccessMask = VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT;
+ VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer,
+ VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT, VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT, 0,
+ 1, &vk_barrier, 0, NULL, 0, NULL));
+
+ list->xfb_enabled = false;
+ }
+}
+
+static void d3d12_command_list_invalidate_current_render_pass(struct d3d12_command_list *list)
+{
+ d3d12_command_list_end_current_render_pass(list);
+}
+
+static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *list,
+ struct d3d12_pipeline_state *state)
+{
+ if (!state)
+ return;
+
+ if (state->uav_counter_mask)
+ {
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[state->vk_bind_point];
+ bindings->uav_counter_dirty_mask = ~(uint8_t)0;
+ }
+}
+
+static void d3d12_command_list_invalidate_root_parameters(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point)
+{
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+
+ if (!bindings->root_signature)
+ return;
+
+ bindings->descriptor_set = VK_NULL_HANDLE;
+ bindings->descriptor_table_dirty_mask = bindings->descriptor_table_active_mask & bindings->root_signature->descriptor_table_mask;
+ bindings->push_descriptor_dirty_mask = bindings->push_descriptor_active_mask & bindings->root_signature->push_descriptor_mask;
+}
+
+static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, unsigned int stencil_state,
+ const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, const struct vkd3d_vulkan_info *vk_info,
+ VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout)
+{
+ bool is_swapchain_image = resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION);
+ VkPipelineStageFlags queue_shader_stages = 0;
+
+ if (vk_queue_flags & VK_QUEUE_GRAPHICS_BIT)
+ {
+ queue_shader_stages |= VK_PIPELINE_STAGE_VERTEX_SHADER_BIT
+ | VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT
+ | VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT
+ | VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT
+ | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+ }
+ if (vk_queue_flags & VK_QUEUE_COMPUTE_BIT)
+ queue_shader_stages |= VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT;
+
+ switch (state)
+ {
+ case D3D12_RESOURCE_STATE_COMMON: /* D3D12_RESOURCE_STATE_PRESENT */
+ /* The COMMON state is used for ownership transfer between
+ * DIRECT/COMPUTE and COPY queues. Additionally, a texture has to
+ * be in the COMMON state to be accessed by CPU. Moreover,
+ * resources can be implicitly promoted to other states out of the
+ * COMMON state, and the resource state can decay to the COMMON
+ * state when GPU finishes execution of a command list. */
+ if (is_swapchain_image)
+ {
+ if (resource->present_state == D3D12_RESOURCE_STATE_PRESENT)
+ {
+ *access_mask = VK_ACCESS_MEMORY_READ_BIT;
+ *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+ if (image_layout)
+ *image_layout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+ return true;
+ }
+ else if (resource->present_state != D3D12_RESOURCE_STATE_COMMON)
+ {
+ vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, 0,
+ resource, vk_queue_flags, vk_info, access_mask, stage_flags, image_layout);
+ return true;
+ }
+ }
+
+ *access_mask = VK_ACCESS_HOST_READ_BIT | VK_ACCESS_HOST_WRITE_BIT;
+ *stage_flags = VK_PIPELINE_STAGE_HOST_BIT;
+ if (image_layout)
+ *image_layout = VK_IMAGE_LAYOUT_GENERAL;
+ return true;
+
+ /* Handle write states. */
+ case D3D12_RESOURCE_STATE_RENDER_TARGET:
+ *access_mask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT
+ | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+ *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+ if (image_layout)
+ *image_layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+ return true;
+
+ case D3D12_RESOURCE_STATE_UNORDERED_ACCESS:
+ *access_mask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT;
+ *stage_flags = queue_shader_stages;
+ if (image_layout)
+ *image_layout = VK_IMAGE_LAYOUT_GENERAL;
+ return true;
+
+ case D3D12_RESOURCE_STATE_DEPTH_WRITE:
+ *access_mask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT
+ | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
+ *stage_flags = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT
+ | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
+ if (image_layout)
+ {
+ if (!stencil_state || (stencil_state & D3D12_RESOURCE_STATE_DEPTH_WRITE))
+ *image_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+ else
+ *image_layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL;
+ }
+ return true;
+
+ case D3D12_RESOURCE_STATE_COPY_DEST:
+ case D3D12_RESOURCE_STATE_RESOLVE_DEST:
+ *access_mask = VK_ACCESS_TRANSFER_WRITE_BIT;
+ *stage_flags = VK_PIPELINE_STAGE_TRANSFER_BIT;
+ if (image_layout)
+ *image_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+ return true;
+
+ case D3D12_RESOURCE_STATE_STREAM_OUT:
+ *access_mask = VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT
+ | VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT
+ | VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT;
+ *stage_flags = VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT
+ | VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT;
+ if (image_layout)
+ *image_layout = VK_IMAGE_LAYOUT_UNDEFINED;
+ return true;
+
+ /* Set the Vulkan image layout for read-only states. */
+ case D3D12_RESOURCE_STATE_DEPTH_READ:
+ case D3D12_RESOURCE_STATE_DEPTH_READ | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE:
+ case D3D12_RESOURCE_STATE_DEPTH_READ | D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE:
+ case D3D12_RESOURCE_STATE_DEPTH_READ | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE
+ | D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE:
+ *access_mask = 0;
+ *stage_flags = 0;
+ if (image_layout)
+ {
+ if (stencil_state & D3D12_RESOURCE_STATE_DEPTH_WRITE)
+ {
+ *image_layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL;
+ *access_mask |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
+ }
+ else
+ {
+ *image_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
+ }
+ }
+ break;
+
+ case D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE:
+ case D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE:
+ case D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE:
+ *access_mask = 0;
+ *stage_flags = 0;
+ if (image_layout)
+ *image_layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+ break;
+
+ case D3D12_RESOURCE_STATE_COPY_SOURCE:
+ case D3D12_RESOURCE_STATE_RESOLVE_SOURCE:
+ *access_mask = 0;
+ *stage_flags = 0;
+ if (image_layout)
+ *image_layout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+ break;
+
+ default:
+ *access_mask = 0;
+ *stage_flags = 0;
+ if (image_layout)
+ *image_layout = VK_IMAGE_LAYOUT_GENERAL;
+ break;
+ }
+
+ /* Handle read-only states. */
+ assert(!is_write_resource_state(state));
+
+ if (state & D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER)
+ {
+ *access_mask |= VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT
+ | VK_ACCESS_UNIFORM_READ_BIT;
+ *stage_flags |= VK_PIPELINE_STAGE_VERTEX_INPUT_BIT
+ | queue_shader_stages;
+ state &= ~D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER;
+ }
+
+ if (state & D3D12_RESOURCE_STATE_INDEX_BUFFER)
+ {
+ *access_mask |= VK_ACCESS_INDEX_READ_BIT;
+ *stage_flags |= VK_PIPELINE_STAGE_VERTEX_INPUT_BIT;
+ state &= ~D3D12_RESOURCE_STATE_INDEX_BUFFER;
+ }
+
+ if (state & D3D12_RESOURCE_STATE_DEPTH_READ)
+ {
+ *access_mask |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
+ *stage_flags |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT
+ | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
+ state &= ~D3D12_RESOURCE_STATE_DEPTH_READ;
+ }
+
+ if (state & D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE)
+ {
+ *access_mask |= VK_ACCESS_SHADER_READ_BIT;
+ *stage_flags |= (queue_shader_stages & ~VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
+ state &= ~D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE;
+ }
+ if (state & D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE)
+ {
+ *access_mask |= VK_ACCESS_SHADER_READ_BIT;
+ *stage_flags |= VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+ state &= ~D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE;
+ }
+
+ if (state & D3D12_RESOURCE_STATE_INDIRECT_ARGUMENT) /* D3D12_RESOURCE_STATE_PREDICATION */
+ {
+ *access_mask |= VK_ACCESS_INDIRECT_COMMAND_READ_BIT;
+ *stage_flags |= VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT;
+ if (vk_info->EXT_conditional_rendering)
+ {
+ *access_mask |= VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT;
+ *stage_flags |= VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT;
+ }
+ state &= ~D3D12_RESOURCE_STATE_INDIRECT_ARGUMENT;
+ }
+
+ if (state & (D3D12_RESOURCE_STATE_COPY_SOURCE | D3D12_RESOURCE_STATE_RESOLVE_SOURCE))
+ {
+ *access_mask |= VK_ACCESS_TRANSFER_READ_BIT;
+ *stage_flags |= VK_PIPELINE_STAGE_TRANSFER_BIT;
+ state &= ~(D3D12_RESOURCE_STATE_COPY_SOURCE | D3D12_RESOURCE_STATE_RESOLVE_SOURCE);
+ }
+
+ if (state)
+ {
+ WARN("Invalid resource state %#x.\n", state);
+ return false;
+ }
+ return true;
+}
+
+static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12_command_list *list,
+ struct d3d12_resource *resource)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info;
+ VkPipelineStageFlags src_stage_mask, dst_stage_mask;
+ const struct vkd3d_format *format;
+ VkImageMemoryBarrier barrier;
+
+ assert(d3d12_resource_is_texture(resource));
+
+ if (!(format = vkd3d_format_from_d3d12_resource_desc(list->device, &resource->desc, 0)))
+ {
+ ERR("Resource %p has invalid format %#x.\n", resource, resource->desc.Format);
+ return;
+ }
+
+ barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+ barrier.pNext = NULL;
+
+ /* vkQueueSubmit() defines a memory dependency with prior host writes. */
+ src_stage_mask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+ barrier.srcAccessMask = 0;
+ barrier.oldLayout = d3d12_resource_is_cpu_accessible(resource) ?
+ VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED;
+
+ if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, 0,
+ resource, list->vk_queue_flags, vk_info, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout))
+ {
+ FIXME("Unhandled state %#x.\n", resource->initial_state);
+ return;
+ }
+
+ barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+ barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+ barrier.image = resource->u.vk_image;
+ barrier.subresourceRange.aspectMask = format->vk_aspect_mask;
+ barrier.subresourceRange.baseMipLevel = 0;
+ barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+ barrier.subresourceRange.baseArrayLayer = 0;
+ barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+
+ TRACE("Initial state %#x transition for resource %p (old layout %#x, new layout %#x).\n",
+ resource->initial_state, resource, barrier.oldLayout, barrier.newLayout);
+
+ VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, src_stage_mask, dst_stage_mask, 0,
+ 0, NULL, 0, NULL, 1, &barrier));
+}
+
+static void d3d12_command_list_track_resource_usage(struct d3d12_command_list *list,
+ struct d3d12_resource *resource)
+{
+ if (resource->flags & VKD3D_RESOURCE_INITIAL_STATE_TRANSITION)
+ {
+ d3d12_command_list_end_current_render_pass(list);
+
+ d3d12_command_list_transition_resource_to_initial_state(list, resource);
+ resource->flags &= ~VKD3D_RESOURCE_INITIAL_STATE_TRANSITION;
+ }
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_QueryInterface(ID3D12GraphicsCommandList1 *iface,
+ REFIID iid, void **object)
+{
+ TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object);
+
+ if (IsEqualGUID(iid, &IID_ID3D12GraphicsCommandList1)
+ || IsEqualGUID(iid, &IID_ID3D12GraphicsCommandList)
+ || IsEqualGUID(iid, &IID_ID3D12CommandList)
+ || IsEqualGUID(iid, &IID_ID3D12DeviceChild)
+ || IsEqualGUID(iid, &IID_ID3D12Object)
+ || IsEqualGUID(iid, &IID_IUnknown))
+ {
+ ID3D12GraphicsCommandList1_AddRef(iface);
+ *object = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+
+ *object = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d3d12_command_list_AddRef(ID3D12GraphicsCommandList1 *iface)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ ULONG refcount = InterlockedIncrement(&list->refcount);
+
+ TRACE("%p increasing refcount to %u.\n", list, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandList1 *iface)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ ULONG refcount = InterlockedDecrement(&list->refcount);
+
+ TRACE("%p decreasing refcount to %u.\n", list, refcount);
+
+ if (!refcount)
+ {
+ struct d3d12_device *device = list->device;
+
+ vkd3d_private_store_destroy(&list->private_store);
+
+ /* When command pool is destroyed, all command buffers are implicitly freed. */
+ if (list->allocator)
+ d3d12_command_allocator_free_command_buffer(list->allocator, list);
+
+ vkd3d_free(list);
+
+ d3d12_device_release(device);
+ }
+
+ return refcount;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetPrivateData(ID3D12GraphicsCommandList1 *iface,
+ REFGUID guid, UINT *data_size, void *data)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data);
+
+ return vkd3d_get_private_data(&list->private_store, guid, data_size, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateData(ID3D12GraphicsCommandList1 *iface,
+ REFGUID guid, UINT data_size, const void *data)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data);
+
+ return vkd3d_set_private_data(&list->private_store, guid, data_size, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateDataInterface(ID3D12GraphicsCommandList1 *iface,
+ REFGUID guid, const IUnknown *data)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
+
+ return vkd3d_set_private_data_interface(&list->private_store, guid, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetName(ID3D12GraphicsCommandList1 *iface, const WCHAR *name)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, name %s.\n", iface, debugstr_w(name, list->device->wchar_size));
+
+ return name ? S_OK : E_INVALIDARG;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetDevice(ID3D12GraphicsCommandList1 *iface, REFIID iid, void **device)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device);
+
+ return d3d12_device_query_interface(list->device, iid, device);
+}
+
+static D3D12_COMMAND_LIST_TYPE STDMETHODCALLTYPE d3d12_command_list_GetType(ID3D12GraphicsCommandList1 *iface)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return list->type;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandList1 *iface)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+ VkResult vr;
+
+ TRACE("iface %p.\n", iface);
+
+ if (!list->is_recording)
+ {
+ WARN("Command list is not in the recording state.\n");
+ return E_FAIL;
+ }
+
+ vk_procs = &list->device->vk_procs;
+
+ d3d12_command_list_end_current_render_pass(list);
+ if (list->is_predicated)
+ VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer));
+
+ if ((vr = VK_CALL(vkEndCommandBuffer(list->vk_command_buffer))) < 0)
+ {
+ WARN("Failed to end command buffer, vr %d.\n", vr);
+ return hresult_from_vk_result(vr);
+ }
+
+ if (list->allocator)
+ {
+ d3d12_command_allocator_free_command_buffer(list->allocator, list);
+ list->allocator = NULL;
+ }
+
+ list->is_recording = false;
+
+ if (!list->is_valid)
+ {
+ WARN("Error occurred during command list recording.\n");
+ return E_INVALIDARG;
+ }
+
+ return S_OK;
+}
+
+static void d3d12_command_list_reset_state(struct d3d12_command_list *list,
+ ID3D12PipelineState *initial_pipeline_state)
+{
+ ID3D12GraphicsCommandList1 *iface = &list->ID3D12GraphicsCommandList1_iface;
+
+ memset(list->strides, 0, sizeof(list->strides));
+ list->primitive_topology = D3D_PRIMITIVE_TOPOLOGY_POINTLIST;
+
+ list->index_buffer_format = DXGI_FORMAT_UNKNOWN;
+
+ memset(list->rtvs, 0, sizeof(list->rtvs));
+ list->dsv = VK_NULL_HANDLE;
+ list->dsv_format = VK_FORMAT_UNDEFINED;
+ list->fb_width = 0;
+ list->fb_height = 0;
+ list->fb_layer_count = 0;
+
+ list->xfb_enabled = false;
+
+ list->is_predicated = false;
+
+ list->current_framebuffer = VK_NULL_HANDLE;
+ list->current_pipeline = VK_NULL_HANDLE;
+ list->pso_render_pass = VK_NULL_HANDLE;
+ list->current_render_pass = VK_NULL_HANDLE;
+
+ memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings));
+
+ list->state = NULL;
+
+ memset(list->so_counter_buffers, 0, sizeof(list->so_counter_buffers));
+ memset(list->so_counter_buffer_offsets, 0, sizeof(list->so_counter_buffer_offsets));
+
+ ID3D12GraphicsCommandList1_SetPipelineState(iface, initial_pipeline_state);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandList1 *iface,
+ ID3D12CommandAllocator *allocator, ID3D12PipelineState *initial_pipeline_state)
+{
+ struct d3d12_command_allocator *allocator_impl = unsafe_impl_from_ID3D12CommandAllocator(allocator);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ HRESULT hr;
+
+ TRACE("iface %p, allocator %p, initial_pipeline_state %p.\n",
+ iface, allocator, initial_pipeline_state);
+
+ if (!allocator_impl)
+ {
+ WARN("Command allocator is NULL.\n");
+ return E_INVALIDARG;
+ }
+
+ if (list->is_recording)
+ {
+ WARN("Command list is in the recording state.\n");
+ return E_FAIL;
+ }
+
+ if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator_impl, list)))
+ {
+ list->allocator = allocator_impl;
+ d3d12_command_list_reset_state(list, initial_pipeline_state);
+ }
+
+ return hr;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCommandList1 *iface,
+ ID3D12PipelineState *pipeline_state)
+{
+ FIXME("iface %p, pipline_state %p stub!\n", iface, pipeline_state);
+
+ return E_NOTIMPL;
+}
+
+static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list *list)
+{
+ struct d3d12_graphics_pipeline_state *graphics;
+
+ assert(d3d12_pipeline_state_is_graphics(list->state));
+ graphics = &list->state->u.graphics;
+
+ return graphics->dsv_format || (d3d12_pipeline_state_has_unknown_dsv_format(list->state) && list->dsv_format);
+}
+
+static void d3d12_command_list_get_fb_extent(struct d3d12_command_list *list,
+ uint32_t *width, uint32_t *height, uint32_t *layer_count)
+{
+ struct d3d12_graphics_pipeline_state *graphics = &list->state->u.graphics;
+ struct d3d12_device *device = list->device;
+
+ if (graphics->rt_count || d3d12_command_list_has_depth_stencil_view(list))
+ {
+ *width = list->fb_width;
+ *height = list->fb_height;
+ if (layer_count)
+ *layer_count = list->fb_layer_count;
+ }
+ else
+ {
+ *width = device->vk_info.device_limits.maxFramebufferWidth;
+ *height = device->vk_info.device_limits.maxFramebufferHeight;
+ if (layer_count)
+ *layer_count = 1;
+ }
+}
+
+static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_list *list)
+{
+ struct d3d12_device *device = list->device;
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1];
+ struct d3d12_graphics_pipeline_state *graphics;
+ struct VkFramebufferCreateInfo fb_desc;
+ VkFramebuffer vk_framebuffer;
+ unsigned int view_count;
+ unsigned int i;
+ VkResult vr;
+
+ if (list->current_framebuffer != VK_NULL_HANDLE)
+ return true;
+
+ graphics = &list->state->u.graphics;
+
+ for (i = 0, view_count = 0; i < graphics->rt_count; ++i)
+ {
+ if (graphics->null_attachment_mask & (1u << i))
+ {
+ if (list->rtvs[i])
+ WARN("Expected NULL RTV for attachment %u.\n", i);
+ continue;
+ }
+
+ if (!list->rtvs[i])
+ {
+ FIXME("Invalid RTV for attachment %u.\n", i);
+ return false;
+ }
+
+ views[view_count++] = list->rtvs[i];
+ }
+
+ if (d3d12_command_list_has_depth_stencil_view(list))
+ {
+ if (!(views[view_count++] = list->dsv))
+ {
+ FIXME("Invalid DSV.\n");
+ return false;
+ }
+ }
+
+ fb_desc.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
+ fb_desc.pNext = NULL;
+ fb_desc.flags = 0;
+ fb_desc.renderPass = list->pso_render_pass;
+ fb_desc.attachmentCount = view_count;
+ fb_desc.pAttachments = views;
+ d3d12_command_list_get_fb_extent(list, &fb_desc.width, &fb_desc.height, &fb_desc.layers);
+ if ((vr = VK_CALL(vkCreateFramebuffer(device->vk_device, &fb_desc, NULL, &vk_framebuffer))) < 0)
+ {
+ WARN("Failed to create Vulkan framebuffer, vr %d.\n", vr);
+ return false;
+ }
+
+ if (!d3d12_command_allocator_add_framebuffer(list->allocator, vk_framebuffer))
+ {
+ WARN("Failed to add framebuffer.\n");
+ VK_CALL(vkDestroyFramebuffer(device->vk_device, vk_framebuffer, NULL));
+ return false;
+ }
+
+ list->current_framebuffer = vk_framebuffer;
+
+ return true;
+}
+
+static bool d3d12_command_list_update_compute_pipeline(struct d3d12_command_list *list)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+
+ if (list->current_pipeline != VK_NULL_HANDLE)
+ return true;
+
+ if (!d3d12_pipeline_state_is_compute(list->state))
+ {
+ WARN("Pipeline state %p is not a compute pipeline.\n", list->state);
+ return false;
+ }
+
+ VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, list->state->vk_bind_point, list->state->u.compute.vk_pipeline));
+ list->current_pipeline = list->state->u.compute.vk_pipeline;
+
+ return true;
+}
+
+static bool d3d12_command_list_update_graphics_pipeline(struct d3d12_command_list *list)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ VkRenderPass vk_render_pass;
+ VkPipeline vk_pipeline;
+
+ if (list->current_pipeline != VK_NULL_HANDLE)
+ return true;
+
+ if (!d3d12_pipeline_state_is_graphics(list->state))
+ {
+ WARN("Pipeline state %p is not a graphics pipeline.\n", list->state);
+ return false;
+ }
+
+ if (!(vk_pipeline = d3d12_pipeline_state_get_or_create_pipeline(list->state,
+ list->primitive_topology, list->strides, list->dsv_format, &vk_render_pass)))
+ return false;
+
+ /* The render pass cache ensures that we use the same Vulkan render pass
+ * object for compatible render passes. */
+ if (list->pso_render_pass != vk_render_pass)
+ {
+ list->pso_render_pass = vk_render_pass;
+ d3d12_command_list_invalidate_current_framebuffer(list);
+ d3d12_command_list_invalidate_current_render_pass(list);
+ }
+
+ VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, list->state->vk_bind_point, vk_pipeline));
+ list->current_pipeline = vk_pipeline;
+
+ return true;
+}
+
+static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point)
+{
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+ const struct d3d12_root_signature *root_signature = bindings->root_signature;
+
+ if (bindings->descriptor_set && !bindings->in_use)
+ return;
+
+ /* We cannot modify bound descriptor sets. We need a new descriptor set if
+ * we are about to update resource bindings.
+ *
+ * The Vulkan spec says:
+ *
+ * "The descriptor set contents bound by a call to
+ * vkCmdBindDescriptorSets may be consumed during host execution of the
+ * command, or during shader execution of the resulting draws, or any
+ * time in between. Thus, the contents must not be altered (overwritten
+ * by an update command, or freed) between when the command is recorded
+ * and when the command completes executing on the queue."
+ */
+ bindings->descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator,
+ root_signature->vk_set_layout);
+ bindings->in_use = false;
+
+ bindings->descriptor_table_dirty_mask |= bindings->descriptor_table_active_mask & root_signature->descriptor_table_mask;
+ bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask & root_signature->push_descriptor_mask;
+}
+
+static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_descriptor_write,
+ VkDescriptorImageInfo *vk_image_info, const struct d3d12_desc *descriptor,
+ uint32_t descriptor_range_magic, VkDescriptorSet vk_descriptor_set,
+ uint32_t vk_binding, unsigned int index)
+{
+ const struct vkd3d_view *view = descriptor->u.view;
+
+ if (descriptor->magic != descriptor_range_magic)
+ return false;
+
+ vk_descriptor_write->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+ vk_descriptor_write->pNext = NULL;
+ vk_descriptor_write->dstSet = vk_descriptor_set;
+ vk_descriptor_write->dstBinding = vk_binding + index;
+ vk_descriptor_write->dstArrayElement = 0;
+ vk_descriptor_write->descriptorCount = 1;
+ vk_descriptor_write->descriptorType = descriptor->vk_descriptor_type;
+ vk_descriptor_write->pImageInfo = NULL;
+ vk_descriptor_write->pBufferInfo = NULL;
+ vk_descriptor_write->pTexelBufferView = NULL;
+
+ switch (descriptor->magic)
+ {
+ case VKD3D_DESCRIPTOR_MAGIC_CBV:
+ vk_descriptor_write->pBufferInfo = &descriptor->u.vk_cbv_info;
+ break;
+
+ case VKD3D_DESCRIPTOR_MAGIC_SRV:
+ case VKD3D_DESCRIPTOR_MAGIC_UAV:
+ /* We use separate bindings for buffer and texture SRVs/UAVs.
+ * See d3d12_root_signature_init(). */
+ vk_descriptor_write->dstBinding = vk_binding + 2 * index;
+ if (descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER
+ && descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER)
+ ++vk_descriptor_write->dstBinding;
+
+ if (descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER
+ || descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER)
+ {
+ vk_descriptor_write->pTexelBufferView = &view->u.vk_buffer_view;
+ }
+ else
+ {
+ vk_image_info->sampler = VK_NULL_HANDLE;
+ vk_image_info->imageView = view->u.vk_image_view;
+ vk_image_info->imageLayout = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV
+ ? VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_GENERAL;
+
+ vk_descriptor_write->pImageInfo = vk_image_info;
+ }
+ break;
+
+ case VKD3D_DESCRIPTOR_MAGIC_SAMPLER:
+ vk_image_info->sampler = view->u.vk_sampler;
+ vk_image_info->imageView = VK_NULL_HANDLE;
+ vk_image_info->imageLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+
+ vk_descriptor_write->pImageInfo = vk_image_info;
+ break;
+
+ default:
+ ERR("Invalid descriptor %#x.\n", descriptor->magic);
+ return false;
+ }
+
+ return true;
+}
+
+static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor)
+{
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+ struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write;
+ const struct d3d12_root_signature *root_signature = bindings->root_signature;
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ struct VkDescriptorImageInfo image_infos[24], *current_image_info;
+ const struct d3d12_root_descriptor_table *descriptor_table;
+ const struct d3d12_root_descriptor_table_range *range;
+ VkDevice vk_device = list->device->vk_device;
+ unsigned int i, j, descriptor_count;
+ struct d3d12_desc *descriptor;
+
+ descriptor_table = root_signature_get_descriptor_table(root_signature, index);
+
+ descriptor = base_descriptor;
+ descriptor_count = 0;
+ current_descriptor_write = descriptor_writes;
+ current_image_info = image_infos;
+ for (i = 0; i < descriptor_table->range_count; ++i)
+ {
+ range = &descriptor_table->ranges[i];
+
+ if (range->offset != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND)
+ {
+ descriptor = base_descriptor + range->offset;
+ }
+
+ for (j = 0; j < range->descriptor_count; ++j, ++descriptor)
+ {
+ unsigned int register_idx = range->base_register_idx + j;
+
+ /* Track UAV counters. */
+ if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV
+ && register_idx < ARRAY_SIZE(bindings->vk_uav_counter_views))
+ {
+ VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV
+ ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE;
+ if (bindings->vk_uav_counter_views[register_idx] != vk_counter_view)
+ bindings->uav_counter_dirty_mask |= 1u << register_idx;
+ bindings->vk_uav_counter_views[register_idx] = vk_counter_view;
+ }
+
+ if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write,
+ current_image_info, descriptor, range->descriptor_magic,
+ bindings->descriptor_set, range->binding, j))
+ continue;
+
+ ++descriptor_count;
+ ++current_descriptor_write;
+ ++current_image_info;
+
+ if (descriptor_count == ARRAY_SIZE(descriptor_writes))
+ {
+ VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL));
+ descriptor_count = 0;
+ current_descriptor_write = descriptor_writes;
+ current_image_info = image_infos;
+ }
+ }
+ }
+
+ VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL));
+}
+
+static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *vk_descriptor_write,
+ const struct d3d12_root_parameter *root_parameter, VkDescriptorSet vk_descriptor_set,
+ VkBufferView *vk_buffer_view, const VkDescriptorBufferInfo *vk_buffer_info)
+{
+ const struct d3d12_root_descriptor *root_descriptor;
+
+ switch (root_parameter->parameter_type)
+ {
+ case D3D12_ROOT_PARAMETER_TYPE_CBV:
+ vk_descriptor_write->descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+ break;
+ case D3D12_ROOT_PARAMETER_TYPE_SRV:
+ vk_descriptor_write->descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
+ break;
+ case D3D12_ROOT_PARAMETER_TYPE_UAV:
+ vk_descriptor_write->descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
+ break;
+ default:
+ ERR("Invalid root descriptor %#x.\n", root_parameter->parameter_type);
+ return false;
+ }
+
+ root_descriptor = &root_parameter->u.descriptor;
+
+ vk_descriptor_write->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+ vk_descriptor_write->pNext = NULL;
+ vk_descriptor_write->dstSet = vk_descriptor_set;
+ vk_descriptor_write->dstBinding = root_descriptor->binding;
+ vk_descriptor_write->dstArrayElement = 0;
+ vk_descriptor_write->descriptorCount = 1;
+ vk_descriptor_write->pImageInfo = NULL;
+ vk_descriptor_write->pBufferInfo = vk_buffer_info;
+ vk_descriptor_write->pTexelBufferView = vk_buffer_view;
+
+ return true;
+}
+
+static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point)
+{
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+ const struct d3d12_root_signature *root_signature = bindings->root_signature;
+ VkWriteDescriptorSet *descriptor_writes = NULL, *current_descriptor_write;
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ VkDescriptorBufferInfo *buffer_infos = NULL, *current_buffer_info;
+ const struct d3d12_root_parameter *root_parameter;
+ struct vkd3d_push_descriptor *push_descriptor;
+ struct d3d12_device *device = list->device;
+ VkDescriptorBufferInfo *vk_buffer_info;
+ unsigned int i, descriptor_count;
+ VkBufferView *vk_buffer_view;
+
+ if (!bindings->push_descriptor_dirty_mask)
+ return;
+
+ descriptor_count = vkd3d_popcount(bindings->push_descriptor_dirty_mask);
+
+ if (!(descriptor_writes = vkd3d_calloc(descriptor_count, sizeof(*descriptor_writes))))
+ return;
+ if (!(buffer_infos = vkd3d_calloc(descriptor_count, sizeof(*buffer_infos))))
+ goto done;
+
+ descriptor_count = 0;
+ current_buffer_info = buffer_infos;
+ current_descriptor_write = descriptor_writes;
+ for (i = 0; i < ARRAY_SIZE(bindings->push_descriptors); ++i)
+ {
+ if (!(bindings->push_descriptor_dirty_mask & (1u << i)))
+ continue;
+
+ root_parameter = root_signature_get_root_descriptor(root_signature, i);
+ push_descriptor = &bindings->push_descriptors[i];
+
+ if (root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV)
+ {
+ vk_buffer_view = NULL;
+ vk_buffer_info = current_buffer_info;
+ vk_buffer_info->buffer = push_descriptor->u.cbv.vk_buffer;
+ vk_buffer_info->offset = push_descriptor->u.cbv.offset;
+ vk_buffer_info->range = VK_WHOLE_SIZE;
+ }
+ else
+ {
+ vk_buffer_view = &push_descriptor->u.vk_buffer_view;
+ vk_buffer_info = NULL;
+ }
+
+ if (!vk_write_descriptor_set_from_root_descriptor(current_descriptor_write,
+ root_parameter, bindings->descriptor_set, vk_buffer_view, vk_buffer_info))
+ continue;
+
+ ++descriptor_count;
+ ++current_descriptor_write;
+ ++current_buffer_info;
+ }
+
+ VK_CALL(vkUpdateDescriptorSets(device->vk_device, descriptor_count, descriptor_writes, 0, NULL));
+ bindings->push_descriptor_dirty_mask = 0;
+
+done:
+ vkd3d_free(descriptor_writes);
+ vkd3d_free(buffer_infos);
+}
+
+static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point)
+{
+ VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS];
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ const struct d3d12_pipeline_state *state = list->state;
+ VkDevice vk_device = list->device->vk_device;
+ VkDescriptorSet vk_descriptor_set;
+ unsigned int uav_counter_count;
+ unsigned int i;
+
+ if (!state || !(state->uav_counter_mask & bindings->uav_counter_dirty_mask))
+ return;
+
+ uav_counter_count = vkd3d_popcount(state->uav_counter_mask);
+ assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes));
+
+ vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout);
+ if (!vk_descriptor_set)
+ return;
+
+ for (i = 0; i < uav_counter_count; ++i)
+ {
+ const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i];
+ const VkBufferView *vk_uav_counter_views = bindings->vk_uav_counter_views;
+
+ assert(vk_uav_counter_views[uav_counter->register_index]);
+
+ vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+ vk_descriptor_writes[i].pNext = NULL;
+ vk_descriptor_writes[i].dstSet = vk_descriptor_set;
+ vk_descriptor_writes[i].dstBinding = uav_counter->binding.binding;
+ vk_descriptor_writes[i].dstArrayElement = 0;
+ vk_descriptor_writes[i].descriptorCount = 1;
+ vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
+ vk_descriptor_writes[i].pImageInfo = NULL;
+ vk_descriptor_writes[i].pBufferInfo = NULL;
+ vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index];
+ }
+
+ VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL));
+
+ VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point,
+ state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL));
+
+ bindings->uav_counter_dirty_mask = 0;
+}
+
+static void d3d12_command_list_update_descriptors(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point)
+{
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ const struct d3d12_root_signature *rs = bindings->root_signature;
+ struct d3d12_desc *base_descriptor;
+ unsigned int i;
+
+ if (!rs || !rs->vk_set_layout)
+ return;
+
+ if (bindings->descriptor_table_dirty_mask || bindings->push_descriptor_dirty_mask)
+ d3d12_command_list_prepare_descriptors(list, bind_point);
+
+ for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i)
+ {
+ if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i))
+ {
+ if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i])))
+ d3d12_command_list_update_descriptor_table(list, bind_point, i, base_descriptor);
+ else
+ WARN("Descriptor table %u is not set.\n", i);
+ }
+ }
+ bindings->descriptor_table_dirty_mask = 0;
+
+ d3d12_command_list_update_push_descriptors(list, bind_point);
+
+ if (bindings->descriptor_set)
+ {
+ VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point,
+ rs->vk_pipeline_layout, rs->main_set, 1, &bindings->descriptor_set, 0, NULL));
+ bindings->in_use = true;
+ }
+
+ d3d12_command_list_update_uav_counter_descriptors(list, bind_point);
+}
+
+static bool d3d12_command_list_update_compute_state(struct d3d12_command_list *list)
+{
+ d3d12_command_list_end_current_render_pass(list);
+
+ if (!d3d12_command_list_update_compute_pipeline(list))
+ return false;
+
+ d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_COMPUTE);
+
+ return true;
+}
+
+static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ struct d3d12_graphics_pipeline_state *graphics;
+ struct VkRenderPassBeginInfo begin_desc;
+ VkRenderPass vk_render_pass;
+
+ if (!d3d12_command_list_update_graphics_pipeline(list))
+ return false;
+ if (!d3d12_command_list_update_current_framebuffer(list))
+ return false;
+
+ d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_GRAPHICS);
+
+ if (list->current_render_pass != VK_NULL_HANDLE)
+ return true;
+
+ vk_render_pass = list->pso_render_pass;
+ assert(vk_render_pass);
+
+ begin_desc.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
+ begin_desc.pNext = NULL;
+ begin_desc.renderPass = vk_render_pass;
+ begin_desc.framebuffer = list->current_framebuffer;
+ begin_desc.renderArea.offset.x = 0;
+ begin_desc.renderArea.offset.y = 0;
+ d3d12_command_list_get_fb_extent(list,
+ &begin_desc.renderArea.extent.width, &begin_desc.renderArea.extent.height, NULL);
+ begin_desc.clearValueCount = 0;
+ begin_desc.pClearValues = NULL;
+ VK_CALL(vkCmdBeginRenderPass(list->vk_command_buffer, &begin_desc, VK_SUBPASS_CONTENTS_INLINE));
+
+ list->current_render_pass = vk_render_pass;
+
+ graphics = &list->state->u.graphics;
+ if (graphics->xfb_enabled)
+ {
+ VK_CALL(vkCmdBeginTransformFeedbackEXT(list->vk_command_buffer, 0, ARRAY_SIZE(list->so_counter_buffers),
+ list->so_counter_buffers, list->so_counter_buffer_offsets));
+
+ list->xfb_enabled = true;
+ }
+
+ return true;
+}
+
+static void d3d12_command_list_check_index_buffer_strip_cut_value(struct d3d12_command_list *list)
+{
+ struct d3d12_graphics_pipeline_state *graphics = &list->state->u.graphics;
+
+ /* In Vulkan, the strip cut value is derived from the index buffer format. */
+ switch (graphics->index_buffer_strip_cut_value)
+ {
+ case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF:
+ if (list->index_buffer_format != DXGI_FORMAT_R16_UINT)
+ {
+ FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n",
+ list->index_buffer_format);
+ }
+ break;
+
+ case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF:
+ if (list->index_buffer_format != DXGI_FORMAT_R32_UINT)
+ {
+ FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n",
+ list->index_buffer_format);
+ }
+ break;
+
+ default:
+ break;
+ }
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCommandList1 *iface,
+ UINT vertex_count_per_instance, UINT instance_count, UINT start_vertex_location,
+ UINT start_instance_location)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+
+ TRACE("iface %p, vertex_count_per_instance %u, instance_count %u, "
+ "start_vertex_location %u, start_instance_location %u.\n",
+ iface, vertex_count_per_instance, instance_count,
+ start_vertex_location, start_instance_location);
+
+ vk_procs = &list->device->vk_procs;
+
+ if (!d3d12_command_list_begin_render_pass(list))
+ {
+ WARN("Failed to begin render pass, ignoring draw call.\n");
+ return;
+ }
+
+ VK_CALL(vkCmdDraw(list->vk_command_buffer, vertex_count_per_instance,
+ instance_count, start_vertex_location, start_instance_location));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12GraphicsCommandList1 *iface,
+ UINT index_count_per_instance, UINT instance_count, UINT start_vertex_location,
+ INT base_vertex_location, UINT start_instance_location)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+
+ TRACE("iface %p, index_count_per_instance %u, instance_count %u, start_vertex_location %u, "
+ "base_vertex_location %d, start_instance_location %u.\n",
+ iface, index_count_per_instance, instance_count, start_vertex_location,
+ base_vertex_location, start_instance_location);
+
+ if (!d3d12_command_list_begin_render_pass(list))
+ {
+ WARN("Failed to begin render pass, ignoring draw call.\n");
+ return;
+ }
+
+ vk_procs = &list->device->vk_procs;
+
+ d3d12_command_list_check_index_buffer_strip_cut_value(list);
+
+ VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance,
+ instance_count, start_vertex_location, base_vertex_location, start_instance_location));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandList1 *iface,
+ UINT x, UINT y, UINT z)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+
+ TRACE("iface %p, x %u, y %u, z %u.\n", iface, x, y, z);
+
+ if (!d3d12_command_list_update_compute_state(list))
+ {
+ WARN("Failed to update compute state, ignoring dispatch.\n");
+ return;
+ }
+
+ vk_procs = &list->device->vk_procs;
+
+ VK_CALL(vkCmdDispatch(list->vk_command_buffer, x, y, z));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12GraphicsCommandList1 *iface,
+ ID3D12Resource *dst, UINT64 dst_offset, ID3D12Resource *src, UINT64 src_offset, UINT64 byte_count)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_resource *dst_resource, *src_resource;
+ const struct vkd3d_vk_device_procs *vk_procs;
+ VkBufferCopy buffer_copy;
+
+ TRACE("iface %p, dst_resource %p, dst_offset %#"PRIx64", src_resource %p, "
+ "src_offset %#"PRIx64", byte_count %#"PRIx64".\n",
+ iface, dst, dst_offset, src, src_offset, byte_count);
+
+ vk_procs = &list->device->vk_procs;
+
+ dst_resource = unsafe_impl_from_ID3D12Resource(dst);
+ assert(d3d12_resource_is_buffer(dst_resource));
+ src_resource = unsafe_impl_from_ID3D12Resource(src);
+ assert(d3d12_resource_is_buffer(src_resource));
+
+ d3d12_command_list_track_resource_usage(list, dst_resource);
+ d3d12_command_list_track_resource_usage(list, src_resource);
+
+ d3d12_command_list_end_current_render_pass(list);
+
+ buffer_copy.srcOffset = src_offset;
+ buffer_copy.dstOffset = dst_offset;
+ buffer_copy.size = byte_count;
+
+ VK_CALL(vkCmdCopyBuffer(list->vk_command_buffer,
+ src_resource->u.vk_buffer, dst_resource->u.vk_buffer, 1, &buffer_copy));
+}
+
+static void vk_image_subresource_layers_from_d3d12(VkImageSubresourceLayers *subresource,
+ const struct vkd3d_format *format, unsigned int sub_resource_idx, unsigned int miplevel_count)
+{
+ subresource->aspectMask = format->vk_aspect_mask;
+ subresource->mipLevel = sub_resource_idx % miplevel_count;
+ subresource->baseArrayLayer = sub_resource_idx / miplevel_count;
+ subresource->layerCount = 1;
+}
+
+static void vk_extent_3d_from_d3d12_miplevel(VkExtent3D *extent,
+ const D3D12_RESOURCE_DESC *resource_desc, unsigned int miplevel_idx)
+{
+ extent->width = d3d12_resource_desc_get_width(resource_desc, miplevel_idx);
+ extent->height = d3d12_resource_desc_get_height(resource_desc, miplevel_idx);
+ extent->depth = d3d12_resource_desc_get_depth(resource_desc, miplevel_idx);
+}
+
+static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *copy,
+ const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *footprint, unsigned int sub_resource_idx,
+ const D3D12_RESOURCE_DESC *image_desc, const struct vkd3d_format *format,
+ const D3D12_BOX *src_box, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z)
+{
+ copy->bufferOffset = footprint->Offset;
+ if (src_box)
+ {
+ VkDeviceSize row_count = footprint->Footprint.Height / format->block_height;
+ copy->bufferOffset += vkd3d_format_get_data_offset(format, footprint->Footprint.RowPitch,
+ row_count * footprint->Footprint.RowPitch, src_box->left, src_box->top, src_box->front);
+ }
+ copy->bufferRowLength = footprint->Footprint.RowPitch /
+ (format->byte_count * format->block_byte_count) * format->block_width;
+ copy->bufferImageHeight = footprint->Footprint.Height;
+ vk_image_subresource_layers_from_d3d12(©->imageSubresource,
+ format, sub_resource_idx, image_desc->MipLevels);
+ copy->imageOffset.x = dst_x;
+ copy->imageOffset.y = dst_y;
+ copy->imageOffset.z = dst_z;
+
+ vk_extent_3d_from_d3d12_miplevel(©->imageExtent, image_desc,
+ copy->imageSubresource.mipLevel);
+ copy->imageExtent.width -= copy->imageOffset.x;
+ copy->imageExtent.height -= copy->imageOffset.y;
+ copy->imageExtent.depth -= copy->imageOffset.z;
+
+ if (src_box)
+ {
+ copy->imageExtent.width = min(copy->imageExtent.width, src_box->right - src_box->left);
+ copy->imageExtent.height = min(copy->imageExtent.height, src_box->bottom - src_box->top);
+ copy->imageExtent.depth = min(copy->imageExtent.depth, src_box->back - src_box->front);
+ }
+ else
+ {
+ copy->imageExtent.width = min(copy->imageExtent.width, footprint->Footprint.Width);
+ copy->imageExtent.height = min(copy->imageExtent.height, footprint->Footprint.Height);
+ copy->imageExtent.depth = min(copy->imageExtent.depth, footprint->Footprint.Depth);
+ }
+}
+
+static void vk_image_buffer_copy_from_d3d12(VkBufferImageCopy *copy,
+ const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *footprint, unsigned int sub_resource_idx,
+ const D3D12_RESOURCE_DESC *image_desc, const struct vkd3d_format *format,
+ const D3D12_BOX *src_box, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z)
+{
+ VkDeviceSize row_count = footprint->Footprint.Height / format->block_height;
+
+ copy->bufferOffset = footprint->Offset + vkd3d_format_get_data_offset(format,
+ footprint->Footprint.RowPitch, row_count * footprint->Footprint.RowPitch, dst_x, dst_y, dst_z);
+ copy->bufferRowLength = footprint->Footprint.RowPitch /
+ (format->byte_count * format->block_byte_count) * format->block_width;
+ copy->bufferImageHeight = footprint->Footprint.Height;
+ vk_image_subresource_layers_from_d3d12(©->imageSubresource,
+ format, sub_resource_idx, image_desc->MipLevels);
+ copy->imageOffset.x = src_box ? src_box->left : 0;
+ copy->imageOffset.y = src_box ? src_box->top : 0;
+ copy->imageOffset.z = src_box ? src_box->front : 0;
+ if (src_box)
+ {
+ copy->imageExtent.width = src_box->right - src_box->left;
+ copy->imageExtent.height = src_box->bottom - src_box->top;
+ copy->imageExtent.depth = src_box->back - src_box->front;
+ }
+ else
+ {
+ unsigned int miplevel = copy->imageSubresource.mipLevel;
+ vk_extent_3d_from_d3d12_miplevel(©->imageExtent, image_desc, miplevel);
+ }
+}
+
+static void vk_image_copy_from_d3d12(VkImageCopy *image_copy,
+ unsigned int src_sub_resource_idx, unsigned int dst_sub_resource_idx,
+ const D3D12_RESOURCE_DESC *src_desc, const D3D12_RESOURCE_DESC *dst_desc,
+ const struct vkd3d_format *src_format, const struct vkd3d_format *dst_format,
+ const D3D12_BOX *src_box, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z)
+{
+ vk_image_subresource_layers_from_d3d12(&image_copy->srcSubresource,
+ src_format, src_sub_resource_idx, src_desc->MipLevels);
+ image_copy->srcOffset.x = src_box ? src_box->left : 0;
+ image_copy->srcOffset.y = src_box ? src_box->top : 0;
+ image_copy->srcOffset.z = src_box ? src_box->front : 0;
+ vk_image_subresource_layers_from_d3d12(&image_copy->dstSubresource,
+ dst_format, dst_sub_resource_idx, dst_desc->MipLevels);
+ image_copy->dstOffset.x = dst_x;
+ image_copy->dstOffset.y = dst_y;
+ image_copy->dstOffset.z = dst_z;
+ if (src_box)
+ {
+ image_copy->extent.width = src_box->right - src_box->left;
+ image_copy->extent.height = src_box->bottom - src_box->top;
+ image_copy->extent.depth = src_box->back - src_box->front;
+ }
+ else
+ {
+ unsigned int miplevel = image_copy->srcSubresource.mipLevel;
+ vk_extent_3d_from_d3d12_miplevel(&image_copy->extent, src_desc, miplevel);
+ }
+}
+
+static HRESULT d3d12_command_list_allocate_transfer_buffer(struct d3d12_command_list *list,
+ VkDeviceSize size, struct vkd3d_buffer *buffer)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ struct d3d12_device *device = list->device;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_RESOURCE_DESC buffer_desc;
+ HRESULT hr;
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+
+ buffer_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
+ buffer_desc.Alignment = 0;
+ buffer_desc.Width = size;
+ buffer_desc.Height = 1;
+ buffer_desc.DepthOrArraySize = 1;
+ buffer_desc.MipLevels = 1;
+ buffer_desc.Format = DXGI_FORMAT_UNKNOWN;
+ buffer_desc.SampleDesc.Count = 1;
+ buffer_desc.SampleDesc.Quality = 0;
+ buffer_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
+ buffer_desc.Flags = D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE;
+
+ if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &buffer_desc, &buffer->vk_buffer)))
+ return hr;
+ if (FAILED(hr = vkd3d_allocate_buffer_memory(device, buffer->vk_buffer,
+ &heap_properties, D3D12_HEAP_FLAG_NONE, &buffer->vk_memory, NULL, NULL)))
+ {
+ VK_CALL(vkDestroyBuffer(device->vk_device, buffer->vk_buffer, NULL));
+ return hr;
+ }
+
+ if (!d3d12_command_allocator_add_transfer_buffer(list->allocator, buffer))
+ {
+ ERR("Failed to add transfer buffer.\n");
+ vkd3d_buffer_destroy(buffer, device);
+ return E_OUTOFMEMORY;
+ }
+
+ return S_OK;
+}
+
+/* In Vulkan, each depth/stencil format is only compatible with itself.
+ * This means that we are not allowed to copy texture regions directly between
+ * depth/stencil and color formats.
+ *
+ * FIXME: Implement color <-> depth/stencil blits in shaders.
+ */
+static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_command_list *list,
+ struct d3d12_resource *dst_resource, unsigned int dst_sub_resource_idx,
+ const struct vkd3d_format *dst_format, struct d3d12_resource *src_resource,
+ unsigned int src_sub_resource_idx, const struct vkd3d_format *src_format)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ const D3D12_RESOURCE_DESC *dst_desc = &dst_resource->desc;
+ const D3D12_RESOURCE_DESC *src_desc = &src_resource->desc;
+ unsigned int dst_miplevel_idx, src_miplevel_idx;
+ struct vkd3d_buffer transfer_buffer;
+ VkBufferImageCopy buffer_image_copy;
+ VkBufferMemoryBarrier vk_barrier;
+ VkDeviceSize buffer_size;
+ HRESULT hr;
+
+ WARN("Copying incompatible texture formats %#x, %#x -> %#x, %#x.\n",
+ src_format->dxgi_format, src_format->vk_format,
+ dst_format->dxgi_format, dst_format->vk_format);
+
+ assert(d3d12_resource_is_texture(dst_resource));
+ assert(d3d12_resource_is_texture(src_resource));
+ assert(!vkd3d_format_is_compressed(dst_format));
+ assert(!vkd3d_format_is_compressed(src_format));
+ assert(dst_format->byte_count == src_format->byte_count);
+
+ buffer_image_copy.bufferOffset = 0;
+ buffer_image_copy.bufferRowLength = 0;
+ buffer_image_copy.bufferImageHeight = 0;
+ vk_image_subresource_layers_from_d3d12(&buffer_image_copy.imageSubresource,
+ src_format, src_sub_resource_idx, src_desc->MipLevels);
+ src_miplevel_idx = buffer_image_copy.imageSubresource.mipLevel;
+ buffer_image_copy.imageOffset.x = 0;
+ buffer_image_copy.imageOffset.y = 0;
+ buffer_image_copy.imageOffset.z = 0;
+ vk_extent_3d_from_d3d12_miplevel(&buffer_image_copy.imageExtent, src_desc, src_miplevel_idx);
+
+ buffer_size = src_format->byte_count * buffer_image_copy.imageExtent.width *
+ buffer_image_copy.imageExtent.height * buffer_image_copy.imageExtent.depth;
+ if (FAILED(hr = d3d12_command_list_allocate_transfer_buffer(list, buffer_size, &transfer_buffer)))
+ {
+ ERR("Failed to allocate transfer buffer, hr %#x.\n", hr);
+ return;
+ }
+
+ VK_CALL(vkCmdCopyImageToBuffer(list->vk_command_buffer,
+ src_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+ transfer_buffer.vk_buffer, 1, &buffer_image_copy));
+
+ vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
+ vk_barrier.pNext = NULL;
+ vk_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+ vk_barrier.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
+ vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+ vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+ vk_barrier.buffer = transfer_buffer.vk_buffer;
+ vk_barrier.offset = 0;
+ vk_barrier.size = VK_WHOLE_SIZE;
+ VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer,
+ VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0,
+ 0, NULL, 1, &vk_barrier, 0, NULL));
+
+ vk_image_subresource_layers_from_d3d12(&buffer_image_copy.imageSubresource,
+ dst_format, dst_sub_resource_idx, dst_desc->MipLevels);
+ dst_miplevel_idx = buffer_image_copy.imageSubresource.mipLevel;
+
+ assert(d3d12_resource_desc_get_width(src_desc, src_miplevel_idx) ==
+ d3d12_resource_desc_get_width(dst_desc, dst_miplevel_idx));
+ assert(d3d12_resource_desc_get_height(src_desc, src_miplevel_idx) ==
+ d3d12_resource_desc_get_height(dst_desc, dst_miplevel_idx));
+ assert(d3d12_resource_desc_get_depth(src_desc, src_miplevel_idx) ==
+ d3d12_resource_desc_get_depth(dst_desc, dst_miplevel_idx));
+
+ VK_CALL(vkCmdCopyBufferToImage(list->vk_command_buffer,
+ transfer_buffer.vk_buffer, dst_resource->u.vk_image,
+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &buffer_image_copy));
+}
+
+static bool validate_d3d12_box(const D3D12_BOX *box)
+{
+ return box->right > box->left
+ && box->bottom > box->top
+ && box->back > box->front;
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12GraphicsCommandList1 *iface,
+ const D3D12_TEXTURE_COPY_LOCATION *dst, UINT dst_x, UINT dst_y, UINT dst_z,
+ const D3D12_TEXTURE_COPY_LOCATION *src, const D3D12_BOX *src_box)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_resource *dst_resource, *src_resource;
+ const struct vkd3d_format *src_format, *dst_format;
+ const struct vkd3d_vk_device_procs *vk_procs;
+ VkBufferImageCopy buffer_image_copy;
+ VkImageCopy image_copy;
+
+ TRACE("iface %p, dst %p, dst_x %u, dst_y %u, dst_z %u, src %p, src_box %p.\n",
+ iface, dst, dst_x, dst_y, dst_z, src, src_box);
+
+ if (src_box && !validate_d3d12_box(src_box))
+ {
+ WARN("Empty box %s.\n", debug_d3d12_box(src_box));
+ return;
+ }
+
+ vk_procs = &list->device->vk_procs;
+
+ dst_resource = unsafe_impl_from_ID3D12Resource(dst->pResource);
+ src_resource = unsafe_impl_from_ID3D12Resource(src->pResource);
+
+ d3d12_command_list_track_resource_usage(list, dst_resource);
+ d3d12_command_list_track_resource_usage(list, src_resource);
+
+ d3d12_command_list_end_current_render_pass(list);
+
+ if (src->Type == D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX
+ && dst->Type == D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT)
+ {
+ assert(d3d12_resource_is_buffer(dst_resource));
+ assert(d3d12_resource_is_texture(src_resource));
+
+ if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device,
+ &src_resource->desc, dst->u.PlacedFootprint.Footprint.Format)))
+ {
+ WARN("Invalid format %#x.\n", dst->u.PlacedFootprint.Footprint.Format);
+ return;
+ }
+
+ if (dst_format->is_emulated)
+ {
+ FIXME("Format %#x is not supported yet.\n", dst_format->dxgi_format);
+ return;
+ }
+
+ if ((dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT)
+ && (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT))
+ FIXME("Depth-stencil format %#x not fully supported yet.\n", dst_format->dxgi_format);
+
+ vk_image_buffer_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint,
+ src->u.SubresourceIndex, &src_resource->desc, dst_format, src_box, dst_x, dst_y, dst_z);
+ VK_CALL(vkCmdCopyImageToBuffer(list->vk_command_buffer,
+ src_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+ dst_resource->u.vk_buffer, 1, &buffer_image_copy));
+ }
+ else if (src->Type == D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT
+ && dst->Type == D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX)
+ {
+ assert(d3d12_resource_is_texture(dst_resource));
+ assert(d3d12_resource_is_buffer(src_resource));
+
+ if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device,
+ &dst_resource->desc, src->u.PlacedFootprint.Footprint.Format)))
+ {
+ WARN("Invalid format %#x.\n", src->u.PlacedFootprint.Footprint.Format);
+ return;
+ }
+
+ if (src_format->is_emulated)
+ {
+ FIXME("Format %#x is not supported yet.\n", src_format->dxgi_format);
+ return;
+ }
+
+ if ((src_format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT)
+ && (src_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT))
+ FIXME("Depth-stencil format %#x not fully supported yet.\n", src_format->dxgi_format);
+
+ vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &src->u.PlacedFootprint,
+ dst->u.SubresourceIndex, &dst_resource->desc, src_format, src_box, dst_x, dst_y, dst_z);
+ VK_CALL(vkCmdCopyBufferToImage(list->vk_command_buffer,
+ src_resource->u.vk_buffer, dst_resource->u.vk_image,
+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &buffer_image_copy));
+ }
+ else if (src->Type == D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX
+ && dst->Type == D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX)
+ {
+ assert(d3d12_resource_is_texture(dst_resource));
+ assert(d3d12_resource_is_texture(src_resource));
+
+ if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device,
+ &dst_resource->desc, DXGI_FORMAT_UNKNOWN)))
+ {
+ WARN("Invalid format %#x.\n", dst_resource->desc.Format);
+ return;
+ }
+ if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device,
+ &src_resource->desc, DXGI_FORMAT_UNKNOWN)))
+ {
+ WARN("Invalid format %#x.\n", src_resource->desc.Format);
+ return;
+ }
+
+ if ((dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT)
+ && (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT))
+ FIXME("Depth-stencil format %#x not fully supported yet.\n", dst_format->dxgi_format);
+ if ((src_format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT)
+ && (src_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT))
+ FIXME("Depth-stencil format %#x not fully supported yet.\n", src_format->dxgi_format);
+
+ if (dst_format->vk_aspect_mask != src_format->vk_aspect_mask)
+ {
+ d3d12_command_list_copy_incompatible_texture_region(list,
+ dst_resource, dst->u.SubresourceIndex, dst_format,
+ src_resource, src->u.SubresourceIndex, src_format);
+ return;
+ }
+
+ vk_image_copy_from_d3d12(&image_copy, src->u.SubresourceIndex, dst->u.SubresourceIndex,
+ &src_resource->desc, &dst_resource->desc, src_format, dst_format,
+ src_box, dst_x, dst_y, dst_z);
+ VK_CALL(vkCmdCopyImage(list->vk_command_buffer, src_resource->u.vk_image,
+ VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_resource->u.vk_image,
+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &image_copy));
+ }
+ else
+ {
+ FIXME("Copy type %#x -> %#x not implemented.\n", src->Type, dst->Type);
+ }
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsCommandList1 *iface,
+ ID3D12Resource *dst, ID3D12Resource *src)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_resource *dst_resource, *src_resource;
+ const struct vkd3d_format *src_format, *dst_format;
+ const struct vkd3d_vk_device_procs *vk_procs;
+ VkBufferCopy vk_buffer_copy;
+ VkImageCopy vk_image_copy;
+ unsigned int layer_count;
+ unsigned int i;
+
+ TRACE("iface %p, dst_resource %p, src_resource %p.\n", iface, dst, src);
+
+ vk_procs = &list->device->vk_procs;
+
+ dst_resource = unsafe_impl_from_ID3D12Resource(dst);
+ src_resource = unsafe_impl_from_ID3D12Resource(src);
+
+ d3d12_command_list_track_resource_usage(list, dst_resource);
+ d3d12_command_list_track_resource_usage(list, src_resource);
+
+ d3d12_command_list_end_current_render_pass(list);
+
+ if (d3d12_resource_is_buffer(dst_resource))
+ {
+ assert(d3d12_resource_is_buffer(src_resource));
+ assert(src_resource->desc.Width == dst_resource->desc.Width);
+
+ vk_buffer_copy.srcOffset = 0;
+ vk_buffer_copy.dstOffset = 0;
+ vk_buffer_copy.size = dst_resource->desc.Width;
+ VK_CALL(vkCmdCopyBuffer(list->vk_command_buffer,
+ src_resource->u.vk_buffer, dst_resource->u.vk_buffer, 1, &vk_buffer_copy));
+ }
+ else
+ {
+ if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device,
+ &dst_resource->desc, DXGI_FORMAT_UNKNOWN)))
+ {
+ WARN("Invalid format %#x.\n", dst_resource->desc.Format);
+ return;
+ }
+ if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device,
+ &src_resource->desc, DXGI_FORMAT_UNKNOWN)))
+ {
+ WARN("Invalid format %#x.\n", src_resource->desc.Format);
+ return;
+ }
+
+ layer_count = d3d12_resource_desc_get_layer_count(&dst_resource->desc);
+
+ assert(d3d12_resource_is_texture(dst_resource));
+ assert(d3d12_resource_is_texture(src_resource));
+ assert(dst_resource->desc.MipLevels == src_resource->desc.MipLevels);
+ assert(layer_count == d3d12_resource_desc_get_layer_count(&src_resource->desc));
+
+ for (i = 0; i < dst_resource->desc.MipLevels; ++i)
+ {
+ vk_image_copy_from_d3d12(&vk_image_copy, i, i,
+ &src_resource->desc, &dst_resource->desc, src_format, dst_format, NULL, 0, 0, 0);
+ vk_image_copy.dstSubresource.layerCount = layer_count;
+ vk_image_copy.srcSubresource.layerCount = layer_count;
+ VK_CALL(vkCmdCopyImage(list->vk_command_buffer, src_resource->u.vk_image,
+ VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_resource->u.vk_image,
+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &vk_image_copy));
+ }
+ }
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_CopyTiles(ID3D12GraphicsCommandList1 *iface,
+ ID3D12Resource *tiled_resource, const D3D12_TILED_RESOURCE_COORDINATE *tile_region_start_coordinate,
+ const D3D12_TILE_REGION_SIZE *tile_region_size, ID3D12Resource *buffer, UINT64 buffer_offset,
+ D3D12_TILE_COPY_FLAGS flags)
+{
+ FIXME("iface %p, tiled_resource %p, tile_region_start_coordinate %p, tile_region_size %p, "
+ "buffer %p, buffer_offset %#"PRIx64", flags %#x stub!\n",
+ iface, tiled_resource, tile_region_start_coordinate, tile_region_size,
+ buffer, buffer_offset, flags);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12GraphicsCommandList1 *iface,
+ ID3D12Resource *dst, UINT dst_sub_resource_idx,
+ ID3D12Resource *src, UINT src_sub_resource_idx, DXGI_FORMAT format)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct vkd3d_format *src_format, *dst_format, *vk_format;
+ struct d3d12_resource *dst_resource, *src_resource;
+ const struct vkd3d_vk_device_procs *vk_procs;
+ const struct d3d12_device *device;
+ VkImageResolve vk_image_resolve;
+
+ TRACE("iface %p, dst_resource %p, dst_sub_resource_idx %u, src_resource %p, src_sub_resource_idx %u, "
+ "format %#x.\n", iface, dst, dst_sub_resource_idx, src, src_sub_resource_idx, format);
+
+ device = list->device;
+ vk_procs = &device->vk_procs;
+
+ dst_resource = unsafe_impl_from_ID3D12Resource(dst);
+ src_resource = unsafe_impl_from_ID3D12Resource(src);
+
+ assert(d3d12_resource_is_texture(dst_resource));
+ assert(d3d12_resource_is_texture(src_resource));
+
+ d3d12_command_list_track_resource_usage(list, dst_resource);
+ d3d12_command_list_track_resource_usage(list, src_resource);
+
+ d3d12_command_list_end_current_render_pass(list);
+
+ if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(device, &dst_resource->desc, DXGI_FORMAT_UNKNOWN)))
+ {
+ WARN("Invalid format %#x.\n", dst_resource->desc.Format);
+ return;
+ }
+ if (!(src_format = vkd3d_format_from_d3d12_resource_desc(device, &src_resource->desc, DXGI_FORMAT_UNKNOWN)))
+ {
+ WARN("Invalid format %#x.\n", src_resource->desc.Format);
+ return;
+ }
+
+ if (dst_format->type == VKD3D_FORMAT_TYPE_TYPELESS || src_format->type == VKD3D_FORMAT_TYPE_TYPELESS)
+ {
+ if (!(vk_format = vkd3d_format_from_d3d12_resource_desc(device, &dst_resource->desc, format)))
+ {
+ WARN("Invalid format %#x.\n", format);
+ return;
+ }
+ if (dst_format->vk_format != src_format->vk_format || dst_format->vk_format != vk_format->vk_format)
+ {
+ FIXME("Not implemented for typeless resources.\n");
+ return;
+ }
+ }
+
+ /* Resolve of depth/stencil images is not supported in Vulkan. */
+ if ((dst_format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))
+ || (src_format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)))
+ {
+ FIXME("Resolve of depth/stencil images is not implemented yet.\n");
+ return;
+ }
+
+ vk_image_subresource_layers_from_d3d12(&vk_image_resolve.srcSubresource,
+ src_format, src_sub_resource_idx, src_resource->desc.MipLevels);
+ memset(&vk_image_resolve.srcOffset, 0, sizeof(vk_image_resolve.srcOffset));
+ vk_image_subresource_layers_from_d3d12(&vk_image_resolve.dstSubresource,
+ dst_format, dst_sub_resource_idx, dst_resource->desc.MipLevels);
+ memset(&vk_image_resolve.dstOffset, 0, sizeof(vk_image_resolve.dstOffset));
+ vk_extent_3d_from_d3d12_miplevel(&vk_image_resolve.extent,
+ &dst_resource->desc, vk_image_resolve.dstSubresource.mipLevel);
+
+ VK_CALL(vkCmdResolveImage(list->vk_command_buffer, src_resource->u.vk_image,
+ VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_resource->u.vk_image,
+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &vk_image_resolve));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12GraphicsCommandList1 *iface,
+ D3D12_PRIMITIVE_TOPOLOGY topology)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, topology %#x.\n", iface, topology);
+
+ if (topology == D3D_PRIMITIVE_TOPOLOGY_UNDEFINED)
+ {
+ WARN("Ignoring D3D_PRIMITIVE_TOPOLOGY_UNDEFINED.\n");
+ return;
+ }
+
+ if (list->primitive_topology == topology)
+ return;
+
+ list->primitive_topology = topology;
+ d3d12_command_list_invalidate_current_pipeline(list);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCommandList1 *iface,
+ UINT viewport_count, const D3D12_VIEWPORT *viewports)
+{
+ VkViewport vk_viewports[D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+ unsigned int i;
+
+ TRACE("iface %p, viewport_count %u, viewports %p.\n", iface, viewport_count, viewports);
+
+ if (viewport_count > ARRAY_SIZE(vk_viewports))
+ {
+ FIXME("Viewport count %u > D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE.\n", viewport_count);
+ viewport_count = ARRAY_SIZE(vk_viewports);
+ }
+
+ for (i = 0; i < viewport_count; ++i)
+ {
+ vk_viewports[i].x = viewports[i].TopLeftX;
+ vk_viewports[i].y = viewports[i].TopLeftY + viewports[i].Height;
+ vk_viewports[i].width = viewports[i].Width;
+ vk_viewports[i].height = -viewports[i].Height;
+ vk_viewports[i].minDepth = viewports[i].MinDepth;
+ vk_viewports[i].maxDepth = viewports[i].MaxDepth;
+
+ if (!vk_viewports[i].width || !vk_viewports[i].height)
+ {
+ FIXME_ONCE("Invalid viewport %u, ignoring RSSetViewports().\n", i);
+ return;
+ }
+ }
+
+ vk_procs = &list->device->vk_procs;
+ VK_CALL(vkCmdSetViewport(list->vk_command_buffer, 0, viewport_count, vk_viewports));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_RSSetScissorRects(ID3D12GraphicsCommandList1 *iface,
+ UINT rect_count, const D3D12_RECT *rects)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ VkRect2D vk_rects[D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
+ const struct vkd3d_vk_device_procs *vk_procs;
+ unsigned int i;
+
+ TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects);
+
+ if (rect_count > ARRAY_SIZE(vk_rects))
+ {
+ FIXME("Rect count %u > D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE.\n", rect_count);
+ rect_count = ARRAY_SIZE(vk_rects);
+ }
+
+ for (i = 0; i < rect_count; ++i)
+ {
+ vk_rects[i].offset.x = rects[i].left;
+ vk_rects[i].offset.y = rects[i].top;
+ vk_rects[i].extent.width = rects[i].right - rects[i].left;
+ vk_rects[i].extent.height = rects[i].bottom - rects[i].top;
+ }
+
+ vk_procs = &list->device->vk_procs;
+ VK_CALL(vkCmdSetScissor(list->vk_command_buffer, 0, rect_count, vk_rects));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_OMSetBlendFactor(ID3D12GraphicsCommandList1 *iface,
+ const FLOAT blend_factor[4])
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+
+ TRACE("iface %p, blend_factor %p.\n", iface, blend_factor);
+
+ vk_procs = &list->device->vk_procs;
+ VK_CALL(vkCmdSetBlendConstants(list->vk_command_buffer, blend_factor));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_OMSetStencilRef(ID3D12GraphicsCommandList1 *iface,
+ UINT stencil_ref)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+
+ TRACE("iface %p, stencil_ref %u.\n", iface, stencil_ref);
+
+ vk_procs = &list->device->vk_procs;
+ VK_CALL(vkCmdSetStencilReference(list->vk_command_buffer, VK_STENCIL_FRONT_AND_BACK, stencil_ref));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12GraphicsCommandList1 *iface,
+ ID3D12PipelineState *pipeline_state)
+{
+ struct d3d12_pipeline_state *state = unsafe_impl_from_ID3D12PipelineState(pipeline_state);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state);
+
+ if (list->state == state)
+ return;
+
+ d3d12_command_list_invalidate_bindings(list, state);
+ d3d12_command_list_invalidate_current_pipeline(list);
+
+ list->state = state;
+}
+
+static bool is_ds_multiplanar_resolvable(unsigned int first_state, unsigned int second_state)
+{
+ /* Only combinations of depth/stencil read/write are supported. */
+ return first_state == second_state
+ || ((first_state & (D3D12_RESOURCE_STATE_DEPTH_READ | D3D12_RESOURCE_STATE_DEPTH_WRITE))
+ && (second_state & (D3D12_RESOURCE_STATE_DEPTH_READ | D3D12_RESOURCE_STATE_DEPTH_WRITE)));
+}
+
+static unsigned int d3d12_find_ds_multiplanar_transition(const D3D12_RESOURCE_BARRIER *barriers,
+ unsigned int i, unsigned int barrier_count, unsigned int sub_resource_count)
+{
+ unsigned int sub_resource_idx = barriers[i].u.Transition.Subresource;
+ unsigned int j;
+
+ for (j = i + 1; j < barrier_count; ++j)
+ {
+ if (barriers[j].Type == D3D12_RESOURCE_BARRIER_TYPE_TRANSITION
+ && barriers[j].u.Transition.pResource == barriers[i].u.Transition.pResource
+ && sub_resource_idx % sub_resource_count == barriers[j].u.Transition.Subresource % sub_resource_count)
+ {
+ /* Second barrier must be for a different plane. */
+ if (barriers[j].u.Transition.Subresource == sub_resource_idx)
+ return 0;
+
+ /* Validate the second barrier and check if the combination of two states is supported. */
+ if (!is_valid_resource_state(barriers[j].u.Transition.StateBefore)
+ || !is_ds_multiplanar_resolvable(barriers[i].u.Transition.StateBefore, barriers[j].u.Transition.StateBefore)
+ || !is_valid_resource_state(barriers[j].u.Transition.StateAfter)
+ || !is_ds_multiplanar_resolvable(barriers[i].u.Transition.StateAfter, barriers[j].u.Transition.StateAfter)
+ || barriers[j].u.Transition.Subresource >= sub_resource_count * 2u)
+ return 0;
+
+ return j;
+ }
+ }
+ return 0;
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList1 *iface,
+ UINT barrier_count, const D3D12_RESOURCE_BARRIER *barriers)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ bool have_aliasing_barriers = false, have_split_barriers = false;
+ const struct vkd3d_vk_device_procs *vk_procs;
+ const struct vkd3d_vulkan_info *vk_info;
+ bool *multiplanar_handled = NULL;
+ unsigned int i;
+
+ TRACE("iface %p, barrier_count %u, barriers %p.\n", iface, barrier_count, barriers);
+
+ vk_procs = &list->device->vk_procs;
+ vk_info = &list->device->vk_info;
+
+ d3d12_command_list_end_current_render_pass(list);
+
+ for (i = 0; i < barrier_count; ++i)
+ {
+ unsigned int sub_resource_idx = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES;
+ VkPipelineStageFlags src_stage_mask = 0, dst_stage_mask = 0;
+ VkAccessFlags src_access_mask = 0, dst_access_mask = 0;
+ const D3D12_RESOURCE_BARRIER *current = &barriers[i];
+ VkImageLayout layout_before, layout_after;
+ struct d3d12_resource *resource;
+
+ have_split_barriers = have_split_barriers
+ || (current->Flags & D3D12_RESOURCE_BARRIER_FLAG_BEGIN_ONLY)
+ || (current->Flags & D3D12_RESOURCE_BARRIER_FLAG_END_ONLY);
+
+ if (current->Flags & D3D12_RESOURCE_BARRIER_FLAG_BEGIN_ONLY)
+ continue;
+
+ switch (current->Type)
+ {
+ case D3D12_RESOURCE_BARRIER_TYPE_TRANSITION:
+ {
+ unsigned int state_before, state_after, stencil_state_before = 0, stencil_state_after = 0;
+ const D3D12_RESOURCE_TRANSITION_BARRIER *transition = ¤t->u.Transition;
+
+ if (!is_valid_resource_state(transition->StateBefore))
+ {
+ d3d12_command_list_mark_as_invalid(list,
+ "Invalid StateBefore %#x (barrier %u).", transition->StateBefore, i);
+ continue;
+ }
+ if (!is_valid_resource_state(transition->StateAfter))
+ {
+ d3d12_command_list_mark_as_invalid(list,
+ "Invalid StateAfter %#x (barrier %u).", transition->StateAfter, i);
+ continue;
+ }
+
+ if (!(resource = unsafe_impl_from_ID3D12Resource(transition->pResource)))
+ {
+ d3d12_command_list_mark_as_invalid(list, "A resource pointer is NULL.");
+ continue;
+ }
+
+ if (multiplanar_handled && multiplanar_handled[i])
+ continue;
+
+ state_before = transition->StateBefore;
+ state_after = transition->StateAfter;
+
+ sub_resource_idx = transition->Subresource;
+
+ if (sub_resource_idx != D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES
+ && (resource->desc.Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL))
+ {
+ unsigned int sub_resource_count = d3d12_resource_desc_get_sub_resource_count(&resource->desc);
+ unsigned int j = d3d12_find_ds_multiplanar_transition(barriers, i, barrier_count, sub_resource_count);
+ if (j && (multiplanar_handled || (multiplanar_handled = vkd3d_calloc(barrier_count, sizeof(*multiplanar_handled)))))
+ {
+ multiplanar_handled[j] = true;
+ if (sub_resource_idx >= sub_resource_count)
+ {
+ sub_resource_idx -= sub_resource_count;
+ /* The stencil barrier is at i, depth at j. */
+ state_before = barriers[j].u.Transition.StateBefore;
+ state_after = barriers[j].u.Transition.StateAfter;
+ stencil_state_before = transition->StateBefore;
+ stencil_state_after = transition->StateAfter;
+ }
+ else
+ {
+ /* Depth at i, stencil at j. */
+ stencil_state_before = barriers[j].u.Transition.StateBefore;
+ stencil_state_after = barriers[j].u.Transition.StateAfter;
+ }
+ }
+ else if (sub_resource_idx >= sub_resource_count)
+ {
+ FIXME_ONCE("Unhandled sub-resource idx %u.\n", sub_resource_idx);
+ continue;
+ }
+ }
+
+ if (!vk_barrier_parameters_from_d3d12_resource_state(state_before, stencil_state_before,
+ resource, list->vk_queue_flags, vk_info, &src_access_mask, &src_stage_mask, &layout_before))
+ {
+ FIXME("Unhandled state %#x.\n", state_before);
+ continue;
+ }
+ if (!vk_barrier_parameters_from_d3d12_resource_state(state_after, stencil_state_after,
+ resource, list->vk_queue_flags, vk_info, &dst_access_mask, &dst_stage_mask, &layout_after))
+ {
+ FIXME("Unhandled state %#x.\n", state_after);
+ continue;
+ }
+
+ TRACE("Transition barrier (resource %p, subresource %#x, before %#x, after %#x).\n",
+ resource, transition->Subresource, transition->StateBefore, transition->StateAfter);
+ break;
+ }
+
+ case D3D12_RESOURCE_BARRIER_TYPE_UAV:
+ {
+ const D3D12_RESOURCE_UAV_BARRIER *uav = ¤t->u.UAV;
+ VkPipelineStageFlags stage_mask;
+ VkImageLayout image_layout;
+ VkAccessFlags access_mask;
+
+ resource = unsafe_impl_from_ID3D12Resource(uav->pResource);
+ vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0,
+ resource, list->vk_queue_flags, vk_info, &access_mask, &stage_mask, &image_layout);
+ src_access_mask = dst_access_mask = access_mask;
+ src_stage_mask = dst_stage_mask = stage_mask;
+ layout_before = layout_after = image_layout;
+
+ TRACE("UAV barrier (resource %p).\n", resource);
+ break;
+ }
+
+ case D3D12_RESOURCE_BARRIER_TYPE_ALIASING:
+ have_aliasing_barriers = true;
+ continue;
+ default:
+ WARN("Invalid barrier type %#x.\n", current->Type);
+ continue;
+ }
+
+ if (resource)
+ d3d12_command_list_track_resource_usage(list, resource);
+
+ if (!resource)
+ {
+ VkMemoryBarrier vk_barrier;
+
+ vk_barrier.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
+ vk_barrier.pNext = NULL;
+ vk_barrier.srcAccessMask = src_access_mask;
+ vk_barrier.dstAccessMask = dst_access_mask;
+
+ VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, src_stage_mask, dst_stage_mask, 0,
+ 1, &vk_barrier, 0, NULL, 0, NULL));
+ }
+ else if (d3d12_resource_is_buffer(resource))
+ {
+ VkBufferMemoryBarrier vk_barrier;
+
+ vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
+ vk_barrier.pNext = NULL;
+ vk_barrier.srcAccessMask = src_access_mask;
+ vk_barrier.dstAccessMask = dst_access_mask;
+ vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+ vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+ vk_barrier.buffer = resource->u.vk_buffer;
+ vk_barrier.offset = 0;
+ vk_barrier.size = VK_WHOLE_SIZE;
+
+ VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, src_stage_mask, dst_stage_mask, 0,
+ 0, NULL, 1, &vk_barrier, 0, NULL));
+ }
+ else
+ {
+ const struct vkd3d_format *format;
+ VkImageMemoryBarrier vk_barrier;
+
+ if (!(format = vkd3d_format_from_d3d12_resource_desc(list->device, &resource->desc, 0)))
+ {
+ ERR("Resource %p has invalid format %#x.\n", resource, resource->desc.Format);
+ continue;
+ }
+
+ vk_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+ vk_barrier.pNext = NULL;
+ vk_barrier.srcAccessMask = src_access_mask;
+ vk_barrier.dstAccessMask = dst_access_mask;
+ vk_barrier.oldLayout = layout_before;
+ vk_barrier.newLayout = layout_after;
+ vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+ vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+ vk_barrier.image = resource->u.vk_image;
+
+ vk_barrier.subresourceRange.aspectMask = format->vk_aspect_mask;
+ if (sub_resource_idx == D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES)
+ {
+ vk_barrier.subresourceRange.baseMipLevel = 0;
+ vk_barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+ vk_barrier.subresourceRange.baseArrayLayer = 0;
+ vk_barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+ }
+ else
+ {
+ /* FIXME: Some formats in D3D12 are planar. Each plane is a separate sub-resource. */
+ if (sub_resource_idx >= d3d12_resource_desc_get_sub_resource_count(&resource->desc))
+ {
+ FIXME_ONCE("Unhandled sub-resource idx %u.\n", sub_resource_idx);
+ continue;
+ }
+
+ vk_barrier.subresourceRange.baseMipLevel = sub_resource_idx % resource->desc.MipLevels;
+ vk_barrier.subresourceRange.levelCount = 1;
+ vk_barrier.subresourceRange.baseArrayLayer = sub_resource_idx / resource->desc.MipLevels;
+ vk_barrier.subresourceRange.layerCount = 1;
+ }
+
+ VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, src_stage_mask, dst_stage_mask, 0,
+ 0, NULL, 0, NULL, 1, &vk_barrier));
+ }
+ }
+
+ vkd3d_free(multiplanar_handled);
+
+ if (have_aliasing_barriers)
+ FIXME_ONCE("Aliasing barriers not implemented yet.\n");
+
+ /* Vulkan doesn't support split barriers. */
+ if (have_split_barriers)
+ WARN("Issuing split barrier(s) on D3D12_RESOURCE_BARRIER_FLAG_END_ONLY.\n");
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_ExecuteBundle(ID3D12GraphicsCommandList1 *iface,
+ ID3D12GraphicsCommandList *command_list)
+{
+ FIXME("iface %p, command_list %p stub!\n", iface, command_list);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetDescriptorHeaps(ID3D12GraphicsCommandList1 *iface,
+ UINT heap_count, ID3D12DescriptorHeap *const *heaps)
+{
+ TRACE("iface %p, heap_count %u, heaps %p.\n", iface, heap_count, heaps);
+
+ /* Our current implementation does not need this method.
+ *
+ * It could be used to validate descriptor tables but we do not have an
+ * equivalent of the D3D12 Debug Layer. */
+}
+
+static void d3d12_command_list_set_root_signature(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point, const struct d3d12_root_signature *root_signature)
+{
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+
+ if (bindings->root_signature == root_signature)
+ return;
+
+ bindings->root_signature = root_signature;
+
+ d3d12_command_list_invalidate_root_parameters(list, bind_point);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList1 *iface,
+ ID3D12RootSignature *root_signature)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_signature %p.\n", iface, root_signature);
+
+ d3d12_command_list_set_root_signature(list, VK_PIPELINE_BIND_POINT_COMPUTE,
+ unsafe_impl_from_ID3D12RootSignature(root_signature));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12GraphicsCommandList1 *iface,
+ ID3D12RootSignature *root_signature)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_signature %p.\n", iface, root_signature);
+
+ d3d12_command_list_set_root_signature(list, VK_PIPELINE_BIND_POINT_GRAPHICS,
+ unsafe_impl_from_ID3D12RootSignature(root_signature));
+}
+
+static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point, unsigned int index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor)
+{
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+ const struct d3d12_root_signature *root_signature = bindings->root_signature;
+
+ assert(root_signature_get_descriptor_table(root_signature, index));
+
+ assert(index < ARRAY_SIZE(bindings->descriptor_tables));
+ bindings->descriptor_tables[index] = base_descriptor;
+ bindings->descriptor_table_dirty_mask |= (uint64_t)1 << index;
+ bindings->descriptor_table_active_mask |= (uint64_t)1 << index;
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList1 *iface,
+ UINT root_parameter_index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_parameter_index %u, base_descriptor %#"PRIx64".\n",
+ iface, root_parameter_index, base_descriptor.ptr);
+
+ d3d12_command_list_set_descriptor_table(list, VK_PIPELINE_BIND_POINT_COMPUTE,
+ root_parameter_index, base_descriptor);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootDescriptorTable(ID3D12GraphicsCommandList1 *iface,
+ UINT root_parameter_index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_parameter_index %u, base_descriptor %#"PRIx64".\n",
+ iface, root_parameter_index, base_descriptor.ptr);
+
+ d3d12_command_list_set_descriptor_table(list, VK_PIPELINE_BIND_POINT_GRAPHICS,
+ root_parameter_index, base_descriptor);
+}
+
+static void d3d12_command_list_set_root_constants(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point, unsigned int index, unsigned int offset,
+ unsigned int count, const void *data)
+{
+ const struct d3d12_root_signature *root_signature = list->pipeline_bindings[bind_point].root_signature;
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ const struct d3d12_root_constant *c;
+
+ c = root_signature_get_32bit_constants(root_signature, index);
+ VK_CALL(vkCmdPushConstants(list->vk_command_buffer, root_signature->vk_pipeline_layout,
+ c->stage_flags, c->offset + offset * sizeof(uint32_t), count * sizeof(uint32_t), data));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstant(ID3D12GraphicsCommandList1 *iface,
+ UINT root_parameter_index, UINT data, UINT dst_offset)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_parameter_index %u, data 0x%08x, dst_offset %u.\n",
+ iface, root_parameter_index, data, dst_offset);
+
+ d3d12_command_list_set_root_constants(list, VK_PIPELINE_BIND_POINT_COMPUTE,
+ root_parameter_index, dst_offset, 1, &data);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstant(ID3D12GraphicsCommandList1 *iface,
+ UINT root_parameter_index, UINT data, UINT dst_offset)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_parameter_index %u, data 0x%08x, dst_offset %u.\n",
+ iface, root_parameter_index, data, dst_offset);
+
+ d3d12_command_list_set_root_constants(list, VK_PIPELINE_BIND_POINT_GRAPHICS,
+ root_parameter_index, dst_offset, 1, &data);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstants(ID3D12GraphicsCommandList1 *iface,
+ UINT root_parameter_index, UINT constant_count, const void *data, UINT dst_offset)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_parameter_index %u, constant_count %u, data %p, dst_offset %u.\n",
+ iface, root_parameter_index, constant_count, data, dst_offset);
+
+ d3d12_command_list_set_root_constants(list, VK_PIPELINE_BIND_POINT_COMPUTE,
+ root_parameter_index, dst_offset, constant_count, data);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstants(ID3D12GraphicsCommandList1 *iface,
+ UINT root_parameter_index, UINT constant_count, const void *data, UINT dst_offset)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_parameter_index %u, constant_count %u, data %p, dst_offset %u.\n",
+ iface, root_parameter_index, constant_count, data, dst_offset);
+
+ d3d12_command_list_set_root_constants(list, VK_PIPELINE_BIND_POINT_GRAPHICS,
+ root_parameter_index, dst_offset, constant_count, data);
+}
+
+static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point, unsigned int index, D3D12_GPU_VIRTUAL_ADDRESS gpu_address)
+{
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+ const struct d3d12_root_signature *root_signature = bindings->root_signature;
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info;
+ const struct d3d12_root_parameter *root_parameter;
+ struct VkWriteDescriptorSet descriptor_write;
+ struct VkDescriptorBufferInfo buffer_info;
+ struct d3d12_resource *resource;
+
+ root_parameter = root_signature_get_root_descriptor(root_signature, index);
+ assert(root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV);
+
+ resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, gpu_address);
+ buffer_info.buffer = resource->u.vk_buffer;
+ buffer_info.offset = gpu_address - resource->gpu_address;
+ buffer_info.range = resource->desc.Width - buffer_info.offset;
+ buffer_info.range = min(buffer_info.range, vk_info->device_limits.maxUniformBufferRange);
+
+ if (vk_info->KHR_push_descriptor)
+ {
+ vk_write_descriptor_set_from_root_descriptor(&descriptor_write,
+ root_parameter, VK_NULL_HANDLE, NULL, &buffer_info);
+ VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bind_point,
+ root_signature->vk_pipeline_layout, 0, 1, &descriptor_write));
+ }
+ else
+ {
+ d3d12_command_list_prepare_descriptors(list, bind_point);
+ vk_write_descriptor_set_from_root_descriptor(&descriptor_write,
+ root_parameter, bindings->descriptor_set, NULL, &buffer_info);
+ VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL));
+
+ assert(index < ARRAY_SIZE(bindings->push_descriptors));
+ bindings->push_descriptors[index].u.cbv.vk_buffer = buffer_info.buffer;
+ bindings->push_descriptors[index].u.cbv.offset = buffer_info.offset;
+ bindings->push_descriptor_dirty_mask |= 1u << index;
+ bindings->push_descriptor_active_mask |= 1u << index;
+ }
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootConstantBufferView(
+ ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n",
+ iface, root_parameter_index, address);
+
+ d3d12_command_list_set_root_cbv(list, VK_PIPELINE_BIND_POINT_COMPUTE, root_parameter_index, address);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootConstantBufferView(
+ ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n",
+ iface, root_parameter_index, address);
+
+ d3d12_command_list_set_root_cbv(list, VK_PIPELINE_BIND_POINT_GRAPHICS, root_parameter_index, address);
+}
+
+static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *list,
+ VkPipelineBindPoint bind_point, unsigned int index, D3D12_GPU_VIRTUAL_ADDRESS gpu_address)
+{
+ struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
+ const struct d3d12_root_signature *root_signature = bindings->root_signature;
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info;
+ const struct d3d12_root_parameter *root_parameter;
+ struct VkWriteDescriptorSet descriptor_write;
+ VkDevice vk_device = list->device->vk_device;
+ VkBufferView vk_buffer_view;
+
+ root_parameter = root_signature_get_root_descriptor(root_signature, index);
+ assert(root_parameter->parameter_type != D3D12_ROOT_PARAMETER_TYPE_CBV);
+
+ /* FIXME: Re-use buffer views. */
+ if (!vkd3d_create_raw_buffer_view(list->device, gpu_address, &vk_buffer_view))
+ {
+ ERR("Failed to create buffer view.\n");
+ return;
+ }
+
+ if (!(d3d12_command_allocator_add_buffer_view(list->allocator, vk_buffer_view)))
+ {
+ ERR("Failed to add buffer view.\n");
+ VK_CALL(vkDestroyBufferView(vk_device, vk_buffer_view, NULL));
+ return;
+ }
+
+ if (vk_info->KHR_push_descriptor)
+ {
+ vk_write_descriptor_set_from_root_descriptor(&descriptor_write,
+ root_parameter, VK_NULL_HANDLE, &vk_buffer_view, NULL);
+ VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bind_point,
+ root_signature->vk_pipeline_layout, 0, 1, &descriptor_write));
+ }
+ else
+ {
+ d3d12_command_list_prepare_descriptors(list, bind_point);
+ vk_write_descriptor_set_from_root_descriptor(&descriptor_write,
+ root_parameter, bindings->descriptor_set, &vk_buffer_view, NULL);
+ VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL));
+
+ assert(index < ARRAY_SIZE(bindings->push_descriptors));
+ bindings->push_descriptors[index].u.vk_buffer_view = vk_buffer_view;
+ bindings->push_descriptor_dirty_mask |= 1u << index;
+ bindings->push_descriptor_active_mask |= 1u << index;
+ }
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootShaderResourceView(
+ ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n",
+ iface, root_parameter_index, address);
+
+ d3d12_command_list_set_root_descriptor(list, VK_PIPELINE_BIND_POINT_COMPUTE,
+ root_parameter_index, address);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootShaderResourceView(
+ ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n",
+ iface, root_parameter_index, address);
+
+ d3d12_command_list_set_root_descriptor(list, VK_PIPELINE_BIND_POINT_GRAPHICS,
+ root_parameter_index, address);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootUnorderedAccessView(
+ ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n",
+ iface, root_parameter_index, address);
+
+ d3d12_command_list_set_root_descriptor(list, VK_PIPELINE_BIND_POINT_COMPUTE,
+ root_parameter_index, address);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootUnorderedAccessView(
+ ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+
+ TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n",
+ iface, root_parameter_index, address);
+
+ d3d12_command_list_set_root_descriptor(list, VK_PIPELINE_BIND_POINT_GRAPHICS,
+ root_parameter_index, address);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12GraphicsCommandList1 *iface,
+ const D3D12_INDEX_BUFFER_VIEW *view)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+ struct d3d12_resource *resource;
+ enum VkIndexType index_type;
+
+ TRACE("iface %p, view %p.\n", iface, view);
+
+ if (!view)
+ {
+ WARN("Ignoring NULL index buffer view.\n");
+ return;
+ }
+
+ vk_procs = &list->device->vk_procs;
+
+ switch (view->Format)
+ {
+ case DXGI_FORMAT_R16_UINT:
+ index_type = VK_INDEX_TYPE_UINT16;
+ break;
+ case DXGI_FORMAT_R32_UINT:
+ index_type = VK_INDEX_TYPE_UINT32;
+ break;
+ default:
+ WARN("Invalid index format %#x.\n", view->Format);
+ return;
+ }
+
+ list->index_buffer_format = view->Format;
+
+ resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, view->BufferLocation);
+ VK_CALL(vkCmdBindIndexBuffer(list->vk_command_buffer, resource->u.vk_buffer,
+ view->BufferLocation - resource->gpu_address, index_type));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12GraphicsCommandList1 *iface,
+ UINT start_slot, UINT view_count, const D3D12_VERTEX_BUFFER_VIEW *views)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct vkd3d_null_resources *null_resources;
+ struct vkd3d_gpu_va_allocator *gpu_va_allocator;
+ VkDeviceSize offsets[ARRAY_SIZE(list->strides)];
+ const struct vkd3d_vk_device_procs *vk_procs;
+ VkBuffer buffers[ARRAY_SIZE(list->strides)];
+ struct d3d12_resource *resource;
+ bool invalidate = false;
+ unsigned int i, stride;
+
+ TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views);
+
+ vk_procs = &list->device->vk_procs;
+ null_resources = &list->device->null_resources;
+ gpu_va_allocator = &list->device->gpu_va_allocator;
+
+ if (start_slot >= ARRAY_SIZE(list->strides) || view_count > ARRAY_SIZE(list->strides) - start_slot)
+ {
+ WARN("Invalid start slot %u / view count %u.\n", start_slot, view_count);
+ return;
+ }
+
+ for (i = 0; i < view_count; ++i)
+ {
+ if (views[i].BufferLocation)
+ {
+ resource = vkd3d_gpu_va_allocator_dereference(gpu_va_allocator, views[i].BufferLocation);
+ buffers[i] = resource->u.vk_buffer;
+ offsets[i] = views[i].BufferLocation - resource->gpu_address;
+ stride = views[i].StrideInBytes;
+ }
+ else
+ {
+ buffers[i] = null_resources->vk_buffer;
+ offsets[i] = 0;
+ stride = 0;
+ }
+
+ invalidate |= list->strides[start_slot + i] != stride;
+ list->strides[start_slot + i] = stride;
+ }
+
+ if (view_count)
+ VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, start_slot, view_count, buffers, offsets));
+
+ if (invalidate)
+ d3d12_command_list_invalidate_current_pipeline(list);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsCommandList1 *iface,
+ UINT start_slot, UINT view_count, const D3D12_STREAM_OUTPUT_BUFFER_VIEW *views)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ VkDeviceSize offsets[ARRAY_SIZE(list->so_counter_buffers)];
+ VkDeviceSize sizes[ARRAY_SIZE(list->so_counter_buffers)];
+ VkBuffer buffers[ARRAY_SIZE(list->so_counter_buffers)];
+ struct vkd3d_gpu_va_allocator *gpu_va_allocator;
+ const struct vkd3d_vk_device_procs *vk_procs;
+ struct d3d12_resource *resource;
+ unsigned int i, first, count;
+
+ TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views);
+
+ d3d12_command_list_end_current_render_pass(list);
+
+ if (!list->device->vk_info.EXT_transform_feedback)
+ {
+ FIXME("Transform feedback is not supported by Vulkan implementation.\n");
+ return;
+ }
+
+ if (start_slot >= ARRAY_SIZE(buffers) || view_count > ARRAY_SIZE(buffers) - start_slot)
+ {
+ WARN("Invalid start slot %u / view count %u.\n", start_slot, view_count);
+ return;
+ }
+
+ vk_procs = &list->device->vk_procs;
+ gpu_va_allocator = &list->device->gpu_va_allocator;
+
+ count = 0;
+ first = start_slot;
+ for (i = 0; i < view_count; ++i)
+ {
+ if (views[i].BufferLocation && views[i].SizeInBytes)
+ {
+ resource = vkd3d_gpu_va_allocator_dereference(gpu_va_allocator, views[i].BufferLocation);
+ buffers[count] = resource->u.vk_buffer;
+ offsets[count] = views[i].BufferLocation - resource->gpu_address;
+ sizes[count] = views[i].SizeInBytes;
+
+ resource = vkd3d_gpu_va_allocator_dereference(gpu_va_allocator, views[i].BufferFilledSizeLocation);
+ list->so_counter_buffers[start_slot + i] = resource->u.vk_buffer;
+ list->so_counter_buffer_offsets[start_slot + i] = views[i].BufferFilledSizeLocation - resource->gpu_address;
+ ++count;
+ }
+ else
+ {
+ if (count)
+ VK_CALL(vkCmdBindTransformFeedbackBuffersEXT(list->vk_command_buffer, first, count, buffers, offsets, sizes));
+ count = 0;
+ first = start_slot + i + 1;
+
+ list->so_counter_buffers[start_slot + i] = VK_NULL_HANDLE;
+ list->so_counter_buffer_offsets[start_slot + i] = 0;
+
+ WARN("Trying to unbind transform feedback buffer %u. Ignoring.\n", start_slot + i);
+ }
+ }
+
+ if (count)
+ VK_CALL(vkCmdBindTransformFeedbackBuffersEXT(list->vk_command_buffer, first, count, buffers, offsets, sizes));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12GraphicsCommandList1 *iface,
+ UINT render_target_descriptor_count, const D3D12_CPU_DESCRIPTOR_HANDLE *render_target_descriptors,
+ BOOL single_descriptor_handle, const D3D12_CPU_DESCRIPTOR_HANDLE *depth_stencil_descriptor)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct d3d12_rtv_desc *rtv_desc;
+ const struct d3d12_dsv_desc *dsv_desc;
+ VkFormat prev_dsv_format;
+ struct vkd3d_view *view;
+ unsigned int i;
+
+ TRACE("iface %p, render_target_descriptor_count %u, render_target_descriptors %p, "
+ "single_descriptor_handle %#x, depth_stencil_descriptor %p.\n",
+ iface, render_target_descriptor_count, render_target_descriptors,
+ single_descriptor_handle, depth_stencil_descriptor);
+
+ if (render_target_descriptor_count > ARRAY_SIZE(list->rtvs))
+ {
+ WARN("Descriptor count %u > %zu, ignoring extra descriptors.\n",
+ render_target_descriptor_count, ARRAY_SIZE(list->rtvs));
+ render_target_descriptor_count = ARRAY_SIZE(list->rtvs);
+ }
+
+ list->fb_width = 0;
+ list->fb_height = 0;
+ list->fb_layer_count = 0;
+ for (i = 0; i < render_target_descriptor_count; ++i)
+ {
+ if (single_descriptor_handle)
+ {
+ if ((rtv_desc = d3d12_rtv_desc_from_cpu_handle(*render_target_descriptors)))
+ rtv_desc += i;
+ }
+ else
+ {
+ rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]);
+ }
+
+ if (!rtv_desc || !rtv_desc->resource)
+ {
+ WARN("RTV descriptor %u is not initialized.\n", i);
+ list->rtvs[i] = VK_NULL_HANDLE;
+ continue;
+ }
+
+ d3d12_command_list_track_resource_usage(list, rtv_desc->resource);
+
+ /* In D3D12 CPU descriptors are consumed when a command is recorded. */
+ view = rtv_desc->view;
+ if (!d3d12_command_allocator_add_view(list->allocator, view))
+ {
+ WARN("Failed to add view.\n");
+ }
+
+ list->rtvs[i] = view->u.vk_image_view;
+ list->fb_width = max(list->fb_width, rtv_desc->width);
+ list->fb_height = max(list->fb_height, rtv_desc->height);
+ list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count);
+ }
+
+ prev_dsv_format = list->dsv_format;
+ list->dsv = VK_NULL_HANDLE;
+ list->dsv_format = VK_FORMAT_UNDEFINED;
+ if (depth_stencil_descriptor)
+ {
+ if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor))
+ && dsv_desc->resource)
+ {
+ d3d12_command_list_track_resource_usage(list, dsv_desc->resource);
+
+ /* In D3D12 CPU descriptors are consumed when a command is recorded. */
+ view = dsv_desc->view;
+ if (!d3d12_command_allocator_add_view(list->allocator, view))
+ {
+ WARN("Failed to add view.\n");
+ list->dsv = VK_NULL_HANDLE;
+ }
+
+ list->dsv = view->u.vk_image_view;
+ list->fb_width = max(list->fb_width, dsv_desc->width);
+ list->fb_height = max(list->fb_height, dsv_desc->height);
+ list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count);
+ list->dsv_format = dsv_desc->format->vk_format;
+ }
+ else
+ {
+ WARN("DSV descriptor is not initialized.\n");
+ }
+ }
+
+ if (prev_dsv_format != list->dsv_format && d3d12_pipeline_state_has_unknown_dsv_format(list->state))
+ d3d12_command_list_invalidate_current_pipeline(list);
+
+ d3d12_command_list_invalidate_current_framebuffer(list);
+ d3d12_command_list_invalidate_current_render_pass(list);
+}
+
+static void d3d12_command_list_clear(struct d3d12_command_list *list,
+ const struct VkAttachmentDescription *attachment_desc,
+ const struct VkAttachmentReference *color_reference, const struct VkAttachmentReference *ds_reference,
+ struct vkd3d_view *view, size_t width, size_t height, unsigned int layer_count,
+ const union VkClearValue *clear_value, unsigned int rect_count, const D3D12_RECT *rects)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
+ struct VkSubpassDescription sub_pass_desc;
+ struct VkRenderPassCreateInfo pass_desc;
+ struct VkRenderPassBeginInfo begin_desc;
+ struct VkFramebufferCreateInfo fb_desc;
+ VkFramebuffer vk_framebuffer;
+ VkRenderPass vk_render_pass;
+ D3D12_RECT full_rect;
+ unsigned int i;
+ VkResult vr;
+
+ d3d12_command_list_end_current_render_pass(list);
+
+ if (!rect_count)
+ {
+ full_rect.top = 0;
+ full_rect.left = 0;
+ full_rect.bottom = height;
+ full_rect.right = width;
+
+ rect_count = 1;
+ rects = &full_rect;
+ }
+
+ sub_pass_desc.flags = 0;
+ sub_pass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+ sub_pass_desc.inputAttachmentCount = 0;
+ sub_pass_desc.pInputAttachments = NULL;
+ sub_pass_desc.colorAttachmentCount = !!color_reference;
+ sub_pass_desc.pColorAttachments = color_reference;
+ sub_pass_desc.pResolveAttachments = NULL;
+ sub_pass_desc.pDepthStencilAttachment = ds_reference;
+ sub_pass_desc.preserveAttachmentCount = 0;
+ sub_pass_desc.pPreserveAttachments = NULL;
+
+ pass_desc.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
+ pass_desc.pNext = NULL;
+ pass_desc.flags = 0;
+ pass_desc.attachmentCount = 1;
+ pass_desc.pAttachments = attachment_desc;
+ pass_desc.subpassCount = 1;
+ pass_desc.pSubpasses = &sub_pass_desc;
+ pass_desc.dependencyCount = 0;
+ pass_desc.pDependencies = NULL;
+ if ((vr = VK_CALL(vkCreateRenderPass(list->device->vk_device, &pass_desc, NULL, &vk_render_pass))) < 0)
+ {
+ WARN("Failed to create Vulkan render pass, vr %d.\n", vr);
+ return;
+ }
+
+ if (!d3d12_command_allocator_add_render_pass(list->allocator, vk_render_pass))
+ {
+ WARN("Failed to add render pass.\n");
+ VK_CALL(vkDestroyRenderPass(list->device->vk_device, vk_render_pass, NULL));
+ return;
+ }
+
+ if (!d3d12_command_allocator_add_view(list->allocator, view))
+ {
+ WARN("Failed to add view.\n");
+ }
+
+ fb_desc.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
+ fb_desc.pNext = NULL;
+ fb_desc.flags = 0;
+ fb_desc.renderPass = vk_render_pass;
+ fb_desc.attachmentCount = 1;
+ fb_desc.pAttachments = &view->u.vk_image_view;
+ fb_desc.width = width;
+ fb_desc.height = height;
+ fb_desc.layers = layer_count;
+ if ((vr = VK_CALL(vkCreateFramebuffer(list->device->vk_device, &fb_desc, NULL, &vk_framebuffer))) < 0)
+ {
+ WARN("Failed to create Vulkan framebuffer, vr %d.\n", vr);
+ return;
+ }
+
+ if (!d3d12_command_allocator_add_framebuffer(list->allocator, vk_framebuffer))
+ {
+ WARN("Failed to add framebuffer.\n");
+ VK_CALL(vkDestroyFramebuffer(list->device->vk_device, vk_framebuffer, NULL));
+ return;
+ }
+
+ begin_desc.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
+ begin_desc.pNext = NULL;
+ begin_desc.renderPass = vk_render_pass;
+ begin_desc.framebuffer = vk_framebuffer;
+ begin_desc.clearValueCount = 1;
+ begin_desc.pClearValues = clear_value;
+
+ for (i = 0; i < rect_count; ++i)
+ {
+ begin_desc.renderArea.offset.x = rects[i].left;
+ begin_desc.renderArea.offset.y = rects[i].top;
+ begin_desc.renderArea.extent.width = rects[i].right - rects[i].left;
+ begin_desc.renderArea.extent.height = rects[i].bottom - rects[i].top;
+ VK_CALL(vkCmdBeginRenderPass(list->vk_command_buffer, &begin_desc, VK_SUBPASS_CONTENTS_INLINE));
+ VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer));
+ }
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12GraphicsCommandList1 *iface,
+ D3D12_CPU_DESCRIPTOR_HANDLE dsv, D3D12_CLEAR_FLAGS flags, float depth, UINT8 stencil,
+ UINT rect_count, const D3D12_RECT *rects)
+{
+ const union VkClearValue clear_value = {.depthStencil = {depth, stencil}};
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct d3d12_dsv_desc *dsv_desc = d3d12_dsv_desc_from_cpu_handle(dsv);
+ struct VkAttachmentDescription attachment_desc;
+ struct VkAttachmentReference ds_reference;
+
+ TRACE("iface %p, dsv %#lx, flags %#x, depth %.8e, stencil 0x%02x, rect_count %u, rects %p.\n",
+ iface, dsv.ptr, flags, depth, stencil, rect_count, rects);
+
+ d3d12_command_list_track_resource_usage(list, dsv_desc->resource);
+
+ attachment_desc.flags = 0;
+ attachment_desc.format = dsv_desc->format->vk_format;
+ attachment_desc.samples = dsv_desc->sample_count;
+ if (flags & D3D12_CLEAR_FLAG_DEPTH)
+ {
+ attachment_desc.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+ attachment_desc.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+ }
+ else
+ {
+ attachment_desc.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+ attachment_desc.storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+ }
+ if (flags & D3D12_CLEAR_FLAG_STENCIL)
+ {
+ attachment_desc.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+ attachment_desc.stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE;
+ }
+ else
+ {
+ attachment_desc.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+ attachment_desc.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+ }
+ attachment_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+ attachment_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+
+ ds_reference.attachment = 0;
+ ds_reference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+
+ d3d12_command_list_clear(list, &attachment_desc, NULL, &ds_reference,
+ dsv_desc->view, dsv_desc->width, dsv_desc->height, dsv_desc->layer_count,
+ &clear_value, rect_count, rects);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12GraphicsCommandList1 *iface,
+ D3D12_CPU_DESCRIPTOR_HANDLE rtv, const FLOAT color[4], UINT rect_count, const D3D12_RECT *rects)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct d3d12_rtv_desc *rtv_desc = d3d12_rtv_desc_from_cpu_handle(rtv);
+ struct VkAttachmentDescription attachment_desc;
+ struct VkAttachmentReference color_reference;
+ VkClearValue clear_value;
+
+ TRACE("iface %p, rtv %#lx, color %p, rect_count %u, rects %p.\n",
+ iface, rtv.ptr, color, rect_count, rects);
+
+ d3d12_command_list_track_resource_usage(list, rtv_desc->resource);
+
+ attachment_desc.flags = 0;
+ attachment_desc.format = rtv_desc->format->vk_format;
+ attachment_desc.samples = rtv_desc->sample_count;
+ attachment_desc.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+ attachment_desc.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+ attachment_desc.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+ attachment_desc.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+ attachment_desc.initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+ attachment_desc.finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+
+ color_reference.attachment = 0;
+ color_reference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+
+ if (rtv_desc->format->type == VKD3D_FORMAT_TYPE_UINT)
+ {
+ clear_value.color.uint32[0] = max(0, color[0]);
+ clear_value.color.uint32[1] = max(0, color[1]);
+ clear_value.color.uint32[2] = max(0, color[2]);
+ clear_value.color.uint32[3] = max(0, color[3]);
+ }
+ else if (rtv_desc->format->type == VKD3D_FORMAT_TYPE_SINT)
+ {
+ clear_value.color.int32[0] = color[0];
+ clear_value.color.int32[1] = color[1];
+ clear_value.color.int32[2] = color[2];
+ clear_value.color.int32[3] = color[3];
+ }
+ else
+ {
+ clear_value.color.float32[0] = color[0];
+ clear_value.color.float32[1] = color[1];
+ clear_value.color.float32[2] = color[2];
+ clear_value.color.float32[3] = color[3];
+ }
+
+ d3d12_command_list_clear(list, &attachment_desc, &color_reference, NULL,
+ rtv_desc->view, rtv_desc->width, rtv_desc->height, rtv_desc->layer_count,
+ &clear_value, rect_count, rects);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID3D12GraphicsCommandList1 *iface,
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource,
+ const UINT values[4], UINT rect_count, const D3D12_RECT *rects)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+ const struct vkd3d_vulkan_info *vk_info;
+ const struct d3d12_desc *cpu_descriptor;
+ struct d3d12_resource *resource_impl;
+ VkBufferMemoryBarrier buffer_barrier;
+ VkImageMemoryBarrier image_barrier;
+ VkPipelineStageFlags stage_mask;
+ VkImageSubresourceRange range;
+ VkClearColorValue color;
+
+ TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n",
+ iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects);
+
+ vk_procs = &list->device->vk_procs;
+ vk_info = &list->device->vk_info;
+
+ resource_impl = unsafe_impl_from_ID3D12Resource(resource);
+
+ d3d12_command_list_track_resource_usage(list, resource_impl);
+
+ if (rect_count)
+ {
+ FIXME("Clear rects not supported.\n");
+ return;
+ }
+
+ d3d12_command_list_end_current_render_pass(list);
+
+ cpu_descriptor = d3d12_desc_from_cpu_handle(cpu_handle);
+
+ if (d3d12_resource_is_buffer(resource_impl))
+ {
+ if (cpu_descriptor->u.view->format->vk_format != VK_FORMAT_R32_UINT)
+ {
+ FIXME("Not supported for UAV descriptor %p.\n", cpu_descriptor);
+ return;
+ }
+
+ VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer,
+ cpu_descriptor->u.view->info.buffer.offset, cpu_descriptor->u.view->info.buffer.size, values[0]));
+
+ buffer_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
+ buffer_barrier.pNext = NULL;
+ buffer_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+ buffer_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+ buffer_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+ buffer_barrier.buffer = resource_impl->u.vk_buffer;
+ buffer_barrier.offset = cpu_descriptor->u.view->info.buffer.offset;
+ buffer_barrier.size = cpu_descriptor->u.view->info.buffer.size;
+
+ vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0,
+ resource_impl, list->vk_queue_flags, vk_info, &buffer_barrier.dstAccessMask, &stage_mask, NULL);
+
+ VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer,
+ VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0,
+ 0, NULL, 1, &buffer_barrier, 0, NULL));
+ }
+ else
+ {
+ color.uint32[0] = values[0];
+ color.uint32[1] = values[1];
+ color.uint32[2] = values[2];
+ color.uint32[3] = values[3];
+
+ range.aspectMask = cpu_descriptor->u.view->format->vk_aspect_mask;
+ range.baseMipLevel = cpu_descriptor->u.view->info.texture.miplevel_idx;
+ range.levelCount = 1;
+ range.baseArrayLayer = cpu_descriptor->u.view->info.texture.layer_idx;
+ range.layerCount = cpu_descriptor->u.view->info.texture.layer_count;
+
+ VK_CALL(vkCmdClearColorImage(list->vk_command_buffer,
+ resource_impl->u.vk_image, VK_IMAGE_LAYOUT_GENERAL, &color, 1, &range));
+
+ image_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+ image_barrier.pNext = NULL;
+ image_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+ image_barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL;
+ image_barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL;
+ image_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+ image_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+ image_barrier.image = resource_impl->u.vk_image;
+ image_barrier.subresourceRange = range;
+
+ vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0,
+ resource_impl, list->vk_queue_flags, vk_info, &image_barrier.dstAccessMask, &stage_mask, NULL);
+
+ VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer,
+ VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0,
+ 0, NULL, 0, NULL, 1, &image_barrier));
+ }
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList1 *iface,
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource,
+ const float values[4], UINT rect_count, const D3D12_RECT *rects)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_resource *resource_impl;
+
+ FIXME("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p stub!\n",
+ iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects);
+
+ resource_impl = unsafe_impl_from_ID3D12Resource(resource);
+
+ d3d12_command_list_track_resource_usage(list, resource_impl);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_DiscardResource(ID3D12GraphicsCommandList1 *iface,
+ ID3D12Resource *resource, const D3D12_DISCARD_REGION *region)
+{
+ FIXME_ONCE("iface %p, resource %p, region %p stub!\n", iface, resource, region);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsCommandList1 *iface,
+ ID3D12QueryHeap *heap, D3D12_QUERY_TYPE type, UINT index)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap);
+ const struct vkd3d_vk_device_procs *vk_procs;
+ VkQueryControlFlags flags = 0;
+
+ TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index);
+
+ vk_procs = &list->device->vk_procs;
+
+ d3d12_command_list_end_current_render_pass(list);
+
+ VK_CALL(vkCmdResetQueryPool(list->vk_command_buffer, query_heap->vk_query_pool, index, 1));
+
+ if (type == D3D12_QUERY_TYPE_OCCLUSION)
+ flags = VK_QUERY_CONTROL_PRECISE_BIT;
+
+ if (D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0 <= type && type <= D3D12_QUERY_TYPE_SO_STATISTICS_STREAM3)
+ {
+ unsigned int stream_index = type - D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0;
+ VK_CALL(vkCmdBeginQueryIndexedEXT(list->vk_command_buffer,
+ query_heap->vk_query_pool, index, flags, stream_index));
+ return;
+ }
+
+ VK_CALL(vkCmdBeginQuery(list->vk_command_buffer, query_heap->vk_query_pool, index, flags));
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_EndQuery(ID3D12GraphicsCommandList1 *iface,
+ ID3D12QueryHeap *heap, D3D12_QUERY_TYPE type, UINT index)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap);
+ const struct vkd3d_vk_device_procs *vk_procs;
+
+ TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index);
+
+ vk_procs = &list->device->vk_procs;
+
+ d3d12_command_list_end_current_render_pass(list);
+
+ d3d12_query_heap_mark_result_as_available(query_heap, index);
+
+ if (type == D3D12_QUERY_TYPE_TIMESTAMP)
+ {
+ VK_CALL(vkCmdResetQueryPool(list->vk_command_buffer, query_heap->vk_query_pool, index, 1));
+ VK_CALL(vkCmdWriteTimestamp(list->vk_command_buffer,
+ VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, query_heap->vk_query_pool, index));
+ return;
+ }
+
+ if (D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0 <= type && type <= D3D12_QUERY_TYPE_SO_STATISTICS_STREAM3)
+ {
+ unsigned int stream_index = type - D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0;
+ VK_CALL(vkCmdEndQueryIndexedEXT(list->vk_command_buffer,
+ query_heap->vk_query_pool, index, stream_index));
+ return;
+ }
+
+ VK_CALL(vkCmdEndQuery(list->vk_command_buffer, query_heap->vk_query_pool, index));
+}
+
+static size_t get_query_stride(D3D12_QUERY_TYPE type)
+{
+ if (type == D3D12_QUERY_TYPE_PIPELINE_STATISTICS)
+ return sizeof(D3D12_QUERY_DATA_PIPELINE_STATISTICS);
+
+ if (D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0 <= type && type <= D3D12_QUERY_TYPE_SO_STATISTICS_STREAM3)
+ return sizeof(D3D12_QUERY_DATA_SO_STATISTICS);
+
+ return sizeof(uint64_t);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12GraphicsCommandList1 *iface,
+ ID3D12QueryHeap *heap, D3D12_QUERY_TYPE type, UINT start_index, UINT query_count,
+ ID3D12Resource *dst_buffer, UINT64 aligned_dst_buffer_offset)
+{
+ const struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_resource *buffer = unsafe_impl_from_ID3D12Resource(dst_buffer);
+ const struct vkd3d_vk_device_procs *vk_procs;
+ unsigned int i, first, count;
+ VkDeviceSize offset, stride;
+
+ TRACE("iface %p, heap %p, type %#x, start_index %u, query_count %u, "
+ "dst_buffer %p, aligned_dst_buffer_offset %#"PRIx64".\n",
+ iface, heap, type, start_index, query_count,
+ dst_buffer, aligned_dst_buffer_offset);
+
+ vk_procs = &list->device->vk_procs;
+
+ /* Vulkan is less strict than D3D12 here. Vulkan implementations are free
+ * to return any non-zero result for binary occlusion with at least one
+ * sample passing, while D3D12 guarantees that the result is 1 then.
+ *
+ * For example, the Nvidia binary blob drivers on Linux seem to always
+ * count precisely, even when it was signalled that non-precise is enough.
+ */
+ if (type == D3D12_QUERY_TYPE_BINARY_OCCLUSION)
+ FIXME_ONCE("D3D12 guarantees binary occlusion queries result in only 0 and 1.\n");
+
+ if (!d3d12_resource_is_buffer(buffer))
+ {
+ WARN("Destination resource is not a buffer.\n");
+ return;
+ }
+
+ d3d12_command_list_end_current_render_pass(list);
+
+ stride = get_query_stride(type);
+
+ count = 0;
+ first = start_index;
+ offset = aligned_dst_buffer_offset;
+ for (i = 0; i < query_count; ++i)
+ {
+ if (d3d12_query_heap_is_result_available(query_heap, start_index + i))
+ {
+ ++count;
+ }
+ else
+ {
+ if (count)
+ {
+ VK_CALL(vkCmdCopyQueryPoolResults(list->vk_command_buffer,
+ query_heap->vk_query_pool, first, count, buffer->u.vk_buffer,
+ offset, stride, VK_QUERY_RESULT_64_BIT | VK_QUERY_RESULT_WAIT_BIT));
+ }
+ count = 0;
+ first = start_index + i;
+ offset = aligned_dst_buffer_offset + i * stride;
+
+ /* We cannot copy query results if a query was not issued:
+ *
+ * "If the query does not become available in a finite amount of
+ * time (e.g. due to not issuing a query since the last reset),
+ * a VK_ERROR_DEVICE_LOST error may occur."
+ */
+ VK_CALL(vkCmdFillBuffer(list->vk_command_buffer,
+ buffer->u.vk_buffer, offset, stride, 0x00000000));
+
+ ++first;
+ offset += stride;
+ }
+ }
+
+ if (count)
+ {
+ VK_CALL(vkCmdCopyQueryPoolResults(list->vk_command_buffer,
+ query_heap->vk_query_pool, first, count, buffer->u.vk_buffer,
+ offset, stride, VK_QUERY_RESULT_64_BIT | VK_QUERY_RESULT_WAIT_BIT));
+ }
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCommandList1 *iface,
+ ID3D12Resource *buffer, UINT64 aligned_buffer_offset, D3D12_PREDICATION_OP operation)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_resource *resource = unsafe_impl_from_ID3D12Resource(buffer);
+ const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info;
+ const struct vkd3d_vk_device_procs *vk_procs;
+
+ TRACE("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x.\n",
+ iface, buffer, aligned_buffer_offset, operation);
+
+ if (!vk_info->EXT_conditional_rendering)
+ {
+ FIXME("Vulkan conditional rendering extension not present. Conditional rendering not supported.\n");
+ return;
+ }
+
+ vk_procs = &list->device->vk_procs;
+
+ /* FIXME: Add support for conditional rendering in render passes. */
+ d3d12_command_list_end_current_render_pass(list);
+
+ if (resource)
+ {
+ VkConditionalRenderingBeginInfoEXT cond_info;
+
+ if (aligned_buffer_offset & (sizeof(uint64_t) - 1))
+ {
+ WARN("Unaligned predicate argument buffer offset %#"PRIx64".\n", aligned_buffer_offset);
+ return;
+ }
+
+ if (!d3d12_resource_is_buffer(resource))
+ {
+ WARN("Predicate arguments must be stored in a buffer resource.\n");
+ return;
+ }
+
+ FIXME_ONCE("Predication doesn't support clear and copy commands, "
+ "and predication values are treated as 32-bit values.\n");
+
+ cond_info.sType = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT;
+ cond_info.pNext = NULL;
+ cond_info.buffer = resource->u.vk_buffer;
+ cond_info.offset = aligned_buffer_offset;
+ switch (operation)
+ {
+ case D3D12_PREDICATION_OP_EQUAL_ZERO:
+ cond_info.flags = 0;
+ break;
+
+ case D3D12_PREDICATION_OP_NOT_EQUAL_ZERO:
+ cond_info.flags = VK_CONDITIONAL_RENDERING_INVERTED_BIT_EXT;
+ break;
+
+ default:
+ FIXME("Unhandled predication operation %#x.\n", operation);
+ return;
+ }
+
+ if (list->is_predicated)
+ VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer));
+ VK_CALL(vkCmdBeginConditionalRenderingEXT(list->vk_command_buffer, &cond_info));
+ list->is_predicated = true;
+ }
+ else if (list->is_predicated)
+ {
+ VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer));
+ list->is_predicated = false;
+ }
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetMarker(ID3D12GraphicsCommandList1 *iface,
+ UINT metadata, const void *data, UINT size)
+{
+ FIXME("iface %p, metadata %#x, data %p, size %u stub!\n", iface, metadata, data, size);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_BeginEvent(ID3D12GraphicsCommandList1 *iface,
+ UINT metadata, const void *data, UINT size)
+{
+ FIXME("iface %p, metadata %#x, data %p, size %u stub!\n", iface, metadata, data, size);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_EndEvent(ID3D12GraphicsCommandList1 *iface)
+{
+ FIXME("iface %p stub!\n", iface);
+}
+
+STATIC_ASSERT(sizeof(VkDispatchIndirectCommand) == sizeof(D3D12_DISPATCH_ARGUMENTS));
+STATIC_ASSERT(sizeof(VkDrawIndexedIndirectCommand) == sizeof(D3D12_DRAW_INDEXED_ARGUMENTS));
+STATIC_ASSERT(sizeof(VkDrawIndirectCommand) == sizeof(D3D12_DRAW_ARGUMENTS));
+
+static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsCommandList1 *iface,
+ ID3D12CommandSignature *command_signature, UINT max_command_count, ID3D12Resource *arg_buffer,
+ UINT64 arg_buffer_offset, ID3D12Resource *count_buffer, UINT64 count_buffer_offset)
+{
+ struct d3d12_command_signature *sig_impl = unsafe_impl_from_ID3D12CommandSignature(command_signature);
+ struct d3d12_resource *count_impl = unsafe_impl_from_ID3D12Resource(count_buffer);
+ struct d3d12_resource *arg_impl = unsafe_impl_from_ID3D12Resource(arg_buffer);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ const D3D12_COMMAND_SIGNATURE_DESC *signature_desc;
+ const struct vkd3d_vk_device_procs *vk_procs;
+ unsigned int i;
+
+ TRACE("iface %p, command_signature %p, max_command_count %u, arg_buffer %p, "
+ "arg_buffer_offset %#"PRIx64", count_buffer %p, count_buffer_offset %#"PRIx64".\n",
+ iface, command_signature, max_command_count, arg_buffer, arg_buffer_offset,
+ count_buffer, count_buffer_offset);
+
+ vk_procs = &list->device->vk_procs;
+
+ if (count_buffer && !list->device->vk_info.KHR_draw_indirect_count)
+ {
+ FIXME("Count buffers not supported by Vulkan implementation.\n");
+ return;
+ }
+
+ signature_desc = &sig_impl->desc;
+ for (i = 0; i < signature_desc->NumArgumentDescs; ++i)
+ {
+ const D3D12_INDIRECT_ARGUMENT_DESC *arg_desc = &signature_desc->pArgumentDescs[i];
+
+ switch (arg_desc->Type)
+ {
+ case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW:
+ if (!d3d12_command_list_begin_render_pass(list))
+ {
+ WARN("Failed to begin render pass, ignoring draw.\n");
+ break;
+ }
+
+ if (count_buffer)
+ {
+ VK_CALL(vkCmdDrawIndirectCountKHR(list->vk_command_buffer, arg_impl->u.vk_buffer,
+ arg_buffer_offset, count_impl->u.vk_buffer, count_buffer_offset,
+ max_command_count, signature_desc->ByteStride));
+ }
+ else
+ {
+ VK_CALL(vkCmdDrawIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer,
+ arg_buffer_offset, max_command_count, signature_desc->ByteStride));
+ }
+ break;
+
+ case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED:
+ if (!d3d12_command_list_begin_render_pass(list))
+ {
+ WARN("Failed to begin render pass, ignoring draw.\n");
+ break;
+ }
+
+ d3d12_command_list_check_index_buffer_strip_cut_value(list);
+
+ if (count_buffer)
+ {
+ VK_CALL(vkCmdDrawIndexedIndirectCountKHR(list->vk_command_buffer, arg_impl->u.vk_buffer,
+ arg_buffer_offset, count_impl->u.vk_buffer, count_buffer_offset,
+ max_command_count, signature_desc->ByteStride));
+ }
+ else
+ {
+ VK_CALL(vkCmdDrawIndexedIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer,
+ arg_buffer_offset, max_command_count, signature_desc->ByteStride));
+ }
+ break;
+
+ case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH:
+ if (max_command_count != 1)
+ FIXME("Ignoring command count %u.\n", max_command_count);
+
+ if (count_buffer)
+ {
+ FIXME("Count buffers not supported for indirect dispatch.\n");
+ break;
+ }
+
+ if (!d3d12_command_list_update_compute_state(list))
+ {
+ WARN("Failed to update compute state, ignoring dispatch.\n");
+ return;
+ }
+
+ VK_CALL(vkCmdDispatchIndirect(list->vk_command_buffer,
+ arg_impl->u.vk_buffer, arg_buffer_offset));
+ break;
+
+ default:
+ FIXME("Ignoring unhandled argument type %#x.\n", arg_desc->Type);
+ break;
+ }
+ }
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_AtomicCopyBufferUINT(ID3D12GraphicsCommandList1 *iface,
+ ID3D12Resource *dst_buffer, UINT64 dst_offset,
+ ID3D12Resource *src_buffer, UINT64 src_offset,
+ UINT dependent_resource_count, ID3D12Resource * const *dependent_resources,
+ const D3D12_SUBRESOURCE_RANGE_UINT64 *dependent_sub_resource_ranges)
+{
+ FIXME("iface %p, dst_resource %p, dst_offset %#"PRIx64", src_resource %p, "
+ "src_offset %#"PRIx64", dependent_resource_count %u, "
+ "dependent_resources %p, dependent_sub_resource_ranges %p stub!\n",
+ iface, dst_buffer, dst_offset, src_buffer, src_offset,
+ dependent_resource_count, dependent_resources, dependent_sub_resource_ranges);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_AtomicCopyBufferUINT64(ID3D12GraphicsCommandList1 *iface,
+ ID3D12Resource *dst_buffer, UINT64 dst_offset,
+ ID3D12Resource *src_buffer, UINT64 src_offset,
+ UINT dependent_resource_count, ID3D12Resource * const *dependent_resources,
+ const D3D12_SUBRESOURCE_RANGE_UINT64 *dependent_sub_resource_ranges)
+{
+ FIXME("iface %p, dst_resource %p, dst_offset %#"PRIx64", src_resource %p, "
+ "src_offset %#"PRIx64", dependent_resource_count %u, "
+ "dependent_resources %p, dependent_sub_resource_ranges %p stub!\n",
+ iface, dst_buffer, dst_offset, src_buffer, src_offset,
+ dependent_resource_count, dependent_resources, dependent_sub_resource_ranges);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_OMSetDepthBounds(ID3D12GraphicsCommandList1 *iface,
+ FLOAT min, FLOAT max)
+{
+ FIXME("iface %p, min %.8e, max %.8e stub!\n", iface, min, max);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_SetSamplePositions(ID3D12GraphicsCommandList1 *iface,
+ UINT sample_count, UINT pixel_count, D3D12_SAMPLE_POSITION *sample_positions)
+{
+ FIXME("iface %p, sample_count %u, pixel_count %u, sample_positions %p stub!\n",
+ iface, sample_count, pixel_count, sample_positions);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresourceRegion(ID3D12GraphicsCommandList1 *iface,
+ ID3D12Resource *dst_resource, UINT dst_sub_resource_idx, UINT dst_x, UINT dst_y,
+ ID3D12Resource *src_resource, UINT src_sub_resource_idx,
+ D3D12_RECT *src_rect, DXGI_FORMAT format, D3D12_RESOLVE_MODE mode)
+{
+ FIXME("iface %p, dst_resource %p, dst_sub_resource_idx %u, "
+ "dst_x %u, dst_y %u, src_resource %p, src_sub_resource_idx %u, "
+ "src_rect %p, format %#x, mode %#x stub!\n",
+ iface, dst_resource, dst_sub_resource_idx, dst_x, dst_y,
+ src_resource, src_sub_resource_idx, src_rect, format, mode);
+}
+
+static const struct ID3D12GraphicsCommandList1Vtbl d3d12_command_list_vtbl =
+{
+ /* IUnknown methods */
+ d3d12_command_list_QueryInterface,
+ d3d12_command_list_AddRef,
+ d3d12_command_list_Release,
+ /* ID3D12Object methods */
+ d3d12_command_list_GetPrivateData,
+ d3d12_command_list_SetPrivateData,
+ d3d12_command_list_SetPrivateDataInterface,
+ d3d12_command_list_SetName,
+ /* ID3D12DeviceChild methods */
+ d3d12_command_list_GetDevice,
+ /* ID3D12CommandList methods */
+ d3d12_command_list_GetType,
+ /* ID3D12GraphicsCommandList methods */
+ d3d12_command_list_Close,
+ d3d12_command_list_Reset,
+ d3d12_command_list_ClearState,
+ d3d12_command_list_DrawInstanced,
+ d3d12_command_list_DrawIndexedInstanced,
+ d3d12_command_list_Dispatch,
+ d3d12_command_list_CopyBufferRegion,
+ d3d12_command_list_CopyTextureRegion,
+ d3d12_command_list_CopyResource,
+ d3d12_command_list_CopyTiles,
+ d3d12_command_list_ResolveSubresource,
+ d3d12_command_list_IASetPrimitiveTopology,
+ d3d12_command_list_RSSetViewports,
+ d3d12_command_list_RSSetScissorRects,
+ d3d12_command_list_OMSetBlendFactor,
+ d3d12_command_list_OMSetStencilRef,
+ d3d12_command_list_SetPipelineState,
+ d3d12_command_list_ResourceBarrier,
+ d3d12_command_list_ExecuteBundle,
+ d3d12_command_list_SetDescriptorHeaps,
+ d3d12_command_list_SetComputeRootSignature,
+ d3d12_command_list_SetGraphicsRootSignature,
+ d3d12_command_list_SetComputeRootDescriptorTable,
+ d3d12_command_list_SetGraphicsRootDescriptorTable,
+ d3d12_command_list_SetComputeRoot32BitConstant,
+ d3d12_command_list_SetGraphicsRoot32BitConstant,
+ d3d12_command_list_SetComputeRoot32BitConstants,
+ d3d12_command_list_SetGraphicsRoot32BitConstants,
+ d3d12_command_list_SetComputeRootConstantBufferView,
+ d3d12_command_list_SetGraphicsRootConstantBufferView,
+ d3d12_command_list_SetComputeRootShaderResourceView,
+ d3d12_command_list_SetGraphicsRootShaderResourceView,
+ d3d12_command_list_SetComputeRootUnorderedAccessView,
+ d3d12_command_list_SetGraphicsRootUnorderedAccessView,
+ d3d12_command_list_IASetIndexBuffer,
+ d3d12_command_list_IASetVertexBuffers,
+ d3d12_command_list_SOSetTargets,
+ d3d12_command_list_OMSetRenderTargets,
+ d3d12_command_list_ClearDepthStencilView,
+ d3d12_command_list_ClearRenderTargetView,
+ d3d12_command_list_ClearUnorderedAccessViewUint,
+ d3d12_command_list_ClearUnorderedAccessViewFloat,
+ d3d12_command_list_DiscardResource,
+ d3d12_command_list_BeginQuery,
+ d3d12_command_list_EndQuery,
+ d3d12_command_list_ResolveQueryData,
+ d3d12_command_list_SetPredication,
+ d3d12_command_list_SetMarker,
+ d3d12_command_list_BeginEvent,
+ d3d12_command_list_EndEvent,
+ d3d12_command_list_ExecuteIndirect,
+ /* ID3D12GraphicsCommandList1 methods */
+ d3d12_command_list_AtomicCopyBufferUINT,
+ d3d12_command_list_AtomicCopyBufferUINT64,
+ d3d12_command_list_OMSetDepthBounds,
+ d3d12_command_list_SetSamplePositions,
+ d3d12_command_list_ResolveSubresourceRegion,
+};
+
+static struct d3d12_command_list *unsafe_impl_from_ID3D12CommandList(ID3D12CommandList *iface)
+{
+ if (!iface)
+ return NULL;
+ assert(iface->lpVtbl == (struct ID3D12CommandListVtbl *)&d3d12_command_list_vtbl);
+ return CONTAINING_RECORD(iface, struct d3d12_command_list, ID3D12GraphicsCommandList1_iface);
+}
+
+static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d3d12_device *device,
+ D3D12_COMMAND_LIST_TYPE type, struct d3d12_command_allocator *allocator,
+ ID3D12PipelineState *initial_pipeline_state)
+{
+ HRESULT hr;
+
+ list->ID3D12GraphicsCommandList1_iface.lpVtbl = &d3d12_command_list_vtbl;
+ list->refcount = 1;
+
+ list->type = type;
+
+ if (FAILED(hr = vkd3d_private_store_init(&list->private_store)))
+ return hr;
+
+ d3d12_device_add_ref(list->device = device);
+
+ list->allocator = allocator;
+
+ if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list)))
+ {
+ d3d12_command_list_reset_state(list, initial_pipeline_state);
+ }
+ else
+ {
+ vkd3d_private_store_destroy(&list->private_store);
+ d3d12_device_release(device);
+ }
+
+ return hr;
+}
+
+HRESULT d3d12_command_list_create(struct d3d12_device *device,
+ UINT node_mask, D3D12_COMMAND_LIST_TYPE type, ID3D12CommandAllocator *allocator_iface,
+ ID3D12PipelineState *initial_pipeline_state, struct d3d12_command_list **list)
+{
+ struct d3d12_command_allocator *allocator;
+ struct d3d12_command_list *object;
+ HRESULT hr;
+
+ if (!(allocator = unsafe_impl_from_ID3D12CommandAllocator(allocator_iface)))
+ {
+ WARN("Command allocator is NULL.\n");
+ return E_INVALIDARG;
+ }
+
+ if (allocator->type != type)
+ {
+ WARN("Command list types do not match (allocator %#x, list %#x).\n",
+ allocator->type, type);
+ return E_INVALIDARG;
+ }
+
+ debug_ignored_node_mask(node_mask);
+
+ if (!(object = vkd3d_malloc(sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ if (FAILED(hr = d3d12_command_list_init(object, device, type, allocator, initial_pipeline_state)))
+ {
+ vkd3d_free(object);
+ return hr;
+ }
+
+ TRACE("Created command list %p.\n", object);
+
+ *list = object;
+
+ return S_OK;
+}
+
+/* ID3D12CommandQueue */
+static inline struct d3d12_command_queue *impl_from_ID3D12CommandQueue(ID3D12CommandQueue *iface)
+{
+ return CONTAINING_RECORD(iface, struct d3d12_command_queue, ID3D12CommandQueue_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_queue_QueryInterface(ID3D12CommandQueue *iface,
+ REFIID riid, void **object)
+{
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
+
+ if (IsEqualGUID(riid, &IID_ID3D12CommandQueue)
+ || IsEqualGUID(riid, &IID_ID3D12Pageable)
+ || IsEqualGUID(riid, &IID_ID3D12DeviceChild)
+ || IsEqualGUID(riid, &IID_ID3D12Object)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
+ ID3D12CommandQueue_AddRef(iface);
+ *object = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
+ *object = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d3d12_command_queue_AddRef(ID3D12CommandQueue *iface)
+{
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+ ULONG refcount = InterlockedIncrement(&command_queue->refcount);
+
+ TRACE("%p increasing refcount to %u.\n", command_queue, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d3d12_command_queue_Release(ID3D12CommandQueue *iface)
+{
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+ ULONG refcount = InterlockedDecrement(&command_queue->refcount);
+
+ TRACE("%p decreasing refcount to %u.\n", command_queue, refcount);
+
+ if (!refcount)
+ {
+ struct d3d12_device *device = command_queue->device;
+
+ vkd3d_private_store_destroy(&command_queue->private_store);
+
+ vkd3d_free(command_queue);
+
+ d3d12_device_release(device);
+ }
+
+ return refcount;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetPrivateData(ID3D12CommandQueue *iface,
+ REFGUID guid, UINT *data_size, void *data)
+{
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+
+ TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data);
+
+ return vkd3d_get_private_data(&command_queue->private_store, guid, data_size, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetPrivateData(ID3D12CommandQueue *iface,
+ REFGUID guid, UINT data_size, const void *data)
+{
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+
+ TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data);
+
+ return vkd3d_set_private_data(&command_queue->private_store, guid, data_size, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetPrivateDataInterface(ID3D12CommandQueue *iface,
+ REFGUID guid, const IUnknown *data)
+{
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+
+ TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
+
+ return vkd3d_set_private_data_interface(&command_queue->private_store, guid, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetName(ID3D12CommandQueue *iface, const WCHAR *name)
+{
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+ VkQueue vk_queue;
+ HRESULT hr;
+
+ TRACE("iface %p, name %s.\n", iface, debugstr_w(name, command_queue->device->wchar_size));
+
+ if (!(vk_queue = vkd3d_queue_acquire(command_queue->vkd3d_queue)))
+ {
+ ERR("Failed to acquire queue %p.\n", command_queue->vkd3d_queue);
+ return E_FAIL;
+ }
+
+ hr = vkd3d_set_vk_object_name(command_queue->device, (uint64_t)(uintptr_t)vk_queue,
+ VK_DEBUG_REPORT_OBJECT_TYPE_QUEUE_EXT, name);
+ vkd3d_queue_release(command_queue->vkd3d_queue);
+ return hr;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetDevice(ID3D12CommandQueue *iface, REFIID iid, void **device)
+{
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+
+ TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device);
+
+ return d3d12_device_query_interface(command_queue->device, iid, device);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_queue_UpdateTileMappings(ID3D12CommandQueue *iface,
+ ID3D12Resource *resource, UINT region_count,
+ const D3D12_TILED_RESOURCE_COORDINATE *region_start_coordinates,
+ const D3D12_TILE_REGION_SIZE *region_sizes,
+ UINT range_count,
+ const D3D12_TILE_RANGE_FLAGS *range_flags,
+ UINT *heap_range_offsets,
+ UINT *range_tile_counts,
+ D3D12_TILE_MAPPING_FLAGS flags)
+{
+ FIXME("iface %p, resource %p, region_count %u, region_start_coordinates %p, "
+ "region_sizes %p, range_count %u, range_flags %p, heap_range_offsets %p, "
+ "range_tile_counts %p, flags %#x stub!\n",
+ iface, resource, region_count, region_start_coordinates, region_sizes, range_count,
+ range_flags, heap_range_offsets, range_tile_counts, flags);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_queue_CopyTileMappings(ID3D12CommandQueue *iface,
+ ID3D12Resource *dst_resource,
+ const D3D12_TILED_RESOURCE_COORDINATE *dst_region_start_coordinate,
+ ID3D12Resource *src_resource,
+ const D3D12_TILED_RESOURCE_COORDINATE *src_region_start_coordinate,
+ const D3D12_TILE_REGION_SIZE *region_size,
+ D3D12_TILE_MAPPING_FLAGS flags)
+{
+ FIXME("iface %p, dst_resource %p, dst_region_start_coordinate %p, "
+ "src_resource %p, src_region_start_coordinate %p, region_size %p, flags %#x stub!\n",
+ iface, dst_resource, dst_region_start_coordinate, src_resource,
+ src_region_start_coordinate, region_size, flags);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12CommandQueue *iface,
+ UINT command_list_count, ID3D12CommandList * const *command_lists)
+{
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+ struct d3d12_command_list *cmd_list;
+ struct VkSubmitInfo submit_desc;
+ VkCommandBuffer *buffers;
+ VkQueue vk_queue;
+ unsigned int i;
+ VkResult vr;
+
+ TRACE("iface %p, command_list_count %u, command_lists %p.\n",
+ iface, command_list_count, command_lists);
+
+ vk_procs = &command_queue->device->vk_procs;
+
+ if (!(buffers = vkd3d_calloc(command_list_count, sizeof(*buffers))))
+ {
+ ERR("Failed to allocate command buffer array.\n");
+ return;
+ }
+
+ for (i = 0; i < command_list_count; ++i)
+ {
+ cmd_list = unsafe_impl_from_ID3D12CommandList(command_lists[i]);
+
+ if (cmd_list->is_recording)
+ {
+ d3d12_device_mark_as_removed(command_queue->device, DXGI_ERROR_INVALID_CALL,
+ "Command list %p is in recording state.\n", command_lists[i]);
+ vkd3d_free(buffers);
+ return;
+ }
+
+ buffers[i] = cmd_list->vk_command_buffer;
+ }
+
+ submit_desc.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+ submit_desc.pNext = NULL;
+ submit_desc.waitSemaphoreCount = 0;
+ submit_desc.pWaitSemaphores = NULL;
+ submit_desc.pWaitDstStageMask = NULL;
+ submit_desc.commandBufferCount = command_list_count;
+ submit_desc.pCommandBuffers = buffers;
+ submit_desc.signalSemaphoreCount = 0;
+ submit_desc.pSignalSemaphores = NULL;
+
+ if (!(vk_queue = vkd3d_queue_acquire(command_queue->vkd3d_queue)))
+ {
+ ERR("Failed to acquire queue %p.\n", command_queue->vkd3d_queue);
+ vkd3d_free(buffers);
+ return;
+ }
+
+ if ((vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_desc, VK_NULL_HANDLE))) < 0)
+ ERR("Failed to submit queue(s), vr %d.\n", vr);
+
+ vkd3d_queue_release(command_queue->vkd3d_queue);
+
+ vkd3d_free(buffers);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_queue_SetMarker(ID3D12CommandQueue *iface,
+ UINT metadata, const void *data, UINT size)
+{
+ FIXME("iface %p, metadata %#x, data %p, size %u stub!\n",
+ iface, metadata, data, size);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_queue_BeginEvent(ID3D12CommandQueue *iface,
+ UINT metadata, const void *data, UINT size)
+{
+ FIXME("iface %p, metatdata %#x, data %p, size %u stub!\n",
+ iface, metadata, data, size);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_queue_EndEvent(ID3D12CommandQueue *iface)
+{
+ FIXME("iface %p stub!\n", iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *iface,
+ ID3D12Fence *fence_iface, UINT64 value)
+{
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+ VkSemaphore vk_semaphore = VK_NULL_HANDLE;
+ VkFence vk_fence = VK_NULL_HANDLE;
+ struct vkd3d_queue *vkd3d_queue;
+ struct d3d12_device *device;
+ struct d3d12_fence *fence;
+ VkSubmitInfo submit_info;
+ uint64_t sequence_number;
+ VkQueue vk_queue;
+ VkResult vr;
+ HRESULT hr;
+
+ TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence_iface, value);
+
+ device = command_queue->device;
+ vk_procs = &device->vk_procs;
+ vkd3d_queue = command_queue->vkd3d_queue;
+
+ fence = unsafe_impl_from_ID3D12Fence(fence_iface);
+
+ if ((vr = d3d12_fence_create_vk_fence(fence, &vk_fence)) < 0)
+ {
+ WARN("Failed to create Vulkan fence, vr %d.\n", vr);
+ goto fail_vkresult;
+ }
+
+ if (!(vk_queue = vkd3d_queue_acquire(vkd3d_queue)))
+ {
+ ERR("Failed to acquire queue %p.\n", vkd3d_queue);
+ hr = E_FAIL;
+ goto fail;
+ }
+
+ if ((vr = vkd3d_queue_create_vk_semaphore_locked(vkd3d_queue, device, &vk_semaphore)) < 0)
+ {
+ ERR("Failed to create Vulkan semaphore, vr %d.\n", vr);
+ vk_semaphore = VK_NULL_HANDLE;
+ }
+
+ submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+ submit_info.pNext = NULL;
+ submit_info.waitSemaphoreCount = 0;
+ submit_info.pWaitSemaphores = NULL;
+ submit_info.pWaitDstStageMask = NULL;
+ submit_info.commandBufferCount = 0;
+ submit_info.pCommandBuffers = NULL;
+ submit_info.signalSemaphoreCount = vk_semaphore ? 1 : 0;
+ submit_info.pSignalSemaphores = &vk_semaphore;
+
+ if ((vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, vk_fence))) >= 0)
+ {
+ sequence_number = ++vkd3d_queue->submitted_sequence_number;
+
+ /* We don't expect to overrun the 64-bit counter, but we handle it gracefully anyway. */
+ if (!sequence_number)
+ sequence_number = vkd3d_queue_reset_sequence_number_locked(vkd3d_queue);
+ }
+
+ vkd3d_queue_release(vkd3d_queue);
+
+ if (vr < 0)
+ {
+ WARN("Failed to submit signal operation, vr %d.\n", vr);
+ goto fail_vkresult;
+ }
+
+ if (vk_semaphore && SUCCEEDED(hr = d3d12_fence_add_vk_semaphore(fence, vk_semaphore, vk_fence, value)))
+ vk_semaphore = VK_NULL_HANDLE;
+
+ vr = VK_CALL(vkGetFenceStatus(device->vk_device, vk_fence));
+ if (vr == VK_NOT_READY)
+ {
+ if (SUCCEEDED(hr = vkd3d_enqueue_gpu_fence(&device->fence_worker, vk_fence, fence, value, vkd3d_queue, sequence_number)))
+ vk_fence = VK_NULL_HANDLE;
+ }
+ else if (vr == VK_SUCCESS)
+ {
+ TRACE("Already signaled %p, value %#"PRIx64".\n", fence, value);
+ hr = d3d12_fence_signal(fence, value, vk_fence);
+ vk_fence = VK_NULL_HANDLE;
+ vkd3d_queue_update_sequence_number(vkd3d_queue, sequence_number, device);
+ }
+ else
+ {
+ FIXME("Failed to get fence status, vr %d.\n", vr);
+ hr = hresult_from_vk_result(vr);
+ }
+
+ if (vk_fence || vk_semaphore)
+ {
+ /* In case of an unexpected failure, try to safely destroy Vulkan objects. */
+ vkd3d_queue_wait_idle(vkd3d_queue, vk_procs);
+ goto fail;
+ }
+
+ return hr;
+
+fail_vkresult:
+ hr = hresult_from_vk_result(vr);
+fail:
+ VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL));
+ VK_CALL(vkDestroySemaphore(device->vk_device, vk_semaphore, NULL));
+ return hr;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *iface,
+ ID3D12Fence *fence_iface, UINT64 value)
+{
+ static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+ const struct vkd3d_vk_device_procs *vk_procs;
+ struct vkd3d_signaled_semaphore *semaphore;
+ uint64_t completed_value = 0;
+ struct vkd3d_queue *queue;
+ struct d3d12_fence *fence;
+ VkSubmitInfo submit_info;
+ VkQueue vk_queue;
+ VkResult vr;
+ HRESULT hr;
+
+ TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence_iface, value);
+
+ vk_procs = &command_queue->device->vk_procs;
+ queue = command_queue->vkd3d_queue;
+
+ fence = unsafe_impl_from_ID3D12Fence(fence_iface);
+
+ semaphore = d3d12_fence_acquire_vk_semaphore(fence, value, &completed_value);
+ if (!semaphore && completed_value >= value)
+ {
+ /* We don't get a Vulkan semaphore if the fence was signaled on CPU. */
+ TRACE("Already signaled %p, value %#"PRIx64".\n", fence, completed_value);
+ return S_OK;
+ }
+
+ if (!(vk_queue = vkd3d_queue_acquire(queue)))
+ {
+ ERR("Failed to acquire queue %p.\n", queue);
+ hr = E_FAIL;
+ goto fail;
+ }
+
+ if (!semaphore)
+ {
+ if (command_queue->last_waited_fence == fence && command_queue->last_waited_fence_value >= value)
+ {
+ WARN("Already waited on fence %p, value %#"PRIx64".\n", fence, value);
+ }
+ else
+ {
+ FIXME("Failed to acquire Vulkan semaphore for fence %p, value %#"PRIx64
+ ", completed value %#"PRIx64".\n", fence, value, completed_value);
+ }
+
+ vkd3d_queue_release(queue);
+ return S_OK;
+ }
+
+ submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+ submit_info.pNext = NULL;
+ submit_info.waitSemaphoreCount = 1;
+ submit_info.pWaitSemaphores = &semaphore->vk_semaphore;
+ submit_info.pWaitDstStageMask = &wait_stage_mask;
+ submit_info.commandBufferCount = 0;
+ submit_info.pCommandBuffers = NULL;
+ submit_info.signalSemaphoreCount = 0;
+ submit_info.pSignalSemaphores = NULL;
+
+ if (!vkd3d_array_reserve((void **)&queue->semaphores, &queue->semaphores_size,
+ queue->semaphore_count + 1, sizeof(*queue->semaphores)))
+ {
+ ERR("Failed to allocate memory for semaphore.\n");
+ vkd3d_queue_release(queue);
+ hr = E_OUTOFMEMORY;
+ goto fail;
+ }
+
+ if ((vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE))) >= 0)
+ {
+ queue->semaphores[queue->semaphore_count].vk_semaphore = semaphore->vk_semaphore;
+ queue->semaphores[queue->semaphore_count].sequence_number = queue->submitted_sequence_number + 1;
+ ++queue->semaphore_count;
+
+ command_queue->last_waited_fence = fence;
+ command_queue->last_waited_fence_value = value;
+ }
+
+ vkd3d_queue_release(queue);
+
+ if (vr < 0)
+ {
+ WARN("Failed to submit wait operation, vr %d.\n", vr);
+ hr = hresult_from_vk_result(vr);
+ goto fail;
+ }
+
+ d3d12_fence_remove_vk_semaphore(fence, semaphore);
+ return S_OK;
+
+fail:
+ d3d12_fence_release_vk_semaphore(fence, semaphore);
+ return hr;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetTimestampFrequency(ID3D12CommandQueue *iface,
+ UINT64 *frequency)
+{
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+ struct d3d12_device *device = command_queue->device;
+
+ TRACE("iface %p, frequency %p.\n", iface, frequency);
+
+ if (!command_queue->vkd3d_queue->timestamp_bits)
+ {
+ WARN("Timestamp queries not supported.\n");
+ return E_FAIL;
+ }
+
+ *frequency = 1000000000 / device->vk_info.device_limits.timestampPeriod;
+
+ return S_OK;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetClockCalibration(ID3D12CommandQueue *iface,
+ UINT64 *gpu_timestamp, UINT64 *cpu_timestamp)
+{
+ FIXME("iface %p, gpu_timestamp %p, cpu_timestamp %p stub!\n",
+ iface, gpu_timestamp, cpu_timestamp);
+
+ return E_NOTIMPL;
+}
+
+static D3D12_COMMAND_QUEUE_DESC * STDMETHODCALLTYPE d3d12_command_queue_GetDesc(ID3D12CommandQueue *iface,
+ D3D12_COMMAND_QUEUE_DESC *desc)
+{
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+
+ TRACE("iface %p, desc %p.\n", iface, desc);
+
+ *desc = command_queue->desc;
+ return desc;
+}
+
+static const struct ID3D12CommandQueueVtbl d3d12_command_queue_vtbl =
+{
+ /* IUnknown methods */
+ d3d12_command_queue_QueryInterface,
+ d3d12_command_queue_AddRef,
+ d3d12_command_queue_Release,
+ /* ID3D12Object methods */
+ d3d12_command_queue_GetPrivateData,
+ d3d12_command_queue_SetPrivateData,
+ d3d12_command_queue_SetPrivateDataInterface,
+ d3d12_command_queue_SetName,
+ /* ID3D12DeviceChild methods */
+ d3d12_command_queue_GetDevice,
+ /* ID3D12CommandQueue methods */
+ d3d12_command_queue_UpdateTileMappings,
+ d3d12_command_queue_CopyTileMappings,
+ d3d12_command_queue_ExecuteCommandLists,
+ d3d12_command_queue_SetMarker,
+ d3d12_command_queue_BeginEvent,
+ d3d12_command_queue_EndEvent,
+ d3d12_command_queue_Signal,
+ d3d12_command_queue_Wait,
+ d3d12_command_queue_GetTimestampFrequency,
+ d3d12_command_queue_GetClockCalibration,
+ d3d12_command_queue_GetDesc,
+};
+
+static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue,
+ struct d3d12_device *device, const D3D12_COMMAND_QUEUE_DESC *desc)
+{
+ HRESULT hr;
+
+ queue->ID3D12CommandQueue_iface.lpVtbl = &d3d12_command_queue_vtbl;
+ queue->refcount = 1;
+
+ queue->desc = *desc;
+ if (!queue->desc.NodeMask)
+ queue->desc.NodeMask = 0x1;
+
+ if (!(queue->vkd3d_queue = d3d12_device_get_vkd3d_queue(device, desc->Type)))
+ return E_NOTIMPL;
+
+ queue->last_waited_fence = NULL;
+ queue->last_waited_fence_value = 0;
+
+ if (desc->Priority == D3D12_COMMAND_QUEUE_PRIORITY_GLOBAL_REALTIME)
+ {
+ FIXME("Global realtime priority is not implemented.\n");
+ return E_NOTIMPL;
+ }
+
+ if (desc->Priority)
+ FIXME("Ignoring priority %#x.\n", desc->Priority);
+ if (desc->Flags)
+ FIXME("Ignoring flags %#x.\n", desc->Flags);
+
+ if (FAILED(hr = vkd3d_private_store_init(&queue->private_store)))
+ return hr;
+
+ d3d12_device_add_ref(queue->device = device);
+
+ return S_OK;
+}
+
+HRESULT d3d12_command_queue_create(struct d3d12_device *device,
+ const D3D12_COMMAND_QUEUE_DESC *desc, struct d3d12_command_queue **queue)
+{
+ struct d3d12_command_queue *object;
+ HRESULT hr;
+
+ if (!(object = vkd3d_malloc(sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ if (FAILED(hr = d3d12_command_queue_init(object, device, desc)))
+ {
+ vkd3d_free(object);
+ return hr;
+ }
+
+ TRACE("Created command queue %p.\n", object);
+
+ *queue = object;
+
+ return S_OK;
+}
+
+uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue)
+{
+ struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue);
+
+ return d3d12_queue->vkd3d_queue->vk_family_index;
+}
+
+VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue)
+{
+ struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue);
+
+ return vkd3d_queue_acquire(d3d12_queue->vkd3d_queue);
+}
+
+void vkd3d_release_vk_queue(ID3D12CommandQueue *queue)
+{
+ struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue);
+
+ return vkd3d_queue_release(d3d12_queue->vkd3d_queue);
+}
+
+/* ID3D12CommandSignature */
+static inline struct d3d12_command_signature *impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface)
+{
+ return CONTAINING_RECORD(iface, struct d3d12_command_signature, ID3D12CommandSignature_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_signature_QueryInterface(ID3D12CommandSignature *iface,
+ REFIID iid, void **out)
+{
+ TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+ if (IsEqualGUID(iid, &IID_ID3D12CommandSignature)
+ || IsEqualGUID(iid, &IID_ID3D12Pageable)
+ || IsEqualGUID(iid, &IID_ID3D12DeviceChild)
+ || IsEqualGUID(iid, &IID_ID3D12Object)
+ || IsEqualGUID(iid, &IID_IUnknown))
+ {
+ ID3D12CommandSignature_AddRef(iface);
+ *out = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d3d12_command_signature_AddRef(ID3D12CommandSignature *iface)
+{
+ struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface);
+ ULONG refcount = InterlockedIncrement(&signature->refcount);
+
+ TRACE("%p increasing refcount to %u.\n", signature, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d3d12_command_signature_Release(ID3D12CommandSignature *iface)
+{
+ struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface);
+ ULONG refcount = InterlockedDecrement(&signature->refcount);
+
+ TRACE("%p decreasing refcount to %u.\n", signature, refcount);
+
+ if (!refcount)
+ {
+ struct d3d12_device *device = signature->device;
+
+ vkd3d_private_store_destroy(&signature->private_store);
+
+ vkd3d_free((void *)signature->desc.pArgumentDescs);
+ vkd3d_free(signature);
+
+ d3d12_device_release(device);
+ }
+
+ return refcount;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_signature_GetPrivateData(ID3D12CommandSignature *iface,
+ REFGUID guid, UINT *data_size, void *data)
+{
+ struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface);
+
+ TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data);
+
+ return vkd3d_get_private_data(&signature->private_store, guid, data_size, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetPrivateData(ID3D12CommandSignature *iface,
+ REFGUID guid, UINT data_size, const void *data)
+{
+ struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface);
+
+ TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data);
+
+ return vkd3d_set_private_data(&signature->private_store, guid, data_size, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetPrivateDataInterface(ID3D12CommandSignature *iface,
+ REFGUID guid, const IUnknown *data)
+{
+ struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface);
+
+ TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
+
+ return vkd3d_set_private_data_interface(&signature->private_store, guid, data);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetName(ID3D12CommandSignature *iface, const WCHAR *name)
+{
+ struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface);
+
+ TRACE("iface %p, name %s.\n", iface, debugstr_w(name, signature->device->wchar_size));
+
+ return name ? S_OK : E_INVALIDARG;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_signature_GetDevice(ID3D12CommandSignature *iface, REFIID iid, void **device)
+{
+ struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface);
+
+ TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device);
+
+ return d3d12_device_query_interface(signature->device, iid, device);
+}
+
+static const struct ID3D12CommandSignatureVtbl d3d12_command_signature_vtbl =
+{
+ /* IUnknown methods */
+ d3d12_command_signature_QueryInterface,
+ d3d12_command_signature_AddRef,
+ d3d12_command_signature_Release,
+ /* ID3D12Object methods */
+ d3d12_command_signature_GetPrivateData,
+ d3d12_command_signature_SetPrivateData,
+ d3d12_command_signature_SetPrivateDataInterface,
+ d3d12_command_signature_SetName,
+ /* ID3D12DeviceChild methods */
+ d3d12_command_signature_GetDevice,
+};
+
+struct d3d12_command_signature *unsafe_impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface)
+{
+ if (!iface)
+ return NULL;
+ assert(iface->lpVtbl == &d3d12_command_signature_vtbl);
+ return CONTAINING_RECORD(iface, struct d3d12_command_signature, ID3D12CommandSignature_iface);
+}
+
+HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_COMMAND_SIGNATURE_DESC *desc,
+ struct d3d12_command_signature **signature)
+{
+ struct d3d12_command_signature *object;
+ unsigned int i;
+ HRESULT hr;
+
+ for (i = 0; i < desc->NumArgumentDescs; ++i)
+ {
+ const D3D12_INDIRECT_ARGUMENT_DESC *argument_desc = &desc->pArgumentDescs[i];
+ switch (argument_desc->Type)
+ {
+ case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW:
+ case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED:
+ case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH:
+ if (i != desc->NumArgumentDescs - 1)
+ {
+ WARN("Draw/dispatch must be the last element of a command signature.\n");
+ return E_INVALIDARG;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ if (!(object = vkd3d_malloc(sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ object->ID3D12CommandSignature_iface.lpVtbl = &d3d12_command_signature_vtbl;
+ object->refcount = 1;
+
+ object->desc = *desc;
+ if (!(object->desc.pArgumentDescs = vkd3d_calloc(desc->NumArgumentDescs, sizeof(*desc->pArgumentDescs))))
+ {
+ vkd3d_free(object);
+ return E_OUTOFMEMORY;
+ }
+ memcpy((void *)object->desc.pArgumentDescs, desc->pArgumentDescs,
+ desc->NumArgumentDescs * sizeof(*desc->pArgumentDescs));
+
+ if (FAILED(hr = vkd3d_private_store_init(&object->private_store)))
+ {
+ vkd3d_free((void *)object->desc.pArgumentDescs);
+ vkd3d_free(object);
+ return hr;
+ }
+
+ d3d12_device_add_ref(object->device = device);
+
+ TRACE("Created command signature %p.\n", object);
+
+ *signature = object;
+
+ return S_OK;
+}
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 0624318..0a29988 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -1436,11 +1436,25 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device,
}
if (vulkan_info->EXT_descriptor_indexing && descriptor_indexing
- && (descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind
- || descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind
+ && descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind
+ && descriptor_indexing->descriptorBindingSampledImageUpdateAfterBind
+ && descriptor_indexing->descriptorBindingStorageImageUpdateAfterBind
+ && descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind)
+ {
+ TRACE("Enabling VK_EXT_descriptor_indexing for volatile descriptor updates.\n");
+ }
+ else
+ {
+ WARN("VK_EXT_descriptor indexing not supported in sufficient capacity. Volatile descriptor updates will not work.\n");
+ vulkan_info->EXT_descriptor_indexing = false;
+ }
+
+ if (vulkan_info->EXT_descriptor_indexing && descriptor_indexing
+ && (descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind
|| descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind
+ || descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind
|| descriptor_indexing->descriptorBindingStorageTexelBufferUpdateAfterBind)
- && !physical_device_info->descriptor_indexing_properties.robustBufferAccessUpdateAfterBind)
+ && !physical_device_info->descriptor_indexing_properties.robustBufferAccessUpdateAfterBind)
{
WARN("Disabling robust buffer access for the update after bind feature.\n");
features->robustBufferAccess = VK_FALSE;
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index a321fa4..50cff1f 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -745,21 +745,43 @@ static HRESULT vkd3d_create_descriptor_set_layout(struct d3d12_device *device,
VkDescriptorSetLayoutCreateFlags flags, unsigned int binding_count,
const VkDescriptorSetLayoutBinding *bindings, VkDescriptorSetLayout *set_layout)
{
+ unsigned int i;
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
VkDescriptorSetLayoutCreateInfo set_desc;
VkResult vr;
+ VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_info;
+ VkDescriptorBindingFlagsEXT *binding_flags = NULL;
set_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
set_desc.pNext = NULL;
set_desc.flags = flags;
set_desc.bindingCount = binding_count;
set_desc.pBindings = bindings;
+
+ if (!(flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR) && device->vk_info.EXT_descriptor_indexing)
+ {
+ set_desc.flags |= VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT;
+ flags_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT;
+ flags_info.pNext = NULL;
+ flags_info.bindingCount = binding_count;
+ binding_flags = vkd3d_malloc(sizeof(*binding_flags) * binding_count);
+ for (i = 0; i < binding_count; i++)
+ {
+ binding_flags[i] = VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT |
+ VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT_EXT;
+ }
+ flags_info.pBindingFlags = binding_flags;
+ set_desc.pNext = &flags_info;
+ }
+
if ((vr = VK_CALL(vkCreateDescriptorSetLayout(device->vk_device, &set_desc, NULL, set_layout))) < 0)
{
WARN("Failed to create Vulkan descriptor set layout, vr %d.\n", vr);
+ vkd3d_free(binding_flags);
return hresult_from_vk_result(vr);
}
+ vkd3d_free(binding_flags);
return S_OK;
}
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 84b5ff2..9dd0973 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -896,13 +896,16 @@ struct vkd3d_pipeline_bindings
const struct d3d12_root_signature *root_signature;
VkDescriptorSet descriptor_set;
+ VkDescriptorSet uav_counter_descriptor_set;
+ VkDescriptorSet descriptor_set_bound;
+ VkDescriptorSet uav_counter_descriptor_set_bound;
bool in_use;
+ bool uav_counter_in_use;
D3D12_GPU_DESCRIPTOR_HANDLE descriptor_tables[D3D12_MAX_ROOT_COST];
uint64_t descriptor_table_dirty_mask;
uint64_t descriptor_table_active_mask;
- VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS];
uint8_t uav_counter_dirty_mask;
/* Needed when VK_KHR_push_descriptor is not available. */
@@ -911,6 +914,16 @@ struct vkd3d_pipeline_bindings
uint32_t push_descriptor_active_mask;
};
+struct d3d12_deferred_descriptor_set_update
+{
+ const struct d3d12_desc *base_descriptor;
+ unsigned int index;
+
+ const struct d3d12_root_signature *root_signature;
+ VkDescriptorSet descriptor_set;
+ bool uav;
+};
+
/* ID3D12CommandList */
struct d3d12_command_list
{
@@ -954,6 +967,10 @@ struct d3d12_command_list
VkBuffer so_counter_buffers[D3D12_SO_BUFFER_SLOT_COUNT];
VkDeviceSize so_counter_buffer_offsets[D3D12_SO_BUFFER_SLOT_COUNT];
+ struct d3d12_deferred_descriptor_set_update *descriptor_updates;
+ size_t descriptor_updates_size;
+ size_t descriptor_updates_count;
+
struct vkd3d_private_store private_store;
};
diff --git a/libs/vkd3d/vkd3d_private.h.orig b/libs/vkd3d/vkd3d_private.h.orig
new file mode 100644
index 0000000..84b5ff2
--- /dev/null
+++ b/libs/vkd3d/vkd3d_private.h.orig
@@ -0,0 +1,1299 @@
+/*
+ * Copyright 2016 Józef Kucia for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __VKD3D_PRIVATE_H
+#define __VKD3D_PRIVATE_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define VK_NO_PROTOTYPES
+
+#include "vkd3d_common.h"
+#include "vkd3d_memory.h"
+#include "vkd3d_utf8.h"
+#include "list.h"
+#include "rbtree.h"
+
+#include "vkd3d.h"
+#include "vkd3d_shader.h"
+
+#include <assert.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <pthread.h>
+#include <stdbool.h>
+
+#define VK_CALL(f) (vk_procs->f)
+
+#define VKD3D_DESCRIPTOR_MAGIC_FREE 0x00000000u
+#define VKD3D_DESCRIPTOR_MAGIC_CBV 0x00564243u
+#define VKD3D_DESCRIPTOR_MAGIC_SRV 0x00565253u
+#define VKD3D_DESCRIPTOR_MAGIC_UAV 0x00564155u
+#define VKD3D_DESCRIPTOR_MAGIC_SAMPLER 0x504d4153u
+#define VKD3D_DESCRIPTOR_MAGIC_DSV 0x00565344u
+#define VKD3D_DESCRIPTOR_MAGIC_RTV 0x00565452u
+
+#define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 6u
+#define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u
+#define VKD3D_MAX_SHADER_EXTENSIONS 1u
+#define VKD3D_MAX_SHADER_STAGES 5u
+#define VKD3D_MAX_VK_SYNC_OBJECTS 4u
+
+struct d3d12_command_list;
+struct d3d12_device;
+struct d3d12_resource;
+
+struct vkd3d_vk_global_procs
+{
+ PFN_vkCreateInstance vkCreateInstance;
+ PFN_vkEnumerateInstanceExtensionProperties vkEnumerateInstanceExtensionProperties;
+ PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr;
+};
+
+#define DECLARE_VK_PFN(name) PFN_##name name;
+struct vkd3d_vk_instance_procs
+{
+#define VK_INSTANCE_PFN DECLARE_VK_PFN
+#define VK_INSTANCE_EXT_PFN DECLARE_VK_PFN
+#include "vulkan_procs.h"
+};
+
+struct vkd3d_vk_device_procs
+{
+#define VK_INSTANCE_PFN DECLARE_VK_PFN
+#define VK_DEVICE_PFN DECLARE_VK_PFN
+#define VK_DEVICE_EXT_PFN DECLARE_VK_PFN
+#include "vulkan_procs.h"
+};
+#undef DECLARE_VK_PFN
+
+HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN;
+HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN;
+HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN;
+
+struct vkd3d_vulkan_info
+{
+ /* KHR instance extensions */
+ bool KHR_get_physical_device_properties2;
+ /* EXT instance extensions */
+ bool EXT_debug_report;
+
+ /* KHR device extensions */
+ bool KHR_dedicated_allocation;
+ bool KHR_draw_indirect_count;
+ bool KHR_get_memory_requirements2;
+ bool KHR_image_format_list;
+ bool KHR_maintenance3;
+ bool KHR_push_descriptor;
+ /* EXT device extensions */
+ bool EXT_conditional_rendering;
+ bool EXT_debug_marker;
+ bool EXT_depth_clip_enable;
+ bool EXT_descriptor_indexing;
+ bool EXT_shader_demote_to_helper_invocation;
+ bool EXT_texel_buffer_alignment;
+ bool EXT_transform_feedback;
+ bool EXT_vertex_attribute_divisor;
+
+ bool rasterization_stream;
+ bool transform_feedback_queries;
+
+ bool vertex_attrib_zero_divisor;
+ unsigned int max_vertex_attrib_divisor;
+
+ VkPhysicalDeviceLimits device_limits;
+ VkPhysicalDeviceSparseProperties sparse_properties;
+
+ VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties;
+
+ unsigned int shader_extension_count;
+ enum vkd3d_shader_target_extension shader_extensions[VKD3D_MAX_SHADER_EXTENSIONS];
+
+ D3D_FEATURE_LEVEL max_feature_level;
+};
+
+enum vkd3d_config_flags
+{
+ VKD3D_CONFIG_FLAG_VULKAN_DEBUG = 0x00000001,
+};
+
+struct vkd3d_instance
+{
+ VkInstance vk_instance;
+ struct vkd3d_vk_instance_procs vk_procs;
+
+ PFN_vkd3d_signal_event signal_event;
+ PFN_vkd3d_create_thread create_thread;
+ PFN_vkd3d_join_thread join_thread;
+ size_t wchar_size;
+
+ struct vkd3d_vulkan_info vk_info;
+ struct vkd3d_vk_global_procs vk_global_procs;
+ void *libvulkan;
+
+ uint64_t config_flags;
+
+ VkDebugReportCallbackEXT vk_debug_callback;
+
+ LONG refcount;
+};
+
+union vkd3d_thread_handle
+{
+ pthread_t pthread;
+ void *handle;
+};
+
+HRESULT vkd3d_create_thread(struct vkd3d_instance *instance,
+ PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN;
+HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN;
+
+struct vkd3d_waiting_fence
+{
+ struct d3d12_fence *fence;
+ uint64_t value;
+ struct vkd3d_queue *queue;
+ uint64_t queue_sequence_number;
+};
+
+struct vkd3d_fence_worker
+{
+ union vkd3d_thread_handle thread;
+ pthread_mutex_t mutex;
+ pthread_cond_t cond;
+ pthread_cond_t fence_destruction_cond;
+ bool should_exit;
+ bool pending_fence_destruction;
+
+ size_t enqueued_fence_count;
+ struct vkd3d_enqueued_fence
+ {
+ VkFence vk_fence;
+ struct vkd3d_waiting_fence waiting_fence;
+ } *enqueued_fences;
+ size_t enqueued_fences_size;
+
+ size_t fence_count;
+ VkFence *vk_fences;
+ size_t vk_fences_size;
+ struct vkd3d_waiting_fence *fences;
+ size_t fences_size;
+
+ struct d3d12_device *device;
+};
+
+HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker,
+ struct d3d12_device *device) DECLSPEC_HIDDEN;
+HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker,
+ struct d3d12_device *device) DECLSPEC_HIDDEN;
+
+struct vkd3d_gpu_va_allocation
+{
+ D3D12_GPU_VIRTUAL_ADDRESS base;
+ SIZE_T size;
+ void *ptr;
+};
+
+struct vkd3d_gpu_va_slab
+{
+ SIZE_T size;
+ void *ptr;
+};
+
+struct vkd3d_gpu_va_allocator
+{
+ pthread_mutex_t mutex;
+
+ D3D12_GPU_VIRTUAL_ADDRESS fallback_floor;
+ struct vkd3d_gpu_va_allocation *fallback_allocations;
+ size_t fallback_allocations_size;
+ size_t fallback_allocation_count;
+
+ struct vkd3d_gpu_va_slab *slabs;
+ struct vkd3d_gpu_va_slab *free_slab;
+};
+
+D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator,
+ size_t alignment, size_t size, void *ptr) DECLSPEC_HIDDEN;
+void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator,
+ D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN;
+void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator,
+ D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN;
+
+struct vkd3d_render_pass_key
+{
+ unsigned int attachment_count;
+ bool depth_enable;
+ bool stencil_enable;
+ bool depth_stencil_write;
+ bool padding;
+ unsigned int sample_count;
+ VkFormat vk_formats[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1];
+};
+
+struct vkd3d_render_pass_entry;
+
+struct vkd3d_render_pass_cache
+{
+ struct vkd3d_render_pass_entry *render_passes;
+ size_t render_pass_count;
+ size_t render_passes_size;
+};
+
+void vkd3d_render_pass_cache_cleanup(struct vkd3d_render_pass_cache *cache,
+ struct d3d12_device *device) DECLSPEC_HIDDEN;
+HRESULT vkd3d_render_pass_cache_find(struct vkd3d_render_pass_cache *cache,
+ struct d3d12_device *device, const struct vkd3d_render_pass_key *key,
+ VkRenderPass *vk_render_pass) DECLSPEC_HIDDEN;
+void vkd3d_render_pass_cache_init(struct vkd3d_render_pass_cache *cache) DECLSPEC_HIDDEN;
+
+struct vkd3d_private_store
+{
+ pthread_mutex_t mutex;
+
+ struct list content;
+};
+
+struct vkd3d_private_data
+{
+ struct list entry;
+
+ GUID tag;
+ unsigned int size;
+ bool is_object;
+ union
+ {
+ BYTE data[1];
+ IUnknown *object;
+ } u;
+};
+
+static inline void vkd3d_private_data_destroy(struct vkd3d_private_data *data)
+{
+ if (data->is_object)
+ IUnknown_Release(data->u.object);
+ list_remove(&data->entry);
+ vkd3d_free(data);
+}
+
+static inline HRESULT vkd3d_private_store_init(struct vkd3d_private_store *store)
+{
+ int rc;
+
+ list_init(&store->content);
+
+ if ((rc = pthread_mutex_init(&store->mutex, NULL)))
+ ERR("Failed to initialize mutex, error %d.\n", rc);
+
+ return hresult_from_errno(rc);
+}
+
+static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store)
+{
+ struct vkd3d_private_data *data, *cursor;
+
+ LIST_FOR_EACH_ENTRY_SAFE(data, cursor, &store->content, struct vkd3d_private_data, entry)
+ {
+ vkd3d_private_data_destroy(data);
+ }
+
+ pthread_mutex_destroy(&store->mutex);
+}
+
+HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store,
+ const GUID *tag, unsigned int *out_size, void *out) DECLSPEC_HIDDEN;
+HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store,
+ const GUID *tag, unsigned int data_size, const void *data) DECLSPEC_HIDDEN;
+HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store,
+ const GUID *tag, const IUnknown *object) DECLSPEC_HIDDEN;
+
+struct vkd3d_signaled_semaphore
+{
+ struct list entry;
+ uint64_t value;
+ VkSemaphore vk_semaphore;
+ VkFence vk_fence;
+ bool is_acquired;
+};
+
+/* ID3D12Fence */
+struct d3d12_fence
+{
+ ID3D12Fence ID3D12Fence_iface;
+ LONG refcount;
+
+ uint64_t value;
+ pthread_mutex_t mutex;
+
+ struct vkd3d_waiting_event
+ {
+ uint64_t value;
+ HANDLE event;
+ } *events;
+ size_t events_size;
+ size_t event_count;
+
+ struct list semaphores;
+ unsigned int semaphore_count;
+
+ LONG pending_worker_operation_count;
+
+ VkFence old_vk_fences[VKD3D_MAX_VK_SYNC_OBJECTS];
+
+ struct d3d12_device *device;
+
+ struct vkd3d_private_store private_store;
+};
+
+HRESULT d3d12_fence_create(struct d3d12_device *device,
+ uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN;
+
+/* ID3D12Heap */
+struct d3d12_heap
+{
+ ID3D12Heap ID3D12Heap_iface;
+ LONG refcount;
+
+ bool is_private;
+ D3D12_HEAP_DESC desc;
+
+ pthread_mutex_t mutex;
+
+ VkDeviceMemory vk_memory;
+ void *map_ptr;
+ unsigned int map_count;
+ uint32_t vk_memory_type;
+
+ struct d3d12_device *device;
+
+ struct vkd3d_private_store private_store;
+};
+
+HRESULT d3d12_heap_create(struct d3d12_device *device, const D3D12_HEAP_DESC *desc,
+ const struct d3d12_resource *resource, struct d3d12_heap **heap) DECLSPEC_HIDDEN;
+struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) DECLSPEC_HIDDEN;
+
+#define VKD3D_RESOURCE_PUBLIC_FLAGS \
+ (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION)
+#define VKD3D_RESOURCE_EXTERNAL 0x00000004
+#define VKD3D_RESOURCE_DEDICATED_HEAP 0x00000008
+#define VKD3D_RESOURCE_LINEAR_TILING 0x00000010
+
+/* ID3D12Resource */
+struct d3d12_resource
+{
+ ID3D12Resource ID3D12Resource_iface;
+ LONG refcount;
+ LONG internal_refcount;
+
+ D3D12_RESOURCE_DESC desc;
+
+ D3D12_GPU_VIRTUAL_ADDRESS gpu_address;
+ union
+ {
+ VkBuffer vk_buffer;
+ VkImage vk_image;
+ } u;
+ unsigned int flags;
+
+ unsigned int map_count;
+
+ struct d3d12_heap *heap;
+ uint64_t heap_offset;
+
+ D3D12_RESOURCE_STATES initial_state;
+ D3D12_RESOURCE_STATES present_state;
+
+ struct d3d12_device *device;
+
+ struct vkd3d_private_store private_store;
+};
+
+static inline bool d3d12_resource_is_buffer(const struct d3d12_resource *resource)
+{
+ return resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER;
+}
+
+static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resource)
+{
+ return resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER;
+}
+
+bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) DECLSPEC_HIDDEN;
+HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) DECLSPEC_HIDDEN;
+
+HRESULT d3d12_committed_resource_create(struct d3d12_device *device,
+ const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,
+ const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state,
+ const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN;
+HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, uint64_t heap_offset,
+ const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state,
+ const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN;
+HRESULT d3d12_reserved_resource_create(struct d3d12_device *device,
+ const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state,
+ const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN;
+struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) DECLSPEC_HIDDEN;
+
+HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer,
+ const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,
+ VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size) DECLSPEC_HIDDEN;
+HRESULT vkd3d_create_buffer(struct d3d12_device *device,
+ const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,
+ const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer) DECLSPEC_HIDDEN;
+HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device,
+ const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_ALLOCATION_INFO *allocation_info) DECLSPEC_HIDDEN;
+
+enum vkd3d_view_type
+{
+ VKD3D_VIEW_TYPE_BUFFER,
+ VKD3D_VIEW_TYPE_IMAGE,
+ VKD3D_VIEW_TYPE_SAMPLER,
+};
+
+struct vkd3d_view
+{
+ LONG refcount;
+ enum vkd3d_view_type type;
+ union
+ {
+ VkBufferView vk_buffer_view;
+ VkImageView vk_image_view;
+ VkSampler vk_sampler;
+ } u;
+ VkBufferView vk_counter_view;
+ const struct vkd3d_format *format;
+ union
+ {
+ struct
+ {
+ VkDeviceSize offset;
+ VkDeviceSize size;
+ } buffer;
+ struct
+ {
+ VkImageViewType vk_view_type;
+ unsigned int miplevel_idx;
+ unsigned int layer_idx;
+ unsigned int layer_count;
+ } texture;
+ } info;
+};
+
+void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) DECLSPEC_HIDDEN;
+void vkd3d_view_incref(struct vkd3d_view *view) DECLSPEC_HIDDEN;
+
+struct d3d12_desc
+{
+ uint32_t magic;
+ VkDescriptorType vk_descriptor_type;
+ union
+ {
+ VkDescriptorBufferInfo vk_cbv_info;
+ struct vkd3d_view *view;
+ } u;
+};
+
+static inline struct d3d12_desc *d3d12_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle)
+{
+ return (struct d3d12_desc *)cpu_handle.ptr;
+}
+
+static inline struct d3d12_desc *d3d12_desc_from_gpu_handle(D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle)
+{
+ return (struct d3d12_desc *)(intptr_t)gpu_handle.ptr;
+}
+
+void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src,
+ struct d3d12_device *device) DECLSPEC_HIDDEN;
+void d3d12_desc_create_cbv(struct d3d12_desc *descriptor,
+ struct d3d12_device *device, const D3D12_CONSTANT_BUFFER_VIEW_DESC *desc) DECLSPEC_HIDDEN;
+void d3d12_desc_create_srv(struct d3d12_desc *descriptor,
+ struct d3d12_device *device, struct d3d12_resource *resource,
+ const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN;
+void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *device,
+ struct d3d12_resource *resource, struct d3d12_resource *counter_resource,
+ const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) DECLSPEC_HIDDEN;
+void d3d12_desc_create_sampler(struct d3d12_desc *sampler,
+ struct d3d12_device *device, const D3D12_SAMPLER_DESC *desc) DECLSPEC_HIDDEN;
+void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src,
+ struct d3d12_device *device) DECLSPEC_HIDDEN;
+
+bool vkd3d_create_raw_buffer_view(struct d3d12_device *device,
+ D3D12_GPU_VIRTUAL_ADDRESS gpu_address, VkBufferView *vk_buffer_view) DECLSPEC_HIDDEN;
+HRESULT vkd3d_create_static_sampler(struct d3d12_device *device,
+ const D3D12_STATIC_SAMPLER_DESC *desc, VkSampler *vk_sampler) DECLSPEC_HIDDEN;
+
+struct d3d12_rtv_desc
+{
+ uint32_t magic;
+ VkSampleCountFlagBits sample_count;
+ const struct vkd3d_format *format;
+ uint64_t width;
+ unsigned int height;
+ unsigned int layer_count;
+ struct vkd3d_view *view;
+ struct d3d12_resource *resource;
+};
+
+static inline struct d3d12_rtv_desc *d3d12_rtv_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle)
+{
+ return (struct d3d12_rtv_desc *)cpu_handle.ptr;
+}
+
+void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_device *device,
+ struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN;
+
+struct d3d12_dsv_desc
+{
+ uint32_t magic;
+ VkSampleCountFlagBits sample_count;
+ const struct vkd3d_format *format;
+ uint64_t width;
+ unsigned int height;
+ unsigned int layer_count;
+ struct vkd3d_view *view;
+ struct d3d12_resource *resource;
+};
+
+static inline struct d3d12_dsv_desc *d3d12_dsv_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle)
+{
+ return (struct d3d12_dsv_desc *)cpu_handle.ptr;
+}
+
+void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_device *device,
+ struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN;
+
+/* ID3D12DescriptorHeap */
+struct d3d12_descriptor_heap
+{
+ ID3D12DescriptorHeap ID3D12DescriptorHeap_iface;
+ LONG refcount;
+
+ D3D12_DESCRIPTOR_HEAP_DESC desc;
+
+ struct d3d12_device *device;
+
+ struct vkd3d_private_store private_store;
+
+ BYTE descriptors[];
+};
+
+HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device,
+ const D3D12_DESCRIPTOR_HEAP_DESC *desc, struct d3d12_descriptor_heap **descriptor_heap) DECLSPEC_HIDDEN;
+
+/* ID3D12QueryHeap */
+struct d3d12_query_heap
+{
+ ID3D12QueryHeap ID3D12QueryHeap_iface;
+ LONG refcount;
+
+ VkQueryPool vk_query_pool;
+
+ struct d3d12_device *device;
+
+ struct vkd3d_private_store private_store;
+
+ uint64_t availability_mask[];
+};
+
+HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_HEAP_DESC *desc,
+ struct d3d12_query_heap **heap) DECLSPEC_HIDDEN;
+struct d3d12_query_heap *unsafe_impl_from_ID3D12QueryHeap(ID3D12QueryHeap *iface) DECLSPEC_HIDDEN;
+
+/* A Vulkan query has to be issued at least one time before the result is
+ * available. In D3D12 it is legal to get query reults for not issued queries.
+ */
+static inline bool d3d12_query_heap_is_result_available(const struct d3d12_query_heap *heap,
+ unsigned int query_index)
+{
+ unsigned int index = query_index / (sizeof(*heap->availability_mask) * CHAR_BIT);
+ unsigned int shift = query_index % (sizeof(*heap->availability_mask) * CHAR_BIT);
+ return heap->availability_mask[index] & ((uint64_t)1 << shift);
+}
+
+static inline void d3d12_query_heap_mark_result_as_available(struct d3d12_query_heap *heap,
+ unsigned int query_index)
+{
+ unsigned int index = query_index / (sizeof(*heap->availability_mask) * CHAR_BIT);
+ unsigned int shift = query_index % (sizeof(*heap->availability_mask) * CHAR_BIT);
+ heap->availability_mask[index] |= (uint64_t)1 << shift;
+}
+
+struct d3d12_root_descriptor_table_range
+{
+ unsigned int offset;
+ unsigned int descriptor_count;
+ uint32_t binding;
+
+ uint32_t descriptor_magic;
+ unsigned int base_register_idx;
+};
+
+struct d3d12_root_descriptor_table
+{
+ unsigned int range_count;
+ struct d3d12_root_descriptor_table_range *ranges;
+};
+
+struct d3d12_root_constant
+{
+ VkShaderStageFlags stage_flags;
+ uint32_t offset;
+};
+
+struct d3d12_root_descriptor
+{
+ uint32_t binding;
+};
+
+struct d3d12_root_parameter
+{
+ D3D12_ROOT_PARAMETER_TYPE parameter_type;
+ union
+ {
+ struct d3d12_root_constant constant;
+ struct d3d12_root_descriptor descriptor;
+ struct d3d12_root_descriptor_table descriptor_table;
+ } u;
+};
+
+/* ID3D12RootSignature */
+struct d3d12_root_signature
+{
+ ID3D12RootSignature ID3D12RootSignature_iface;
+ LONG refcount;
+
+ VkPipelineLayout vk_pipeline_layout;
+ VkDescriptorSetLayout vk_push_set_layout;
+ VkDescriptorSetLayout vk_set_layout;
+
+ struct d3d12_root_parameter *parameters;
+ unsigned int parameter_count;
+ uint32_t main_set;
+
+ uint64_t descriptor_table_mask;
+ uint32_t push_descriptor_mask;
+
+ D3D12_ROOT_SIGNATURE_FLAGS flags;
+
+ unsigned int descriptor_count;
+ struct vkd3d_shader_resource_binding *descriptor_mapping;
+
+ unsigned int root_constant_count;
+ struct vkd3d_shader_push_constant_buffer *root_constants;
+
+ unsigned int root_descriptor_count;
+
+ unsigned int push_constant_range_count;
+ /* Only a single push constant range may include the same stage in Vulkan. */
+ VkPushConstantRange push_constant_ranges[D3D12_SHADER_VISIBILITY_PIXEL + 1];
+
+ unsigned int static_sampler_count;
+ VkSampler *static_samplers;
+
+ struct d3d12_device *device;
+
+ struct vkd3d_private_store private_store;
+};
+
+HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *bytecode,
+ size_t bytecode_length, struct d3d12_root_signature **root_signature) DECLSPEC_HIDDEN;
+struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN;
+
+int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc,
+ struct vkd3d_versioned_root_signature_desc *desc) DECLSPEC_HIDDEN;
+
+struct d3d12_graphics_pipeline_state
+{
+ VkPipelineShaderStageCreateInfo stages[VKD3D_MAX_SHADER_STAGES];
+ size_t stage_count;
+
+ VkVertexInputAttributeDescription attributes[D3D12_VS_INPUT_REGISTER_COUNT];
+ VkVertexInputRate input_rates[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
+ VkVertexInputBindingDivisorDescriptionEXT instance_divisors[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
+ size_t instance_divisor_count;
+ size_t attribute_count;
+
+ VkPipelineColorBlendAttachmentState blend_attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT];
+ unsigned int rt_count;
+ unsigned int null_attachment_mask;
+ VkFormat dsv_format;
+ VkFormat rtv_formats[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT];
+ VkRenderPass render_pass;
+
+ D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value;
+ VkPipelineRasterizationStateCreateInfo rs_desc;
+ VkPipelineMultisampleStateCreateInfo ms_desc;
+ VkPipelineDepthStencilStateCreateInfo ds_desc;
+
+ VkSampleMask sample_mask[2];
+ VkPipelineRasterizationDepthClipStateCreateInfoEXT rs_depth_clip_info;
+ VkPipelineRasterizationStateStreamCreateInfoEXT rs_stream_info;
+
+ const struct d3d12_root_signature *root_signature;
+
+ struct list compiled_pipelines;
+
+ bool xfb_enabled;
+};
+
+static inline unsigned int dsv_attachment_mask(const struct d3d12_graphics_pipeline_state *graphics)
+{
+ return 1u << graphics->rt_count;
+}
+
+struct d3d12_compute_pipeline_state
+{
+ VkPipeline vk_pipeline;
+};
+
+/* ID3D12PipelineState */
+struct d3d12_pipeline_state
+{
+ ID3D12PipelineState ID3D12PipelineState_iface;
+ LONG refcount;
+
+ union
+ {
+ struct d3d12_graphics_pipeline_state graphics;
+ struct d3d12_compute_pipeline_state compute;
+ } u;
+ VkPipelineBindPoint vk_bind_point;
+
+ VkPipelineLayout vk_pipeline_layout;
+ VkDescriptorSetLayout vk_set_layout;
+ uint32_t set_index;
+
+ struct vkd3d_shader_uav_counter_binding *uav_counters;
+ uint8_t uav_counter_mask;
+
+ struct d3d12_device *device;
+
+ struct vkd3d_private_store private_store;
+};
+
+static inline bool d3d12_pipeline_state_is_compute(const struct d3d12_pipeline_state *state)
+{
+ return state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE;
+}
+
+static inline bool d3d12_pipeline_state_is_graphics(const struct d3d12_pipeline_state *state)
+{
+ return state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_GRAPHICS;
+}
+
+static inline bool d3d12_pipeline_state_has_unknown_dsv_format(struct d3d12_pipeline_state *state)
+{
+ if (d3d12_pipeline_state_is_graphics(state))
+ {
+ struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics;
+
+ return graphics->null_attachment_mask & dsv_attachment_mask(graphics);
+ }
+
+ return false;
+}
+
+HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device,
+ const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN;
+HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device,
+ const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN;
+VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state,
+ D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides, VkFormat dsv_format,
+ VkRenderPass *vk_render_pass) DECLSPEC_HIDDEN;
+struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN;
+
+struct vkd3d_buffer
+{
+ VkBuffer vk_buffer;
+ VkDeviceMemory vk_memory;
+};
+
+/* ID3D12CommandAllocator */
+struct d3d12_command_allocator
+{
+ ID3D12CommandAllocator ID3D12CommandAllocator_iface;
+ LONG refcount;
+
+ D3D12_COMMAND_LIST_TYPE type;
+ VkQueueFlags vk_queue_flags;
+
+ VkCommandPool vk_command_pool;
+
+ VkDescriptorPool vk_descriptor_pool;
+
+ VkDescriptorPool *free_descriptor_pools;
+ size_t free_descriptor_pools_size;
+ size_t free_descriptor_pool_count;
+
+ VkRenderPass *passes;
+ size_t passes_size;
+ size_t pass_count;
+
+ VkFramebuffer *framebuffers;
+ size_t framebuffers_size;
+ size_t framebuffer_count;
+
+ VkDescriptorPool *descriptor_pools;
+ size_t descriptor_pools_size;
+ size_t descriptor_pool_count;
+
+ struct vkd3d_view **views;
+ size_t views_size;
+ size_t view_count;
+
+ VkBufferView *buffer_views;
+ size_t buffer_views_size;
+ size_t buffer_view_count;
+
+ struct vkd3d_buffer *transfer_buffers;
+ size_t transfer_buffers_size;
+ size_t transfer_buffer_count;
+
+ VkCommandBuffer *command_buffers;
+ size_t command_buffers_size;
+ size_t command_buffer_count;
+
+ struct d3d12_command_list *current_command_list;
+ struct d3d12_device *device;
+
+ struct vkd3d_private_store private_store;
+};
+
+HRESULT d3d12_command_allocator_create(struct d3d12_device *device,
+ D3D12_COMMAND_LIST_TYPE type, struct d3d12_command_allocator **allocator) DECLSPEC_HIDDEN;
+
+struct vkd3d_push_descriptor
+{
+ union
+ {
+ VkBufferView vk_buffer_view;
+ struct
+ {
+ VkBuffer vk_buffer;
+ VkDeviceSize offset;
+ } cbv;
+ } u;
+};
+
+struct vkd3d_pipeline_bindings
+{
+ const struct d3d12_root_signature *root_signature;
+
+ VkDescriptorSet descriptor_set;
+ bool in_use;
+
+ D3D12_GPU_DESCRIPTOR_HANDLE descriptor_tables[D3D12_MAX_ROOT_COST];
+ uint64_t descriptor_table_dirty_mask;
+ uint64_t descriptor_table_active_mask;
+
+ VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS];
+ uint8_t uav_counter_dirty_mask;
+
+ /* Needed when VK_KHR_push_descriptor is not available. */
+ struct vkd3d_push_descriptor push_descriptors[D3D12_MAX_ROOT_COST / 2];
+ uint32_t push_descriptor_dirty_mask;
+ uint32_t push_descriptor_active_mask;
+};
+
+/* ID3D12CommandList */
+struct d3d12_command_list
+{
+ ID3D12GraphicsCommandList1 ID3D12GraphicsCommandList1_iface;
+ LONG refcount;
+
+ D3D12_COMMAND_LIST_TYPE type;
+ VkQueueFlags vk_queue_flags;
+
+ bool is_recording;
+ bool is_valid;
+ VkCommandBuffer vk_command_buffer;
+
+ uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
+ D3D12_PRIMITIVE_TOPOLOGY primitive_topology;
+
+ DXGI_FORMAT index_buffer_format;
+
+ VkImageView rtvs[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT];
+ VkImageView dsv;
+ unsigned int fb_width;
+ unsigned int fb_height;
+ unsigned int fb_layer_count;
+ VkFormat dsv_format;
+
+ bool xfb_enabled;
+
+ bool is_predicated;
+
+ VkFramebuffer current_framebuffer;
+ VkPipeline current_pipeline;
+ VkRenderPass pso_render_pass;
+ VkRenderPass current_render_pass;
+ struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_RANGE_SIZE];
+
+ struct d3d12_pipeline_state *state;
+
+ struct d3d12_command_allocator *allocator;
+ struct d3d12_device *device;
+
+ VkBuffer so_counter_buffers[D3D12_SO_BUFFER_SLOT_COUNT];
+ VkDeviceSize so_counter_buffer_offsets[D3D12_SO_BUFFER_SLOT_COUNT];
+
+ struct vkd3d_private_store private_store;
+};
+
+HRESULT d3d12_command_list_create(struct d3d12_device *device,
+ UINT node_mask, D3D12_COMMAND_LIST_TYPE type, ID3D12CommandAllocator *allocator_iface,
+ ID3D12PipelineState *initial_pipeline_state, struct d3d12_command_list **list) DECLSPEC_HIDDEN;
+
+struct vkd3d_queue
+{
+ /* Access to VkQueue must be externally synchronized. */
+ pthread_mutex_t mutex;
+
+ VkQueue vk_queue;
+
+ uint64_t completed_sequence_number;
+ uint64_t submitted_sequence_number;
+
+ uint32_t vk_family_index;
+ VkQueueFlags vk_queue_flags;
+ uint32_t timestamp_bits;
+
+ struct
+ {
+ VkSemaphore vk_semaphore;
+ uint64_t sequence_number;
+ } *semaphores;
+ size_t semaphores_size;
+ size_t semaphore_count;
+
+ VkSemaphore old_vk_semaphores[VKD3D_MAX_VK_SYNC_OBJECTS];
+};
+
+VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue) DECLSPEC_HIDDEN;
+HRESULT vkd3d_queue_create(struct d3d12_device *device,
+ uint32_t family_index, const VkQueueFamilyProperties *properties,
+ struct vkd3d_queue **queue) DECLSPEC_HIDDEN;
+void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device) DECLSPEC_HIDDEN;
+void vkd3d_queue_release(struct vkd3d_queue *queue) DECLSPEC_HIDDEN;
+
+/* ID3D12CommandQueue */
+struct d3d12_command_queue
+{
+ ID3D12CommandQueue ID3D12CommandQueue_iface;
+ LONG refcount;
+
+ D3D12_COMMAND_QUEUE_DESC desc;
+
+ struct vkd3d_queue *vkd3d_queue;
+
+ const struct d3d12_fence *last_waited_fence;
+ uint64_t last_waited_fence_value;
+
+ struct d3d12_device *device;
+
+ struct vkd3d_private_store private_store;
+};
+
+HRESULT d3d12_command_queue_create(struct d3d12_device *device,
+ const D3D12_COMMAND_QUEUE_DESC *desc, struct d3d12_command_queue **queue) DECLSPEC_HIDDEN;
+
+/* ID3D12CommandSignature */
+struct d3d12_command_signature
+{
+ ID3D12CommandSignature ID3D12CommandSignature_iface;
+ LONG refcount;
+
+ D3D12_COMMAND_SIGNATURE_DESC desc;
+
+ struct d3d12_device *device;
+
+ struct vkd3d_private_store private_store;
+};
+
+HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_COMMAND_SIGNATURE_DESC *desc,
+ struct d3d12_command_signature **signature) DECLSPEC_HIDDEN;
+struct d3d12_command_signature *unsafe_impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface) DECLSPEC_HIDDEN;
+
+/* NULL resources */
+struct vkd3d_null_resources
+{
+ VkBuffer vk_buffer;
+ VkDeviceMemory vk_buffer_memory;
+
+ VkBuffer vk_storage_buffer;
+ VkDeviceMemory vk_storage_buffer_memory;
+
+ VkImage vk_2d_image;
+ VkDeviceMemory vk_2d_image_memory;
+
+ VkImage vk_2d_storage_image;
+ VkDeviceMemory vk_2d_storage_image_memory;
+};
+
+HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources,
+ struct d3d12_device *device) DECLSPEC_HIDDEN;
+void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources,
+ struct d3d12_device *device) DECLSPEC_HIDDEN;
+
+struct vkd3d_format_compatibility_list
+{
+ DXGI_FORMAT typeless_format;
+ unsigned int format_count;
+ VkFormat vk_formats[VKD3D_MAX_COMPATIBLE_FORMAT_COUNT];
+};
+
+/* ID3D12Device */
+struct d3d12_device
+{
+ ID3D12Device ID3D12Device_iface;
+ LONG refcount;
+
+ VkDevice vk_device;
+ VkPhysicalDevice vk_physical_device;
+ struct vkd3d_vk_device_procs vk_procs;
+ PFN_vkd3d_signal_event signal_event;
+ size_t wchar_size;
+
+ struct vkd3d_gpu_va_allocator gpu_va_allocator;
+ struct vkd3d_fence_worker fence_worker;
+
+ pthread_mutex_t mutex;
+ pthread_mutex_t desc_mutex[8];
+ struct vkd3d_render_pass_cache render_pass_cache;
+ VkPipelineCache vk_pipeline_cache;
+
+ VkPhysicalDeviceMemoryProperties memory_properties;
+
+ D3D12_FEATURE_DATA_D3D12_OPTIONS feature_options;
+
+ struct vkd3d_vulkan_info vk_info;
+
+ struct vkd3d_queue *direct_queue;
+ struct vkd3d_queue *compute_queue;
+ struct vkd3d_queue *copy_queue;
+ uint32_t queue_family_indices[VKD3D_MAX_QUEUE_FAMILY_COUNT];
+ unsigned int queue_family_count;
+
+ struct vkd3d_instance *vkd3d_instance;
+
+ IUnknown *parent;
+ LUID adapter_luid;
+
+ struct vkd3d_private_store private_store;
+
+ HRESULT removed_reason;
+
+ const struct vkd3d_format *depth_stencil_formats;
+ unsigned int format_compatibility_list_count;
+ const struct vkd3d_format_compatibility_list *format_compatibility_lists;
+ struct vkd3d_null_resources null_resources;
+};
+
+HRESULT d3d12_device_create(struct vkd3d_instance *instance,
+ const struct vkd3d_device_create_info *create_info, struct d3d12_device **device) DECLSPEC_HIDDEN;
+struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device,
+ D3D12_COMMAND_LIST_TYPE type) DECLSPEC_HIDDEN;
+bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent) DECLSPEC_HIDDEN;
+void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason,
+ const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN;
+struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN;
+
+static inline HRESULT d3d12_device_query_interface(struct d3d12_device *device, REFIID iid, void **object)
+{
+ return ID3D12Device_QueryInterface(&device->ID3D12Device_iface, iid, object);
+}
+
+static inline ULONG d3d12_device_add_ref(struct d3d12_device *device)
+{
+ return ID3D12Device_AddRef(&device->ID3D12Device_iface);
+}
+
+static inline ULONG d3d12_device_release(struct d3d12_device *device)
+{
+ return ID3D12Device_Release(&device->ID3D12Device_iface);
+}
+
+static inline unsigned int d3d12_device_get_descriptor_handle_increment_size(struct d3d12_device *device,
+ D3D12_DESCRIPTOR_HEAP_TYPE descriptor_type)
+{
+ return ID3D12Device_GetDescriptorHandleIncrementSize(&device->ID3D12Device_iface, descriptor_type);
+}
+
+static inline pthread_mutex_t *d3d12_device_get_descriptor_mutex(struct d3d12_device *device,
+ const struct d3d12_desc *descriptor)
+{
+ STATIC_ASSERT(!(ARRAY_SIZE(device->desc_mutex) & (ARRAY_SIZE(device->desc_mutex) - 1)));
+ uintptr_t idx = (uintptr_t)descriptor;
+
+ idx ^= idx >> 12;
+ idx ^= idx >> 6;
+ idx ^= idx >> 3;
+
+ return &device->desc_mutex[idx & (ARRAY_SIZE(device->desc_mutex) - 1)];
+}
+
+/* utils */
+enum vkd3d_format_type
+{
+ VKD3D_FORMAT_TYPE_OTHER,
+ VKD3D_FORMAT_TYPE_TYPELESS,
+ VKD3D_FORMAT_TYPE_SINT,
+ VKD3D_FORMAT_TYPE_UINT,
+};
+
+struct vkd3d_format
+{
+ DXGI_FORMAT dxgi_format;
+ VkFormat vk_format;
+ size_t byte_count;
+ size_t block_width;
+ size_t block_height;
+ size_t block_byte_count;
+ VkImageAspectFlags vk_aspect_mask;
+ unsigned int plane_count;
+ enum vkd3d_format_type type;
+ bool is_emulated;
+};
+
+static inline size_t vkd3d_format_get_data_offset(const struct vkd3d_format *format,
+ unsigned int row_pitch, unsigned int slice_pitch,
+ unsigned int x, unsigned int y, unsigned int z)
+{
+ return z * slice_pitch
+ + (y / format->block_height) * row_pitch
+ + (x / format->block_width) * format->byte_count * format->block_byte_count;
+}
+
+static inline bool vkd3d_format_is_compressed(const struct vkd3d_format *format)
+{
+ return format->block_byte_count != 1;
+}
+
+void vkd3d_format_copy_data(const struct vkd3d_format *format, const uint8_t *src,
+ unsigned int src_row_pitch, unsigned int src_slice_pitch, uint8_t *dst, unsigned int dst_row_pitch,
+ unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d) DECLSPEC_HIDDEN;
+
+const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device,
+ DXGI_FORMAT dxgi_format, bool depth_stencil) DECLSPEC_HIDDEN;
+
+HRESULT vkd3d_init_format_info(struct d3d12_device *device) DECLSPEC_HIDDEN;
+void vkd3d_cleanup_format_info(struct d3d12_device *device) DECLSPEC_HIDDEN;
+
+static inline const struct vkd3d_format *vkd3d_format_from_d3d12_resource_desc(
+ const struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, DXGI_FORMAT view_format)
+{
+ return vkd3d_get_format(device, view_format ? view_format : desc->Format,
+ desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL);
+}
+
+static inline bool d3d12_box_is_empty(const D3D12_BOX *box)
+{
+ return box->right <= box->left || box->bottom <= box->top || box->back <= box->front;
+}
+
+static inline unsigned int d3d12_resource_desc_get_width(const D3D12_RESOURCE_DESC *desc,
+ unsigned int miplevel_idx)
+{
+ return max(1, desc->Width >> miplevel_idx);
+}
+
+static inline unsigned int d3d12_resource_desc_get_height(const D3D12_RESOURCE_DESC *desc,
+ unsigned int miplevel_idx)
+{
+ return max(1, desc->Height >> miplevel_idx);
+}
+
+static inline unsigned int d3d12_resource_desc_get_depth(const D3D12_RESOURCE_DESC *desc,
+ unsigned int miplevel_idx)
+{
+ unsigned int d = desc->Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D ? 1 : desc->DepthOrArraySize;
+ return max(1, d >> miplevel_idx);
+}
+
+static inline unsigned int d3d12_resource_desc_get_layer_count(const D3D12_RESOURCE_DESC *desc)
+{
+ return desc->Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D ? desc->DepthOrArraySize : 1;
+}
+
+static inline unsigned int d3d12_resource_desc_get_sub_resource_count(const D3D12_RESOURCE_DESC *desc)
+{
+ return d3d12_resource_desc_get_layer_count(desc) * desc->MipLevels;
+}
+
+VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN;
+VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN;
+VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count) DECLSPEC_HIDDEN;
+
+bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN;
+
+bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN;
+bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN;
+
+HRESULT return_interface(void *iface, REFIID iface_iid,
+ REFIID requested_iid, void **object) DECLSPEC_HIDDEN;
+
+const char *debug_d3d12_box(const D3D12_BOX *box) DECLSPEC_HIDDEN;
+const char *debug_d3d12_shader_component_mapping(unsigned int mapping) DECLSPEC_HIDDEN;
+const char *debug_vk_extent_3d(VkExtent3D extent) DECLSPEC_HIDDEN;
+const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN;
+const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN;
+const char *debug_vk_queue_flags(VkQueueFlags flags) DECLSPEC_HIDDEN;
+
+static inline void debug_ignored_node_mask(unsigned int mask)
+{
+ if (mask && mask != 1)
+ FIXME("Ignoring node mask 0x%08x.\n", mask);
+}
+
+HRESULT vkd3d_load_vk_global_procs(struct vkd3d_vk_global_procs *procs,
+ PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr) DECLSPEC_HIDDEN;
+HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs,
+ const struct vkd3d_vk_global_procs *global_procs, VkInstance instance) DECLSPEC_HIDDEN;
+HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs,
+ const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device) DECLSPEC_HIDDEN;
+
+extern const char vkd3d_build[];
+
+bool vkd3d_get_program_name(char program_name[PATH_MAX]) DECLSPEC_HIDDEN;
+
+static inline void vkd3d_set_thread_name(const char *name)
+{
+#if defined(HAVE_PTHREAD_SETNAME_NP_2)
+ pthread_setname_np(pthread_self(), name);
+#elif defined(HAVE_PTHREAD_SETNAME_NP_1)
+ pthread_setname_np(name);
+#endif
+}
+
+VkResult vkd3d_set_vk_object_name_utf8(struct d3d12_device *device, uint64_t vk_object,
+ VkDebugReportObjectTypeEXT vk_object_type, const char *name) DECLSPEC_HIDDEN;
+HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object,
+ VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) DECLSPEC_HIDDEN;
+
+static inline void vk_prepend_struct(void *header, void *structure)
+{
+ VkBaseOutStructure *vk_header = header, *vk_structure = structure;
+
+ assert(!vk_structure->pNext);
+ vk_structure->pNext = vk_header->pNext;
+ vk_header->pNext = vk_structure;
+}
+
+#endif /* __VKD3D_PRIVATE_H */
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 5284138..2c5d4be 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -16177,7 +16177,7 @@ static void test_update_descriptor_heap_after_closing_command_list(void)
D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
value = get_readback_uint(&rb, 0, 0, 0);
- todo ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value);
+ ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value);
release_resource_readback(&rb);
ID3D12DescriptorHeap_Release(cpu_heap);
diff --git a/tests/d3d12.c.orig b/tests/d3d12.c.orig
new file mode 100644
index 0000000..5284138
--- /dev/null
+++ b/tests/d3d12.c.orig
@@ -0,0 +1,32850 @@
+/*
+ * Copyright 2016-2017 Józef Kucia for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifdef _MSC_VER
+/* Used for M_PI */
+#define _USE_MATH_DEFINES
+#endif
+
+#include "d3d12_crosstest.h"
+
+static PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER pfn_D3D12CreateVersionedRootSignatureDeserializer;
+static PFN_D3D12_SERIALIZE_VERSIONED_ROOT_SIGNATURE pfn_D3D12SerializeVersionedRootSignature;
+
+struct vec2
+{
+ float x, y;
+};
+
+struct vec4
+{
+ float x, y, z, w;
+};
+
+struct uvec4
+{
+ unsigned int x, y, z, w;
+};
+
+struct ivec4
+{
+ int x, y, z, w;
+};
+
+static bool compare_float(float f, float g, unsigned int ulps)
+{
+ int x, y;
+ union
+ {
+ float f;
+ int i;
+ } u;
+
+ u.f = f;
+ x = u.i;
+ u.f = g;
+ y = u.i;
+
+ if (x < 0)
+ x = INT_MIN - x;
+ if (y < 0)
+ y = INT_MIN - y;
+
+ if (abs(x - y) > ulps)
+ return false;
+
+ return true;
+}
+
+static bool compare_vec4(const struct vec4 *v1, const struct vec4 *v2, unsigned int ulps)
+{
+ return compare_float(v1->x, v2->x, ulps)
+ && compare_float(v1->y, v2->y, ulps)
+ && compare_float(v1->z, v2->z, ulps)
+ && compare_float(v1->w, v2->w, ulps);
+}
+
+static bool compare_uvec4(const struct uvec4* v1, const struct uvec4 *v2)
+{
+ return v1->x == v2->x && v1->y == v2->y && v1->z == v2->z && v1->w == v2->w;
+}
+
+static bool compare_uint8(uint8_t a, uint8_t b, unsigned int max_diff)
+{
+ return abs(a - b) <= max_diff;
+}
+
+static bool compare_uint16(uint16_t a, uint16_t b, unsigned int max_diff)
+{
+ return abs(a - b) <= max_diff;
+}
+
+static bool compare_uint64(uint64_t a, uint64_t b, unsigned int max_diff)
+{
+ return llabs(a - b) <= max_diff;
+}
+
+static ULONG get_refcount(void *iface)
+{
+ IUnknown *unk = iface;
+ IUnknown_AddRef(unk);
+ return IUnknown_Release(unk);
+}
+
+#define check_interface(a, b, c) check_interface_(__LINE__, (IUnknown *)a, b, c)
+static void check_interface_(unsigned int line, IUnknown *iface, REFIID riid, bool supported)
+{
+ HRESULT hr, expected_hr;
+ IUnknown *unk;
+
+ expected_hr = supported ? S_OK : E_NOINTERFACE;
+
+ hr = IUnknown_QueryInterface(iface, riid, (void **)&unk);
+ ok_(line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr);
+ if (SUCCEEDED(hr))
+ IUnknown_Release(unk);
+}
+
+#define check_heap_properties(a, b) check_heap_properties_(__LINE__, a, b)
+static void check_heap_properties_(unsigned int line,
+ const D3D12_HEAP_PROPERTIES *properties, const D3D12_HEAP_PROPERTIES *expected_properties)
+{
+ D3D12_HEAP_PROPERTIES expected = *expected_properties;
+
+ if (!expected.CreationNodeMask)
+ expected.CreationNodeMask = 0x1;
+ if (!expected.VisibleNodeMask)
+ expected.VisibleNodeMask = 0x1;
+
+ ok_(line)(properties->Type == expected.Type,
+ "Got type %#x, expected %#x.\n", properties->Type, expected.Type);
+ ok_(line)(properties->CPUPageProperty == expected.CPUPageProperty,
+ "Got CPU page properties %#x, expected %#x.\n",
+ properties->CPUPageProperty, expected.CPUPageProperty);
+ ok_(line)(properties->MemoryPoolPreference == expected.MemoryPoolPreference,
+ "Got memory pool %#x, expected %#x.\n",
+ properties->MemoryPoolPreference, expected.MemoryPoolPreference);
+ ok_(line)(properties->CreationNodeMask == expected.CreationNodeMask,
+ "Got creation node mask %#x, expected %#x.\n",
+ properties->CreationNodeMask, expected.CreationNodeMask);
+ ok_(line)(properties->VisibleNodeMask == expected.VisibleNodeMask,
+ "Got visible node mask %#x, expected %#x.\n",
+ properties->VisibleNodeMask, expected.VisibleNodeMask);
+}
+
+#define check_heap_desc(a, b) check_heap_desc_(__LINE__, a, b)
+static void check_heap_desc_(unsigned int line, const D3D12_HEAP_DESC *desc,
+ const D3D12_HEAP_DESC *expected_desc)
+{
+ D3D12_HEAP_DESC expected = *expected_desc;
+
+ if (!expected.Alignment)
+ expected.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+
+ ok_(line)(desc->SizeInBytes == expected.SizeInBytes,
+ "Got size %"PRIu64", expected %"PRIu64".\n",
+ desc->SizeInBytes, expected.SizeInBytes);
+ check_heap_properties_(line, &desc->Properties, &expected.Properties);
+ ok_(line)(desc->Alignment == expected.Alignment,
+ "Got alignment %"PRIu64", expected %"PRIu64".\n",
+ desc->Alignment, expected.Alignment);
+ ok_(line)(desc->Flags == expected.Flags,
+ "Got flags %#x, expected %#x.\n", desc->Flags, expected.Flags);
+}
+
+#define check_alignment(a, b) check_alignment_(__LINE__, a, b)
+static void check_alignment_(unsigned int line, uint64_t size, uint64_t alignment)
+{
+ uint64_t aligned_size = align(size, alignment);
+ ok_(line)(aligned_size == size, "Got unaligned size %"PRIu64", expected %"PRIu64".\n",
+ size, aligned_size);
+}
+
+static void uav_barrier(ID3D12GraphicsCommandList *list, ID3D12Resource *resource)
+{
+ D3D12_RESOURCE_BARRIER barrier;
+
+ barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_UAV;
+ barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
+ barrier.UAV.pResource = resource;
+
+ ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier);
+}
+
+static void copy_sub_resource_data(const D3D12_MEMCPY_DEST *dst, const D3D12_SUBRESOURCE_DATA *src,
+ unsigned int row_count, unsigned int slice_count, size_t row_size)
+{
+ const BYTE *src_slice_ptr;
+ BYTE *dst_slice_ptr;
+ unsigned int z, y;
+
+ for (z = 0; z < slice_count; ++z)
+ {
+ dst_slice_ptr = (BYTE *)dst->pData + z * dst->SlicePitch;
+ src_slice_ptr = (const BYTE*)src->pData + z * src->SlicePitch;
+ for (y = 0; y < row_count; ++y)
+ memcpy(dst_slice_ptr + y * dst->RowPitch, src_slice_ptr + y * src->RowPitch, row_size);
+ }
+}
+
+#define upload_buffer_data(a, b, c, d, e, f) upload_buffer_data_(__LINE__, a, b, c, d, e, f)
+static void upload_buffer_data_(unsigned int line, ID3D12Resource *buffer, size_t offset,
+ size_t size, const void *data, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list)
+{
+ ID3D12Resource *upload_buffer;
+ ID3D12Device *device;
+ HRESULT hr;
+
+ hr = ID3D12Resource_GetDevice(buffer, &IID_ID3D12Device, (void **)&device);
+ ok_(line)(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr);
+
+ upload_buffer = create_upload_buffer_(line, device, size, data);
+
+ ID3D12GraphicsCommandList_CopyBufferRegion(command_list, buffer, offset,
+ upload_buffer, 0, size);
+
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok_(line)(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+ exec_command_list(queue, command_list);
+ wait_queue_idle(device, queue);
+
+ ID3D12Resource_Release(upload_buffer);
+ ID3D12Device_Release(device);
+}
+
+#define upload_texture_data(a, b, c, d, e) upload_texture_data_(__LINE__, a, b, c, d, e)
+static void upload_texture_data_(unsigned int line, ID3D12Resource *texture,
+ const D3D12_SUBRESOURCE_DATA *data, unsigned int sub_resource_count,
+ ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list)
+{
+ D3D12_TEXTURE_COPY_LOCATION dst_location, src_location;
+ D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts;
+ uint64_t *row_sizes, required_size;
+ D3D12_RESOURCE_DESC resource_desc;
+ ID3D12Resource *upload_buffer;
+ D3D12_MEMCPY_DEST dst_data;
+ ID3D12Device *device;
+ UINT *row_counts;
+ unsigned int i;
+ HRESULT hr;
+ void *ptr;
+
+ layouts = calloc(sub_resource_count, sizeof(*layouts));
+ ok(layouts, "Failed to allocate memory.\n");
+ row_counts = calloc(sub_resource_count, sizeof(*row_counts));
+ ok(row_counts, "Failed to allocate memory.\n");
+ row_sizes = calloc(sub_resource_count, sizeof(*row_sizes));
+ ok(row_sizes, "Failed to allocate memory.\n");
+
+ resource_desc = ID3D12Resource_GetDesc(texture);
+ hr = ID3D12Resource_GetDevice(texture, &IID_ID3D12Device, (void **)&device);
+ ok_(line)(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr);
+
+ ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count,
+ 0, layouts, row_counts, row_sizes, &required_size);
+
+ upload_buffer = create_upload_buffer_(line, device, required_size, NULL);
+
+ hr = ID3D12Resource_Map(upload_buffer, 0, NULL, (void **)&ptr);
+ ok_(line)(SUCCEEDED(hr), "Failed to map upload buffer, hr %#x.\n", hr);
+ for (i = 0; i < sub_resource_count; ++i)
+ {
+ dst_data.pData = (BYTE *)ptr + layouts[i].Offset;
+ dst_data.RowPitch = layouts[i].Footprint.RowPitch;
+ dst_data.SlicePitch = layouts[i].Footprint.RowPitch * row_counts[i];
+ copy_sub_resource_data(&dst_data, &data[i],
+ row_counts[i], layouts[i].Footprint.Depth, row_sizes[i]);
+ }
+ ID3D12Resource_Unmap(upload_buffer, 0, NULL);
+
+ for (i = 0; i < sub_resource_count; ++i)
+ {
+ dst_location.pResource = texture;
+ dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ dst_location.SubresourceIndex = i;
+
+ src_location.pResource = upload_buffer;
+ src_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT;
+ src_location.PlacedFootprint = layouts[i];
+
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 0, 0, &src_location, NULL);
+ }
+
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok_(line)(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+
+ exec_command_list(queue, command_list);
+ wait_queue_idle(device, queue);
+
+ ID3D12Resource_Release(upload_buffer);
+ ID3D12Device_Release(device);
+
+ free(layouts);
+ free(row_counts);
+ free(row_sizes);
+}
+
+static const DXGI_FORMAT depth_stencil_formats[] =
+{
+ DXGI_FORMAT_R32G8X24_TYPELESS,
+ DXGI_FORMAT_D32_FLOAT_S8X24_UINT,
+ DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS,
+ DXGI_FORMAT_X32_TYPELESS_G8X24_UINT,
+ DXGI_FORMAT_R32_TYPELESS,
+ DXGI_FORMAT_D32_FLOAT,
+ DXGI_FORMAT_R24G8_TYPELESS,
+ DXGI_FORMAT_D24_UNORM_S8_UINT,
+ DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
+ DXGI_FORMAT_X24_TYPELESS_G8_UINT,
+ DXGI_FORMAT_R16_TYPELESS,
+ DXGI_FORMAT_D16_UNORM,
+};
+
+static void init_readback(struct resource_readback *rb, ID3D12Resource *buffer,
+ uint64_t buffer_size, uint64_t width, uint64_t height, unsigned int depth, uint64_t row_pitch)
+{
+ D3D12_RANGE read_range;
+ HRESULT hr;
+
+ rb->width = width;
+ rb->height = height;
+ rb->depth = depth;
+ rb->resource = buffer;
+ rb->row_pitch = row_pitch;
+ rb->data = NULL;
+
+ ID3D12Resource_AddRef(rb->resource);
+
+ read_range.Begin = 0;
+ read_range.End = buffer_size;
+ hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data);
+ ok(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr);
+}
+
+static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_FORMAT format,
+ struct resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list)
+{
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_RESOURCE_DESC resource_desc;
+ ID3D12Resource *rb_buffer;
+ D3D12_RANGE read_range;
+ ID3D12Device *device;
+ HRESULT hr;
+
+ hr = ID3D12Resource_GetDevice(buffer, &IID_ID3D12Device, (void **)&device);
+ ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr);
+
+ resource_desc = ID3D12Resource_GetDesc(buffer);
+ assert(resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER);
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE;
+
+ hr = ID3D12Resource_GetHeapProperties(buffer, &heap_properties, NULL);
+ ok(SUCCEEDED(hr), "Failed to get heap properties.\n");
+ if (heap_properties.Type == D3D12_HEAP_TYPE_READBACK)
+ {
+ rb_buffer = buffer;
+ ID3D12Resource_AddRef(rb_buffer);
+ }
+ else
+ {
+ rb_buffer = create_readback_buffer(device, resource_desc.Width);
+ ID3D12GraphicsCommandList_CopyBufferRegion(command_list, rb_buffer, 0,
+ buffer, 0, resource_desc.Width);
+ }
+
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+
+ exec_command_list(queue, command_list);
+ wait_queue_idle(device, queue);
+ ID3D12Device_Release(device);
+
+ rb->width = resource_desc.Width / format_size(format);
+ rb->height = 1;
+ rb->depth = 1;
+ rb->resource = rb_buffer;
+ rb->row_pitch = resource_desc.Width;
+ rb->data = NULL;
+
+ read_range.Begin = 0;
+ read_range.End = resource_desc.Width;
+ hr = ID3D12Resource_Map(rb_buffer, 0, &read_range, &rb->data);
+ ok(SUCCEEDED(hr), "Failed to map readback buffer, hr %#x.\n", hr);
+}
+
+static uint8_t get_readback_uint8(struct resource_readback *rb, unsigned int x, unsigned int y)
+{
+ return *(uint8_t *)get_readback_data(rb, x, y, 0, sizeof(uint8_t));
+}
+
+static uint16_t get_readback_uint16(struct resource_readback *rb, unsigned int x, unsigned int y)
+{
+ return *(uint16_t *)get_readback_data(rb, x, y, 0, sizeof(uint16_t));
+}
+
+static uint64_t get_readback_uint64(struct resource_readback *rb, unsigned int x, unsigned int y)
+{
+ return *(uint64_t *)get_readback_data(rb, x, y, 0, sizeof(uint64_t));
+}
+
+static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y)
+{
+ return *(float *)get_readback_data(rb, x, y, 0, sizeof(float));
+}
+
+static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsigned int x, unsigned int y)
+{
+ return get_readback_data(rb, x, y, 0, sizeof(struct vec4));
+}
+
+static const struct uvec4 *get_readback_uvec4(struct resource_readback *rb, unsigned int x, unsigned int y)
+{
+ return get_readback_data(rb, x, y, 0, sizeof(struct uvec4));
+}
+
+#define check_readback_data_float(a, b, c, d) check_readback_data_float_(__LINE__, a, b, c, d)
+static void check_readback_data_float_(unsigned int line, struct resource_readback *rb,
+ const RECT *rect, float expected, unsigned int max_diff)
+{
+ RECT r = {0, 0, rb->width, rb->height};
+ unsigned int x = 0, y;
+ bool all_match = true;
+ float got = 0;
+
+ if (rect)
+ r = *rect;
+
+ for (y = r.top; y < r.bottom; ++y)
+ {
+ for (x = r.left; x < r.right; ++x)
+ {
+ got = get_readback_float(rb, x, y);
+ if (!compare_float(got, expected, max_diff))
+ {
+ all_match = false;
+ break;
+ }
+ }
+ if (!all_match)
+ break;
+ }
+ ok_(line)(all_match, "Got %.8e, expected %.8e at (%u, %u).\n", got, expected, x, y);
+}
+
+#define check_sub_resource_float(a, b, c, d, e, f) check_sub_resource_float_(__LINE__, a, b, c, d, e, f)
+static void check_sub_resource_float_(unsigned int line, ID3D12Resource *texture,
+ unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list,
+ float expected, unsigned int max_diff)
+{
+ struct resource_readback rb;
+
+ get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list);
+ check_readback_data_float_(line, &rb, NULL, expected, max_diff);
+ release_resource_readback(&rb);
+}
+
+#define check_readback_data_uint8(a, b, c, d) check_readback_data_uint8_(__LINE__, a, b, c, d)
+static void check_readback_data_uint8_(unsigned int line, struct resource_readback *rb,
+ const RECT *rect, uint8_t expected, unsigned int max_diff)
+{
+ RECT r = {0, 0, rb->width, rb->height};
+ unsigned int x = 0, y;
+ bool all_match = true;
+ uint8_t got = 0;
+
+ if (rect)
+ r = *rect;
+
+ for (y = r.top; y < r.bottom; ++y)
+ {
+ for (x = r.left; x < r.right; ++x)
+ {
+ got = get_readback_uint8(rb, x, y);
+ if (!compare_uint8(got, expected, max_diff))
+ {
+ all_match = false;
+ break;
+ }
+ }
+ if (!all_match)
+ break;
+ }
+ ok_(line)(all_match, "Got 0x%02x, expected 0x%02x at (%u, %u).\n", got, expected, x, y);
+}
+
+#define check_sub_resource_uint8(a, b, c, d, e, f) check_sub_resource_uint8_(__LINE__, a, b, c, d, e, f)
+static void check_sub_resource_uint8_(unsigned int line, ID3D12Resource *texture,
+ unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list,
+ uint8_t expected, unsigned int max_diff)
+{
+ struct resource_readback rb;
+
+ get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list);
+ check_readback_data_uint8_(line, &rb, NULL, expected, max_diff);
+ release_resource_readback(&rb);
+}
+
+#define check_readback_data_uint16(a, b, c, d) check_readback_data_uint16_(__LINE__, a, b, c, d)
+static void check_readback_data_uint16_(unsigned int line, struct resource_readback *rb,
+ const RECT *rect, uint16_t expected, unsigned int max_diff)
+{
+ RECT r = {0, 0, rb->width, rb->height};
+ unsigned int x = 0, y;
+ bool all_match = true;
+ uint16_t got = 0;
+
+ if (rect)
+ r = *rect;
+
+ for (y = r.top; y < r.bottom; ++y)
+ {
+ for (x = r.left; x < r.right; ++x)
+ {
+ got = get_readback_uint16(rb, x, y);
+ if (!compare_uint16(got, expected, max_diff))
+ {
+ all_match = false;
+ break;
+ }
+ }
+ if (!all_match)
+ break;
+ }
+ ok_(line)(all_match, "Got 0x%04x, expected 0x%04x at (%u, %u).\n", got, expected, x, y);
+}
+
+#define check_sub_resource_uint16(a, b, c, d, e, f) check_sub_resource_uint16_(__LINE__, a, b, c, d, e, f)
+static void check_sub_resource_uint16_(unsigned int line, ID3D12Resource *texture,
+ unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list,
+ uint16_t expected, unsigned int max_diff)
+{
+ struct resource_readback rb;
+
+ get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list);
+ check_readback_data_uint16_(line, &rb, NULL, expected, max_diff);
+ release_resource_readback(&rb);
+}
+
+#define check_readback_data_uint64(a, b, c, d) check_readback_data_uint64_(__LINE__, a, b, c, d)
+static void check_readback_data_uint64_(unsigned int line, struct resource_readback *rb,
+ const RECT *rect, uint64_t expected, unsigned int max_diff)
+{
+ RECT r = {0, 0, rb->width, rb->height};
+ unsigned int x = 0, y;
+ bool all_match = true;
+ uint64_t got = 0;
+
+ if (rect)
+ r = *rect;
+
+ for (y = r.top; y < r.bottom; ++y)
+ {
+ for (x = r.left; x < r.right; ++x)
+ {
+ got = get_readback_uint64(rb, x, y);
+ if (!compare_uint64(got, expected, max_diff))
+ {
+ all_match = false;
+ break;
+ }
+ }
+ if (!all_match)
+ break;
+ }
+ ok_(line)(all_match, "Got %#"PRIx64", expected %#"PRIx64" at (%u, %u).\n", got, expected, x, y);
+}
+
+#define check_sub_resource_uint64(a, b, c, d, e, f) check_sub_resource_uint64_(__LINE__, a, b, c, d, e, f)
+static void check_sub_resource_uint64_(unsigned int line, ID3D12Resource *texture,
+ unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list,
+ uint64_t expected, unsigned int max_diff)
+{
+ struct resource_readback rb;
+
+ get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list);
+ check_readback_data_uint64_(line, &rb, NULL, expected, max_diff);
+ release_resource_readback(&rb);
+}
+
+#define check_sub_resource_vec4(a, b, c, d, e, f) check_sub_resource_vec4_(__LINE__, a, b, c, d, e, f)
+static void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *texture,
+ unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list,
+ const struct vec4 *expected, unsigned int max_diff)
+{
+ struct resource_readback rb;
+ unsigned int x = 0, y;
+ bool all_match = true;
+ struct vec4 got = {0};
+
+ get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ got = *get_readback_vec4(&rb, x, y);
+ if (!compare_vec4(&got, expected, max_diff))
+ {
+ all_match = false;
+ break;
+ }
+ }
+ if (!all_match)
+ break;
+ }
+ release_resource_readback(&rb);
+
+ ok_(line)(all_match, "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n",
+ got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y);
+}
+
+#define check_sub_resource_uvec4(a, b, c, d, e) check_sub_resource_uvec4_(__LINE__, a, b, c, d, e)
+static void check_sub_resource_uvec4_(unsigned int line, ID3D12Resource *texture,
+ unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list,
+ const struct uvec4 *expected_value)
+{
+ struct resource_readback rb;
+ struct uvec4 value = {0};
+ unsigned int x = 0, y;
+ bool all_match = true;
+
+ get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ value = *get_readback_uvec4(&rb, x, y);
+ if (!compare_uvec4(&value, expected_value))
+ {
+ all_match = false;
+ break;
+ }
+ }
+ if (!all_match)
+ break;
+ }
+ release_resource_readback(&rb);
+
+ ok_(line)(all_match,
+ "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x}, expected {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u).\n",
+ value.x, value.y, value.z, value.w,
+ expected_value->x, expected_value->y, expected_value->z, expected_value->w, x, y);
+}
+
+static bool broken_on_warp(bool condition)
+{
+ return broken(use_warp_device && condition);
+}
+
+static bool is_min_max_filtering_supported(ID3D12Device *device)
+{
+ D3D12_FEATURE_DATA_D3D12_OPTIONS options;
+ HRESULT hr;
+
+ if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device,
+ D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options))))
+ {
+ trace("Failed to check feature support, hr %#x.\n", hr);
+ return false;
+ }
+
+ /* D3D12 validation layer says tiled resource tier 2+ support implies min/max filtering support. */
+ return options.TiledResourcesTier >= D3D12_TILED_RESOURCES_TIER_2;
+}
+
+static D3D12_TILED_RESOURCES_TIER get_tiled_resources_tier(ID3D12Device *device)
+{
+ D3D12_FEATURE_DATA_D3D12_OPTIONS options;
+ HRESULT hr;
+
+ if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device,
+ D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options))))
+ {
+ trace("Failed to check feature support, hr %#x.\n", hr);
+ return D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED;
+ }
+
+ return options.TiledResourcesTier;
+}
+
+static bool is_standard_swizzle_64kb_supported(ID3D12Device *device)
+{
+ D3D12_FEATURE_DATA_D3D12_OPTIONS options;
+ HRESULT hr;
+
+ if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device,
+ D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options))))
+ {
+ trace("Failed to check feature support, hr %#x.\n", hr);
+ return false;
+ }
+
+ return options.StandardSwizzle64KBSupported;
+}
+
+static bool is_memory_pool_L1_supported(ID3D12Device *device)
+{
+ D3D12_FEATURE_DATA_ARCHITECTURE architecture;
+ HRESULT hr;
+
+ memset(&architecture, 0, sizeof(architecture));
+ if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ARCHITECTURE,
+ &architecture, sizeof(architecture))))
+ {
+ trace("Failed to check feature support, hr %#x.\n", hr);
+ return false;
+ }
+
+ return !architecture.UMA;
+}
+
+#define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e)
+static ID3D12RootSignature *create_cb_root_signature_(unsigned int line,
+ ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility,
+ D3D12_ROOT_SIGNATURE_FLAGS flags)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ ID3D12RootSignature *root_signature = NULL;
+ D3D12_ROOT_PARAMETER root_parameter;
+ HRESULT hr;
+
+ root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameter.Descriptor.ShaderRegister = reg_idx;
+ root_parameter.Descriptor.RegisterSpace = 0;
+ root_parameter.ShaderVisibility = shader_visibility;
+
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = &root_parameter;
+ root_signature_desc.Flags = flags;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok_(line)(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ return root_signature;
+}
+
+#define create_32bit_constants_root_signature(a, b, c, e) \
+ create_32bit_constants_root_signature_(__LINE__, a, b, c, e, 0)
+static ID3D12RootSignature *create_32bit_constants_root_signature_(unsigned int line,
+ ID3D12Device *device, unsigned int reg_idx, unsigned int element_count,
+ D3D12_SHADER_VISIBILITY shader_visibility, D3D12_ROOT_SIGNATURE_FLAGS flags)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ ID3D12RootSignature *root_signature = NULL;
+ D3D12_ROOT_PARAMETER root_parameter;
+ HRESULT hr;
+
+ root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameter.Constants.ShaderRegister = reg_idx;
+ root_parameter.Constants.RegisterSpace = 0;
+ root_parameter.Constants.Num32BitValues = element_count;
+ root_parameter.ShaderVisibility = shader_visibility;
+
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = &root_parameter;
+ root_signature_desc.Flags = flags;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok_(line)(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ return root_signature;
+}
+
+#define create_texture_root_signature(a, b, c, d) create_texture_root_signature_(__LINE__, a, b, c, d, NULL)
+static ID3D12RootSignature *create_texture_root_signature_(unsigned int line,
+ ID3D12Device *device, D3D12_SHADER_VISIBILITY shader_visibility,
+ unsigned int constant_count, D3D12_ROOT_SIGNATURE_FLAGS flags,
+ const D3D12_STATIC_SAMPLER_DESC *sampler_desc)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ ID3D12RootSignature *root_signature = NULL;
+ D3D12_STATIC_SAMPLER_DESC static_sampler;
+ D3D12_DESCRIPTOR_RANGE descriptor_range;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ HRESULT hr;
+
+ if (sampler_desc)
+ {
+ static_sampler = *sampler_desc;
+ }
+ else
+ {
+ memset(&static_sampler, 0, sizeof(static_sampler));
+ static_sampler.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT;
+ static_sampler.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ static_sampler.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ static_sampler.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ static_sampler.MaxLOD = D3D12_FLOAT32_MAX;
+ static_sampler.ShaderRegister = 0;
+ static_sampler.RegisterSpace = 0;
+ static_sampler.ShaderVisibility = shader_visibility;
+ }
+
+ descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_range.NumDescriptors = 1;
+ descriptor_range.BaseShaderRegister = 0;
+ descriptor_range.RegisterSpace = 0;
+ descriptor_range.OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range;
+ root_parameters[0].ShaderVisibility = shader_visibility;
+
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = constant_count;
+ root_parameters[1].ShaderVisibility = shader_visibility;
+
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = constant_count ? 2 : 1;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 1;
+ root_signature_desc.pStaticSamplers = &static_sampler;
+ root_signature_desc.Flags = flags;
+
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok_(line)(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ return root_signature;
+}
+
+#define create_compute_pipeline_state(a, b, c) create_compute_pipeline_state_(__LINE__, a, b, c)
+static ID3D12PipelineState *create_compute_pipeline_state_(unsigned int line, ID3D12Device *device,
+ ID3D12RootSignature *root_signature, const D3D12_SHADER_BYTECODE cs)
+{
+ D3D12_COMPUTE_PIPELINE_STATE_DESC pipeline_state_desc;
+ ID3D12PipelineState *pipeline_state;
+ HRESULT hr;
+
+ memset(&pipeline_state_desc, 0, sizeof(pipeline_state_desc));
+ pipeline_state_desc.pRootSignature = root_signature;
+ pipeline_state_desc.CS = cs;
+ pipeline_state_desc.NodeMask = 0;
+ pipeline_state_desc.Flags = D3D12_PIPELINE_STATE_FLAG_NONE;
+ hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc,
+ &IID_ID3D12PipelineState, (void **)&pipeline_state);
+ ok_(line)(SUCCEEDED(hr), "Failed to create compute pipeline state, hr %#x.\n", hr);
+
+ return pipeline_state;
+}
+
+#define create_command_signature(a, b) create_command_signature_(__LINE__, a, b)
+static ID3D12CommandSignature *create_command_signature_(unsigned int line,
+ ID3D12Device *device, D3D12_INDIRECT_ARGUMENT_TYPE argument_type)
+{
+ D3D12_COMMAND_SIGNATURE_DESC signature_desc;
+ D3D12_INDIRECT_ARGUMENT_DESC argument_desc;
+ ID3D12CommandSignature *command_signature;
+ HRESULT hr;
+
+ argument_desc.Type = argument_type;
+
+ switch (argument_type)
+ {
+ case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW:
+ signature_desc.ByteStride = sizeof(D3D12_DRAW_ARGUMENTS);
+ break;
+ case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED:
+ signature_desc.ByteStride = sizeof(D3D12_DRAW_INDEXED_ARGUMENTS);
+ break;
+ case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH:
+ signature_desc.ByteStride = sizeof(D3D12_DISPATCH_ARGUMENTS);
+ break;
+ default:
+ return NULL;
+ }
+
+ signature_desc.NumArgumentDescs = 1;
+ signature_desc.pArgumentDescs = &argument_desc;
+ signature_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateCommandSignature(device, &signature_desc,
+ NULL, &IID_ID3D12CommandSignature, (void **)&command_signature);
+ ok_(line)(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr);
+
+ return command_signature;
+}
+
+#define init_compute_test_context(context) init_compute_test_context_(__LINE__, context)
+static bool init_compute_test_context_(unsigned int line, struct test_context *context)
+{
+ ID3D12Device *device;
+ HRESULT hr;
+
+ memset(context, 0, sizeof(*context));
+
+ if (!(context->device = create_device()))
+ {
+ skip_(line)("Failed to create device.\n");
+ return false;
+ }
+ device = context->device;
+
+ context->queue = create_command_queue_(line, device,
+ D3D12_COMMAND_LIST_TYPE_COMPUTE, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_COMPUTE,
+ &IID_ID3D12CommandAllocator, (void **)&context->allocator);
+ ok_(line)(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr);
+
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_COMPUTE,
+ context->allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&context->list);
+ ok_(line)(hr == S_OK, "Failed to create command list, hr %#x.\n", hr);
+
+ return true;
+}
+
+struct depth_stencil_resource
+{
+ ID3D12Resource *texture;
+ ID3D12DescriptorHeap *heap;
+ D3D12_CPU_DESCRIPTOR_HANDLE dsv_handle;
+};
+
+#define init_depth_stencil(a, b, c, d, e, f, g, h, i) init_depth_stencil_(__LINE__, a, b, c, d, e, f, g, h, i)
+static void init_depth_stencil_(unsigned int line, struct depth_stencil_resource *ds,
+ ID3D12Device *device, unsigned int width, unsigned int height, unsigned int array_size, unsigned int level_count,
+ DXGI_FORMAT format, DXGI_FORMAT view_format, const D3D12_CLEAR_VALUE *clear_value)
+{
+ D3D12_DEPTH_STENCIL_VIEW_DESC dsv_desc, *view_desc;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_RESOURCE_DESC resource_desc;
+ HRESULT hr;
+
+ memset(ds, 0, sizeof(*ds));
+
+ ds->heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_DSV, 1);
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = width;
+ resource_desc.Height = height;
+ resource_desc.DepthOrArraySize = array_size;
+ resource_desc.MipLevels = level_count;
+ resource_desc.Format = format;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_DEPTH_WRITE, clear_value,
+ &IID_ID3D12Resource, (void **)&ds->texture);
+ ok_(line)(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+
+ view_desc = NULL;
+ if (view_format)
+ {
+ memset(&dsv_desc, 0, sizeof(dsv_desc));
+ dsv_desc.Format = view_format;
+ dsv_desc.ViewDimension = D3D12_DSV_DIMENSION_TEXTURE2D;
+ view_desc = &dsv_desc;
+ }
+ ds->dsv_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(ds->heap);
+ ID3D12Device_CreateDepthStencilView(device, ds->texture, view_desc, ds->dsv_handle);
+}
+
+#define destroy_depth_stencil(depth_stencil) destroy_depth_stencil_(__LINE__, depth_stencil)
+static void destroy_depth_stencil_(unsigned int line, struct depth_stencil_resource *ds)
+{
+ ID3D12DescriptorHeap_Release(ds->heap);
+ ID3D12Resource_Release(ds->texture);
+}
+
+static void test_create_device(void)
+{
+ ID3D12Device *device;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ check_interface(device, &IID_ID3D12Object, true);
+ check_interface(device, &IID_ID3D12DeviceChild, false);
+ check_interface(device, &IID_ID3D12Pageable, false);
+ check_interface(device, &IID_ID3D12Device, true);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+
+ hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device);
+ ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr);
+ ID3D12Device_Release(device);
+
+ hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, NULL);
+ ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr);
+ hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, NULL, NULL);
+ ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr);
+ hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12DeviceChild, NULL);
+ ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_1, &IID_ID3D12Device, (void **)&device);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_2, &IID_ID3D12Device, (void **)&device);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_3, &IID_ID3D12Device, (void **)&device);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_10_0, &IID_ID3D12Device, (void **)&device);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_10_1, &IID_ID3D12Device, (void **)&device);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3D12CreateDevice(NULL, 0, &IID_ID3D12Device, (void **)&device);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = D3D12CreateDevice(NULL, ~0u, &IID_ID3D12Device, (void **)&device);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+}
+
+static void test_node_count(void)
+{
+ ID3D12Device *device;
+ UINT node_count;
+ ULONG refcount;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ node_count = ID3D12Device_GetNodeCount(device);
+ trace("Node count: %u.\n", node_count);
+ ok(1 <= node_count && node_count <= 32, "Got unexpected node count %u.\n", node_count);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_check_feature_support(void)
+{
+ D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT gpu_virtual_address;
+ D3D12_FEATURE_DATA_FEATURE_LEVELS feature_levels;
+ D3D12_FEATURE_DATA_ROOT_SIGNATURE root_signature;
+ D3D_FEATURE_LEVEL max_supported_feature_level;
+ D3D12_FEATURE_DATA_ARCHITECTURE architecture;
+ D3D12_FEATURE_DATA_FORMAT_INFO format_info;
+ unsigned int expected_plane_count;
+ ID3D12Device *device;
+ DXGI_FORMAT format;
+ ULONG refcount;
+ bool is_todo;
+ HRESULT hr;
+
+ static const D3D_FEATURE_LEVEL all_feature_levels[] =
+ {
+ D3D_FEATURE_LEVEL_12_1,
+ D3D_FEATURE_LEVEL_12_0,
+ D3D_FEATURE_LEVEL_11_1,
+ D3D_FEATURE_LEVEL_11_0,
+ D3D_FEATURE_LEVEL_10_1,
+ D3D_FEATURE_LEVEL_10_0,
+ D3D_FEATURE_LEVEL_9_3,
+ D3D_FEATURE_LEVEL_9_2,
+ D3D_FEATURE_LEVEL_9_1,
+ };
+ static const D3D_FEATURE_LEVEL d3d12_feature_levels[] =
+ {
+ D3D_FEATURE_LEVEL_12_1,
+ D3D_FEATURE_LEVEL_12_0,
+ D3D_FEATURE_LEVEL_11_1,
+ D3D_FEATURE_LEVEL_11_0,
+ };
+ static const D3D_FEATURE_LEVEL d3d_9_x_feature_levels[] =
+ {
+ D3D_FEATURE_LEVEL_9_3,
+ D3D_FEATURE_LEVEL_9_2,
+ D3D_FEATURE_LEVEL_9_1,
+ };
+ static const D3D_FEATURE_LEVEL invalid_feature_levels[] =
+ {
+ 0x0000,
+ 0x3000,
+ };
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ /* Architecture. */
+ memset(&architecture, 0, sizeof(architecture));
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ARCHITECTURE,
+ &architecture, sizeof(architecture));
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(!architecture.NodeIndex, "Got unexpected node %u.\n", architecture.NodeIndex);
+ ok(!architecture.CacheCoherentUMA || architecture.UMA,
+ "Got unexpected cache coherent UMA %#x (UMA %#x).\n",
+ architecture.CacheCoherentUMA, architecture.UMA);
+ trace("UMA %#x, cache coherent UMA %#x, tile based renderer %#x.\n",
+ architecture.UMA, architecture.CacheCoherentUMA, architecture.TileBasedRenderer);
+
+ if (ID3D12Device_GetNodeCount(device) == 1)
+ {
+ memset(&architecture, 0, sizeof(architecture));
+ architecture.NodeIndex = 1;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ARCHITECTURE,
+ &architecture, sizeof(architecture));
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ }
+
+ /* Feature levels */
+ memset(&feature_levels, 0, sizeof(feature_levels));
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS,
+ &feature_levels, sizeof(feature_levels));
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ feature_levels.NumFeatureLevels = ARRAY_SIZE(all_feature_levels);
+ feature_levels.pFeatureLevelsRequested = all_feature_levels;
+ feature_levels.MaxSupportedFeatureLevel = 0;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS,
+ &feature_levels, sizeof(feature_levels));
+ ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr);
+ trace("Max supported feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel);
+ max_supported_feature_level = feature_levels.MaxSupportedFeatureLevel;
+
+ feature_levels.NumFeatureLevels = ARRAY_SIZE(d3d12_feature_levels);
+ feature_levels.pFeatureLevelsRequested = d3d12_feature_levels;
+ feature_levels.MaxSupportedFeatureLevel = 0;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS,
+ &feature_levels, sizeof(feature_levels));
+ ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr);
+ ok(feature_levels.MaxSupportedFeatureLevel == max_supported_feature_level,
+ "Got unexpected feature level %#x, expected %#x.\n",
+ feature_levels.MaxSupportedFeatureLevel, max_supported_feature_level);
+
+ /* Check invalid size. */
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS,
+ &feature_levels, sizeof(feature_levels) + 1);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS,
+ &feature_levels, sizeof(feature_levels) - 1);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ feature_levels.NumFeatureLevels = ARRAY_SIZE(d3d_9_x_feature_levels);
+ feature_levels.pFeatureLevelsRequested = d3d_9_x_feature_levels;
+ feature_levels.MaxSupportedFeatureLevel = 0;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS,
+ &feature_levels, sizeof(feature_levels));
+ ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr);
+ ok(feature_levels.MaxSupportedFeatureLevel == D3D_FEATURE_LEVEL_9_3,
+ "Got unexpected max feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel);
+
+ feature_levels.NumFeatureLevels = ARRAY_SIZE(invalid_feature_levels);
+ feature_levels.pFeatureLevelsRequested = invalid_feature_levels;
+ feature_levels.MaxSupportedFeatureLevel = 0;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS,
+ &feature_levels, sizeof(feature_levels));
+ ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr);
+ ok(feature_levels.MaxSupportedFeatureLevel == 0x3000,
+ "Got unexpected max feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel);
+
+ /* Format info. */
+ memset(&format_info, 0, sizeof(format_info));
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO,
+ &format_info, sizeof(format_info));
+ ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr);
+ ok(format_info.Format == DXGI_FORMAT_UNKNOWN, "Got unexpected format %#x.\n", format_info.Format);
+ ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount);
+
+ for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format)
+ {
+ vkd3d_test_set_context("format %#x", format);
+
+ switch (format)
+ {
+ case DXGI_FORMAT_R32G8X24_TYPELESS:
+ case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
+ case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
+ case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
+ case DXGI_FORMAT_D24_UNORM_S8_UINT:
+ case DXGI_FORMAT_R24G8_TYPELESS:
+ case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
+ case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
+ case DXGI_FORMAT_NV12:
+ case DXGI_FORMAT_P010:
+ case DXGI_FORMAT_P016:
+ case DXGI_FORMAT_NV11:
+ expected_plane_count = 2;
+ break;
+ default:
+ expected_plane_count = 1;
+ break;
+ }
+
+ is_todo = format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP
+ || format == DXGI_FORMAT_R8G8_B8G8_UNORM
+ || format == DXGI_FORMAT_G8R8_G8B8_UNORM
+ || format == DXGI_FORMAT_B5G6R5_UNORM
+ || format == DXGI_FORMAT_B5G5R5A1_UNORM
+ || format == DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM
+ || (DXGI_FORMAT_AYUV <= format && format <= DXGI_FORMAT_B4G4R4A4_UNORM);
+
+ memset(&format_info, 0, sizeof(format_info));
+ format_info.Format = format;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO,
+ &format_info, sizeof(format_info));
+
+ if (format == DXGI_FORMAT_R1_UNORM)
+ {
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ continue;
+ }
+
+ todo_if(is_todo)
+ ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr);
+ ok(format_info.Format == format, "Got unexpected format %#x.\n", format_info.Format);
+ todo_if(is_todo)
+ ok(format_info.PlaneCount == expected_plane_count,
+ "Got plane count %u, expected %u.\n", format_info.PlaneCount, expected_plane_count);
+ }
+ vkd3d_test_set_context(NULL);
+
+ /* GPU virtual address */
+ memset(&gpu_virtual_address, 0, sizeof(gpu_virtual_address));
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT,
+ &gpu_virtual_address, sizeof(gpu_virtual_address));
+ ok(hr == S_OK, "Failed to check GPU virtual address support, hr %#x.\n", hr);
+ trace("GPU virtual address bits per resource: %u.\n",
+ gpu_virtual_address.MaxGPUVirtualAddressBitsPerResource);
+ trace("GPU virtual address bits per process: %u.\n",
+ gpu_virtual_address.MaxGPUVirtualAddressBitsPerProcess);
+
+ root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE,
+ &root_signature, sizeof(root_signature));
+ ok(hr == S_OK, "Failed to get root signature feature support, hr %#x.\n", hr);
+ ok(root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_0,
+ "Got unexpected root signature feature version %#x.\n", root_signature.HighestVersion);
+
+ root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE,
+ &root_signature, sizeof(root_signature));
+ ok(hr == S_OK, "Failed to get root signature feature support, hr %#x.\n", hr);
+ ok(root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_0
+ || root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_1,
+ "Got unexpected root signature feature version %#x.\n", root_signature.HighestVersion);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_format_support(void)
+{
+ D3D12_FEATURE_DATA_FORMAT_SUPPORT format_support;
+ ID3D12Device *device;
+ ULONG refcount;
+ unsigned int i;
+ HRESULT hr;
+
+ static const struct
+ {
+ D3D12_FEATURE_DATA_FORMAT_SUPPORT f;
+ bool broken;
+ }
+ unsupported_format_features[] =
+ {
+ /* A recent version of WARP suppots B8G8R8A8 UAVs even on D3D_FEATURE_LEVEL_11_0. */
+ {{DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW,
+ D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, true},
+ };
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ memset(&format_support, 0, sizeof(format_support));
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT,
+ &format_support, sizeof(format_support));
+ todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ todo ok(format_support.Support1 == D3D12_FORMAT_SUPPORT1_BUFFER,
+ "Got unexpected support1 %#x.\n", format_support.Support1);
+ ok(!format_support.Support2 || format_support.Support2 == D3D12_FORMAT_SUPPORT2_TILED,
+ "Got unexpected support2 %#x.\n", format_support.Support2);
+
+ for (i = 0; i < ARRAY_SIZE(unsupported_format_features); ++i)
+ {
+ memset(&format_support, 0, sizeof(format_support));
+ format_support.Format = unsupported_format_features[i].f.Format;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT,
+ &format_support, sizeof(format_support));
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(!(format_support.Support1 & unsupported_format_features[i].f.Support1)
+ || broken_on_warp(unsupported_format_features[i].broken),
+ "Format %#x supports %#x.\n", unsupported_format_features[i].f.Format,
+ format_support.Support1 & unsupported_format_features[i].f.Support1);
+ ok(!(format_support.Support2 & unsupported_format_features[i].f.Support2)
+ || broken_on_warp(unsupported_format_features[i].broken),
+ "Format %#x supports %#x.\n", unsupported_format_features[i].f.Format,
+ format_support.Support2 & unsupported_format_features[i].f.Support2);
+ }
+
+ for (i = 0; i < ARRAY_SIZE(depth_stencil_formats); ++i)
+ {
+ memset(&format_support, 0, sizeof(format_support));
+ format_support.Format = depth_stencil_formats[i];
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT,
+ &format_support, sizeof(format_support));
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ }
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_multisample_quality_levels(void)
+{
+ static const unsigned int sample_counts[] = {1, 2, 4, 8, 16, 32};
+ D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS format_support;
+ ID3D12Device *device;
+ DXGI_FORMAT format;
+ unsigned int i, j;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ memset(&format_support, 0, sizeof(format_support));
+ format_support.NumQualityLevels = 0xdeadbeef;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS,
+ &format_support, sizeof(format_support));
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+ ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags);
+ ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels);
+
+ format_support.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ format_support.NumQualityLevels = 0xdeadbeef;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS,
+ &format_support, sizeof(format_support));
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+ ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags);
+ ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels);
+
+ /* 1 sample */
+ for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format)
+ {
+ if (format == DXGI_FORMAT_R1_UNORM)
+ continue;
+
+ vkd3d_test_set_context("format %#x", format);
+
+ memset(&format_support, 0, sizeof(format_support));
+ format_support.Format = format;
+ format_support.SampleCount = 1;
+ format_support.NumQualityLevels = 0xdeadbeef;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS,
+ &format_support, sizeof(format_support));
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(format_support.NumQualityLevels == 1, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels);
+ }
+ vkd3d_test_set_context(NULL);
+
+ /* DXGI_FORMAT_UNKNOWN */
+ for (i = 1; i < ARRAY_SIZE(sample_counts); ++i)
+ {
+ vkd3d_test_set_context("samples %#x", sample_counts[i]);
+
+ memset(&format_support, 0, sizeof(format_support));
+ format_support.SampleCount = sample_counts[i];
+ format_support.NumQualityLevels = 0xdeadbeef;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS,
+ &format_support, sizeof(format_support));
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags);
+ ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels);
+
+ format_support.Flags = D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE;
+ format_support.NumQualityLevels = 0xdeadbeef;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS,
+ &format_support, sizeof(format_support));
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(format_support.Flags == D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE,
+ "Got unexpected flags %#x.\n", format_support.Flags);
+ ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels);
+ }
+ vkd3d_test_set_context(NULL);
+
+ /* invalid sample counts */
+ for (i = 1; i <= 32; ++i)
+ {
+ bool valid_sample_count = false;
+ for (j = 0; j < ARRAY_SIZE(sample_counts); ++j)
+ {
+ if (sample_counts[j] == i)
+ {
+ valid_sample_count = true;
+ break;
+ }
+ }
+ if (valid_sample_count)
+ continue;
+
+ vkd3d_test_set_context("samples %#x", i);
+
+ memset(&format_support, 0, sizeof(format_support));
+ format_support.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ format_support.SampleCount = i;
+ format_support.NumQualityLevels = 0xdeadbeef;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS,
+ &format_support, sizeof(format_support));
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags);
+ ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels);
+ }
+ vkd3d_test_set_context(NULL);
+
+ /* DXGI_FORMAT_R8G8B8A8_UNORM */
+ memset(&format_support, 0, sizeof(format_support));
+ format_support.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ format_support.SampleCount = 4;
+ format_support.NumQualityLevels = 0xdeadbeef;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS,
+ &format_support, sizeof(format_support));
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags);
+ ok(format_support.NumQualityLevels >= 1, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels);
+
+ for (i = 0; i < ARRAY_SIZE(depth_stencil_formats); ++i)
+ {
+ memset(&format_support, 0, sizeof(format_support));
+ format_support.Format = depth_stencil_formats[i];
+ format_support.SampleCount = 4;
+ format_support.NumQualityLevels = 0xdeadbeef;
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS,
+ &format_support, sizeof(format_support));
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ }
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_command_allocator(void)
+{
+ ID3D12CommandAllocator *command_allocator;
+ ID3D12Device *device, *tmp_device;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+
+ refcount = get_refcount(device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ hr = ID3D12CommandAllocator_GetDevice(command_allocator, &IID_ID3D12Device, (void **)&tmp_device);
+ ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr);
+ refcount = get_refcount(device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(tmp_device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ check_interface(command_allocator, &IID_ID3D12Object, true);
+ check_interface(command_allocator, &IID_ID3D12DeviceChild, true);
+ check_interface(command_allocator, &IID_ID3D12Pageable, true);
+ check_interface(command_allocator, &IID_ID3D12CommandAllocator, true);
+
+ refcount = ID3D12CommandAllocator_Release(command_allocator);
+ ok(!refcount, "ID3D12CommandAllocator has %u references left.\n", (unsigned int)refcount);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_BUNDLE,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+ refcount = ID3D12CommandAllocator_Release(command_allocator);
+ ok(!refcount, "ID3D12CommandAllocator has %u references left.\n", (unsigned int)refcount);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_COMPUTE,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+ refcount = ID3D12CommandAllocator_Release(command_allocator);
+ ok(!refcount, "ID3D12CommandAllocator has %u references left.\n", (unsigned int)refcount);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_COPY,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+ refcount = ID3D12CommandAllocator_Release(command_allocator);
+ ok(!refcount, "ID3D12CommandAllocator has %u references left.\n", (unsigned int)refcount);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, ~0u,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_command_list(void)
+{
+ ID3D12CommandAllocator *command_allocator;
+ ID3D12Device *device, *tmp_device;
+ ID3D12CommandList *command_list;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ NULL, NULL, &IID_ID3D12CommandList, (void **)&command_list);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+
+ refcount = get_refcount(device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ command_allocator, NULL, &IID_ID3D12CommandList, (void **)&command_list);
+ ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr);
+
+ refcount = get_refcount(command_allocator);
+ ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ refcount = get_refcount(device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ hr = ID3D12CommandList_GetDevice(command_list, &IID_ID3D12Device, (void **)&tmp_device);
+ ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr);
+ refcount = get_refcount(device);
+ ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(tmp_device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ check_interface(command_list, &IID_ID3D12Object, true);
+ check_interface(command_list, &IID_ID3D12DeviceChild, true);
+ check_interface(command_list, &IID_ID3D12Pageable, false);
+ check_interface(command_list, &IID_ID3D12CommandList, true);
+ check_interface(command_list, &IID_ID3D12GraphicsCommandList, true);
+ check_interface(command_list, &IID_ID3D12CommandAllocator, false);
+
+ refcount = ID3D12CommandList_Release(command_list);
+ ok(!refcount, "ID3D12CommandList has %u references left.\n", (unsigned int)refcount);
+ refcount = ID3D12CommandAllocator_Release(command_allocator);
+ ok(!refcount, "ID3D12CommandAllocator has %u references left.\n", (unsigned int)refcount);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_BUNDLE,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ command_allocator, NULL, &IID_ID3D12CommandList, (void **)&command_list);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_BUNDLE,
+ command_allocator, NULL, &IID_ID3D12CommandList, (void **)&command_list);
+ ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr);
+ check_interface(command_list, &IID_ID3D12GraphicsCommandList, true);
+ refcount = ID3D12CommandList_Release(command_list);
+ ok(!refcount, "ID3D12CommandList has %u references left.\n", (unsigned int)refcount);
+ refcount = ID3D12CommandAllocator_Release(command_allocator);
+ ok(!refcount, "ID3D12CommandAllocator has %u references left.\n", (unsigned int)refcount);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_COMPUTE,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_BUNDLE,
+ command_allocator, NULL, &IID_ID3D12CommandList, (void **)&command_list);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_COMPUTE,
+ command_allocator, NULL, &IID_ID3D12CommandList, (void **)&command_list);
+ ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr);
+ check_interface(command_list, &IID_ID3D12GraphicsCommandList, true);
+ refcount = ID3D12CommandList_Release(command_list);
+ ok(!refcount, "ID3D12CommandList has %u references left.\n", (unsigned int)refcount);
+ refcount = ID3D12CommandAllocator_Release(command_allocator);
+ ok(!refcount, "ID3D12CommandAllocator has %u references left.\n", (unsigned int)refcount);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_COPY,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ command_allocator, NULL, &IID_ID3D12CommandList, (void **)&command_list);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_COMPUTE,
+ command_allocator, NULL, &IID_ID3D12CommandList, (void **)&command_list);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_COPY,
+ command_allocator, NULL, &IID_ID3D12CommandList, (void **)&command_list);
+ ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr);
+ check_interface(command_list, &IID_ID3D12GraphicsCommandList, true);
+ refcount = ID3D12CommandList_Release(command_list);
+ ok(!refcount, "ID3D12CommandList has %u references left.\n", (unsigned int)refcount);
+ refcount = ID3D12CommandAllocator_Release(command_allocator);
+ ok(!refcount, "ID3D12CommandAllocator has %u references left.\n", (unsigned int)refcount);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_command_queue(void)
+{
+ ID3D12CommandQueue* direct_queues[32], *compute_queues[32];
+ D3D12_COMMAND_QUEUE_DESC desc, result_desc;
+ ID3D12Device *device, *tmp_device;
+ ID3D12CommandQueue *queue;
+ unsigned int i;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;
+ desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL;
+ desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
+ desc.NodeMask = 0;
+ hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&queue);
+ ok(SUCCEEDED(hr), "Failed to create command queue, hr %#x.\n", hr);
+
+ refcount = get_refcount(device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ hr = ID3D12CommandQueue_GetDevice(queue, &IID_ID3D12Device, (void **)&tmp_device);
+ ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr);
+ refcount = get_refcount(device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(tmp_device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ check_interface(queue, &IID_ID3D12Object, true);
+ check_interface(queue, &IID_ID3D12DeviceChild, true);
+ check_interface(queue, &IID_ID3D12Pageable, true);
+ check_interface(queue, &IID_ID3D12CommandQueue, true);
+
+ result_desc = ID3D12CommandQueue_GetDesc(queue);
+ ok(result_desc.Type == desc.Type, "Got unexpected type %#x.\n", result_desc.Type);
+ ok(result_desc.Priority == desc.Priority, "Got unexpected priority %#x.\n", result_desc.Priority);
+ ok(result_desc.Flags == desc.Flags, "Got unexpected flags %#x.\n", result_desc.Flags);
+ ok(result_desc.NodeMask == 0x1, "Got unexpected node mask 0x%08x.\n", result_desc.NodeMask);
+
+ refcount = ID3D12CommandQueue_Release(queue);
+ ok(!refcount, "ID3D12CommandQueue has %u references left.\n", (unsigned int)refcount);
+
+ desc.Type = D3D12_COMMAND_LIST_TYPE_COMPUTE;
+ hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&queue);
+ ok(SUCCEEDED(hr), "Failed to create command queue, hr %#x.\n", hr);
+
+ result_desc = ID3D12CommandQueue_GetDesc(queue);
+ ok(result_desc.Type == desc.Type, "Got unexpected type %#x.\n", result_desc.Type);
+ ok(result_desc.Priority == desc.Priority, "Got unexpected priority %#x.\n", result_desc.Priority);
+ ok(result_desc.Flags == desc.Flags, "Got unexpected flags %#x.\n", result_desc.Flags);
+ ok(result_desc.NodeMask == 0x1, "Got unexpected node mask 0x%08x.\n", result_desc.NodeMask);
+
+ refcount = ID3D12CommandQueue_Release(queue);
+ ok(!refcount, "ID3D12CommandQueue has %u references left.\n", (unsigned int)refcount);
+
+ desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;
+ for (i = 0; i < ARRAY_SIZE(direct_queues); ++i)
+ {
+ hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&direct_queues[i]);
+ ok(hr == S_OK, "Failed to create direct command queue %u, hr %#x.\n", hr, i);
+ }
+ desc.Type = D3D12_COMMAND_LIST_TYPE_COMPUTE;
+ for (i = 0; i < ARRAY_SIZE(compute_queues); ++i)
+ {
+ hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&compute_queues[i]);
+ ok(hr == S_OK, "Failed to create compute command queue %u, hr %#x.\n", hr, i);
+ }
+
+ for (i = 0; i < ARRAY_SIZE(direct_queues); ++i)
+ ID3D12CommandQueue_Release(direct_queues[i]);
+ for (i = 0; i < ARRAY_SIZE(compute_queues); ++i)
+ ID3D12CommandQueue_Release(compute_queues[i]);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_command_signature(void)
+{
+ D3D12_INDIRECT_ARGUMENT_DESC argument_desc[3];
+ D3D12_COMMAND_SIGNATURE_DESC signature_desc;
+ ID3D12CommandSignature *command_signature;
+ ID3D12Device *device;
+ unsigned int i;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ signature_desc.ByteStride = 1024;
+ signature_desc.NumArgumentDescs = ARRAY_SIZE(argument_desc);
+ signature_desc.pArgumentDescs = argument_desc;
+ signature_desc.NodeMask = 0;
+
+ for (i = 0; i < ARRAY_SIZE(argument_desc); ++i)
+ argument_desc[i].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW;
+ hr = ID3D12Device_CreateCommandSignature(device, &signature_desc,
+ NULL, &IID_ID3D12CommandSignature, (void **)&command_signature);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(argument_desc); ++i)
+ argument_desc[i].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED;
+ hr = ID3D12Device_CreateCommandSignature(device, &signature_desc,
+ NULL, &IID_ID3D12CommandSignature, (void **)&command_signature);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(argument_desc); ++i)
+ argument_desc[i].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH;
+ hr = ID3D12Device_CreateCommandSignature(device, &signature_desc,
+ NULL, &IID_ID3D12CommandSignature, (void **)&command_signature);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ argument_desc[0].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH;
+ argument_desc[1].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW;
+ signature_desc.NumArgumentDescs = 2;
+ hr = ID3D12Device_CreateCommandSignature(device, &signature_desc,
+ NULL, &IID_ID3D12CommandSignature, (void **)&command_signature);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_committed_resource(void)
+{
+ D3D12_GPU_VIRTUAL_ADDRESS gpu_address;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_RESOURCE_DESC resource_desc;
+ ID3D12Device *device, *tmp_device;
+ D3D12_CLEAR_VALUE clear_value;
+ D3D12_RESOURCE_STATES state;
+ ID3D12Resource *resource;
+ unsigned int i;
+ ULONG refcount;
+ HRESULT hr;
+
+ static const struct
+ {
+ D3D12_HEAP_TYPE heap_type;
+ D3D12_RESOURCE_FLAGS flags;
+ }
+ invalid_buffer_desc_tests[] =
+ {
+ /* Render target or unordered access resources are not allowed with UPLOAD or READBACK. */
+ {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET},
+ {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET},
+ {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS},
+ {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS},
+ {D3D12_HEAP_TYPE_DEFAULT, D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS},
+ {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS},
+ {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS},
+ };
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 32;
+ resource_desc.Height = 32;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+
+ clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ clear_value.Color[0] = 1.0f;
+ clear_value.Color[1] = 0.0f;
+ clear_value.Color[2] = 0.0f;
+ clear_value.Color[3] = 1.0f;
+
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr);
+
+ refcount = get_refcount(device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ hr = ID3D12Resource_GetDevice(resource, &IID_ID3D12Device, (void **)&tmp_device);
+ ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr);
+ refcount = get_refcount(device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(tmp_device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ check_interface(resource, &IID_ID3D12Object, true);
+ check_interface(resource, &IID_ID3D12DeviceChild, true);
+ check_interface(resource, &IID_ID3D12Pageable, true);
+ check_interface(resource, &IID_ID3D12Resource, true);
+
+ gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource);
+ ok(!gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address);
+
+ refcount = ID3D12Resource_Release(resource);
+ ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount);
+
+ resource_desc.MipLevels = 0;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr);
+ resource_desc = ID3D12Resource_GetDesc(resource);
+ ok(resource_desc.MipLevels == 6, "Got unexpected miplevels %u.\n", resource_desc.MipLevels);
+ ID3D12Resource_Release(resource);
+ resource_desc.MipLevels = 10;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr);
+ resource_desc = ID3D12Resource_GetDesc(resource);
+ ok(resource_desc.MipLevels == 10, "Got unexpected miplevels %u.\n", resource_desc.MipLevels);
+ ID3D12Resource_Release(resource);
+ resource_desc.MipLevels = 1;
+
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE,
+ &clear_value, &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ /* For D3D12_RESOURCE_STATE_RENDER_TARGET the D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET flag is required. */
+ resource_desc.Flags = 0;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ if (SUCCEEDED(hr))
+ ID3D12Resource_Release(resource);
+
+ /* A texture cannot be created on a UPLOAD heap. */
+ heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD;
+ resource = (void *)0xdeadbeef;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(!resource, "Got unexpected pointer %p.\n", resource);
+
+ resource = (void *)0xdeadbeef;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL,
+ &IID_ID3D12Device, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(!resource, "Got unexpected pointer %p.\n", resource);
+
+ /* A texture cannot be created on a READBACK heap. */
+ heap_properties.Type = D3D12_HEAP_TYPE_READBACK;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD;
+
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 32;
+ resource_desc.Height = 1;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_UNKNOWN;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_NONE;
+
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr);
+
+ check_interface(resource, &IID_ID3D12Object, true);
+ check_interface(resource, &IID_ID3D12DeviceChild, true);
+ check_interface(resource, &IID_ID3D12Pageable, true);
+ check_interface(resource, &IID_ID3D12Resource, true);
+
+ gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource);
+ ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address);
+
+ refcount = ID3D12Resource_Release(resource);
+ ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount);
+
+ resource_desc.MipLevels = 0;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, &clear_value,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Failed to create committed resource, hr %#x.\n", hr);
+ resource_desc.MipLevels = 1;
+
+ /* The clear value must be NULL for buffers. */
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, &clear_value,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ /* For D3D12_HEAP_TYPE_UPLOAD the state must be D3D12_RESOURCE_STATE_GENERIC_READ. */
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_COPY_SOURCE, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ heap_properties.Type = D3D12_HEAP_TYPE_READBACK;
+
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr);
+
+ gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource);
+ ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address);
+
+ refcount = ID3D12Resource_Release(resource);
+ ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount);
+
+ /* For D3D12_HEAP_TYPE_READBACK the state must be D3D12_RESOURCE_STATE_COPY_DEST. */
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_COPY_SOURCE, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(invalid_buffer_desc_tests); ++i)
+ {
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = invalid_buffer_desc_tests[i].heap_type;
+
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 32;
+ resource_desc.Height = 1;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_UNKNOWN;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
+ resource_desc.Flags = invalid_buffer_desc_tests[i].flags;
+
+ if (invalid_buffer_desc_tests[i].heap_type == D3D12_HEAP_TYPE_UPLOAD)
+ state = D3D12_RESOURCE_STATE_GENERIC_READ;
+ else
+ state = D3D12_RESOURCE_STATE_COPY_DEST;
+
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, state, NULL, &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ }
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_heap(void)
+{
+ D3D12_FEATURE_DATA_ARCHITECTURE architecture;
+ D3D12_FEATURE_DATA_D3D12_OPTIONS options;
+ D3D12_HEAP_DESC desc, result_desc;
+ ID3D12Device *device, *tmp_device;
+ bool is_pool_L1_supported;
+ HRESULT hr, expected_hr;
+ unsigned int i, j;
+ ID3D12Heap *heap;
+ ULONG refcount;
+
+ static const struct
+ {
+ uint64_t alignment;
+ HRESULT expected_hr;
+ }
+ tests[] =
+ {
+ {D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT, S_OK},
+ {D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, S_OK},
+ {2 * D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT, E_INVALIDARG},
+ {2 * D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, E_INVALIDARG},
+ {D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, E_INVALIDARG},
+ };
+ static const struct
+ {
+ D3D12_HEAP_FLAGS flags;
+ const char *name;
+ }
+ heap_flags[] =
+ {
+ {D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS, "buffers"},
+ {D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES, "textures"},
+ {D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES, "rt_ds_textures"},
+ };
+ static const struct
+ {
+ D3D12_CPU_PAGE_PROPERTY page_property;
+ D3D12_MEMORY_POOL pool_preference;
+ HRESULT expected_hr;
+ }
+ custom_tests[] =
+ {
+ {D3D12_CPU_PAGE_PROPERTY_UNKNOWN, D3D12_MEMORY_POOL_UNKNOWN, E_INVALIDARG},
+ {D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE, D3D12_MEMORY_POOL_UNKNOWN, E_INVALIDARG},
+ {D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE, D3D12_MEMORY_POOL_UNKNOWN, E_INVALIDARG},
+ {D3D12_CPU_PAGE_PROPERTY_WRITE_BACK, D3D12_MEMORY_POOL_UNKNOWN, E_INVALIDARG},
+ {D3D12_CPU_PAGE_PROPERTY_UNKNOWN, D3D12_MEMORY_POOL_L0, E_INVALIDARG},
+ {D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE, D3D12_MEMORY_POOL_L0, S_OK},
+ {D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE, D3D12_MEMORY_POOL_L0, S_OK},
+ {D3D12_CPU_PAGE_PROPERTY_WRITE_BACK, D3D12_MEMORY_POOL_L0, S_OK},
+ {D3D12_CPU_PAGE_PROPERTY_UNKNOWN, D3D12_MEMORY_POOL_L1, E_INVALIDARG},
+ {D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE, D3D12_MEMORY_POOL_L1, S_OK},
+ {D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE, D3D12_MEMORY_POOL_L1, E_INVALIDARG},
+ {D3D12_CPU_PAGE_PROPERTY_WRITE_BACK, D3D12_MEMORY_POOL_L1, E_INVALIDARG},
+ };
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+ memset(&desc.Properties, 0, sizeof(desc.Properties));
+ desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ desc.Alignment = 0;
+ desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES;
+ hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap);
+ ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr);
+
+ refcount = get_refcount(device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ hr = ID3D12Heap_GetDevice(heap, &IID_ID3D12Device, (void **)&tmp_device);
+ ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr);
+ refcount = get_refcount(device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(tmp_device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ check_interface(heap, &IID_ID3D12Object, true);
+ check_interface(heap, &IID_ID3D12DeviceChild, true);
+ check_interface(heap, &IID_ID3D12Pageable, true);
+ check_interface(heap, &IID_ID3D12Heap, true);
+
+ result_desc = ID3D12Heap_GetDesc(heap);
+ check_heap_desc(&result_desc, &desc);
+
+ refcount = ID3D12Heap_Release(heap);
+ ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount);
+
+ desc.SizeInBytes = 0;
+ hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+ desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES | D3D12_HEAP_FLAG_ALLOW_DISPLAY;
+ hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ heap = (void *)0xdeadbeef;
+ desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES | D3D12_HEAP_FLAG_ALLOW_DISPLAY;
+ hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(!heap, "Got unexpected pointer %p.\n", heap);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ for (j = 0; j < ARRAY_SIZE(heap_flags); ++j)
+ {
+ vkd3d_test_set_context("Test %u, %u", i, j);
+
+ desc.SizeInBytes = 10 * tests[i].alignment;
+ desc.Alignment = tests[i].alignment;
+ desc.Flags = heap_flags[j].flags;
+ hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap);
+ ok(hr == tests[i].expected_hr, "Test %u, %s: Got hr %#x, expected %#x.\n",
+ i, heap_flags[j].name, hr, tests[i].expected_hr);
+ if (FAILED(hr))
+ continue;
+
+ result_desc = ID3D12Heap_GetDesc(heap);
+ check_heap_desc(&result_desc, &desc);
+
+ refcount = ID3D12Heap_Release(heap);
+ ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount);
+ }
+ }
+ vkd3d_test_set_context(NULL);
+
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options));
+ ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr);
+ if (options.ResourceHeapTier < D3D12_RESOURCE_HEAP_TIER_2)
+ {
+ skip("Resource heap tier %u.\n", options.ResourceHeapTier);
+ goto done;
+ }
+
+ desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+ desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+ desc.Flags = D3D12_HEAP_FLAG_ALLOW_ALL_BUFFERS_AND_TEXTURES;
+ hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ result_desc = ID3D12Heap_GetDesc(heap);
+ check_heap_desc(&result_desc, &desc);
+ refcount = ID3D12Heap_Release(heap);
+ ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount);
+
+ memset(&architecture, 0, sizeof(architecture));
+ hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ARCHITECTURE, &architecture, sizeof(architecture));
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ for (i = D3D12_HEAP_TYPE_DEFAULT; i < D3D12_HEAP_TYPE_CUSTOM; ++i)
+ {
+ vkd3d_test_set_context("Test %u\n", i);
+ desc.Properties = ID3D12Device_GetCustomHeapProperties(device, 1, i);
+ ok(desc.Properties.Type == D3D12_HEAP_TYPE_CUSTOM, "Got unexpected heap type %#x.\n", desc.Properties.Type);
+
+ switch (i)
+ {
+ case D3D12_HEAP_TYPE_DEFAULT:
+ ok(desc.Properties.CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE,
+ "Got unexpected CPUPageProperty %#x.\n", desc.Properties.CPUPageProperty);
+ ok(desc.Properties.MemoryPoolPreference == (architecture.UMA
+ ? D3D12_MEMORY_POOL_L0 : D3D12_MEMORY_POOL_L1),
+ "Got unexpected MemoryPoolPreference %#x.\n", desc.Properties.MemoryPoolPreference);
+ break;
+
+ case D3D12_HEAP_TYPE_UPLOAD:
+ ok(desc.Properties.CPUPageProperty == (architecture.CacheCoherentUMA
+ ? D3D12_CPU_PAGE_PROPERTY_WRITE_BACK : D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE),
+ "Got unexpected CPUPageProperty %#x.\n", desc.Properties.CPUPageProperty);
+ ok(desc.Properties.MemoryPoolPreference == D3D12_MEMORY_POOL_L0,
+ "Got unexpected MemoryPoolPreference %#x.\n", desc.Properties.MemoryPoolPreference);
+ break;
+
+ case D3D12_HEAP_TYPE_READBACK:
+ ok(desc.Properties.CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_BACK,
+ "Got unexpected CPUPageProperty %#x.\n", desc.Properties.CPUPageProperty);
+ ok(desc.Properties.MemoryPoolPreference == D3D12_MEMORY_POOL_L0,
+ "Got unexpected MemoryPoolPreference %#x.\n", desc.Properties.MemoryPoolPreference);
+ break;
+
+ default:
+ ok(0, "Invalid heap type %#x.\n", i);
+ continue;
+ }
+
+ hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ result_desc = ID3D12Heap_GetDesc(heap);
+ check_heap_desc(&result_desc, &desc);
+ ID3D12Heap_Release(heap);
+ }
+ vkd3d_test_set_context(NULL);
+
+ is_pool_L1_supported = is_memory_pool_L1_supported(device);
+ desc.Properties.Type = D3D12_HEAP_TYPE_CUSTOM;
+ desc.Properties.CreationNodeMask = 1;
+ desc.Properties.VisibleNodeMask = 1;
+ for (i = 0; i < ARRAY_SIZE(custom_tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ desc.Properties.CPUPageProperty = custom_tests[i].page_property;
+ desc.Properties.MemoryPoolPreference = custom_tests[i].pool_preference;
+ hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap);
+ expected_hr = (custom_tests[i].pool_preference != D3D12_MEMORY_POOL_L1 || is_pool_L1_supported) ? custom_tests[i].expected_hr : E_INVALIDARG;
+ ok(hr == expected_hr, "Test %u, page_property %u, pool_preference %u: Got hr %#x, expected %#x.\n",
+ i, custom_tests[i].page_property, custom_tests[i].pool_preference, hr, expected_hr);
+ if (FAILED(hr))
+ continue;
+
+ result_desc = ID3D12Heap_GetDesc(heap);
+ check_heap_desc(&result_desc, &desc);
+
+ refcount = ID3D12Heap_Release(heap);
+ ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount);
+ }
+ vkd3d_test_set_context(NULL);
+
+done:
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_placed_resource(void)
+{
+ D3D12_GPU_VIRTUAL_ADDRESS gpu_address;
+ D3D12_RESOURCE_DESC resource_desc;
+ ID3D12Device *device, *tmp_device;
+ D3D12_CLEAR_VALUE clear_value;
+ D3D12_RESOURCE_STATES state;
+ D3D12_HEAP_DESC heap_desc;
+ ID3D12Resource *resource;
+ ID3D12Heap *heap;
+ unsigned int i;
+ ULONG refcount;
+ HRESULT hr;
+
+ static const struct
+ {
+ D3D12_HEAP_TYPE heap_type;
+ D3D12_RESOURCE_FLAGS flags;
+ }
+ invalid_buffer_desc_tests[] =
+ {
+ /* Render target or unordered access resources are not allowed with UPLOAD or READBACK. */
+ {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET},
+ {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET},
+ {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS},
+ {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS},
+ };
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ heap_desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+ memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties));
+ heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ heap_desc.Alignment = 0;
+ heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
+ hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap);
+ ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr);
+
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 32;
+ resource_desc.Height = 1;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_UNKNOWN;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
+ resource_desc.Flags = 0;
+
+ clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ clear_value.Color[0] = 1.0f;
+ clear_value.Color[1] = 0.0f;
+ clear_value.Color[2] = 0.0f;
+ clear_value.Color[3] = 1.0f;
+
+ refcount = get_refcount(heap);
+ ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ hr = ID3D12Device_CreatePlacedResource(device, heap, 0,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr);
+
+ refcount = get_refcount(heap);
+ ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ refcount = get_refcount(device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ hr = ID3D12Resource_GetDevice(resource, &IID_ID3D12Device, (void **)&tmp_device);
+ ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr);
+ refcount = get_refcount(device);
+ ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(tmp_device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ check_interface(resource, &IID_ID3D12Object, true);
+ check_interface(resource, &IID_ID3D12DeviceChild, true);
+ check_interface(resource, &IID_ID3D12Pageable, true);
+ check_interface(resource, &IID_ID3D12Resource, true);
+
+ gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource);
+ ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address);
+
+ refcount = ID3D12Resource_Release(resource);
+ ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount);
+
+ /* The clear value must be NULL for buffers. */
+ hr = ID3D12Device_CreatePlacedResource(device, heap, 0,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, &clear_value,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ ID3D12Heap_Release(heap);
+
+ for (i = 0; i < ARRAY_SIZE(invalid_buffer_desc_tests); ++i)
+ {
+ heap_desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+ memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties));
+ heap_desc.Properties.Type = invalid_buffer_desc_tests[i].heap_type;
+ heap_desc.Alignment = 0;
+ heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
+ hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap);
+ ok(hr == S_OK, "Test %u: Failed to create heap, hr %#x.\n", i, hr);
+
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 32;
+ resource_desc.Height = 1;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_UNKNOWN;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
+ resource_desc.Flags = invalid_buffer_desc_tests[i].flags;
+
+ if (invalid_buffer_desc_tests[i].heap_type == D3D12_HEAP_TYPE_UPLOAD)
+ state = D3D12_RESOURCE_STATE_GENERIC_READ;
+ else
+ state = D3D12_RESOURCE_STATE_COPY_DEST;
+
+ hr = ID3D12Device_CreatePlacedResource(device, heap, 0,
+ &resource_desc, state, &clear_value, &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr);
+
+ ID3D12Heap_Release(heap);
+ }
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_reserved_resource(void)
+{
+ D3D12_GPU_VIRTUAL_ADDRESS gpu_address;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_RESOURCE_DESC resource_desc;
+ D3D12_CLEAR_VALUE clear_value;
+ D3D12_HEAP_FLAGS heap_flags;
+ ID3D12Resource *resource;
+ bool standard_swizzle;
+ ID3D12Device *device;
+ ULONG refcount;
+ HRESULT hr;
+ void *ptr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ if (get_tiled_resources_tier(device) == D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED)
+ {
+ skip("Tiled resources are not supported.\n");
+ goto done;
+ }
+
+ standard_swizzle = is_standard_swizzle_64kb_supported(device);
+ trace("Standard swizzle 64KB: %#x.\n", standard_swizzle);
+
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 32;
+ resource_desc.Height = 1;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_UNKNOWN;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
+ resource_desc.Flags = 0;
+
+ hr = ID3D12Device_CreateReservedResource(device,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create reserved resource, hr %#x.\n", hr);
+
+ check_interface(resource, &IID_ID3D12Object, true);
+ check_interface(resource, &IID_ID3D12DeviceChild, true);
+ check_interface(resource, &IID_ID3D12Pageable, true);
+ check_interface(resource, &IID_ID3D12Resource, true);
+
+ gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource);
+ ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address);
+
+ heap_flags = 0xdeadbeef;
+ hr = ID3D12Resource_GetHeapProperties(resource, &heap_properties, &heap_flags);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(heap_flags == 0xdeadbeef, "Got unexpected heap flags %#x.\n", heap_flags);
+
+ /* Map() is not allowed on reserved resources */
+ hr = ID3D12Resource_Map(resource, 0, NULL, &ptr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ refcount = ID3D12Resource_Release(resource);
+ ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount);
+
+ /* The clear value must be NULL for buffers. */
+ clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ clear_value.Color[0] = 1.0f;
+ clear_value.Color[1] = 0.0f;
+ clear_value.Color[2] = 0.0f;
+ clear_value.Color[3] = 1.0f;
+
+ hr = ID3D12Device_CreateReservedResource(device,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, &clear_value,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ /* D3D12_TEXTURE_LAYOUT_ROW_MAJOR must be used for buffers. */
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE;
+ hr = ID3D12Device_CreateReservedResource(device,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ hr = ID3D12Device_CreateReservedResource(device,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ /* D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE must be used for textures. */
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 64;
+ resource_desc.Height = 64;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 4;
+ resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE;
+ resource_desc.Flags = 0;
+
+ hr = ID3D12Device_CreateReservedResource(device,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create reserved resource, hr %#x.\n", hr);
+ refcount = ID3D12Resource_Release(resource);
+ ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount);
+
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ hr = ID3D12Device_CreateReservedResource(device,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ resource_desc.MipLevels = 1;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
+ hr = ID3D12Device_CreateReservedResource(device,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE;
+ hr = ID3D12Device_CreateReservedResource(device,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == (standard_swizzle ? S_OK : E_INVALIDARG) || broken(use_warp_device), "Got unexpected hr %#x.\n", hr);
+ if (SUCCEEDED(hr))
+ ID3D12Resource_Release(resource);
+
+done:
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_descriptor_heap(void)
+{
+ D3D12_DESCRIPTOR_HEAP_DESC heap_desc;
+ ID3D12Device *device, *tmp_device;
+ ID3D12DescriptorHeap *heap;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
+ heap_desc.NumDescriptors = 16;
+ heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
+ heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap);
+ ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr);
+
+ refcount = get_refcount(device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ hr = ID3D12DescriptorHeap_GetDevice(heap, &IID_ID3D12Device, (void **)&tmp_device);
+ ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr);
+ refcount = get_refcount(device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(tmp_device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ check_interface(heap, &IID_ID3D12Object, true);
+ check_interface(heap, &IID_ID3D12DeviceChild, true);
+ check_interface(heap, &IID_ID3D12Pageable, true);
+ check_interface(heap, &IID_ID3D12DescriptorHeap, true);
+
+ refcount = ID3D12DescriptorHeap_Release(heap);
+ ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount);
+
+ heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
+ heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
+ hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap);
+ ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr);
+ refcount = ID3D12DescriptorHeap_Release(heap);
+ ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount);
+
+ heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER;
+ heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
+ hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap);
+ ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr);
+ refcount = ID3D12DescriptorHeap_Release(heap);
+ ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount);
+
+ heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV;
+ heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
+ hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap);
+ ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr);
+ refcount = ID3D12DescriptorHeap_Release(heap);
+ ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount);
+
+ heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
+ hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_DSV;
+ heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
+ hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap);
+ ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr);
+ refcount = ID3D12DescriptorHeap_Release(heap);
+ ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount);
+
+ heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
+ hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_sampler(void)
+{
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ D3D12_DESCRIPTOR_HEAP_DESC heap_desc;
+ unsigned int sampler_increment_size;
+ D3D12_SAMPLER_DESC sampler_desc;
+ ID3D12DescriptorHeap *heap;
+ ID3D12Device *device;
+ unsigned int i;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ sampler_increment_size = ID3D12Device_GetDescriptorHandleIncrementSize(device,
+ D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER);
+ trace("Sampler descriptor handle increment size: %u.\n", sampler_increment_size);
+ ok(sampler_increment_size, "Got unexpected increment size %#x.\n", sampler_increment_size);
+
+ heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER;
+ heap_desc.NumDescriptors = 16;
+ heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
+ heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap);
+ ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr);
+
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ memset(&sampler_desc, 0, sizeof(sampler_desc));
+ sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT;
+ sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
+ sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
+ sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
+ sampler_desc.MaxLOD = D3D12_FLOAT32_MAX;
+ ID3D12Device_CreateSampler(device, &sampler_desc, cpu_handle);
+
+ cpu_handle.ptr += sampler_increment_size;
+ sampler_desc.Filter = D3D12_FILTER_MIN_MAG_POINT_MIP_LINEAR;
+ for (i = 1; i < heap_desc.NumDescriptors; ++i)
+ {
+ ID3D12Device_CreateSampler(device, &sampler_desc, cpu_handle);
+ cpu_handle.ptr += sampler_increment_size;
+ }
+
+ trace("MinMaxFiltering: %#x.\n", is_min_max_filtering_supported(device));
+ if (is_min_max_filtering_supported(device))
+ {
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ sampler_desc.Filter = D3D12_FILTER_MINIMUM_MIN_MAG_MIP_POINT;
+ ID3D12Device_CreateSampler(device, &sampler_desc, cpu_handle);
+
+ cpu_handle.ptr += sampler_increment_size;
+ sampler_desc.Filter = D3D12_FILTER_MAXIMUM_MIN_MAG_MIP_POINT;
+ ID3D12Device_CreateSampler(device, &sampler_desc, cpu_handle);
+ }
+
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ sampler_desc.Filter = D3D12_FILTER_COMPARISON_MIN_MAG_MIP_POINT;
+ sampler_desc.ComparisonFunc = D3D12_COMPARISON_FUNC_LESS;
+ ID3D12Device_CreateSampler(device, &sampler_desc, cpu_handle);
+
+ refcount = ID3D12DescriptorHeap_Release(heap);
+ ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_unordered_access_view(void)
+{
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ ID3D12Resource *buffer, *texture;
+ unsigned int descriptor_size;
+ ID3D12DescriptorHeap *heap;
+ ID3D12Device *device;
+ ULONG refcount;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(device,
+ D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+ trace("CBV/SRV/UAV descriptor size: %u.\n", descriptor_size);
+ ok(descriptor_size, "Got unexpected descriptor size %#x.\n", descriptor_size);
+
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 16);
+
+ buffer = create_default_buffer(device, 64 * sizeof(float),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ uav_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.FirstElement = 0;
+ uav_desc.Buffer.NumElements = 64;
+ uav_desc.Buffer.StructureByteStride = 0;
+ uav_desc.Buffer.CounterOffsetInBytes = 0;
+ uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE;
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, cpu_handle);
+
+ cpu_handle.ptr += descriptor_size;
+
+ /* DXGI_FORMAT_R32_UINT view for DXGI_FORMAT_R8G8B8A8_TYPELESS resources. */
+ texture = create_default_texture(device, 8, 8, DXGI_FORMAT_R8G8B8A8_TYPELESS,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ uav_desc.Format = DXGI_FORMAT_R32_UINT;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE2D;
+ uav_desc.Texture2D.MipSlice = 0;
+ uav_desc.Texture2D.PlaneSlice = 0;
+ ID3D12Device_CreateUnorderedAccessView(device, texture, NULL, &uav_desc, cpu_handle);
+
+ ID3D12Resource_Release(buffer);
+ ID3D12Resource_Release(texture);
+ refcount = ID3D12DescriptorHeap_Release(heap);
+ ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_root_signature(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[2];
+ D3D12_ROOT_PARAMETER root_parameters[3];
+ ID3D12RootSignature *root_signature;
+ ID3D12Device *device, *tmp_device;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ /* descriptor table */
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ refcount = get_refcount(device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ hr = ID3D12RootSignature_GetDevice(root_signature, &IID_ID3D12Device, (void **)&tmp_device);
+ ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr);
+ refcount = get_refcount(device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(tmp_device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ check_interface(root_signature, &IID_ID3D12Object, true);
+ check_interface(root_signature, &IID_ID3D12DeviceChild, true);
+ check_interface(root_signature, &IID_ID3D12Pageable, false);
+ check_interface(root_signature, &IID_ID3D12RootSignature, true);
+
+ refcount = ID3D12RootSignature_Release(root_signature);
+ ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount);
+
+ /* sampler and SRV in the same descriptor table */
+ descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER;
+ descriptor_ranges[1].NumDescriptors = 1;
+ descriptor_ranges[1].BaseShaderRegister = 2;
+ descriptor_ranges[1].RegisterSpace = 0;
+ descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 10;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 2;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(hr == E_INVALIDARG, "Failed to create root signature, hr %#x.\n", hr);
+
+ /* empty root signature */
+ root_signature_desc.NumParameters = 0;
+ root_signature_desc.pParameters = NULL;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+ refcount = ID3D12RootSignature_Release(root_signature);
+ ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount);
+
+ /* root constants */
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[0].Constants.ShaderRegister = 0;
+ root_parameters[0].Constants.RegisterSpace = 0;
+ root_parameters[0].Constants.Num32BitValues = 4;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 8;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX;
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ todo ok(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ if (SUCCEEDED(hr))
+ ID3D12RootSignature_Release(root_signature);
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+ refcount = ID3D12RootSignature_Release(root_signature);
+ ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount);
+
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[2].Constants.ShaderRegister = 1;
+ root_parameters[2].Constants.RegisterSpace = 0;
+ root_parameters[2].Constants.Num32BitValues = 3;
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 3;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+ refcount = ID3D12RootSignature_Release(root_signature);
+ ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount);
+
+ /* root descriptors */
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[0].Descriptor.ShaderRegister = 0;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[1].Descriptor.ShaderRegister = 0;
+ root_parameters[1].Descriptor.RegisterSpace = 0;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ todo ok(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ if (SUCCEEDED(hr))
+ ID3D12RootSignature_Release(root_signature);
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_GEOMETRY;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+ refcount = ID3D12RootSignature_Release(root_signature);
+ ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_root_signature_limits(void)
+{
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[D3D12_MAX_ROOT_COST + 1];
+ D3D12_ROOT_PARAMETER root_parameters[D3D12_MAX_ROOT_COST + 1];
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ ID3D12RootSignature *root_signature;
+ ID3D12Device *device;
+ ULONG refcount;
+ unsigned int i;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ /* A descriptor table costs 1 DWORD. */
+ for (i = 0; i < ARRAY_SIZE(root_parameters); ++i)
+ {
+ descriptor_ranges[i].RangeType = i % 2
+ ? D3D12_DESCRIPTOR_RANGE_TYPE_SRV : D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[i].NumDescriptors = 1;
+ descriptor_ranges[i].BaseShaderRegister = i / 2;
+ descriptor_ranges[i].RegisterSpace = 0;
+ descriptor_ranges[i].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[i].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[i].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[i].DescriptorTable.pDescriptorRanges = &descriptor_ranges[i];
+ root_parameters[i].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ }
+
+ root_signature_desc.NumParameters = D3D12_MAX_ROOT_COST;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+ ID3D12RootSignature_Release(root_signature);
+
+ root_signature_desc.NumParameters = D3D12_MAX_ROOT_COST + 1;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_compute_pipeline_state(void)
+{
+ D3D12_COMPUTE_PIPELINE_STATE_DESC pipeline_state_desc;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ ID3D12RootSignature *root_signature;
+ ID3D12PipelineState *pipeline_state;
+ ID3D12Device *device, *tmp_device;
+ ULONG refcount;
+ HRESULT hr;
+
+ static const DWORD dxbc_code[] =
+ {
+#if 0
+ [numthreads(1, 1, 1)]
+ void main() { }
+#endif
+ 0x43425844, 0x1acc3ad0, 0x71c7b057, 0xc72c4306, 0xf432cb57, 0x00000001, 0x00000074, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000020, 0x00050050, 0x00000008, 0x0100086a,
+ 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x0100003e,
+ };
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ root_signature_desc.NumParameters = 0;
+ root_signature_desc.pParameters = NULL;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ refcount = get_refcount(device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ memset(&pipeline_state_desc, 0, sizeof(pipeline_state_desc));
+ pipeline_state_desc.pRootSignature = root_signature;
+ pipeline_state_desc.CS = shader_bytecode(dxbc_code, sizeof(dxbc_code));
+ pipeline_state_desc.NodeMask = 0;
+ pipeline_state_desc.Flags = D3D12_PIPELINE_STATE_FLAG_NONE;
+
+ hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc,
+ &IID_ID3D12PipelineState, (void **)&pipeline_state);
+ ok(hr == S_OK, "Failed to create compute pipeline, hr %#x.\n", hr);
+
+ refcount = get_refcount(root_signature);
+ ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ refcount = get_refcount(device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ hr = ID3D12PipelineState_GetDevice(pipeline_state, &IID_ID3D12Device, (void **)&tmp_device);
+ ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr);
+ refcount = get_refcount(device);
+ ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(tmp_device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ check_interface(pipeline_state, &IID_ID3D12Object, true);
+ check_interface(pipeline_state, &IID_ID3D12DeviceChild, true);
+ check_interface(pipeline_state, &IID_ID3D12Pageable, true);
+ check_interface(pipeline_state, &IID_ID3D12PipelineState, true);
+
+ refcount = ID3D12PipelineState_Release(pipeline_state);
+ ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount);
+ refcount = ID3D12RootSignature_Release(root_signature);
+ ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_graphics_pipeline_state(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12RootSignature *root_signature;
+ ID3D12PipelineState *pipeline_state;
+ ID3D12Device *device, *tmp_device;
+ D3D12_BLEND_DESC *blend;
+ ULONG refcount;
+ unsigned int i;
+ HRESULT hr;
+
+ static const D3D12_SO_DECLARATION_ENTRY so_declaration[] =
+ {
+ {0, "SV_Position", 0, 0, 4, 0},
+ };
+ static const unsigned int strides[] = {16};
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ root_signature_desc.NumParameters = 0;
+ root_signature_desc.pParameters = NULL;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ refcount = get_refcount(device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ init_pipeline_state_desc(&pso_desc, root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL);
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ refcount = get_refcount(root_signature);
+ ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ refcount = get_refcount(device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ hr = ID3D12PipelineState_GetDevice(pipeline_state, &IID_ID3D12Device, (void **)&tmp_device);
+ ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr);
+ refcount = get_refcount(device);
+ ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(tmp_device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ check_interface(pipeline_state, &IID_ID3D12Object, true);
+ check_interface(pipeline_state, &IID_ID3D12DeviceChild, true);
+ check_interface(pipeline_state, &IID_ID3D12Pageable, true);
+ check_interface(pipeline_state, &IID_ID3D12PipelineState, true);
+
+ refcount = ID3D12PipelineState_Release(pipeline_state);
+ ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount);
+
+ blend = &pso_desc.BlendState;
+ blend->IndependentBlendEnable = false;
+ blend->RenderTarget[0].BlendEnable = true;
+ blend->RenderTarget[0].SrcBlend = D3D12_BLEND_SRC_COLOR;
+ blend->RenderTarget[0].DestBlend = D3D12_BLEND_DEST_COLOR;
+ blend->RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD;
+ blend->RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_SRC_ALPHA;
+ blend->RenderTarget[0].DestBlendAlpha = D3D12_BLEND_DEST_ALPHA;
+ blend->RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD;
+ blend->RenderTarget[0].RenderTargetWriteMask = D3D12_COLOR_WRITE_ENABLE_ALL;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+ ID3D12PipelineState_Release(pipeline_state);
+
+ /* Only one of BlendEnable or LogicOpEnable can be set to true. */
+ blend->IndependentBlendEnable = false;
+ blend->RenderTarget[0].BlendEnable = true;
+ blend->RenderTarget[0].LogicOpEnable = true;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pipeline_state);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ pso_desc.RTVFormats[0] = DXGI_FORMAT_R32_UINT;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pipeline_state);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ blend->IndependentBlendEnable = false;
+ blend->RenderTarget[0].BlendEnable = false;
+ blend->RenderTarget[0].LogicOpEnable = true;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+ ID3D12PipelineState_Release(pipeline_state);
+
+ /* IndependentBlendEnable must be set to false when logic operations are enabled. */
+ blend->IndependentBlendEnable = true;
+ blend->RenderTarget[0].LogicOpEnable = true;
+ for (i = 1; i < ARRAY_SIZE(blend->RenderTarget); ++i)
+ blend->RenderTarget[i] = blend->RenderTarget[0];
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pipeline_state);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ /* DSVFormat = DXGI_FORMAT_UNKNOWN */
+ memset(blend, 0, sizeof(*blend));
+ pso_desc.DSVFormat = DXGI_FORMAT_UNKNOWN;
+ pso_desc.DepthStencilState.DepthEnable = true;
+ pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL;
+ pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_LESS;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pipeline_state);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ID3D12PipelineState_Release(pipeline_state);
+
+ /* Invalid DSVFormat */
+ pso_desc.DSVFormat = DXGI_FORMAT_R8G8B8A8_UNORM;
+ pso_desc.DepthStencilState.DepthEnable = true;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pipeline_state);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ID3D12PipelineState_Release(pipeline_state);
+
+ /* Inactive render targets formats must be set to DXGI_FORMAT_UNKNOWN. */
+ init_pipeline_state_desc(&pso_desc, root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL);
+ pso_desc.RTVFormats[1] = DXGI_FORMAT_R8G8B8A8_UNORM;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pipeline_state);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ /* Stream output without D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT. */
+ init_pipeline_state_desc(&pso_desc, root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL);
+ pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration);
+ pso_desc.StreamOutput.pSODeclaration = so_declaration;
+ pso_desc.StreamOutput.pBufferStrides = strides;
+ pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides);
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pipeline_state);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ refcount = ID3D12RootSignature_Release(root_signature);
+ ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_create_fence(void)
+{
+ ID3D12Device *device, *tmp_device;
+ ID3D12Fence *fence;
+ ULONG refcount;
+ uint64_t value;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE,
+ &IID_ID3D12Fence, (void **)&fence);
+ ok(SUCCEEDED(hr), "Failed to create fence, hr %#x.\n", hr);
+
+ refcount = get_refcount(device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ hr = ID3D12Fence_GetDevice(fence, &IID_ID3D12Device, (void **)&tmp_device);
+ ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr);
+ refcount = get_refcount(device);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(tmp_device);
+ ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ check_interface(fence, &IID_ID3D12Object, true);
+ check_interface(fence, &IID_ID3D12DeviceChild, true);
+ check_interface(fence, &IID_ID3D12Pageable, true);
+ check_interface(fence, &IID_ID3D12Fence, true);
+
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == 0, "Got unexpected value %"PRIu64".\n", value);
+
+ refcount = ID3D12Fence_Release(fence);
+ ok(!refcount, "ID3D12Fence has %u references left.\n", (unsigned int)refcount);
+
+ hr = ID3D12Device_CreateFence(device, 99, D3D12_FENCE_FLAG_NONE,
+ &IID_ID3D12Fence, (void **)&fence);
+ ok(SUCCEEDED(hr), "Failed to create fence, hr %#x.\n", hr);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == 99, "Got unexpected value %"PRIu64".\n", value);
+ refcount = ID3D12Fence_Release(fence);
+ ok(!refcount, "ID3D12Fence has %u references left.\n", (unsigned int)refcount);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_object_interface(void)
+{
+ D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc;
+ D3D12_QUERY_HEAP_DESC query_heap_desc;
+ ID3D12RootSignature *root_signature;
+ ULONG refcount, expected_refcount;
+ ID3D12CommandAllocator *allocator;
+ D3D12_HEAP_DESC heap_desc;
+ IUnknown *test_object;
+ ID3D12Device *device;
+ ID3D12Object *object;
+ IUnknown *unknown;
+ unsigned int size;
+ unsigned int i;
+ IUnknown *ptr;
+ HRESULT hr;
+
+ static const GUID test_guid
+ = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0xfc}};
+ static const GUID test_guid2
+ = {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}};
+ static const DWORD data[] = {1, 2, 3, 4};
+ static const WCHAR deadbeefW[] = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f', 0};
+ static const WCHAR emptyW[] = {0};
+ static const GUID *tests[] =
+ {
+ &IID_ID3D12CommandAllocator,
+ &IID_ID3D12CommandList,
+ &IID_ID3D12CommandQueue,
+ &IID_ID3D12CommandSignature,
+ &IID_ID3D12DescriptorHeap,
+ &IID_ID3D12Device,
+ &IID_ID3D12Fence,
+ &IID_ID3D12Heap,
+ &IID_ID3D12PipelineState,
+ &IID_ID3D12QueryHeap,
+ &IID_ID3D12Resource,
+ &IID_ID3D12RootSignature,
+ };
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ if (IsEqualGUID(tests[i], &IID_ID3D12CommandAllocator))
+ {
+ vkd3d_test_set_context("command allocator");
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ &IID_IUnknown, (void **)&unknown);
+ ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr);
+ }
+ else if (IsEqualGUID(tests[i], &IID_ID3D12CommandList))
+ {
+ vkd3d_test_set_context("command list");
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ &IID_ID3D12CommandAllocator, (void **)&allocator);
+ ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ allocator, NULL, &IID_IUnknown, (void **)&unknown);
+ ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr);
+ ID3D12CommandAllocator_Release(allocator);
+ }
+ else if (IsEqualGUID(tests[i], &IID_ID3D12CommandQueue))
+ {
+ vkd3d_test_set_context("command queue");
+ unknown = (IUnknown *)create_command_queue(device,
+ D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL);
+ }
+ else if (IsEqualGUID(tests[i], &IID_ID3D12CommandSignature))
+ {
+ vkd3d_test_set_context("command signature");
+ unknown = (IUnknown *)create_command_signature(device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW);
+ }
+ else if (IsEqualGUID(tests[i], &IID_ID3D12DescriptorHeap))
+ {
+ vkd3d_test_set_context("descriptor heap");
+ descriptor_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
+ descriptor_heap_desc.NumDescriptors = 16;
+ descriptor_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
+ descriptor_heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateDescriptorHeap(device, &descriptor_heap_desc,
+ &IID_ID3D12DescriptorHeap, (void **)&unknown);
+ ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr);
+ }
+ else if (IsEqualGUID(tests[i], &IID_ID3D12Device))
+ {
+ vkd3d_test_set_context("device");
+ unknown = (IUnknown *)create_device();
+ }
+ else if (IsEqualGUID(tests[i], &IID_ID3D12Fence))
+ {
+ vkd3d_test_set_context("fence");
+ hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE,
+ &IID_IUnknown, (void **)&unknown);
+ ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+ }
+ else if (IsEqualGUID(tests[i], &IID_ID3D12Heap))
+ {
+ vkd3d_test_set_context("heap");
+ heap_desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+ memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties));
+ heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ heap_desc.Alignment = 0;
+ heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES;
+ hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&unknown);
+ ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr);
+ }
+ else if (IsEqualGUID(tests[i], &IID_ID3D12PipelineState))
+ {
+ vkd3d_test_set_context("pipeline state");
+ root_signature = create_empty_root_signature(device, 0);
+ unknown = (IUnknown *)create_pipeline_state(device,
+ root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL);
+ ID3D12RootSignature_Release(root_signature);
+ }
+ else if (IsEqualGUID(tests[i], &IID_ID3D12QueryHeap))
+ {
+ vkd3d_test_set_context("query heap");
+ query_heap_desc.Type = D3D12_QUERY_HEAP_TYPE_OCCLUSION;
+ query_heap_desc.Count = 8;
+ query_heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateQueryHeap(device, &query_heap_desc,
+ &IID_ID3D12QueryHeap, (void **)&unknown);
+ ok(hr == S_OK, "Failed to create query heap, hr %#x.\n", hr);
+ }
+ else if (IsEqualGUID(tests[i], &IID_ID3D12Resource))
+ {
+ vkd3d_test_set_context("resource");
+ unknown = (IUnknown *)create_readback_buffer(device, 512);
+ }
+ else if (IsEqualGUID(tests[i], &IID_ID3D12RootSignature))
+ {
+ vkd3d_test_set_context("root signature");
+ unknown = (IUnknown *)create_empty_root_signature(device, 0);
+ }
+ else
+ {
+ unknown = NULL;
+ }
+
+ ok(unknown, "Unhandled object type %u.\n", i);
+ object = NULL;
+ hr = IUnknown_QueryInterface(unknown, &IID_ID3D12Object, (void **)&object);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ IUnknown_Release(unknown);
+
+ hr = ID3D12Object_SetPrivateData(object, &test_guid, 0, NULL);
+ ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Object_SetPrivateData(object, &test_guid, ~0u, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Object_SetPrivateData(object, &test_guid, ~0u, NULL);
+ ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ size = sizeof(ptr) * 2;
+ ptr = (IUnknown *)0xdeadbeef;
+ hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(!ptr, "Got unexpected pointer %p.\n", ptr);
+ ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size);
+
+ hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE,
+ &IID_ID3D12Fence, (void **)&test_object);
+ ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+
+ refcount = get_refcount(test_object);
+ hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ expected_refcount = refcount + 1;
+ refcount = get_refcount(test_object);
+ ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
+ (unsigned int)refcount, (unsigned int)expected_refcount);
+ hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ refcount = get_refcount(test_object);
+ ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
+ (unsigned int)refcount, (unsigned int)expected_refcount);
+
+ hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ --expected_refcount;
+ refcount = get_refcount(test_object);
+ ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
+ (unsigned int)refcount, (unsigned int)expected_refcount);
+
+ hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ size = sizeof(data);
+ hr = ID3D12Object_SetPrivateData(object, &test_guid, size, data);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ refcount = get_refcount(test_object);
+ ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
+ (unsigned int)refcount, (unsigned int)expected_refcount);
+ hr = ID3D12Object_SetPrivateData(object, &test_guid, 42, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Object_SetPrivateData(object, &test_guid, 42, NULL);
+ ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ++expected_refcount;
+ size = 2 * sizeof(ptr);
+ ptr = NULL;
+ hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(size == sizeof(test_object), "Got unexpected size %u.\n", size);
+ ++expected_refcount;
+ refcount = get_refcount(test_object);
+ ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
+ (unsigned int)refcount, (unsigned int)expected_refcount);
+ IUnknown_Release(ptr);
+ --expected_refcount;
+
+ ptr = (IUnknown *)0xdeadbeef;
+ size = 1;
+ hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(size == sizeof(ptr), "Got unexpected size %u.\n", size);
+ size = 2 * sizeof(ptr);
+ hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(size == sizeof(ptr), "Got unexpected size %u.\n", size);
+ refcount = get_refcount(test_object);
+ ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
+ (unsigned int)refcount, (unsigned int)expected_refcount);
+
+ size = 1;
+ hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr);
+ ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr);
+ ok(size == sizeof(object), "Got unexpected size %u.\n", size);
+ ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr);
+ size = 1;
+ hr = ID3D12Object_GetPrivateData(object, &test_guid2, &size, &ptr);
+ ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr);
+ ok(!size, "Got unexpected size %u.\n", size);
+ ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr);
+
+ if (IsEqualGUID(tests[i], &IID_ID3D12Device))
+ {
+ hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ }
+
+ hr = ID3D12Object_SetName(object, emptyW);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12Object_SetName(object, deadbeefW);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ ID3D12Object_Release(object);
+
+ refcount = IUnknown_Release(test_object);
+ ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount);
+
+ vkd3d_test_set_context(NULL);
+ }
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+struct private_data
+{
+ ID3D12Object *object;
+ GUID guid;
+ unsigned int value;
+};
+
+static void private_data_thread_main(void *untyped_data)
+{
+ struct private_data *data = untyped_data;
+ unsigned int i;
+ HRESULT hr;
+
+ hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ for (i = 0; i < 100000; ++i)
+ {
+ hr = ID3D12Object_SetPrivateData(data->object, &data->guid, 0, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ }
+}
+
+struct private_data_interface
+{
+ ID3D12Object *object;
+ GUID guid;
+ IUnknown *iface;
+};
+
+static void private_data_interface_thread_main(void *untyped_data)
+{
+ struct private_data_interface *data = untyped_data;
+ unsigned int i;
+ HRESULT hr;
+
+ for (i = 0; i < 100000; ++i)
+ {
+ hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ }
+}
+
+static void test_multithread_private_data(void)
+{
+ static const GUID guid = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0x00}};
+ struct private_data_interface private_data_interface[4];
+ HANDLE private_data_interface_thread[4];
+ struct private_data private_data[4];
+ ID3D12RootSignature *root_signature;
+ HANDLE private_data_thread[4];
+ IUnknown *test_object, *unk;
+ ID3D12Device *device;
+ ID3D12Object *object;
+ unsigned int value;
+ unsigned int size;
+ unsigned int id;
+ unsigned int i;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ root_signature = create_empty_root_signature(device,
+ D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT);
+ hr = ID3D12RootSignature_QueryInterface(root_signature, &IID_ID3D12Object, (void **)&object);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ID3D12RootSignature_Release(root_signature);
+
+ hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE,
+ &IID_ID3D12Fence, (void **)&test_object);
+ ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+
+ for (i = 0, id = 1; i < ARRAY_SIZE(private_data_interface); ++i, ++id)
+ {
+ private_data_interface[i].object = object;
+ private_data_interface[i].guid = guid;
+ private_data_interface[i].guid.Data4[7] = id;
+
+ hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE,
+ &IID_ID3D12Fence, (void **)&private_data_interface[i].iface);
+ ok(hr == S_OK, "Failed to create fence %u, hr %#x.\n", i, hr);
+ }
+ for (i = 0; i < ARRAY_SIZE(private_data); ++i, ++id)
+ {
+ private_data[i].object = object;
+ private_data[i].guid = guid;
+ private_data[i].guid.Data4[7] = id;
+ private_data[i].value = id;
+ }
+
+ for (i = 0; i < 4; ++i)
+ {
+ private_data_interface_thread[i] = create_thread(private_data_interface_thread_main, &private_data_interface[i]);
+ private_data_thread[i] = create_thread(private_data_thread_main, &private_data[i]);
+ }
+
+ for (i = 0; i < 100000; ++i)
+ {
+ hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ }
+
+ for (i = 0; i < 4; ++i)
+ {
+ ok(join_thread(private_data_interface_thread[i]), "Failed to join thread %u.\n", i);
+ ok(join_thread(private_data_thread[i]), "Failed to join thread %u.\n", i);
+ }
+
+ for (i = 0; i < ARRAY_SIZE(private_data_interface); ++i)
+ {
+ size = sizeof(unk);
+ hr = ID3D12Object_GetPrivateData(object, &private_data_interface[i].guid, &size, &unk);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ ok(unk == private_data_interface[i].iface, "Got %p, expected %p.\n", unk, private_data_interface[i].iface);
+ IUnknown_Release(unk);
+ refcount = IUnknown_Release(private_data_interface[i].iface);
+ ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+ }
+ for (i = 0; i < ARRAY_SIZE(private_data); ++i)
+ {
+ size = sizeof(value);
+ hr = ID3D12Object_GetPrivateData(object, &private_data[i].guid, &size, &value);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ ok(value == private_data[i].value, "Got %u, expected %u.\n", value, private_data[i].value);
+ }
+
+ hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ refcount = IUnknown_Release(test_object);
+ ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount);
+ refcount = ID3D12Object_Release(object);
+ ok(!refcount, "Object has %u references left.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_reset_command_allocator(void)
+{
+ ID3D12CommandAllocator *command_allocator, *command_allocator2;
+ ID3D12GraphicsCommandList *command_list, *command_list2;
+ D3D12_COMMAND_QUEUE_DESC command_queue_desc;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+
+ hr = ID3D12CommandAllocator_Reset(command_allocator);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12CommandAllocator_Reset(command_allocator);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list);
+ ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr);
+
+ hr = ID3D12CommandAllocator_Reset(command_allocator);
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12CommandAllocator_Reset(command_allocator);
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+
+ hr = ID3D12CommandAllocator_Reset(command_allocator);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12CommandAllocator_Reset(command_allocator);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12GraphicsCommandList_Reset(command_list, command_allocator, NULL);
+ ok(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr);
+
+ hr = ID3D12CommandAllocator_Reset(command_allocator);
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+ hr = ID3D12GraphicsCommandList_Reset(command_list, command_allocator, NULL);
+ ok(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr);
+
+ command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;
+ command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL;
+ command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
+ command_queue_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc,
+ &IID_ID3D12CommandQueue, (void **)&queue);
+ ok(SUCCEEDED(hr), "Failed to create command queue, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator2);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+
+ uav_barrier(command_list, NULL);
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+ exec_command_list(queue, command_list);
+
+ /* A command list can be reset when it is in use. */
+ hr = ID3D12GraphicsCommandList_Reset(command_list, command_allocator2, NULL);
+ ok(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr);
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+
+ wait_queue_idle(device, queue);
+ hr = ID3D12CommandAllocator_Reset(command_allocator);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12GraphicsCommandList_Reset(command_list, command_allocator, NULL);
+ ok(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr);
+
+ uav_barrier(command_list, NULL);
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+ exec_command_list(queue, command_list);
+
+ hr = ID3D12GraphicsCommandList_Reset(command_list, command_allocator, NULL);
+ ok(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr);
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+
+ wait_queue_idle(device, queue);
+ hr = ID3D12CommandAllocator_Reset(command_allocator);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12GraphicsCommandList_Reset(command_list, command_allocator, NULL);
+ ok(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr);
+
+ /* A command allocator can be used with one command list at a time. */
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list2);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ command_allocator2, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list2);
+ ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr);
+
+ hr = ID3D12GraphicsCommandList_Close(command_list2);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+ hr = ID3D12GraphicsCommandList_Reset(command_list2, command_allocator, NULL);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ID3D12GraphicsCommandList_Release(command_list2);
+
+ /* A command allocator can be re-used after closing the command list. */
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list2);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list2);
+ ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr);
+
+ ID3D12CommandAllocator_Release(command_allocator);
+ ID3D12CommandAllocator_Release(command_allocator2);
+ ID3D12CommandQueue_Release(queue);
+ ID3D12GraphicsCommandList_Release(command_list);
+ ID3D12GraphicsCommandList_Release(command_list2);
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_cpu_signal_fence(void)
+{
+ HANDLE event1, event2;
+ ID3D12Device *device;
+ unsigned int i, ret;
+ ID3D12Fence *fence;
+ ULONG refcount;
+ uint64_t value;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE,
+ &IID_ID3D12Fence, (void **)&fence);
+ ok(SUCCEEDED(hr), "Failed to create fence, hr %#x.\n", hr);
+
+ hr = ID3D12Fence_Signal(fence, 1);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == 1, "Got unexpected value %"PRIu64".\n", value);
+
+ hr = ID3D12Fence_Signal(fence, 10);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == 10, "Got unexpected value %"PRIu64".\n", value);
+
+ hr = ID3D12Fence_Signal(fence, 5);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == 5, "Got unexpected value %"PRIu64".\n", value);
+
+ hr = ID3D12Fence_Signal(fence, 0);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == 0, "Got unexpected value %"PRIu64".\n", value);
+
+ /* Basic tests with single event. */
+ event1 = create_event();
+ ok(event1, "Failed to create event.\n");
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 5, event1);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ hr = ID3D12Fence_Signal(fence, 5);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 6, event1);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ hr = ID3D12Fence_Signal(fence, 7);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_Signal(fence, 10);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ /* Event is signaled immediately when value <= GetCompletedValue(). */
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ for (i = 0; i <= ID3D12Fence_GetCompletedValue(fence); ++i)
+ {
+ hr = ID3D12Fence_SetEventOnCompletion(fence, i, event1);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x for %u.\n", ret, i);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x for %u.\n", ret, i);
+ }
+ hr = ID3D12Fence_SetEventOnCompletion(fence, i, event1);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ hr = ID3D12Fence_Signal(fence, i);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ /* Attach event to multiple values. */
+ hr = ID3D12Fence_Signal(fence, 0);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 3, event1);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 5, event1);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 9, event1);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 12, event1);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 12, event1);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ for (i = 1; i < 13; ++i)
+ {
+ hr = ID3D12Fence_Signal(fence, i);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ if (i == 3 || i == 5 || i == 9 || i == 12)
+ {
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x for %u.\n", ret, i);
+ }
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x for %u.\n", ret, i);
+ }
+
+ /* Tests with 2 events. */
+ hr = ID3D12Fence_Signal(fence, 0);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == 0, "Got unexpected value %"PRIu64".\n", value);
+
+ event2 = create_event();
+ ok(event2, "Failed to create event.\n");
+
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 100, event1);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, ~(uint64_t)0, event2);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+
+ hr = ID3D12Fence_Signal(fence, 50);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_Signal(fence, 99);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_Signal(fence, 100);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_Signal(fence, 101);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_Signal(fence, 0);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_Signal(fence, 100);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_Signal(fence, ~(uint64_t)0);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_Signal(fence, ~(uint64_t)0);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ hr = ID3D12Fence_Signal(fence, 0);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ /* Attach two events to the same value. */
+ hr = ID3D12Fence_Signal(fence, 0);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 1, event1);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 1, event2);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ hr = ID3D12Fence_Signal(fence, 3);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ /* Test passing signaled event. */
+ hr = ID3D12Fence_Signal(fence, 20);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == 20, "Got unexpected value %"PRIu64".\n", value);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ signal_event(event1);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 30, event1);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_Signal(fence, 30);
+ ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ destroy_event(event1);
+ destroy_event(event2);
+
+ ID3D12Fence_Release(fence);
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_gpu_signal_fence(void)
+{
+ ID3D12CommandQueue *queue;
+ HANDLE event1, event2;
+ ID3D12Device *device;
+ unsigned int i, ret;
+ ID3D12Fence *fence;
+ ULONG refcount;
+ uint64_t value;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL);
+
+ hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE,
+ &IID_ID3D12Fence, (void **)&fence);
+ ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+
+ /* XXX: It seems that when a queue is idle a fence is signalled immediately
+ * in D3D12. Vulkan implementations don't signal a fence immediately so
+ * libvkd3d doesn't as well. In order to make this test reliable
+ * wait_queue_idle() is inserted after every ID3D12CommandQueue_Signal(). */
+ queue_signal(queue, fence, 10);
+ wait_queue_idle(device, queue);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == 10, "Got unexpected value %"PRIu64".\n", value);
+
+ queue_signal(queue, fence, 0);
+ wait_queue_idle(device, queue);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == 0, "Got unexpected value %"PRIu64".\n", value);
+
+ /* Basic tests with single event. */
+ event1 = create_event();
+ ok(event1, "Failed to create event.\n");
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 5, event1);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ queue_signal(queue, fence, 5);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 6, event1);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ queue_signal(queue, fence, 7);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ queue_signal(queue, fence, 10);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ /* Attach one event to multiple values. */
+ queue_signal(queue, fence, 0);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 3, event1);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 5, event1);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 9, event1);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 12, event1);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 12, event1);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ for (i = 1; i < 13; ++i)
+ {
+ queue_signal(queue, fence, i);
+ wait_queue_idle(device, queue);
+ if (i == 3 || i == 5 || i == 9 || i == 12)
+ {
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x for %u.\n", ret, i);
+ }
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x for %u.\n", ret, i);
+ }
+
+ /* Tests with 2 events. */
+ queue_signal(queue, fence, 0);
+ wait_queue_idle(device, queue);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == 0, "Got unexpected value %"PRIu64".\n", value);
+
+ event2 = create_event();
+ ok(event2, "Failed to create event.\n");
+
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 100, event1);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, ~(uint64_t)0, event2);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+
+ queue_signal(queue, fence, 50);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ queue_signal(queue, fence, 99);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ queue_signal(queue, fence, 100);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ queue_signal(queue, fence, 101);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ queue_signal(queue, fence, 0);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ queue_signal(queue, fence, 100);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ queue_signal(queue, fence, ~(uint64_t)0);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ queue_signal(queue, fence, ~(uint64_t)0);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ queue_signal(queue, fence, 0);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ /* Attach two events to the same value. */
+ queue_signal(queue, fence, 0);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 1, event1);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+ hr = ID3D12Fence_SetEventOnCompletion(fence, 1, event2);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ queue_signal(queue, fence, 3);
+ wait_queue_idle(device, queue);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event1, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event2, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+
+ wait_queue_idle(device, queue);
+
+ destroy_event(event1);
+ destroy_event(event2);
+
+ ID3D12Fence_Release(fence);
+ ID3D12CommandQueue_Release(queue);
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+struct multithread_fence_wait_data
+{
+ HANDLE event;
+ ID3D12Fence *fence;
+ uint64_t value;
+};
+
+static void fence_event_wait_main(void *untyped_data)
+{
+ struct multithread_fence_wait_data *data = untyped_data;
+ unsigned int ret;
+ HANDLE event;
+ HRESULT hr;
+
+ event = create_event();
+ ok(event, "Failed to create event.\n");
+
+ hr = ID3D12Fence_SetEventOnCompletion(data->fence, data->value, event);
+ ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr);
+
+ signal_event(data->event);
+
+ ret = wait_event(event, INFINITE);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+
+ destroy_event(event);
+}
+
+static void fence_busy_wait_main(void *untyped_data)
+{
+ struct multithread_fence_wait_data *data = untyped_data;
+
+ signal_event(data->event);
+
+ while (ID3D12Fence_GetCompletedValue(data->fence) < data->value)
+ ;
+}
+
+static void test_multithread_fence_wait(void)
+{
+ struct multithread_fence_wait_data thread_data;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int ret;
+ ULONG refcount;
+ HANDLE thread;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL);
+
+ thread_data.event = create_event();
+ thread_data.value = 0;
+ ok(thread_data.event, "Failed to create event.\n");
+ hr = ID3D12Device_CreateFence(device, thread_data.value, D3D12_FENCE_FLAG_NONE,
+ &IID_ID3D12Fence, (void **)&thread_data.fence);
+ ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+
+ /* Signal fence on host. */
+ ++thread_data.value;
+ thread = create_thread(fence_event_wait_main, &thread_data);
+ ok(thread, "Failed to create thread.\n");
+ ret = wait_event(thread_data.event, INFINITE);
+ ok(ret == WAIT_OBJECT_0, "Failed to wait for thread start, return value %#x.\n", ret);
+
+ hr = ID3D12Fence_Signal(thread_data.fence, thread_data.value);
+ ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+
+ ok(join_thread(thread), "Failed to join thread.\n");
+
+ ++thread_data.value;
+ thread = create_thread(fence_busy_wait_main, &thread_data);
+ ok(thread, "Failed to create thread.\n");
+ ret = wait_event(thread_data.event, INFINITE);
+ ok(ret == WAIT_OBJECT_0, "Failed to wait for thread start, return value %#x.\n", ret);
+
+ hr = ID3D12Fence_Signal(thread_data.fence, thread_data.value);
+ ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+
+ ok(join_thread(thread), "Failed to join thread.\n");
+
+ /* Signal fence on device. */
+ ++thread_data.value;
+ thread = create_thread(fence_event_wait_main, &thread_data);
+ ok(thread, "Failed to create thread.\n");
+ ret = wait_event(thread_data.event, INFINITE);
+ ok(ret == WAIT_OBJECT_0, "Failed to wait for thread start, return value %#x.\n", ret);
+
+ queue_signal(queue, thread_data.fence, thread_data.value);
+
+ ok(join_thread(thread), "Failed to join thread.\n");
+
+ ++thread_data.value;
+ thread = create_thread(fence_busy_wait_main, &thread_data);
+ ok(thread, "Failed to create thread.\n");
+ ret = wait_event(thread_data.event, INFINITE);
+ ok(ret == WAIT_OBJECT_0, "Failed to wait for thread start, return value %#x.\n", ret);
+
+ queue_signal(queue, thread_data.fence, thread_data.value);
+
+ ok(join_thread(thread), "Failed to join thread.\n");
+
+ destroy_event(thread_data.event);
+ ID3D12Fence_Release(thread_data.fence);
+ ID3D12CommandQueue_Release(queue);
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_fence_values(void)
+{
+ uint64_t value, next_value;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ ID3D12Fence *fence;
+ ULONG refcount;
+ unsigned int i;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL);
+
+ next_value = (uint64_t)1 << 60;
+ hr = ID3D12Device_CreateFence(device, next_value, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence);
+ ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value);
+
+ for (i = 0; i < 100; ++i)
+ {
+ ++next_value;
+ queue_signal(queue, fence, next_value);
+ wait_queue_idle(device, queue);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value);
+ }
+
+ for (i = 0; i < 100; ++i)
+ {
+ next_value += 10000;
+ hr = ID3D12Fence_Signal(fence, next_value);
+ ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value);
+ }
+
+ ID3D12Fence_Release(fence);
+
+ hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence);
+ ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+ next_value = (uint64_t)1 << 60;
+ hr = ID3D12Fence_Signal(fence, next_value);
+ ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value);
+ next_value = 0;
+ hr = ID3D12Fence_Signal(fence, next_value);
+ ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value);
+ ID3D12Fence_Release(fence);
+
+ hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence);
+ ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+ next_value = (uint64_t)1 << 60;
+ queue_signal(queue, fence, next_value);
+ wait_queue_idle(device, queue);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value);
+ next_value = 0;
+ queue_signal(queue, fence, next_value);
+ wait_queue_idle(device, queue);
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value);
+ ID3D12Fence_Release(fence);
+
+ ID3D12CommandQueue_Release(queue);
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_clear_depth_stencil_view(void)
+{
+ static const float expected_values[] = {0.5f, 0.1f, 0.1f, 0.6, 1.0f, 0.5f};
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_DEPTH_STENCIL_VIEW_DESC dsv_desc;
+ struct depth_stencil_resource ds;
+ unsigned int dsv_increment_size;
+ D3D12_CLEAR_VALUE clear_value;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ dsv_increment_size = ID3D12Device_GetDescriptorHandleIncrementSize(device,
+ D3D12_DESCRIPTOR_HEAP_TYPE_DSV);
+ trace("DSV descriptor handle increment size: %u.\n", dsv_increment_size);
+ ok(dsv_increment_size, "Got unexpected increment size %#x.\n", dsv_increment_size);
+
+ clear_value.Format = DXGI_FORMAT_D32_FLOAT;
+ clear_value.DepthStencil.Depth = 0.5f;
+ clear_value.DepthStencil.Stencil = 0x3;
+ init_depth_stencil(&ds, device, 32, 32, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, &clear_value);
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, 0.75f, 0x7, 0, NULL);
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(ds.texture, 0, queue, command_list, 0.75f, 1);
+
+ destroy_depth_stencil(&ds);
+ reset_command_list(command_list, context.allocator);
+ init_depth_stencil(&ds, device, 32, 32, 6, 1, DXGI_FORMAT_D32_FLOAT, 0, &clear_value);
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, expected_values[0], 0, 0, NULL);
+ memset(&dsv_desc, 0, sizeof(dsv_desc));
+ dsv_desc.Format = DXGI_FORMAT_D32_FLOAT;
+ dsv_desc.ViewDimension = D3D12_DSV_DIMENSION_TEXTURE2DARRAY;
+ dsv_desc.Texture2DArray.FirstArraySlice = 1;
+ dsv_desc.Texture2DArray.ArraySize = 2;
+ ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, expected_values[1], 0, 0, NULL);
+ dsv_desc.Texture2DArray.FirstArraySlice = 3;
+ dsv_desc.Texture2DArray.ArraySize = 1;
+ ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, expected_values[3], 0, 0, NULL);
+ dsv_desc.Texture2DArray.FirstArraySlice = 4;
+ ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, expected_values[4], 0, 0, NULL);
+
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ for (i = 0; i < ARRAY_SIZE(expected_values); ++i)
+ {
+ check_sub_resource_float(ds.texture, i, queue, command_list, expected_values[i], 1);
+ reset_command_list(command_list, context.allocator);
+ }
+
+ destroy_depth_stencil(&ds);
+ destroy_test_context(&context);
+}
+
+static void test_clear_render_target_view(void)
+{
+ static const unsigned int array_expected_colors[] = {0xff00ff00, 0xff0000ff, 0xffff0000};
+ static const struct vec4 array_colors[] =
+ {
+ {0.0f, 1.0f, 0.0f, 1.0f},
+ {1.0f, 0.0f, 0.0f, 1.0f},
+ {0.0f, 0.0f, 1.0f, 1.0f},
+ };
+ static const float negative_value[] = {1.0f, -1.0f, -0.5f, -2.0f};
+ static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f};
+ static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f};
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle;
+ D3D12_RENDER_TARGET_VIEW_DESC rtv_desc;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_RESOURCE_DESC resource_desc;
+ unsigned int rtv_increment_size;
+ ID3D12DescriptorHeap *rtv_heap;
+ D3D12_CLEAR_VALUE clear_value;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *resource;
+ ID3D12Device *device;
+ unsigned int i;
+ D3D12_BOX box;
+ HRESULT hr;
+
+ static const struct
+ {
+ const float *color;
+ DXGI_FORMAT format;
+ uint32_t result;
+ }
+ r8g8b8a8[] =
+ {
+ {color, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 0xbf95bc59},
+
+ {green, DXGI_FORMAT_R8G8B8A8_UNORM, 0xff00ff00},
+ {color, DXGI_FORMAT_R8G8B8A8_UNORM, 0xbf4c7f19},
+
+ {green, DXGI_FORMAT_R8G8B8A8_UINT, 0x01000100},
+ {color, DXGI_FORMAT_R8G8B8A8_UINT, 0x00000000},
+ {negative_value, DXGI_FORMAT_R8G8B8A8_UINT, 0x00000001},
+
+ {green, DXGI_FORMAT_R8G8B8A8_SINT, 0x01000100},
+ {color, DXGI_FORMAT_R8G8B8A8_SINT, 0x00000000},
+ {negative_value, DXGI_FORMAT_R8G8B8A8_SINT, 0xfe00ff01},
+ };
+ static const struct
+ {
+ const float *color;
+ DXGI_FORMAT format;
+ uint64_t result;
+ }
+ r16g16b16a16[] =
+ {
+ {green, DXGI_FORMAT_R16G16B16A16_UNORM, 0xffff0000ffff0000},
+
+ {green, DXGI_FORMAT_R16G16B16A16_UINT, 0x0001000000010000},
+ {color, DXGI_FORMAT_R16G16B16A16_UINT, 0x0000000000000000},
+ {negative_value, DXGI_FORMAT_R16G16B16A16_UINT, 0x0000000000000001},
+
+ {green, DXGI_FORMAT_R16G16B16A16_SINT, 0x0001000000010000},
+ {color, DXGI_FORMAT_R16G16B16A16_SINT, 0x0000000000000000},
+ {negative_value, DXGI_FORMAT_R16G16B16A16_SINT, 0xfffe0000ffff0001},
+ };
+
+ STATIC_ASSERT(ARRAY_SIZE(array_colors) == ARRAY_SIZE(array_expected_colors));
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1);
+
+ rtv_increment_size = ID3D12Device_GetDescriptorHandleIncrementSize(device,
+ D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
+ trace("RTV descriptor handle increment size: %u.\n", rtv_increment_size);
+
+ rtv_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap);
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 32;
+ resource_desc.Height = 32;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_R8G8B8A8_TYPELESS;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+ clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ clear_value.Color[0] = 1.0f;
+ clear_value.Color[1] = 0.0f;
+ clear_value.Color[2] = 0.0f;
+ clear_value.Color[3] = 1.0f;
+ hr = ID3D12Device_CreateCommittedResource(device,
+ &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
+
+ memset(&rtv_desc, 0, sizeof(rtv_desc));
+ rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D;
+
+ /* R8G8B8A8 */
+ for (i = 0; i < ARRAY_SIZE(r8g8b8a8); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ rtv_desc.Format = r8g8b8a8[i].format;
+ ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, r8g8b8a8[i].color, 0, NULL);
+ transition_resource_state(command_list, resource,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(resource, 0, queue, command_list, r8g8b8a8[i].result, 2);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, resource,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ /* R16G16B16A16 */
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
+ reset_command_list(command_list, context.allocator);
+ ID3D12Resource_Release(resource);
+ resource_desc.Format = DXGI_FORMAT_R16G16B16A16_TYPELESS;
+ hr = ID3D12Device_CreateCommittedResource(device,
+ &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(r16g16b16a16); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ rtv_desc.Format = r16g16b16a16[i].format;
+ ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, r16g16b16a16[i].color, 0, NULL);
+ transition_resource_state(command_list, resource,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint64(resource, 0, queue, command_list, r16g16b16a16[i].result, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, resource,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ /* 2D array texture */
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
+ reset_command_list(command_list, context.allocator);
+ ID3D12Resource_Release(resource);
+ resource_desc.Format = DXGI_FORMAT_R8G8B8A8_TYPELESS;
+ resource_desc.DepthOrArraySize = ARRAY_SIZE(array_colors);
+ hr = ID3D12Device_CreateCommittedResource(device,
+ &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(array_colors); ++i)
+ {
+ memset(&rtv_desc, 0, sizeof(rtv_desc));
+ rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DARRAY;
+ rtv_desc.Texture2DArray.FirstArraySlice = i;
+ rtv_desc.Texture2DArray.ArraySize = 1;
+
+ ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL);
+ }
+
+ transition_resource_state(command_list, resource,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i)
+ {
+ check_sub_resource_uint(resource, i, queue, command_list, array_expected_colors[i], 2);
+ reset_command_list(command_list, context.allocator);
+ }
+
+ /* 2D multisample array texture */
+ ID3D12Resource_Release(resource);
+ resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ resource_desc.SampleDesc.Count = 4;
+ hr = ID3D12Device_CreateCommittedResource(device,
+ &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(array_colors); ++i)
+ {
+ memset(&rtv_desc, 0, sizeof(rtv_desc));
+ rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY;
+ rtv_desc.Texture2DMSArray.FirstArraySlice = i;
+ rtv_desc.Texture2DMSArray.ArraySize = 1;
+
+ ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL);
+ }
+
+ transition_resource_state(command_list, resource,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i)
+ {
+ check_sub_resource_uint(resource, i, queue, command_list, array_expected_colors[i], 2);
+ reset_command_list(command_list, context.allocator);
+ }
+
+ /* 3D texture */
+ ID3D12Resource_Release(resource);
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D;
+ resource_desc.DepthOrArraySize = 32;
+ resource_desc.MipLevels = 1;
+ resource_desc.SampleDesc.Count = 1;
+ hr = ID3D12Device_CreateCommittedResource(device,
+ &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
+
+ ID3D12Device_CreateRenderTargetView(device, resource, NULL, rtv_handle);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL);
+ transition_resource_state(command_list, resource,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(resource, 0, queue, command_list, 0xbf4c7f19, 2);
+
+ memset(&rtv_desc, 0, sizeof(rtv_desc));
+ rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE3D;
+ rtv_desc.Texture3D.FirstWSlice = 2;
+ rtv_desc.Texture3D.WSize = 2;
+ ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, resource,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, green, 0, NULL);
+ transition_resource_state(command_list, resource,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list);
+ set_box(&box, 0, 0, 0, 32, 32, 2);
+ check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1);
+ set_box(&box, 0, 0, 2, 32, 32, 4);
+ check_readback_data_uint(&rb, &box, 0xff00ff00, 1);
+ set_box(&box, 0, 0, 4, 32, 32, 32);
+ check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1);
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(resource);
+ ID3D12DescriptorHeap_Release(rtv_heap);
+ destroy_test_context(&context);
+}
+
+static void test_clear_unordered_access_view_buffer(void)
+{
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ ID3D12DescriptorHeap *cpu_heap, *gpu_heap;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ D3D12_HEAP_DESC heap_desc;
+ ID3D12Resource *buffer;
+ ID3D12Device *device;
+ UINT clear_value[4];
+ unsigned int i, j;
+ ID3D12Heap *heap;
+ D3D12_BOX box;
+ HRESULT hr;
+
+#define BUFFER_SIZE (1024 * 1024)
+ static const struct
+ {
+ DXGI_FORMAT format;
+ D3D12_BUFFER_UAV buffer_uav;
+ unsigned int values[4];
+ unsigned int expected;
+ bool is_float;
+ bool is_todo;
+ }
+ tests[] =
+ {
+ {DXGI_FORMAT_R32_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0, 0, 0, 0}, 0},
+ {DXGI_FORMAT_R32_UINT, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0, 0, 0, 0}, 0},
+ {DXGI_FORMAT_R32_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {1, 0, 0, 0}, 1},
+ {DXGI_FORMAT_R32_UINT, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {2, 0, 0, 0}, 2},
+ {DXGI_FORMAT_R32_UINT, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {3, 0, 0, 0}, 3},
+ {DXGI_FORMAT_R32_UINT, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {4, 2, 3, 4}, 4},
+ {DXGI_FORMAT_R32_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t) - 10, 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {5, 0, 0, 0}, 5},
+
+ {DXGI_FORMAT_R32_TYPELESS, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
+ {0, 0, 0, 0}, 0},
+ {DXGI_FORMAT_R32_TYPELESS, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
+ {0, 0, 0, 0}, 0},
+ {DXGI_FORMAT_R32_TYPELESS, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
+ {6, 0, 0, 0}, 6},
+ {DXGI_FORMAT_R32_TYPELESS, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
+ {7, 0, 0, 0}, 7},
+ {DXGI_FORMAT_R32_TYPELESS, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
+ {8, 0, 0, 0}, 8},
+ {DXGI_FORMAT_R32_TYPELESS, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
+ {9, 1, 1, 1}, 9},
+ {DXGI_FORMAT_R32_TYPELESS, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
+ {~0u, 0, 0, 0}, ~0u},
+ {DXGI_FORMAT_R32_TYPELESS, { 0, BUFFER_SIZE / sizeof(uint32_t) - 10, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
+ {10, 0, 0, 0}, 10},
+ {DXGI_FORMAT_R32_TYPELESS, { 0, BUFFER_SIZE / sizeof(uint32_t) - 9, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
+ {11, 0, 0, 0}, 11},
+
+ {DXGI_FORMAT_R32_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0, 0, 0, 0}, 0, false, true},
+ {DXGI_FORMAT_R32_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {1, 0, 0, 0}, 1, false, true},
+ {DXGI_FORMAT_R32_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x3f800000 /* 1.0f */, 0, 0, 0}, 0x3f800000 /* 1.0f */, true, true},
+
+ {DXGI_FORMAT_R16G16_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x1234, 0xabcd, 0, 0}, 0xabcd1234, false, true},
+ {DXGI_FORMAT_R16G16_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x10000, 0, 0, 0}, 0, false, true},
+
+ {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x1234, 0xabcd, 0, 0}, 0xabcd1234, false, true},
+ {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true, true},
+ {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x40000000 /* 2.0f */, 0 /* 0.0f */, 0, 0}, 0x0000ffff, true, true},
+ {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0xbf800000 /* -1.0f */, 0 /* 0.0f */, 0x3f000000 /* 1.0f */, 0x3f000000 /* 1.0f */}, 0, true, true},
+
+ {DXGI_FORMAT_R16G16_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x1234, 0xabcd, 0, 0}, 0xabcd1234, false, true},
+ {DXGI_FORMAT_R16G16_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, true, true},
+
+ {DXGI_FORMAT_R8G8B8A8_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x11, 0x22, 0x33, 0x44}, 0x44332211, false, true},
+ {DXGI_FORMAT_R8G8B8A8_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x100, 0, 0, 0}, 0, false, true},
+
+ {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0, 0, 0, 0}, 0, false, true},
+ {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x7ff, 0x7ff, 0x3ff, 0}, 0xffffffff, false, true},
+ {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x7ff, 0, 0x3ff, 0}, 0xffc007ff, false, true},
+ {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* 2.0f */, 0}, 0x801e0380, true, true},
+ {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x3f000000 /* 1.0f */, 0 /* 0.0f */, 0xbf800000 /* -1.0f */, 0x3f000000 /* 1.0f */},
+ 0x00000380, true, true},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2);
+ gpu_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2);
+
+ heap_desc.SizeInBytes = 2 * BUFFER_SIZE;
+ memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties));
+ heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ heap_desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+ heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
+ hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap);
+ ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ buffer = create_placed_buffer(device, heap, BUFFER_SIZE, BUFFER_SIZE,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ for (j = 0; j < ARRAY_SIZE(clear_value); ++j)
+ clear_value[j] = tests[i].expected ? 0 : ~0u;
+
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = DXGI_FORMAT_R32_UINT;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.NumElements = BUFFER_SIZE / sizeof(uint32_t);
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, cpu_heap, 1));
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, gpu_heap, 1));
+
+ uav_desc.Format = tests[i].format;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer = tests[i].buffer_uav;
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, cpu_heap, 0));
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, gpu_heap, 0));
+
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 1),
+ get_cpu_descriptor_handle(&context, cpu_heap, 1),
+ buffer, clear_value, 0, NULL);
+
+ uav_barrier(command_list, buffer);
+
+ if (tests[i].is_float)
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewFloat(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_heap, 0),
+ buffer, (const float *)tests[i].values, 0, NULL);
+ else
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_heap, 0),
+ buffer, tests[i].values, 0, NULL);
+
+ set_box(&box, 0, 0, 0, 1, 1, 1);
+ transition_resource_state(command_list, buffer,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_TYPELESS, &rb, queue, command_list);
+ box.left = 0;
+ box.right = uav_desc.Buffer.FirstElement;
+ check_readback_data_uint(&rb, &box, clear_value[0], 0);
+ box.left = uav_desc.Buffer.FirstElement;
+ box.right = uav_desc.Buffer.FirstElement + uav_desc.Buffer.NumElements;
+ todo_if(tests[i].is_todo)
+ check_readback_data_uint(&rb, &box, tests[i].expected, tests[i].is_float ? 1 : 0);
+ box.left = uav_desc.Buffer.FirstElement + uav_desc.Buffer.NumElements;
+ box.right = BUFFER_SIZE / format_size(uav_desc.Format);
+ check_readback_data_uint(&rb, &box, clear_value[0], 0);
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ ID3D12Resource_Release(buffer);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12DescriptorHeap_Release(cpu_heap);
+ ID3D12DescriptorHeap_Release(gpu_heap);
+ ID3D12Heap_Release(heap);
+ destroy_test_context(&context);
+#undef BUFFER_SIZE
+}
+
+static void test_clear_unordered_access_view_image(void)
+{
+ unsigned int expected_colour, actual_colour;
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ ID3D12DescriptorHeap *cpu_heap, *gpu_heap;
+ ID3D12GraphicsCommandList *command_list;
+ unsigned int i, j, d, p, x, y, z, layer;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ unsigned int image_size, image_depth;
+ D3D12_RESOURCE_DESC resource_desc;
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ bool is_inside, success;
+ ID3D12Resource *texture;
+ ID3D12Device *device;
+ UINT clear_value[4];
+ HRESULT hr;
+
+#define IMAGE_SIZE 16
+ static const struct
+ {
+ DXGI_FORMAT format;
+ unsigned int image_mips;
+ unsigned int image_layers;
+ unsigned int mip_level;
+ unsigned int first_layer;
+ unsigned int layer_count;
+ unsigned int rect_count;
+ RECT clear_rects[2];
+ unsigned int values[4];
+ unsigned int expected;
+ bool is_float;
+ bool is_todo;
+ }
+ tests[] =
+ {
+ /* Test clearing a specific mip level. */
+ {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, 0, {}, {1, 0, 0, 0}, 1, false, false},
+ {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, 0, {}, {1, 0, 0, 0}, 1, false, false},
+ {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, 0, {}, {0x3f000000, 0, 0, 0}, 0x3f000000, true, true},
+ {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, 0, {}, {0x3f000000, 0, 0, 0}, 0x3f000000, true, true},
+ /* Test clearing specific array layers. */
+ {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, 0, {}, {1, 0, 0, 0}, 1, false, false},
+ {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, 0, {}, {1, 0, 0, 0}, 1, false, false},
+ {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, 0, {},
+ {0x3f000000, 0, 0, 0}, 0x3f000000, true, true},
+ {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, 0, {},
+ {0x3f000000, 0, 0, 0}, 0x3f000000, true, true},
+ /* Test a single clear rect. */
+ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 1, {{1, 2, IMAGE_SIZE - 4, IMAGE_SIZE - 2}},
+ {1, 0, 0, 0}, 1, false, true},
+ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 1, {{1, 2, IMAGE_SIZE - 4, IMAGE_SIZE - 2}},
+ {0x3f000000, 0, 0, 0}, 0x3f000000, true, true},
+ /* Test multiple clear rects. */
+ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 2, {{1, 2, 3, 4}, {5, 6, 7, 8}},
+ {1, 0, 0, 0}, 1, false, true},
+ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 2, {{1, 2, 3, 4}, {5, 6, 7, 8}},
+ {0x3f000000, 0, 0, 0}, 0x3f000000, true, true},
+ /* Test uint clears with formats. */
+ {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001, false, false},
+ {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, 0, {}, {0x12345, 0, 0, 0}, 0x00002345, false, true},
+ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001, false, true},
+ {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001, false, true},
+ {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201, false, false},
+ {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {0x123, 0, 0, 0}, 0x00000023, false, true},
+ {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201, false, true},
+ {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001, false, true},
+ /* Test float clears with formats. */
+ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true, true},
+ {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, 0, {},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, true, true},
+ {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x0000ff80, true, true},
+ {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {},
+ {0, 0, 0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */}, 0xff800000, true, true},
+ {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {},
+ {0x3f000000 /* 1.0f */, 0 /* 0.0f */, 0xbf800000 /* -1.0f */, 0x3f000000 /* 1.0f */},
+ 0x00000380, true, true},
+ };
+
+ static const struct
+ {
+ D3D12_RESOURCE_DIMENSION resource_dim;
+ D3D12_UAV_DIMENSION view_dim;
+ bool is_layered;
+ }
+ uav_dimensions[] =
+ {
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, D3D12_UAV_DIMENSION_TEXTURE2D, false},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, D3D12_UAV_DIMENSION_TEXTURE2DARRAY, true },
+ /* Expected behaviour with partial layer coverage is unclear. */
+ {D3D12_RESOURCE_DIMENSION_TEXTURE3D, D3D12_UAV_DIMENSION_TEXTURE3D, false},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2);
+ gpu_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2);
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+
+ for (d = 0; d < ARRAY_SIZE(uav_dimensions); ++d)
+ {
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Dim %u, Test %u", d, i);
+
+ if (tests[i].image_layers > 1 && !uav_dimensions[d].is_layered)
+ continue;
+
+ resource_desc.Dimension = uav_dimensions[d].resource_dim;
+ resource_desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+ resource_desc.Width = IMAGE_SIZE;
+ resource_desc.Height = IMAGE_SIZE;
+ if (uav_dimensions[d].resource_dim == D3D12_RESOURCE_DIMENSION_TEXTURE1D)
+ resource_desc.Height = 1;
+ resource_desc.DepthOrArraySize = tests[i].image_layers;
+ resource_desc.MipLevels = tests[i].image_mips;
+ resource_desc.Format = tests[i].format;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
+
+ if (FAILED(hr = ID3D12Device_CreateCommittedResource(device, &heap_properties,
+ D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_UNORDERED_ACCESS,
+ NULL, &IID_ID3D12Resource, (void **)&texture)))
+ {
+ skip("Failed to create texture, hr %#x.\n", hr);
+ continue;
+ }
+
+ uav_desc.Format = tests[i].format;
+ uav_desc.ViewDimension = uav_dimensions[d].view_dim;
+
+ for (j = 0; j < 2; ++j)
+ {
+ unsigned int first_layer = j ? 0 : tests[i].first_layer;
+ unsigned int layer_count = j ? tests[i].image_layers : tests[i].layer_count;
+
+ switch (uav_desc.ViewDimension)
+ {
+ case D3D12_UAV_DIMENSION_TEXTURE1D:
+ uav_desc.Texture1D.MipSlice = tests[i].mip_level;
+ break;
+
+ case D3D12_UAV_DIMENSION_TEXTURE1DARRAY:
+ uav_desc.Texture1DArray.MipSlice = tests[i].mip_level;
+ uav_desc.Texture1DArray.FirstArraySlice = first_layer;
+ uav_desc.Texture1DArray.ArraySize = layer_count;
+ break;
+
+ case D3D12_UAV_DIMENSION_TEXTURE2D:
+ uav_desc.Texture2D.MipSlice = tests[i].mip_level;
+ uav_desc.Texture2D.PlaneSlice = 0;
+ break;
+
+ case D3D12_UAV_DIMENSION_TEXTURE2DARRAY:
+ uav_desc.Texture2DArray.MipSlice = tests[i].mip_level;
+ uav_desc.Texture2DArray.FirstArraySlice = first_layer;
+ uav_desc.Texture2DArray.ArraySize = layer_count;
+ uav_desc.Texture2DArray.PlaneSlice = 0;
+ break;
+
+ case D3D12_UAV_DIMENSION_TEXTURE3D:
+ uav_desc.Texture3D.MipSlice = tests[i].mip_level;
+ uav_desc.Texture3D.FirstWSlice = first_layer;
+ uav_desc.Texture3D.WSize = layer_count;
+ break;
+
+ default:
+ continue;
+ }
+
+ ID3D12Device_CreateUnorderedAccessView(device, texture, NULL,
+ &uav_desc, get_cpu_descriptor_handle(&context, cpu_heap, j));
+ ID3D12Device_CreateUnorderedAccessView(device, texture, NULL,
+ &uav_desc, get_cpu_descriptor_handle(&context, gpu_heap, j));
+ }
+
+ for (j = 0; j < 4; ++j)
+ {
+ clear_value[j] = tests[i].expected ? 0u : ~0u;
+ }
+
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 1),
+ get_cpu_descriptor_handle(&context, cpu_heap, 1),
+ texture, clear_value, 0, NULL);
+
+ uav_barrier(command_list, texture);
+
+ if (tests[i].is_float)
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewFloat(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_heap, 0),
+ texture, (const float *)tests[i].values, tests[i].rect_count, tests[i].clear_rects);
+ else
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_heap, 0),
+ texture, tests[i].values, tests[i].rect_count, tests[i].clear_rects);
+
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ image_depth = uav_dimensions[d].resource_dim == D3D12_RESOURCE_DIMENSION_TEXTURE3D
+ ? max(tests[i].image_layers >> tests[i].mip_level, 1u) : 1;
+ image_size = max(IMAGE_SIZE >> tests[i].mip_level, 1u);
+
+ for (layer = 0; layer < tests[i].image_layers / image_depth; ++layer)
+ {
+ get_texture_readback_with_command_list(texture,
+ tests[i].mip_level + (layer * tests[i].image_mips),
+ &rb, queue, command_list);
+
+ for (p = 0; p < image_depth * image_size * image_size; ++p)
+ {
+ x = p % image_size;
+ y = (p / image_size) % image_size;
+ z = p / (image_size * image_size);
+
+ is_inside = tests[i].rect_count == 0;
+
+ for (j = 0; j < tests[i].rect_count; ++j)
+ {
+ if (y >= tests[i].clear_rects[j].top && y < tests[i].clear_rects[j].bottom
+ && x >= tests[i].clear_rects[j].left && x < tests[i].clear_rects[j].right)
+ {
+ is_inside = true;
+ break;
+ }
+ }
+
+ if (uav_dimensions[d].resource_dim == D3D12_RESOURCE_DIMENSION_TEXTURE3D)
+ is_inside = is_inside && z >= tests[i].first_layer
+ && z < tests[i].first_layer + tests[i].layer_count;
+ else
+ is_inside = is_inside && layer >= tests[i].first_layer
+ && layer < tests[i].first_layer + tests[i].layer_count;
+
+ expected_colour = is_inside ? tests[i].expected : clear_value[0];
+ actual_colour = get_readback_uint(&rb, x, y, z);
+ success = compare_color(actual_colour, expected_colour, tests[i].is_float ? 1 : 0);
+
+ todo_if(tests[i].is_todo && expected_colour)
+ ok(success, "At layer %u, (%u,%u,%u), expected %#x, got %#x.\n",
+ layer, x, y, z, expected_colour, actual_colour);
+
+ if (!success)
+ break;
+ }
+
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+ }
+
+ ID3D12Resource_Release(texture);
+ }
+ }
+
+ ID3D12DescriptorHeap_Release(cpu_heap);
+ ID3D12DescriptorHeap_Release(gpu_heap);
+ destroy_test_context(&context);
+#undef IMAGE_SIZE
+}
+
+static void test_set_render_targets(void)
+{
+ ID3D12DescriptorHeap *dsv_heap, *rtv_heap;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE dsv, rtv;
+ struct test_context context;
+ ID3D12Device *device;
+ HRESULT hr;
+
+ if (!init_test_context(&context, NULL))
+ return;
+ device = context.device;
+ command_list = context.list;
+
+ rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 4);
+ dsv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_DSV, 4);
+
+ dsv = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(dsv_heap);
+ rtv = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, false, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, true, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, true, &dsv);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, &rtv, true, &dsv);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, &rtv, false, &dsv);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, true, &dsv);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, false, &dsv);
+
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
+
+ ID3D12DescriptorHeap_Release(rtv_heap);
+ ID3D12DescriptorHeap_Release(dsv_heap);
+ destroy_test_context(&context);
+}
+
+static void test_draw_instanced(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+
+ if (!init_test_context(&context, NULL))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ if (!use_warp_device)
+ {
+ /* This draw call is ignored. */
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ }
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ destroy_test_context(&context);
+}
+
+static void test_draw_indexed_instanced(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const uint16_t indices[] = {0, 1, 2};
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context context;
+ D3D12_INDEX_BUFFER_VIEW ibv;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *ib;
+
+ if (!init_test_context(&context, NULL))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ ib = create_upload_buffer(context.device, sizeof(indices), indices);
+
+ ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib);
+ ibv.SizeInBytes = sizeof(indices);
+ ibv.Format = DXGI_FORMAT_R16_UINT;
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ if (!use_warp_device)
+ {
+ /* This draw call is ignored. */
+ ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 1, 0, 0, 0);
+ }
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, NULL);
+ ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 1, 0, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12Resource_Release(ib);
+ destroy_test_context(&context);
+}
+
+static void test_draw_no_descriptor_bindings(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_range[2];
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ HRESULT hr;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_range[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_range[0].NumDescriptors = 2;
+ descriptor_range[0].BaseShaderRegister = 0;
+ descriptor_range[0].RegisterSpace = 0;
+ descriptor_range[0].OffsetInDescriptorsFromTableStart = 1;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range[0];
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ descriptor_range[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_range[1].NumDescriptors = 1;
+ descriptor_range[1].BaseShaderRegister = 0;
+ descriptor_range[1].RegisterSpace = 0;
+ descriptor_range[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[1].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[1].DescriptorTable.pDescriptorRanges = &descriptor_range[1];
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, NULL, NULL);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ destroy_test_context(&context);
+}
+
+static void test_multiple_render_targets(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ struct vec4 expected_vec4 = {0.0f, 0.0f, 0.0f, 1.0f};
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE rtvs[3];
+ ID3D12Resource *render_targets[2];
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ void main(out float4 target0 : SV_Target0, out float4 target1 : SV_Target1,
+ out float4 target2 : SV_Target2)
+ {
+ target0 = float4(1.0f, 0.0f, 0.0f, 1.0f);
+ target1 = float4(2.0f, 0.0f, 0.0f, 1.0f);
+ target2 = float4(3.0f, 0.0f, 0.0f, 1.0f);
+ }
+#endif
+ 0x43425844, 0xc4325131, 0x8ba4a693, 0x08d15431, 0xcb990885, 0x00000001, 0x0000013c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x000000a0, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000005c, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x00000050, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x00000050,
+ 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074,
+ 0x58454853, 0x00000094, 0x00000050, 0x00000025, 0x0100086a, 0x03000065, 0x001020f2, 0x00000000,
+ 0x03000065, 0x001020f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x08000036, 0x001020f2,
+ 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x08000036, 0x001020f2,
+ 0x00000001, 0x00004002, 0x40000000, 0x00000000, 0x00000000, 0x3f800000, 0x08000036, 0x001020f2,
+ 0x00000002, 0x00004002, 0x40400000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.rt_descriptor_count = ARRAY_SIZE(rtvs);
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL);
+ pso_desc.NumRenderTargets = ARRAY_SIZE(rtvs);
+ for (i = 0; i < ARRAY_SIZE(rtvs); ++i)
+ pso_desc.RTVFormats[i] = desc.rt_format;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr);
+
+ rtvs[0] = get_cpu_rtv_handle(&context, context.rtv_heap, 2);
+ rtvs[1] = get_cpu_rtv_handle(&context, context.rtv_heap, 0);
+ rtvs[2] = get_cpu_rtv_handle(&context, context.rtv_heap, 1);
+
+ create_render_target(&context, &desc, &render_targets[0], &rtvs[0]);
+ create_render_target(&context, &desc, &render_targets[1], &rtvs[2]);
+
+ for (i = 0; i < ARRAY_SIZE(rtvs); ++i)
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtvs[i], white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, ARRAY_SIZE(rtvs), rtvs, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, render_targets[0],
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, render_targets[1],
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ expected_vec4.x = 2.0f;
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4, 0);
+ reset_command_list(command_list, context.allocator);
+ expected_vec4.x = 1.0f;
+ check_sub_resource_vec4(render_targets[0], 0, queue, command_list, &expected_vec4, 0);
+ reset_command_list(command_list, context.allocator);
+ expected_vec4.x = 3.0f;
+ check_sub_resource_vec4(render_targets[1], 0, queue, command_list, &expected_vec4, 0);
+ reset_command_list(command_list, context.allocator);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ transition_resource_state(command_list, render_targets[0],
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ transition_resource_state(command_list, render_targets[1],
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, ARRAY_SIZE(rtvs), &context.rtv, true, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, render_targets[0],
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, render_targets[1],
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ expected_vec4.x = 1.0f;
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4, 0);
+ reset_command_list(command_list, context.allocator);
+ expected_vec4.x = 3.0f;
+ check_sub_resource_vec4(render_targets[0], 0, queue, command_list, &expected_vec4, 0);
+ reset_command_list(command_list, context.allocator);
+ expected_vec4.x = 2.0f;
+ check_sub_resource_vec4(render_targets[1], 0, queue, command_list, &expected_vec4, 0);
+ reset_command_list(command_list, context.allocator);
+
+ for (i = 0; i < ARRAY_SIZE(render_targets); ++i)
+ ID3D12Resource_Release(render_targets[i]);
+ destroy_test_context(&context);
+}
+
+static void test_unknown_rtv_format(void)
+{
+ static const struct vec4 white = {1.0f, 1.0f, 1.0f, 1.0f};
+ struct vec4 expected_vec4 = {0.0f, 0.0f, 0.0f, 1.0f};
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_RENDER_TARGET_VIEW_DESC rtv_desc;
+ D3D12_CPU_DESCRIPTOR_HANDLE rtvs[3];
+ ID3D12Resource *render_targets[2];
+ struct depth_stencil_resource ds;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ void main(out float4 target1 : SV_Target1, out float4 target2 : SV_Target2)
+ {
+ target1 = float4(2.0f, 0.0f, 0.0f, 1.0f);
+ target2 = float4(3.0f, 0.0f, 0.0f, 1.0f);
+ }
+#endif
+ 0x43425844, 0x980554be, 0xb8743fb0, 0xf5bb8deb, 0x639feaf8, 0x00000001, 0x000000f4, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000088, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000001, 0x00000000, 0x00000003, 0x00000001,
+ 0x0000000f, 0x00000038, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x545f5653,
+ 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, 0x03000065, 0x001020f2,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x08000036, 0x001020f2, 0x00000001, 0x00004002,
+ 0x40000000, 0x00000000, 0x00000000, 0x3f800000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002,
+ 0x40400000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.rt_descriptor_count = 16;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ init_depth_stencil(&ds, context.device, 32, 32, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL);
+ pso_desc.NumRenderTargets = ARRAY_SIZE(rtvs);
+ for (i = 0; i < ARRAY_SIZE(rtvs); ++i)
+ pso_desc.RTVFormats[i] = desc.rt_format;
+ pso_desc.RTVFormats[0] = DXGI_FORMAT_UNKNOWN;
+ pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT;
+ pso_desc.DepthStencilState.DepthEnable = true;
+ pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL;
+ pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr);
+
+ rtvs[0] = get_cpu_rtv_handle(&context, context.rtv_heap, 0);
+ rtvs[1] = get_cpu_rtv_handle(&context, context.rtv_heap, 1);
+ rtvs[2] = get_cpu_rtv_handle(&context, context.rtv_heap, 2);
+ create_render_target(&context, &desc, &render_targets[0], &rtvs[1]);
+ create_render_target(&context, &desc, &render_targets[1], &rtvs[2]);
+
+ for (i = 0; i < ARRAY_SIZE(rtvs); ++i)
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtvs[i], &white.x, 0, NULL);
+
+ /* NULL RTV */
+ memset(&rtv_desc, 0, sizeof(rtv_desc));
+ rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D;
+ rtv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ rtv_desc.Texture2D.MipSlice = 0;
+ rtv_desc.Texture2D.PlaneSlice = 0;
+ ID3D12Device_CreateRenderTargetView(context.device, NULL, &rtv_desc,
+ get_cpu_rtv_handle(&context, context.rtv_heap, 0));
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, ARRAY_SIZE(rtvs), rtvs, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.5f, 0.5f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, render_targets[0],
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, render_targets[1],
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &white, 0);
+ reset_command_list(command_list, context.allocator);
+ expected_vec4.x = 2.0f;
+ check_sub_resource_vec4(render_targets[0], 0, queue, command_list, &expected_vec4, 0);
+ reset_command_list(command_list, context.allocator);
+ expected_vec4.x = 3.0f;
+ check_sub_resource_vec4(render_targets[1], 0, queue, command_list, &expected_vec4, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(ds.texture, 0, queue, command_list, 0.5f, 1);
+
+ for (i = 0; i < ARRAY_SIZE(render_targets); ++i)
+ ID3D12Resource_Release(render_targets[i]);
+ destroy_depth_stencil(&ds);
+ destroy_test_context(&context);
+}
+
+static void test_unknown_dsv_format(void)
+{
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct depth_stencil_resource ds;
+ D3D12_CLEAR_VALUE clear_value;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ HRESULT hr;
+
+ static const DWORD ps_color_code[] =
+ {
+#if 0
+ float4 color;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ return color;
+ }
+#endif
+ 0x43425844, 0xd18ead43, 0x8b8264c1, 0x9c0a062d, 0xfc843226, 0x00000001, 0x000000e0, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050,
+ 0x00000011, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2,
+ 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_color = {ps_color_code, sizeof(ps_color_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f};
+ static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ clear_value.Format = DXGI_FORMAT_D32_FLOAT;
+ clear_value.DepthStencil.Depth = 0.5f;
+ clear_value.DepthStencil.Stencil = 0;
+ init_depth_stencil(&ds, context.device, 32, 32, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, &clear_value);
+
+ context.root_signature = create_32bit_constants_root_signature(context.device,
+ 0, 4, D3D12_SHADER_VISIBILITY_PIXEL);
+
+ /* DSVFormat = DXGI_FORMAT_UNKNOWN and D3D12_DEPTH_WRITE_MASK_ZERO */
+ init_pipeline_state_desc(&pso_desc, context.root_signature, desc.rt_format, NULL, &ps_color, NULL);
+ pso_desc.DSVFormat = DXGI_FORMAT_UNKNOWN;
+ pso_desc.DepthStencilState.DepthEnable = true;
+ pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ZERO;
+ pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_EQUAL;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 0.5f, 0, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.5f, 0.5f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &red.x, 0);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 1.0f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.0f, 0.0f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.55f, 0.55f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(ds.texture, 0, queue, command_list, 0.5f, 1);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0);
+
+ /* DSVFormat = DXGI_FORMAT_UNKNOWN and no DSV */
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &red.x, 0);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.0f, 0.0f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.5f, 0.5f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0);
+
+ /* DSVFormat = DXGI_FORMAT_UNKNOWN and D3D12_COMPARISON_FUNC_ALWAYS */
+ ID3D12PipelineState_Release(context.pipeline_state);
+ pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &red.x, 0);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.0f, 0.0f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.6f, 0.6f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0);
+
+ /* DSVFormat = DXGI_FORMAT_UNKNOWN and depth write */
+ ID3D12PipelineState_Release(context.pipeline_state);
+ pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL;
+ pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 0.0f, 0, 0, NULL);
+
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &red.x, 0);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 1.0f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.6f, 0.6f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(ds.texture, 0, queue, command_list, 1.0f, 1);
+
+ destroy_depth_stencil(&ds);
+ destroy_test_context(&context);
+}
+
+static void test_append_aligned_element(void)
+{
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ D3D12_VERTEX_BUFFER_VIEW vbv[6];
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *vb[3];
+ unsigned int color;
+
+ /* Semantic names are case-insensitive. */
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"CoLoR", 2, DXGI_FORMAT_R32G32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1},
+ {"ColoR", 3, DXGI_FORMAT_R32G32_FLOAT, 5, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1},
+ {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"ColoR", 0, DXGI_FORMAT_R32G32_FLOAT, 5, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1},
+ {"cOLOr", 1, DXGI_FORMAT_R32G32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1},
+ };
+ static const DWORD vs_code[] =
+ {
+#if 0
+ struct vs_in
+ {
+ float4 position : POSITION;
+ float2 color_xy : COLOR0;
+ float2 color_zw : COLOR1;
+ unsigned int instance_id : SV_INSTANCEID;
+ };
+
+ struct vs_out
+ {
+ float4 position : SV_POSITION;
+ float2 color_xy : COLOR0;
+ float2 color_zw : COLOR1;
+ };
+
+ struct vs_out main(struct vs_in i)
+ {
+ struct vs_out o;
+
+ o.position = i.position;
+ o.position.x += i.instance_id * 0.5;
+ o.color_xy = i.color_xy;
+ o.color_zw = i.color_zw;
+
+ return o;
+ }
+#endif
+ 0x43425844, 0x52e3bf46, 0x6300403d, 0x624cffe4, 0xa4fc0013, 0x00000001, 0x00000214, 0x00000003,
+ 0x0000002c, 0x000000bc, 0x00000128, 0x4e475349, 0x00000088, 0x00000004, 0x00000008, 0x00000068,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000071, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000303, 0x00000071, 0x00000001, 0x00000000, 0x00000003, 0x00000002,
+ 0x00000303, 0x00000077, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000101, 0x49534f50,
+ 0x4e4f4954, 0x4c4f4300, 0x5300524f, 0x4e495f56, 0x4e415453, 0x44494543, 0xababab00, 0x4e47534f,
+ 0x00000064, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000,
+ 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000c03, 0x0000005c,
+ 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000030c, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4f4c4f43, 0xabab0052, 0x52444853, 0x000000e4, 0x00010040, 0x00000039, 0x0300005f, 0x001010f2,
+ 0x00000000, 0x0300005f, 0x00101032, 0x00000001, 0x0300005f, 0x00101032, 0x00000002, 0x04000060,
+ 0x00101012, 0x00000003, 0x00000008, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065,
+ 0x00102032, 0x00000001, 0x03000065, 0x001020c2, 0x00000001, 0x02000068, 0x00000001, 0x05000056,
+ 0x00100012, 0x00000000, 0x0010100a, 0x00000003, 0x09000032, 0x00102012, 0x00000000, 0x0010000a,
+ 0x00000000, 0x00004001, 0x3f000000, 0x0010100a, 0x00000000, 0x05000036, 0x001020e2, 0x00000000,
+ 0x00101e56, 0x00000000, 0x05000036, 0x00102032, 0x00000001, 0x00101046, 0x00000001, 0x05000036,
+ 0x001020c2, 0x00000001, 0x00101406, 0x00000002, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ struct vs_out
+ {
+ float4 position : SV_POSITION;
+ float2 color_xy : COLOR0;
+ float2 color_zw : COLOR1;
+ };
+
+ float4 main(struct vs_out i) : SV_TARGET
+ {
+ return float4(i.color_xy.xy, i.color_zw.xy);
+ }
+#endif
+ 0x43425844, 0x64e48a09, 0xaa484d46, 0xe40a6e78, 0x9885edf3, 0x00000001, 0x00000118, 0x00000003,
+ 0x0000002c, 0x00000098, 0x000000cc, 0x4e475349, 0x00000064, 0x00000003, 0x00000008, 0x00000050,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000303, 0x0000005c, 0x00000001, 0x00000000, 0x00000003, 0x00000001,
+ 0x00000c0c, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c,
+ 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f,
+ 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000044, 0x00000040, 0x00000011, 0x03001062,
+ 0x00101032, 0x00000001, 0x03001062, 0x001010c2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const struct
+ {
+ struct vec4 position;
+ }
+ stream0[] =
+ {
+ {{-1.0f, -1.0f, 0.0f, 1.0f}},
+ {{-1.0f, 1.0f, 0.0f, 1.0f}},
+ {{-0.5f, -1.0f, 0.0f, 1.0f}},
+ {{-0.5f, 1.0f, 0.0f, 1.0f}},
+ };
+ static const struct
+ {
+ struct vec2 color2;
+ struct vec2 color1;
+ }
+ stream1[] =
+ {
+ {{0.5f, 0.5f}, {0.0f, 1.0f}},
+ {{0.5f, 0.5f}, {0.0f, 1.0f}},
+ {{0.5f, 0.5f}, {1.0f, 1.0f}},
+ {{0.5f, 0.5f}, {1.0f, 1.0f}},
+ };
+ static const struct
+ {
+ struct vec2 color3;
+ struct vec2 color0;
+ }
+ stream2[] =
+ {
+ {{0.5f, 0.5f}, {1.0f, 0.0f}},
+ {{0.5f, 0.5f}, {0.0f, 1.0f}},
+ {{0.5f, 0.5f}, {0.0f, 0.0f}},
+ {{0.5f, 0.5f}, {1.0f, 0.0f}},
+ };
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 640;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_empty_root_signature(context.device,
+ D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT);
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout);
+
+ memset(vbv, 0, sizeof(vbv));
+ vb[0] = create_upload_buffer(context.device, sizeof(stream0), stream0);
+ vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]);
+ vbv[0].StrideInBytes = sizeof(*stream0);
+ vbv[0].SizeInBytes = sizeof(stream0);
+
+ vb[1] = create_upload_buffer(context.device, sizeof(stream1), stream1);
+ vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]);
+ vbv[1].StrideInBytes = sizeof(*stream1);
+ vbv[1].SizeInBytes = sizeof(stream1);
+
+ vb[2] = create_upload_buffer(context.device, sizeof(stream2), stream2);
+ vbv[5].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[2]);
+ vbv[5].StrideInBytes = sizeof(*stream2);
+ vbv[5].SizeInBytes = sizeof(stream2);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ color = get_readback_uint(&rb, 80, 16, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 240, 16, 0);
+ ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 400, 16, 0);
+ ok(compare_color(color, 0xffff0000, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 560, 16, 0);
+ ok(compare_color(color, 0xffff00ff, 1), "Got unexpected color 0x%08x.\n", color);
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(vb[2]);
+ ID3D12Resource_Release(vb[1]);
+ ID3D12Resource_Release(vb[0]);
+ destroy_test_context(&context);
+}
+
+static void test_gpu_virtual_address(void)
+{
+ D3D12_GPU_VIRTUAL_ADDRESS vb_offset, ib_offset;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct test_context context;
+ D3D12_INDEX_BUFFER_VIEW ibv;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *buffer;
+ HRESULT hr;
+ BYTE *ptr;
+
+ static const DWORD vs_code[] =
+ {
+#if 0
+ void main(float4 in_position : POSITION, float4 in_color : COLOR,
+ out float4 out_position : SV_POSITION, out float4 out_color : COLOR)
+ {
+ out_position = in_position;
+ out_color = in_color;
+ }
+#endif
+ 0x43425844, 0xa58fc911, 0x280038e9, 0x14cfff54, 0xe43fc328, 0x00000001, 0x00000144, 0x00000003,
+ 0x0000002c, 0x0000007c, 0x000000d0, 0x4e475349, 0x00000048, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0x4c4f4300, 0xab00524f, 0x4e47534f,
+ 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, 0x00000000,
+ 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x505f5653,
+ 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x58454853, 0x0000006c, 0x00010050, 0x0000001b,
+ 0x0100086a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067,
+ 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2,
+ 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ void main(float4 in_position : SV_POSITION, float4 in_color : COLOR,
+ out float4 out_color : SV_TARGET)
+ {
+ out_color = in_color;
+ }
+#endif
+ 0x43425844, 0x1a6def50, 0x9c069300, 0x7cce68f0, 0x621239b9, 0x00000001, 0x000000f8, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x58454853, 0x0000003c, 0x00000050,
+ 0x0000000f, 0x0100086a, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const uint32_t indices[] = {0, 1, 2, 3};
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 8, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const struct
+ {
+ struct vec2 position;
+ struct vec4 color;
+ }
+ quad[] =
+ {
+ {{-1.0f, -1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}},
+ {{-1.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}},
+ {{ 1.0f, -1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}},
+ {{ 1.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_empty_root_signature(context.device,
+ D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT);
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout);
+
+ vb_offset = 0x200;
+ ib_offset = 0x500;
+ buffer = create_upload_buffer(context.device, ib_offset + sizeof(indices), NULL);
+
+ hr = ID3D12Resource_Map(buffer, 0, NULL, (void **)&ptr);
+ ok(SUCCEEDED(hr), "Failed to map upload buffer, hr %#x.\n", hr);
+ memcpy(ptr + vb_offset, quad, sizeof(quad));
+ memcpy(ptr + ib_offset, indices, sizeof(indices));
+ ID3D12Resource_Unmap(buffer, 0, NULL);
+
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(buffer) + vb_offset;
+ vbv.StrideInBytes = sizeof(*quad);
+ vbv.SizeInBytes = sizeof(quad);
+ ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(buffer) + ib_offset;
+ ibv.SizeInBytes = sizeof(indices);
+ ibv.Format = DXGI_FORMAT_R32_UINT;
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 4, 1, 0, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12Resource_Release(buffer);
+ destroy_test_context(&context);
+}
+
+static void test_fragment_coords(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct test_context context;
+ struct resource_readback rb;
+ const struct vec4 *v = NULL;
+ struct vec4 expected = {0};
+ ID3D12CommandQueue *queue;
+ unsigned int i, x = 0, y;
+ ID3D12Resource *vb;
+ bool all_match;
+
+ static const DWORD vs_code[] =
+ {
+#if 0
+ void main(float4 in_position : POSITION, out float4 out_position : SV_POSITION)
+ {
+ out_position = in_position;
+ }
+#endif
+ 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040,
+ 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float4 main(float4 position: sv_position) : sv_target
+ {
+ return position;
+ }
+#endif
+ 0x43425844, 0xac408178, 0x2ca4213f, 0x4f2551e1, 0x1626b422, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x705f7673, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x745f7673, 0x65677261, 0xabab0074, 0x52444853, 0x0000003c, 0x00000040,
+ 0x0000000f, 0x04002064, 0x001010f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const struct vec4 vertices[] =
+ {
+ {-1.0f, -1.0f, 0.00f, 1.00f},
+ {-1.0f, 1.0f, 0.00f, 1.00f},
+ { 1.0f, -1.0f, 0.00f, 1.00f},
+ { 1.0f, 1.0f, 0.00f, 1.00f},
+
+ {-1.0f, -1.0f, 0.25f, 1.00f},
+ {-1.0f, 1.0f, 0.25f, 1.00f},
+ { 1.0f, -1.0f, 0.25f, 1.00f},
+ { 1.0f, 1.0f, 0.25f, 1.00f},
+
+ {-1.0f, -1.0f, 0.50f, 1.00f},
+ {-1.0f, 1.0f, 0.50f, 1.00f},
+ { 1.0f, -1.0f, 0.50f, 1.00f},
+ { 1.0f, 1.0f, 0.50f, 1.00f},
+
+ {-1.0f, -1.0f, 0.75f, 1.00f},
+ {-1.0f, 1.0f, 0.75f, 1.00f},
+ { 1.0f, -1.0f, 0.75f, 1.00f},
+ { 1.0f, 1.0f, 0.75f, 1.00f},
+
+ {-1.0f, -1.0f, 1.00f, 1.00f},
+ {-1.0f, 1.0f, 1.00f, 1.00f},
+ { 1.0f, -1.0f, 1.00f, 1.00f},
+ { 1.0f, 1.0f, 1.00f, 1.00f},
+
+ {-1.0f, -1.0f, 1.00f, 0.50f},
+ {-1.0f, 1.0f, 1.00f, 0.50f},
+ { 1.0f, -1.0f, 1.00f, 0.50f},
+ { 1.0f, 1.0f, 1.00f, 0.50f},
+
+ {-1.0f, -1.0f, 1.00f, 0.25f},
+ {-1.0f, 1.0f, 1.00f, 0.25f},
+ { 1.0f, -1.0f, 1.00f, 0.25f},
+ { 1.0f, 1.0f, 1.00f, 0.25f},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout);
+
+ vb = create_upload_buffer(context.device, sizeof(vertices), vertices);
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*vertices);
+ vbv.SizeInBytes = sizeof(vertices);
+
+ for (i = 0; i < ARRAY_SIZE(vertices) / 4; ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.0f, 1.0f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 4 * i, 0);
+
+ set_viewport(&context.viewport, 10.0f, 10.0f, 20.0f, 30.0f, 0.0f, 1.0f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 4 * i, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ all_match = true;
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ v = get_readback_vec4(&rb, x, y);
+ expected.x = x + 0.5f;
+ expected.y = y + 0.5f;
+ expected.z = vertices[4 * i].z / vertices[4 * i].w;
+ expected.w = vertices[4 * i].w;
+ if (!compare_vec4(v, &expected, 2))
+ {
+ all_match = false;
+ break;
+ }
+ }
+ if (!all_match)
+ break;
+ }
+ ok(all_match, "Got {%.8e, %.8e, %.8e, %.8e} expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n",
+ v->x, v->y, v->z, v->w, expected.x, expected.y, expected.z, expected.w, x, y);
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12Resource_Release(vb);
+ destroy_test_context(&context);
+}
+
+static void test_fractional_viewports(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ D3D12_VIEWPORT viewport;
+ unsigned int i, x, y;
+ ID3D12Resource *vb;
+
+ static const DWORD vs_code[] =
+ {
+#if 0
+ void main(in float4 in_position : POSITION,
+ in float2 in_texcoord : TEXCOORD,
+ out float4 position : SV_Position,
+ out float2 texcoord : TEXCOORD)
+ {
+ position = in_position;
+ texcoord = in_texcoord;
+ }
+#endif
+ 0x43425844, 0x4df282ca, 0x85c8bbfc, 0xd44ad19f, 0x1158be97, 0x00000001, 0x00000148, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000d8, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000303, 0x49534f50, 0x4e4f4954, 0x58455400, 0x524f4f43, 0xabab0044,
+ 0x4e47534f, 0x00000050, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000c03,
+ 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, 0xababab00, 0x52444853, 0x00000068,
+ 0x00010040, 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101032, 0x00000001,
+ 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x00102032, 0x00000001, 0x05000036,
+ 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102032, 0x00000001, 0x00101046,
+ 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float4 main(float4 position : SV_Position,
+ float2 texcoord : TEXCOORD) : SV_Target
+ {
+ return float4(position.xy, texcoord);
+ }
+#endif
+ 0x43425844, 0xa15616bc, 0x6862ab1c, 0x28b915c0, 0xdb0df67c, 0x00000001, 0x0000011c, 0x00000003,
+ 0x0000002c, 0x00000084, 0x000000b8, 0x4e475349, 0x00000050, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000303, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f,
+ 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000005c,
+ 0x00000040, 0x00000017, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03001062, 0x00101032,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00101046,
+ 0x00000000, 0x05000036, 0x001020c2, 0x00000000, 0x00101406, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const struct
+ {
+ struct vec2 position;
+ struct vec2 texcoord;
+ }
+ quad[] =
+ {
+ {{-1.0f, -1.0f}, {0.0f, 0.0f}},
+ {{-1.0f, 1.0f}, {0.0f, 1.0f}},
+ {{ 1.0f, -1.0f}, {1.0f, 0.0f}},
+ {{ 1.0f, 1.0f}, {1.0f, 1.0f}},
+ };
+ static const float viewport_offsets[] =
+ {
+ 0.0f, 1.0f / 2.0f, 1.0f / 4.0f, 1.0f / 8.0f, 1.0f / 16.0f, 1.0f / 32.0f,
+ 1.0f / 64.0f, 1.0f / 128.0f, 1.0f / 256.0f, 63.0f / 128.0f,
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_empty_root_signature(context.device,
+ D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT);
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, &vs, &ps, &input_layout);
+
+ vb = create_upload_buffer(context.device, sizeof(quad), quad);
+
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*quad);
+ vbv.SizeInBytes = sizeof(quad);
+
+ for (i = 0; i < ARRAY_SIZE(viewport_offsets); ++i)
+ {
+ set_viewport(&viewport, viewport_offsets[i], viewport_offsets[i],
+ context.render_target_desc.Width, context.render_target_desc.Height, 0.0f, 1.0f);
+
+ if (i)
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ const struct vec4 *v = get_readback_vec4(&rb, x, y);
+ struct vec4 expected = {x + 0.5f, y + 0.5f,
+ (x + 0.5f - viewport_offsets[i]) / context.render_target_desc.Width,
+ 1.0f - (y + 0.5f - viewport_offsets[i]) / context.render_target_desc.Height};
+ ok(compare_float(v->x, expected.x, 0) && compare_float(v->y, expected.y, 0),
+ "Got fragcoord {%.8e, %.8e}, expected {%.8e, %.8e} at (%u, %u), offset %.8e.\n",
+ v->x, v->y, expected.x, expected.y, x, y, viewport_offsets[i]);
+ ok(compare_float(v->z, expected.z, 2) && compare_float(v->w, expected.w, 2),
+ "Got texcoord {%.8e, %.8e}, expected {%.8e, %.8e} at (%u, %u), offset %.8e.\n",
+ v->z, v->w, expected.z, expected.w, x, y, viewport_offsets[i]);
+ }
+ }
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ }
+
+ ID3D12Resource_Release(vb);
+ destroy_test_context(&context);
+}
+
+static void test_scissor(void)
+{
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ unsigned int color;
+ RECT scissor_rect;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ return float4(0.0, 1.0, 0.0, 1.0);
+ }
+#endif
+ 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040,
+ 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002,
+ 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 640;
+ desc.rt_height = 480;
+ desc.ps = &ps;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ set_rect(&scissor_rect, 160, 120, 480, 360);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, red, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ color = get_readback_uint(&rb, 320, 60, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 80, 240, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 320, 240, 0);
+ ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 560, 240, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 320, 420, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ release_resource_readback(&rb);
+
+ destroy_test_context(&context);
+}
+
+static void test_draw_depth_no_ps(void)
+{
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ struct depth_stencil_resource ds;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *vb;
+ HRESULT hr;
+
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const struct
+ {
+ struct vec4 position;
+ }
+ quad[] =
+ {
+ {{-1.0f, -1.0f, 0.5f, 1.0f}},
+ {{-1.0f, 1.0f, 0.5f, 1.0f}},
+ {{ 1.0f, -1.0f, 0.5f, 1.0f}},
+ {{ 1.0f, 1.0f, 0.5f, 1.0f}},
+ };
+ static const DWORD vs_code[] =
+ {
+#if 0
+ void main(float4 in_position : POSITION, out float4 out_position : SV_POSITION)
+ {
+ out_position = in_position;
+ }
+#endif
+ 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040,
+ 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ vb = create_upload_buffer(context.device, sizeof(quad), quad);
+
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*quad);
+ vbv.SizeInBytes = sizeof(quad);
+
+ init_depth_stencil(&ds, context.device, 640, 480, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f);
+ set_rect(&context.scissor_rect, 0, 0, 640, 480);
+
+ context.root_signature = create_empty_root_signature(context.device,
+ D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT);
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ init_pipeline_state_desc(&pso_desc, context.root_signature, 0, &vs, NULL, &input_layout);
+ memset(&pso_desc.PS, 0, sizeof(pso_desc.PS));
+ pso_desc.NumRenderTargets = 0;
+ pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT;
+ pso_desc.DepthStencilState.DepthEnable = true;
+ pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL;
+ pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(ds.texture, 0, queue, command_list, 0.5f, 1);
+
+ destroy_depth_stencil(&ds);
+ ID3D12Resource_Release(vb);
+ destroy_test_context(&context);
+}
+
+static void test_draw_depth_only(void)
+{
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct depth_stencil_resource ds;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ unsigned int i, j;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float depth;
+
+ float main() : SV_Depth
+ {
+ return depth;
+ }
+#endif
+ 0x43425844, 0x91af6cd0, 0x7e884502, 0xcede4f54, 0x6f2c9326, 0x00000001, 0x000000b0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff,
+ 0x00000e01, 0x445f5653, 0x68747065, 0xababab00, 0x52444853, 0x00000038, 0x00000040, 0x0000000e,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x02000065, 0x0000c001, 0x05000036, 0x0000c001,
+ 0x0020800a, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const struct
+ {
+ float clear_depth;
+ float depth;
+ float expected_depth;
+ }
+ tests[] =
+ {
+ {0.0f, 0.0f, 0.0f},
+ {0.0f, 0.7f, 0.0f},
+ {0.0f, 0.8f, 0.0f},
+ {0.0f, 0.5f, 0.0f},
+
+ {1.0f, 0.0f, 0.0f},
+ {1.0f, 0.7f, 0.7f},
+ {1.0f, 0.8f, 0.8f},
+ {1.0f, 0.5f, 0.5f},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ init_depth_stencil(&ds, context.device, 640, 480, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f);
+ set_rect(&context.scissor_rect, 0, 0, 640, 480);
+
+ context.root_signature = create_32bit_constants_root_signature(context.device,
+ 0, 1, D3D12_SHADER_VISIBILITY_PIXEL);
+ init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL);
+ pso_desc.NumRenderTargets = 0;
+ pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT;
+ pso_desc.DepthStencilState.DepthEnable = true;
+ pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL;
+ pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_LESS;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(SUCCEEDED(hr), "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, tests[i].clear_depth, 0, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 1, &tests[i].depth, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(ds.texture, 0, queue, command_list, tests[i].expected_depth, 1);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ for (i = 0; i < 4; ++i)
+ {
+ for (j = 0; j < 4; ++j)
+ {
+ float depth = 1.0f / 16.0f * (j + 4 * i);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 1, &depth, 0);
+
+ set_viewport(&context.viewport, 160.0f * j, 120.0f * i, 160.0f, 120.0f, 0.0f, 1.0f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ }
+ }
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(ds.texture, 0, &rb, queue, command_list);
+ for (i = 0; i < 4; ++i)
+ {
+ for (j = 0; j < 4; ++j)
+ {
+ float obtained_depth, expected_depth;
+
+ obtained_depth = get_readback_float(&rb, 80 + j * 160, 60 + i * 120);
+ expected_depth = 1.0f / 16.0f * (j + 4 * i);
+ ok(compare_float(obtained_depth, expected_depth, 1),
+ "Got unexpected depth %.8e at (%u, %u), expected %.8e.\n",
+ obtained_depth, j, i, expected_depth);
+ }
+ }
+ release_resource_readback(&rb);
+
+ destroy_depth_stencil(&ds);
+ destroy_test_context(&context);
+}
+
+static void test_draw_uav_only(void)
+{
+ ID3D12DescriptorHeap *cpu_descriptor_heap, *descriptor_heap;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_range;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle;
+ D3D12_ROOT_PARAMETER root_parameter;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *resource;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ RWTexture2D<int> u;
+
+ void main()
+ {
+ InterlockedAdd(u[uint2(0, 0)], 1);
+ }
+#endif
+ 0x43425844, 0x237a8398, 0xe7b34c17, 0xa28c91a4, 0xb3614d73, 0x00000001, 0x0000009c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000048, 0x00000050, 0x00000012, 0x0100086a,
+ 0x0400189c, 0x0011e000, 0x00000000, 0x00003333, 0x0a0000ad, 0x0011e000, 0x00000000, 0x00004002,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004001, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float zero[4] = {0};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_range.NumDescriptors = 1;
+ descriptor_range.BaseShaderRegister = 0;
+ descriptor_range.RegisterSpace = 0;
+ descriptor_range.OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameter.DescriptorTable.NumDescriptorRanges = 1;
+ root_parameter.DescriptorTable.pDescriptorRanges = &descriptor_range;
+ root_parameter.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = &root_parameter;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_pipeline_state(context.device, context.root_signature, 0, NULL, &ps, NULL);
+
+ resource = create_default_texture(context.device, 1, 1, DXGI_FORMAT_R32_SINT,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ descriptor_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_descriptor_heap = create_cpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(descriptor_heap);
+ gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap);
+ ID3D12Device_CreateUnorderedAccessView(context.device, resource, NULL, NULL, cpu_handle);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(cpu_descriptor_heap);
+ ID3D12Device_CreateUnorderedAccessView(context.device, resource, NULL, NULL, cpu_handle);
+
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewFloat(command_list,
+ gpu_handle, cpu_handle, resource, zero, 0, NULL);
+
+ set_rect(&context.scissor_rect, 0, 0, 1000, 1000);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 1.0f, 100.0f, 0.0f, 0.0f);
+
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+
+ for (i = 0; i < 5; ++i)
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, resource,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ bug_if(is_radv_device(context.device))
+ check_sub_resource_uint(resource, 0, queue, command_list, 500, 0);
+
+ ID3D12DescriptorHeap_Release(cpu_descriptor_heap);
+ ID3D12DescriptorHeap_Release(descriptor_heap);
+ ID3D12Resource_Release(resource);
+ destroy_test_context(&context);
+}
+
+static void test_texture_resource_barriers(void)
+{
+ ID3D12CommandAllocator *command_allocator;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_RESOURCE_BARRIER barriers[8];
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *resource;
+ ID3D12Device *device;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list);
+ ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr);
+
+ resource = create_default_texture(device, 32, 32, DXGI_FORMAT_R8G8B8A8_UNORM,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COMMON);
+
+ barriers[0].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
+ barriers[0].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
+ barriers[0].Transition.pResource = resource;
+ barriers[0].Transition.Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES;
+ barriers[0].Transition.StateBefore = D3D12_RESOURCE_STATE_COMMON;
+ barriers[0].Transition.StateAfter = D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
+ ID3D12GraphicsCommandList_ResourceBarrier(command_list, 1, &barriers[0]);
+
+ barriers[1].Type = D3D12_RESOURCE_BARRIER_TYPE_UAV;
+ barriers[1].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
+ barriers[1].UAV.pResource = resource;
+ ID3D12GraphicsCommandList_ResourceBarrier(command_list, 1, &barriers[1]);
+
+ barriers[2].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
+ barriers[2].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
+ barriers[2].Transition.pResource = resource;
+ barriers[2].Transition.Subresource = 0;
+ barriers[2].Transition.StateBefore = D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
+ barriers[2].Transition.StateAfter = D3D12_RESOURCE_STATE_COPY_SOURCE;
+ ID3D12GraphicsCommandList_ResourceBarrier(command_list, 1, &barriers[2]);
+
+ barriers[3].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
+ barriers[3].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
+ barriers[3].Transition.pResource = resource;
+ barriers[3].Transition.Subresource = 0;
+ barriers[3].Transition.StateBefore = D3D12_RESOURCE_STATE_COPY_SOURCE;
+ barriers[3].Transition.StateAfter = D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE
+ | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE;
+ ID3D12GraphicsCommandList_ResourceBarrier(command_list, 1, &barriers[3]);
+
+ barriers[4].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
+ barriers[4].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
+ barriers[4].Transition.pResource = resource;
+ barriers[4].Transition.Subresource = 0;
+ barriers[4].Transition.StateBefore = D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE
+ | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE;
+ barriers[4].Transition.StateAfter = D3D12_RESOURCE_STATE_COPY_SOURCE;
+ ID3D12GraphicsCommandList_ResourceBarrier(command_list, 1, &barriers[4]);
+
+ barriers[5].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
+ barriers[5].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
+ barriers[5].Transition.pResource = resource;
+ barriers[5].Transition.Subresource = 0;
+ barriers[5].Transition.StateBefore = D3D12_RESOURCE_STATE_COPY_SOURCE;
+ barriers[5].Transition.StateAfter = D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
+ ID3D12GraphicsCommandList_ResourceBarrier(command_list, 1, &barriers[5]);
+
+ barriers[6].Type = D3D12_RESOURCE_BARRIER_TYPE_UAV;
+ barriers[6].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
+ barriers[6].UAV.pResource = resource;
+ ID3D12GraphicsCommandList_ResourceBarrier(command_list, 1, &barriers[6]);
+ ID3D12GraphicsCommandList_ResourceBarrier(command_list, 1, &barriers[6]);
+
+ barriers[7].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
+ barriers[7].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
+ barriers[7].Transition.pResource = resource;
+ barriers[7].Transition.Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES;
+ barriers[7].Transition.StateBefore = D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
+ barriers[7].Transition.StateAfter = D3D12_RESOURCE_STATE_COMMON;
+ ID3D12GraphicsCommandList_ResourceBarrier(command_list, 1, &barriers[7]);
+
+ ID3D12GraphicsCommandList_ResourceBarrier(command_list, 8, barriers);
+
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+ exec_command_list(queue, command_list);
+ wait_queue_idle(device, queue);
+
+ ID3D12GraphicsCommandList_Release(command_list);
+ ID3D12CommandAllocator_Release(command_allocator);
+ ID3D12Resource_Release(resource);
+ ID3D12CommandQueue_Release(queue);
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_device_removed_reason(void)
+{
+ D3D12_COMMAND_QUEUE_DESC command_queue_desc;
+ ID3D12CommandAllocator *command_allocator;
+ ID3D12GraphicsCommandList *command_list;
+ ID3D12CommandQueue *queue, *tmp_queue;
+ ID3D12Device *device;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ hr = ID3D12Device_GetDeviceRemovedReason(device);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;
+ command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL;
+ command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
+ command_queue_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc,
+ &IID_ID3D12CommandQueue, (void **)&queue);
+ ok(SUCCEEDED(hr), "Failed to create command queue, hr %#x.\n", hr);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list);
+ ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr);
+
+ /* Execute a command list in the recording state. */
+ exec_command_list(queue, command_list);
+
+ hr = ID3D12Device_GetDeviceRemovedReason(device);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc,
+ &IID_ID3D12CommandQueue, (void **)&tmp_queue);
+ todo ok(hr == DXGI_ERROR_DEVICE_REMOVED, "Got unexpected hr %#x.\n", hr);
+ if (SUCCEEDED(hr))
+ ID3D12CommandQueue_Release(tmp_queue);
+
+ hr = ID3D12Device_GetDeviceRemovedReason(device);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_Release(command_list);
+ ID3D12CommandAllocator_Release(command_allocator);
+ ID3D12CommandQueue_Release(queue);
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_map_resource(void)
+{
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_RESOURCE_DESC resource_desc;
+ ID3D12Resource *resource;
+ ID3D12Device *device;
+ ULONG refcount;
+ void *data;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 32;
+ resource_desc.Height = 32;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = 0;
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
+
+ /* Resources on a DEFAULT heap cannot be mapped. */
+ data = (void *)0xdeadbeef;
+ hr = ID3D12Resource_Map(resource, 0, NULL, &data);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data);
+
+ ID3D12Resource_Release(resource);
+
+ heap_properties.Type = D3D12_HEAP_TYPE_CUSTOM;
+ heap_properties.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE;
+ heap_properties.MemoryPoolPreference = D3D12_MEMORY_POOL_L0;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ if (FAILED(hr))
+ {
+ skip("Failed to create texture on custom heap.\n");
+ }
+ else
+ {
+ /* The data pointer must be NULL for the UNKNOWN layout. */
+ data = (void *)0xdeadbeef;
+ hr = ID3D12Resource_Map(resource, 0, NULL, &data);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data);
+
+ /* Texture on custom heaps can be mapped, but the address doesn't get disclosed to applications */
+ hr = ID3D12Resource_Map(resource, 0, NULL, NULL);
+ todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ID3D12Resource_Unmap(resource, 0, NULL);
+
+ ID3D12Resource_Release(resource);
+ }
+
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
+ resource_desc.Height = 1;
+ resource_desc.Format = DXGI_FORMAT_UNKNOWN;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr);
+
+ /* Resources on a DEFAULT heap cannot be mapped. */
+ data = (void *)0xdeadbeef;
+ hr = ID3D12Resource_Map(resource, 0, NULL, &data);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data);
+
+ ID3D12Resource_Release(resource);
+
+ heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL,
+ &IID_ID3D12Resource, (void **)&resource);
+ ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr);
+
+ data = NULL;
+ hr = ID3D12Resource_Map(resource, 0, NULL, &data);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(data, "Got NULL pointer.\n");
+ ID3D12Resource_Unmap(resource, 0, NULL);
+
+ data = (void *)0xdeadbeef;
+ hr = ID3D12Resource_Map(resource, 1, NULL, &data);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data);
+
+ data = NULL;
+ hr = ID3D12Resource_Map(resource, 0, NULL, &data);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(data, "Got NULL pointer.\n");
+ ID3D12Resource_Unmap(resource, 1, NULL);
+ ID3D12Resource_Unmap(resource, 0, NULL);
+
+ /* Passing NULL to Map should map, but not disclose the CPU VA to caller. */
+ hr = ID3D12Resource_Map(resource, 0, NULL, NULL);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ID3D12Resource_Unmap(resource, 0, NULL);
+
+ ID3D12Resource_Release(resource);
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_map_placed_resources(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ ID3D12GraphicsCommandList *command_list;
+ ID3D12Heap *upload_heap, *readback_heap;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ D3D12_RESOURCE_DESC resource_desc;
+ ID3D12Resource *readback_buffer;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12Resource *uav_buffer;
+ D3D12_HEAP_DESC heap_desc;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *cb[4];
+ uint32_t *cb_data[4];
+ ID3D12Device *device;
+ D3D12_RANGE range;
+ unsigned int i;
+ uint32_t *ptr;
+ HRESULT hr;
+
+ STATIC_ASSERT(ARRAY_SIZE(cb) == ARRAY_SIZE(cb_data));
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ uint offset;
+ uint value;
+
+ RWByteAddressBuffer u;
+
+ void main()
+ {
+ u.Store(offset, value);
+ }
+#endif
+ 0x43425844, 0x0dcbdd90, 0x7dad2857, 0x4ee149ee, 0x72a13d21, 0x00000001, 0x000000a4, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000050, 0x00000050, 0x00000014, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300009d, 0x0011e000, 0x00000000, 0x090000a6,
+ 0x0011e012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const uint32_t expected_values[] = {0xdead, 0xbeef, 0xfeed, 0xc0de};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[0].Descriptor.ShaderRegister = 0;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[1].Descriptor.ShaderRegister = 0;
+ root_parameters[1].Descriptor.RegisterSpace = 0;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_pipeline_state(device, context.root_signature, 0, NULL, &ps, NULL);
+
+ heap_desc.SizeInBytes = ARRAY_SIZE(cb) * D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+ memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties));
+ heap_desc.Properties.Type = D3D12_HEAP_TYPE_UPLOAD;
+ heap_desc.Alignment = 0;
+ heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
+ hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&upload_heap);
+ ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr);
+
+ heap_desc.SizeInBytes = 1024;
+ heap_desc.Properties.Type = D3D12_HEAP_TYPE_READBACK;
+ hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&readback_heap);
+ ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr);
+
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT;
+ resource_desc.Height = 1;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_UNKNOWN;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
+ resource_desc.Flags = 0;
+
+ for (i = 0; i < ARRAY_SIZE(cb); ++i)
+ {
+ hr = ID3D12Device_CreatePlacedResource(device, upload_heap,
+ i * D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT,
+ &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL,
+ &IID_ID3D12Resource, (void **)&cb[i]);
+ ok(hr == S_OK, "Failed to create placed resource %u, hr %#x.\n", i, hr);
+ }
+
+ resource_desc.Width = 1024;
+ hr = ID3D12Device_CreatePlacedResource(device, readback_heap, 0,
+ &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL,
+ &IID_ID3D12Resource, (void **)&readback_buffer);
+ ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr);
+
+ uav_buffer = create_default_buffer(device, resource_desc.Width,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ for (i = 0; i < ARRAY_SIZE(cb); ++i)
+ {
+ hr = ID3D12Resource_Map(cb[i], 0, NULL, (void **)&cb_data[i]);
+ ok(hr == S_OK, "Failed to map buffer %u, hr %#x.\n", i, hr);
+ }
+
+ hr = ID3D12Resource_Map(cb[0], 0, NULL, (void **)&ptr);
+ ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr);
+ ok(ptr == cb_data[0], "Got map ptr %p, expected %p.\n", ptr, cb_data[0]);
+ cb_data[0][0] = 0;
+ cb_data[0][1] = expected_values[0];
+ ID3D12Resource_Unmap(cb[0], 0, NULL);
+ ID3D12Resource_Unmap(cb[0], 0, NULL);
+ cb_data[0] = NULL;
+
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetGraphicsRootUnorderedAccessView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(uav_buffer));
+
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb[0]));
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb[2]));
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ cb_data[2][0] = 4;
+ cb_data[2][1] = expected_values[1];
+
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb[1]));
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ cb_data[1][0] = 8;
+ cb_data[1][1] = expected_values[2];
+
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb[3]));
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ cb_data[3][0] = 12;
+ cb_data[3][1] = expected_values[3];
+ range.Begin = 0;
+ range.End = 2 * sizeof(uint32_t);
+ ID3D12Resource_Unmap(cb[3], 0, &range);
+ cb_data[3] = NULL;
+
+ transition_resource_state(command_list, uav_buffer,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ ID3D12GraphicsCommandList_CopyResource(command_list, readback_buffer, uav_buffer);
+
+ get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < ARRAY_SIZE(expected_values); ++i)
+ {
+ unsigned int value = get_readback_uint(&rb, i, 0, 0);
+ ok(value == expected_values[i], "Got %#x, expected %#x at %u.\n", value, expected_values[i], i);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(uav_buffer);
+ ID3D12Resource_Release(readback_buffer);
+ ID3D12Heap_Release(upload_heap);
+ ID3D12Heap_Release(readback_heap);
+ for (i = 0; i < ARRAY_SIZE(cb); ++i)
+ ID3D12Resource_Release(cb[i]);
+ destroy_test_context(&context);
+}
+
+static void test_bundle_state_inheritance(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList *command_list, *bundle;
+ ID3D12CommandAllocator *bundle_allocator;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int x, y;
+ HRESULT hr;
+
+ if (!vkd3d_test_platform_is_windows())
+ {
+ /* FIXME: Avoid 2048 test todos. */
+ skip("Bundles are not implemented yet.\n");
+ return;
+ }
+
+ if (use_warp_device)
+ {
+ skip("Bundle state inheritance test crashes on WARP.\n");
+ return;
+ }
+
+ if (!init_test_context(&context, NULL))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_BUNDLE,
+ &IID_ID3D12CommandAllocator, (void **)&bundle_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_BUNDLE,
+ bundle_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&bundle);
+ ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr);
+
+ /* A bundle does not inherit the current pipeline state. */
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_DrawInstanced(bundle, 3, 1, 0, 0);
+ hr = ID3D12GraphicsCommandList_Close(bundle);
+ ok(SUCCEEDED(hr), "Failed to close bundle, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ExecuteBundle(command_list, bundle);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ unsigned int v = get_readback_uint(&rb, x, y, 0);
+ /* This works on AMD. */
+ ok(v == 0xffffffff || v == 0xff00ff00, "Got unexpected value 0x%08x at (%u, %u).\n", v, x, y);
+ }
+ }
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ reset_command_list(bundle, bundle_allocator);
+
+ /* A bundle does not inherit the current primitive topology. */
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetPipelineState(bundle, context.pipeline_state);
+ ID3D12GraphicsCommandList_DrawInstanced(bundle, 3, 1, 0, 0);
+ hr = ID3D12GraphicsCommandList_Close(bundle);
+ ok(SUCCEEDED(hr), "Failed to close bundle, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ExecuteBundle(command_list, bundle);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ unsigned int v = get_readback_uint(&rb, x, y, 0);
+ /* This works on AMD, even though the debug layer says that the primitive topology is undefined. */
+ ok(v == 0xffffffff || v == 0xff00ff00, "Got unexpected value 0x%08x at (%u, %u).\n", v, x, y);
+ }
+ }
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ reset_command_list(bundle, bundle_allocator);
+
+ /* A bundle inherit all other states. */
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetPipelineState(bundle, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(bundle, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_DrawInstanced(bundle, 3, 1, 0, 0);
+ hr = ID3D12GraphicsCommandList_Close(bundle);
+ ok(SUCCEEDED(hr), "Failed to close bundle, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ExecuteBundle(command_list, bundle);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+ reset_command_list(bundle, bundle_allocator);
+
+ /* All state that is set in a bundle affects a command list. */
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(bundle, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(bundle, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(bundle, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ hr = ID3D12GraphicsCommandList_Close(bundle);
+ ok(SUCCEEDED(hr), "Failed to close bundle, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ExecuteBundle(command_list, bundle);
+
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12CommandAllocator_Release(bundle_allocator);
+ ID3D12GraphicsCommandList_Release(bundle);
+ destroy_test_context(&context);
+}
+
+static void test_shader_instructions(void)
+{
+ struct named_shader
+ {
+ const char *name;
+ const void *code;
+ size_t size;
+ };
+
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList *command_list;
+ const struct named_shader *current_ps;
+ struct test_context_desc desc;
+ D3D12_SHADER_BYTECODE shader;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *cb;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD ps_div_code[] =
+ {
+#if 0
+ float4 src0;
+ float4 src1;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst.x = src0.x / src1.x;
+ dst.yzw = (float3)0;
+ }
+#endif
+ 0x43425844, 0x19578813, 0xb1e4de1e, 0x3adee1dc, 0x478cd5d3, 0x00000001, 0x000000e8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0900000e, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x0100003e,
+ };
+ static const struct named_shader ps_div = {"div", ps_div_code, sizeof(ps_div_code)};
+ static const DWORD ps_dot2_code[] =
+ {
+#if 0
+ float4 src0;
+ float4 src1;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst.x = dot(src0.xy, src1.xy);
+ dst.yzw = (float3)0;
+ }
+#endif
+ 0x43425844, 0x3621a1c7, 0x79d3be21, 0x9f14138c, 0x9f5506f2, 0x00000001, 0x000000e8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0900000f, 0x00102012, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x00208046, 0x00000000,
+ 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_dot2 = {"dot2", ps_dot2_code, sizeof(ps_dot2_code)};
+ static const DWORD ps_dot3_code[] =
+ {
+#if 0
+ float4 src0;
+ float3 src1;
+
+ float4 main() : SV_Target
+ {
+ return dot(src0, src1);
+ }
+#endif
+ 0x43425844, 0xa75a4a95, 0x5d09936e, 0xdc5c694f, 0x68b6b04f, 0x00000001, 0x000000c8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000050, 0x00000050, 0x00000014,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x09000010, 0x001020f2, 0x00000000, 0x00208246, 0x00000000, 0x00000000, 0x00208246, 0x00000000,
+ 0x00000001, 0x0100003e,
+ };
+ static struct named_shader ps_dot3 = {"dot3", ps_dot3_code, sizeof(ps_dot3_code)};
+ static const DWORD ps_eq_code[] =
+ {
+#if 0
+ float4 src0;
+ float4 src1;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst = (uint4)0;
+ if (src0.x == src1.x)
+ dst.x = asfloat(0xffffffff);
+ }
+#endif
+ 0x43425844, 0x7bce1728, 0xa7d5d0f0, 0xaef5bc00, 0x7bb6b161, 0x00000001, 0x000000e8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x09000018, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_eq = {"eq", ps_eq_code, sizeof(ps_eq_code)};
+ static const DWORD ps_ne_code[] =
+ {
+#if 0
+ float4 src0;
+ float4 src1;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst = (uint4)0;
+ if (src0.x != src1.x)
+ dst.x = asfloat(0xffffffff);
+ }
+#endif
+ 0x43425844, 0x5bbb7f90, 0x1a44971c, 0x4ee3d92e, 0x149ceecf, 0x00000001, 0x000000e8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x09000039, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_ne = {"ne", ps_ne_code, sizeof(ps_ne_code)};
+ static const DWORD ps_if_code[] =
+ {
+ /* compiled with /Gfp option */
+#if 0
+ float4 src0;
+
+ void main(out float4 dst : SV_Target)
+ {
+ if (src0.x)
+ dst = float4(0, 1, 0, 1);
+ else
+ dst = float4(1, 0, 0, 1);
+ }
+#endif
+ 0x43425844, 0xfe5b6a47, 0x123f8934, 0xfa5910fe, 0x497aad93, 0x00000001, 0x0000012c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000b4, 0x00000050, 0x0000002d,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x0b000039, 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0304001f, 0x0010000a, 0x00000000,
+ 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000,
+ 0x01000012, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000,
+ 0x3f800000, 0x01000015, 0x0100003e
+ };
+ static struct named_shader ps_if = {"if", ps_if_code, sizeof(ps_if_code)};
+ static const DWORD ps_if_return_code[] =
+ {
+#if 0
+ float4 src0;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst = (float4)0;
+ if (src0.x < 4)
+ return;
+ dst.x = 1;
+ if (src0.y < 4)
+ return;
+ dst.y = 1;
+ if (src0.z >= 4)
+ return;
+ dst.z = 1;
+ if (src0.w <= src0.x)
+ return;
+ dst.w = 1;
+ }
+#endif
+ 0x43425844, 0xa2797349, 0xd0a60aee, 0x7ae89f23, 0xf9681bfe, 0x00000001, 0x00000220, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000001a8, 0x00000050, 0x0000006a,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x08000031, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000,
+ 0x00004001, 0x40800000, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, 0x01000015, 0x08000031,
+ 0x00100012, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x00004001, 0x40800000, 0x0304001f,
+ 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000,
+ 0x00000000, 0x00000000, 0x0100003e, 0x01000015, 0x0800001d, 0x00100012, 0x00000000, 0x0020802a,
+ 0x00000000, 0x00000000, 0x00004001, 0x40800000, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036,
+ 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x00000000, 0x00000000, 0x0100003e,
+ 0x01000015, 0x0900001d, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020803a,
+ 0x00000000, 0x00000000, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000,
+ 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x00000000, 0x0100003e, 0x01000015, 0x08000036,
+ 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e,
+ };
+ static struct named_shader ps_if_return = {"if_return", ps_if_return_code, sizeof(ps_if_return_code)};
+ static const DWORD ps_nested_if_code[] =
+ {
+ /* compiled with /Gfp option */
+#if 0
+ float4 src0;
+
+ void main(out float4 dst : SV_Target)
+ {
+ if (src0.x)
+ {
+ if (src0.y)
+ dst = float4(0, 1, 0, 1);
+ else
+ dst = float4(0, 0, 1, 1);
+ }
+ else
+ {
+ if (src0.z)
+ dst = float4(1, 0, 0, 1);
+ else
+ dst = float4(0, 0, 0, 1);
+ }
+ }
+#endif
+ 0x43425844, 0x35e50e88, 0x68c45bdd, 0x0dc60de1, 0x4bc29735, 0x00000001, 0x000001ec, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000174, 0x00000050, 0x0000005d,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x0b000039, 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0304001f, 0x0010000a, 0x00000000,
+ 0x0b000039, 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x0020801a, 0x00000000, 0x00000000, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2,
+ 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x01000012, 0x08000036,
+ 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 0x01000015,
+ 0x01000012, 0x0b000039, 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x0020802a, 0x00000000, 0x00000000, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036,
+ 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x01000012,
+ 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000,
+ 0x01000015, 0x01000015, 0x0100003e,
+ };
+ static struct named_shader ps_nested_if = {"nested_if", ps_nested_if_code, sizeof(ps_nested_if_code)};
+ static const DWORD ps_loop_break_code[] =
+ {
+#if 0
+ float4 src0;
+
+ void main(out float4 dst : SV_Target)
+ {
+ float tmp = 0.0f;
+ for (int i = 0; i < src0.x; ++i)
+ {
+ if (i == src0.y)
+ {
+ tmp = 1.0f;
+ break;
+ }
+ tmp += 1.0f;
+ }
+
+ dst = float4(tmp, 0, 0, 0);
+ }
+#endif
+ 0x43425844, 0xbd9dabbd, 0xe56cab2a, 0xfd37cd76, 0x5dd181c4, 0x00000001, 0x000001c8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000150, 0x00000050, 0x00000054,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x08000036, 0x00100032, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x01000030, 0x0500002b, 0x00100042, 0x00000000, 0x0010001a, 0x00000000,
+ 0x0800001d, 0x00100082, 0x00000000, 0x0010002a, 0x00000000, 0x0020800a, 0x00000000, 0x00000000,
+ 0x03040003, 0x0010003a, 0x00000000, 0x08000018, 0x00100042, 0x00000000, 0x0010002a, 0x00000000,
+ 0x0020801a, 0x00000000, 0x00000000, 0x0304001f, 0x0010002a, 0x00000000, 0x05000036, 0x00100012,
+ 0x00000000, 0x00004001, 0x3f800000, 0x01000002, 0x01000015, 0x07000000, 0x00100012, 0x00000000,
+ 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0700001e, 0x00100022, 0x00000000, 0x0010001a,
+ 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x05000036, 0x00102012, 0x00000000, 0x0010000a,
+ 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_loop_break = {"loop_break", ps_loop_break_code, sizeof(ps_loop_break_code)};
+ static const DWORD ps_loop_ret_code[] =
+ {
+#if 0
+ float4 src0;
+
+ void main(out float4 dst : SV_Target)
+ {
+ float tmp = 0.0f;
+ for (int i = 0; i < src0.x; ++i)
+ {
+ if (i == src0.y)
+ {
+ dst = 1;
+ return;
+ }
+ tmp += 1.0f;
+ }
+
+ dst = float4(tmp, 0, 0, 0);
+ }
+#endif
+ 0x43425844, 0xb327003a, 0x5812a5f6, 0xb5a78d54, 0xa72a8db8, 0x00000001, 0x000001d4, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000015c, 0x00000050, 0x00000057,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x08000036, 0x00100032, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x01000030, 0x0500002b, 0x00100042, 0x00000000, 0x0010001a, 0x00000000,
+ 0x0800001d, 0x00100082, 0x00000000, 0x0010002a, 0x00000000, 0x0020800a, 0x00000000, 0x00000000,
+ 0x03040003, 0x0010003a, 0x00000000, 0x08000018, 0x00100042, 0x00000000, 0x0010002a, 0x00000000,
+ 0x0020801a, 0x00000000, 0x00000000, 0x0304001f, 0x0010002a, 0x00000000, 0x08000036, 0x001020f2,
+ 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, 0x01000015,
+ 0x07000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0700001e,
+ 0x00100022, 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x05000036,
+ 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_loop_ret = {"loop_ret", ps_loop_ret_code, sizeof(ps_loop_ret_code)};
+ static const DWORD ps_breakc_nz_code[] =
+ {
+#if 0
+ float4 main() : SV_TARGET
+ {
+ uint counter = 0;
+
+ for (uint i = 0; i < 255; ++i)
+ ++counter;
+
+ if (counter == 255)
+ return float4(0.0f, 1.0f, 0.0f, 1.0f);
+ else
+ return float4(1.0f, 0.0f, 0.0f, 1.0f);
+ }
+#endif
+ 0x43425844, 0x065ac80a, 0x24369e7e, 0x218d5dc1, 0x3532868c, 0x00000001, 0x00000188, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000110, 0x00000040, 0x00000044,
+ 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x08000036, 0x00100032, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000030, 0x07000050, 0x00100042,
+ 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a, 0x00000000,
+ 0x0a00001e, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x00000001, 0x00000001,
+ 0x00000000, 0x00000000, 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000,
+ 0x00004001, 0x000000ff, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000,
+ 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036,
+ 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e,
+ 0x01000015, 0x0100003e,
+ };
+ static struct named_shader ps_breakc_nz = {"breakc_nz", ps_breakc_nz_code, sizeof(ps_breakc_nz_code)};
+ static const DWORD ps_breakc_z_code[] =
+ {
+#if 0
+ float4 main() : SV_TARGET
+ {
+ uint counter = 0;
+
+ for (int i = 0, j = 254; i < 255 && j >= 0; ++i, --j)
+ ++counter;
+
+ if (counter == 255)
+ return float4(0.0f, 1.0f, 0.0f, 1.0f);
+ else
+ return float4(1.0f, 0.0f, 0.0f, 1.0f);
+ }
+#endif
+ 0x43425844, 0x687406ef, 0x7bdeb7d1, 0xb3282292, 0x934a9101, 0x00000001, 0x000001c0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000148, 0x00000040, 0x00000052,
+ 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x08000036, 0x00100072, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x000000fe, 0x00000000, 0x01000030, 0x07000022, 0x00100082,
+ 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x07000021, 0x00100012, 0x00000001,
+ 0x0010002a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100082, 0x00000000, 0x0010003a,
+ 0x00000000, 0x0010000a, 0x00000001, 0x03000003, 0x0010003a, 0x00000000, 0x0a00001e, 0x00100072,
+ 0x00000000, 0x00100246, 0x00000000, 0x00004002, 0x00000001, 0x00000001, 0xffffffff, 0x00000000,
+ 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x000000ff,
+ 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000,
+ 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, 0x001020f2, 0x00000000,
+ 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0100003e,
+ };
+ static struct named_shader ps_breakc_z = {"breakc_z", ps_breakc_z_code, sizeof(ps_breakc_z_code)};
+ static const DWORD ps_continue_code[] =
+ {
+#if 0
+ float4 main() : SV_TARGET
+ {
+ uint counter = 0;
+
+ for (uint i = 0; i < 255; ++i)
+ {
+ if (i == 10)
+ continue;
+ ++counter;
+ }
+
+ return float4(counter, 0.0f, 0.0f, 0.0f);
+ }
+#endif
+ 0x43425844, 0x8cab8e1f, 0x527560f9, 0x04eb888b, 0x20d89b05, 0x00000001, 0x000001c4, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x58454853, 0x0000014c, 0x00000050, 0x00000053,
+ 0x0100086a, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x05000036, 0x00100022,
+ 0x00000000, 0x00004001, 0x0000000b, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x01000030, 0x07000050, 0x00100012, 0x00000001, 0x0010002a,
+ 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010000a, 0x00000001, 0x07000020, 0x00100012,
+ 0x00000001, 0x0010002a, 0x00000000, 0x00004001, 0x0000000a, 0x0304001f, 0x0010000a, 0x00000001,
+ 0x05000036, 0x00100012, 0x00000000, 0x0010003a, 0x00000000, 0x05000036, 0x001000c2, 0x00000000,
+ 0x00100156, 0x00000000, 0x01000007, 0x01000015, 0x0700001e, 0x00100082, 0x00000000, 0x0010003a,
+ 0x00000000, 0x00004001, 0x00000001, 0x0700001e, 0x00100042, 0x00000000, 0x0010002a, 0x00000000,
+ 0x00004001, 0x00000001, 0x01000016, 0x05000056, 0x00102012, 0x00000000, 0x0010003a, 0x00000000,
+ 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x0100003e,
+ };
+ static struct named_shader ps_continue = {"continue", ps_continue_code, sizeof(ps_continue_code)};
+ static const DWORD ps_continuec_nz_code[] =
+ {
+#if 0
+ float4 main() : SV_TARGET
+ {
+ uint counter = 0;
+
+ for (uint i = 0; i < 255; ++i)
+ {
+ ++counter;
+ if (i % 2 == 0)
+ continue;
+ ++counter;
+ if (i != 0)
+ continue;
+ ++counter;
+ }
+
+ return float4(counter, 0.0f, 0.0f, 0.0f);
+ }
+#endif
+ /* compiled with /Gfa */
+ 0x43425844, 0xf35d8ce6, 0x54988f56, 0x5848863e, 0xa1618498, 0x00000001, 0x00000278, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x58454853, 0x00000200, 0x00000050, 0x00000080,
+ 0x0100086a, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x08000036, 0x00100032,
+ 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000030, 0x07000050,
+ 0x00100042, 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a,
+ 0x00000000, 0x0700001e, 0x00100042, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000001,
+ 0x07000001, 0x00100082, 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x0700001e,
+ 0x00100012, 0x00000001, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x09000037, 0x00100022,
+ 0x00000001, 0x0010003a, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000001, 0x05000036,
+ 0x00100012, 0x00000000, 0x0010002a, 0x00000000, 0x05000036, 0x00100022, 0x00000000, 0x0010001a,
+ 0x00000001, 0x03000008, 0x0010003a, 0x00000000, 0x0700001e, 0x00100042, 0x00000000, 0x0010000a,
+ 0x00000000, 0x00004001, 0x00000002, 0x07000027, 0x00100082, 0x00000000, 0x0010001a, 0x00000000,
+ 0x00004001, 0x00000000, 0x09000037, 0x00100022, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a,
+ 0x00000001, 0x00004001, 0x00000000, 0x05000036, 0x00100032, 0x00000000, 0x00100a66, 0x00000000,
+ 0x03040008, 0x0010003a, 0x00000000, 0x0700001e, 0x00100012, 0x00000000, 0x0010000a, 0x00000000,
+ 0x00004001, 0x00000003, 0x05000036, 0x00100022, 0x00000000, 0x0010000a, 0x00000001, 0x01000016,
+ 0x05000056, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_continuec_nz = {"continuec_nz", ps_continuec_nz_code, sizeof(ps_continuec_nz_code)};
+ static const DWORD ps_retc_nz_code[] =
+ {
+#if 0
+ float src;
+
+ float4 main() : SV_TARGET
+ {
+ for (int i = 0; i < 255; ++i)
+ {
+ if (i == src)
+ return float4(1, 0, 0, 0);
+ }
+
+ return 0;
+ }
+#endif
+ /* compiled with /Gfa */
+ 0x43425844, 0xf829c302, 0xf21361cb, 0x963b87e9, 0x92f9470e, 0x00000001, 0x00000188, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000110, 0x00000040, 0x00000044,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068,
+ 0x00000001, 0x05000036, 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000021,
+ 0x00100022, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010001a,
+ 0x00000000, 0x0500002b, 0x00100022, 0x00000000, 0x0010000a, 0x00000000, 0x08000018, 0x00100022,
+ 0x00000000, 0x0010001a, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2,
+ 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x0304003f, 0x0010001a,
+ 0x00000000, 0x0700001e, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000001,
+ 0x01000016, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_retc_nz = {"retc_nz", ps_retc_nz_code, sizeof(ps_retc_nz_code)};
+ static const DWORD ps_src_modifiers_code[] =
+ {
+#if 0
+ float4 src0;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst.x = -src0.x;
+ dst.y = abs(src0.y);
+ dst.zw = -abs(src0.zw);
+ }
+#endif
+ 0x43425844, 0xa5f66fa8, 0xd430e547, 0x1cd28240, 0xaf5bc0f4, 0x00000001, 0x000000f8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000080, 0x00000050, 0x00000020,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x07000036, 0x00102012, 0x00000000, 0x8020800a, 0x00000041, 0x00000000, 0x00000000, 0x07000036,
+ 0x00102022, 0x00000000, 0x8020801a, 0x00000081, 0x00000000, 0x00000000, 0x07000036, 0x001020c2,
+ 0x00000000, 0x80208ea6, 0x000000c1, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_src_modifiers = {"src_modifiers", ps_src_modifiers_code, sizeof(ps_src_modifiers_code)};
+ static const DWORD ps_sat_code[] =
+ {
+#if 0
+ float4 src;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst = clamp(src, 0, 1);
+ }
+#endif
+ 0x43425844, 0x50af2f8b, 0xaadad7cd, 0x77815f01, 0x612ec066, 0x00000001, 0x000000bc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, 0x00000011,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x06002036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_sat = {"sat", ps_sat_code, sizeof(ps_sat_code)};
+ static const DWORD ps_min_max_code[] =
+ {
+#if 0
+ float4 src0;
+ float4 src1;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst = (float4)0;
+ dst.x = min(src0.x, src1.x);
+ dst.y = max(src0.x, src1.x);
+ }
+#endif
+ 0x43425844, 0xb570ee39, 0xcf84fe48, 0x7fa59ede, 0x6151def2, 0x00000001, 0x0000010c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000094, 0x00000050, 0x00000025,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x09000033, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000001, 0x09000034, 0x00102022, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020800a,
+ 0x00000000, 0x00000001, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_min_max = {"min_max", ps_min_max_code, sizeof(ps_min_max_code)};
+ static const DWORD ps_ftou_code[] =
+ {
+#if 0
+ float src;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst = asfloat(uint4(src, -src, 0, 0));
+ }
+#endif
+ 0x43425844, 0x7a61c2fa, 0x4f20de14, 0x3492a5ae, 0x0a1fdc98, 0x00000001, 0x000000f8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000080, 0x00000050, 0x00000020,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0600001c, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0700001c, 0x00102022,
+ 0x00000000, 0x8020800a, 0x00000041, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_ftou = {"ftou", ps_ftou_code, sizeof(ps_ftou_code)};
+ static const DWORD ps_ftoi_code[] =
+ {
+#if 0
+ float src;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst = asfloat(int4(src, -src, 0, 0));
+ }
+#endif
+ 0x43425844, 0x2737f059, 0x5a2faecc, 0x7eab1956, 0xf96357b5, 0x00000001, 0x000000f8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000080, 0x00000050, 0x00000020,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0600001b, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0700001b, 0x00102022,
+ 0x00000000, 0x8020800a, 0x00000041, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_ftoi = {"ftoi", ps_ftoi_code, sizeof(ps_ftoi_code)};
+ static const DWORD ps_round_code[] =
+ {
+#if 0
+ float src0;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst.x = floor(src0);
+ dst.y = ceil(src0);
+ dst.z = trunc(src0);
+ dst.w = 0;
+ }
+#endif
+ 0x43425844, 0x44e2c554, 0x216a8c83, 0x87e90dd8, 0x3fde3e57, 0x00000001, 0x00000100, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000088, 0x00000050, 0x00000022,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x06000041, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000042, 0x00102022,
+ 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000043, 0x00102042, 0x00000000, 0x0020800a,
+ 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_round = {"round", ps_round_code, sizeof(ps_round_code)};
+ static const DWORD ps_round_ne_code[] =
+ {
+#if 0
+ float4 src0;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst = round(src0);
+ }
+#endif
+ 0x43425844, 0xa2be1ad3, 0xf1389007, 0xc8221829, 0xcbef8ed0, 0x00000001, 0x000000bc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, 0x00000011,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x06000040, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_round_ne = {"round_ne", ps_round_ne_code, sizeof(ps_round_ne_code)};
+ static const DWORD ps_frc_code[] =
+ {
+#if 0
+ float src;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst = 0;
+ dst.x = frac(src);
+ dst.y = frac(-src);
+ }
+#endif
+ 0x43425844, 0xd52bc741, 0xda411d9a, 0x199054a2, 0x7461462d, 0x00000001, 0x000000f8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000080, 0x00000050, 0x00000020,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0600001a, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0700001a, 0x00102022,
+ 0x00000000, 0x8020800a, 0x00000041, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_frc = {"frc", ps_frc_code, sizeof(ps_frc_code)};
+ static const DWORD ps_exp_code[] =
+ {
+#if 0
+ float src;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst = 0;
+ dst.x = exp2(src);
+ }
+#endif
+ 0x43425844, 0xa742b300, 0x10b64393, 0x7827fc4a, 0x328b8db5, 0x00000001, 0x000000dc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, 0x00000019,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x06000019, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020e2,
+ 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_exp = {"exp", ps_exp_code, sizeof(ps_exp_code)};
+ static const DWORD ps_log_code[] =
+ {
+#if 0
+ float src;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst = 0;
+ dst.x = log2(src);
+ }
+#endif
+ 0x43425844, 0x2f1cc195, 0x6cc7d061, 0xe63df3b1, 0x9c68b968, 0x00000001, 0x000000dc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, 0x00000019,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0600002f, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020e2,
+ 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_log = {"log", ps_log_code, sizeof(ps_log_code)};
+ static const DWORD ps_rcp_code[] =
+ {
+#if 0
+ float4 src;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst = 0;
+ dst.x = rcp(src.x);
+ }
+#endif
+ 0x43425844, 0x3b0ab43e, 0xff4dcb50, 0x22531bf6, 0xe44bbc8c, 0x00000001, 0x000000dc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, 0x00000019,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x06000081, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020e2,
+ 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_rcp = {"rcp", ps_rcp_code, sizeof(ps_rcp_code)};
+ static const DWORD ps_rcp_vector_code[] =
+ {
+#if 0
+ float4 src;
+
+ void main(out float4 dst : SV_Target)
+ {
+ dst.xyzw = rcp(src.xyzw);
+ }
+#endif
+ 0x43425844, 0x4952e20e, 0x859b9f18, 0x7a31907a, 0x3f1cc4af, 0x00000001, 0x000000bc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, 0x00000011,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x06000081, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_rcp_vector = {"rcp_vector", ps_rcp_vector_code, sizeof(ps_rcp_vector_code)};
+ static const DWORD ps_sincos_code[] =
+ {
+#if 0
+ float2 src0;
+
+ void main(out float4 dst : SV_Target)
+ {
+ sincos(src0, dst.xy, dst.zw);
+ }
+#endif
+ 0x43425844, 0xb47a22ec, 0xdb165106, 0xeee971d7, 0x8836fcc0, 0x00000001, 0x000000dc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, 0x00000019,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0700004d, 0x00102032, 0x00000000, 0x0000d000, 0x00208046, 0x00000000, 0x00000000, 0x0700004d,
+ 0x0000d000, 0x001020c2, 0x00000000, 0x00208406, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_sincos = {"sincos", ps_sincos_code, sizeof(ps_sincos_code)};
+ static const DWORD ps_indexable_temp_code[] =
+ {
+#if 0
+ float index;
+
+ float4 main() : SV_Target
+ {
+ float4 colors[] =
+ {
+ float4(1.0f, 0.0f, 0.0f, 1.0f),
+ float4(0.0f, 1.0f, 0.0f, 1.0f),
+ float4(0.0f, 0.0f, 1.0f, 1.0f),
+ };
+ return colors[index];
+ }
+#endif
+ 0x43425844, 0x82c65bbb, 0x5b713473, 0xa16ebe60, 0xdcc329be, 0x00000001, 0x00000170, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f8, 0x00000050, 0x0000003e,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x04000069, 0x00000000, 0x00000003, 0x00000004, 0x09000036, 0x00203072,
+ 0x00000000, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x09000036,
+ 0x00203072, 0x00000000, 0x00000001, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x00000000,
+ 0x09000036, 0x00203072, 0x00000000, 0x00000002, 0x00004002, 0x00000000, 0x00000000, 0x3f800000,
+ 0x00000000, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x07000036,
+ 0x00102072, 0x00000000, 0x04203246, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102082,
+ 0x00000000, 0x00004001, 0x3f800000, 0x0100003e,
+ };
+ static struct named_shader ps_indexable_temp = {"indexable_temp", ps_indexable_temp_code, sizeof(ps_indexable_temp_code)};
+ static const DWORD ps_indexable_temp2_code[] =
+ {
+#if 0
+ float index;
+
+ float4 main() : SV_Target
+ {
+ uint remap[] = {0, 1, 2, 2, 1, 0, 1, 1, 2, 2};
+ float4 colors[] =
+ {
+ float4(1.0f, 0.0f, 0.0f, 1.0f),
+ float4(0.0f, 1.0f, 0.0f, 1.0f),
+ float4(0.0f, 0.0f, 1.0f, 1.0f),
+ };
+ return colors[remap[index]];
+ }
+#endif
+ 0x43425844, 0xcacc5b8f, 0x19bb905e, 0x6af8eae1, 0x80654684, 0x00000001, 0x0000028c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000214, 0x00000050, 0x00000085,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x04000069, 0x00000000, 0x0000000a, 0x00000004, 0x04000069, 0x00000001,
+ 0x00000003, 0x00000004, 0x06000036, 0x00203012, 0x00000000, 0x00000000, 0x00004001, 0x00000000,
+ 0x06000036, 0x00203012, 0x00000000, 0x00000001, 0x00004001, 0x00000001, 0x06000036, 0x00203012,
+ 0x00000000, 0x00000002, 0x00004001, 0x00000002, 0x06000036, 0x00203012, 0x00000000, 0x00000003,
+ 0x00004001, 0x00000002, 0x06000036, 0x00203012, 0x00000000, 0x00000004, 0x00004001, 0x00000001,
+ 0x06000036, 0x00203012, 0x00000000, 0x00000005, 0x00004001, 0x00000000, 0x06000036, 0x00203012,
+ 0x00000000, 0x00000006, 0x00004001, 0x00000001, 0x06000036, 0x00203012, 0x00000000, 0x00000007,
+ 0x00004001, 0x00000001, 0x06000036, 0x00203012, 0x00000000, 0x00000008, 0x00004001, 0x00000002,
+ 0x06000036, 0x00203012, 0x00000000, 0x00000009, 0x00004001, 0x00000002, 0x09000036, 0x00203072,
+ 0x00000001, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x09000036,
+ 0x00203072, 0x00000001, 0x00000001, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x00000000,
+ 0x09000036, 0x00203072, 0x00000001, 0x00000002, 0x00004002, 0x00000000, 0x00000000, 0x3f800000,
+ 0x00000000, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x07000036,
+ 0x00100012, 0x00000000, 0x0420300a, 0x00000000, 0x0010000a, 0x00000000, 0x07000036, 0x00102072,
+ 0x00000000, 0x04203246, 0x00000001, 0x0010000a, 0x00000000, 0x05000036, 0x00102082, 0x00000000,
+ 0x00004001, 0x3f800000, 0x0100003e,
+ };
+ static struct named_shader ps_indexable_temp2 = {"indexable_temp2", ps_indexable_temp2_code, sizeof(ps_indexable_temp2_code)};
+ static const DWORD ps_bfi_code[] =
+ {
+#if 0
+ uint bits, offset, insert, base;
+
+ uint4 main() : SV_Target
+ {
+ uint mask = ((1 << bits) - 1) << offset;
+ return ((insert << offset) & mask) | (base & ~mask);
+ }
+#endif
+ 0x43425844, 0xbe9af688, 0xf5caec6f, 0x63ed2522, 0x5f91f209, 0x00000001, 0x000000e0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000068, 0x00000050, 0x0000001a,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0f00008c, 0x001020f2, 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x00208556, 0x00000000,
+ 0x00000000, 0x00208aa6, 0x00000000, 0x00000000, 0x00208ff6, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_bfi = {"bfi", ps_bfi_code, sizeof(ps_bfi_code)};
+ static const DWORD ps_ibfe_code[] =
+ {
+#if 0
+ ps_5_0
+ dcl_globalFlags refactoringAllowed
+ dcl_constantbuffer cb0[1], immediateIndexed
+ dcl_output o0.xyzw
+ ibfe o0.xyzw, cb0[0].xxxx, cb0[0].yyyy, cb0[0].zzzz
+ ret
+#endif
+ 0x43425844, 0x4b2225f7, 0xd0860f66, 0xe38775bb, 0x6d23d1d2, 0x00000001, 0x000000d4, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000005c, 0x00000050, 0x00000017,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0c00008b, 0x001020f2, 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x00208556, 0x00000000,
+ 0x00000000, 0x00208aa6, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_ibfe = {"ibfe", ps_ibfe_code, sizeof(ps_ibfe_code)};
+ static const DWORD ps_ibfe2_code[] =
+ {
+#if 0
+ ps_5_0
+ dcl_globalFlags refactoringAllowed
+ dcl_constantbuffer cb0[1], immediateIndexed
+ dcl_output o0.xyzw
+ dcl_temps 1
+ mov r0.xyzw, cb0[0].xyzw
+ ibfe r0.xyzw, r0.xxxx, r0.yyyy, r0.zzzz
+ mov o0.xyzw, r0.xyzw
+ ret
+#endif
+ 0x43425844, 0x347a9c0e, 0x3eff39a4, 0x3dd41cc5, 0xff87ec8d, 0x00000001, 0x000000fc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000084, 0x00000050, 0x00000021,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000,
+ 0x0900008b, 0x001000f2, 0x00000000, 0x00100006, 0x00000000, 0x00100556, 0x00000000, 0x00100aa6,
+ 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_ibfe2 = {"ibfe2", ps_ibfe2_code, sizeof(ps_ibfe2_code)};
+ static const DWORD ps_ubfe_code[] =
+ {
+#if 0
+ uint u;
+
+ uint4 main() : SV_Target
+ {
+ return uint4((u & 0xf0) >> 4, (u & 0x7fffff00) >> 8, (u & 0xfe) >> 1, (u & 0x7fffffff) >> 1);
+ }
+#endif
+ 0x43425844, 0xc4ac0509, 0xaea83154, 0xf1fb3b80, 0x4c22e3cc, 0x00000001, 0x000000e4, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000006c, 0x00000050, 0x0000001b,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x1000008a, 0x001020f2, 0x00000000, 0x00004002, 0x00000004, 0x00000017, 0x00000007, 0x0000001e,
+ 0x00004002, 0x00000004, 0x00000008, 0x00000001, 0x00000001, 0x00208006, 0x00000000, 0x00000000,
+ 0x0100003e,
+ };
+ static struct named_shader ps_ubfe = {"ubfe", ps_ubfe_code, sizeof(ps_ubfe_code)};
+ static const DWORD ps_bfrev_code[] =
+ {
+#if 0
+ uint bits;
+
+ uint4 main() : SV_Target
+ {
+ return uint4(reversebits(bits), reversebits(reversebits(bits)),
+ reversebits(bits & 0xFFFF), reversebits(bits >> 16));
+ }
+#endif
+ 0x43425844, 0x73daef82, 0xe52befa3, 0x8504d5f0, 0xebdb321d, 0x00000001, 0x00000154, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000dc, 0x00000050, 0x00000037,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x08000001, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000,
+ 0x00004001, 0x0000ffff, 0x0500008d, 0x00102042, 0x00000000, 0x0010000a, 0x00000000, 0x08000055,
+ 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000010, 0x0500008d,
+ 0x00102082, 0x00000000, 0x0010000a, 0x00000000, 0x0600008d, 0x00100012, 0x00000000, 0x0020800a,
+ 0x00000000, 0x00000000, 0x0500008d, 0x00102022, 0x00000000, 0x0010000a, 0x00000000, 0x05000036,
+ 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_bfrev = {"bfrev", ps_bfrev_code, sizeof(ps_bfrev_code)};
+ static const DWORD ps_bits_code[] =
+ {
+#if 0
+ uint u;
+ int i;
+
+ uint4 main() : SV_Target
+ {
+ return uint4(countbits(u), firstbitlow(u), firstbithigh(u), firstbithigh(i));
+ }
+#endif
+ 0x43425844, 0x23fee911, 0x145287d1, 0xea904419, 0x8aa59a6a, 0x00000001, 0x000001b4, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000013c, 0x00000050, 0x0000004f,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x06000089, 0x00100012, 0x00000000, 0x0020801a, 0x00000000, 0x00000000,
+ 0x07000020, 0x00100022, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0xffffffff, 0x0800001e,
+ 0x00100012, 0x00000000, 0x00004001, 0x0000001f, 0x8010000a, 0x00000041, 0x00000000, 0x09000037,
+ 0x00102082, 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0xffffffff, 0x0010000a, 0x00000000,
+ 0x06000087, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0800001e, 0x00100012,
+ 0x00000000, 0x00004001, 0x0000001f, 0x8010000a, 0x00000041, 0x00000000, 0x0a000037, 0x00102042,
+ 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0xffffffff,
+ 0x06000086, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000088, 0x00102022,
+ 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_bits = {"bits", ps_bits_code, sizeof(ps_bits_code)};
+ static const DWORD ps_ishr_code[] =
+ {
+#if 0
+ int4 src0;
+ int4 src1;
+
+ void main(out uint4 dst : SV_Target)
+ {
+ dst = src0 >> src1;
+ }
+#endif
+ 0x43425844, 0x4551d737, 0xd3dcf723, 0xdf387a99, 0xb6d6b00b, 0x00000001, 0x000000c8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000050, 0x00000050, 0x00000014,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0900002a, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00208e46, 0x00000000,
+ 0x00000001, 0x0100003e,
+ };
+ static struct named_shader ps_ishr = {"ishr", ps_ishr_code, sizeof(ps_ishr_code)};
+ static const DWORD ps_ushr_code[] =
+ {
+#if 0
+ uint4 src0;
+ uint4 src1;
+
+ void main(out uint4 dst : SV_Target)
+ {
+ dst = src0 >> src1;
+ }
+#endif
+ 0x43425844, 0x00f49f17, 0xe7933d92, 0xf527d4e6, 0x1fe1c216, 0x00000001, 0x000000c8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000050, 0x00000050, 0x00000014,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x09000055, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00208e46, 0x00000000,
+ 0x00000001, 0x0100003e,
+ };
+ static struct named_shader ps_ushr = {"ushr", ps_ushr_code, sizeof(ps_ushr_code)};
+ static const DWORD ps_ishl_code[] =
+ {
+#if 0
+ uint4 src0;
+ uint4 src1;
+
+ void main(out uint4 dst : SV_Target)
+ {
+ dst = src0 << src1;
+ }
+#endif
+ 0x43425844, 0xc88f5e4d, 0x64e1e5c6, 0x70e7173e, 0x960d6691, 0x00000001, 0x000000c8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000050, 0x00000050, 0x00000014,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x09000029, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00208e46, 0x00000000,
+ 0x00000001, 0x0100003e,
+ };
+ static struct named_shader ps_ishl = {"ishl", ps_ishl_code, sizeof(ps_ishl_code)};
+ static const DWORD ps_ishl_const_code[] =
+ {
+#if 0
+ uint4 src;
+
+ void main(out uint4 dst : SV_Target)
+ {
+ dst = src << 2;
+ }
+#endif
+ 0x43425844, 0x5b749bf4, 0xe24de3dc, 0xbbd75bc9, 0xc6fc9eca, 0x00000001, 0x000000c0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000048, 0x00000040, 0x00000012,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x08000029,
+ 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0100003e,
+ };
+ static struct named_shader ps_ishl_const = {"ishl_const", ps_ishl_const_code, sizeof(ps_ishl_const_code)};
+ static const DWORD ps_not_code[] =
+ {
+#if 0
+ uint2 bits;
+
+ uint4 main() : SV_Target
+ {
+ return uint4(~bits.x, ~(bits.x ^ ~0u), ~bits.y, ~(bits.y ^ ~0u));
+ }
+#endif
+ 0x43425844, 0xaed0fd26, 0xf719a878, 0xc832efd6, 0xba03c264, 0x00000001, 0x00000100, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000088, 0x00000040, 0x00000022,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068,
+ 0x00000001, 0x0b000057, 0x00100032, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x00004002,
+ 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x0500003b, 0x001020a2, 0x00000000, 0x00100406,
+ 0x00000000, 0x0600003b, 0x00102052, 0x00000000, 0x00208106, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_not = {"not", ps_not_code, sizeof(ps_not_code)};
+ static const DWORD ps_icmp_code[] =
+ {
+#if 0
+ int2 src;
+
+ void main(out uint4 dst : SV_Target)
+ {
+ dst.x = src.x == src.y ? ~0u : 0;
+ dst.y = src.x >= src.y ? ~0u : 0;
+ dst.z = src.x < src.y ? ~0u : 0;
+ dst.w = src.x != src.y ? ~0u : 0;
+ }
+#endif
+ 0x43425844, 0xa39748f0, 0x39d5c9e4, 0xdf073d48, 0x7946c5c4, 0x00000001, 0x00000134, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000bc, 0x00000050, 0x0000002f,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x09000020, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000,
+ 0x00000000, 0x09000021, 0x00102022, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a,
+ 0x00000000, 0x00000000, 0x09000022, 0x00102042, 0x00000000, 0x0020800a, 0x00000000, 0x00000000,
+ 0x0020801a, 0x00000000, 0x00000000, 0x09000027, 0x00102082, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_icmp = {"icmp", ps_icmp_code, sizeof(ps_icmp_code)};
+ static const DWORD ps_ucmp_code[] =
+ {
+#if 0
+ uint2 src;
+
+ void main(out uint4 dst : SV_Target)
+ {
+ dst = 0;
+ dst.x = src.x >= src.y ? ~0u : 0;
+ dst.y = src.x < src.y ? ~0u : 0;
+ }
+#endif
+ 0x43425844, 0xe083954f, 0xb55bf642, 0xeb2fa36c, 0x60ee1782, 0x00000001, 0x0000010c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000094, 0x00000050, 0x00000025,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x09000050, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000,
+ 0x00000000, 0x0900004f, 0x00102022, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a,
+ 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_ucmp = {"ucmp", ps_ucmp_code, sizeof(ps_ucmp_code)};
+ static const DWORD ps_umin_umax_code[] =
+ {
+#if 0
+ uint2 src;
+
+ void main(out uint4 dst : SV_Target)
+ {
+ dst.x = min(src.x, src.y);
+ dst.y = max(src.x, src.y);
+ dst.zw = 0;
+ }
+#endif
+ 0x43425844, 0xe705f812, 0xa515c8df, 0xb82066d9, 0xb05c8ad3, 0x00000001, 0x0000010c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000094, 0x00000050, 0x00000025,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x09000054, 0x00102012, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000000, 0x09000053, 0x00102022, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0020800a,
+ 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_umin_umax = {"umin_umax", ps_umin_umax_code, sizeof(ps_umin_umax_code)};
+ static const DWORD ps_f16tof32_code[] =
+ {
+#if 0
+ uint4 hf;
+
+ uint4 main() : SV_Target
+ {
+ return f16tof32(hf);
+ }
+#endif
+ 0x43425844, 0xc1816e6e, 0x27562d96, 0x56980fa2, 0x421e6640, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000060, 0x00000050, 0x00000018,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x06000083, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000,
+ 0x0500001c, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_f16tof32 = {"f16tof32", ps_f16tof32_code, sizeof(ps_f16tof32_code)};
+ static const DWORD ps_f16tof32_2_code[] =
+ {
+#if 0
+ ps_5_0
+ dcl_globalFlags refactoringAllowed
+ dcl_constantbuffer cb0[1], immediateIndexed
+ dcl_output o0.xyzw
+ dcl_temps 1
+ mov r0.xyzw, cb0[0].xyzw
+ f16tof32 r0.xyzw, r0.wzyx
+ ftou o0.xyzw, r0.xyzw
+ ret
+#endif
+ 0x43425844, 0x38472f03, 0x2c49b7dd, 0xc2d76bbf, 0xfc093e1d, 0x00000001, 0x000000ec, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000074, 0x00000050, 0x0000001d,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000,
+ 0x05000083, 0x001000f2, 0x00000000, 0x001001b6, 0x00000000, 0x0500001c, 0x001020f2, 0x00000000,
+ 0x00100e46, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_f16tof32_2 = {"f16tof32_2", ps_f16tof32_2_code, sizeof(ps_f16tof32_2_code)};
+ static const DWORD ps_f32tof16_code[] =
+ {
+#if 0
+ float4 f;
+
+ uint4 main() : SV_Target
+ {
+ return f32tof16(f);
+ }
+#endif
+ 0x43425844, 0x523a765c, 0x1a5be3a9, 0xaed69c80, 0xd26fe296, 0x00000001, 0x000000bc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, 0x00000011,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x06000082, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_f32tof16 = {"f32tof16", ps_f32tof16_code, sizeof(ps_f32tof16_code)};
+ static const DWORD ps_f32tof16_2_code[] =
+ {
+#if 0
+ ps_5_0
+ dcl_globalFlags refactoringAllowed
+ dcl_constantbuffer cb0[1], immediateIndexed
+ dcl_output o0.xyzw
+ dcl_temps 1
+ mov r0.xyzw, cb0[0].xyzw
+ f32tof16 r0.xyzw, r0.wzyx
+ mov o0.xyzw, r0.xyzw
+ ret
+#endif
+ 0x43425844, 0x607c82d2, 0x940cc7c2, 0xe9de23c6, 0x696beb90, 0x00000001, 0x000000ec, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000074, 0x00000050, 0x0000001d,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000,
+ 0x05000082, 0x001000f2, 0x00000000, 0x001001b6, 0x00000000, 0x05000036, 0x001020f2, 0x00000000,
+ 0x00100e46, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_f32tof16_2 = {"f32tof16_2", ps_f32tof16_2_code, sizeof(ps_f32tof16_2_code)};
+ static const DWORD ps_imad_code[] =
+ {
+#if 0
+ int4 src0;
+ int4 src1;
+ int4 src2;
+
+ void main(out uint4 dst : SV_Target)
+ {
+ dst.xy = src0.xy * src1.xy + src2.xy;
+ dst.zw = src0.zw * src1.zw - src2.zw;
+ }
+#endif
+ 0x43425844, 0xb6a7735a, 0xc891e560, 0x6df8f267, 0x2753395c, 0x00000001, 0x00000108, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000090, 0x00000050, 0x00000024,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0c000023, 0x00102032, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x00208046, 0x00000000,
+ 0x00000001, 0x00208046, 0x00000000, 0x00000002, 0x0d000023, 0x001020c2, 0x00000000, 0x00208ea6,
+ 0x00000000, 0x00000000, 0x00208ea6, 0x00000000, 0x00000001, 0x80208ea6, 0x00000041, 0x00000000,
+ 0x00000002, 0x0100003e,
+ };
+ static struct named_shader ps_imad = {"imad", ps_imad_code, sizeof(ps_imad_code)};
+ static const DWORD ps_imul_code[] =
+ {
+#if 0
+ uint4 src0;
+ uint4 src1;
+
+ void main(out uint4 dst : SV_Target)
+ {
+ dst = 0;
+ dst.x = src0.x * src1.x;
+ }
+#endif
+ 0x43425844, 0x55ebfe14, 0xc9834c14, 0x5f89388a, 0x523be7e0, 0x00000001, 0x000000ec, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000074, 0x00000050, 0x0000001d,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0a000026, 0x0000d000, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020800a,
+ 0x00000000, 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_imul = {"imul", ps_imul_code, sizeof(ps_imul_code)};
+ static const DWORD ps_udiv_code[] =
+ {
+#if 0
+ uint4 src0;
+ uint4 src1;
+
+ void main(out uint4 dst : SV_Target)
+ {
+ dst = 0;
+ dst.x = src0.x / src1.x;
+ dst.y = src0.x % src1.x;
+ }
+#endif
+ 0x43425844, 0x007d5f29, 0x042f2e56, 0x212eddf2, 0xc98cca76, 0x00000001, 0x00000120, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a8, 0x00000050, 0x0000002a,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000002, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x0b00004e, 0x00100012, 0x00000000, 0x00100012, 0x00000001, 0x0020800a,
+ 0x00000000, 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x05000036, 0x00102012, 0x00000000,
+ 0x0010000a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010000a, 0x00000001, 0x0100003e,
+ };
+ static struct named_shader ps_udiv = {"udiv", ps_udiv_code, sizeof(ps_udiv_code)};
+ static const DWORD ps_nested_switch_code[] =
+ {
+#if 0
+ uint4 src0;
+ uint4 src1;
+
+ uint4 main() : SV_Target
+ {
+ uint4 dst = 0;
+
+ switch (src0.x)
+ {
+ case ~0u:
+ dst.x = 1;
+ break;
+ case 0:
+ case 1:
+ case 2:
+ if (src1.x)
+ break;
+ dst.x = 2;
+ break;
+ case 3:
+ break;
+ case 4:
+ if (src1.x)
+ {
+ switch (src0.y)
+ {
+ case 0:
+ case 1:
+ case 2:
+ case 3:
+ if (src0.z)
+ dst += src0.z * (uint4)2;
+ else if (src0.w)
+ return (uint4)255;
+ else
+ dst.zw = 1;
+ break;
+ default:
+ dst = 1;
+ break;
+ }
+ break;
+ }
+ else
+ {
+ dst = 128;
+ break;
+ }
+ }
+
+ return dst;
+ }
+#endif
+ 0x43425844, 0x46d465cb, 0x5d7ed52f, 0x3573b153, 0x1691c479, 0x00000001, 0x00000334, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000002bc, 0x00000050, 0x000000af,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x0400004c, 0x0020800a, 0x00000000, 0x00000000, 0x03000006, 0x00004001,
+ 0xffffffff, 0x08000036, 0x001000f2, 0x00000000, 0x00004002, 0x00000001, 0x00000000, 0x00000000,
+ 0x00000000, 0x01000002, 0x03000006, 0x00004001, 0x00000000, 0x03000006, 0x00004001, 0x00000001,
+ 0x03000006, 0x00004001, 0x00000002, 0x0404001f, 0x0020800a, 0x00000000, 0x00000001, 0x08000036,
+ 0x001000f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000002,
+ 0x01000015, 0x08000036, 0x001000f2, 0x00000000, 0x00004002, 0x00000002, 0x00000000, 0x00000000,
+ 0x00000000, 0x01000002, 0x03000006, 0x00004001, 0x00000003, 0x08000036, 0x001000f2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000002, 0x03000006, 0x00004001,
+ 0x00000004, 0x0404001f, 0x0020800a, 0x00000000, 0x00000001, 0x0400004c, 0x0020801a, 0x00000000,
+ 0x00000000, 0x03000006, 0x00004001, 0x00000000, 0x03000006, 0x00004001, 0x00000001, 0x03000006,
+ 0x00004001, 0x00000002, 0x03000006, 0x00004001, 0x00000003, 0x0404001f, 0x0020802a, 0x00000000,
+ 0x00000000, 0x0b000029, 0x001000f2, 0x00000000, 0x00208aa6, 0x00000000, 0x00000000, 0x00004002,
+ 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x01000012, 0x0404001f, 0x0020803a, 0x00000000,
+ 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x000000ff, 0x000000ff, 0x000000ff,
+ 0x000000ff, 0x0100003e, 0x01000015, 0x08000036, 0x001000f2, 0x00000000, 0x00004002, 0x00000000,
+ 0x00000000, 0x00000001, 0x00000001, 0x01000015, 0x01000002, 0x0100000a, 0x08000036, 0x001000f2,
+ 0x00000000, 0x00004002, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x01000002, 0x01000017,
+ 0x01000002, 0x01000012, 0x08000036, 0x001000f2, 0x00000000, 0x00004002, 0x00000080, 0x00000080,
+ 0x00000080, 0x00000080, 0x01000002, 0x01000015, 0x0100000a, 0x08000036, 0x001000f2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000002, 0x01000017, 0x05000036,
+ 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_nested_switch = {"nested_switch", ps_nested_switch_code, sizeof(ps_nested_switch_code)};
+ static const DWORD ps_switch_no_default_code[] =
+ {
+#if 0
+ ps_5_0
+ dcl_globalFlags refactoringAllowed
+ dcl_constantbuffer CB0[1], immediateIndexed
+ dcl_output o0.xyzw
+ switch cb0[0].x
+ case l(0)
+ mov o0.xyzw, l(1,1,1,1)
+ ret
+ case l(3)
+ mov o0.xyzw, l(2,2,2,2)
+ ret
+ endswitch
+ nop
+ nop
+ mov o0.xyzw, l(3,3,3,3)
+ ret
+#endif
+ 0x43425844, 0x97459226, 0x57ed7614, 0xcda58342, 0xbdf6a9dd, 0x00000001, 0x00000140, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000c8, 0x00000050, 0x00000032,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x0400004c, 0x0020800a, 0x00000000, 0x00000000, 0x03000006, 0x00004001, 0x00000000, 0x08000036,
+ 0x001020f2, 0x00000000, 0x00004002, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x0100003e,
+ 0x03000006, 0x00004001, 0x00000003, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000002,
+ 0x00000002, 0x00000002, 0x00000002, 0x0100003e, 0x01000017, 0x0100003a, 0x0100003a, 0x08000036,
+ 0x001020f2, 0x00000000, 0x00004002, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x0100003e,
+ };
+ static const struct named_shader ps_switch_no_default
+ = {"switch_no_default", ps_switch_no_default_code, sizeof(ps_switch_no_default_code)};
+ static const DWORD ps_movc_code[] =
+ {
+#if 0
+ ps_5_0
+ dcl_globalFlags refactoringAllowed
+ dcl_constantbuffer cb0[3], immediateIndexed
+ dcl_output o0.xyzw
+ dcl_temps 1
+ mov r0.xyzw, cb0[0].xyzw
+ movc r0.xyzw, r0.xyzw, cb0[1].xyzw, cb0[2].xyzw
+ mov o0.xyzw, r0.xyzw
+ ret
+#endif
+ 0x43425844, 0x59a5be58, 0x260c36c0, 0x7eadcff2, 0x947f4e9d, 0x00000001, 0x00000104, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000008c, 0x00000050, 0x00000023,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000,
+ 0x0b000037, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000001,
+ 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000,
+ 0x0100003e,
+ };
+ static struct named_shader ps_movc = {"movc", ps_movc_code, sizeof(ps_movc_code)};
+ static const DWORD ps_swapc0_code[] =
+ {
+#if 0
+ ps_5_0
+ dcl_globalFlags refactoringAllowed
+ dcl_constantbuffer cb0[3], immediateIndexed
+ dcl_output o0.xyzw
+ dcl_temps 2
+ swapc r0.xyzw, r1.xyzw, cb0[0].xyzw, cb0[1].xyzw, cb0[2].xyzw
+ mov o0.xyzw, r0.xyzw
+ ret
+#endif
+ 0x43425844, 0x9e089246, 0x9f8b5cbe, 0xbac66faf, 0xaef23488, 0x00000001, 0x000000f8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000080, 0x00000050, 0x00000020,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000002, 0x0e00008e, 0x001000f2, 0x00000000, 0x001000f2, 0x00000001, 0x00208e46,
+ 0x00000000, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_swapc0 = {"swapc0", ps_swapc0_code, sizeof(ps_swapc0_code)};
+ static const DWORD ps_swapc1_code[] =
+ {
+#if 0
+ ps_5_0
+ dcl_globalFlags refactoringAllowed
+ dcl_constantbuffer cb0[3], immediateIndexed
+ dcl_output o0.xyzw
+ dcl_temps 2
+ swapc r0.xyzw, r1.xyzw, cb0[0].xyzw, cb0[1].xyzw, cb0[2].xyzw
+ mov o0.xyzw, r1.xyzw
+ ret
+#endif
+ 0x43425844, 0xf2daed61, 0xede211f7, 0x7300dbea, 0x573ed49f, 0x00000001, 0x000000f8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000080, 0x00000050, 0x00000020,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000002, 0x0e00008e, 0x001000f2, 0x00000000, 0x001000f2, 0x00000001, 0x00208e46,
+ 0x00000000, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x0100003e,
+ };
+ static struct named_shader ps_swapc1 = {"swapc1", ps_swapc1_code, sizeof(ps_swapc1_code)};
+ static const DWORD ps_swapc2_code[] =
+ {
+#if 0
+ ps_5_0
+ dcl_globalFlags refactoringAllowed
+ dcl_constantbuffer cb0[3], immediateIndexed
+ dcl_output o0.xyzw
+ dcl_temps 2
+ mov r0.xyzw, cb0[1].xyzw
+ mov r1.xyzw, cb0[2].xyzw
+ swapc r0.xyzw, r1.xyzw, cb0[0].xyzw, r0.xyzw, r1.xyzw
+ mov o0.xyzw, r0.xyzw
+ ret
+#endif
+ 0x43425844, 0x230fcb22, 0x70d99148, 0x65814d89, 0x97473498, 0x00000001, 0x00000120, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a8, 0x00000050, 0x0000002a,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000002, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000001,
+ 0x06000036, 0x001000f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x0c00008e, 0x001000f2,
+ 0x00000000, 0x001000f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000,
+ 0x00100e46, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_swapc2 = {"swapc2", ps_swapc2_code, sizeof(ps_swapc2_code)};
+ static const DWORD ps_swapc3_code[] =
+ {
+#if 0
+ ps_5_0
+ dcl_globalFlags refactoringAllowed
+ dcl_constantbuffer cb0[3], immediateIndexed
+ dcl_output o0.xyzw
+ dcl_temps 2
+ mov r0.xyzw, cb0[1].xyzw
+ mov r1.xyzw, cb0[2].xyzw
+ swapc r0.xyzw, r1.xyzw, cb0[0].xyzw, r0.xyzw, r1.xyzw
+ mov o0.xyzw, r1.xyzw
+ ret
+#endif
+ 0x43425844, 0xce595d62, 0x98305541, 0xb04e74c8, 0xfc010f3a, 0x00000001, 0x00000120, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a8, 0x00000050, 0x0000002a,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000002, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000001,
+ 0x06000036, 0x001000f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x0c00008e, 0x001000f2,
+ 0x00000000, 0x001000f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000,
+ 0x00100e46, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x0100003e,
+ };
+ static struct named_shader ps_swapc3 = {"swapc3", ps_swapc3_code, sizeof(ps_swapc3_code)};
+ static const DWORD ps_swapc4_code[] =
+ {
+#if 0
+ ps_5_0
+ dcl_globalFlags refactoringAllowed
+ dcl_constantbuffer cb0[3], immediateIndexed
+ dcl_output o0.xyzw
+ dcl_temps 2
+ mov r0.xyzw, cb0[0].xyzw
+ swapc r0.xyzw, r1.xyzw, r0.xyzw, cb0[1].xyzw, cb0[2].xyzw
+ mov o0.xyzw, r0.xyzw
+ ret
+#endif
+ 0x43425844, 0x72067c48, 0xb53572a0, 0x9dd9e0fd, 0x903e37e3, 0x00000001, 0x0000010c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000094, 0x00000050, 0x00000025,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000002, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000,
+ 0x0d00008e, 0x001000f2, 0x00000000, 0x001000f2, 0x00000001, 0x00100e46, 0x00000000, 0x00208e46,
+ 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000,
+ 0x00100e46, 0x00000000, 0x0100003e,
+ };
+ static struct named_shader ps_swapc4 = {"swapc4", ps_swapc4_code, sizeof(ps_swapc4_code)};
+ static const DWORD ps_swapc5_code[] =
+ {
+#if 0
+ ps_5_0
+ dcl_globalFlags refactoringAllowed
+ dcl_constantbuffer cb0[3], immediateIndexed
+ dcl_output o0.xyzw
+ dcl_temps 2
+ mov r1.xyzw, cb0[0].xyzw
+ swapc r0.xyzw, r1.xyzw, r1.xyzw, cb0[1].xyzw, cb0[2].xyzw
+ mov o0.xyzw, r1.xyzw
+ ret
+#endif
+ 0x43425844, 0x7078fb08, 0xdd24cd44, 0x469d3258, 0x9e33a0bc, 0x00000001, 0x0000010c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000094, 0x00000050, 0x00000025,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000002, 0x06000036, 0x001000f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000000,
+ 0x0d00008e, 0x001000f2, 0x00000000, 0x001000f2, 0x00000001, 0x00100e46, 0x00000001, 0x00208e46,
+ 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000,
+ 0x00100e46, 0x00000001, 0x0100003e,
+ };
+ static struct named_shader ps_swapc5 = {"swapc5", ps_swapc5_code, sizeof(ps_swapc5_code)};
+ static const struct
+ {
+ const struct named_shader *ps;
+ struct
+ {
+ struct vec4 src0;
+ struct vec4 src1;
+ struct vec4 src2;
+ } input;
+ union
+ {
+ struct vec4 f;
+ struct uvec4 u;
+ struct ivec4 i;
+ } output;
+ bool skip_on_warp;
+ bool is_mesa_bug;
+ }
+ tests[] =
+ {
+ {&ps_div, {{ 2.0f}, { 4.0f}}, {{ 0.5f}}},
+ {&ps_div, {{ 2.0f}, {-4.0f}}, {{ -0.5f}}},
+ {&ps_div, {{-2.0f}, { 4.0f}}, {{ -0.5f}}},
+ {&ps_div, {{-2.0f}, {-4.0f}}, {{ 0.5f}}},
+ {&ps_div, {{ 0.0f}, { 1.0f}}, {{ 0.0f}}},
+ {&ps_div, {{ 0.0f}, {-1.0f}}, {{ -0.0f}}},
+ {&ps_div, {{ 1.0f}, { 0.0f}}, {{ INFINITY}}},
+ {&ps_div, {{ 1.0f}, {-0.0f}}, {{-INFINITY}}},
+ {&ps_div, {{-1.0f}, { 0.0f}}, {{-INFINITY}}},
+ {&ps_div, {{-1.0f}, {-0.0f}}, {{ INFINITY}}},
+
+ {&ps_dot2, {{1.0f, 1.0f}, {1.0f, 1.0f}}, {{2.0f}}},
+ {&ps_dot2, {{1.0f, 1.0f}, {2.0f, 3.0f}}, {{5.0f}}},
+
+ {&ps_dot3, {{1.0f, 2.0f, 3.0f, 4.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, {{6.0f, 6.0f, 6.0f, 6.0f}}},
+ {&ps_dot3, {{1.0f, 2.0f, 3.0f}, {3.0f, 1.0f, 2.0f}}, {{11.0f, 11.0f, 11.0f, 11.0f}}},
+
+ {&ps_eq, {{0.0f}, {0.0f}}, {.u = {0xffffffff}}},
+ {&ps_eq, {{1.0f}, {0.0f}}, {.u = {0x00000000}}},
+ {&ps_eq, {{0.0f}, {1.0f}}, {.u = {0x00000000}}},
+ {&ps_eq, {{1.0f}, {1.0f}}, {.u = {0xffffffff}}},
+ {&ps_eq, {{0.0f}, {NAN}}, {.u = {0x00000000}}},
+ {&ps_eq, {{1.0f}, {NAN}}, {.u = {0x00000000}}},
+ {&ps_eq, { {NAN}, {NAN}}, {.u = {0x00000000}}},
+
+ {&ps_ne, {{0.0f}, {0.0f}}, {.u = {0x00000000}}},
+ {&ps_ne, {{1.0f}, {0.0f}}, {.u = {0xffffffff}}},
+ {&ps_ne, {{0.0f}, {1.0f}}, {.u = {0xffffffff}}},
+ {&ps_ne, {{1.0f}, {1.0f}}, {.u = {0x00000000}}},
+ {&ps_ne, {{0.0f}, {NAN}}, {.u = {0xffffffff}}},
+ {&ps_ne, {{1.0f}, {NAN}}, {.u = {0xffffffff}}},
+ {&ps_ne, { {NAN}, {NAN}}, {.u = {0xffffffff}}},
+
+ {&ps_if, {{0.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}},
+ {&ps_if, {{1.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
+
+ /* FIXME: Ordered/unordered comparisons are broken on Mesa. */
+ {&ps_if_return, {{0.0f, 0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 0.0f}}},
+ {&ps_if_return, {{ NAN, 0.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}, false, true},
+ {&ps_if_return, {{3.0f, 0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 0.0f}}},
+ {&ps_if_return, {{4.0f, 0.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}},
+ {&ps_if_return, {{4.0f, NAN, 0.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}, false, true},
+ {&ps_if_return, {{4.0f, 3.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}},
+ {&ps_if_return, {{4.0f, 4.0f, 0.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}},
+ {&ps_if_return, {{4.0f, 4.0f, NAN, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}, false, true},
+ {&ps_if_return, {{4.0f, 4.0f, 3.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}},
+ {&ps_if_return, {{4.0f, 4.0f, 4.0f, 0.0f}}, {{1.0f, 1.0f, 0.0f, 0.0f}}},
+ {&ps_if_return, {{4.0f, 4.0f, 5.0f, 0.0f}}, {{1.0f, 1.0f, 0.0f, 0.0f}}},
+ {&ps_if_return, {{4.0f, 4.0f, 0.0f, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}, false, true},
+ {&ps_if_return, {{4.0f, 4.0f, 0.0f, 1.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}},
+ {&ps_if_return, {{4.0f, 4.0f, 0.0f, 2.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}},
+ {&ps_if_return, {{4.0f, 4.0f, 0.0f, 3.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}},
+ {&ps_if_return, {{4.0f, 4.0f, 0.0f, 4.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}},
+ {&ps_if_return, {{4.0f, 4.0f, 0.0f, 5.0f}}, {{1.0f, 1.0f, 1.0f, 1.0f}}},
+ {&ps_if_return, {{5.0f, 4.0f, 0.0f, 5.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}},
+ {&ps_if_return, {{ NAN, NAN, NAN, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}, false, true},
+
+ {&ps_nested_if, {{0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 1.0f}}},
+ {&ps_nested_if, {{0.0f, 0.0f, 1.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}},
+ {&ps_nested_if, {{1.0f, 0.0f, 1.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}},
+ {&ps_nested_if, {{1.0f, 1.0f, 1.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
+
+ {&ps_loop_break, {{0.0f, 0.0f}}, {{0.0f}}},
+ {&ps_loop_break, {{1.0f, 0.0f}}, {{1.0f}}},
+ {&ps_loop_break, {{1.0f, 1.0f}}, {{1.0f}}},
+ {&ps_loop_break, {{1.0f, 2.0f}}, {{1.0f}}},
+ {&ps_loop_break, {{1.0f, 3.0f}}, {{1.0f}}},
+ {&ps_loop_break, {{7.0f, 0.0f}}, {{1.0f}}},
+ {&ps_loop_break, {{7.0f, 2.0f}}, {{1.0f}}},
+ {&ps_loop_break, {{7.0f, 6.0f}}, {{1.0f}}},
+ {&ps_loop_break, {{7.0f, 7.0f}}, {{7.0f}}},
+ {&ps_loop_break, {{7.0f, 8.0f}}, {{7.0f}}},
+ {&ps_loop_break, {{7.0f, 9.0f}}, {{7.0f}}},
+
+ {&ps_loop_ret, {{0.0f, 0.0f}}, {{0.0f}}},
+ {&ps_loop_ret, {{1.0f, 9.0f}}, {{1.0f}}},
+ {&ps_loop_ret, {{2.0f, 2.0f}}, {{2.0f}}},
+ {&ps_loop_ret, {{5.0f, 9.0f}}, {{5.0f}}},
+ {&ps_loop_ret, {{1.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 1.0f}}},
+ {&ps_loop_ret, {{2.0f, 1.0f}}, {{1.0f, 1.0f, 1.0f, 1.0f}}},
+ {&ps_loop_ret, {{8.0f, 7.0f}}, {{1.0f, 1.0f, 1.0f, 1.0f}}},
+
+ {&ps_breakc_nz, {{0}}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
+ {&ps_breakc_z, {{0}}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
+
+ {&ps_continue, {{0}}, {{254.0f}}, true},
+ {&ps_continuec_nz, {{0}}, {{509.0f}}},
+
+ {&ps_retc_nz, {{ 0.0f}}, {{1.0f}}},
+ {&ps_retc_nz, {{ 10.0f}}, {{1.0f}}},
+ {&ps_retc_nz, {{ 99.0f}}, {{1.0f}}},
+ {&ps_retc_nz, {{300.0f}}, {{0.0f}}},
+
+ {&ps_src_modifiers, {{ 1.0f, 1.0f, 1.0f, 2.0f}}, {{-1.0f, 1.0f, -1.0f, -2.0f}}},
+ {&ps_src_modifiers, {{-1.0f, -1.0f, -1.0f, -2.0f}}, {{ 1.0f, 1.0f, -1.0f, -2.0f}}},
+
+ {&ps_sat, {{ 0.0f, 1.0f, 2.0f, 3.0f}}, {{0.0f, 1.0f, 1.0f, 1.0f}}},
+ {&ps_sat, {{-0.0f, -1.0f, -2.0f, -3.0f}}, {{0.0f, 0.0f, 0.0f, 0.0f}}},
+ {&ps_sat, {{ NAN, -NAN, INFINITY, -INFINITY}}, {{0.0f, 0.0f, 1.0f, 0.0f}}},
+
+ {&ps_min_max, {{0.0f}, { 1.0f}}, {{ 0.0f, 1.0f}}},
+ {&ps_min_max, {{0.0f}, { -1.0f}}, {{ -1.0f, 0.0f}}},
+ {&ps_min_max, {{ NAN}, { 1.0f}}, {{ 1.0f, 1.0f}}},
+ {&ps_min_max, {{0.0f}, { NAN}}, {{ 0.0f, 0.0f}}},
+ {&ps_min_max, {{0.0f}, { INFINITY}}, {{ 0.0f, INFINITY}}},
+ {&ps_min_max, {{1.0f}, { INFINITY}}, {{ 1.0f, INFINITY}}},
+ {&ps_min_max, {{0.0f}, {-INFINITY}}, {{-INFINITY, 0.0f}}},
+ {&ps_min_max, {{1.0f}, {-INFINITY}}, {{-INFINITY, 1.0f}}},
+
+ {&ps_ftou, {{ -NAN}}, {.u = { 0, 0 }}},
+ {&ps_ftou, {{ NAN}}, {.u = { 0, 0 }}},
+ {&ps_ftou, {{-INFINITY}}, {.u = { 0, ~0u}}},
+ {&ps_ftou, {{ INFINITY}}, {.u = {~0u, 0 }}},
+ {&ps_ftou, {{ -1.0f}}, {.u = { 0, 1 }}},
+ {&ps_ftou, {{ 1.0f}}, {.u = { 1, 0 }}},
+
+ {&ps_ftoi, {{ -NAN}}, {.u = { 0, 0}}},
+ {&ps_ftoi, {{ NAN}}, {.u = { 0, 0}}},
+ {&ps_ftoi, {{-INFINITY}}, {.u = {INT_MIN, INT_MAX}}},
+ {&ps_ftoi, {{ INFINITY}}, {.i = {INT_MAX, INT_MIN}}},
+ {&ps_ftoi, {{ -1.0f}}, {.i = { -1, 1}}},
+ {&ps_ftoi, {{ 1.0f}}, {.i = { 1, -1}}},
+
+ {&ps_round, {{ -0.5f}}, {{ -1.0f, 0.0f, -0.0f}}},
+ {&ps_round, {{ -0.0f}}, {{ -0.0f, -0.0f, -0.0f}}},
+ {&ps_round, {{ 0.0f}}, {{ 0.0f, 0.0f, 0.0f}}},
+ {&ps_round, {{ 0.5f}}, {{ 0.0f, 1.0f, 0.0f}}},
+ {&ps_round, {{ 3.0f}}, {{ 3.0f, 3.0f, 3.0f}}},
+ {&ps_round, {{ INFINITY}}, {{ INFINITY, INFINITY, INFINITY}}},
+ {&ps_round, {{-INFINITY}}, {{-INFINITY, -INFINITY, -INFINITY}}},
+
+ {&ps_round_ne, {{ 0.0f, -0.0f, 0.5f, -0.5f}}, {{ 0.0f, -0.0f, 0.0f, -0.0f}}},
+ {&ps_round_ne, {{ 2.0f, 3.0f, 4.0f, 5.0f}}, {{ 2.0f, 3.0f, 4.0f, 5.0f}}},
+ {&ps_round_ne, {{ 2.4f, 3.4f, 4.4f, 5.4f}}, {{ 2.0f, 3.0f, 4.0f, 5.0f}}},
+ {&ps_round_ne, {{ 2.5f, 3.5f, 4.5f, 5.5f}}, {{ 2.0f, 4.0f, 4.0f, 6.0f}}},
+ {&ps_round_ne, {{ 2.6f, 3.6f, 4.6f, 5.6f}}, {{ 3.0f, 4.0f, 5.0f, 6.0f}}},
+ {&ps_round_ne, {{-2.5f, -3.5f, -4.5f, -5.5f}}, {{-2.0f, -4.0f, -4.0f, -6.0f}}},
+ {&ps_round_ne, {{-2.4f, -3.4f, -4.4f, -5.4f}}, {{-2.0f, -3.0f, -4.0f, -5.0f}}},
+ {&ps_round_ne, {{ INFINITY}}, {{ INFINITY}}},
+ {&ps_round_ne, {{-INFINITY}}, {{-INFINITY}}},
+
+ {&ps_frc, {{ 0.0f}}, {{0.0f, 0.0f}}},
+ {&ps_frc, {{-0.0f}}, {{0.0f, 0.0f}}},
+ {&ps_frc, {{ 1.0f}}, {{0.0f, 0.0f}}},
+ {&ps_frc, {{-1.0f}}, {{0.0f, 0.0f}}},
+ {&ps_frc, {{ 0.5f}}, {{0.5f, 0.5f}}},
+ {&ps_frc, {{-0.5f}}, {{0.5f, 0.5f}}},
+
+ {&ps_exp, {{ 0.0f}}, {{ 1.00f}}},
+ {&ps_exp, {{ -0.0f}}, {{ 1.00f}}},
+ {&ps_exp, {{ 2.0f}}, {{ 4.00f}}},
+ {&ps_exp, {{ -2.0f}}, {{ 0.25f}}},
+ {&ps_exp, {{ INFINITY}}, {{INFINITY}}},
+ {&ps_exp, {{-INFINITY}}, {{ 0.00f}}},
+
+ {&ps_log, {{ -0.00f}}, {{-INFINITY}}},
+ {&ps_log, {{ 0.00f}}, {{-INFINITY}}},
+ {&ps_log, {{INFINITY}}, {{ INFINITY}}},
+ {&ps_log, {{ 0.25f}}, {{ -2.0f}}},
+ {&ps_log, {{ 0.50f}}, {{ -1.0f}}},
+ {&ps_log, {{ 2.00f}}, {{ 1.0f}}},
+ {&ps_log, {{ 8.00f}}, {{ 3.0f}}},
+
+ {&ps_rcp, {{-INFINITY}}, {{ -0.0f}}},
+ {&ps_rcp, {{ INFINITY}}, {{ 0.0f}}},
+ {&ps_rcp, {{ -0.0f}}, {{-INFINITY}}},
+ {&ps_rcp, {{ 0.0f}}, {{ INFINITY}}},
+ {&ps_rcp, {{ -1.0f}}, {{ -1.0f}}},
+ {&ps_rcp, {{ 1.0f}}, {{ 1.0f}}},
+ {&ps_rcp, {{ -2.0f}}, {{ -0.5f}}},
+ {&ps_rcp, {{ 2.0f}}, {{ 0.5f}}},
+
+ {&ps_rcp_vector, {{-1.0f, 1.0f, 4.0f, -4.0f}}, {{-1.0f, 1.0f, 0.25f, -0.25f}}},
+
+ {&ps_sincos, {{ 0.0f, -0.0f, 0.0f, -0.0f}}, {{ 0.0f, -0.0f, 1.0f, 1.0f}}},
+ {&ps_sincos, {{ 0.0f, -0.0f, M_PI, -M_PI}}, {{ 0.0f, -0.0f, 1.0f, 1.0f}}},
+
+ {&ps_indexable_temp, {{0.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}},
+ {&ps_indexable_temp, {{1.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
+ {&ps_indexable_temp, {{2.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}},
+
+ {&ps_indexable_temp2, {{0.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}},
+ {&ps_indexable_temp2, {{1.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
+ {&ps_indexable_temp2, {{2.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}},
+ {&ps_indexable_temp2, {{3.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}},
+ {&ps_indexable_temp2, {{4.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
+ {&ps_indexable_temp2, {{5.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}},
+ {&ps_indexable_temp2, {{6.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
+ {&ps_indexable_temp2, {{7.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
+ {&ps_indexable_temp2, {{8.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}},
+ {&ps_indexable_temp2, {{9.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}},
+ };
+
+ static const struct
+ {
+ const struct named_shader *ps;
+ union
+ {
+ struct
+ {
+ struct uvec4 src0;
+ struct uvec4 src1;
+ struct uvec4 src2;
+ } u;
+ struct
+ {
+ struct ivec4 src0;
+ struct ivec4 src1;
+ struct ivec4 src2;
+ } i;
+ struct
+ {
+ struct vec4 src0;
+ struct vec4 src1;
+ struct vec4 src2;
+ } f;
+ } input;
+ union
+ {
+ struct uvec4 u;
+ struct ivec4 i;
+ struct vec4 f;
+ } output;
+ bool skip_on_warp;
+ }
+ uint_tests[] =
+ {
+ {&ps_bfi, {{{ 0, 0, 0, 0}}}, {{ 0, 0, 0, 0}}},
+ {&ps_bfi, {{{ 0, 0, 0, 1}}}, {{ 1, 1, 1, 1}}},
+ {&ps_bfi, {{{ ~0u, 0, ~0u, 0}}}, {{0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}}},
+ {&ps_bfi, {{{ ~0u, ~0u, ~0u, 0}}}, {{0x80000000, 0x80000000, 0x80000000, 0x80000000}}},
+ {&ps_bfi, {{{ ~0u, 0x1fu, ~0u, 0}}}, {{0x80000000, 0x80000000, 0x80000000, 0x80000000}}},
+ {&ps_bfi, {{{ ~0u, ~0x1fu, ~0u, 0}}}, {{0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}}},
+ {&ps_bfi, {{{ 0, 0, 0xff, 1}}}, {{ 1, 1, 1, 1}}},
+ {&ps_bfi, {{{ 0, 0, 0xff, 2}}}, {{ 2, 2, 2, 2}}},
+ {&ps_bfi, {{{ 16, 16, 0xff, 0xff}}}, {{0x00ff00ff, 0x00ff00ff, 0x00ff00ff, 0x00ff00ff}}},
+ {&ps_bfi, {{{ 0, 0, ~0u, ~0u}}}, {{ ~0u, ~0u, ~0u, ~0u}}},
+ {&ps_bfi, {{{~0x1fu, 0, ~0u, 0}}}, {{ 0, 0, 0, 0}}},
+ {&ps_bfi, {{{~0x1fu, 0, ~0u, 1}}}, {{ 1, 1, 1, 1}}},
+ {&ps_bfi, {{{~0x1fu, 0, ~0u, 2}}}, {{ 2, 2, 2, 2}}},
+ {&ps_bfi, {{{ 0, ~0x1fu, ~0u, 0}}}, {{ 0, 0, 0, 0}}},
+ {&ps_bfi, {{{ 0, ~0x1fu, ~0u, 1}}}, {{ 1, 1, 1, 1}}},
+ {&ps_bfi, {{{ 0, ~0x1fu, ~0u, 2}}}, {{ 2, 2, 2, 2}}},
+ {&ps_bfi, {{{~0x1fu, ~0x1fu, ~0u, 0}}}, {{ 0, 0, 0, 0}}},
+ {&ps_bfi, {{{~0x1fu, ~0x1fu, ~0u, 1}}}, {{ 1, 1, 1, 1}}},
+ {&ps_bfi, {{{~0x1fu, ~0x1fu, ~0u, 2}}}, {{ 2, 2, 2, 2}}},
+
+ {&ps_ibfe, {{{ 0, 4, 0x00000000}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ibfe, {{{ 0, 4, 0xffffffff}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ibfe, {{{ 0, 4, 0x7fffffff}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ibfe, {{{ 4, 0, 0x00000000}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ibfe, {{{ 4, 0, 0xfffffffa}}}, {{0xfffffffa, 0xfffffffa, 0xfffffffa, 0xfffffffa}}},
+ {&ps_ibfe, {{{ 4, 0, 0x7ffffffc}}}, {{0xfffffffc, 0xfffffffc, 0xfffffffc, 0xfffffffc}}},
+ {&ps_ibfe, {{{ 4, 4, 0x00000000}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ibfe, {{{ 4, 4, 0xffffffff}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ibfe, {{{ 4, 4, 0xffffff1f}}}, {{0x00000001, 0x00000001, 0x00000001, 0x00000001}}},
+ {&ps_ibfe, {{{ 4, 4, 0x7fffffff}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ibfe, {{{23, 8, 0x00000000}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ibfe, {{{23, 8, 0xffffffff}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ibfe, {{{23, 8, 0x7fffffff}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ibfe, {{{30, 1, 0x00000000}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ibfe, {{{30, 1, 0xffffffff}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ibfe, {{{30, 1, 0x7fffffff}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ibfe, {{{15, 15, 0x7fffffff}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ibfe, {{{15, 15, 0x3fffffff}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ibfe, {{{15, 15, 0x1fffffff}}}, {{0x00003fff, 0x00003fff, 0x00003fff, 0x00003fff}}},
+ {&ps_ibfe, {{{15, 15, 0xffff00ff}}}, {{0xfffffffe, 0xfffffffe, 0xfffffffe, 0xfffffffe}}},
+ {&ps_ibfe, {{{16, 15, 0xffffffff}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ibfe, {{{16, 15, 0x3fffffff}}}, {{0x00007fff, 0x00007fff, 0x00007fff, 0x00007fff}}},
+ {&ps_ibfe, {{{20, 15, 0xffffffff}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ibfe, {{{31, 31, 0xffffffff}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ibfe, {{{31, 31, 0x80000000}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ibfe, {{{31, 31, 0x7fffffff}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+
+ {&ps_ibfe2, {{{16, 15, 0x3fffffff}}}, {{0x00007fff, 0x00007fff, 0x00007fff, 0x00007fff}}},
+
+ {&ps_ubfe, {{{0x00000000}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ubfe, {{{0xffffffff}}}, {{0x0000000f, 0x007fffff, 0x0000007f, 0x3fffffff}}},
+ {&ps_ubfe, {{{0xff000000}}}, {{0x00000000, 0x007f0000, 0x00000000, 0x3f800000}}},
+ {&ps_ubfe, {{{0x00ff0000}}}, {{0x00000000, 0x0000ff00, 0x00000000, 0x007f8000}}},
+ {&ps_ubfe, {{{0x000000ff}}}, {{0x0000000f, 0x00000000, 0x0000007f, 0x0000007f}}},
+ {&ps_ubfe, {{{0x80000001}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ubfe, {{{0xc0000003}}}, {{0x00000000, 0x00400000, 0x00000001, 0x20000001}}},
+
+ {&ps_bfrev, {{{0x12345678}}}, {{0x1e6a2c48, 0x12345678, 0x1e6a0000, 0x2c480000}}},
+ {&ps_bfrev, {{{0xffff0000}}}, {{0x0000ffff, 0xffff0000, 0x00000000, 0xffff0000}}},
+ {&ps_bfrev, {{{0xffffffff}}}, {{0xffffffff, 0xffffffff, 0xffff0000, 0xffff0000}}},
+
+ {&ps_bits, {{{ 0, 0}}}, {{ 0, ~0u, ~0u, ~0u}}},
+ {&ps_bits, {{{ ~0u, ~0u}}}, {{32, 0, 31, ~0u}}},
+ {&ps_bits, {{{0x7fffffff, 0x7fffffff}}}, {{31, 0, 30, 30}}},
+ {&ps_bits, {{{0x80000000, 0x80000000}}}, {{ 1, 31, 31, 30}}},
+ {&ps_bits, {{{0x00000001, 0x00000001}}}, {{ 1, 0, 0, 0}}},
+ {&ps_bits, {{{0x80000001, 0x80000001}}}, {{ 2, 0, 31, 30}}},
+ {&ps_bits, {{{0x88888888, 0x88888888}}}, {{ 8, 3, 31, 30}}},
+ {&ps_bits, {{{0xcccccccc, 0xcccccccc}}}, {{16, 2, 31, 29}}},
+ {&ps_bits, {{{0x11111111, 0x11111c11}}}, {{ 8, 0, 28, 28}}},
+ {&ps_bits, {{{0x0000000f, 0x0000000f}}}, {{ 4, 0, 3, 3}}},
+ {&ps_bits, {{{0x8000000f, 0x8000000f}}}, {{ 5, 0, 31, 30}}},
+ {&ps_bits, {{{0x00080000, 0x00080000}}}, {{ 1, 19, 19, 19}}},
+
+ {&ps_ishr, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, {~0x1fu, 0, 32, 64}}},
+ {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ishr, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}, {~0x1fu, 0, 32, 64}}},
+ {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ishr, {{{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}, {~0x1fu, 0, 32, 64}}},
+ {{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}}},
+ {&ps_ishr, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, { 31, 7, 15, 11}}},
+ {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ishr, {{{0x80000000, 0x80000000, 0x80000000, 0x80000000}, { 31, 7, 15, 11}}},
+ {{0xffffffff, 0xff000000, 0xffff0000, 0xfff00000}}},
+
+ {&ps_ushr, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, {~0x1fu, 0, 32, 64}}},
+ {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ushr, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}, {~0x1fu, 0, 32, 64}}},
+ {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ushr, {{{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}, {~0x1fu, 0, 32, 64}}},
+ {{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}}},
+ {&ps_ushr, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, { 31, 7, 15, 11}}},
+ {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ushr, {{{0x80000000, 0x80000000, 0x80000000, 0x80000000}, { 31, 7, 15, 11}}},
+ {{0x00000001, 0x01000000, 0x00010000, 0x00100000}}},
+
+ {&ps_ishl, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, {~0x1fu, 0, 32, 64}}},
+ {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ishl, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}, {~0x1fu, 0, 32, 64}}},
+ {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {&ps_ishl, {{{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}, {~0x1fu, 0, 32, 64}}},
+ {{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}}},
+ {&ps_ishl, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, { 31, 7, 15, 11}}},
+ {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ishl, {{{0x80000000, 0x80000000, 0x80000000, 0x80000000}, { 31, 7, 15, 11}}},
+ {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ishl, {{{0x00000001, 0x00000001, 0x00000001, 0x800feac1}, { 31, 7, 15, 11}}},
+ {{0x80000000, 0x00000080, 0x00008000, 0x7f560800}}},
+
+ {&ps_ishl_const, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},
+ {&ps_ishl_const, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}},
+ {{0xfffffffc, 0xfffffffc, 0xfffffffc, 0xfffffffc}}},
+
+ {&ps_not, {{{0x00000000, 0xffffffff}}}, {{0xffffffff, 0x00000000, 0x00000000, 0xffffffff}}},
+ {&ps_not, {{{0xf0f0f0f0, 0x0f0f0f0f}}}, {{0x0f0f0f0f, 0xf0f0f0f0, 0xf0f0f0f0, 0x0f0f0f0f}}},
+
+ {&ps_icmp, {.i = {{ 0, 0}}}, {{~0u, ~0u, 0, 0}}},
+ {&ps_icmp, {.i = {{ 1, 0}}}, {{ 0, ~0u, 0, ~0u}}},
+ {&ps_icmp, {.i = {{ 0, 1}}}, {{ 0, 0, ~0u, ~0u}}},
+ {&ps_icmp, {.i = {{ 1, 1}}}, {{~0u, ~0u, 0, 0}}},
+ {&ps_icmp, {.i = {{-1, -1}}}, {{~0u, ~0u, 0, 0}}},
+ {&ps_icmp, {.i = {{ 0, -1}}}, {{ 0, ~0u, 0, ~0u}}},
+ {&ps_icmp, {.i = {{-1, 0}}}, {{ 0, 0, ~0u, ~0u}}},
+ {&ps_icmp, {.i = {{ 1, -1}}}, {{ 0, ~0u, 0, ~0u}}},
+ {&ps_icmp, {.i = {{-1, 1}}}, {{ 0, 0, ~0u, ~0u}}},
+ {&ps_icmp, {.i = {{-2, -1}}}, {{ 0, 0, ~0u, ~0u}}},
+
+ {&ps_ucmp, {{{0, 0}}}, {{~0u, 0, }}},
+ {&ps_ucmp, {{{1, 0}}}, {{~0u, 0, }}},
+ {&ps_ucmp, {{{0, 1}}}, {{ 0, ~0u,}}},
+ {&ps_ucmp, {{{1, 1}}}, {{~0u, 0, }}},
+ {&ps_ucmp, {{{1, 2}}}, {{ 0, ~0u,}}},
+
+ {&ps_umin_umax, {{{ 0, 0}}}, {{ 0, 0}}},
+ {&ps_umin_umax, {{{ 0, 1}}}, {{ 0, 1}}},
+ {&ps_umin_umax, {{{ 1, 0}}}, {{ 0, 1}}},
+ {&ps_umin_umax, {{{~0u, ~0u}}}, {{~0u, ~0u}}},
+ {&ps_umin_umax, {{{ 0, ~0u}}}, {{ 0, ~0u}}},
+ {&ps_umin_umax, {{{~0u, 0}}}, {{ 0, ~0u}}},
+
+ {&ps_f16tof32, {{{0x00000000, 0x00003c00, 0x00005640, 0x00005bd0}}}, {{0, 1, 100, 250}}},
+ {&ps_f16tof32, {{{0x00010000, 0x00013c00, 0x00015640, 0x00015bd0}}}, {{0, 1, 100, 250}}},
+ {&ps_f16tof32, {{{0x000f0000, 0x000f3c00, 0x000f5640, 0x000f5bd0}}}, {{0, 1, 100, 250}}},
+ {&ps_f16tof32, {{{0xffff0000, 0xffff3c00, 0xffff5640, 0xffff5bd0}}}, {{0, 1, 100, 250}}},
+
+ {&ps_f16tof32_2, {{{0x00000000, 0x00003c00, 0x00005640, 0x00005bd0}}}, {{250, 100, 1, 0}}},
+ {&ps_f16tof32_2, {{{0x00010000, 0x00013c00, 0x00015640, 0x00015bd0}}}, {{250, 100, 1, 0}}},
+ {&ps_f16tof32_2, {{{0x000f0000, 0x000f3c00, 0x000f5640, 0x000f5bd0}}}, {{250, 100, 1, 0}}},
+ {&ps_f16tof32_2, {{{0xffff0000, 0xffff3c00, 0xffff5640, 0xffff5bd0}}}, {{250, 100, 1, 0}}},
+
+ {&ps_f32tof16, {.f = {{0.0f, 1.0f, -1.0f, 666.0f}}}, {{0, 0x3c00, 0xbc00, 0x6134}}},
+
+ {&ps_f32tof16_2, {.f = {{0.0f, 1.0f, -1.0f, 666.0f}}}, {{0x6134, 0xbc00, 0x3c00, 0}}},
+
+ {&ps_imad, {{{0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}}, {{ 0, 0, 0, 0}}},
+ {&ps_imad, {{{0, 0, 0, 0}, {0, 0, 0, 0}, {1, 2, 0, 0}}}, {{ 1, 2, 0, 0}}},
+ {&ps_imad, {{{2, 3, 4, 5}, {5, 5, 5, 5}, {0, 0, 0, 0}}}, {{10, 15, 20, 25}}},
+ {&ps_imad, {{{2, 3, 4, 5}, {5, 5, 5, 5}, {5, 5, 6, 6}}}, {{15, 20, 14, 19}}},
+
+ {&ps_imul, {{{0}, { 0u}}}, {{ 0u}}},
+ {&ps_imul, {{{1}, { 2u}}}, {{ 2u}}},
+ {&ps_imul, {{{1}, { 3u}}}, {{ 3u}}},
+ {&ps_imul, {{{6}, { 3u}}}, {{18u}}},
+ {&ps_imul, {{{1}, {~0u}}}, {{~0u}}},
+ {&ps_imul, {{{2}, {~0u}}}, {{~1u}}},
+ {&ps_imul, {{{3}, {~0u}}}, {{~2u}}},
+
+ {&ps_udiv, {{{0}, {0}}}, {{~0u, ~0u}}},
+ {&ps_udiv, {{{1}, {0}}}, {{~0u, ~0u}}},
+ {&ps_udiv, {{{1}, {1}}}, {{ 1u, 0u}}},
+ {&ps_udiv, {{{7}, {1}}}, {{ 7u, 0u}}},
+ {&ps_udiv, {{{7}, {2}}}, {{ 3u, 1u}}},
+ {&ps_udiv, {{{7}, {3}}}, {{ 2u, 1u}}},
+ {&ps_udiv, {{{7}, {4}}}, {{ 1u, 3u}}},
+ {&ps_udiv, {{{7}, {5}}}, {{ 1u, 2u}}},
+ {&ps_udiv, {{{7}, {6}}}, {{ 1u, 1u}}},
+ {&ps_udiv, {{{7}, {7}}}, {{ 1u, 0u}}},
+
+ {&ps_nested_switch, {{{~0u, 0, 0, 0}, {0}}}, {{ 1, 0, 0, 0}}},
+ {&ps_nested_switch, {{{ 0u, 0, 0, 0}, {0}}}, {{ 2, 0, 0, 0}}},
+ {&ps_nested_switch, {{{ 1u, 0, 0, 0}, {0}}}, {{ 2, 0, 0, 0}}},
+ {&ps_nested_switch, {{{ 2u, 0, 0, 0}, {0}}}, {{ 2, 0, 0, 0}}},
+ {&ps_nested_switch, {{{ 0u, 0, 0, 0}, {1}}}, {{ 0, 0, 0, 0}}},
+ {&ps_nested_switch, {{{ 1u, 0, 0, 0}, {2}}}, {{ 0, 0, 0, 0}}},
+ {&ps_nested_switch, {{{ 2u, 0, 0, 0}, {3}}}, {{ 0, 0, 0, 0}}},
+ {&ps_nested_switch, {{{ 3u, 0, 0, 0}, {0}}}, {{ 0, 0, 0, 0}}},
+ {&ps_nested_switch, {{{ 3u, 0, 0, 0}, {1}}}, {{ 0, 0, 0, 0}}},
+ {&ps_nested_switch, {{{ 5u, 1, 2, 3}, {0}}}, {{ 0, 0, 0, 0}}},
+ {&ps_nested_switch, {{{ 6u, 1, 2, 3}, {1}}}, {{ 0, 0, 0, 0}}},
+ {&ps_nested_switch, {{{ 4u, 0, 0, 0}, {0}}}, {{128, 128, 128, 128}}},
+ {&ps_nested_switch, {{{ 4u, 0, 0, 0}, {1}}}, {{ 0, 0, 1, 1}}},
+ {&ps_nested_switch, {{{ 4u, 1, 0, 0}, {1}}}, {{ 0, 0, 1, 1}}},
+ {&ps_nested_switch, {{{ 4u, 2, 0, 0}, {1}}}, {{ 0, 0, 1, 1}}},
+ {&ps_nested_switch, {{{ 4u, 3, 0, 0}, {1}}}, {{ 0, 0, 1, 1}}},
+ {&ps_nested_switch, {{{ 4u, 0, 0, 1}, {1}}}, {{255, 255, 255, 255}}},
+ {&ps_nested_switch, {{{ 4u, 1, 0, 1}, {1}}}, {{255, 255, 255, 255}}},
+ {&ps_nested_switch, {{{ 4u, 2, 0, 1}, {1}}}, {{255, 255, 255, 255}}},
+ {&ps_nested_switch, {{{ 4u, 3, 0, 1}, {1}}}, {{255, 255, 255, 255}}},
+ {&ps_nested_switch, {{{ 4u, 0, 1, 1}, {1}}}, {{ 2, 2, 2, 2}}},
+ {&ps_nested_switch, {{{ 4u, 1, 1, 1}, {1}}}, {{ 2, 2, 2, 2}}},
+ {&ps_nested_switch, {{{ 4u, 2, 1, 1}, {1}}}, {{ 2, 2, 2, 2}}},
+ {&ps_nested_switch, {{{ 4u, 3, 1, 1}, {1}}}, {{ 2, 2, 2, 2}}},
+ {&ps_nested_switch, {{{ 4u, 0, 3, 1}, {1}}}, {{ 6, 6, 6, 6}}},
+ {&ps_nested_switch, {{{ 4u, 1, 3, 1}, {1}}}, {{ 6, 6, 6, 6}}},
+ {&ps_nested_switch, {{{ 4u, 2, 3, 1}, {1}}}, {{ 6, 6, 6, 6}}},
+ {&ps_nested_switch, {{{ 4u, 3, 3, 1}, {1}}}, {{ 6, 6, 6, 6}}},
+ {&ps_nested_switch, {{{ 4u, 5, 3, 1}, {1}}}, {{ 1, 1, 1, 1}}},
+ {&ps_nested_switch, {{{ 4u, 6, 3, 1}, {1}}}, {{ 1, 1, 1, 1}}},
+ {&ps_nested_switch, {{{ 4u, 7, 3, 1}, {1}}}, {{ 1, 1, 1, 1}}},
+ {&ps_nested_switch, {{{ 4u, 8, 3, 1}, {1}}}, {{ 1, 1, 1, 1}}},
+
+ {&ps_switch_no_default, {{{0}}}, {{1, 1, 1, 1}}},
+ {&ps_switch_no_default, {{{1}}}, {{3, 3, 3, 3}}},
+ {&ps_switch_no_default, {{{2}}}, {{3, 3, 3, 3}}},
+ {&ps_switch_no_default, {{{3}}}, {{2, 2, 2, 2}}},
+ {&ps_switch_no_default, {{{4}}}, {{3, 3, 3, 3}}},
+
+ {&ps_movc, {{{0, 0, 0, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 6, 7, 8}}},
+ {&ps_movc, {{{0, 0, 0, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 6, 7, 4}}},
+ {&ps_movc, {{{1, 0, 0, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 6, 7, 8}}},
+ {&ps_movc, {{{1, 0, 0, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 6, 7, 4}}},
+ {&ps_movc, {{{0, 1, 1, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 2, 3, 8}}},
+ {&ps_movc, {{{1, 1, 1, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 2, 3, 4}}},
+
+ {
+ &ps_swapc0,
+ {{{0, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc0,
+ {{{1, 1, 1, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xcccc, 0xdddd}},
+ },
+ {
+ &ps_swapc0,
+ {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff},
+ {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xcccc, 0xdddd}},
+ },
+ {
+ &ps_swapc0,
+ {{{1, 0, 1, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xc0de, 0xcccc, 0xeeee}},
+ },
+ {
+ &ps_swapc0,
+ {{{1, 0, 0, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xc0de, 0xffff, 0xdddd}},
+ },
+ {
+ &ps_swapc0,
+ {{{1, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xc0de, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc0,
+ {{{0, 1, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xbbbb, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc0,
+ {{{0, 0, 1, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xcccc, 0xeeee}},
+ },
+ {
+ &ps_swapc0,
+ {{{0, 0, 0, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xffff, 0xdddd}},
+ },
+
+ {
+ &ps_swapc1,
+ {{{0, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}
+ },
+ {
+ &ps_swapc1,
+ {{{1, 1, 1, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc1,
+ {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff},
+ {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc1,
+ {{{1, 0, 1, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xbbbb, 0xffff, 0xdddd}},
+ },
+ {
+ &ps_swapc1,
+ {{{1, 0, 0, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xbbbb, 0xcccc, 0xeeee}},
+ },
+ {
+ &ps_swapc1,
+ {{{1, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xbbbb, 0xcccc, 0xdddd}}
+ },
+ {
+ &ps_swapc1,
+ {{{0, 1, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xc0de, 0xcccc, 0xdddd}}
+ },
+ {
+ &ps_swapc1,
+ {{{0, 0, 1, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xffff, 0xdddd}}
+ },
+ {
+ &ps_swapc1,
+ {{{0, 0, 0, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xcccc, 0xeeee}},
+ },
+
+ {
+ &ps_swapc2,
+ {{{0, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc2,
+ {{{1, 1, 1, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xcccc, 0xdddd}},
+ },
+ {
+ &ps_swapc2,
+ {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff},
+ {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xcccc, 0xdddd}},
+ },
+ {
+ &ps_swapc2,
+ {{{1, 0, 1, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xc0de, 0xcccc, 0xeeee}},
+ },
+ {
+ &ps_swapc2,
+ {{{1, 0, 0, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xc0de, 0xffff, 0xdddd}},
+ },
+ {
+ &ps_swapc2,
+ {{{1, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xc0de, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc2,
+ {{{0, 1, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xbbbb, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc2,
+ {{{0, 0, 1, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xcccc, 0xeeee}},
+ },
+ {
+ &ps_swapc2,
+ {{{0, 0, 0, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xffff, 0xdddd}},
+ },
+
+ {
+ &ps_swapc3,
+ {{{0, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}
+ },
+ {
+ &ps_swapc3,
+ {{{1, 1, 1, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc3,
+ {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff},
+ {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc3,
+ {{{1, 0, 1, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xbbbb, 0xffff, 0xdddd}},
+ },
+ {
+ &ps_swapc3,
+ {{{1, 0, 0, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xbbbb, 0xcccc, 0xeeee}},
+ },
+ {
+ &ps_swapc3,
+ {{{1, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xbbbb, 0xcccc, 0xdddd}}
+ },
+ {
+ &ps_swapc3,
+ {{{0, 1, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xc0de, 0xcccc, 0xdddd}}
+ },
+ {
+ &ps_swapc3,
+ {{{0, 0, 1, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xffff, 0xdddd}}
+ },
+ {
+ &ps_swapc3,
+ {{{0, 0, 0, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xcccc, 0xeeee}},
+ },
+
+ {
+ &ps_swapc4,
+ {{{0, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc4,
+ {{{1, 1, 1, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xcccc, 0xdddd}},
+ },
+ {
+ &ps_swapc4,
+ {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff},
+ {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xcccc, 0xdddd}},
+ },
+ {
+ &ps_swapc4,
+ {{{1, 0, 1, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xc0de, 0xcccc, 0xeeee}},
+ },
+ {
+ &ps_swapc4,
+ {{{1, 0, 0, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xc0de, 0xffff, 0xdddd}},
+ },
+ {
+ &ps_swapc4,
+ {{{1, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xc0de, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc4,
+ {{{0, 1, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xbbbb, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc4,
+ {{{0, 0, 1, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xcccc, 0xeeee}},
+ },
+ {
+ &ps_swapc4,
+ {{{0, 0, 0, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xffff, 0xdddd}},
+ },
+
+ {
+ &ps_swapc5,
+ {{{0, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}
+ },
+ {
+ &ps_swapc5,
+ {{{1, 1, 1, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc5,
+ {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff},
+ {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xc0de, 0xffff, 0xeeee}},
+ },
+ {
+ &ps_swapc5,
+ {{{1, 0, 1, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xbbbb, 0xffff, 0xdddd}},
+ },
+ {
+ &ps_swapc5,
+ {{{1, 0, 0, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xbbbb, 0xcccc, 0xeeee}},
+ },
+ {
+ &ps_swapc5,
+ {{{1, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xdead, 0xbbbb, 0xcccc, 0xdddd}}
+ },
+ {
+ &ps_swapc5,
+ {{{0, 1, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xc0de, 0xcccc, 0xdddd}}
+ },
+ {
+ &ps_swapc5,
+ {{{0, 0, 1, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xffff, 0xdddd}}
+ },
+ {
+ &ps_swapc5,
+ {{{0, 0, 0, 1}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}},
+ {{0xaaaa, 0xbbbb, 0xcccc, 0xeeee}},
+ },
+ };
+
+ STATIC_ASSERT(sizeof(tests->input) == sizeof(uint_tests->input));
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_cb_root_signature(context.device,
+ 0, D3D12_SHADER_VISIBILITY_PIXEL, D3D12_ROOT_SIGNATURE_FLAG_NONE);
+
+ cb = create_upload_buffer(context.device, sizeof(tests->input), NULL);
+
+ current_ps = NULL;
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("%u:%s", i, tests[i].ps->name);
+
+ if (tests[i].skip_on_warp && use_warp_device)
+ {
+ skip("Skipping shader '%s' test on WARP.\n", tests[i].ps->name);
+ continue;
+ }
+
+ if (current_ps != tests[i].ps)
+ {
+ if (context.pipeline_state)
+ ID3D12PipelineState_Release(context.pipeline_state);
+ current_ps = tests[i].ps;
+ shader.pShaderBytecode = current_ps->code;
+ shader.BytecodeLength = current_ps->size;
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, NULL, &shader, NULL);
+ }
+
+ update_buffer_data(cb, 0, sizeof(tests[i].input), &tests[i].input);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ bug_if(tests[i].is_mesa_bug && is_mesa_device(context.device))
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &tests[i].output.f, 2);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
+ reset_command_list(command_list, context.allocator);
+ ID3D12Resource_Release(context.render_target);
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_UINT;
+ create_render_target(&context, &desc, &context.render_target, &context.rtv);
+
+ for (i = 0; i < ARRAY_SIZE(uint_tests); ++i)
+ {
+ vkd3d_test_set_context("%u:%s", i, uint_tests[i].ps->name);
+
+ if (uint_tests[i].skip_on_warp && use_warp_device)
+ {
+ skip("Skipping shader '%s' test on WARP.\n", uint_tests[i].ps->name);
+ continue;
+ }
+
+ if (current_ps != uint_tests[i].ps)
+ {
+ if (context.pipeline_state)
+ ID3D12PipelineState_Release(context.pipeline_state);
+ current_ps = uint_tests[i].ps;
+ shader.pShaderBytecode = current_ps->code;
+ shader.BytecodeLength = current_ps->size;
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, NULL, &shader, NULL);
+ }
+
+ update_buffer_data(cb, 0, sizeof(uint_tests[i].input), &uint_tests[i].input);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &uint_tests[i].output.u);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12Resource_Release(cb);
+ destroy_test_context(&context);
+}
+
+static void test_compute_shader_instructions(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ const D3D12_SHADER_BYTECODE *current_cs;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *buffer;
+ ID3D12Device *device;
+ unsigned int i, j;
+ uint32_t value;
+ HRESULT hr;
+
+ static const DWORD cs_atomic_iadd_tgsm_raw_code[] =
+ {
+#if 0
+ RWByteAddressBuffer buffer;
+
+ groupshared uint m0;
+ groupshared uint m1;
+
+ uint4 u;
+ int4 s;
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ m0 = buffer.Load(0 * 4);
+ m1 = buffer.Load(1 * 4);
+
+ InterlockedAdd(m0, u.x);
+ InterlockedAdd(m1, s.x);
+
+ GroupMemoryBarrierWithGroupSync();
+
+ buffer.Store(0 * 4, m0);
+ buffer.Store(1 * 4, m1);
+ }
+#endif
+ 0x43425844, 0xcd7bfbec, 0x273e77a4, 0x49b75eb9, 0xe7d291f4, 0x00000001, 0x000001d0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x0000017c, 0x00050050, 0x0000005f, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300009d, 0x0011e000, 0x00000000, 0x02000068,
+ 0x00000001, 0x0400009f, 0x0011f000, 0x00000000, 0x00000004, 0x0400009f, 0x0011f000, 0x00000001,
+ 0x00000004, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x890000a5, 0x800002c2, 0x00199983,
+ 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x0011e006, 0x00000000, 0x070000a6, 0x0011f012,
+ 0x00000000, 0x00004001, 0x00000000, 0x0010000a, 0x00000000, 0x080000ad, 0x0011f000, 0x00000000,
+ 0x00004001, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x890000a5, 0x800002c2, 0x00199983,
+ 0x00100012, 0x00000000, 0x00004001, 0x00000004, 0x0011e006, 0x00000000, 0x070000a6, 0x0011f012,
+ 0x00000001, 0x00004001, 0x00000000, 0x0010000a, 0x00000000, 0x080000ad, 0x0011f000, 0x00000001,
+ 0x00004001, 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x010018be, 0x070000a5, 0x00100022,
+ 0x00000000, 0x00004001, 0x00000000, 0x0011f006, 0x00000001, 0x070000a5, 0x00100012, 0x00000000,
+ 0x00004001, 0x00000000, 0x0011f006, 0x00000000, 0x070000a6, 0x0011e032, 0x00000000, 0x00004001,
+ 0x00000000, 0x00100046, 0x00000000, 0x0100003e,
+ };
+ static D3D12_SHADER_BYTECODE cs_atomic_iadd_tgsm_raw
+ = {cs_atomic_iadd_tgsm_raw_code, sizeof(cs_atomic_iadd_tgsm_raw_code)};
+ static const DWORD cs_atomic_iadd_const_code[] =
+ {
+#if 0
+ RWByteAddressBuffer buffer;
+
+ groupshared uint m;
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ m = buffer.Load(0 * 4);
+
+ InterlockedAdd(m, -1);
+ buffer.InterlockedAdd(1 * 4, -1);
+
+ GroupMemoryBarrierWithGroupSync();
+
+ buffer.Store(0 * 4, m);
+ }
+#endif
+ 0x43425844, 0x85f9168a, 0x5fe0c4d5, 0x5989b572, 0xecb6ce3c, 0x00000001, 0x0000014c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000f8, 0x00050050, 0x0000003e, 0x0100086a,
+ 0x0300009d, 0x0011e000, 0x00000000, 0x02000068, 0x00000001, 0x0400009f, 0x0011f000, 0x00000000,
+ 0x00000004, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x890000a5, 0x800002c2, 0x00199983,
+ 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x0011e006, 0x00000000, 0x070000a6, 0x0011f012,
+ 0x00000000, 0x00004001, 0x00000000, 0x0010000a, 0x00000000, 0x070000ad, 0x0011f000, 0x00000000,
+ 0x00004001, 0x00000000, 0x00004001, 0xffffffff, 0x070000ad, 0x0011e000, 0x00000000, 0x00004001,
+ 0x00000004, 0x00004001, 0xffffffff, 0x010018be, 0x070000a5, 0x00100012, 0x00000000, 0x00004001,
+ 0x00000000, 0x0011f006, 0x00000000, 0x070000a6, 0x0011e012, 0x00000000, 0x00004001, 0x00000000,
+ 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE cs_atomic_iadd_const
+ = {cs_atomic_iadd_const_code, sizeof(cs_atomic_iadd_const_code)};
+ static const struct
+ {
+ const D3D12_SHADER_BYTECODE *cs;
+ struct uvec4 u;
+ struct ivec4 s;
+ uint32_t input_data[10];
+ uint32_t expected_data[10];
+ }
+ tests[] =
+ {
+ {&cs_atomic_iadd_tgsm_raw, { 0}, { 0}, {0, 0}, {0, 0}},
+ {&cs_atomic_iadd_tgsm_raw, { 0}, { 0}, {1, 1}, {1, 1}},
+ {&cs_atomic_iadd_tgsm_raw, { 1}, { 1}, {0, 0}, {1, 1}},
+ {&cs_atomic_iadd_tgsm_raw, {0xffffffff}, {-1}, {1, 1}, {0, 0}},
+ {&cs_atomic_iadd_tgsm_raw, {0xffffffff}, {-1}, {4, 4}, {3, 3}},
+
+ {&cs_atomic_iadd_const, {0}, {0}, {0x00000000, 0x00000000}, {0xffffffff, 0xffffffff}},
+ {&cs_atomic_iadd_const, {0}, {0}, {0x00000001, 0x00000001}, {0x00000000, 0x00000000}},
+ {&cs_atomic_iadd_const, {0}, {0}, {0xffffffff, 0xffffffff}, {0xfffffffe, 0xfffffffe}},
+ };
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[0].Descriptor.ShaderRegister = 0;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 8;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ buffer = create_default_buffer(device, 512,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+
+ current_cs = NULL;
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ if (current_cs != tests[i].cs)
+ {
+ if (context.pipeline_state)
+ ID3D12PipelineState_Release(context.pipeline_state);
+ current_cs = tests[i].cs;
+ context.pipeline_state = create_compute_pipeline_state(device,
+ context.root_signature, *current_cs);
+ }
+
+ upload_buffer_data(buffer, 0, sizeof(tests[i].input_data), tests[i].input_data,
+ queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, buffer,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(buffer));
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstants(command_list, 1, 4, &tests[i].u, 0);
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstants(command_list, 1, 4, &tests[i].s, 4);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ transition_resource_state(command_list, buffer,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (j = 0; j < ARRAY_SIZE(tests[i].expected_data); ++j)
+ {
+ value = get_readback_uint(&rb, j, 0, 0);
+ ok(value == tests[i].expected_data[j], "Test %u: Got 0x%08x, expected 0x%08x at %u.\n",
+ i, value, tests[i].expected_data[j], j);
+ }
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, buffer,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST);
+ }
+
+ ID3D12Resource_Release(buffer);
+ destroy_test_context(&context);
+}
+
+static void test_discard_instruction(void)
+{
+ ID3D12PipelineState *pso_discard_nz, *pso_discard_z;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ ID3D12Resource *cb;
+ unsigned int i;
+
+ static const DWORD ps_discard_nz_code[] =
+ {
+#if 0
+ uint data;
+
+ float4 main() : SV_Target
+ {
+ if (data)
+ discard;
+ return float4(0.0f, 0.5f, 0.0f, 1.0f);
+ }
+#endif
+ 0x43425844, 0xfa7e5758, 0xd8716ffc, 0x5ad6a940, 0x2b99bba2, 0x00000001, 0x000000d0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0404000d,
+ 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000,
+ 0x3f000000, 0x00000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_discard_nz = {ps_discard_nz_code, sizeof(ps_discard_nz_code)};
+ static const DWORD ps_discard_z_code[] =
+ {
+#if 0
+ uint data;
+
+ float4 main() : SV_Target
+ {
+ if (!data)
+ discard;
+ return float4(0.0f, 1.0f, 0.0f, 1.0f);
+ }
+#endif
+ 0x43425844, 0x5c4dd108, 0x1eb43558, 0x7c02c98c, 0xd81eb34c, 0x00000001, 0x000000d0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0400000d,
+ 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000,
+ 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_discard_z = {ps_discard_z_code, sizeof(ps_discard_z_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const struct uvec4 values[] =
+ {
+ {0x0000000},
+ {0x0000001},
+ {0x8000000},
+ {0xfffffff},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_cb_root_signature(device,
+ 0, D3D12_SHADER_VISIBILITY_PIXEL, D3D12_ROOT_SIGNATURE_FLAG_NONE);
+ pso_discard_nz = create_pipeline_state(device, context.root_signature,
+ context.render_target_desc.Format, NULL, &ps_discard_nz, NULL);
+ pso_discard_z = create_pipeline_state(device, context.root_signature,
+ context.render_target_desc.Format, NULL, &ps_discard_z, NULL);
+
+ cb = create_upload_buffer(device, sizeof(*values), NULL);
+
+ for (i = 0; i < ARRAY_SIZE(values); ++i)
+ {
+ update_buffer_data(cb, 0, sizeof(values[i]), &values[i]);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso_discard_nz);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list,
+ values[i].x ? 0xffffffff : 0xff007f00, 1);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso_discard_z);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list,
+ values[i].x ? 0xff00ff00 : 0xffffffff, 1);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+
+ ID3D12Resource_Release(cb);
+ ID3D12PipelineState_Release(pso_discard_nz);
+ ID3D12PipelineState_Release(pso_discard_z);
+ destroy_test_context(&context);
+}
+
+static void test_shader_interstage_interface(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *vb;
+
+ static const DWORD vs_code[] =
+ {
+#if 0
+ struct vertex
+ {
+ float4 position : SV_Position;
+ float2 t0 : TEXCOORD0;
+ nointerpolation float t1 : TEXCOORD1;
+ uint t2 : TEXCOORD2;
+ uint t3 : TEXCOORD3;
+ float t4 : TEXCOORD4;
+ };
+
+ void main(in vertex vin, out vertex vout)
+ {
+ vout = vin;
+ }
+#endif
+ 0x43425844, 0x561ea178, 0x7b8f454c, 0x69091b4f, 0xf28d9a01, 0x00000001, 0x000002c0, 0x00000003,
+ 0x0000002c, 0x000000e4, 0x0000019c, 0x4e475349, 0x000000b0, 0x00000006, 0x00000008, 0x00000098,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x000000a4, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000303, 0x000000a4, 0x00000001, 0x00000000, 0x00000003, 0x00000002,
+ 0x00000101, 0x000000a4, 0x00000002, 0x00000000, 0x00000001, 0x00000003, 0x00000101, 0x000000a4,
+ 0x00000003, 0x00000000, 0x00000001, 0x00000004, 0x00000101, 0x000000a4, 0x00000004, 0x00000000,
+ 0x00000003, 0x00000005, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f,
+ 0xababab00, 0x4e47534f, 0x000000b0, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x00000001,
+ 0x00000003, 0x00000000, 0x0000000f, 0x000000a4, 0x00000000, 0x00000000, 0x00000003, 0x00000001,
+ 0x00000c03, 0x000000a4, 0x00000004, 0x00000000, 0x00000003, 0x00000001, 0x00000b04, 0x000000a4,
+ 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000e01, 0x000000a4, 0x00000002, 0x00000000,
+ 0x00000001, 0x00000002, 0x00000d02, 0x000000a4, 0x00000003, 0x00000000, 0x00000001, 0x00000002,
+ 0x00000b04, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, 0xababab00, 0x58454853,
+ 0x0000011c, 0x00010050, 0x00000047, 0x0100086a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f,
+ 0x00101032, 0x00000001, 0x0300005f, 0x00101012, 0x00000002, 0x0300005f, 0x00101012, 0x00000003,
+ 0x0300005f, 0x00101012, 0x00000004, 0x0300005f, 0x00101012, 0x00000005, 0x04000067, 0x001020f2,
+ 0x00000000, 0x00000001, 0x03000065, 0x00102032, 0x00000001, 0x03000065, 0x00102042, 0x00000001,
+ 0x03000065, 0x00102012, 0x00000002, 0x03000065, 0x00102022, 0x00000002, 0x03000065, 0x00102042,
+ 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102032,
+ 0x00000001, 0x00101046, 0x00000001, 0x05000036, 0x00102042, 0x00000001, 0x0010100a, 0x00000005,
+ 0x05000036, 0x00102012, 0x00000002, 0x0010100a, 0x00000002, 0x05000036, 0x00102022, 0x00000002,
+ 0x0010100a, 0x00000003, 0x05000036, 0x00102042, 0x00000002, 0x0010100a, 0x00000004, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ void main(float4 position : SV_Position, float2 t0 : TEXCOORD0,
+ nointerpolation float t1 : TEXCOORD1, uint t2 : TEXCOORD2,
+ uint t3 : TEXCOORD3, float t4 : TEXCOORD4, out float4 o : SV_Target)
+ {
+ o.x = t0.y + t1;
+ o.y = t2 + t3;
+ o.z = t4;
+ o.w = t0.x;
+ }
+#endif
+ 0x43425844, 0x21076b15, 0x493d36f1, 0x0cd125d6, 0x1e92c724, 0x00000001, 0x000001e0, 0x00000003,
+ 0x0000002c, 0x000000e4, 0x00000118, 0x4e475349, 0x000000b0, 0x00000006, 0x00000008, 0x00000098,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x000000a4, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000303, 0x000000a4, 0x00000004, 0x00000000, 0x00000003, 0x00000001,
+ 0x00000404, 0x000000a4, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000101, 0x000000a4,
+ 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000202, 0x000000a4, 0x00000003, 0x00000000,
+ 0x00000001, 0x00000002, 0x00000404, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f,
+ 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000c0,
+ 0x00000050, 0x00000030, 0x0100086a, 0x03001062, 0x00101032, 0x00000001, 0x03001062, 0x00101042,
+ 0x00000001, 0x03000862, 0x00101012, 0x00000002, 0x03000862, 0x00101022, 0x00000002, 0x03000862,
+ 0x00101042, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0700001e,
+ 0x00100012, 0x00000000, 0x0010101a, 0x00000002, 0x0010102a, 0x00000002, 0x05000056, 0x00102022,
+ 0x00000000, 0x0010000a, 0x00000000, 0x07000000, 0x00102012, 0x00000000, 0x0010101a, 0x00000001,
+ 0x0010100a, 0x00000002, 0x05000036, 0x001020c2, 0x00000000, 0x001012a6, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"SV_POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"TEXCOORD", 1, DXGI_FORMAT_R32_FLOAT, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"TEXCOORD", 2, DXGI_FORMAT_R32_UINT, 0, 20, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"TEXCOORD", 3, DXGI_FORMAT_R32_UINT, 0, 24, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"TEXCOORD", 4, DXGI_FORMAT_R32_FLOAT, 0, 28, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const struct
+ {
+ struct vec2 position;
+ struct vec2 t0;
+ float t1;
+ unsigned int t2;
+ unsigned int t3;
+ float t4;
+ }
+ quad[] =
+ {
+ {{-1.0f, -1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f},
+ {{-1.0f, 1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f},
+ {{ 1.0f, -1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f},
+ {{ 1.0f, 1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f},
+ };
+ static const struct vec4 expected_result = {10.0f, 8.0f, 7.0f, 3.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_empty_root_signature(context.device,
+ D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT);
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, &vs, &ps, &input_layout);
+
+ vb = create_upload_buffer(context.device, sizeof(quad), quad);
+
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*quad);
+ vbv.SizeInBytes = sizeof(quad);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_result, 0);
+
+ ID3D12Resource_Release(vb);
+ destroy_test_context(&context);
+}
+
+static void test_shader_input_output_components(void)
+{
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ D3D12_CPU_DESCRIPTOR_HANDLE rtvs[2];
+ ID3D12Resource *uint_render_target;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *vb;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD vs1_code[] =
+ {
+#if 0
+ void main(float4 in_position : POSITION, uint4 in_uint : UINT,
+ out float4 out_position : SV_POSITION, out uint out_uint : UINT,
+ out float3 out_float : FLOAT)
+ {
+ out_position = in_position;
+ out_uint = in_uint.y;
+ out_float = float3(1, 2, 3);
+ }
+#endif
+ 0x43425844, 0x0521bc60, 0xd39733a4, 0x1522eea3, 0x0c741ea3, 0x00000001, 0x0000018c, 0x00000003,
+ 0x0000002c, 0x0000007c, 0x000000ec, 0x4e475349, 0x00000048, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000,
+ 0x00000001, 0x00000001, 0x0000020f, 0x49534f50, 0x4e4f4954, 0x4e495500, 0xabab0054, 0x4e47534f,
+ 0x00000068, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000,
+ 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000e01, 0x00000061,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000807, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x544e4955, 0x4f4c4600, 0xab005441, 0x58454853, 0x00000098, 0x00010050, 0x00000026, 0x0100086a,
+ 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101022, 0x00000001, 0x04000067, 0x001020f2,
+ 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, 0x03000065, 0x00102072, 0x00000002,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102012, 0x00000001,
+ 0x0010101a, 0x00000001, 0x08000036, 0x00102072, 0x00000002, 0x00004002, 0x3f800000, 0x40000000,
+ 0x40400000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs1 = {vs1_code, sizeof(vs1_code)};
+ static const DWORD ps1_code[] =
+ {
+#if 0
+ void main(float4 position : SV_POSITION, uint in_uint : UINT,
+ float3 in_float : FLOAT, out float4 out_float : SV_TARGET0,
+ out uint4 out_uint : SV_TARGET1)
+ {
+ out_float.x = position.w;
+ out_float.y = in_uint;
+ out_float.z = in_float.z;
+ out_float.w = 0;
+ out_uint.x = 0xdeadbeef;
+ out_uint.y = 0;
+ out_uint.z = in_uint;
+ out_uint.w = in_float.z;
+ }
+#endif
+ 0x43425844, 0x762dbf5e, 0x2cc83972, 0x60c7aa48, 0xbca6118a, 0x00000001, 0x000001d4, 0x00000003,
+ 0x0000002c, 0x0000009c, 0x000000e8, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000080f, 0x0000005c, 0x00000000, 0x00000000,
+ 0x00000001, 0x00000001, 0x00000101, 0x00000061, 0x00000000, 0x00000000, 0x00000003, 0x00000002,
+ 0x00000407, 0x505f5653, 0x5449534f, 0x004e4f49, 0x544e4955, 0x4f4c4600, 0xab005441, 0x4e47534f,
+ 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x00000038, 0x00000001, 0x00000000, 0x00000001, 0x00000001, 0x0000000f, 0x545f5653,
+ 0x45475241, 0xabab0054, 0x52444853, 0x000000e4, 0x00000040, 0x00000039, 0x04002064, 0x00101082,
+ 0x00000000, 0x00000001, 0x03000862, 0x00101012, 0x00000001, 0x03001062, 0x00101042, 0x00000002,
+ 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x05000056, 0x00102022,
+ 0x00000000, 0x0010100a, 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010103a, 0x00000000,
+ 0x05000036, 0x00102042, 0x00000000, 0x0010102a, 0x00000002, 0x05000036, 0x00102082, 0x00000000,
+ 0x00004001, 0x00000000, 0x0500001c, 0x00102082, 0x00000001, 0x0010102a, 0x00000002, 0x08000036,
+ 0x00102032, 0x00000001, 0x00004002, 0xdeadbeef, 0x00000000, 0x00000000, 0x00000000, 0x05000036,
+ 0x00102042, 0x00000001, 0x0010100a, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps1 = {ps1_code, sizeof(ps1_code)};
+ static const DWORD vs2_code[] =
+ {
+#if 0
+ void main(float4 in_position : POSITION,
+ float4 in_texcoord0 : TEXCOORD0, float4 in_texcoord1 : TEXCOORD1,
+ float4 in_texcoord2 : TEXCOORD2,
+ out float4 position : Sv_Position,
+ out float2 texcoord0 : TEXCOORD0, out float2 texcoord1 : TEXCOORD1,
+ out float4 texcoord2 : TEXCOORD2, out float3 texcoord3 : TEXCOORD3)
+ {
+ position = in_position;
+ texcoord0 = in_texcoord0.yx;
+ texcoord1 = in_texcoord0.wz;
+ texcoord2 = in_texcoord1;
+ texcoord3 = in_texcoord2.yzx;
+ }
+#endif
+ 0x43425844, 0x6721613b, 0xb997c7e4, 0x8bc3df4d, 0x813c93b9, 0x00000001, 0x00000224, 0x00000003,
+ 0x0000002c, 0x000000b0, 0x00000150, 0x4e475349, 0x0000007c, 0x00000004, 0x00000008, 0x00000068,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000071, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x00000071, 0x00000001, 0x00000000, 0x00000003, 0x00000002,
+ 0x00000f0f, 0x00000071, 0x00000002, 0x00000000, 0x00000003, 0x00000003, 0x0000070f, 0x49534f50,
+ 0x4e4f4954, 0x58455400, 0x524f4f43, 0xabab0044, 0x4e47534f, 0x00000098, 0x00000005, 0x00000008,
+ 0x00000080, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000008c, 0x00000000,
+ 0x00000000, 0x00000003, 0x00000001, 0x00000c03, 0x0000008c, 0x00000001, 0x00000000, 0x00000003,
+ 0x00000001, 0x0000030c, 0x0000008c, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f,
+ 0x0000008c, 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000807, 0x505f7653, 0x7469736f,
+ 0x006e6f69, 0x43584554, 0x44524f4f, 0xababab00, 0x52444853, 0x000000cc, 0x00010040, 0x00000033,
+ 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x0300005f, 0x001010f2,
+ 0x00000002, 0x0300005f, 0x00101072, 0x00000003, 0x04000067, 0x001020f2, 0x00000000, 0x00000001,
+ 0x03000065, 0x00102032, 0x00000001, 0x03000065, 0x001020c2, 0x00000001, 0x03000065, 0x001020f2,
+ 0x00000002, 0x03000065, 0x00102072, 0x00000003, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46,
+ 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101b16, 0x00000001, 0x05000036, 0x001020f2,
+ 0x00000002, 0x00101e46, 0x00000002, 0x05000036, 0x00102072, 0x00000003, 0x00101496, 0x00000003,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs2 = {vs2_code, sizeof(vs2_code)};
+ static const DWORD ps2_code[] =
+ {
+#if 0
+ void main(float4 position : Sv_Position,
+ float2 texcoord0 : TEXCOORD0, float2 texcoord1 : TEXCOORD1,
+ float4 texcoord2 : TEXCOORD2, float3 texcoord3 : TEXCOORD3,
+ out float4 target0 : Sv_Target0, out uint4 target1 : SV_Target1)
+ {
+ target0.x = texcoord0.x + texcoord0.y;
+ target0.y = texcoord1.x;
+ target0.z = texcoord3.z;
+ target0.w = texcoord1.y;
+
+ target1.x = texcoord2.x;
+ target1.y = texcoord2.y;
+ target1.w = texcoord2.w;
+ target1.z = 0;
+ }
+#endif
+ 0x43425844, 0xa6c0df60, 0x5bf34683, 0xa0093595, 0x98cca724, 0x00000001, 0x000001e8, 0x00000003,
+ 0x0000002c, 0x000000cc, 0x00000120, 0x4e475349, 0x00000098, 0x00000005, 0x00000008, 0x00000080,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000008c, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000303, 0x0000008c, 0x00000001, 0x00000000, 0x00000003, 0x00000001,
+ 0x00000c0c, 0x0000008c, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x00000b0f, 0x0000008c,
+ 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000407, 0x505f7653, 0x7469736f, 0x006e6f69,
+ 0x43584554, 0x44524f4f, 0xababab00, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000042, 0x00000001, 0x00000000,
+ 0x00000001, 0x00000001, 0x0000000f, 0x545f7653, 0x65677261, 0x56530074, 0x7261545f, 0x00746567,
+ 0x52444853, 0x000000c0, 0x00000040, 0x00000030, 0x03001062, 0x00101032, 0x00000001, 0x03001062,
+ 0x001010c2, 0x00000001, 0x03001062, 0x001010b2, 0x00000002, 0x03001062, 0x00101042, 0x00000003,
+ 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x07000000, 0x00102012,
+ 0x00000000, 0x0010101a, 0x00000001, 0x0010100a, 0x00000001, 0x05000036, 0x001020a2, 0x00000000,
+ 0x00101ea6, 0x00000001, 0x05000036, 0x00102042, 0x00000000, 0x0010102a, 0x00000003, 0x0500001c,
+ 0x001020b2, 0x00000001, 0x00101c46, 0x00000002, 0x05000036, 0x00102042, 0x00000001, 0x00004001,
+ 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps2 = {ps2_code, sizeof(ps2_code)};
+ static const DWORD ps3_code[] =
+ {
+#if 0
+ void main(float4 position : Sv_Position,
+ float2 texcoord0 : TEXCOORD0, float2 texcoord1 : TEXCOORD1,
+ float4 texcoord2 : TEXCOORD2, float3 texcoord3 : TEXCOORD3,
+ out float4 target0 : Sv_Target0, out uint4 target1 : SV_Target1)
+ {
+ target0.x = texcoord0.x;
+ target0.y = texcoord1.y;
+ target0.z = texcoord3.z;
+ target0.w = texcoord3.z;
+
+ target1.x = texcoord2.x;
+ target1.y = 0;
+ target1.w = texcoord2.w;
+ target1.z = 0;
+ }
+#endif
+ 0x43425844, 0x2df3a11d, 0x885fc859, 0x332d922b, 0xf8e01020, 0x00000001, 0x000001d8, 0x00000003,
+ 0x0000002c, 0x000000cc, 0x00000120, 0x4e475349, 0x00000098, 0x00000005, 0x00000008, 0x00000080,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000008c, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000103, 0x0000008c, 0x00000001, 0x00000000, 0x00000003, 0x00000001,
+ 0x0000080c, 0x0000008c, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000090f, 0x0000008c,
+ 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000407, 0x505f7653, 0x7469736f, 0x006e6f69,
+ 0x43584554, 0x44524f4f, 0xababab00, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000042, 0x00000001, 0x00000000,
+ 0x00000001, 0x00000001, 0x0000000f, 0x545f7653, 0x65677261, 0x56530074, 0x7261545f, 0x00746567,
+ 0x52444853, 0x000000b0, 0x00000040, 0x0000002c, 0x03001062, 0x00101012, 0x00000001, 0x03001062,
+ 0x00101082, 0x00000001, 0x03001062, 0x00101092, 0x00000002, 0x03001062, 0x00101042, 0x00000003,
+ 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x00102032,
+ 0x00000000, 0x001010c6, 0x00000001, 0x05000036, 0x001020c2, 0x00000000, 0x00101aa6, 0x00000003,
+ 0x0500001c, 0x00102092, 0x00000001, 0x00101c06, 0x00000002, 0x08000036, 0x00102062, 0x00000001,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps3 = {ps3_code, sizeof(ps3_code)};
+ /* position.xyw */
+ static const DWORD ps4_code[] =
+ {
+#if 0
+ void main(float4 position : Sv_Position,
+ float2 texcoord0 : TEXCOORD0, float2 texcoord1 : TEXCOORD1,
+ float4 texcoord2 : TEXCOORD2, float3 texcoord3 : TEXCOORD3,
+ out float4 target0 : Sv_Target0, out uint4 target1 : SV_Target1)
+ {
+ if (all(position.xy < float2(64, 64)))
+ target0 = float4(0, 1, 0, 1);
+ else
+ target0 = float4(0, 0, 0, 0);
+
+ target1.xyzw = 0;
+ target1.y = position.w;
+ }
+#endif
+ 0x43425844, 0x6dac90a1, 0x518a6b0a, 0x393cc320, 0x5f6fbe5e, 0x00000001, 0x00000204, 0x00000003,
+ 0x0000002c, 0x000000cc, 0x00000120, 0x4e475349, 0x00000098, 0x00000005, 0x00000008, 0x00000080,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000b0f, 0x0000008c, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000003, 0x0000008c, 0x00000001, 0x00000000, 0x00000003, 0x00000001,
+ 0x0000000c, 0x0000008c, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x0000008c,
+ 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000007, 0x505f7653, 0x7469736f, 0x006e6f69,
+ 0x43584554, 0x44524f4f, 0xababab00, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000042, 0x00000001, 0x00000000,
+ 0x00000001, 0x00000001, 0x0000000f, 0x545f7653, 0x65677261, 0x56530074, 0x7261545f, 0x00746567,
+ 0x52444853, 0x000000dc, 0x00000040, 0x00000037, 0x04002064, 0x001010b2, 0x00000000, 0x00000001,
+ 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000001,
+ 0x0a000031, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x42800000, 0x42800000,
+ 0x00000000, 0x00000000, 0x07000001, 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a,
+ 0x00000000, 0x0a000001, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x00004002, 0x00000000,
+ 0x3f800000, 0x00000000, 0x3f800000, 0x0500001c, 0x00102022, 0x00000001, 0x0010103a, 0x00000000,
+ 0x08000036, 0x001020d2, 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps4 = {ps4_code, sizeof(ps4_code)};
+#if 0
+ struct ps_data
+ {
+ float4 position : SV_Position;
+ float4 color : COLOR;
+ float3 color1 : COLOR1;
+ float color2 : COLOR2;
+ };
+
+ ps_data vs_main(float4 position : POSITION)
+ {
+ ps_data o;
+ o.position = position;
+ o.color = float4(0, 1, 0, 1);
+ o.color1 = (float3)0.5;
+ o.color2 = 0.25;
+ return o;
+ }
+
+ float4 ps_main(ps_data i) : SV_Target
+ {
+ return float4(i.color.rgb, i.color2);
+ }
+#endif
+ static const DWORD vs5_code[] =
+ {
+ 0x43425844, 0xc3e1b9fc, 0xb99e43ef, 0x9a2a6dfc, 0xad719e68, 0x00000001, 0x00000190, 0x00000003,
+ 0x0000002c, 0x00000060, 0x000000e4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00,
+ 0x4e47534f, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f,
+ 0x00000074, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000807, 0x00000074, 0x00000002,
+ 0x00000000, 0x00000003, 0x00000002, 0x00000708, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43,
+ 0xabab0052, 0x58454853, 0x000000a4, 0x00010050, 0x00000029, 0x0100086a, 0x0300005f, 0x001010f2,
+ 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001,
+ 0x03000065, 0x00102072, 0x00000002, 0x03000065, 0x00102082, 0x00000002, 0x05000036, 0x001020f2,
+ 0x00000000, 0x00101e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x00000000,
+ 0x3f800000, 0x00000000, 0x3f800000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x3f000000,
+ 0x3f000000, 0x3f000000, 0x3e800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs5 = {vs5_code, sizeof(vs5_code)};
+ static const DWORD ps5_code[] =
+ {
+ 0x43425844, 0x285bf397, 0xbc07e078, 0xc4e528e3, 0x74efea4d, 0x00000001, 0x00000148, 0x00000003,
+ 0x0000002c, 0x000000b0, 0x000000e4, 0x4e475349, 0x0000007c, 0x00000004, 0x00000008, 0x00000068,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x0000070f, 0x00000074, 0x00000001, 0x00000000, 0x00000003, 0x00000002,
+ 0x00000007, 0x00000074, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x00000808, 0x505f5653,
+ 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261,
+ 0xabab0074, 0x58454853, 0x0000005c, 0x00000050, 0x00000017, 0x0100086a, 0x03001062, 0x00101072,
+ 0x00000001, 0x03001062, 0x00101082, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x05000036,
+ 0x00102072, 0x00000000, 0x00101246, 0x00000001, 0x05000036, 0x00102082, 0x00000000, 0x0010103a,
+ 0x00000002, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps5 = {ps5_code, sizeof(ps5_code)};
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"UINT", 0, DXGI_FORMAT_R32G32B32A32_UINT, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"TEXCOORD", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 32, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"TEXCOORD", 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 48, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"TEXCOORD", 2, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 64, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const struct
+ {
+ struct vec4 position;
+ struct uvec4 u;
+ struct vec4 t0;
+ struct vec4 t1;
+ struct vec4 t2;
+ }
+ quad[] =
+ {
+ {{-1.0f, -1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f, 5.0f}},
+ {{-1.0f, 1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f, 5.0f}},
+ {{ 1.0f, -1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f, 5.0f}},
+ {{ 1.0f, 1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f, 5.0f}},
+ };
+ static const struct
+ {
+ const D3D12_SHADER_BYTECODE *vs;
+ const D3D12_SHADER_BYTECODE *ps;
+ const struct vec4 expected_vec4;
+ const struct uvec4 expected_uvec4;
+ }
+ tests[] =
+ {
+ {&vs1, &ps1, {1.0f, 2.0f, 3.0f, 0.00f}, {0xdeadbeef, 0, 2, 3}},
+ {&vs2, &ps2, {6.0f, 4.0f, 7.0f, 8.00f}, { 9, 5, 0, 1}},
+ {&vs2, &ps3, {3.0f, 8.0f, 7.0f, 7.00f}, { 9, 0, 0, 1}},
+ {&vs2, &ps4, {0.0f, 1.0f, 0.0f, 1.00f}, { 0, 1, 0, 0}},
+ {&vs5, &ps5, {0.0f, 1.0f, 0.0f, 0.25f}, { 0, 1, 0, 0}},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.rt_descriptor_count = 2;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_empty_root_signature(context.device,
+ D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT);
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ init_pipeline_state_desc(&pso_desc, context.root_signature, desc.rt_format, NULL, NULL, &input_layout);
+ pso_desc.NumRenderTargets = 2;
+ pso_desc.RTVFormats[1] = DXGI_FORMAT_R32G32B32A32_UINT;
+
+ rtvs[0] = context.rtv;
+ rtvs[1] = get_cpu_rtv_handle(&context, context.rtv_heap, 1);
+ desc.rt_format = pso_desc.RTVFormats[1];
+ create_render_target(&context, &desc, &uint_render_target, &rtvs[1]);
+
+ vb = create_upload_buffer(context.device, sizeof(quad), quad);
+
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*quad);
+ vbv.SizeInBytes = sizeof(quad);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ pso_desc.VS = *tests[i].vs;
+ pso_desc.PS = *tests[i].ps;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ if (i)
+ {
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ transition_resource_state(command_list, uint_render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 2, &context.rtv, true, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &tests[i].expected_vec4, 0);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, uint_render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uvec4(uint_render_target, 0, queue, command_list, &tests[i].expected_uvec4);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ context.pipeline_state = NULL;
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12Resource_Release(vb);
+ ID3D12Resource_Release(uint_render_target);
+ destroy_test_context(&context);
+}
+
+static void check_descriptor_range_(unsigned int line, const D3D12_DESCRIPTOR_RANGE *range,
+ const D3D12_DESCRIPTOR_RANGE *expected_range)
+{
+ ok_(line)(range->RangeType == expected_range->RangeType,
+ "Got range type %#x, expected %#x.\n", range->RangeType, expected_range->RangeType);
+ ok_(line)(range->NumDescriptors == expected_range->NumDescriptors,
+ "Got descriptor count %u, expected %u.\n", range->NumDescriptors, expected_range->NumDescriptors);
+ ok_(line)(range->BaseShaderRegister == expected_range->BaseShaderRegister,
+ "Got base shader register %u, expected %u.\n",
+ range->BaseShaderRegister, expected_range->BaseShaderRegister);
+ ok_(line)(range->RegisterSpace == expected_range->RegisterSpace,
+ "Got register space %u, expected %u.\n", range->RegisterSpace, expected_range->RegisterSpace);
+ ok_(line)(range->OffsetInDescriptorsFromTableStart == expected_range->OffsetInDescriptorsFromTableStart,
+ "Got offset %u, expected %u.\n", range->OffsetInDescriptorsFromTableStart,
+ expected_range->OffsetInDescriptorsFromTableStart);
+}
+
+static void check_descriptor_range1_(unsigned int line, const D3D12_DESCRIPTOR_RANGE1 *range,
+ const D3D12_DESCRIPTOR_RANGE1 *expected_range, bool converted)
+{
+ unsigned int expected_flags = converted
+ ? D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | D3D12_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE
+ : expected_range->Flags;
+
+ ok_(line)(range->RangeType == expected_range->RangeType,
+ "Got range type %#x, expected %#x.\n", range->RangeType, expected_range->RangeType);
+ ok_(line)(range->NumDescriptors == expected_range->NumDescriptors,
+ "Got descriptor count %u, expected %u.\n", range->NumDescriptors, expected_range->NumDescriptors);
+ ok_(line)(range->BaseShaderRegister == expected_range->BaseShaderRegister,
+ "Got base shader register %u, expected %u.\n",
+ range->BaseShaderRegister, expected_range->BaseShaderRegister);
+ ok_(line)(range->RegisterSpace == expected_range->RegisterSpace,
+ "Got register space %u, expected %u.\n", range->RegisterSpace, expected_range->RegisterSpace);
+ ok_(line)(range->Flags == expected_flags,
+ "Got descriptor range flags %#x, expected %#x.\n", range->Flags, expected_flags);
+ ok_(line)(range->OffsetInDescriptorsFromTableStart == expected_range->OffsetInDescriptorsFromTableStart,
+ "Got offset %u, expected %u.\n", range->OffsetInDescriptorsFromTableStart,
+ expected_range->OffsetInDescriptorsFromTableStart);
+}
+
+static void check_root_parameter_(unsigned int line, const D3D12_ROOT_PARAMETER *parameter,
+ const D3D12_ROOT_PARAMETER *expected_parameter)
+{
+ const D3D12_ROOT_DESCRIPTOR *descriptor, *expected_descriptor;
+ const D3D12_ROOT_DESCRIPTOR_TABLE *table, *expected_table;
+ const D3D12_ROOT_CONSTANTS *constants, *expected_constants;
+ unsigned int i;
+
+ ok_(line)(parameter->ParameterType == expected_parameter->ParameterType,
+ "Got type %#x, expected %#x.\n", parameter->ParameterType, expected_parameter->ParameterType);
+ if (parameter->ParameterType != expected_parameter->ParameterType)
+ return;
+
+ switch (parameter->ParameterType)
+ {
+ case D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE:
+ table = ¶meter->DescriptorTable;
+ expected_table = &expected_parameter->DescriptorTable;
+ ok_(line)(table->NumDescriptorRanges == expected_table->NumDescriptorRanges,
+ "Got range count %u, expected %u.\n",
+ table->NumDescriptorRanges, expected_table->NumDescriptorRanges);
+ if (table->NumDescriptorRanges == expected_table->NumDescriptorRanges)
+ {
+ for (i = 0; i < table->NumDescriptorRanges; ++i)
+ check_descriptor_range_(line, &table->pDescriptorRanges[i],
+ &expected_table->pDescriptorRanges[i]);
+ }
+ break;
+ case D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS:
+ constants = ¶meter->Constants;
+ expected_constants = &expected_parameter->Constants;
+ ok_(line)(constants->ShaderRegister == expected_constants->ShaderRegister,
+ "Got shader register %u, expected %u.\n",
+ constants->ShaderRegister, expected_constants->ShaderRegister);
+ ok_(line)(constants->RegisterSpace == expected_constants->RegisterSpace,
+ "Got register space %u, expected %u.\n",
+ constants->RegisterSpace, expected_constants->RegisterSpace);
+ ok_(line)(constants->Num32BitValues == expected_constants->Num32BitValues,
+ "Got 32-bit value count %u, expected %u.\n",
+ constants->Num32BitValues, expected_constants->Num32BitValues);
+ break;
+ case D3D12_ROOT_PARAMETER_TYPE_CBV:
+ case D3D12_ROOT_PARAMETER_TYPE_SRV:
+ case D3D12_ROOT_PARAMETER_TYPE_UAV:
+ descriptor = ¶meter->Descriptor;
+ expected_descriptor = &expected_parameter->Descriptor;
+ ok_(line)(descriptor->ShaderRegister == expected_descriptor->ShaderRegister,
+ "Got shader register %u, expected %u.\n",
+ descriptor->ShaderRegister, expected_descriptor->ShaderRegister);
+ ok_(line)(descriptor->RegisterSpace == expected_descriptor->RegisterSpace,
+ "Got register space %u, expected %u.\n",
+ descriptor->RegisterSpace, expected_descriptor->RegisterSpace);
+ break;
+ default:
+ trace("Unhandled type %#x.\n", parameter->ParameterType);
+ }
+
+ ok_(line)(parameter->ShaderVisibility == expected_parameter->ShaderVisibility,
+ "Got shader visibility %#x, expected %#x.\n",
+ parameter->ShaderVisibility, expected_parameter->ShaderVisibility);
+}
+
+static void check_root_parameter1_(unsigned int line, const D3D12_ROOT_PARAMETER1 *parameter,
+ const D3D12_ROOT_PARAMETER1 *expected_parameter, bool converted)
+{
+ const D3D12_ROOT_DESCRIPTOR1 *descriptor, *expected_descriptor;
+ const D3D12_ROOT_DESCRIPTOR_TABLE1 *table, *expected_table;
+ const D3D12_ROOT_CONSTANTS *constants, *expected_constants;
+ unsigned int expected_flags;
+ unsigned int i;
+
+ ok_(line)(parameter->ParameterType == expected_parameter->ParameterType,
+ "Got type %#x, expected %#x.\n", parameter->ParameterType, expected_parameter->ParameterType);
+ if (parameter->ParameterType != expected_parameter->ParameterType)
+ return;
+
+ switch (parameter->ParameterType)
+ {
+ case D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE:
+ table = ¶meter->DescriptorTable;
+ expected_table = &expected_parameter->DescriptorTable;
+ ok_(line)(table->NumDescriptorRanges == expected_table->NumDescriptorRanges,
+ "Got range count %u, expected %u.\n",
+ table->NumDescriptorRanges, expected_table->NumDescriptorRanges);
+ if (table->NumDescriptorRanges == expected_table->NumDescriptorRanges)
+ {
+ for (i = 0; i < table->NumDescriptorRanges; ++i)
+ check_descriptor_range1_(line, &table->pDescriptorRanges[i],
+ &expected_table->pDescriptorRanges[i], converted);
+ }
+ break;
+ case D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS:
+ constants = ¶meter->Constants;
+ expected_constants = &expected_parameter->Constants;
+ ok_(line)(constants->ShaderRegister == expected_constants->ShaderRegister,
+ "Got shader register %u, expected %u.\n",
+ constants->ShaderRegister, expected_constants->ShaderRegister);
+ ok_(line)(constants->RegisterSpace == expected_constants->RegisterSpace,
+ "Got register space %u, expected %u.\n",
+ constants->RegisterSpace, expected_constants->RegisterSpace);
+ ok_(line)(constants->Num32BitValues == expected_constants->Num32BitValues,
+ "Got 32-bit value count %u, expected %u.\n",
+ constants->Num32BitValues, expected_constants->Num32BitValues);
+ break;
+ case D3D12_ROOT_PARAMETER_TYPE_CBV:
+ case D3D12_ROOT_PARAMETER_TYPE_SRV:
+ case D3D12_ROOT_PARAMETER_TYPE_UAV:
+ descriptor = ¶meter->Descriptor;
+ expected_descriptor = &expected_parameter->Descriptor;
+ ok_(line)(descriptor->ShaderRegister == expected_descriptor->ShaderRegister,
+ "Got shader register %u, expected %u.\n",
+ descriptor->ShaderRegister, expected_descriptor->ShaderRegister);
+ ok_(line)(descriptor->RegisterSpace == expected_descriptor->RegisterSpace,
+ "Got register space %u, expected %u.\n",
+ descriptor->RegisterSpace, expected_descriptor->RegisterSpace);
+ expected_flags = converted ? D3D12_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE : expected_descriptor->Flags;
+ ok_(line)(descriptor->Flags == expected_flags,
+ "Got root descriptor flags %#x, expected %#x.\n",
+ descriptor->Flags, expected_flags);
+ break;
+ default:
+ trace("Unhandled type %#x.\n", parameter->ParameterType);
+ }
+
+ ok_(line)(parameter->ShaderVisibility == expected_parameter->ShaderVisibility,
+ "Got shader visibility %#x, expected %#x.\n",
+ parameter->ShaderVisibility, expected_parameter->ShaderVisibility);
+}
+
+static void check_static_sampler_(unsigned int line, const D3D12_STATIC_SAMPLER_DESC *sampler,
+ const D3D12_STATIC_SAMPLER_DESC *expected_sampler)
+{
+ ok_(line)(sampler->Filter == expected_sampler->Filter,
+ "Got filter %#x, expected %#x.\n", sampler->Filter, expected_sampler->Filter);
+ ok_(line)(sampler->AddressU == expected_sampler->AddressU,
+ "Got address U %#x, expected %#x.\n", sampler->AddressU, expected_sampler->AddressU);
+ ok_(line)(sampler->AddressV == expected_sampler->AddressV,
+ "Got address V %#x, expected %#x.\n", sampler->AddressV, expected_sampler->AddressV);
+ ok_(line)(sampler->AddressW == expected_sampler->AddressW,
+ "Got address W %#x, expected %#x.\n", sampler->AddressW, expected_sampler->AddressW);
+ ok_(line)(sampler->MipLODBias == expected_sampler->MipLODBias,
+ "Got mip LOD bias %.8e, expected %.8e.\n", sampler->MipLODBias, expected_sampler->MipLODBias);
+ ok_(line)(sampler->MaxAnisotropy == expected_sampler->MaxAnisotropy,
+ "Got max anisotropy %u, expected %u.\n", sampler->MaxAnisotropy, expected_sampler->MaxAnisotropy);
+ ok_(line)(sampler->ComparisonFunc == expected_sampler->ComparisonFunc,
+ "Got comparison func %#x, expected %#x.\n", sampler->ComparisonFunc, expected_sampler->ComparisonFunc);
+ ok_(line)(sampler->BorderColor == expected_sampler->BorderColor,
+ "Got border color %#x, expected %#x.\n", sampler->BorderColor, expected_sampler->BorderColor);
+ ok_(line)(sampler->MinLOD == expected_sampler->MinLOD,
+ "Got min LOD %.8e, expected %.8e.\n", sampler->MinLOD, expected_sampler->MinLOD);
+ ok_(line)(sampler->MaxLOD == expected_sampler->MaxLOD,
+ "Got max LOD %.8e, expected %.8e.\n", sampler->MaxLOD, expected_sampler->MaxLOD);
+ ok_(line)(sampler->ShaderRegister == expected_sampler->ShaderRegister,
+ "Got shader register %u, expected %u.\n", sampler->ShaderRegister, expected_sampler->ShaderRegister);
+ ok_(line)(sampler->RegisterSpace == expected_sampler->RegisterSpace,
+ "Got register space %u, expected %u.\n", sampler->RegisterSpace, expected_sampler->RegisterSpace);
+ ok_(line)(sampler->ShaderVisibility == expected_sampler->ShaderVisibility,
+ "Got shader visibility %#x, expected %#x.\n",
+ sampler->ShaderVisibility, expected_sampler->ShaderVisibility);
+}
+
+#define check_root_signature_desc(desc, expected) check_root_signature_desc_(__LINE__, desc, expected)
+static void check_root_signature_desc_(unsigned int line, const D3D12_ROOT_SIGNATURE_DESC *desc,
+ const D3D12_ROOT_SIGNATURE_DESC *expected_desc)
+{
+ unsigned int i;
+
+ ok_(line)(desc->NumParameters == expected_desc->NumParameters,
+ "Got parameter count %u, expected %u.\n",
+ desc->NumParameters, expected_desc->NumParameters);
+ if (!expected_desc->pParameters)
+ {
+ ok_(line)(!desc->pParameters, "Got unexpected parameters %p.\n", desc->pParameters);
+ }
+ else if (desc->NumParameters == expected_desc->NumParameters)
+ {
+ for (i = 0; i < desc->NumParameters; ++i)
+ check_root_parameter_(line, &desc->pParameters[i], &expected_desc->pParameters[i]);
+ }
+ ok_(line)(desc->NumStaticSamplers == expected_desc->NumStaticSamplers,
+ "Got static sampler count %u, expected %u.\n",
+ desc->NumStaticSamplers, expected_desc->NumStaticSamplers);
+ if (!expected_desc->pStaticSamplers)
+ {
+ ok_(line)(!desc->pStaticSamplers, "Got unexpected static samplers %p.\n", desc->pStaticSamplers);
+ }
+ else if (desc->NumStaticSamplers == expected_desc->NumStaticSamplers)
+ {
+ for (i = 0; i < desc->NumStaticSamplers; ++i)
+ check_static_sampler_(line, &desc->pStaticSamplers[i], &expected_desc->pStaticSamplers[i]);
+ }
+ ok_(line)(desc->Flags == expected_desc->Flags, "Got flags %#x, expected %#x.\n",
+ desc->Flags, expected_desc->Flags);
+}
+
+#define check_root_signature_desc1(a, b, c) check_root_signature_desc1_(__LINE__, a, b, c)
+static void check_root_signature_desc1_(unsigned int line, const D3D12_ROOT_SIGNATURE_DESC1 *desc,
+ const D3D12_ROOT_SIGNATURE_DESC1 *expected_desc, bool converted)
+{
+ unsigned int i;
+
+ ok_(line)(desc->NumParameters == expected_desc->NumParameters,
+ "Got parameter count %u, expected %u.\n",
+ desc->NumParameters, expected_desc->NumParameters);
+ if (!expected_desc->pParameters)
+ {
+ ok_(line)(!desc->pParameters, "Got unexpected parameters %p.\n", desc->pParameters);
+ }
+ else if (desc->NumParameters == expected_desc->NumParameters)
+ {
+ for (i = 0; i < desc->NumParameters; ++i)
+ check_root_parameter1_(line, &desc->pParameters[i], &expected_desc->pParameters[i], converted);
+ }
+ ok_(line)(desc->NumStaticSamplers == expected_desc->NumStaticSamplers,
+ "Got static sampler count %u, expected %u.\n",
+ desc->NumStaticSamplers, expected_desc->NumStaticSamplers);
+ if (!expected_desc->pStaticSamplers)
+ {
+ ok_(line)(!desc->pStaticSamplers, "Got unexpected static samplers %p.\n", desc->pStaticSamplers);
+ }
+ else if (desc->NumStaticSamplers == expected_desc->NumStaticSamplers)
+ {
+ for (i = 0; i < desc->NumStaticSamplers; ++i)
+ check_static_sampler_(line, &desc->pStaticSamplers[i], &expected_desc->pStaticSamplers[i]);
+ }
+ ok_(line)(desc->Flags == expected_desc->Flags, "Got flags %#x, expected %#x.\n",
+ desc->Flags, expected_desc->Flags);
+}
+
+#define check_root_signature_deserialization(a, b, c) check_root_signature_deserialization_(__LINE__, a, b, c)
+static void check_root_signature_deserialization_(unsigned int line, const D3D12_SHADER_BYTECODE *code,
+ const D3D12_ROOT_SIGNATURE_DESC *expected_desc, const D3D12_ROOT_SIGNATURE_DESC1 *expected_desc1)
+{
+ const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *versioned_desc, *versioned_desc2;
+ ID3D12VersionedRootSignatureDeserializer *versioned_deserializer;
+ ID3D12RootSignatureDeserializer *deserializer;
+ const D3D12_ROOT_SIGNATURE_DESC *desc;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!code->BytecodeLength)
+ return;
+
+ hr = D3D12CreateRootSignatureDeserializer(code->pShaderBytecode, code->BytecodeLength,
+ &IID_ID3D12RootSignatureDeserializer, (void **)&deserializer);
+ ok_(line)(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr);
+
+ desc = ID3D12RootSignatureDeserializer_GetRootSignatureDesc(deserializer);
+ ok(desc, "Got NULL root signature desc.\n");
+ check_root_signature_desc_(line, desc, expected_desc);
+
+ refcount = ID3D12RootSignatureDeserializer_Release(deserializer);
+ ok_(line)(!refcount, "ID3D12RootSignatureDeserializer has %u references left.\n", (unsigned int)refcount);
+
+ if (!pfn_D3D12CreateVersionedRootSignatureDeserializer)
+ return;
+
+ hr = pfn_D3D12CreateVersionedRootSignatureDeserializer(code->pShaderBytecode, code->BytecodeLength,
+ &IID_ID3D12VersionedRootSignatureDeserializer, (void **)&versioned_deserializer);
+ ok_(line)(hr == S_OK, "Failed to create versioned deserializer, hr %#x.\n", hr);
+
+ versioned_desc = ID3D12VersionedRootSignatureDeserializer_GetUnconvertedRootSignatureDesc(versioned_deserializer);
+ ok(versioned_desc, "Got NULL root signature desc.\n");
+ ok(versioned_desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0, "Got unexpected version %#x.\n", versioned_desc->Version);
+ check_root_signature_desc_(line, &versioned_desc->Desc_1_0, expected_desc);
+
+ hr = ID3D12VersionedRootSignatureDeserializer_GetRootSignatureDescAtVersion(versioned_deserializer,
+ D3D_ROOT_SIGNATURE_VERSION_1_0, &versioned_desc2);
+ ok_(line)(hr == S_OK, "Failed to get root signature 1.0, hr %#x.\n", hr);
+ ok_(line)(versioned_desc2 == versioned_desc, "Got unexpected pointer %p.\n", versioned_desc2);
+
+ hr = ID3D12VersionedRootSignatureDeserializer_GetRootSignatureDescAtVersion(versioned_deserializer,
+ D3D_ROOT_SIGNATURE_VERSION_1_1, &versioned_desc);
+ ok_(line)(hr == S_OK, "Failed to get root signature 1.0, hr %#x.\n", hr);
+ ok(versioned_desc, "Got NULL root signature desc.\n");
+ ok(versioned_desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_1, "Got unexpected version %#x.\n", versioned_desc->Version);
+ check_root_signature_desc1_(line, &versioned_desc->Desc_1_1, expected_desc1, true);
+
+ refcount = ID3D12VersionedRootSignatureDeserializer_Release(versioned_deserializer);
+ ok_(line)(!refcount, "ID3D12VersionedRootSignatureDeserializer has %u references left.\n", (unsigned int)refcount);
+}
+
+#define check_root_signature_deserialization1(a, b, c) check_root_signature_deserialization1_(__LINE__, a, b, c)
+static void check_root_signature_deserialization1_(unsigned int line, const D3D12_SHADER_BYTECODE *code,
+ const D3D12_ROOT_SIGNATURE_DESC *expected_desc, const D3D12_ROOT_SIGNATURE_DESC1 *expected_desc1)
+{
+ const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *versioned_desc, *versioned_desc2;
+ ID3D12VersionedRootSignatureDeserializer *versioned_deserializer;
+ ID3D12RootSignatureDeserializer *deserializer;
+ const D3D12_ROOT_SIGNATURE_DESC *desc;
+ ULONG refcount;
+ HRESULT hr;
+
+ hr = pfn_D3D12CreateVersionedRootSignatureDeserializer(code->pShaderBytecode, code->BytecodeLength,
+ &IID_ID3D12VersionedRootSignatureDeserializer, (void **)&versioned_deserializer);
+ ok_(line)(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr);
+
+ versioned_desc = ID3D12VersionedRootSignatureDeserializer_GetUnconvertedRootSignatureDesc(versioned_deserializer);
+ ok(versioned_desc, "Got NULL root signature desc.\n");
+ ok(versioned_desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_1, "Got unexpected version %#x.\n", versioned_desc->Version);
+ check_root_signature_desc1_(line, &versioned_desc->Desc_1_1, expected_desc1, false);
+
+ hr = ID3D12VersionedRootSignatureDeserializer_GetRootSignatureDescAtVersion(versioned_deserializer,
+ D3D_ROOT_SIGNATURE_VERSION_1_1, &versioned_desc2);
+ ok_(line)(hr == S_OK, "Failed to get root signature 1.1, hr %#x.\n", hr);
+ ok_(line)(versioned_desc2 == versioned_desc, "Got unexpected pointer %p.\n", versioned_desc2);
+
+ hr = ID3D12VersionedRootSignatureDeserializer_GetRootSignatureDescAtVersion(versioned_deserializer,
+ D3D_ROOT_SIGNATURE_VERSION_1_0, &versioned_desc);
+ ok_(line)(hr == S_OK, "Failed to get root signature 1.0, hr %#x.\n", hr);
+ ok(versioned_desc, "Got NULL root signature desc.\n");
+ ok(versioned_desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0, "Got unexpected version %#x.\n", versioned_desc->Version);
+ check_root_signature_desc_(line, &versioned_desc->Desc_1_0, expected_desc);
+
+ refcount = ID3D12VersionedRootSignatureDeserializer_Release(versioned_deserializer);
+ ok_(line)(!refcount, "ID3D12VersionedRootSignatureDeserializer has %u references left.\n", (unsigned int)refcount);
+
+ hr = D3D12CreateRootSignatureDeserializer(code->pShaderBytecode, code->BytecodeLength,
+ &IID_ID3D12RootSignatureDeserializer, (void **)&deserializer);
+ ok_(line)(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr);
+
+ desc = ID3D12RootSignatureDeserializer_GetRootSignatureDesc(deserializer);
+ ok(desc, "Got NULL root signature desc.\n");
+ check_root_signature_desc_(line, desc, expected_desc);
+
+ refcount = ID3D12RootSignatureDeserializer_Release(deserializer);
+ ok_(line)(!refcount, "ID3D12RootSignatureDeserializer has %u references left.\n", (unsigned int)refcount);
+}
+
+#define check_root_signature_serialization(a, b) check_root_signature_serialization_(__LINE__, a, b)
+static void check_root_signature_serialization_(unsigned int line, const D3D12_SHADER_BYTECODE *bytecode,
+ const D3D12_ROOT_SIGNATURE_DESC *desc)
+{
+ const DWORD *code = bytecode->pShaderBytecode;
+ ID3DBlob *blob, *error_blob;
+ DWORD *blob_buffer;
+ size_t blob_size;
+ unsigned int i;
+ HRESULT hr;
+
+ if (!bytecode->BytecodeLength)
+ return;
+
+ error_blob = (ID3DBlob *)0xdeadbeef;
+ hr = D3D12SerializeRootSignature(desc, D3D_ROOT_SIGNATURE_VERSION_1_0, &blob, &error_blob);
+ ok_(line)(hr == S_OK, "Failed to serialize root signature, hr %#x.\n", hr);
+ ok_(line)(!error_blob, "Got unexpected error blob %p.\n", error_blob);
+
+ blob_buffer = ID3D10Blob_GetBufferPointer(blob);
+ blob_size = ID3D10Blob_GetBufferSize(blob);
+ ok_(line)(blob_size == bytecode->BytecodeLength, "Got size %u, expected %u.\n",
+ (unsigned int)blob_size, (unsigned int)bytecode->BytecodeLength);
+
+ for (i = 0; i < bytecode->BytecodeLength / sizeof(*code); ++i)
+ {
+ ok_(line)(blob_buffer[i] == code[i], "Got dword %#x, expected %#x at %u.\n",
+ (unsigned int)blob_buffer[i], (unsigned int)code[i], i);
+ }
+
+ ID3D10Blob_Release(blob);
+}
+
+#define check_root_signature_serialization1(a, b) check_root_signature_serialization1_(__LINE__, a, b)
+static void check_root_signature_serialization1_(unsigned int line, const D3D12_SHADER_BYTECODE *bytecode,
+ const D3D12_ROOT_SIGNATURE_DESC1 *desc)
+{
+ D3D12_VERSIONED_ROOT_SIGNATURE_DESC versioned_desc;
+ const DWORD *code = bytecode->pShaderBytecode;
+ ID3DBlob *blob, *error_blob;
+ DWORD *blob_buffer;
+ size_t blob_size;
+ unsigned int i;
+ HRESULT hr;
+
+ versioned_desc.Version = D3D_ROOT_SIGNATURE_VERSION_1_1;
+ versioned_desc.Desc_1_1 = *desc;
+
+ error_blob = (ID3DBlob *)0xdeadbeef;
+ hr = pfn_D3D12SerializeVersionedRootSignature(&versioned_desc, &blob, &error_blob);
+ ok_(line)(hr == S_OK, "Failed to serialize root signature, hr %#x.\n", hr);
+ ok_(line)(!error_blob, "Got unexpected error blob %p.\n", error_blob);
+
+ blob_buffer = ID3D10Blob_GetBufferPointer(blob);
+ blob_size = ID3D10Blob_GetBufferSize(blob);
+ ok_(line)(blob_size == bytecode->BytecodeLength, "Got size %u, expected %u.\n",
+ (unsigned int)blob_size, (unsigned int)bytecode->BytecodeLength);
+
+ for (i = 0; i < bytecode->BytecodeLength / sizeof(*code); ++i)
+ {
+ ok_(line)(blob_buffer[i] == code[i], "Got dword %#x, expected %#x at %u.\n",
+ (unsigned int)blob_buffer[i], (unsigned int)code[i], i);
+ }
+
+ ID3D10Blob_Release(blob);
+}
+
+static void test_root_signature_byte_code(void)
+{
+ ID3D12VersionedRootSignatureDeserializer *versioned_deserializer;
+ ID3D12RootSignatureDeserializer *deserializer;
+ ID3DBlob *blob;
+ unsigned int i;
+ ULONG refcount;
+ HRESULT hr;
+
+#if 0
+ #define RS ""
+#endif
+ /* /T rootsig_1_0 /E RS */
+ static const DWORD empty_rootsig[] =
+ {
+ 0x43425844, 0xd64afc1d, 0x5dc27735, 0x9edacb4a, 0x6bd8a7fa, 0x00000001, 0x00000044, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000018, 0x00000001, 0x00000000, 0x00000018, 0x00000000, 0x00000018,
+ 0x00000000,
+ };
+ /* /T rootsig_1_1 /E RS */
+ static const DWORD empty_rootsig1[] =
+ {
+ 0x43425844, 0x791882cb, 0x83c1db39, 0x327edc93, 0x3163085b, 0x00000001, 0x00000044, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000018, 0x00000002, 0x00000000, 0x00000018, 0x00000000, 0x00000018,
+ 0x00000000,
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC empty_rootsig_desc =
+ {
+ .Flags = 0,
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 empty_rootsig_desc1 =
+ {
+ .Flags = 0,
+ };
+
+#if 0
+ #define RS "RootFlags(ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)"
+#endif
+ static const DWORD ia_rootsig[] =
+ {
+ 0x43425844, 0x05bbd62e, 0xc74d3646, 0xde1407a5, 0x0d99273d, 0x00000001, 0x00000044, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000018, 0x00000001, 0x00000000, 0x00000018, 0x00000000, 0x00000018,
+ 0x00000001,
+ };
+ static const DWORD ia_rootsig1[] =
+ {
+ 0x43425844, 0x1e922238, 0xa7743a59, 0x652c0188, 0xe999b061, 0x00000001, 0x00000044, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000018, 0x00000002, 0x00000000, 0x00000018, 0x00000000, 0x00000018,
+ 0x00000001,
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC ia_rootsig_desc =
+ {
+ .Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT,
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 ia_rootsig_desc1 =
+ {
+ .Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT,
+ };
+
+#if 0
+ #define RS "RootFlags(DENY_PIXEL_SHADER_ROOT_ACCESS)"
+#endif
+ static const DWORD deny_ps_rootsig[] =
+ {
+ 0x43425844, 0xfad3a4ce, 0xf246286e, 0xeaa9e176, 0x278d5137, 0x00000001, 0x00000044, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000018, 0x00000001, 0x00000000, 0x00000018, 0x00000000, 0x00000018,
+ 0x00000020,
+ };
+ static const DWORD deny_ps_rootsig1[] =
+ {
+ 0x43425844, 0xca541ae8, 0x791dbcaa, 0xe8a61219, 0x697a84c7, 0x00000001, 0x00000044, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000018, 0x00000002, 0x00000000, 0x00000018, 0x00000000, 0x00000018,
+ 0x00000020,
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC deny_ps_rootsig_desc =
+ {
+ .Flags = D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS,
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 deny_ps_rootsig_desc1 =
+ {
+ .Flags = D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS,
+ };
+
+#if 0
+ #define RS "CBV(b3, space = 0)"
+#endif
+ static const DWORD cbv_rootsig[] =
+ {
+ 0x43425844, 0x8dc5087e, 0x5cb9bf0d, 0x2e465ae3, 0x6291e0e0, 0x00000001, 0x00000058, 0x00000001,
+ 0x00000024, 0x30535452, 0x0000002c, 0x00000001, 0x00000001, 0x00000018, 0x00000000, 0x0000002c,
+ 0x00000000, 0x00000002, 0x00000000, 0x00000024, 0x00000003, 0x00000000,
+
+ };
+ static const DWORD cbv_rootsig1[] =
+ {
+ 0x43425844, 0x66f3e4ad, 0x9938583c, 0x4eaf4733, 0x7940ab73, 0x00000001, 0x0000005c, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000030, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000030,
+ 0x00000000, 0x00000002, 0x00000000, 0x00000024, 0x00000003, 0x00000000, 0x00000000,
+ };
+ static const D3D12_ROOT_PARAMETER cbv_parameters[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {3, 0}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC cbv_rootsig_desc =
+ {
+ .NumParameters = ARRAY_SIZE(cbv_parameters),
+ .pParameters = cbv_parameters,
+ };
+ static const D3D12_ROOT_PARAMETER1 cbv_parameters1[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {3, 0}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 cbv_rootsig_desc1 =
+ {
+ .NumParameters = ARRAY_SIZE(cbv_parameters1),
+ .pParameters = cbv_parameters1,
+ };
+
+#if 0
+ #define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_GEOMETRY)"
+#endif
+ static const DWORD cbv2_rootsig[] =
+ {
+ 0x43425844, 0x6d4cfb48, 0xbfecaa8d, 0x379ff9c3, 0x0cc56997, 0x00000001, 0x00000058, 0x00000001,
+ 0x00000024, 0x30535452, 0x0000002c, 0x00000001, 0x00000001, 0x00000018, 0x00000000, 0x0000002c,
+ 0x00000000, 0x00000002, 0x00000004, 0x00000024, 0x00000004, 0x00000001,
+ };
+ static DWORD cbv2_rootsig1[] =
+ {
+ 0x43425844, 0x8450397e, 0x4e136d61, 0xb4fe3b44, 0xc7223872, 0x00000001, 0x0000005c, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000030, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000030,
+ 0x00000000, 0x00000002, 0x00000004, 0x00000024, 0x00000004, 0x00000001, 0x00000000,
+ };
+ static const D3D12_ROOT_PARAMETER cbv2_parameters[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {4, 1}, D3D12_SHADER_VISIBILITY_GEOMETRY},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC cbv2_rootsig_desc =
+ {
+ .NumParameters = ARRAY_SIZE(cbv2_parameters),
+ .pParameters = cbv2_parameters,
+ };
+ static const D3D12_ROOT_PARAMETER1 cbv2_parameters1[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {4, 1}, D3D12_SHADER_VISIBILITY_GEOMETRY},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 cbv2_rootsig_desc1 =
+ {
+ .NumParameters = ARRAY_SIZE(cbv2_parameters1),
+ .pParameters = cbv2_parameters1,
+ };
+
+#if 0
+ #define RS "RootFlags(DENY_VERTEX_SHADER_ROOT_ACCESS), SRV(t13)"
+#endif
+ static const DWORD srv_rootsig[] =
+ {
+ 0x43425844, 0xbc00e5e0, 0xffff2fd3, 0x85c2d405, 0xa61db5e5, 0x00000001, 0x00000058, 0x00000001,
+ 0x00000024, 0x30535452, 0x0000002c, 0x00000001, 0x00000001, 0x00000018, 0x00000000, 0x0000002c,
+ 0x00000002, 0x00000003, 0x00000000, 0x00000024, 0x0000000d, 0x00000000,
+ };
+ static const DWORD srv_rootsig1[] =
+ {
+ 0x43425844, 0xe79f4ac0, 0x1ac0829e, 0x94fddf9d, 0xd83d8bbf, 0x00000001, 0x0000005c, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000030, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000030,
+ 0x00000002, 0x00000003, 0x00000000, 0x00000024, 0x0000000d, 0x00000000, 0x00000000,
+ };
+ static const D3D12_ROOT_PARAMETER srv_parameters[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_SRV, .Descriptor = {13}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC srv_rootsig_desc =
+ {
+ .NumParameters = ARRAY_SIZE(srv_parameters),
+ .pParameters = srv_parameters,
+ .Flags = D3D12_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS,
+ };
+ static const D3D12_ROOT_PARAMETER1 srv_parameters1[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_SRV, .Descriptor = {13}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 srv_rootsig_desc1 =
+ {
+ .NumParameters = ARRAY_SIZE(srv_parameters1),
+ .pParameters = srv_parameters1,
+ .Flags = D3D12_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS,
+ };
+
+#if 0
+ #define RS "UAV(u6)"
+#endif
+ static const DWORD uav_rootsig[] =
+ {
+ 0x43425844, 0xf873c52c, 0x69f5cbea, 0xaf6bc9f4, 0x2ccf8b54, 0x00000001, 0x00000058, 0x00000001,
+ 0x00000024, 0x30535452, 0x0000002c, 0x00000001, 0x00000001, 0x00000018, 0x00000000, 0x0000002c,
+ 0x00000000, 0x00000004, 0x00000000, 0x00000024, 0x00000006, 0x00000000,
+ };
+ static const DWORD uav_rootsig1[] =
+ {
+ 0x43425844, 0xbd670c62, 0x5c35651b, 0xfb9b9bd1, 0x8a4dddde, 0x00000001, 0x0000005c, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000030, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000030,
+ 0x00000000, 0x00000004, 0x00000000, 0x00000024, 0x00000006, 0x00000000, 0x00000000,
+ };
+ static const D3D12_ROOT_PARAMETER uav_parameters[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {6}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC uav_rootsig_desc =
+ {
+ .NumParameters = ARRAY_SIZE(uav_parameters),
+ .pParameters = uav_parameters,
+ };
+ static const D3D12_ROOT_PARAMETER1 uav_parameters1[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {6}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 uav_rootsig_desc1 =
+ {
+ .NumParameters = ARRAY_SIZE(uav_parameters1),
+ .pParameters = uav_parameters1,
+ };
+
+#if 0
+ #define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_VERTEX), " \
+ "SRV(t13, flags = DATA_STATIC), " \
+ "UAV(u6, flags = DATA_STATIC_WHILE_SET_AT_EXECUTE)"
+#endif
+ static const DWORD root_descriptors_rootsig1[] =
+ {
+ 0x43425844, 0x8ddedbbe, 0xbcfea259, 0x6b35bfbb, 0x23e1de24, 0x00000001, 0x0000008c, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000060, 0x00000002, 0x00000003, 0x00000018, 0x00000000, 0x00000060,
+ 0x00000000, 0x00000002, 0x00000001, 0x0000003c, 0x00000003, 0x00000000, 0x00000048, 0x00000004,
+ 0x00000000, 0x00000054, 0x00000004, 0x00000001, 0x00000000, 0x0000000d, 0x00000000, 0x00000008,
+ 0x00000006, 0x00000000, 0x00000004,
+ };
+ static const D3D12_ROOT_PARAMETER root_descriptors_parameters[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {4, 1}, D3D12_SHADER_VISIBILITY_VERTEX},
+ {D3D12_ROOT_PARAMETER_TYPE_SRV, .Descriptor = {13}},
+ {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {6}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC root_descriptors_desc =
+ {
+ .NumParameters = ARRAY_SIZE(root_descriptors_parameters),
+ .pParameters = root_descriptors_parameters,
+ };
+ static const D3D12_ROOT_PARAMETER1 root_descriptors_parameters1[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {4, 1}, D3D12_SHADER_VISIBILITY_VERTEX},
+ {D3D12_ROOT_PARAMETER_TYPE_SRV, .Descriptor = {13, 0, D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC}},
+ {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {6, 0, D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 root_descriptors_desc1 =
+ {
+ .NumParameters = ARRAY_SIZE(root_descriptors_parameters1),
+ .pParameters = root_descriptors_parameters1,
+ };
+
+#if 0
+ #define RS "RootConstants(num32BitConstants=3, b4), " \
+ "RootConstants(num32BitConstants=4, b5, space = 3)"
+#endif
+ static const DWORD constants_rootsig[] =
+ {
+ 0x43425844, 0xbc015590, 0xa9a4a345, 0x7e446850, 0x2be05281, 0x00000001, 0x00000074, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000048, 0x00000001, 0x00000002, 0x00000018, 0x00000000, 0x00000048,
+ 0x00000000, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0x00000000, 0x0000003c, 0x00000004,
+ 0x00000000, 0x00000003, 0x00000005, 0x00000003, 0x00000004,
+ };
+ static const DWORD constants_rootsig1[] =
+ {
+ 0x43425844, 0xaa6e3eb1, 0x092b0bd3, 0x63af9657, 0xa97a0fe4, 0x00000001, 0x00000074, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000048, 0x00000002, 0x00000002, 0x00000018, 0x00000000, 0x00000048,
+ 0x00000000, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0x00000000, 0x0000003c, 0x00000004,
+ 0x00000000, 0x00000003, 0x00000005, 0x00000003, 0x00000004,
+ };
+ static const D3D12_ROOT_PARAMETER constants_parameters[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS, .Constants = {4, 0, 3}},
+ {D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS, .Constants = {5, 3, 4}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC constants_rootsig_desc =
+ {
+ .NumParameters = ARRAY_SIZE(constants_parameters),
+ .pParameters = constants_parameters,
+ };
+ static const D3D12_ROOT_PARAMETER1 constants_parameters1[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS, .Constants = {4, 0, 3}},
+ {D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS, .Constants = {5, 3, 4}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 constants_rootsig_desc1 =
+ {
+ .NumParameters = ARRAY_SIZE(constants_parameters1),
+ .pParameters = constants_parameters1,
+ };
+
+#if 0
+ #define RS "DescriptorTable(CBV(b1, space = 7), " \
+ "SRV(t16, numDescriptors = 8), " \
+ "UAV(u3, numDescriptors = unbounded, offset = 44))"
+#endif
+ static const DWORD descriptor_table_rootsig[] =
+ {
+ 0x43425844, 0x0f92e563, 0x4766993f, 0x2304e283, 0x14f0d8dc, 0x00000001, 0x00000094, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000068, 0x00000001, 0x00000001, 0x00000018, 0x00000000, 0x00000068,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000003, 0x0000002c, 0x00000002, 0x00000001,
+ 0x00000001, 0x00000007, 0xffffffff, 0x00000000, 0x00000008, 0x00000010, 0x00000000, 0xffffffff,
+ 0x00000001, 0xffffffff, 0x00000003, 0x00000000, 0x0000002c,
+ };
+ static const DWORD descriptor_table_rootsig1[] =
+ {
+ 0x43425844, 0x739302ac, 0x9db37f96, 0x1ad9eec8, 0x7a5d08cb, 0x00000001, 0x000000a0, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000074, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000074,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000003, 0x0000002c, 0x00000002, 0x00000001,
+ 0x00000001, 0x00000007, 0x00000000, 0xffffffff, 0x00000000, 0x00000008, 0x00000010, 0x00000000,
+ 0x00000000, 0xffffffff, 0x00000001, 0xffffffff, 0x00000003, 0x00000000, 0x00000000, 0x0000002c,
+ };
+ static const D3D12_DESCRIPTOR_RANGE descriptor_ranges[] =
+ {
+ {D3D12_DESCRIPTOR_RANGE_TYPE_CBV, 1, 1, 7, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND},
+ {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 8, 16, 0, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND},
+ {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 3, 0, 44},
+ };
+ static const D3D12_ROOT_PARAMETER descriptor_table_parameters[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE,
+ .DescriptorTable = {ARRAY_SIZE(descriptor_ranges), descriptor_ranges}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC descriptor_table_rootsig_desc =
+ {
+ .NumParameters = ARRAY_SIZE(descriptor_table_parameters),
+ .pParameters = descriptor_table_parameters,
+ };
+ static const D3D12_DESCRIPTOR_RANGE1 descriptor_ranges1[] =
+ {
+ {D3D12_DESCRIPTOR_RANGE_TYPE_CBV, 1, 1, 7, 0, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND},
+ {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 8, 16, 0, 0, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND},
+ {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 3, 0, 0, 44},
+ };
+ static const D3D12_ROOT_PARAMETER1 descriptor_table_parameters1[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE,
+ .DescriptorTable = {ARRAY_SIZE(descriptor_ranges1), descriptor_ranges1}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 descriptor_table_rootsig_desc1 =
+ {
+ .NumParameters = ARRAY_SIZE(descriptor_table_parameters1),
+ .pParameters = descriptor_table_parameters1,
+ };
+
+#if 0
+ #define RS "DescriptorTable(CBV(b1, space = 7, flags = DESCRIPTORS_VOLATILE), " \
+ "SRV(t16, numDescriptors = 8, flags = DESCRIPTORS_VOLATILE | DATA_VOLATILE), " \
+ "UAV(u3, numDescriptors = unbounded, offset = 44, flags = DATA_STATIC))"
+#endif
+ static const DWORD descriptor_table_flags_rootsig1[] =
+ {
+ 0x43425844, 0xe77ffa8f, 0xfab552d5, 0x586e15d4, 0x4c186c26, 0x00000001, 0x000000a0, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000074, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000074,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000003, 0x0000002c, 0x00000002, 0x00000001,
+ 0x00000001, 0x00000007, 0x00000001, 0xffffffff, 0x00000000, 0x00000008, 0x00000010, 0x00000000,
+ 0x00000003, 0xffffffff, 0x00000001, 0xffffffff, 0x00000003, 0x00000000, 0x00000008, 0x0000002c,
+ };
+ static const D3D12_DESCRIPTOR_RANGE1 descriptor_ranges1_flags[] =
+ {
+ {D3D12_DESCRIPTOR_RANGE_TYPE_CBV, 1, 1, 7,
+ D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND},
+ {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 8, 16, 0,
+ D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | D3D12_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE,
+ D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND},
+ {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 3, 0,
+ D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC, 44},
+ };
+ static const D3D12_ROOT_PARAMETER1 descriptor_table_parameters1_flags[] =
+ {
+ {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE,
+ .DescriptorTable = {ARRAY_SIZE(descriptor_ranges1_flags), descriptor_ranges1_flags}},
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 descriptor_table_flags_rootsig_desc1 =
+ {
+ .NumParameters = ARRAY_SIZE(descriptor_table_parameters1_flags),
+ .pParameters = descriptor_table_parameters1_flags,
+ };
+
+#if 0
+ #define RS "StaticSampler(s4)"
+#endif
+ static const DWORD default_static_sampler_rootsig[] =
+ {
+ 0x43425844, 0x2876b8ff, 0x935aaa0d, 0x5d2d344a, 0xe002147c, 0x00000001, 0x00000078, 0x00000001,
+ 0x00000024, 0x30535452, 0x0000004c, 0x00000001, 0x00000000, 0x00000018, 0x00000001, 0x00000018,
+ 0x00000000, 0x00000055, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000010, 0x00000004,
+ 0x00000002, 0x00000000, 0x7f7fffff, 0x00000004, 0x00000000, 0x00000000,
+ };
+ static const DWORD default_static_sampler_rootsig1[] =
+ {
+ 0x43425844, 0x52b07945, 0x997c0a1e, 0xe4efb9e9, 0x0378e2d4, 0x00000001, 0x00000078, 0x00000001,
+ 0x00000024, 0x30535452, 0x0000004c, 0x00000002, 0x00000000, 0x00000018, 0x00000001, 0x00000018,
+ 0x00000000, 0x00000055, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000010, 0x00000004,
+ 0x00000002, 0x00000000, 0x7f7fffff, 0x00000004, 0x00000000, 0x00000000,
+ };
+ static const D3D12_STATIC_SAMPLER_DESC default_static_sampler_desc =
+ {
+ .Filter = D3D12_FILTER_ANISOTROPIC,
+ .AddressU = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
+ .AddressV = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
+ .AddressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
+ .MaxAnisotropy = 16,
+ .ComparisonFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL,
+ .BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE,
+ .MaxLOD = D3D12_FLOAT32_MAX,
+ .ShaderRegister = 4,
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC default_static_sampler_rootsig_desc =
+ {
+ .NumStaticSamplers = 1,
+ .pStaticSamplers = &default_static_sampler_desc,
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 default_static_sampler_rootsig_desc1 =
+ {
+ .NumStaticSamplers = 1,
+ .pStaticSamplers = &default_static_sampler_desc,
+ };
+
+#if 0
+ #define RS "StaticSampler(s0, filter = FILTER_MIN_MAG_MIP_POINT, " \
+ "addressV = TEXTURE_ADDRESS_CLAMP, visibility = SHADER_VISIBILITY_PIXEL), " \
+ "StaticSampler(s0, filter = FILTER_MIN_MAG_POINT_MIP_LINEAR, " \
+ "AddressW = TEXTURE_ADDRESS_BORDER, MipLODBias = 1, maxLod = 10, " \
+ "borderColor = STATIC_BORDER_COLOR_OPAQUE_BLACK, space = 3)"
+#endif
+ static const DWORD static_samplers_rootsig[] =
+ {
+ 0x43425844, 0x52ed526c, 0x892c2d7c, 0xb8ab1123, 0x7e3a727d, 0x00000001, 0x000000ac, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000080, 0x00000001, 0x00000000, 0x00000018, 0x00000002, 0x00000018,
+ 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000010, 0x00000004,
+ 0x00000002, 0x00000000, 0x7f7fffff, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000001,
+ 0x00000001, 0x00000004, 0x3f800000, 0x00000010, 0x00000004, 0x00000001, 0x00000000, 0x41200000,
+ 0x00000000, 0x00000003, 0x00000000,
+ };
+ static const DWORD static_samplers_rootsig1[] =
+ {
+ 0x43425844, 0xcf44eb9e, 0xdbeaed6b, 0xb8d52b6f, 0x0be01c3b, 0x00000001, 0x000000ac, 0x00000001,
+ 0x00000024, 0x30535452, 0x00000080, 0x00000002, 0x00000000, 0x00000018, 0x00000002, 0x00000018,
+ 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000010, 0x00000004,
+ 0x00000002, 0x00000000, 0x7f7fffff, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000001,
+ 0x00000001, 0x00000004, 0x3f800000, 0x00000010, 0x00000004, 0x00000001, 0x00000000, 0x41200000,
+ 0x00000000, 0x00000003, 0x00000000,
+ };
+ static const D3D12_STATIC_SAMPLER_DESC static_sampler_descs[] =
+ {
+ {
+ .Filter = D3D12_FILTER_MIN_MAG_MIP_POINT,
+ .AddressU = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
+ .AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+ .AddressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
+ .MaxAnisotropy = 16,
+ .ComparisonFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL,
+ .BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE,
+ .MaxLOD = D3D12_FLOAT32_MAX,
+ .ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL,
+ },
+ {
+ .Filter = D3D12_FILTER_MIN_MAG_POINT_MIP_LINEAR,
+ .AddressU = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
+ .AddressV = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
+ .AddressW = D3D12_TEXTURE_ADDRESS_MODE_BORDER,
+ .MipLODBias = 1.0f,
+ .MaxAnisotropy = 16,
+ .ComparisonFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL,
+ .BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK,
+ .MaxLOD = 10.0f,
+ .RegisterSpace = 3,
+ }
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC static_samplers_rootsig_desc =
+ {
+ .NumStaticSamplers = ARRAY_SIZE(static_sampler_descs),
+ .pStaticSamplers = static_sampler_descs,
+ };
+ static const D3D12_ROOT_SIGNATURE_DESC1 static_samplers_rootsig_desc1 =
+ {
+ .NumStaticSamplers = ARRAY_SIZE(static_sampler_descs),
+ .pStaticSamplers = static_sampler_descs,
+ };
+
+ static const struct test
+ {
+ D3D12_SHADER_BYTECODE code;
+ D3D12_SHADER_BYTECODE code1;
+ const D3D12_ROOT_SIGNATURE_DESC *desc;
+ const D3D12_ROOT_SIGNATURE_DESC1 *desc1;
+ }
+ tests[] =
+ {
+ {
+ {empty_rootsig, sizeof(empty_rootsig)},
+ {empty_rootsig1, sizeof(empty_rootsig1)},
+ &empty_rootsig_desc, &empty_rootsig_desc1,
+ },
+ {
+ {ia_rootsig, sizeof(ia_rootsig)},
+ {ia_rootsig1, sizeof(ia_rootsig1)},
+ &ia_rootsig_desc, &ia_rootsig_desc1,
+ },
+ {
+ {deny_ps_rootsig, sizeof(deny_ps_rootsig)},
+ {deny_ps_rootsig1, sizeof(deny_ps_rootsig1)},
+ &deny_ps_rootsig_desc, &deny_ps_rootsig_desc1,
+ },
+ {
+ {cbv_rootsig, sizeof(cbv_rootsig)},
+ {cbv_rootsig1, sizeof(cbv_rootsig1)},
+ &cbv_rootsig_desc, &cbv_rootsig_desc1,
+ },
+ {
+ {cbv2_rootsig, sizeof(cbv2_rootsig)},
+ {cbv2_rootsig1, sizeof(cbv2_rootsig1)},
+ &cbv2_rootsig_desc, &cbv2_rootsig_desc1,
+ },
+ {
+ {srv_rootsig, sizeof(srv_rootsig)},
+ {srv_rootsig1, sizeof(srv_rootsig1)},
+ &srv_rootsig_desc, &srv_rootsig_desc1,
+ },
+ {
+ {uav_rootsig, sizeof(uav_rootsig)},
+ {uav_rootsig1, sizeof(uav_rootsig1)},
+ &uav_rootsig_desc, &uav_rootsig_desc1,
+ },
+ {
+ {NULL},
+ {root_descriptors_rootsig1, sizeof(root_descriptors_rootsig1)},
+ &root_descriptors_desc, &root_descriptors_desc1,
+ },
+ {
+ {constants_rootsig, sizeof(constants_rootsig)},
+ {constants_rootsig1, sizeof(constants_rootsig1)},
+ &constants_rootsig_desc, &constants_rootsig_desc1,
+ },
+ {
+ {descriptor_table_rootsig, sizeof(descriptor_table_rootsig)},
+ {descriptor_table_rootsig1, sizeof(descriptor_table_rootsig1)},
+ &descriptor_table_rootsig_desc, &descriptor_table_rootsig_desc1,
+ },
+ {
+ {NULL},
+ {descriptor_table_flags_rootsig1, sizeof(descriptor_table_flags_rootsig1)},
+ &descriptor_table_rootsig_desc, &descriptor_table_flags_rootsig_desc1,
+ },
+ {
+ {default_static_sampler_rootsig, sizeof(default_static_sampler_rootsig)},
+ {default_static_sampler_rootsig1, sizeof(default_static_sampler_rootsig1)},
+ &default_static_sampler_rootsig_desc, &default_static_sampler_rootsig_desc1,
+ },
+ {
+ {static_samplers_rootsig, sizeof(static_samplers_rootsig)},
+ {static_samplers_rootsig1, sizeof(static_samplers_rootsig1)},
+ &static_samplers_rootsig_desc, &static_samplers_rootsig_desc1,
+ },
+ };
+
+ hr = D3D12CreateRootSignatureDeserializer(empty_rootsig, sizeof(empty_rootsig),
+ &IID_IUnknown, (void **)&deserializer);
+ ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+ hr = D3D12CreateRootSignatureDeserializer(empty_rootsig, sizeof(empty_rootsig),
+ &IID_ID3D12VersionedRootSignatureDeserializer, (void **)&deserializer);
+ ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3D12CreateRootSignatureDeserializer(empty_rootsig, sizeof(empty_rootsig),
+ &IID_ID3D12RootSignatureDeserializer, (void **)&deserializer);
+ ok(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr);
+
+ check_interface(deserializer, &IID_IUnknown, false);
+ check_interface(deserializer, &IID_ID3D12RootSignatureDeserializer, true);
+ check_interface(deserializer, &IID_ID3D12VersionedRootSignatureDeserializer, false);
+ check_interface(deserializer, &IID_ID3D12Object, false);
+ check_interface(deserializer, &IID_ID3D12DeviceChild, false);
+ check_interface(deserializer, &IID_ID3D12Pageable, false);
+
+ refcount = ID3D12RootSignatureDeserializer_Release(deserializer);
+ ok(!refcount, "ID3D12RootSignatureDeserializer has %u references left.\n", (unsigned int)refcount);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ const struct test *t = &tests[i];
+
+ vkd3d_test_set_context("Test %u", i);
+
+ check_root_signature_deserialization(&t->code, t->desc, t->desc1);
+ check_root_signature_serialization(&t->code, t->desc);
+
+ blob = (ID3DBlob *)0xdeadbeef;
+ hr = D3D12SerializeRootSignature(t->desc, D3D_ROOT_SIGNATURE_VERSION_1_1, &blob, NULL);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(blob == (ID3DBlob *)0xdeadbeef, "Got unexpected blob %p.\n", blob);
+
+ if (!pfn_D3D12CreateVersionedRootSignatureDeserializer)
+ continue;
+
+ check_root_signature_deserialization1(&t->code1, t->desc, t->desc1);
+ check_root_signature_serialization1(&t->code1, t->desc1);
+ }
+ vkd3d_test_set_context(NULL);
+
+ if (!pfn_D3D12CreateVersionedRootSignatureDeserializer)
+ {
+ skip("D3D12CreateVersionedRootSignatureDeserializer is not available.\n");
+ return;
+ }
+
+ hr = pfn_D3D12CreateVersionedRootSignatureDeserializer(empty_rootsig, sizeof(empty_rootsig),
+ &IID_IUnknown, (void **)&versioned_deserializer);
+ ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+ hr = pfn_D3D12CreateVersionedRootSignatureDeserializer(empty_rootsig, sizeof(empty_rootsig),
+ &IID_ID3D12RootSignatureDeserializer, (void **)&versioned_deserializer);
+ ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+
+ hr = pfn_D3D12CreateVersionedRootSignatureDeserializer(empty_rootsig, sizeof(empty_rootsig),
+ &IID_ID3D12VersionedRootSignatureDeserializer, (void **)&versioned_deserializer);
+ ok(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr);
+
+ check_interface(versioned_deserializer, &IID_IUnknown, false);
+ check_interface(versioned_deserializer, &IID_ID3D12RootSignatureDeserializer, false);
+ check_interface(versioned_deserializer, &IID_ID3D12VersionedRootSignatureDeserializer, true);
+ check_interface(versioned_deserializer, &IID_ID3D12Object, false);
+ check_interface(versioned_deserializer, &IID_ID3D12DeviceChild, false);
+ check_interface(versioned_deserializer, &IID_ID3D12Pageable, false);
+
+ refcount = ID3D12VersionedRootSignatureDeserializer_Release(versioned_deserializer);
+ ok(!refcount, "ID3D12VersionedRootSignatureDeserializer has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_cs_constant_buffer(void)
+{
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_descriptor_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_descriptor_handle;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[1];
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ ID3D12DescriptorHeap *descriptor_heap;
+ D3D12_DESCRIPTOR_HEAP_DESC heap_desc;
+ ID3D12RootSignature *root_signature;
+ ID3D12PipelineState *pipeline_state;
+ ID3D12Resource *resource, *cb;
+ unsigned int descriptor_size;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i;
+ float value;
+ HRESULT hr;
+
+ static const DWORD cs_code[] =
+ {
+#if 0
+ cbuffer cb : register(b7)
+ {
+ float value;
+ };
+
+ RWBuffer<float> buffer;
+
+ [numthreads(32, 1, 1)]
+ void main(uint3 group_id : SV_groupID, uint group_index : SV_GroupIndex)
+ {
+ uint global_index = 32 * group_id.x + group_index;
+ buffer[global_index] = value;
+ }
+#endif
+ 0x43425844, 0xbcbca6fb, 0x0bd883e5, 0x8e0848ea, 0xaf152cfd, 0x00000001, 0x000000e8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000094, 0x00050050, 0x00000025, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000007, 0x00000001, 0x0400089c, 0x0011e000, 0x00000000, 0x00005555,
+ 0x0200005f, 0x00024000, 0x0200005f, 0x00021012, 0x02000068, 0x00000001, 0x0400009b, 0x00000020,
+ 0x00000001, 0x00000001, 0x07000023, 0x00100012, 0x00000000, 0x0002100a, 0x00004001, 0x00000020,
+ 0x0002400a, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100006, 0x00000000, 0x00208006, 0x00000007,
+ 0x00000000, 0x0100003e,
+ };
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ value = 2.0f;
+ cb = create_upload_buffer(context.device, sizeof(value), &value);
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[0].NumDescriptors = 4;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[1].Descriptor.ShaderRegister = 7;
+ root_parameters[1].Descriptor.RegisterSpace = 0;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ pipeline_state = create_compute_pipeline_state(device, root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+
+ heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
+ heap_desc.NumDescriptors = 4;
+ heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
+ heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc,
+ &IID_ID3D12DescriptorHeap, (void **)&descriptor_heap);
+ ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr);
+
+ descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(device,
+ D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ cpu_descriptor_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(descriptor_heap);
+ gpu_descriptor_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap);
+
+ resource = create_default_buffer(device, 64 * sizeof(float),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ uav_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.FirstElement = 0;
+ uav_desc.Buffer.NumElements = 64;
+ uav_desc.Buffer.StructureByteStride = 0;
+ uav_desc.Buffer.CounterOffsetInBytes = 0;
+ uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE;
+ ID3D12Device_CreateUnorderedAccessView(device, resource, NULL, &uav_desc, cpu_descriptor_handle);
+ /* For tier 1 hardware all descriptors must be populated. */
+ for (i = 1; i < heap_desc.NumDescriptors; ++i)
+ {
+ cpu_descriptor_handle.ptr += descriptor_size;
+ ID3D12Device_CreateUnorderedAccessView(device, NULL, NULL, &uav_desc, cpu_descriptor_handle);
+ }
+
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 2, 1, 1);
+
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(resource, uav_desc.Format, &rb, queue, command_list);
+ check_readback_data_float(&rb, NULL, 2.0f, 0);
+ release_resource_readback(&rb);
+
+ value = 6.0f;
+ update_buffer_data(cb, 0, sizeof(value), &value);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle);
+ ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_Dispatch(command_list, 2, 1, 1);
+
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(resource, uav_desc.Format, &rb, queue, command_list);
+ check_readback_data_float(&rb, NULL, 6.0f, 0);
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(cb);
+ ID3D12Resource_Release(resource);
+ ID3D12RootSignature_Release(root_signature);
+ ID3D12PipelineState_Release(pipeline_state);
+ ID3D12DescriptorHeap_Release(descriptor_heap);
+ destroy_test_context(&context);
+}
+
+static void test_constant_buffer_relative_addressing(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ ID3D12GraphicsCommandList *command_list;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *uav, *cb;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD cs_code[] =
+ {
+#if 0
+ cbuffer b0
+ {
+ uint4 pad;
+ uint4 data[4];
+ };
+
+ RWByteAddressBuffer u0;
+
+ [numthreads(4, 1, 1)]
+ void main(uint tid : SV_GroupThreadID)
+ {
+ uint location = 4 * tid;
+ u0.Store4(4 * location, data[tid]);
+ }
+#endif
+ 0x43425844, 0x759a28a0, 0xdd34cd41, 0x73702692, 0x739a66ea, 0x00000001, 0x000000f0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x0000009c, 0x00050050, 0x00000027, 0x0100086a,
+ 0x04000859, 0x00208e46, 0x00000000, 0x00000005, 0x0300009d, 0x0011e000, 0x00000000, 0x0200005f,
+ 0x00022012, 0x02000068, 0x00000001, 0x0400009b, 0x00000004, 0x00000001, 0x00000001, 0x06000029,
+ 0x00100012, 0x00000000, 0x0002200a, 0x00004001, 0x00000004, 0x04000036, 0x00100022, 0x00000000,
+ 0x0002200a, 0x0a0000a6, 0x0011e0f2, 0x00000000, 0x0010000a, 0x00000000, 0x06208e46, 0x00000000,
+ 0x00000001, 0x0010001a, 0x00000000, 0x0100003e,
+ };
+ static const struct uvec4 cb_data[] =
+ {
+ {0xdeadbeef, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef},
+ {1, 2, 3, 4},
+ {4, 4, 9, 8},
+ {4, 5, 6, 7},
+ {6, 0, 6, 0},
+ };
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ cb = create_upload_buffer(context.device, sizeof(cb_data), &cb_data);
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[0].Descriptor.ShaderRegister = 0;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[1].Descriptor.ShaderRegister = 0;
+ root_parameters[1].Descriptor.RegisterSpace = 0;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+
+ uav = create_default_buffer(device, 16 * sizeof(uint32_t),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(uav));
+ ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ transition_sub_resource_state(command_list, uav, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(uav, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < rb.width; ++i)
+ {
+ unsigned int got = get_readback_uint(&rb, i, 0, 0);
+ const unsigned int *expected = &cb_data[1].x;
+ ok(got == expected[i], "Got %#x, expected %#x at %u.\n", got, expected[i], i);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(cb);
+ ID3D12Resource_Release(uav);
+ destroy_test_context(&context);
+}
+
+static void test_immediate_constant_buffer(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ unsigned int index[4] = {0};
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *cb;
+ unsigned int i;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ uint index;
+
+ static const int int_array[6] =
+ {
+ 310, 111, 212, -513, -318, 0,
+ };
+
+ static const uint uint_array[6] =
+ {
+ 2, 7, 0x7f800000, 0xff800000, 0x7fc00000, 0
+ };
+
+ static const float float_array[6] =
+ {
+ 76, 83.5f, 0.5f, 0.75f, -0.5f, 0.0f,
+ };
+
+ float4 main() : SV_Target
+ {
+ return float4(int_array[index], uint_array[index], float_array[index], 1.0f);
+ }
+#endif
+ 0x43425844, 0xbad068da, 0xd631ea3c, 0x41648374, 0x3ccd0120, 0x00000001, 0x00000184, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000010c, 0x00000040, 0x00000043,
+ 0x00001835, 0x0000001a, 0x00000136, 0x00000002, 0x42980000, 0x00000000, 0x0000006f, 0x00000007,
+ 0x42a70000, 0x00000000, 0x000000d4, 0x7f800000, 0x3f000000, 0x00000000, 0xfffffdff, 0xff800000,
+ 0x3f400000, 0x00000000, 0xfffffec2, 0x7fc00000, 0xbf000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2,
+ 0x00000000, 0x02000068, 0x00000001, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000,
+ 0x06000036, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000056, 0x00102022,
+ 0x00000000, 0x0090901a, 0x0010000a, 0x00000000, 0x0600002b, 0x00102012, 0x00000000, 0x0090900a,
+ 0x0010000a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0090902a, 0x0010000a, 0x00000000,
+ 0x0100003e,
+ };
+ static const unsigned int MAX_CB_SIZE = D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT * sizeof(struct vec4);
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static struct vec4 expected_result[] =
+ {
+ { 310.0f, 2.0f, 76.00f, 1.0f},
+ { 111.0f, 7.0f, 83.50f, 1.0f},
+ { 212.0f, 2139095040.0f, 0.50f, 1.0f},
+ {-513.0f, 4286578688.0f, 0.75f, 1.0f},
+ {-318.0f, 2143289344.0f, -0.50f, 1.0f},
+ { 0.0f, 0.0f, 0.0f, 1.0f},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_cb_root_signature(context.device,
+ 0, D3D12_SHADER_VISIBILITY_PIXEL, D3D12_ROOT_SIGNATURE_FLAG_NONE);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, NULL, &ps, NULL);
+
+ cb = create_upload_buffer(context.device, 2 * MAX_CB_SIZE, NULL);
+
+ for (i = 0; i < ARRAY_SIZE(expected_result); ++i)
+ {
+ *index = i;
+ update_buffer_data(cb, 0, sizeof(index), index);
+
+ if (i)
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_result[i], 0);
+
+ reset_command_list(command_list, context.allocator);
+ }
+
+ ID3D12Resource_Release(cb);
+ destroy_test_context(&context);
+}
+
+static void test_root_constants(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const unsigned int constants[4] = {0, 1, 0, 2};
+
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_ROOT_PARAMETER root_parameters[3];
+ ID3D12GraphicsCommandList *command_list;
+ struct vec4 vs_cb_color, ps_cb_color;
+ struct test_context_desc desc;
+ struct test_context context;
+ struct vec4 expected_result;
+ ID3D12CommandQueue *queue;
+ HRESULT hr;
+
+ static const DWORD ps_uint_constant_code[] =
+ {
+#if 0
+ uint4 constants;
+
+ float4 main() : SV_Target
+ {
+ return (float4)constants;
+ }
+#endif
+ 0x43425844, 0xf744186d, 0x6805439a, 0x491c3625, 0xe3e4053c, 0x00000001, 0x000000bc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, 0x00000011,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x06000056, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_uint_constant = {ps_uint_constant_code, sizeof(ps_uint_constant_code)};
+ static const DWORD vs_color_code[] =
+ {
+#if 0
+ float4 constant_color;
+
+ void main(uint id : SV_VertexID,
+ out float4 position : SV_Position, out float4 color : COLOR)
+ {
+ float2 coords = float2((id << 1) & 2, id & 2);
+ position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);
+ color = constant_color;
+ }
+#endif
+ 0x43425844, 0x7c3173fb, 0xdd990625, 0x290ad676, 0x50b41793, 0x00000001, 0x000001e0, 0x00000003,
+ 0x0000002c, 0x00000060, 0x000000b4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978,
+ 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f,
+ 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x58454853, 0x00000124, 0x00010050,
+ 0x00000049, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000060, 0x00101012,
+ 0x00000000, 0x00000006, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2,
+ 0x00000001, 0x02000068, 0x00000001, 0x0b00008c, 0x00100012, 0x00000000, 0x00004001, 0x00000001,
+ 0x00004001, 0x00000001, 0x0010100a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100042,
+ 0x00000000, 0x0010100a, 0x00000000, 0x00004001, 0x00000002, 0x05000056, 0x00100032, 0x00000000,
+ 0x00100086, 0x00000000, 0x0f000032, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x00004002,
+ 0x40000000, 0xc0000000, 0x00000000, 0x00000000, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000,
+ 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs_color = {vs_color_code, sizeof(vs_color_code)};
+ static const DWORD ps_color_code[] =
+ {
+#if 0
+ float4 color;
+
+ float4 main(float4 position : SV_POSITION, float4 in_color : COLOR) : SV_Target
+ {
+ if (any(color != in_color))
+ return float4(0.0f, 0.0f, 1.0f, 1.0f);
+ return in_color;
+ }
+#endif
+ 0x43425844, 0xb1e305a3, 0x962c4d64, 0x6b2c5515, 0x4fb4f524, 0x00000001, 0x0000019c, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000e0, 0x00000050,
+ 0x00000038, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03001062, 0x001010f2,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x08000039, 0x001000f2,
+ 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00101e46, 0x00000001, 0x0700003c, 0x00100032,
+ 0x00000000, 0x00100ae6, 0x00000000, 0x00100046, 0x00000000, 0x0700003c, 0x00100012, 0x00000000,
+ 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036,
+ 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 0x0100003e,
+ 0x01000015, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_color = {ps_color_code, sizeof(ps_color_code)};
+ static const DWORD vs_mix_code[] =
+ {
+#if 0
+ cbuffer shared_cb
+ {
+ uint token;
+ uint op;
+ };
+
+ cbuffer vs_cb
+ {
+ float4 padding;
+ float4 vs_color;
+ };
+
+ void main(uint id : SV_VertexID,
+ out float4 position : SV_Position, out float4 color : COLOR,
+ out uint vs_token : TOKEN)
+ {
+ float2 coords = float2((id << 1) & 2, id & 2);
+ position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);
+ color = vs_color;
+ vs_token = token;
+ }
+#endif
+ 0x43425844, 0xb5bc00c3, 0x6b5041fe, 0xd55d1d86, 0x34a2a229, 0x00000001, 0x00000230, 0x00000003,
+ 0x0000002c, 0x00000060, 0x000000d0, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978,
+ 0x4e47534f, 0x00000068, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f,
+ 0x00000062, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000e01, 0x505f5653, 0x7469736f,
+ 0x006e6f69, 0x4f4c4f43, 0x4f540052, 0x004e454b, 0x58454853, 0x00000158, 0x00010050, 0x00000056,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000059, 0x00208e46, 0x00000001,
+ 0x00000002, 0x04000060, 0x00101012, 0x00000000, 0x00000006, 0x04000067, 0x001020f2, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x03000065, 0x00102012, 0x00000002, 0x02000068,
+ 0x00000001, 0x0b00008c, 0x00100012, 0x00000000, 0x00004001, 0x00000001, 0x00004001, 0x00000001,
+ 0x0010100a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100042, 0x00000000, 0x0010100a,
+ 0x00000000, 0x00004001, 0x00000002, 0x05000056, 0x00100032, 0x00000000, 0x00100086, 0x00000000,
+ 0x0f000032, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x40000000, 0xc0000000,
+ 0x00000000, 0x00000000, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, 0x08000036,
+ 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x06000036,
+ 0x001020f2, 0x00000001, 0x00208e46, 0x00000001, 0x00000001, 0x06000036, 0x00102012, 0x00000002,
+ 0x0020800a, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs_mix = {vs_mix_code, sizeof(vs_mix_code)};
+ static const DWORD ps_mix_code[] =
+ {
+#if 0
+ cbuffer shared_cb
+ {
+ uint token;
+ uint op;
+ };
+
+ cbuffer ps_cb
+ {
+ float4 ps_color;
+ };
+
+ float4 main(float4 position : SV_POSITION, float4 vs_color : COLOR,
+ uint vs_token : TOKEN) : SV_Target
+ {
+ if (token != vs_token)
+ return (float4)1.0f;
+
+ switch (op)
+ {
+ case 0: return vs_color;
+ case 1: return ps_color;
+ case 2: return vs_color * ps_color;
+ default: return (float4)0.0f;
+ }
+ }
+#endif
+ 0x43425844, 0x128ef4ce, 0xa1c46517, 0x34ca76f3, 0x3c7d6112, 0x00000001, 0x00000240, 0x00000003,
+ 0x0000002c, 0x0000009c, 0x000000d0, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x00000062, 0x00000000, 0x00000000, 0x00000001, 0x00000002,
+ 0x00000101, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0x4f540052, 0x004e454b, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000168, 0x00000050, 0x0000005a,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000059, 0x00208e46, 0x00000001,
+ 0x00000001, 0x03001062, 0x001010f2, 0x00000001, 0x03000862, 0x00101012, 0x00000002, 0x03000065,
+ 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x08000027, 0x00100012, 0x00000000, 0x0020800a,
+ 0x00000000, 0x00000000, 0x0010100a, 0x00000002, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036,
+ 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e,
+ 0x01000015, 0x0400004c, 0x0020801a, 0x00000000, 0x00000000, 0x03000006, 0x00004001, 0x00000000,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, 0x03000006, 0x00004001,
+ 0x00000001, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000001, 0x00000000, 0x0100003e,
+ 0x03000006, 0x00004001, 0x00000002, 0x08000038, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001,
+ 0x00208e46, 0x00000001, 0x00000000, 0x0100003e, 0x0100000a, 0x08000036, 0x001020f2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, 0x01000017, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_mix = {ps_mix_code, sizeof(ps_mix_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_32bit_constants_root_signature(context.device,
+ 0, ARRAY_SIZE(constants), D3D12_SHADER_VISIBILITY_ALL);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, NULL, &ps_uint_constant, NULL);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0,
+ ARRAY_SIZE(constants), constants, 0);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ expected_result.x = constants[0];
+ expected_result.y = constants[1];
+ expected_result.z = constants[2];
+ expected_result.w = constants[3];
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_result, 0);
+
+ reset_command_list(command_list, context.allocator);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ ID3D12RootSignature_Release(context.root_signature);
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[0].Constants.ShaderRegister = 0;
+ root_parameters[0].Constants.RegisterSpace = 0;
+ root_parameters[0].Constants.Num32BitValues = 4;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 4;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, &vs_color, &ps_color, NULL);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ vs_cb_color = ps_cb_color = expected_result = (struct vec4){0.0f, 1.0f, 0.0f, 1.0f};
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &vs_cb_color.x, 0);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_cb_color.x, 0);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_result, 0);
+
+ reset_command_list(command_list, context.allocator);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ vs_cb_color = (struct vec4){0.0f, 1.0f, 0.0f, 1.0f};
+ ps_cb_color = (struct vec4){1.0f, 1.0f, 1.0f, 1.0f};
+ expected_result = (struct vec4){0.0f, 0.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &vs_cb_color.x, 0);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_cb_color.x, 0);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_result, 0);
+
+ reset_command_list(command_list, context.allocator);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ ID3D12RootSignature_Release(context.root_signature);
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[0].Constants.ShaderRegister = 1;
+ root_parameters[0].Constants.RegisterSpace = 0;
+ root_parameters[0].Constants.Num32BitValues = 8;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 1;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 4;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[2].Constants.ShaderRegister = 0;
+ root_parameters[2].Constants.RegisterSpace = 0;
+ root_parameters[2].Constants.Num32BitValues = 2;
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 3;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, &vs_mix, &ps_mix, NULL);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ vs_cb_color = expected_result = (struct vec4){0.0f, 1.0f, 0.0f, 1.0f};
+ ps_cb_color = (struct vec4){1.0f, 1.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &vs_cb_color.x, 4);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_cb_color.x, 0);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(command_list, 2, 0xdeadbeef, 0);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(command_list, 2, 0, 1);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_result, 0);
+
+ reset_command_list(command_list, context.allocator);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ vs_cb_color = (struct vec4){0.0f, 1.0f, 0.0f, 1.0f};
+ ps_cb_color = expected_result = (struct vec4){1.0f, 1.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &vs_cb_color.x, 4);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_cb_color.x, 0);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(command_list, 2, 0xdeadbeef, 0);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(command_list, 2, 1, 1);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_result, 0);
+
+ reset_command_list(command_list, context.allocator);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ vs_cb_color = (struct vec4){0.5f, 1.0f, 0.5f, 1.0f};
+ ps_cb_color = (struct vec4){0.5f, 0.7f, 1.0f, 1.0f};
+ expected_result = (struct vec4){0.25f, 0.7f, 0.5f, 1.0f};
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &vs_cb_color.x, 4);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_cb_color.x, 0);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(command_list, 2, 0xdeadbeef, 0);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(command_list, 2, 2, 1);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_result, 0);
+
+ destroy_test_context(&context);
+}
+
+static void test_sample_instructions(void)
+{
+ ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2];
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_range[2];
+ D3D12_ROOT_PARAMETER root_parameters[3];
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle;
+ D3D12_SAMPLER_DESC sampler_desc;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ unsigned int x_step, y_step;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *texture;
+ unsigned int i, x, y;
+ ID3D12Device *device;
+ HRESULT hr;
+
+ static const DWORD ps_sample_code[] =
+ {
+#if 0
+ Texture2D t;
+ SamplerState s;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p;
+
+ p.x = position.x / 640.0f;
+ p.y = position.y / 480.0f;
+ return t.Sample(s, p);
+ }
+#endif
+ 0x43425844, 0xd48f8d1c, 0x91689a9a, 0x99683e50, 0xae5e3efd, 0x00000001, 0x00000140, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a4, 0x00000050,
+ 0x00000029, 0x0100086a, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000,
+ 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002,
+ 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x8b000045, 0x800000c2, 0x00155543, 0x001020f2,
+ 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_sample = {ps_sample_code, sizeof(ps_sample_code)};
+ static const DWORD ps_sample_b_code[] =
+ {
+#if 0
+ Texture2D t;
+ SamplerState s;
+
+ float bias;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p;
+
+ p.x = position.x / 640.0f;
+ p.y = position.y / 480.0f;
+ return t.SampleBias(s, p, bias);
+ }
+#endif
+ 0x43425844, 0xc39b0686, 0x8244a7fc, 0x14c0b97a, 0x2900b3b7, 0x00000001, 0x00000150, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000b4, 0x00000040,
+ 0x0000002d, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000, 0x00000000,
+ 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001,
+ 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000,
+ 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x0c00004a,
+ 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000,
+ 0x0020800a, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_sample_b = {ps_sample_b_code, sizeof(ps_sample_b_code)};
+ static const DWORD ps_sample_d_code[] =
+ {
+#if 0
+ Texture2D t;
+ SamplerState s;
+
+ float4 dd;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p;
+
+ p.x = position.x / 640.0f;
+ p.y = position.y / 480.0f;
+ return t.SampleGrad(s, p, float2(dd.x, dd.y), float2(dd.z, dd.w));
+ }
+#endif
+ 0x43425844, 0xecc423bc, 0x3742699c, 0xf08f6dd7, 0x9976ad55, 0x00000001, 0x00000168, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000cc, 0x00000050,
+ 0x00000033, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000,
+ 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032,
+ 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000,
+ 0x91000049, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46,
+ 0x00000000, 0x00106000, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x00208ae6, 0x00000000,
+ 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_sample_d = {ps_sample_d_code, sizeof(ps_sample_d_code)};
+ static const DWORD ps_sample_l_code[] =
+ {
+#if 0
+ Texture2D t;
+ SamplerState s;
+
+ float level;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p;
+
+ p.x = position.x / 640.0f;
+ p.y = position.y / 480.0f;
+ return t.SampleLevel(s, p, level);
+ }
+#endif
+ 0x43425844, 0x61e05d85, 0x2a7300fb, 0x0a83706b, 0x889d1683, 0x00000001, 0x00000150, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000b4, 0x00000040,
+ 0x0000002d, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000, 0x00000000,
+ 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001,
+ 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000,
+ 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x0c000048,
+ 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000,
+ 0x0020800a, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_sample_l = {ps_sample_l_code, sizeof(ps_sample_l_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const unsigned int r8g8b8a8_data[] =
+ {
+ 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00,
+ 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000,
+ 0xffffffff, 0xff000000, 0xff000000, 0xff000000,
+ };
+ static const uint8_t a8_data[] =
+ {
+ 0x00, 0xff, 0x7f, 0xf0,
+ 0x0f, 0x11, 0x00, 0x00,
+ 0xff, 0xf0, 0x0f, 0xff,
+ 0xfa, 0xfe, 0xaa, 0xcc,
+ };
+ static const unsigned int a8_expected_data[] =
+ {
+ 0x00000000, 0xff000000, 0x7f000000, 0xf0000000,
+ 0x0f000000, 0x11000000, 0x00000000, 0x00000000,
+ 0xff000000, 0xf0000000, 0x0f000000, 0xff000000,
+ 0xfa000000, 0xfe000000, 0xaa000000, 0xcc000000,
+ };
+ static const unsigned int rgba_level_0[] =
+ {
+ 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00,
+ 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000,
+ 0xffffffff, 0xff000000, 0xff000000, 0xff000000,
+ };
+ static const unsigned int rgba_level_1[] =
+ {
+ 0xffffffff, 0xff0000ff,
+ 0xff000000, 0xff00ff00,
+ };
+ static const unsigned int rgba_level_2[] =
+ {
+ 0xffff0000,
+ };
+ static const unsigned int level_1_colors[] =
+ {
+ 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff,
+ 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff,
+ 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00,
+ 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00,
+ };
+ static const unsigned int level_2_colors[] =
+ {
+ 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000,
+ 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000,
+ 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000,
+ 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000,
+ };
+ static const unsigned int lerp_1_2_colors[] =
+ {
+ 0xffff7f7f, 0xffff7f7f, 0xff7f007f, 0xff7f007f,
+ 0xffff7f7f, 0xffff7f7f, 0xff7f007f, 0xff7f007f,
+ 0xff7f0000, 0xff7f0000, 0xff7f7f00, 0xff7f7f00,
+ 0xff7f0000, 0xff7f0000, 0xff7f7f00, 0xff7f7f00,
+ };
+ struct texture
+ {
+ unsigned int width;
+ unsigned int height;
+ unsigned int miplevel_count;
+ unsigned int array_size;
+ DXGI_FORMAT format;
+ D3D12_SUBRESOURCE_DATA data[3];
+ };
+ static const struct texture r8g8b8a8_texture =
+ {
+ 4, 4, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM,
+ {
+ {r8g8b8a8_data, 4 * sizeof(*r8g8b8a8_data), 16 * sizeof(*r8g8b8a8_data)},
+ },
+ };
+ static const struct texture a8_texture =
+ {
+ 4, 4, 1, 1, DXGI_FORMAT_A8_UNORM,
+ {
+ {a8_data, 4 * sizeof(*a8_data), 16 * sizeof(*a8_data)},
+ },
+ };
+ static const struct texture rgba_texture =
+ {
+ 4, 4, 3, 1, DXGI_FORMAT_R8G8B8A8_UNORM,
+ {
+ {rgba_level_0, 4 * sizeof(*rgba_level_0), 0},
+ {rgba_level_1, 2 * sizeof(*rgba_level_1), 0},
+ {rgba_level_2, sizeof(*rgba_level_2), 0},
+ },
+ };
+ static const struct
+ {
+ const D3D12_SHADER_BYTECODE *ps_code;
+ const struct texture *texture;
+ D3D12_FILTER filter;
+ float lod_bias;
+ float min_lod;
+ float max_lod;
+ float ps_constants[4];
+ const unsigned int *expected_data;
+ }
+ tests[] =
+ {
+#define MIP_MAX D3D12_FLOAT32_MAX
+#define POINT D3D12_FILTER_MIN_MAG_MIP_POINT
+#define POINT_LINEAR D3D12_FILTER_MIN_MAG_POINT_MIP_LINEAR
+ {&ps_sample, &r8g8b8a8_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f}, r8g8b8a8_data},
+ {&ps_sample, &a8_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f}, a8_expected_data},
+ {&ps_sample_b, &r8g8b8a8_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f}, r8g8b8a8_data},
+ {&ps_sample_b, &a8_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f}, a8_expected_data},
+ {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f}, rgba_level_0},
+ {&ps_sample_b, &rgba_texture, POINT, 8.0f, 0.0f, MIP_MAX, {0.0f}, level_1_colors},
+ {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {8.0f}, level_1_colors},
+ {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {8.4f}, level_1_colors},
+ {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {8.5f}, level_2_colors},
+ {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {9.0f}, level_2_colors},
+ {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 2.0f, {1.0f}, rgba_level_0},
+ {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 2.0f, {9.0f}, level_2_colors},
+ {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 1.0f, {9.0f}, level_1_colors},
+ {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, {9.0f}, rgba_level_0},
+ {&ps_sample_d, &r8g8b8a8_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f, 0.0f, 0.0f, 0.0f}, r8g8b8a8_data},
+ {&ps_sample_d, &a8_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f, 0.0f, 0.0f, 0.0f}, a8_expected_data},
+ {&ps_sample_d, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f, 0.0f, 0.0f, 0.0f}, rgba_level_0},
+ {&ps_sample_d, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.3f, 0.0f, 0.0f, 0.0f}, rgba_level_0},
+ {&ps_sample_d, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.4f, 0.0f, 0.0f, 0.0f}, level_1_colors},
+ {&ps_sample_d, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {1.0f, 0.0f, 0.0f, 0.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {-1.0f}, rgba_level_0},
+ {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f}, rgba_level_0},
+ {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.4f}, rgba_level_0},
+ {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.5f}, level_1_colors},
+ {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {1.0f}, level_1_colors},
+ {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {1.4f}, level_1_colors},
+ {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {1.5f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {2.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {3.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {4.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT_LINEAR, 0.0f, 0.0f, MIP_MAX, {1.5f}, lerp_1_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 0.0f, MIP_MAX, {-2.0f}, rgba_level_0},
+ {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 0.0f, MIP_MAX, {-1.0f}, level_1_colors},
+ {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 0.0f, MIP_MAX, {0.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 0.0f, MIP_MAX, {1.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 0.0f, MIP_MAX, {1.5f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 2.0f, 2.0f, {-9.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 2.0f, 2.0f, {-1.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 2.0f, 2.0f, {0.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 2.0f, 2.0f, {1.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 2.0f, 2.0f, {9.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, {-9.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, {-1.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, {0.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, {1.0f}, level_2_colors},
+ {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, {9.0f}, level_2_colors},
+#undef MIP_MAX
+#undef POINT
+#undef POINT_LINEAR
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 640;
+ desc.rt_height = 480;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_range[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_range[0].NumDescriptors = 1;
+ descriptor_range[0].BaseShaderRegister = 0;
+ descriptor_range[0].RegisterSpace = 0;
+ descriptor_range[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range[0];
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ descriptor_range[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER;
+ descriptor_range[1].NumDescriptors = 1;
+ descriptor_range[1].BaseShaderRegister = 0;
+ descriptor_range[1].RegisterSpace = 0;
+ descriptor_range[1].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[1].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[1].DescriptorTable.pDescriptorRanges = &descriptor_range[1];
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[2].Constants.ShaderRegister = 0;
+ root_parameters[2].Constants.RegisterSpace = 0;
+ root_parameters[2].Constants.Num32BitValues = ARRAY_SIZE(tests->ps_constants);
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);
+ root_signature_desc.pParameters = root_parameters;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap);
+
+ sampler_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 1);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ memset(&sampler_desc, 0, sizeof(sampler_desc));
+ sampler_desc.Filter = tests[i].filter;
+ sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc.MipLODBias = tests[i].lod_bias;
+ sampler_desc.MinLOD = tests[i].min_lod;
+ sampler_desc.MaxLOD = tests[i].max_lod;
+ ID3D12Device_CreateSampler(device, &sampler_desc, get_cpu_sampler_handle(&context, sampler_heap, 0));
+
+ if (context.pipeline_state)
+ ID3D12PipelineState_Release(context.pipeline_state);
+ context.pipeline_state = create_pipeline_state(device, context.root_signature,
+ context.render_target_desc.Format, NULL, tests[i].ps_code, NULL);
+
+ texture = create_default_texture2d(device, tests[i].texture->width, tests[i].texture->height,
+ tests[i].texture->array_size, tests[i].texture->miplevel_count, tests[i].texture->format,
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_texture_data(texture, tests[i].texture->data,
+ tests[i].texture->miplevel_count * tests[i].texture->array_size, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ ID3D12Device_CreateShaderResourceView(device, texture, NULL, cpu_handle);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ heaps[0] = heap; heaps[1] = sampler_heap;
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 1,
+ get_gpu_sampler_handle(&context, sampler_heap, 0));
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 2,
+ ARRAY_SIZE(tests[i].ps_constants), tests[i].ps_constants, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ x_step = desc.rt_width / tests[i].texture->width;
+ y_step = desc.rt_height / tests[i].texture->height;
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < tests[i].texture->height; ++y)
+ {
+ for (x = 0; x < tests[i].texture->width; ++x)
+ {
+ unsigned int color = get_readback_uint(&rb, x * x_step + x_step / 2, y * y_step + y_step / 2, 0);
+ ok(compare_color(color, tests[i].expected_data[tests[i].texture->width * y + x], 1),
+ "Got color 0x%08x, expected 0x%08x at (%u, %u).\n",
+ color, tests[i].expected_data[tests[i].texture->width * y + x], x, y);
+ }
+ }
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(texture);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12DescriptorHeap_Release(heap);
+ ID3D12DescriptorHeap_Release(sampler_heap);
+ destroy_test_context(&context);
+}
+
+static void test_texture_ld(void)
+{
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *texture;
+ unsigned int i;
+
+ static const DWORD ps_ld_code[] =
+ {
+#if 0
+ Texture2D t;
+
+ int2 offset;
+ uint2 location;
+
+ float4 main() : SV_Target
+ {
+ switch (offset.x)
+ {
+ case -1:
+ switch (offset.y)
+ {
+ case -2: return t.Load(uint3(location, 0), int2(-1, -2));
+ case -1: return t.Load(uint3(location, 0), int2(-1, -1));
+ case 0: return t.Load(uint3(location, 0), int2(-1, 0));
+ case 1: return t.Load(uint3(location, 0), int2(-1, 1));
+ case 2: return t.Load(uint3(location, 0), int2(-1, 2));
+ }
+ break;
+ case 0:
+ switch (offset.y)
+ {
+ case -2: return t.Load(uint3(location, 0), int2(0, -2));
+ case -1: return t.Load(uint3(location, 0), int2(0, -1));
+ case 0: return t.Load(uint3(location, 0), int2(0, 0));
+ case 1: return t.Load(uint3(location, 0), int2(0, 1));
+ case 2: return t.Load(uint3(location, 0), int2(0, 2));
+ }
+ break;
+ case 1:
+ switch (offset.y)
+ {
+ case -2: return t.Load(uint3(location, 0), int2(1, -2));
+ case -1: return t.Load(uint3(location, 0), int2(1, -1));
+ case 0: return t.Load(uint3(location, 0), int2(1, 0));
+ case 1: return t.Load(uint3(location, 0), int2(1, 1));
+ case 2: return t.Load(uint3(location, 0), int2(1, 2));
+ }
+ break;
+ }
+
+ return t.Load(uint3(location, 0));
+ }
+#endif
+ 0x43425844, 0xe925cc02, 0x43ea9623, 0xb67c6425, 0xb4503305, 0x00000001, 0x00000844, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000007cc, 0x00000050, 0x000001f3,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04001858, 0x00107000, 0x00000000,
+ 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400004c, 0x0020800a,
+ 0x00000000, 0x00000000, 0x03000006, 0x00004001, 0xffffffff, 0x0400004c, 0x0020801a, 0x00000000,
+ 0x00000000, 0x03000006, 0x00004001, 0xfffffffe, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6,
+ 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x8a00002d, 0x8001de01, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000,
+ 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0xffffffff,
+ 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2,
+ 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x8001fe01,
+ 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000,
+ 0x0100003e, 0x03000006, 0x00004001, 0x00000000, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6,
+ 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x8a00002d, 0x80001e01, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000,
+ 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0x00000001,
+ 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2,
+ 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x80003e01,
+ 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000,
+ 0x0100003e, 0x03000006, 0x00004001, 0x00000002, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6,
+ 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x8a00002d, 0x80005e01, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000,
+ 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x0100000a, 0x01000002, 0x01000017,
+ 0x01000002, 0x03000006, 0x00004001, 0x00000000, 0x0400004c, 0x0020801a, 0x00000000, 0x00000000,
+ 0x03000006, 0x00004001, 0xfffffffe, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000,
+ 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x8a00002d, 0x8001c001, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46,
+ 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0xffffffff, 0x06000036,
+ 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x8001e001, 0x800000c2,
+ 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e,
+ 0x03000006, 0x00004001, 0x00000000, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000,
+ 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x8900002d, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000,
+ 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0x00000001, 0x06000036, 0x00100032,
+ 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x80002001, 0x800000c2, 0x00155543,
+ 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006,
+ 0x00004001, 0x00000002, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000,
+ 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x8a00002d, 0x80004001, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000,
+ 0x00107e46, 0x00000000, 0x0100003e, 0x0100000a, 0x01000002, 0x01000017, 0x01000002, 0x03000006,
+ 0x00004001, 0x00000001, 0x0400004c, 0x0020801a, 0x00000000, 0x00000000, 0x03000006, 0x00004001,
+ 0xfffffffe, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036,
+ 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d,
+ 0x8001c201, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46,
+ 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0xffffffff, 0x06000036, 0x00100032, 0x00000000,
+ 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x8001e201, 0x800000c2, 0x00155543, 0x001020f2,
+ 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001,
+ 0x00000000, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036,
+ 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d,
+ 0x80000201, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46,
+ 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0x00000001, 0x06000036, 0x00100032, 0x00000000,
+ 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x80002201, 0x800000c2, 0x00155543, 0x001020f2,
+ 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001,
+ 0x00000002, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036,
+ 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d,
+ 0x80004201, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46,
+ 0x00000000, 0x0100003e, 0x0100000a, 0x01000002, 0x01000017, 0x01000002, 0x0100000a, 0x01000002,
+ 0x01000017, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036,
+ 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8900002d,
+ 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_ld = {ps_ld_code, sizeof(ps_ld_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const unsigned int texture_data[] =
+ {
+ 0xff0008ff, 0xff00ffff, 0xff00ff05, 0xffffff01,
+ 0xffff0007, 0xffff00ff, 0x11111101, 0xff7f7f7f,
+ 0x44444f44, 0x88888888, 0x22222222, 0xff000002,
+ 0x66f66666, 0xff000000, 0xff000003, 0x55555555,
+ };
+ static const D3D12_SUBRESOURCE_DATA resource_data = {&texture_data, sizeof(texture_data) / 4};
+ static const struct
+ {
+ int32_t constants[4];
+ unsigned int expected_color;
+ }
+ tests[] =
+ {
+ {{ 0, 0, 0, 0}, 0xff0008ff},
+ {{ 1, 0, 0, 0}, 0xff00ffff},
+ {{ 0, 1, 0, 0}, 0xffff0007},
+ {{ 1, 1, 0, 0}, 0xffff00ff},
+ {{ 3, 3, 0, 0}, 0xff0008ff},
+ {{ 3, 3, 1, 1}, 0xffff00ff},
+ {{ 0, 0, 3, 3}, 0x55555555},
+ {{-1, -1, 3, 3}, 0x22222222},
+ {{-1, -2, 3, 3}, 0x11111101},
+ {{ 0, -1, 3, 3}, 0xff000002},
+ {{ 0, -2, 3, 3}, 0xff7f7f7f},
+ {{ 3, 3, 3, 3}, 0x55555555},
+ };
+
+ if (use_warp_device)
+ {
+ skip("WARP device is removed when ps_ld is used.\n");
+ return;
+ }
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_texture_root_signature(context.device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 4, 0);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps_ld, NULL);
+
+ heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap);
+
+ texture = create_default_texture(context.device,
+ 4, 4, DXGI_FORMAT_R8G8B8A8_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_texture_data(texture, &resource_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+ ID3D12Device_CreateShaderResourceView(context.device, texture, NULL,
+ ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap));
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1,
+ ARRAY_SIZE(tests[i].constants), &tests[i].constants, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_color, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12Resource_Release(texture);
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_gather(void)
+{
+ struct
+ {
+ int width, height;
+ int offset_x, offset_y;
+ } constants;
+
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *texture;
+ unsigned int x, y;
+
+ static const DWORD gather4_code[] =
+ {
+#if 0
+ SamplerState s;
+ Texture2D<float4> t;
+
+ int2 size;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t.Gather(s, position.xy / size);
+ }
+#endif
+ 0x43425844, 0xca1ee692, 0xb122f477, 0x8c467d38, 0x0f5a233a, 0x00000001, 0x00000154, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000b8, 0x00000041,
+ 0x0000002e, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000,
+ 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0600002b, 0x00100032,
+ 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x0700000e, 0x00100032, 0x00000000, 0x00101046,
+ 0x00000000, 0x00100046, 0x00000000, 0x0900006d, 0x001020f2, 0x00000000, 0x00100046, 0x00000000,
+ 0x00107e46, 0x00000000, 0x0010600a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_gather4 = {gather4_code, sizeof(gather4_code)};
+ static const DWORD gather4_offset_code[] =
+ {
+#if 0
+ SamplerState s;
+ Texture2D<float4> t;
+
+ int2 size;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t.Gather(s, position.xy / size, int2(1, 1));
+ }
+#endif
+ 0x43425844, 0xe5ab2216, 0x90748ece, 0x7ccf2123, 0x4edbba7c, 0x00000001, 0x00000158, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000bc, 0x00000041,
+ 0x0000002f, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000,
+ 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0600002b, 0x00100032,
+ 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x0700000e, 0x00100032, 0x00000000, 0x00101046,
+ 0x00000000, 0x00100046, 0x00000000, 0x8a00006d, 0x00002201, 0x001020f2, 0x00000000, 0x00100046,
+ 0x00000000, 0x00107e46, 0x00000000, 0x0010600a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_gather4_offset = {gather4_offset_code, sizeof(gather4_offset_code)};
+ static const DWORD gather4_green_code[] =
+ {
+#if 0
+ SamplerState s;
+ Texture2D<float4> t;
+
+ int2 size;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t.GatherGreen(s, position.xy / size);
+ }
+#endif
+ 0x43425844, 0x2b0ad2d9, 0x8ad30b52, 0xc418477f, 0xe5211693, 0x00000001, 0x0000015c, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000c0, 0x00000050,
+ 0x00000030, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000,
+ 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0600002b, 0x00100032,
+ 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x0700000e, 0x00100032, 0x00000000, 0x00101046,
+ 0x00000000, 0x00100046, 0x00000000, 0x8b00006d, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000,
+ 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x0010601a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_gather4_green = {gather4_green_code, sizeof(gather4_green_code)};
+ static const DWORD gather4_po_code[] =
+ {
+#if 0
+ SamplerState s;
+ Texture2D<float4> t;
+
+ int2 size;
+ int2 offset;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t.Gather(s, position.xy / size, offset);
+ }
+#endif
+ 0x43425844, 0xe19bdd35, 0x44514fb3, 0xfaa8727f, 0xc1092da0, 0x00000001, 0x00000168, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000cc, 0x00000050,
+ 0x00000033, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000,
+ 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0600002b, 0x00100032,
+ 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x0700000e, 0x00100032, 0x00000000, 0x00101046,
+ 0x00000000, 0x00100046, 0x00000000, 0x8e00007f, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000,
+ 0x00100046, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x00107e46, 0x00000000, 0x0010600a,
+ 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_gather4_po = {gather4_po_code, sizeof(gather4_po_code)};
+ static const struct vec4 texture_data[] =
+ {
+ {0.0f, 0.0f}, {1.0f, 1.0f}, {2.0f, 2.0f}, {3.0f, 3.0f},
+ {4.0f, 0.1f}, {5.0f, 1.1f}, {6.0f, 2.1f}, {7.0f, 3.1f},
+ {8.0f, 0.2f}, {9.0f, 1.2f}, {0.5f, 2.2f}, {1.5f, 3.2f},
+ {2.5f, 0.3f}, {3.5f, 1.3f}, {4.5f, 2.3f}, {5.5f, 3.3f},
+ };
+ static const struct vec4 expected_gather4[] =
+ {
+ {4.0f, 5.0f, 1.0f, 0.0f}, {5.0f, 6.0f, 2.0f, 1.0f}, {6.0f, 7.0f, 3.0f, 2.0f}, {7.0f, 7.0f, 3.0f, 3.0f},
+ {8.0f, 9.0f, 5.0f, 4.0f}, {9.0f, 0.5f, 6.0f, 5.0f}, {0.5f, 1.5f, 7.0f, 6.0f}, {1.5f, 1.5f, 7.0f, 7.0f},
+ {2.5f, 3.5f, 9.0f, 8.0f}, {3.5f, 4.5f, 0.5f, 9.0f}, {4.5f, 5.5f, 1.5f, 0.5f}, {5.5f, 5.5f, 1.5f, 1.5f},
+ {2.5f, 3.5f, 3.5f, 2.5f}, {3.5f, 4.5f, 4.5f, 3.5f}, {4.5f, 5.5f, 5.5f, 4.5f}, {5.5f, 5.5f, 5.5f, 5.5f},
+ };
+ static const struct vec4 expected_gather4_offset[] =
+ {
+ {9.0f, 0.5f, 6.0f, 5.0f}, {0.5f, 1.5f, 7.0f, 6.0f}, {1.5f, 1.5f, 7.0f, 7.0f}, {1.5f, 1.5f, 7.0f, 7.0f},
+ {3.5f, 4.5f, 0.5f, 9.0f}, {4.5f, 5.5f, 1.5f, 0.5f}, {5.5f, 5.5f, 1.5f, 1.5f}, {5.5f, 5.5f, 1.5f, 1.5f},
+ {3.5f, 4.5f, 4.5f, 3.5f}, {4.5f, 5.5f, 5.5f, 4.5f}, {5.5f, 5.5f, 5.5f, 5.5f}, {5.5f, 5.5f, 5.5f, 5.5f},
+ {3.5f, 4.5f, 4.5f, 3.5f}, {4.5f, 5.5f, 5.5f, 4.5f}, {5.5f, 5.5f, 5.5f, 5.5f}, {5.5f, 5.5f, 5.5f, 5.5f},
+ };
+ static const struct vec4 expected_gather4_green[] =
+ {
+ {0.1f, 1.1f, 1.0f, 0.0f}, {1.1f, 2.1f, 2.0f, 1.0f}, {2.1f, 3.1f, 3.0f, 2.0f}, {3.1f, 3.1f, 3.0f, 3.0f},
+ {0.2f, 1.2f, 1.1f, 0.1f}, {1.2f, 2.2f, 2.1f, 1.1f}, {2.2f, 3.2f, 3.1f, 2.1f}, {3.2f, 3.2f, 3.1f, 3.1f},
+ {0.3f, 1.3f, 1.2f, 0.2f}, {1.3f, 2.3f, 2.2f, 1.2f}, {2.3f, 3.3f, 3.2f, 2.2f}, {3.3f, 3.3f, 3.2f, 3.2f},
+ {0.3f, 1.3f, 1.3f, 0.3f}, {1.3f, 2.3f, 2.3f, 1.3f}, {2.3f, 3.3f, 3.3f, 2.3f}, {3.3f, 3.3f, 3.3f, 3.3f},
+ };
+ static const struct vec4 white = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const D3D12_SUBRESOURCE_DATA resource_data = {&texture_data, sizeof(texture_data) / 4};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 4;
+ desc.rt_height = 4;
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_texture_root_signature(context.device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 4, 0);
+
+ heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap);
+
+ texture = create_default_texture(context.device, 4, 4, DXGI_FORMAT_R32G32B32A32_FLOAT,
+ 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ ID3D12Device_CreateShaderResourceView(context.device, texture, NULL, cpu_handle);
+ upload_texture_data(texture, &resource_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ constants.width = 4;
+ constants.height = 4;
+ constants.offset_x = 1;
+ constants.offset_y = 1;
+
+ /* ps_gather4 */
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, NULL, &ps_gather4, NULL);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &constants.width, 0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ const struct vec4 *expected = &expected_gather4[y * rb.width + x];
+ const struct vec4 *got = get_readback_vec4(&rb, x, y);
+ ok(compare_vec4(got, expected, 0),
+ "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n",
+ got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w);
+ }
+ }
+ release_resource_readback(&rb);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* ps_gather4_offset */
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, NULL, &ps_gather4_offset, NULL);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &constants.width, 0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ const struct vec4 *expected = &expected_gather4_offset[y * rb.width + x];
+ const struct vec4 *got = get_readback_vec4(&rb, x, y);
+ ok(compare_vec4(got, expected, 0),
+ "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n",
+ got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w);
+ }
+ }
+ release_resource_readback(&rb);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* ps_gather4_green */
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, NULL, &ps_gather4_green, NULL);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &constants.width, 0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ const struct vec4 *expected = &expected_gather4_green[y * rb.width + x];
+ const struct vec4 *got = get_readback_vec4(&rb, x, y);
+ ok(compare_vec4(got, expected, 0),
+ "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n",
+ got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w);
+ }
+ }
+ release_resource_readback(&rb);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* ps_gather4_po */
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, NULL, &ps_gather4_po, NULL);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &constants.width, 0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ const struct vec4 *expected = &expected_gather4_offset[y * rb.width + x];
+ const struct vec4 *got = get_readback_vec4(&rb, x, y);
+ ok(compare_vec4(got, expected, 0),
+ "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n",
+ got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w);
+ }
+ }
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ constants.offset_x = 0;
+ constants.offset_y = 0;
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &constants.width, 0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ const struct vec4 *expected = &expected_gather4[y * rb.width + x];
+ const struct vec4 *got = get_readback_vec4(&rb, x, y);
+ ok(compare_vec4(got, expected, 0),
+ "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n",
+ got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w);
+ }
+ }
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(texture);
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_gather_c(void)
+{
+ struct
+ {
+ int width, height;
+ int offset_x, offset_y;
+ float d_ref;
+ } constants;
+
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *texture;
+ unsigned int x, y;
+
+ static const DWORD gather4_c_code[] =
+ {
+#if 0
+ SamplerComparisonState s;
+ Texture2D<float4> t;
+
+ int2 size;
+ int2 offset;
+ float d_ref;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t.GatherCmp(s, position.xy / size, d_ref);
+ }
+#endif
+ 0x43425844, 0xd3d04479, 0x901e9208, 0x7074fd0c, 0xbcadb2da, 0x00000001, 0x00000168, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000cc, 0x00000050,
+ 0x00000033, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300085a, 0x00106000,
+ 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0600002b, 0x00100032,
+ 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x0700000e, 0x00100032, 0x00000000, 0x00101046,
+ 0x00000000, 0x00100046, 0x00000000, 0x8e00007e, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000,
+ 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x0010600a, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_gather4_c = {gather4_c_code, sizeof(gather4_c_code)};
+ static const DWORD gather4_po_c_code[] =
+ {
+#if 0
+ SamplerComparisonState s;
+ Texture2D<float4> t;
+
+ int2 size;
+ int2 offset;
+ float d_ref;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t.GatherCmp(s, position.xy / size, d_ref, offset);
+ }
+#endif
+ 0x43425844, 0x501de13e, 0x472d2d20, 0x6df0fee4, 0xef27d9e6, 0x00000001, 0x00000174, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000d8, 0x00000050,
+ 0x00000036, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300085a, 0x00106000,
+ 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0600002b, 0x00100032,
+ 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x0700000e, 0x00100032, 0x00000000, 0x00101046,
+ 0x00000000, 0x00100046, 0x00000000, 0x91000080, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000,
+ 0x00100046, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x00107e46, 0x00000000, 0x0010600a,
+ 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_gather4_po_c = {gather4_po_c_code, sizeof(gather4_po_c_code)};
+ static const float texture_data[] =
+ {
+ 0.0f, 1.0f, 0.20f, 0.30f,
+ 0.4f, 0.5f, 0.60f, 0.70f,
+ 0.8f, 0.9f, 0.50f, 0.15f,
+ 0.2f, 0.3f, 0.45f, 0.55f,
+ };
+ static const struct vec4 expected_gather4_c[] =
+ {
+ {0.0f, 1.0f, 1.0f, 0.0f}, {1.0f, 1.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 0.0f, 0.0f},
+ {1.0f, 1.0f, 1.0f, 0.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 0.0f, 1.0f, 1.0f}, {0.0f, 0.0f, 1.0f, 1.0f},
+ {0.0f, 0.0f, 1.0f, 1.0f}, {0.0f, 0.0f, 1.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 0.0f, 0.0f},
+ {0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 1.0f, 0.0f}, {1.0f, 1.0f, 1.0f, 1.0f},
+ };
+ static const struct vec4 expected_gather4_po_c[] =
+ {
+ {1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 0.0f, 1.0f, 1.0f}, {0.0f, 0.0f, 1.0f, 1.0f}, {0.0f, 0.0f, 1.0f, 1.0f},
+ {0.0f, 0.0f, 1.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 0.0f, 0.0f},
+ {0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 1.0f, 0.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f},
+ {0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 1.0f, 0.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f},
+ };
+ static const struct vec4 white = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const D3D12_SUBRESOURCE_DATA resource_data = {&texture_data, sizeof(texture_data) / 4};
+ static const D3D12_STATIC_SAMPLER_DESC sampler_desc =
+ {
+ .Filter = D3D12_FILTER_COMPARISON_MIN_MAG_MIP_POINT,
+ .AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+ .AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+ .AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+ .ComparisonFunc = D3D12_COMPARISON_FUNC_LESS,
+ .MaxLOD = D3D12_FLOAT32_MAX,
+ .ShaderRegister = 0,
+ .RegisterSpace = 0,
+ .ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL,
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 4;
+ desc.rt_height = 4;
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_texture_root_signature_(__LINE__, context.device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 5, 0, &sampler_desc);
+
+ heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap);
+
+ texture = create_default_texture(context.device, 4, 4, DXGI_FORMAT_R32_TYPELESS,
+ 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_texture_data(texture, &resource_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+ srv_desc.Texture2D.MipLevels = 1;
+ ID3D12Device_CreateShaderResourceView(context.device, texture, &srv_desc, cpu_handle);
+
+ constants.width = 4;
+ constants.height = 4;
+ constants.offset_x = 1;
+ constants.offset_y = 1;
+ constants.d_ref = 0.46f;
+
+ /* ps_gather4_c */
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, NULL, &ps_gather4_c, NULL);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 5, &constants.width, 0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ const struct vec4 *expected = &expected_gather4_c[y * rb.width + x];
+ const struct vec4 *got = get_readback_vec4(&rb, x, y);
+ ok(compare_vec4(got, expected, 0),
+ "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n",
+ got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w);
+ }
+ }
+ release_resource_readback(&rb);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* ps_gather4_po_c */
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, desc.rt_format, NULL, &ps_gather4_po_c, NULL);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 5, &constants.width, 0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ const struct vec4 *expected = &expected_gather4_po_c[y * rb.width + x];
+ const struct vec4 *got = get_readback_vec4(&rb, x, y);
+ ok(compare_vec4(got, expected, 0),
+ "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n",
+ got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w);
+ }
+ }
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ constants.offset_x = 0;
+ constants.offset_y = 0;
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 5, &constants.width, 0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < rb.height; ++y)
+ {
+ for (x = 0; x < rb.width; ++x)
+ {
+ const struct vec4 *expected = &expected_gather4_c[y * rb.width + x];
+ const struct vec4 *got = get_readback_vec4(&rb, x, y);
+ ok(compare_vec4(got, expected, 0),
+ "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n",
+ got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w);
+ }
+ }
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(texture);
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_sample_c_lz(void)
+{
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_DEPTH_STENCIL_VIEW_DESC dsv_desc;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ struct depth_stencil_resource ds;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ struct vec4 ps_constant;
+ ID3D12Device *device;
+ unsigned int i;
+ RECT rect;
+
+ static const D3D12_STATIC_SAMPLER_DESC sampler_desc =
+ {
+ .Filter = D3D12_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR,
+ .AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+ .AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+ .AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+ .ComparisonFunc = D3D12_COMPARISON_FUNC_GREATER,
+ .MaxAnisotropy = 0,
+ .BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE,
+ .MaxLOD = 10.0f,
+ };
+ static const float clear_color[] = {0.5f, 0.5f, 0.5f, 0.5f};
+ static const DWORD ps_array_code[] =
+ {
+#if 0
+ Texture2DArray t;
+ SamplerComparisonState s;
+
+ float ref;
+ float layer;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t.SampleCmpLevelZero(s, float3(position.x / 640.0f, position.y / 480.0f, layer), ref);
+ }
+#endif
+ 0x43425844, 0xfe28b3c3, 0xdd7ef404, 0x8d5874a1, 0x984ff182, 0x00000001, 0x00000180, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000e4, 0x00000041,
+ 0x00000039, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300085a, 0x00106000,
+ 0x00000000, 0x04004058, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032,
+ 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000,
+ 0x06000036, 0x00100042, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0c000047, 0x00100012,
+ 0x00000000, 0x00100246, 0x00000000, 0x00107006, 0x00000000, 0x00106000, 0x00000000, 0x0020800a,
+ 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_array = {ps_array_code, sizeof(ps_array_code)};
+ static const DWORD ps_cube_code[] =
+ {
+#if 0
+ TextureCube t;
+ SamplerComparisonState s;
+
+ float ref;
+ float face;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ float2 p;
+ p.x = position.x / 640.0f;
+ p.y = position.y / 480.0f;
+
+ float3 coord;
+ switch ((uint)face)
+ {
+ case 0:
+ coord = float3(1.0f, p.x, p.y);
+ break;
+ case 1:
+ coord = float3(-1.0f, p.x, p.y);
+ break;
+ case 2:
+ coord = float3(p.x, 1.0f, p.y);
+ break;
+ case 3:
+ coord = float3(p.x, -1.0f, p.y);
+ break;
+ case 4:
+ coord = float3(p.x, p.y, 1.0f);
+ break;
+ case 5:
+ default:
+ coord = float3(p.x, p.y, -1.0f);
+ break;
+ }
+
+ return t.SampleCmpLevelZero(s, coord, ref);
+ }
+#endif
+ 0x43425844, 0xde5655e5, 0x1b116fa1, 0xfce9e757, 0x41c28aac, 0x00000001, 0x00000328, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000028c, 0x00000041,
+ 0x000000a3, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300085a, 0x00106000,
+ 0x00000000, 0x04003058, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0600001c, 0x00100012,
+ 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0300004c, 0x0010000a, 0x00000000, 0x03000006,
+ 0x00004001, 0x00000000, 0x05000036, 0x00100012, 0x00000000, 0x00004001, 0x3f800000, 0x0a000038,
+ 0x00100062, 0x00000000, 0x00101106, 0x00000000, 0x00004002, 0x00000000, 0x3acccccd, 0x3b088889,
+ 0x00000000, 0x01000002, 0x03000006, 0x00004001, 0x00000001, 0x05000036, 0x00100012, 0x00000000,
+ 0x00004001, 0xbf800000, 0x0a000038, 0x00100062, 0x00000000, 0x00101106, 0x00000000, 0x00004002,
+ 0x00000000, 0x3acccccd, 0x3b088889, 0x00000000, 0x01000002, 0x03000006, 0x00004001, 0x00000002,
+ 0x0a000038, 0x00100052, 0x00000000, 0x00101106, 0x00000000, 0x00004002, 0x3acccccd, 0x00000000,
+ 0x3b088889, 0x00000000, 0x05000036, 0x00100022, 0x00000000, 0x00004001, 0x3f800000, 0x01000002,
+ 0x03000006, 0x00004001, 0x00000003, 0x0a000038, 0x00100052, 0x00000000, 0x00101106, 0x00000000,
+ 0x00004002, 0x3acccccd, 0x00000000, 0x3b088889, 0x00000000, 0x05000036, 0x00100022, 0x00000000,
+ 0x00004001, 0xbf800000, 0x01000002, 0x03000006, 0x00004001, 0x00000004, 0x0a000038, 0x00100032,
+ 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000,
+ 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x3f800000, 0x01000002, 0x0100000a, 0x0a000038,
+ 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000,
+ 0x00000000, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0xbf800000, 0x01000002, 0x01000017,
+ 0x0c000047, 0x00100012, 0x00000000, 0x00100246, 0x00000000, 0x00107006, 0x00000000, 0x00106000,
+ 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100006,
+ 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_cube = {ps_cube_code, sizeof(ps_cube_code)};
+ static const float depth_values[] = {1.0f, 0.0f, 0.5f, 0.6f, 0.4f, 0.1f};
+ static const struct
+ {
+ unsigned int layer;
+ float d_ref;
+ float expected;
+ }
+ tests[] =
+ {
+ {0, 0.5f, 0.0f},
+ {1, 0.5f, 1.0f},
+ {2, 0.5f, 0.0f},
+ {3, 0.5f, 0.0f},
+ {4, 0.5f, 1.0f},
+ {5, 0.5f, 1.0f},
+
+ {0, 0.0f, 0.0f},
+ {1, 0.0f, 0.0f},
+ {2, 0.0f, 0.0f},
+ {3, 0.0f, 0.0f},
+ {4, 0.0f, 0.0f},
+ {5, 0.0f, 0.0f},
+
+ {0, 1.0f, 0.0f},
+ {1, 1.0f, 1.0f},
+ {2, 1.0f, 1.0f},
+ {3, 1.0f, 1.0f},
+ {4, 1.0f, 1.0f},
+ {5, 1.0f, 1.0f},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 640;
+ desc.rt_height = 480;
+ desc.rt_format = DXGI_FORMAT_R32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_texture_root_signature_(__LINE__, device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 4, 0, &sampler_desc);
+
+ heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 6);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+
+ /* 2D array texture */
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps_array, NULL);
+
+ init_depth_stencil(&ds, device, 32, 32, ARRAY_SIZE(depth_values), 2,
+ DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL);
+
+ for (i = 0; i < ARRAY_SIZE(depth_values); ++i)
+ {
+ memset(&dsv_desc, 0, sizeof(dsv_desc));
+ dsv_desc.Format = DXGI_FORMAT_D32_FLOAT;
+ dsv_desc.ViewDimension = D3D12_DSV_DIMENSION_TEXTURE2DARRAY;
+ dsv_desc.Texture2DArray.FirstArraySlice = i;
+ dsv_desc.Texture2DArray.ArraySize = 1;
+ ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, depth_values[i], 0, 0, NULL);
+
+ dsv_desc.Texture2DArray.MipSlice = 1;
+ ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL);
+ }
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2DARRAY;
+ srv_desc.Texture2DArray.MostDetailedMip = 0;
+ srv_desc.Texture2DArray.MipLevels = 2;
+ srv_desc.Texture2DArray.FirstArraySlice = 0;
+ srv_desc.Texture2DArray.ArraySize = ARRAY_SIZE(depth_values);
+ ID3D12Device_CreateShaderResourceView(context.device, ds.texture, &srv_desc, cpu_handle);
+
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ memset(&ps_constant, 0, sizeof(ps_constant));
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("test %u", i);
+
+ ps_constant.x = tests[i].d_ref;
+ ps_constant.y = tests[i].layer;
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, clear_color, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 0));
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_constant.x, 0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+
+ /* cube texture */
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps_cube, NULL);
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURECUBE;
+ srv_desc.TextureCube.MostDetailedMip = 0;
+ srv_desc.TextureCube.MipLevels = 2;
+ ID3D12Device_CreateShaderResourceView(context.device, ds.texture, &srv_desc, cpu_handle);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("test %u", i);
+
+ ps_constant.x = tests[i].d_ref;
+ ps_constant.y = tests[i].layer;
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, clear_color, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 0));
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_constant.x, 0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ /* Avoid testing values affected by seamless cube map filtering. */
+ set_rect(&rect, 100, 100, 540, 380);
+ check_readback_data_float(&rb, &rect, tests[i].expected, 2);
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ destroy_depth_stencil(&ds);
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_cube_maps(void)
+{
+ unsigned int i, j, sub_resource_idx, sub_resource_count;
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle;
+ D3D12_SUBRESOURCE_DATA *texture_data;
+ const D3D12_SHADER_BYTECODE *ps;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12PipelineState *pso;
+ ID3D12Resource *texture;
+ float *data;
+ HRESULT hr;
+
+ struct
+ {
+ unsigned int face;
+ unsigned int level;
+ unsigned int cube;
+ } constants;
+
+ const unsigned int texture_size = 64;
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const DWORD ps_cube_code[] =
+ {
+#if 0
+ TextureCube t;
+ SamplerState s;
+
+ uint face;
+ uint level;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p;
+ p.x = position.x / 640.0f;
+ p.y = position.y / 480.0f;
+
+ float3 coord;
+ switch (face)
+ {
+ case 0:
+ coord = float3(1.0f, p.x, p.y);
+ break;
+ case 1:
+ coord = float3(-1.0f, p.x, p.y);
+ break;
+ case 2:
+ coord = float3(p.x, 1.0f, p.y);
+ break;
+ case 3:
+ coord = float3(p.x, -1.0f, p.y);
+ break;
+ case 4:
+ coord = float3(p.x, p.y, 1.0f);
+ break;
+ case 5:
+ default:
+ coord = float3(p.x, p.y, -1.0f);
+ break;
+ }
+ return t.SampleLevel(s, coord, level);
+ }
+#endif
+ 0x43425844, 0x039aee18, 0xfd630453, 0xb884cf0f, 0x10100744, 0x00000001, 0x00000310, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000274, 0x00000040,
+ 0x0000009d, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000, 0x00000000,
+ 0x04003058, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001,
+ 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400004c, 0x0020800a, 0x00000000,
+ 0x00000000, 0x03000006, 0x00004001, 0x00000000, 0x05000036, 0x00100012, 0x00000000, 0x00004001,
+ 0x3f800000, 0x0a000038, 0x00100062, 0x00000000, 0x00101106, 0x00000000, 0x00004002, 0x00000000,
+ 0x3acccccd, 0x3b088889, 0x00000000, 0x01000002, 0x03000006, 0x00004001, 0x00000001, 0x05000036,
+ 0x00100012, 0x00000000, 0x00004001, 0xbf800000, 0x0a000038, 0x00100062, 0x00000000, 0x00101106,
+ 0x00000000, 0x00004002, 0x00000000, 0x3acccccd, 0x3b088889, 0x00000000, 0x01000002, 0x03000006,
+ 0x00004001, 0x00000002, 0x0a000038, 0x00100052, 0x00000000, 0x00101106, 0x00000000, 0x00004002,
+ 0x3acccccd, 0x00000000, 0x3b088889, 0x00000000, 0x05000036, 0x00100022, 0x00000000, 0x00004001,
+ 0x3f800000, 0x01000002, 0x03000006, 0x00004001, 0x00000003, 0x0a000038, 0x00100052, 0x00000000,
+ 0x00101106, 0x00000000, 0x00004002, 0x3acccccd, 0x00000000, 0x3b088889, 0x00000000, 0x05000036,
+ 0x00100022, 0x00000000, 0x00004001, 0xbf800000, 0x01000002, 0x03000006, 0x00004001, 0x00000004,
+ 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889,
+ 0x00000000, 0x00000000, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x3f800000, 0x01000002,
+ 0x0100000a, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd,
+ 0x3b088889, 0x00000000, 0x00000000, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0xbf800000,
+ 0x01000002, 0x01000017, 0x06000056, 0x00100082, 0x00000000, 0x0020801a, 0x00000000, 0x00000000,
+ 0x0b000048, 0x001020f2, 0x00000000, 0x00100246, 0x00000000, 0x00107e46, 0x00000000, 0x00106000,
+ 0x00000000, 0x0010003a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_cube = {ps_cube_code, sizeof(ps_cube_code)};
+ static const DWORD ps_cube_array_code[] =
+ {
+#if 0
+ TextureCubeArray t;
+ SamplerState s;
+
+ uint face;
+ uint level;
+ uint cube;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p;
+ p.x = position.x / 640.0f;
+ p.y = position.y / 480.0f;
+
+ float3 coord;
+ switch (face)
+ {
+ case 0:
+ coord = float3(1.0f, p.x, p.y);
+ break;
+ case 1:
+ coord = float3(-1.0f, p.x, p.y);
+ break;
+ case 2:
+ coord = float3(p.x, 1.0f, p.y);
+ break;
+ case 3:
+ coord = float3(p.x, -1.0f, p.y);
+ break;
+ case 4:
+ coord = float3(p.x, p.y, 1.0f);
+ break;
+ case 5:
+ default:
+ coord = float3(p.x, p.y, -1.0f);
+ break;
+ }
+ return t.SampleLevel(s, float4(coord, cube), level);
+ }
+#endif
+ 0x43425844, 0xb8d5b94a, 0xdb4be034, 0x183aed19, 0xad4af415, 0x00000001, 0x00000328, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000028c, 0x00000041,
+ 0x000000a3, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000,
+ 0x00000000, 0x04005058, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x0400004c, 0x0020800a,
+ 0x00000000, 0x00000000, 0x03000006, 0x00004001, 0x00000000, 0x05000036, 0x00100012, 0x00000000,
+ 0x00004001, 0x3f800000, 0x0a000038, 0x00100062, 0x00000000, 0x00101106, 0x00000000, 0x00004002,
+ 0x00000000, 0x3acccccd, 0x3b088889, 0x00000000, 0x01000002, 0x03000006, 0x00004001, 0x00000001,
+ 0x05000036, 0x00100012, 0x00000000, 0x00004001, 0xbf800000, 0x0a000038, 0x00100062, 0x00000000,
+ 0x00101106, 0x00000000, 0x00004002, 0x00000000, 0x3acccccd, 0x3b088889, 0x00000000, 0x01000002,
+ 0x03000006, 0x00004001, 0x00000002, 0x0a000038, 0x00100052, 0x00000000, 0x00101106, 0x00000000,
+ 0x00004002, 0x3acccccd, 0x00000000, 0x3b088889, 0x00000000, 0x05000036, 0x00100022, 0x00000000,
+ 0x00004001, 0x3f800000, 0x01000002, 0x03000006, 0x00004001, 0x00000003, 0x0a000038, 0x00100052,
+ 0x00000000, 0x00101106, 0x00000000, 0x00004002, 0x3acccccd, 0x00000000, 0x3b088889, 0x00000000,
+ 0x05000036, 0x00100022, 0x00000000, 0x00004001, 0xbf800000, 0x01000002, 0x03000006, 0x00004001,
+ 0x00000004, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd,
+ 0x3b088889, 0x00000000, 0x00000000, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x3f800000,
+ 0x01000002, 0x0100000a, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002,
+ 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x05000036, 0x00100042, 0x00000000, 0x00004001,
+ 0xbf800000, 0x01000002, 0x01000017, 0x06000056, 0x00100032, 0x00000001, 0x00208a66, 0x00000000,
+ 0x00000000, 0x05000036, 0x00100082, 0x00000000, 0x0010000a, 0x00000001, 0x0b000048, 0x001020f2,
+ 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0010001a,
+ 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_cube_array = {ps_cube_array_code, sizeof(ps_cube_array_code)};
+ static const struct ps_test
+ {
+ const D3D12_SHADER_BYTECODE *ps;
+ unsigned int miplevel_count;
+ unsigned int array_size;
+ unsigned int cube_count;
+ }
+ ps_tests[] =
+ {
+ {&ps_cube, 1, 6, 1},
+ {&ps_cube, 2, 6, 1},
+ {&ps_cube, 3, 6, 1},
+ {&ps_cube, 3, 6, ~0u},
+
+ {&ps_cube_array, 1, 12, 2},
+ {&ps_cube_array, 1, 12, ~0u},
+ {&ps_cube_array, 2, 12, 2},
+ {&ps_cube_array, 3, 12, 2},
+ {&ps_cube_array, 3, 12, ~0u},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 640;
+ desc.rt_height = 480;
+ desc.rt_format = DXGI_FORMAT_R32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_texture_root_signature(context.device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 3, 0);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, NULL, NULL);
+
+ heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap);
+
+ ps = NULL;
+ pso = NULL;
+ for (i = 0; i < ARRAY_SIZE(ps_tests); ++i)
+ {
+ const struct ps_test *test = &ps_tests[i];
+
+ if (ps != test->ps)
+ {
+ if (pso)
+ ID3D12PipelineState_Release(pso);
+
+ ps = test->ps;
+ pso_desc.PS = *test->ps;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pso);
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+ }
+
+ texture = create_default_texture2d(context.device, texture_size, texture_size,
+ test->array_size, test->miplevel_count, DXGI_FORMAT_R32_FLOAT,
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ srv_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ if (ps == &ps_cube)
+ {
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURECUBE;
+ srv_desc.TextureCube.MostDetailedMip = 0;
+ srv_desc.TextureCube.MipLevels = test->miplevel_count;
+ srv_desc.TextureCube.ResourceMinLODClamp = 0.0f;
+ }
+ else
+ {
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURECUBEARRAY;
+ srv_desc.TextureCubeArray.MostDetailedMip = 0;
+ srv_desc.TextureCubeArray.MipLevels = test->miplevel_count;
+ srv_desc.TextureCubeArray.First2DArrayFace = 0;
+ srv_desc.TextureCubeArray.NumCubes = test->cube_count;
+ srv_desc.TextureCubeArray.ResourceMinLODClamp = 0.0f;
+ }
+ ID3D12Device_CreateShaderResourceView(context.device, texture, &srv_desc, cpu_handle);
+
+ sub_resource_count = test->array_size * test->miplevel_count;
+ texture_data = calloc(sub_resource_count, sizeof(*texture_data));
+ ok(texture_data, "Failed to allocate memory.\n");
+ for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx)
+ {
+ data = calloc(texture_size * texture_size, sizeof(*data));
+ ok(data, "Failed to allocate memory.\n");
+ for (j = 0; j < texture_size * texture_size; ++j)
+ data[j] = sub_resource_idx;
+
+ texture_data[sub_resource_idx].pData = data;
+ texture_data[sub_resource_idx].RowPitch = texture_size * sizeof(*data);
+ texture_data[sub_resource_idx].SlicePitch = 0;
+ }
+ upload_texture_data(texture, texture_data, sub_resource_count, queue, command_list);
+ for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx)
+ free((void *)texture_data[sub_resource_idx].pData);
+ free(texture_data);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx)
+ {
+ constants.face = (sub_resource_idx / test->miplevel_count) % 6;
+ constants.level = sub_resource_idx % test->miplevel_count;
+ constants.cube = (sub_resource_idx / test->miplevel_count) / 6;
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 3, &constants.face, 0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_float(context.render_target, 0, queue, command_list, sub_resource_idx, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+
+ ID3D12Resource_Release(texture);
+ }
+ ID3D12PipelineState_Release(pso);
+
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_multisample_array_texture(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_ROOT_PARAMETER root_parameters[3];
+ D3D12_DESCRIPTOR_RANGE descriptor_range;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_RENDER_TARGET_VIEW_DESC rtv_desc;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_RESOURCE_DESC resource_desc;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12Resource *uav_buffer;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *texture;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ Texture2DMSArray<float4> t;
+
+ RWByteAddressBuffer u;
+
+ uint layer;
+ uint sample_index;
+
+ uint offset;
+
+ float4 main() : SV_Target
+ {
+ uint width, height, elements, samples;
+ t.GetDimensions(width, height, elements, samples);
+ u.Store4(offset, uint4(width, height, elements, samples));
+ return t.Load(int3(0, 0, layer), sample_index);
+ }
+#endif
+ 0x43425844, 0xb1457478, 0xd475e3dd, 0xda1eb41d, 0x66075d2b, 0x00000001, 0x0000017c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000104, 0x00000050, 0x00000041,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04004858, 0x00107000, 0x00000000,
+ 0x00005555, 0x0300009d, 0x0011e000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068,
+ 0x00000001, 0x8900103d, 0x80000242, 0x00155543, 0x00100072, 0x00000000, 0x00004001, 0x00000000,
+ 0x00107e46, 0x00000000, 0x0500086f, 0x00100082, 0x00000000, 0x0010700a, 0x00000000, 0x080000a6,
+ 0x0011e0f2, 0x00000001, 0x0020802a, 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x05000036,
+ 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x06000036, 0x00100042, 0x00000000, 0x0020800a,
+ 0x00000000, 0x00000000, 0x8c00002e, 0x80000242, 0x00155543, 0x001020f2, 0x00000000, 0x00100206,
+ 0x00000000, 0x00107e46, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const struct vec4 colors[] =
+ {
+ {1.0f, 0.0f, 0.0f, 1.0f},
+ {0.0f, 1.0f, 0.0f, 1.0f},
+ {0.0f, 0.0f, 1.0f, 1.0f},
+
+ {0.0f, 1.0f, 1.0f, 1.0f},
+ {1.0f, 0.0f, 1.0f, 1.0f},
+ {1.0f, 1.0f, 0.0f, 1.0f},
+
+ {0.5f, 0.5f, 0.5f, 1.0f},
+ {0.5f, 0.5f, 0.5f, 0.5f},
+ };
+ static const struct
+ {
+ struct
+ {
+ unsigned int layer;
+ unsigned int sample_index;
+ unsigned int offset;
+ } constants;
+ unsigned int expected_color;
+ }
+ tests[] =
+ {
+ {{0, 0, 0}, 0xff0000ff},
+ {{0, 1, 0}, 0xff0000ff},
+ {{0, 2, 0}, 0xff0000ff},
+ {{0, 3, 0}, 0xff0000ff},
+
+ {{1, 0, 16}, 0xff00ff00},
+ {{2, 1, 32}, 0xffff0000},
+ {{3, 2, 32}, 0xffffff00},
+ {{4, 3, 32}, 0xffff00ff},
+ {{5, 0, 32}, 0xff00ffff},
+ {{6, 0, 32}, 0xff7f7f7f},
+ {{7, 0, 32}, 0x7f7f7f7f},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_descriptor_count = 2;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_range.NumDescriptors = 1;
+ descriptor_range.BaseShaderRegister = 0;
+ descriptor_range.RegisterSpace = 0;
+ descriptor_range.OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 3;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[2].Descriptor.ShaderRegister = 1;
+ root_parameters[2].Descriptor.RegisterSpace = 0;
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+
+ memset(&resource_desc, 0, sizeof(resource_desc));
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Width = 32;
+ resource_desc.Height = 32;
+ resource_desc.DepthOrArraySize = ARRAY_SIZE(colors);
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ resource_desc.SampleDesc.Count = 4;
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&texture);
+ ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
+
+ cpu_handle = get_cpu_rtv_handle(&context, context.rtv_heap, 1);
+
+ for (i = 0; i < ARRAY_SIZE(colors); ++i)
+ {
+ memset(&rtv_desc, 0, sizeof(rtv_desc));
+ rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY;
+ rtv_desc.Format = resource_desc.Format;
+ rtv_desc.Texture2DMSArray.FirstArraySlice = i;
+ rtv_desc.Texture2DMSArray.ArraySize = 1;
+ ID3D12Device_CreateRenderTargetView(device, texture, &rtv_desc, cpu_handle);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, cpu_handle, &colors[i].x, 0, NULL);
+ }
+
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap);
+
+ ID3D12Device_CreateShaderResourceView(device, texture, NULL, cpu_handle);
+
+ uav_buffer = create_default_buffer(device, 4096,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 3, &tests[i].constants.layer, 0);
+ ID3D12GraphicsCommandList_SetGraphicsRootUnorderedAccessView(command_list,
+ 2, ID3D12Resource_GetGPUVirtualAddress(uav_buffer));
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_color, 1);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ transition_resource_state(command_list, uav_buffer,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_buffer_readback_with_command_list(uav_buffer, DXGI_FORMAT_R32G32B32A32_UINT, &rb, queue, command_list);
+ for (i = 0; i < 2; ++i)
+ {
+ const struct uvec4 *v = get_readback_uvec4(&rb, i, 0);
+ ok(v->x == resource_desc.Width, "Got unexpected width %u.\n", v->x);
+ ok(v->y == resource_desc.Height, "Got unexpected height %u.\n", v->y);
+ ok(v->z == resource_desc.DepthOrArraySize, "Got unexpected array size %u.\n", v->z);
+ ok(v->w == resource_desc.SampleDesc.Count, "Got unexpected sample count %u.\n", v->w);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(texture);
+ ID3D12Resource_Release(uav_buffer);
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_resinfo(void)
+{
+ D3D12_SHADER_RESOURCE_VIEW_DESC *current_srv_desc, srv_desc;
+ const D3D12_SHADER_BYTECODE *current_ps;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_RESOURCE_DESC resource_desc;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *texture;
+ struct uvec4 constant;
+ ID3D12Device *device;
+ unsigned int i, type;
+ HRESULT hr;
+
+ static const DWORD ps_2d_code[] =
+ {
+#if 0
+ Texture2D t;
+
+ uint type;
+ uint level;
+
+ float4 main() : SV_TARGET
+ {
+ if (!type)
+ {
+ float width, height, miplevels;
+ t.GetDimensions(level, width, height, miplevels);
+ return float4(width, height, miplevels, 0);
+ }
+ else
+ {
+ uint width, height, miplevels;
+ t.GetDimensions(level, width, height, miplevels);
+ return float4(width, height, miplevels, 0);
+ }
+ }
+#endif
+ 0x43425844, 0x9c2db58d, 0x7218d757, 0x23255414, 0xaa86938e, 0x00000001, 0x00000168, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000f0, 0x00000040, 0x0000003c,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04001858, 0x00107000, 0x00000000, 0x00005555,
+ 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400001f, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0800003d, 0x001000f2, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x00107e46,
+ 0x00000000, 0x05000036, 0x00102072, 0x00000000, 0x00100346, 0x00000000, 0x05000036, 0x00102082,
+ 0x00000000, 0x00004001, 0x00000000, 0x0100003e, 0x01000012, 0x0800103d, 0x001000f2, 0x00000000,
+ 0x0020801a, 0x00000000, 0x00000000, 0x00107e46, 0x00000000, 0x05000056, 0x00102072, 0x00000000,
+ 0x00100346, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x00000000, 0x0100003e,
+ 0x01000015, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_2d = {ps_2d_code, sizeof(ps_2d_code)};
+ static const DWORD ps_2d_array_code[] =
+ {
+#if 0
+ Texture2DArray t;
+
+ uint type;
+ uint level;
+
+ float4 main() : SV_TARGET
+ {
+ if (!type)
+ {
+ float width, height, elements, miplevels;
+ t.GetDimensions(level, width, height, elements, miplevels);
+ return float4(width, height, elements, miplevels);
+ }
+ else
+ {
+ uint width, height, elements, miplevels;
+ t.GetDimensions(level, width, height, elements, miplevels);
+ return float4(width, height, elements, miplevels);
+ }
+ }
+#endif
+ 0x43425844, 0x92cd8789, 0x38e359ac, 0xd65ab502, 0xa018a5ae, 0x00000001, 0x0000012c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000b4, 0x00000040, 0x0000002d,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04004058, 0x00107000, 0x00000000, 0x00005555,
+ 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400001f, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0800003d, 0x001020f2, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x00107e46,
+ 0x00000000, 0x0100003e, 0x01000012, 0x0800103d, 0x001000f2, 0x00000000, 0x0020801a, 0x00000000,
+ 0x00000000, 0x00107e46, 0x00000000, 0x05000056, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000,
+ 0x0100003e, 0x01000015, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_2d_array = {ps_2d_array_code, sizeof(ps_2d_array_code)};
+ static const DWORD ps_3d_code[] =
+ {
+#if 0
+ Texture3D t;
+
+ uint type;
+ uint level;
+
+ float4 main() : SV_TARGET
+ {
+ if (!type)
+ {
+ float width, height, depth, miplevels;
+ t.GetDimensions(level, width, height, depth, miplevels);
+ return float4(width, height, depth, miplevels);
+ }
+ else
+ {
+ uint width, height, depth, miplevels;
+ t.GetDimensions(level, width, height, depth, miplevels);
+ return float4(width, height, depth, miplevels);
+ }
+ }
+#endif
+ 0x43425844, 0xac1f73b9, 0x2bce1322, 0x82c599e6, 0xbff0d681, 0x00000001, 0x0000012c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000b4, 0x00000040, 0x0000002d,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04002858, 0x00107000, 0x00000000, 0x00005555,
+ 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400001f, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0800003d, 0x001020f2, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x00107e46,
+ 0x00000000, 0x0100003e, 0x01000012, 0x0800103d, 0x001000f2, 0x00000000, 0x0020801a, 0x00000000,
+ 0x00000000, 0x00107e46, 0x00000000, 0x05000056, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000,
+ 0x0100003e, 0x01000015, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_3d = {ps_3d_code, sizeof(ps_3d_code)};
+ static const DWORD ps_cube_code[] =
+ {
+#if 0
+ TextureCube t;
+
+ uint type;
+ uint level;
+
+ float4 main() : SV_TARGET
+ {
+ if (!type)
+ {
+ float width, height, miplevels;
+ t.GetDimensions(level, width, height, miplevels);
+ return float4(width, height, miplevels, 0);
+ }
+ else
+ {
+ uint width, height, miplevels;
+ t.GetDimensions(level, width, height, miplevels);
+ return float4(width, height, miplevels, 0);
+ }
+ }
+#endif
+ 0x43425844, 0x795eb161, 0xb8291400, 0xcc531086, 0x2a8143ce, 0x00000001, 0x00000168, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000f0, 0x00000040, 0x0000003c,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04003058, 0x00107000, 0x00000000, 0x00005555,
+ 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400001f, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0800003d, 0x001000f2, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x00107e46,
+ 0x00000000, 0x05000036, 0x00102072, 0x00000000, 0x00100346, 0x00000000, 0x05000036, 0x00102082,
+ 0x00000000, 0x00004001, 0x00000000, 0x0100003e, 0x01000012, 0x0800103d, 0x001000f2, 0x00000000,
+ 0x0020801a, 0x00000000, 0x00000000, 0x00107e46, 0x00000000, 0x05000056, 0x00102072, 0x00000000,
+ 0x00100346, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x00000000, 0x0100003e,
+ 0x01000015, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_cube = {ps_cube_code, sizeof(ps_cube_code)};
+ static const DWORD ps_cube_array_code[] =
+ {
+#if 0
+ TextureCubeArray t;
+
+ uint type;
+ uint level;
+
+ float4 main() : SV_TARGET
+ {
+ if (!type)
+ {
+ float width, height, elements, miplevels;
+ t.GetDimensions(level, width, height, elements, miplevels);
+ return float4(width, height, miplevels, 0);
+ }
+ else
+ {
+ uint width, height, elements, miplevels;
+ t.GetDimensions(level, width, height, elements, miplevels);
+ return float4(width, height, miplevels, 0);
+ }
+ }
+#endif
+ 0x43425844, 0x894d136f, 0xa1f5c746, 0xd771ac09, 0x6914e044, 0x00000001, 0x0000016c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000f4, 0x00000041, 0x0000003d,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04005058, 0x00107000, 0x00000000,
+ 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400001f, 0x0020800a,
+ 0x00000000, 0x00000000, 0x0800003d, 0x00100072, 0x00000000, 0x0020801a, 0x00000000, 0x00000000,
+ 0x00107b46, 0x00000000, 0x05000036, 0x00102072, 0x00000000, 0x00100246, 0x00000000, 0x05000036,
+ 0x00102082, 0x00000000, 0x00004001, 0x00000000, 0x0100003e, 0x01000012, 0x0800103d, 0x00100072,
+ 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x00107b46, 0x00000000, 0x05000056, 0x00102072,
+ 0x00000000, 0x00100246, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x00000000,
+ 0x0100003e, 0x01000015, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_cube_array = {ps_cube_array_code, sizeof(ps_cube_array_code)};
+ static const struct ps_test
+ {
+ const D3D12_SHADER_BYTECODE *ps;
+ struct
+ {
+ unsigned int width;
+ unsigned int height;
+ unsigned int depth;
+ unsigned int miplevel_count;
+ unsigned int array_size;
+ unsigned int cube_count;
+ } texture_desc;
+ unsigned int miplevel;
+ struct vec4 expected_result;
+ }
+ ps_tests[] =
+ {
+ {&ps_2d, {64, 64, 1, 1, 1, 0}, 0, {64.0f, 64.0f, 1.0f, 0.0f}},
+ {&ps_2d, {32, 16, 1, 3, 1, 0}, 0, {32.0f, 16.0f, 3.0f, 0.0f}},
+ {&ps_2d, {32, 16, 1, 3, 1, 0}, 1, {16.0f, 8.0f, 3.0f, 0.0f}},
+ {&ps_2d, {32, 16, 1, 3, 1, 0}, 2, { 8.0f, 4.0f, 3.0f, 0.0f}},
+
+ {&ps_2d_array, {64, 64, 1, 1, 6, 0}, 0, {64.0f, 64.0f, 6.0f, 1.0f}},
+ {&ps_2d_array, {32, 16, 1, 3, 9, 0}, 0, {32.0f, 16.0f, 9.0f, 3.0f}},
+ {&ps_2d_array, {32, 16, 1, 3, 7, 0}, 1, {16.0f, 8.0f, 7.0f, 3.0f}},
+ {&ps_2d_array, {32, 16, 1, 3, 3, 0}, 2, { 8.0f, 4.0f, 3.0f, 3.0f}},
+
+ {&ps_3d, {64, 64, 2, 1, 1, 0}, 0, {64.0f, 64.0f, 2.0f, 1.0f}},
+ {&ps_3d, {64, 64, 2, 2, 1, 0}, 1, {32.0f, 32.0f, 1.0f, 2.0f}},
+ {&ps_3d, {64, 64, 4, 1, 1, 0}, 0, {64.0f, 64.0f, 4.0f, 1.0f}},
+ {&ps_3d, {64, 64, 4, 2, 1, 0}, 1, {32.0f, 32.0f, 2.0f, 2.0f}},
+ {&ps_3d, { 8, 8, 8, 1, 1, 0}, 0, { 8.0f, 8.0f, 8.0f, 1.0f}},
+ {&ps_3d, { 8, 8, 8, 4, 1, 0}, 0, { 8.0f, 8.0f, 8.0f, 4.0f}},
+ {&ps_3d, { 8, 8, 8, 4, 1, 0}, 1, { 4.0f, 4.0f, 4.0f, 4.0f}},
+ {&ps_3d, { 8, 8, 8, 4, 1, 0}, 2, { 2.0f, 2.0f, 2.0f, 4.0f}},
+ {&ps_3d, { 8, 8, 8, 4, 1, 0}, 3, { 1.0f, 1.0f, 1.0f, 4.0f}},
+
+ {&ps_cube, { 4, 4, 1, 1, 6, 1}, 0, { 4.0f, 4.0f, 1.0f, 0.0f}},
+ {&ps_cube, {32, 32, 1, 1, 6, 1}, 0, {32.0f, 32.0f, 1.0f, 0.0f}},
+ {&ps_cube, {32, 32, 1, 3, 6, 1}, 0, {32.0f, 32.0f, 3.0f, 0.0f}},
+ {&ps_cube, {32, 32, 1, 3, 6, 1}, 1, {16.0f, 16.0f, 3.0f, 0.0f}},
+ {&ps_cube, {32, 32, 1, 3, 6, 1}, 2, { 8.0f, 8.0f, 3.0f, 0.0f}},
+
+ {&ps_cube_array, { 4, 4, 1, 1, 12, 2}, 0, { 4.0f, 4.0f, 1.0f, 0.0f}},
+ {&ps_cube_array, {32, 32, 1, 1, 12, 2}, 0, {32.0f, 32.0f, 1.0f, 0.0f}},
+ {&ps_cube_array, {32, 32, 1, 3, 12, 2}, 0, {32.0f, 32.0f, 3.0f, 0.0f}},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = desc.rt_height = 64;
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_texture_root_signature(context.device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 4, 0);
+
+ heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 6);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+
+ current_ps = NULL;
+ for (i = 0; i < ARRAY_SIZE(ps_tests); ++i)
+ {
+ const struct ps_test *test = &ps_tests[i];
+
+ vkd3d_test_set_context("test %u", i);
+
+ if (current_ps != test->ps)
+ {
+ if (context.pipeline_state)
+ ID3D12PipelineState_Release(context.pipeline_state);
+
+ current_ps = test->ps;
+
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, current_ps, NULL);
+ }
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ resource_desc.Dimension = test->texture_desc.depth != 1
+ ? D3D12_RESOURCE_DIMENSION_TEXTURE3D : D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = test->texture_desc.width;
+ resource_desc.Height = test->texture_desc.height;
+ resource_desc.DepthOrArraySize = test->texture_desc.depth != 1
+ ? test->texture_desc.depth : test->texture_desc.array_size;
+ resource_desc.MipLevels = test->texture_desc.miplevel_count;
+ resource_desc.Format = DXGI_FORMAT_R8_UNORM;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = 0;
+ hr = ID3D12Device_CreateCommittedResource(device,
+ &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+ D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, NULL,
+ &IID_ID3D12Resource, (void **)&texture);
+ ok(hr == S_OK, "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+
+ current_srv_desc = NULL;
+ if (test->texture_desc.cube_count)
+ {
+ current_srv_desc = &srv_desc;
+ srv_desc.Format = resource_desc.Format;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ if (test->texture_desc.cube_count > 1)
+ {
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURECUBEARRAY;
+ srv_desc.TextureCubeArray.MostDetailedMip = 0;
+ srv_desc.TextureCubeArray.MipLevels = resource_desc.MipLevels;
+ srv_desc.TextureCubeArray.First2DArrayFace = 0;
+ srv_desc.TextureCubeArray.NumCubes = test->texture_desc.cube_count;
+ srv_desc.TextureCubeArray.ResourceMinLODClamp = 0.0f;
+ }
+ else
+ {
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURECUBE;
+ srv_desc.TextureCube.MostDetailedMip = 0;
+ srv_desc.TextureCube.MipLevels = resource_desc.MipLevels;
+ srv_desc.TextureCube.ResourceMinLODClamp = 0.0f;
+ }
+ }
+ ID3D12Device_CreateShaderResourceView(context.device, texture, current_srv_desc, cpu_handle);
+
+ for (type = 0; type < 2; ++type)
+ {
+ vkd3d_test_set_context("test %u, type %u", i, type);
+
+ memset(&constant, 0, sizeof(constant));
+ constant.x = type;
+ constant.y = test->miplevel;
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 0));
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &constant.x, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &test->expected_result, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+
+ ID3D12Resource_Release(texture);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_srv_component_mapping(void)
+{
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ D3D12_SUBRESOURCE_DATA subresource_data;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *texture;
+ uint32_t expected_color;
+ unsigned int i, j;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ Texture2D t;
+ SamplerState s;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p;
+ D3D12_SUBRESOURCE_DATA data;
+
+ p.x = position.x / 32.0f;
+ p.y = position.y / 32.0f;
+ return t.Sample(s, p);
+ }
+#endif
+ 0x43425844, 0x7a0c3929, 0x75ff3ca4, 0xccb318b2, 0xe6965b4c, 0x00000001, 0x00000140, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a4, 0x00000050,
+ 0x00000029, 0x0100086a, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000,
+ 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002,
+ 0x3d000000, 0x3d000000, 0x00000000, 0x00000000, 0x8b000045, 0x800000c2, 0x00155543, 0x001020f2,
+ 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const uint32_t r8g8b8a8_data = 0x39495969;
+ static const uint16_t r8g8_data = 0xaabb;
+ static const uint8_t a8_data = 0x11;
+ static const uint8_t r8_data = 0xfe;
+ static const struct
+ {
+ const char *name;
+ DXGI_FORMAT format;
+ const void *data;
+ uint32_t color;
+ }
+ tests[] =
+ {
+ {"R8G8B8A8", DXGI_FORMAT_R8G8B8A8_UNORM, &r8g8b8a8_data, 0x39495969},
+ {"R8G8", DXGI_FORMAT_R8G8_UNORM, &r8g8_data, 0xff00aabb},
+ {"R8", DXGI_FORMAT_R8_UNORM, &r8_data, 0xff0000fe},
+ {"A8", DXGI_FORMAT_A8_UNORM, &a8_data, 0x11000000},
+ };
+ static const struct
+ {
+ unsigned int mapping;
+ unsigned int r_shift;
+ unsigned int g_shift;
+ unsigned int b_shift;
+ unsigned int a_shift;
+ uint32_t forced_mask;
+ uint32_t forced_color;
+ }
+ component_mappings[] =
+ {
+ {
+ D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0),
+ 0, 0, 0, 0, 0xffffffff, 0x00000000,
+ },
+ {
+ D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1),
+ 0, 0, 0, 0, 0xffffffff, 0xffffffff,
+ },
+ {
+ D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1),
+ 0, 0, 0, 0, 0xffffffff, 0xff0000ff,
+ },
+ {
+ D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0),
+ 0, 0, 0, 0, 0xffffffff, 0x00ff00ff,
+ },
+
+ {
+ D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_0,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_2,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_3),
+ 0, 8, 16, 24, 0x00000000, 0x00000000,
+ },
+ {
+ D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_3,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_2,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_0),
+ 24, 16, 8, 0, 0x00000000, 0x00000000,
+ },
+
+ {
+ D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_0,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_2,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0),
+ 0, 8, 16, 24, 0xff000000, 0x00000000,
+ },
+
+ {
+ D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_0,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_0,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_0,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_0),
+ 0, 0, 0, 0, 0x00000000, 0x00000000,
+ },
+ {
+ D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1),
+ 8, 8, 8, 8, 0x00000000, 0x00000000,
+ },
+ {
+ D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_2,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_2,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_2,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_2),
+ 16, 16, 16, 16, 0x00000000, 0x00000000,
+ },
+ {
+ D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_3,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_3,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_3,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_3),
+ 24, 24, 24, 24, 0x00000000, 0x00000000,
+ },
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = desc.rt_height = 32;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_texture_root_signature(context.device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 0, 0);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %s", tests[i].name);
+
+ texture = create_default_texture(context.device, 1, 1,
+ tests[i].format, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ subresource_data.pData = tests[i].data;
+ subresource_data.RowPitch = format_size(tests[i].format);
+ subresource_data.SlicePitch = subresource_data.RowPitch;
+ upload_texture_data(texture, &subresource_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ for (j = 0; j < ARRAY_SIZE(component_mappings); ++j)
+ {
+ vkd3d_test_set_context("Test %s, %u", tests[i].name, j);
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = tests[i].format;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+ srv_desc.Shader4ComponentMapping = component_mappings[j].mapping;
+ srv_desc.Texture2D.MipLevels = 1;
+ ID3D12Device_CreateShaderResourceView(context.device, texture, &srv_desc, cpu_handle);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ expected_color = 0;
+ expected_color |= ((tests[i].color >> component_mappings[j].r_shift) & 0xff) << 0;
+ expected_color |= ((tests[i].color >> component_mappings[j].g_shift) & 0xff) << 8;
+ expected_color |= ((tests[i].color >> component_mappings[j].b_shift) & 0xff) << 16;
+ expected_color |= ((tests[i].color >> component_mappings[j].a_shift) & 0xff) << 24;
+ expected_color &= ~component_mappings[j].forced_mask;
+ expected_color |= component_mappings[j].forced_color & component_mappings[j].forced_mask;
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, expected_color, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+
+ ID3D12Resource_Release(texture);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_descriptor_tables(void)
+{
+ ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2];
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_range[4];
+ D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc;
+ D3D12_ROOT_PARAMETER root_parameters[3];
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle;
+ ID3D12Resource *cb, *textures[4];
+ unsigned int i, descriptor_size;
+ D3D12_SAMPLER_DESC sampler_desc;
+ struct test_context_desc desc;
+ D3D12_SUBRESOURCE_DATA data;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ Texture2D t0;
+ Texture2D t1;
+ Texture2D t2;
+ Texture2D t3;
+ SamplerState s0;
+
+ cbuffer cb0
+ {
+ float4 c;
+ };
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p = float2(position.x / 32.0f, position.y / 32.0f);
+
+ return c.x * t0.Sample(s0, p) + c.y * t1.Sample(s0, p)
+ + c.z * t2.Sample(s0, p) + c.w * t3.Sample(s0, p);
+ }
+#endif
+ 0x43425844, 0xf848ef5f, 0x4da3fe0c, 0x776883a0, 0x6b3f0297, 0x00000001, 0x0000029c, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000200, 0x00000050,
+ 0x00000080, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000,
+ 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04001858, 0x00107000, 0x00000001,
+ 0x00005555, 0x04001858, 0x00107000, 0x00000002, 0x00005555, 0x04001858, 0x00107000, 0x00000003,
+ 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000003, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002,
+ 0x3d000000, 0x3d000000, 0x00000000, 0x00000000, 0x8b000045, 0x800000c2, 0x00155543, 0x001000f2,
+ 0x00000001, 0x00100046, 0x00000000, 0x00107e46, 0x00000001, 0x00106000, 0x00000000, 0x08000038,
+ 0x001000f2, 0x00000001, 0x00100e46, 0x00000001, 0x00208556, 0x00000000, 0x00000000, 0x8b000045,
+ 0x800000c2, 0x00155543, 0x001000f2, 0x00000002, 0x00100046, 0x00000000, 0x00107e46, 0x00000000,
+ 0x00106000, 0x00000000, 0x0a000032, 0x001000f2, 0x00000001, 0x00208006, 0x00000000, 0x00000000,
+ 0x00100e46, 0x00000002, 0x00100e46, 0x00000001, 0x8b000045, 0x800000c2, 0x00155543, 0x001000f2,
+ 0x00000002, 0x00100046, 0x00000000, 0x00107e46, 0x00000002, 0x00106000, 0x00000000, 0x8b000045,
+ 0x800000c2, 0x00155543, 0x001000f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000003,
+ 0x00106000, 0x00000000, 0x0a000032, 0x001000f2, 0x00000001, 0x00208aa6, 0x00000000, 0x00000000,
+ 0x00100e46, 0x00000002, 0x00100e46, 0x00000001, 0x0a000032, 0x001020f2, 0x00000000, 0x00208ff6,
+ 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const struct vec4 constant = {0.1f, 0.2f, 0.3f, 0.1f};
+ static const unsigned int texture_data[4] = {0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffff00};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ cb = create_upload_buffer(context.device, sizeof(constant), &constant.x);
+
+ descriptor_range[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_range[0].NumDescriptors = 2;
+ descriptor_range[0].BaseShaderRegister = 0;
+ descriptor_range[0].RegisterSpace = 0;
+ descriptor_range[0].OffsetInDescriptorsFromTableStart = 1;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range[0];
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ descriptor_range[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER;
+ descriptor_range[1].NumDescriptors = 1;
+ descriptor_range[1].BaseShaderRegister = 0;
+ descriptor_range[1].RegisterSpace = 0;
+ descriptor_range[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[1].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[1].DescriptorTable.pDescriptorRanges = &descriptor_range[1];
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ descriptor_range[2].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_range[2].NumDescriptors = 2;
+ descriptor_range[2].BaseShaderRegister = 2;
+ descriptor_range[2].RegisterSpace = 0;
+ descriptor_range[2].OffsetInDescriptorsFromTableStart = 0;
+ descriptor_range[3].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV;
+ descriptor_range[3].NumDescriptors = 1;
+ descriptor_range[3].BaseShaderRegister = 0;
+ descriptor_range[3].RegisterSpace = 0;
+ descriptor_range[3].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[2].DescriptorTable.NumDescriptorRanges = 2;
+ root_parameters[2].DescriptorTable.pDescriptorRanges = &descriptor_range[2];
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = 3;
+ root_signature_desc.pParameters = root_parameters;
+ hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ memset(&sampler_desc, 0, sizeof(sampler_desc));
+ sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT;
+ sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+
+ heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 6);
+ sampler_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 1);
+
+ descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(context.device,
+ D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ {
+ textures[i] = create_default_texture(context.device,
+ 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = &texture_data[i];
+ data.RowPitch = sizeof(texture_data[i]);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(textures[i], &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ }
+
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ transition_resource_state(command_list, textures[i],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ cpu_handle.ptr += descriptor_size;
+ /* t0-t3 */
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ {
+ ID3D12Device_CreateShaderResourceView(context.device, textures[i], NULL, cpu_handle);
+ cpu_handle.ptr += descriptor_size;
+ }
+ /* cbv0 */
+ cbv_desc.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(cb);
+ cbv_desc.SizeInBytes = align(sizeof(constant), D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT);
+ ID3D12Device_CreateConstantBufferView(context.device, &cbv_desc, cpu_handle);
+
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(sampler_heap);
+ /* s0 */
+ ID3D12Device_CreateSampler(context.device, &sampler_desc, cpu_handle);
+
+ gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ heaps[0] = heap; heaps[1] = sampler_heap;
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 1,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(sampler_heap));
+ gpu_handle.ptr += 3 * descriptor_size;
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 2, gpu_handle);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xb2664c19, 2);
+
+ ID3D12Resource_Release(cb);
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ ID3D12Resource_Release(textures[i]);
+ ID3D12DescriptorHeap_Release(heap);
+ ID3D12DescriptorHeap_Release(sampler_heap);
+ destroy_test_context(&context);
+}
+
+/* Tests overlapping descriptor heap ranges for SRV and UAV descriptor tables.
+ * Only descriptors used by the pipeline have to be valid.
+ */
+static void test_descriptor_tables_overlapping_bindings(void)
+{
+ ID3D12Resource *input_buffers[2], *output_buffers[2];
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_range[2];
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ D3D12_ROOT_PARAMETER root_parameters[3];
+ ID3D12GraphicsCommandList *command_list;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD cs_code[] =
+ {
+#if 0
+ ByteAddressBuffer t0;
+ ByteAddressBuffer t4 : register(t4);
+
+ RWByteAddressBuffer u0;
+ RWByteAddressBuffer u2 : register(u2);
+
+ uint size;
+ uint size2;
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ uint i;
+ for (i = 0; i < size; ++i)
+ u0.Store(4 * i, t0.Load(4 *i));
+ for (i = 0; i < size2; ++i)
+ u2.Store(4 * i, t4.Load(4 * i));
+ }
+#endif
+ 0x43425844, 0x8d2646b7, 0xeb60d9ee, 0x33ccd6ed, 0x5557e649, 0x00000001, 0x0000023c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000001e8, 0x00050050, 0x0000007a, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x030000a1, 0x00107000, 0x00000000, 0x030000a1,
+ 0x00107000, 0x00000004, 0x0300009d, 0x0011e000, 0x00000000, 0x0300009d, 0x0011e000, 0x00000002,
+ 0x02000068, 0x00000001, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x05000036, 0x00100012,
+ 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x08000050, 0x00100022, 0x00000000, 0x0010000a,
+ 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x03040003, 0x0010001a, 0x00000000, 0x07000029,
+ 0x00100022, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000002, 0x890000a5, 0x800002c2,
+ 0x00199983, 0x00100042, 0x00000000, 0x0010001a, 0x00000000, 0x00107006, 0x00000000, 0x070000a6,
+ 0x0011e012, 0x00000000, 0x0010001a, 0x00000000, 0x0010002a, 0x00000000, 0x0700001e, 0x00100012,
+ 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x05000036, 0x00100012,
+ 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x08000050, 0x00100022, 0x00000000, 0x0010000a,
+ 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x03040003, 0x0010001a, 0x00000000, 0x07000029,
+ 0x00100022, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000002, 0x890000a5, 0x800002c2,
+ 0x00199983, 0x00100042, 0x00000000, 0x0010001a, 0x00000000, 0x00107006, 0x00000004, 0x070000a6,
+ 0x0011e012, 0x00000002, 0x0010001a, 0x00000000, 0x0010002a, 0x00000000, 0x0700001e, 0x00100012,
+ 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x0100003e,
+ };
+ static const uint32_t buffer_data[] = {0xdeadbabe};
+ static const uint32_t buffer_data2[] = {0, 1, 2, 3, 4, 5};
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_range[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_range[0].NumDescriptors = 10;
+ descriptor_range[0].BaseShaderRegister = 0;
+ descriptor_range[0].RegisterSpace = 0;
+ descriptor_range[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range[0];
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+
+ descriptor_range[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_range[1].NumDescriptors = 10;
+ descriptor_range[1].BaseShaderRegister = 0;
+ descriptor_range[1].RegisterSpace = 0;
+ descriptor_range[1].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[1].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[1].DescriptorTable.pDescriptorRanges = &descriptor_range[1];
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[2].Constants.ShaderRegister = 0;
+ root_parameters[2].Constants.RegisterSpace = 0;
+ root_parameters[2].Constants.Num32BitValues = 2;
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = 3;
+ root_signature_desc.pParameters = root_parameters;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 30);
+
+ input_buffers[0] = create_default_buffer(device, sizeof(buffer_data),
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(input_buffers[0], 0, sizeof(buffer_data), &buffer_data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, input_buffers[0],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ input_buffers[1] = create_default_buffer(device, sizeof(buffer_data2),
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(input_buffers[1], 0, sizeof(buffer_data2), &buffer_data2, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, input_buffers[1],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ output_buffers[0] = create_default_buffer(device, sizeof(buffer_data),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ output_buffers[1] = create_default_buffer(device, sizeof(buffer_data2),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = DXGI_FORMAT_R32_TYPELESS;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.FirstElement = 0;
+ uav_desc.Buffer.NumElements = ARRAY_SIZE(buffer_data);
+ uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_RAW;
+ ID3D12Device_CreateUnorderedAccessView(device, output_buffers[0], NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, heap, 0)); /* u0 */
+ uav_desc.Buffer.NumElements = ARRAY_SIZE(buffer_data2);
+ ID3D12Device_CreateUnorderedAccessView(device, output_buffers[1], NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, heap, 2)); /* u2 */
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_R32_TYPELESS;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.Buffer.FirstElement = 0;
+ srv_desc.Buffer.NumElements = ARRAY_SIZE(buffer_data);
+ srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_RAW;
+ ID3D12Device_CreateShaderResourceView(device, input_buffers[0], &srv_desc,
+ get_cpu_descriptor_handle(&context, heap, 3)); /* t0 */
+ srv_desc.Buffer.NumElements = ARRAY_SIZE(buffer_data2);
+ ID3D12Device_CreateShaderResourceView(device, input_buffers[1], &srv_desc,
+ get_cpu_descriptor_handle(&context, heap, 7)); /* t4 */
+
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 3));
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 1,
+ get_gpu_descriptor_handle(&context, heap, 0));
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstant(command_list, 2,
+ ARRAY_SIZE(buffer_data), 0);
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstant(command_list, 2,
+ ARRAY_SIZE(buffer_data2), 1);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ for (i = 0; i < ARRAY_SIZE(output_buffers); ++i)
+ {
+ transition_resource_state(command_list, output_buffers[i],
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ }
+
+ get_buffer_readback_with_command_list(output_buffers[0], DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < ARRAY_SIZE(buffer_data); ++i)
+ {
+ unsigned int value = get_readback_uint(&rb, i, 0, 0);
+ ok(value == buffer_data[i], "Got %#x, expected %#x.\n", value, buffer_data[i]);
+ }
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+ get_buffer_readback_with_command_list(output_buffers[1], DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < ARRAY_SIZE(buffer_data2); ++i)
+ {
+ unsigned int value = get_readback_uint(&rb, i, 0, 0);
+ ok(value == buffer_data2[i], "Got %#x, expected %#x.\n", value, buffer_data2[i]);
+ }
+ release_resource_readback(&rb);
+
+ for (i = 0; i < ARRAY_SIZE(input_buffers); ++i)
+ ID3D12Resource_Release(input_buffers[i]);
+ for (i = 0; i < ARRAY_SIZE(output_buffers); ++i)
+ ID3D12Resource_Release(output_buffers[i]);
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_update_root_descriptors(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_GPU_VIRTUAL_ADDRESS cb_va, uav_va;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ ID3D12GraphicsCommandList *command_list;
+ ID3D12RootSignature *root_signature;
+ ID3D12PipelineState *pipeline_state;
+ ID3D12Resource *resource, *cb;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD cs_code[] =
+ {
+#if 0
+ cbuffer cb
+ {
+ unsigned int offset;
+ unsigned int value;
+ };
+
+ RWByteAddressBuffer b;
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ b.Store(4 * offset, value);
+ }
+#endif
+ 0x43425844, 0xaadc5460, 0x88c27e90, 0x2acacf4e, 0x4e06019a, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000084, 0x00050050, 0x00000021, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300009d, 0x0011e000, 0x00000000, 0x02000068,
+ 0x00000001, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x08000029, 0x00100012, 0x00000000,
+ 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x080000a6, 0x0011e012, 0x00000000,
+ 0x0010000a, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ struct
+ {
+ uint32_t offset;
+ uint32_t value;
+ uint32_t uav_offset;
+ uint8_t padding[D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT - 3 * sizeof(uint32_t)];
+ }
+ input[] =
+ {
+ {0, 4, 0},
+ {2, 6, 0},
+ {0, 5, 64},
+ {7, 2, 64},
+ };
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ cb = create_upload_buffer(context.device, sizeof(input), input);
+ cb_va = ID3D12Resource_GetGPUVirtualAddress(cb);
+
+ resource = create_default_buffer(device, 512,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ uav_va = ID3D12Resource_GetGPUVirtualAddress(resource);
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[0].Descriptor.ShaderRegister = 0;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[1].Descriptor.ShaderRegister = 0;
+ root_parameters[1].Descriptor.RegisterSpace = 0;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ pipeline_state = create_compute_pipeline_state(device, root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature);
+ for (i = 0; i < ARRAY_SIZE(input); ++i)
+ {
+ ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list,
+ 0, cb_va + i * sizeof(*input));
+ if (!i || input[i - 1].uav_offset != input[i].uav_offset)
+ ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list,
+ 1, uav_va + input[i].uav_offset * sizeof(uint32_t));
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+ }
+
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_buffer_readback_with_command_list(resource, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < ARRAY_SIZE(input); ++i)
+ {
+ unsigned int offset = input[i].uav_offset + input[i].offset;
+ unsigned int value = get_readback_uint(&rb, offset, 0, 0);
+ ok(value == input[i].value, "Got %#x, expected %#x.\n", value, input[i].value);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(cb);
+ ID3D12Resource_Release(resource);
+ ID3D12RootSignature_Release(root_signature);
+ ID3D12PipelineState_Release(pipeline_state);
+ destroy_test_context(&context);
+}
+
+static void test_update_descriptor_tables(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_range;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_STATIC_SAMPLER_DESC sampler_desc;
+ ID3D12DescriptorHeap *heap, *cpu_heap;
+ D3D12_DESCRIPTOR_HEAP_DESC heap_desc;
+ D3D12_ROOT_PARAMETER root_parameter;
+ struct test_context_desc desc;
+ D3D12_SUBRESOURCE_DATA data;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12Resource *textures[3];
+ ID3D12CommandQueue *queue;
+ unsigned int i;
+ D3D12_BOX box;
+ HRESULT hr;
+ RECT rect;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ Texture2D t0;
+ Texture2D t1;
+ SamplerState s;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p = (position.x / 32.0f, position.x / 32.0f);
+ return float4(t0.Sample(s, p).r, t1.Sample(s, p).r, 0, 1);
+ }
+#endif
+ 0x43425844, 0x5c19caa6, 0xd4fadb4f, 0xc9d6831e, 0x563b68b7, 0x00000001, 0x000001a4, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000108, 0x00000050,
+ 0x00000042, 0x0100086a, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000,
+ 0x00005555, 0x04001858, 0x00107000, 0x00000001, 0x00005555, 0x04002064, 0x00101012, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x07000038, 0x00100012,
+ 0x00000000, 0x0010100a, 0x00000000, 0x00004001, 0x3d000000, 0x8b000045, 0x800000c2, 0x00155543,
+ 0x00100022, 0x00000000, 0x00100006, 0x00000000, 0x00107e16, 0x00000000, 0x00106000, 0x00000000,
+ 0x8b000045, 0x800000c2, 0x00155543, 0x00100012, 0x00000000, 0x00100006, 0x00000000, 0x00107e46,
+ 0x00000001, 0x00106000, 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00100516, 0x00000000,
+ 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const float texture_data[] = {0.5f, 0.25f, 0.1f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ memset(&sampler_desc, 0, sizeof(sampler_desc));
+ sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT;
+ sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc.ShaderRegister = 0;
+ sampler_desc.RegisterSpace = 0;
+ sampler_desc.ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_range.NumDescriptors = 2;
+ descriptor_range.BaseShaderRegister = 0;
+ descriptor_range.RegisterSpace = 0;
+ descriptor_range.OffsetInDescriptorsFromTableStart = 0;
+ root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameter.DescriptorTable.NumDescriptorRanges = 1;
+ root_parameter.DescriptorTable.pDescriptorRanges = &descriptor_range;
+ root_parameter.ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = &root_parameter;
+ root_signature_desc.NumStaticSamplers = 1;
+ root_signature_desc.pStaticSamplers = &sampler_desc;
+ hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ memset(&heap_desc, 0, sizeof(heap_desc));
+ heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
+ heap_desc.NumDescriptors = 4;
+ heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
+ hr = ID3D12Device_CreateDescriptorHeap(context.device, &heap_desc,
+ &IID_ID3D12DescriptorHeap, (void **)&heap);
+ ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr);
+
+ heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
+ hr = ID3D12Device_CreateDescriptorHeap(context.device, &heap_desc,
+ &IID_ID3D12DescriptorHeap, (void **)&cpu_heap);
+ ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ {
+ textures[i] = create_default_texture(context.device, 1, 1, DXGI_FORMAT_R32_FLOAT,
+ 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = &texture_data[i];
+ data.RowPitch = sizeof(texture_data[i]);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(textures[i], &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, textures[i],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+ }
+
+ for (i = 0; i < heap_desc.NumDescriptors; ++i)
+ {
+ ID3D12Device_CreateShaderResourceView(context.device, textures[2], NULL,
+ get_cpu_descriptor_handle(&context, heap, i));
+ }
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ {
+ ID3D12Device_CreateShaderResourceView(context.device, textures[i], NULL,
+ get_cpu_descriptor_handle(&context, cpu_heap, i));
+ }
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+
+ set_rect(&rect, 0, 0, 16, 32);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &rect);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 0));
+ ID3D12Device_CopyDescriptorsSimple(context.device, 2,
+ get_cpu_sampler_handle(&context, heap, 0),
+ get_cpu_sampler_handle(&context, cpu_heap, 0),
+ D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ set_rect(&rect, 16, 0, 32, 32);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &rect);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 2));
+ ID3D12Device_CreateShaderResourceView(context.device, textures[1], NULL,
+ get_cpu_descriptor_handle(&context, heap, 2));
+ ID3D12Device_CreateShaderResourceView(context.device, textures[0], NULL,
+ get_cpu_descriptor_handle(&context, heap, 3));
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ set_box(&box, 0, 0, 0, 16, 32, 1);
+ check_readback_data_uint(&rb, &box, 0xff00407f, 1);
+ set_box(&box, 16, 0, 0, 32, 32, 1);
+ check_readback_data_uint(&rb, &box, 0xff007f40, 1);
+ release_resource_readback(&rb);
+
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ ID3D12Resource_Release(textures[i]);
+ ID3D12DescriptorHeap_Release(cpu_heap);
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+/* This cannot be implemented reasonably in Vulkan. Vulkan doesn't allow
+ * updating descriptor sets after the vkCmdBindDescriptorSets() command
+ * is recorded.
+ */
+static void test_update_descriptor_heap_after_closing_command_list(void)
+{
+ ID3D12Resource *red_texture, *green_texture;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ ID3D12DescriptorHeap *cpu_heap, *heap;
+ D3D12_SUBRESOURCE_DATA texture_data;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ unsigned int value;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ Texture2D t;
+ SamplerState s;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p;
+
+ p.x = position.x / 32.0f;
+ p.y = position.y / 32.0f;
+ return t.Sample(s, p);
+ }
+#endif
+ 0x43425844, 0x7a0c3929, 0x75ff3ca4, 0xccb318b2, 0xe6965b4c, 0x00000001, 0x00000140, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a4, 0x00000050,
+ 0x00000029, 0x0100086a, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000,
+ 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002,
+ 0x3d000000, 0x3d000000, 0x00000000, 0x00000000, 0x8b000045, 0x800000c2, 0x00155543, 0x001020f2,
+ 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const unsigned int red_data[] = {0xff0000ff};
+ static const unsigned int green_data[] = {0xff00ff00};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_texture_root_signature(context.device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 0, 0);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+
+ cpu_heap = create_cpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+
+ red_texture = create_default_texture(context.device, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM,
+ 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ texture_data.pData = red_data;
+ texture_data.RowPitch = sizeof(*red_data);
+ texture_data.SlicePitch = texture_data.RowPitch;
+ upload_texture_data(red_texture, &texture_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, red_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ green_texture = create_default_texture(context.device, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM,
+ 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ texture_data.pData = green_data;
+ upload_texture_data(green_texture, &texture_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, green_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ ID3D12Device_CreateShaderResourceView(context.device, red_texture, NULL,
+ get_cpu_descriptor_handle(&context, cpu_heap, 0));
+ ID3D12Device_CopyDescriptorsSimple(context.device, 1,
+ get_cpu_sampler_handle(&context, heap, 0),
+ get_cpu_sampler_handle(&context, cpu_heap, 0),
+ D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap));
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+
+ /* Update the descriptor heap used by the closed command list. */
+ ID3D12Device_CreateShaderResourceView(context.device, green_texture, NULL, cpu_handle);
+
+ exec_command_list(queue, command_list);
+ wait_queue_idle(context.device, queue);
+ reset_command_list(command_list, context.allocator);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ value = get_readback_uint(&rb, 0, 0, 0);
+ todo ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value);
+ release_resource_readback(&rb);
+
+ ID3D12DescriptorHeap_Release(cpu_heap);
+ ID3D12DescriptorHeap_Release(heap);
+ ID3D12Resource_Release(green_texture);
+ ID3D12Resource_Release(red_texture);
+ destroy_test_context(&context);
+}
+
+static void test_update_compute_descriptor_tables(void)
+{
+ struct cb_data
+ {
+ struct uvec4 srv_size[2];
+ struct uvec4 uav_size[2];
+ };
+
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ ID3D12PipelineState *buffer_pso, *texture_pso;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[4];
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc;
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[5];
+ D3D12_SUBRESOURCE_DATA subresource_data;
+ ID3D12Resource *buffer_cb, *texture_cb;
+ ID3D12DescriptorHeap *descriptor_heap;
+ ID3D12Resource *output_buffers[2];
+ ID3D12Resource *input_buffers[5];
+ ID3D12Resource *textures[3];
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ struct cb_data cb_data;
+ ID3D12Device *device;
+ unsigned int i;
+ uint32_t data;
+ HRESULT hr;
+
+ static const DWORD cs_buffer_code[] =
+ {
+#if 0
+ uint offset;
+
+ RWByteAddressBuffer u0 : register(u0);
+
+ cbuffer cb0 : register(b0)
+ {
+ uint4 srv_size[2];
+ uint4 uav_size[2];
+ };
+
+ Buffer<uint> t0 : register(t0);
+ Buffer<uint> t1 : register(t1);
+
+ RWBuffer<uint> u4 : register(u4);
+ RWBuffer<uint> u7 : register(u7);
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ uint x, result, byte_offset = offset;
+
+ for (x = 0, result = 0; x < srv_size[0].x; ++x)
+ result += t0.Load(x);
+ u0.Store(byte_offset, result);
+ byte_offset += 4;
+
+ for (x = 0, result = 0; x < srv_size[1].x; ++x)
+ result += t1.Load(x);
+ u0.Store(byte_offset, result);
+ byte_offset += 4;
+
+ for (x = 0, result = 0; x < uav_size[0].x; ++x)
+ result += u4[x];
+ u0.Store(byte_offset, result);
+ byte_offset += 4;
+
+ for (x = 0, result = 0; x < uav_size[1].x; ++x)
+ result += u7[x];
+ u0.Store(byte_offset, result);
+ }
+#endif
+ 0x43425844, 0xb3d9f052, 0xcc3f0310, 0xd18f8515, 0xccabd8f6, 0x00000001, 0x00000404, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000003b0, 0x00050050, 0x000000ec, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000001, 0x00000001, 0x04000059, 0x00208e46, 0x00000000, 0x00000004,
+ 0x04000858, 0x00107000, 0x00000000, 0x00004444, 0x04000858, 0x00107000, 0x00000001, 0x00004444,
+ 0x0300009d, 0x0011e000, 0x00000000, 0x0400089c, 0x0011e000, 0x00000004, 0x00004444, 0x0400089c,
+ 0x0011e000, 0x00000007, 0x00004444, 0x02000068, 0x00000002, 0x0400009b, 0x00000001, 0x00000001,
+ 0x00000001, 0x08000036, 0x00100032, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x01000030, 0x08000050, 0x00100012, 0x00000001, 0x0010001a, 0x00000000, 0x0020800a,
+ 0x00000000, 0x00000000, 0x03040003, 0x0010000a, 0x00000001, 0x8900002d, 0x80000042, 0x00111103,
+ 0x00100012, 0x00000001, 0x00100556, 0x00000000, 0x00107e46, 0x00000000, 0x0700001e, 0x00100012,
+ 0x00000000, 0x0010000a, 0x00000000, 0x0010000a, 0x00000001, 0x0700001e, 0x00100022, 0x00000000,
+ 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x08000036, 0x00100032, 0x00000001,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000030, 0x08000050, 0x00100042,
+ 0x00000001, 0x0010000a, 0x00000001, 0x0020800a, 0x00000000, 0x00000001, 0x03040003, 0x0010002a,
+ 0x00000001, 0x8900002d, 0x80000042, 0x00111103, 0x00100042, 0x00000001, 0x00100006, 0x00000001,
+ 0x00107c96, 0x00000001, 0x0700001e, 0x00100022, 0x00000001, 0x0010001a, 0x00000001, 0x0010002a,
+ 0x00000001, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a, 0x00000001, 0x00004001, 0x00000001,
+ 0x01000016, 0x05000036, 0x00100022, 0x00000000, 0x0010001a, 0x00000001, 0x08000036, 0x00100032,
+ 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000030, 0x08000050,
+ 0x00100042, 0x00000001, 0x0010000a, 0x00000001, 0x0020800a, 0x00000000, 0x00000002, 0x03040003,
+ 0x0010002a, 0x00000001, 0x890000a3, 0x80000042, 0x00111103, 0x00100042, 0x00000001, 0x00100006,
+ 0x00000001, 0x0011ec96, 0x00000004, 0x0700001e, 0x00100022, 0x00000001, 0x0010001a, 0x00000001,
+ 0x0010002a, 0x00000001, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a, 0x00000001, 0x00004001,
+ 0x00000001, 0x01000016, 0x05000036, 0x00100042, 0x00000000, 0x0010001a, 0x00000001, 0x08000036,
+ 0x00100032, 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000030,
+ 0x08000050, 0x00100042, 0x00000001, 0x0010000a, 0x00000001, 0x0020800a, 0x00000000, 0x00000003,
+ 0x03040003, 0x0010002a, 0x00000001, 0x890000a3, 0x80000042, 0x00111103, 0x00100042, 0x00000001,
+ 0x00100006, 0x00000001, 0x0011ec96, 0x00000007, 0x0700001e, 0x00100022, 0x00000001, 0x0010001a,
+ 0x00000001, 0x0010002a, 0x00000001, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a, 0x00000001,
+ 0x00004001, 0x00000001, 0x01000016, 0x05000036, 0x00100082, 0x00000000, 0x0010001a, 0x00000001,
+ 0x080000a6, 0x0011e0f2, 0x00000000, 0x0020800a, 0x00000001, 0x00000000, 0x00100e46, 0x00000000,
+ 0x0100003e,
+ };
+ static const DWORD cs_texture_code[] =
+ {
+#if 0
+ uint offset;
+
+ RWByteAddressBuffer u0 : register(u0);
+
+ cbuffer cb0 : register(b0)
+ {
+ uint4 srv_size[2];
+ uint4 uav_size[2];
+ };
+
+ Texture2D<uint> t0 : register(t0);
+ Texture2D<uint> t1 : register(t1);
+
+ RWBuffer<uint> u4 : register(u4);
+ RWTexture2D<uint> u6 : register(u6);
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ uint x, y, result, byte_offset = offset;
+
+ for (y = 0, result = 0; y < srv_size[0].y; ++y)
+ {
+ for (x = 0; x < srv_size[0].x; ++x)
+ result += t0.Load(int3(x, y, 0));
+ }
+ u0.Store(byte_offset, result);
+ byte_offset += 4;
+
+ for (y = 0, result = 0; y < srv_size[1].y; ++y)
+ {
+ for (x = 0; x < srv_size[1].x; ++x)
+ result += t1.Load(int3(x, y, 0));
+ }
+ u0.Store(byte_offset, result);
+ byte_offset += 4;
+
+ for (x = 0, result = 0; x < uav_size[0].x; ++x)
+ result += u4[x];
+ u0.Store(byte_offset, result);
+ byte_offset += 4;
+
+ for (y = 0, result = 0; y < uav_size[1].y; ++y)
+ {
+ for (x = 0; x < uav_size[1].x; ++x)
+ result += u6[uint2(x, y)];
+ }
+ u0.Store(byte_offset, result);
+ }
+#endif
+ 0x43425844, 0x3f0f012e, 0xfb75f6aa, 0xb87ffe68, 0xf25f9ee6, 0x00000001, 0x00000650, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000005fc, 0x00050050, 0x0000017f, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000001, 0x00000001, 0x04000059, 0x00208e46, 0x00000000, 0x00000004,
+ 0x04001858, 0x00107000, 0x00000000, 0x00004444, 0x04001858, 0x00107000, 0x00000001, 0x00004444,
+ 0x0300009d, 0x0011e000, 0x00000000, 0x0400089c, 0x0011e000, 0x00000004, 0x00004444, 0x0400189c,
+ 0x0011e000, 0x00000006, 0x00004444, 0x02000068, 0x00000004, 0x0400009b, 0x00000001, 0x00000001,
+ 0x00000001, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x05000036, 0x00100012, 0x00000001, 0x00004001, 0x00000000, 0x05000036, 0x00100012,
+ 0x00000002, 0x00004001, 0x00000000, 0x01000030, 0x08000050, 0x00100022, 0x00000001, 0x0010000a,
+ 0x00000001, 0x0020801a, 0x00000000, 0x00000000, 0x03040003, 0x0010001a, 0x00000001, 0x05000036,
+ 0x00100022, 0x00000000, 0x0010000a, 0x00000001, 0x05000036, 0x00100012, 0x00000003, 0x00004001,
+ 0x00000000, 0x05000036, 0x00100022, 0x00000003, 0x0010000a, 0x00000002, 0x01000030, 0x08000050,
+ 0x00100022, 0x00000001, 0x0010000a, 0x00000003, 0x0020800a, 0x00000000, 0x00000000, 0x03040003,
+ 0x0010001a, 0x00000001, 0x05000036, 0x00100012, 0x00000000, 0x0010000a, 0x00000003, 0x8900002d,
+ 0x800000c2, 0x00111103, 0x00100012, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000,
+ 0x0700001e, 0x00100022, 0x00000003, 0x0010001a, 0x00000003, 0x0010000a, 0x00000000, 0x0700001e,
+ 0x00100012, 0x00000003, 0x0010000a, 0x00000003, 0x00004001, 0x00000001, 0x01000016, 0x05000036,
+ 0x00100012, 0x00000002, 0x0010001a, 0x00000003, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a,
+ 0x00000001, 0x00004001, 0x00000001, 0x01000016, 0x08000036, 0x001000c2, 0x00000000, 0x00004002,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x05000036, 0x00100012, 0x00000001, 0x00004001,
+ 0x00000000, 0x05000036, 0x00100022, 0x00000002, 0x00004001, 0x00000000, 0x01000030, 0x08000050,
+ 0x00100022, 0x00000001, 0x0010000a, 0x00000001, 0x0020801a, 0x00000000, 0x00000001, 0x03040003,
+ 0x0010001a, 0x00000001, 0x05000036, 0x00100022, 0x00000000, 0x0010000a, 0x00000001, 0x05000036,
+ 0x00100012, 0x00000003, 0x00004001, 0x00000000, 0x05000036, 0x00100022, 0x00000003, 0x0010001a,
+ 0x00000002, 0x01000030, 0x08000050, 0x00100022, 0x00000001, 0x0010000a, 0x00000003, 0x0020800a,
+ 0x00000000, 0x00000001, 0x03040003, 0x0010001a, 0x00000001, 0x05000036, 0x00100012, 0x00000000,
+ 0x0010000a, 0x00000003, 0x8900002d, 0x800000c2, 0x00111103, 0x00100012, 0x00000000, 0x00100e46,
+ 0x00000000, 0x00107e46, 0x00000001, 0x0700001e, 0x00100022, 0x00000003, 0x0010001a, 0x00000003,
+ 0x0010000a, 0x00000000, 0x0700001e, 0x00100012, 0x00000003, 0x0010000a, 0x00000003, 0x00004001,
+ 0x00000001, 0x01000016, 0x05000036, 0x00100022, 0x00000002, 0x0010001a, 0x00000003, 0x0700001e,
+ 0x00100012, 0x00000001, 0x0010000a, 0x00000001, 0x00004001, 0x00000001, 0x01000016, 0x08000036,
+ 0x00100032, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000030,
+ 0x08000050, 0x00100042, 0x00000000, 0x0010000a, 0x00000000, 0x0020800a, 0x00000000, 0x00000002,
+ 0x03040003, 0x0010002a, 0x00000000, 0x890000a3, 0x80000042, 0x00111103, 0x00100042, 0x00000000,
+ 0x00100006, 0x00000000, 0x0011ec96, 0x00000004, 0x0700001e, 0x00100022, 0x00000000, 0x0010001a,
+ 0x00000000, 0x0010002a, 0x00000000, 0x0700001e, 0x00100012, 0x00000000, 0x0010000a, 0x00000000,
+ 0x00004001, 0x00000001, 0x01000016, 0x05000036, 0x00100042, 0x00000002, 0x0010001a, 0x00000000,
+ 0x05000036, 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x05000036, 0x00100082, 0x00000002,
+ 0x00004001, 0x00000000, 0x01000030, 0x08000050, 0x00100022, 0x00000000, 0x0010000a, 0x00000000,
+ 0x0020801a, 0x00000000, 0x00000003, 0x03040003, 0x0010001a, 0x00000000, 0x05000036, 0x001000e2,
+ 0x00000001, 0x00100006, 0x00000000, 0x05000036, 0x00100012, 0x00000003, 0x00004001, 0x00000000,
+ 0x05000036, 0x00100022, 0x00000003, 0x0010003a, 0x00000002, 0x01000030, 0x08000050, 0x00100022,
+ 0x00000000, 0x0010000a, 0x00000003, 0x0020800a, 0x00000000, 0x00000003, 0x03040003, 0x0010001a,
+ 0x00000000, 0x05000036, 0x00100012, 0x00000001, 0x0010000a, 0x00000003, 0x890000a3, 0x800000c2,
+ 0x00111103, 0x00100022, 0x00000000, 0x00100e46, 0x00000001, 0x0011ee16, 0x00000006, 0x0700001e,
+ 0x00100022, 0x00000003, 0x0010001a, 0x00000003, 0x0010001a, 0x00000000, 0x0700001e, 0x00100012,
+ 0x00000003, 0x0010000a, 0x00000003, 0x00004001, 0x00000001, 0x01000016, 0x05000036, 0x00100082,
+ 0x00000002, 0x0010001a, 0x00000003, 0x0700001e, 0x00100012, 0x00000000, 0x0010000a, 0x00000000,
+ 0x00004001, 0x00000001, 0x01000016, 0x080000a6, 0x0011e0f2, 0x00000000, 0x0020800a, 0x00000001,
+ 0x00000000, 0x00100e46, 0x00000002, 0x0100003e,
+ };
+ static const uint32_t buffer0_data[] = {1, 2, 3, 1};
+ static const uint32_t buffer1_data[] = {10, 20, 30, 10};
+ static const uint32_t buffer2_data[] = {100, 200, 300, 200};
+ static const uint32_t buffer3_data[] = {1000, 2000, 2000, 2000};
+ static const uint32_t buffer4_data[] = {0, 0, 0, 0};
+ static const uint32_t texture0_data[4][4] =
+ {
+ {1, 0, 0, 0},
+ {10000, 100, 1000, 10000},
+ {0, 0, 0, 2},
+ {0, 30000, 10000, 10},
+ };
+ static const uint32_t texture1_data[4][4] =
+ {
+ {6, 0, 0, 0},
+ {600, 0, 1000, 60000},
+ {0, 40, 0, 0},
+ {0, 30000, 0, 0},
+ };
+ static const uint32_t texture2_data[4][4] =
+ {
+ {1, 1, 1, 1},
+ {2, 2, 2, 2},
+ {3, 3, 3, 3},
+ {4, 4, 4, 4},
+ };
+ static const uint32_t expected_output0[] = {7, 70, 800, 7000, 70, 0, 800, 7000, 61113, 91646, 800, 40};
+ static const uint32_t expected_output1[] = {61113, 91646, 800, 40, 7, 70, 800, 7000};
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[0].Constants.ShaderRegister = 1;
+ root_parameters[0].Constants.RegisterSpace = 0;
+ root_parameters[0].Constants.Num32BitValues = 1;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[1].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[1].DescriptorTable.pDescriptorRanges = &descriptor_ranges[0];
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_ranges[1].NumDescriptors = 2;
+ descriptor_ranges[1].BaseShaderRegister = 0;
+ descriptor_ranges[1].RegisterSpace = 0;
+ descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[2].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[2].DescriptorTable.pDescriptorRanges = &descriptor_ranges[1];
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ descriptor_ranges[2].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[2].NumDescriptors = 4;
+ descriptor_ranges[2].BaseShaderRegister = 4;
+ descriptor_ranges[2].RegisterSpace = 0;
+ descriptor_ranges[2].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[3].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[3].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[3].DescriptorTable.pDescriptorRanges = &descriptor_ranges[2];
+ root_parameters[3].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ descriptor_ranges[3].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV;
+ descriptor_ranges[3].NumDescriptors = 1;
+ descriptor_ranges[3].BaseShaderRegister = 0;
+ descriptor_ranges[3].RegisterSpace = 0;
+ descriptor_ranges[3].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[4].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[4].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[4].DescriptorTable.pDescriptorRanges = &descriptor_ranges[3];
+ root_parameters[4].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 5;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ buffer_pso = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_buffer_code, sizeof(cs_buffer_code)));
+ texture_pso = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_texture_code, sizeof(cs_texture_code)));
+
+ for (i = 0; i < ARRAY_SIZE(output_buffers); ++i)
+ {
+ output_buffers[i] = create_default_buffer(device, 1024,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ }
+
+ input_buffers[0] = create_default_buffer(device, sizeof(buffer0_data),
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(input_buffers[0], 0, sizeof(buffer0_data), buffer0_data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, input_buffers[0],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ input_buffers[1] = create_default_buffer(device, sizeof(buffer1_data),
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(input_buffers[1], 0, sizeof(buffer1_data), buffer1_data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, input_buffers[1],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ input_buffers[2] = create_default_buffer(device, sizeof(buffer2_data),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(input_buffers[2], 0, sizeof(buffer2_data), buffer2_data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, input_buffers[2],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ input_buffers[3] = create_default_buffer(device, sizeof(buffer3_data),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(input_buffers[3], 0, sizeof(buffer3_data), buffer3_data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, input_buffers[3],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ input_buffers[4] = create_default_buffer(device, sizeof(buffer4_data),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(input_buffers[4], 0, sizeof(buffer4_data), buffer4_data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, input_buffers[4],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ textures[0] = create_default_texture(context.device,
+ 4, 4, DXGI_FORMAT_R32_UINT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ subresource_data.pData = texture0_data;
+ subresource_data.RowPitch = sizeof(*texture0_data);
+ subresource_data.SlicePitch = subresource_data.RowPitch;
+ upload_texture_data(textures[0], &subresource_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, textures[0],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ textures[1] = create_default_texture(context.device,
+ 4, 4, DXGI_FORMAT_R32_UINT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ subresource_data.pData = texture1_data;
+ subresource_data.RowPitch = sizeof(*texture1_data);
+ subresource_data.SlicePitch = subresource_data.RowPitch;
+ upload_texture_data(textures[1], &subresource_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, textures[1],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ textures[2] = create_default_texture(context.device, 4, 4, DXGI_FORMAT_R32_UINT,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ subresource_data.pData = texture2_data;
+ subresource_data.RowPitch = sizeof(*texture2_data);
+ subresource_data.SlicePitch = subresource_data.RowPitch;
+ upload_texture_data(textures[2], &subresource_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, textures[2],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ memset(&cb_data, 0, sizeof(cb_data));
+ cb_data.srv_size[0].x = ARRAY_SIZE(buffer0_data);
+ cb_data.srv_size[1].x = ARRAY_SIZE(buffer1_data);
+ cb_data.uav_size[0].x = ARRAY_SIZE(buffer2_data);
+ cb_data.uav_size[1].x = ARRAY_SIZE(buffer3_data);
+ buffer_cb = create_upload_buffer(device, sizeof(cb_data), &cb_data);
+
+ memset(&cb_data, 0, sizeof(cb_data));
+ cb_data.srv_size[0].x = 4;
+ cb_data.srv_size[0].y = 4;
+ cb_data.srv_size[1].x = 4;
+ cb_data.srv_size[1].y = 4;
+ cb_data.uav_size[0].x = ARRAY_SIZE(buffer2_data);
+ cb_data.uav_size[1].x = 4;
+ cb_data.uav_size[1].y = 4;
+ texture_cb = create_upload_buffer(device, sizeof(cb_data), &cb_data);
+
+ descriptor_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 30);
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_R32_UINT;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.Buffer.FirstElement = 0;
+ srv_desc.Buffer.NumElements = ARRAY_SIZE(buffer0_data);
+ ID3D12Device_CreateShaderResourceView(device, input_buffers[0], &srv_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 0));
+ srv_desc.Buffer.NumElements = ARRAY_SIZE(buffer1_data);
+ ID3D12Device_CreateShaderResourceView(device, input_buffers[1], &srv_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 1));
+
+ ID3D12Device_CreateShaderResourceView(device, input_buffers[1], &srv_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 6));
+ srv_desc.Buffer.NumElements = ARRAY_SIZE(buffer4_data);
+ ID3D12Device_CreateShaderResourceView(device, input_buffers[4], &srv_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 7));
+
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = DXGI_FORMAT_R32_UINT;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.FirstElement = 0;
+ uav_desc.Buffer.NumElements = ARRAY_SIZE(buffer2_data);
+ ID3D12Device_CreateUnorderedAccessView(device, input_buffers[2], NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 2));
+ ID3D12Device_CreateUnorderedAccessView(device, input_buffers[2], NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 12));
+ uav_desc.Buffer.NumElements = ARRAY_SIZE(buffer3_data);
+ ID3D12Device_CreateUnorderedAccessView(device, input_buffers[3], NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 5));
+
+ ID3D12Device_CreateShaderResourceView(device, textures[0], NULL,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 10));
+ ID3D12Device_CreateShaderResourceView(device, textures[1], NULL,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 11));
+
+ ID3D12Device_CreateUnorderedAccessView(device, textures[2], NULL, NULL,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 14));
+
+ cbv_desc.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(buffer_cb);
+ cbv_desc.SizeInBytes = align(sizeof(cb_data), D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT);
+ ID3D12Device_CreateConstantBufferView(context.device, &cbv_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 8));
+
+ cbv_desc.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(texture_cb);
+ cbv_desc.SizeInBytes = align(sizeof(cb_data), D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT);
+ ID3D12Device_CreateConstantBufferView(context.device, &cbv_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 9));
+
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = DXGI_FORMAT_R32_TYPELESS;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.FirstElement = 0;
+ uav_desc.Buffer.NumElements = 256;
+ uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_RAW;
+ ID3D12Device_CreateUnorderedAccessView(device, output_buffers[0], NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 20));
+ ID3D12Device_CreateUnorderedAccessView(device, output_buffers[1], NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 21));
+
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, buffer_pso);
+
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstant(command_list, 0, 0 /* offset */, 0);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 1, get_gpu_descriptor_handle(&context, descriptor_heap, 20)); /* u0 */
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 2, get_gpu_descriptor_handle(&context, descriptor_heap, 0)); /* t1-t2 */
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 3, get_gpu_descriptor_handle(&context, descriptor_heap, 2)); /* u4-u7 */
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 4, get_gpu_descriptor_handle(&context, descriptor_heap, 8)); /* b0 */
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstant(command_list, 0, 16 /* offset */, 0);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 2, get_gpu_descriptor_handle(&context, descriptor_heap, 6)); /* t1-t2 */
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, texture_pso);
+
+ transition_resource_state(command_list, input_buffers[4],
+ D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstant(command_list, 0, 32 /* offset */, 0);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 2, get_gpu_descriptor_handle(&context, descriptor_heap, 10)); /* t1-t2 */
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 3, get_gpu_descriptor_handle(&context, descriptor_heap, 12)); /* u4-u7 */
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 4, get_gpu_descriptor_handle(&context, descriptor_heap, 9)); /* b0 */
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstant(command_list, 0, 0 /* offset */, 0);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 1, get_gpu_descriptor_handle(&context, descriptor_heap, 21)); /* u0 */
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, buffer_pso);
+
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstant(command_list, 0, 16 /* offset */, 0);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 2, get_gpu_descriptor_handle(&context, descriptor_heap, 0)); /* t1-t2 */
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 3, get_gpu_descriptor_handle(&context, descriptor_heap, 2)); /* u4-u7 */
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 4, get_gpu_descriptor_handle(&context, descriptor_heap, 8)); /* b0 */
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ transition_sub_resource_state(command_list, output_buffers[0], 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(output_buffers[0], DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < ARRAY_SIZE(expected_output0); ++i)
+ {
+ data = get_readback_uint(&rb, i, 0, 0);
+ ok(data == expected_output0[i], "Got %#x, expected %#x at %u.\n", data, expected_output0[i], i);
+ }
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, output_buffers[1], 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(output_buffers[1], DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < ARRAY_SIZE(expected_output1); ++i)
+ {
+ data = get_readback_uint(&rb, i, 0, 0);
+ ok(data == expected_output1[i], "Got %#x, expected %#x at %u.\n", data, expected_output1[i], i);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(buffer_cb);
+ ID3D12Resource_Release(texture_cb);
+ for (i = 0; i < ARRAY_SIZE(input_buffers); ++i)
+ ID3D12Resource_Release(input_buffers[i]);
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ ID3D12Resource_Release(textures[i]);
+ for (i = 0; i < ARRAY_SIZE(output_buffers); ++i)
+ ID3D12Resource_Release(output_buffers[i]);
+ ID3D12PipelineState_Release(buffer_pso);
+ ID3D12PipelineState_Release(texture_pso);
+ ID3D12DescriptorHeap_Release(descriptor_heap);
+ destroy_test_context(&context);
+}
+
+static void test_update_descriptor_tables_after_root_signature_change(void)
+{
+ ID3D12RootSignature *root_signature, *root_signature2;
+ ID3D12PipelineState *pipeline_state, *pipeline_state2;
+ ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2];
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_range[4];
+ D3D12_ROOT_PARAMETER root_parameters[3];
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ unsigned int i, descriptor_size;
+ D3D12_SAMPLER_DESC sampler_desc;
+ struct test_context_desc desc;
+ ID3D12Resource *textures[2];
+ D3D12_SUBRESOURCE_DATA data;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ Texture2D t;
+ SamplerState s;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p;
+
+ p.x = position.x / 32.0f;
+ p.y = position.y / 32.0f;
+ return t.Sample(s, p);
+ }
+#endif
+ 0x43425844, 0x7a0c3929, 0x75ff3ca4, 0xccb318b2, 0xe6965b4c, 0x00000001, 0x00000140, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a4, 0x00000050,
+ 0x00000029, 0x0100086a, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000,
+ 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002,
+ 0x3d000000, 0x3d000000, 0x00000000, 0x00000000, 0x8b000045, 0x800000c2, 0x00155543, 0x001020f2,
+ 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const unsigned int texture_data[] = {0xff00ff00, 0xff0000ff};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_range[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_range[0].NumDescriptors = 2;
+ descriptor_range[0].BaseShaderRegister = 0;
+ descriptor_range[0].RegisterSpace = 0;
+ descriptor_range[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range[0];
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ descriptor_range[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER;
+ descriptor_range[1].NumDescriptors = 1;
+ descriptor_range[1].BaseShaderRegister = 0;
+ descriptor_range[1].RegisterSpace = 0;
+ descriptor_range[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[1].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[1].DescriptorTable.pDescriptorRanges = &descriptor_range[1];
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ descriptor_range[2].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_range[2].NumDescriptors = 2;
+ descriptor_range[2].BaseShaderRegister = 2;
+ descriptor_range[2].RegisterSpace = 0;
+ descriptor_range[2].OffsetInDescriptorsFromTableStart = 0;
+ descriptor_range[3].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV;
+ descriptor_range[3].NumDescriptors = 1;
+ descriptor_range[3].BaseShaderRegister = 0;
+ descriptor_range[3].RegisterSpace = 0;
+ descriptor_range[3].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[2].DescriptorTable.NumDescriptorRanges = 2;
+ root_parameters[2].DescriptorTable.pDescriptorRanges = &descriptor_range[2];
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);
+ root_signature_desc.pParameters = root_parameters;
+ hr = create_root_signature(context.device, &root_signature_desc, &root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters) - 1;
+ hr = create_root_signature(context.device, &root_signature_desc, &root_signature2);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ pipeline_state = create_pipeline_state(context.device,
+ root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+ pipeline_state2 = create_pipeline_state(context.device,
+ root_signature2, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 6);
+ sampler_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 1);
+
+ memset(&sampler_desc, 0, sizeof(sampler_desc));
+ sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT;
+ sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ ID3D12Device_CreateSampler(context.device, &sampler_desc, get_cpu_descriptor_handle(&context, sampler_heap, 0));
+
+ descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(context.device,
+ D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ {
+ textures[i] = create_default_texture(context.device,
+ 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = &texture_data[i];
+ data.RowPitch = sizeof(texture_data[i]);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(textures[i], &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ }
+
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ {
+ transition_resource_state(command_list, textures[i],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+ ID3D12Device_CreateShaderResourceView(context.device, textures[i], NULL, cpu_handle);
+ cpu_handle.ptr += descriptor_size;
+ }
+ for (; i < 6; ++i)
+ {
+ ID3D12Device_CreateShaderResourceView(context.device, textures[1], NULL, cpu_handle);
+ cpu_handle.ptr += descriptor_size;
+ }
+
+ heaps[0] = heap; heaps[1] = sampler_heap;
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 0));
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 1,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(sampler_heap));
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 2,
+ get_gpu_descriptor_handle(&context, heap, 2));
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state2);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, root_signature2);
+
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 0));
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 1,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(sampler_heap));
+
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state2);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, root_signature2);
+
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 0));
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 1,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(sampler_heap));
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, root_signature);
+
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12PipelineState_Release(pipeline_state);
+ ID3D12PipelineState_Release(pipeline_state2);
+ ID3D12RootSignature_Release(root_signature);
+ ID3D12RootSignature_Release(root_signature2);
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ ID3D12Resource_Release(textures[i]);
+ ID3D12DescriptorHeap_Release(heap);
+ ID3D12DescriptorHeap_Release(sampler_heap);
+ destroy_test_context(&context);
+}
+
+static void test_copy_descriptors(void)
+{
+ struct data
+ {
+ unsigned int u[3];
+ float f;
+ };
+
+ ID3D12DescriptorHeap *cpu_heap, *cpu_sampler_heap, *cpu_sampler_heap2;
+ D3D12_CPU_DESCRIPTOR_HANDLE dst_handles[4], src_handles[4];
+ ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2];
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[5];
+ UINT dst_range_sizes[4], src_range_sizes[4];
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc;
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[4];
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ ID3D12Resource *t[7], *u[3], *cb;
+ struct depth_stencil_resource ds;
+ D3D12_SAMPLER_DESC sampler_desc;
+ struct test_context_desc desc;
+ unsigned int descriptor_size;
+ D3D12_SUBRESOURCE_DATA data;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ unsigned int sampler_size;
+ ID3D12Device *device;
+ unsigned int *result;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD cs_code[] =
+ {
+#if 0
+ struct data
+ {
+ uint3 u;
+ float f;
+ };
+
+ cbuffer cb0
+ {
+ float f;
+ };
+
+ cbuffer cb1
+ {
+ uint u;
+ };
+
+ cbuffer cb2
+ {
+ int i;
+ };
+
+ SamplerState s0;
+ SamplerState s1;
+ SamplerState s2;
+ SamplerComparisonState s3;
+
+ Texture2D t0;
+ Texture2D<uint> t1;
+ Texture2D<int> t2;
+ Buffer<float> t3;
+ StructuredBuffer<float> t4;
+ ByteAddressBuffer t5;
+ Texture2D t6;
+
+ RWByteAddressBuffer u0;
+ RWStructuredBuffer<data> u1;
+
+ RWByteAddressBuffer u2;
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ u2.Store(0 * 4, f);
+ u2.Store(1 * 4, u);
+ u2.Store(2 * 4, i);
+ u2.Store(3 * 4, 0);
+
+ u2.Store4( 4 * 4, t0.SampleLevel(s0, (float2)0, 0));
+ u2.Store4( 8 * 4, t0.SampleLevel(s1, (float2)0, 0));
+ u2.Store4(12 * 4, t0.SampleLevel(s2, (float2)0, 0));
+
+ u2.Store(16 * 4, t1.Load((int3)0));
+ u2.Store(17 * 4, t2.Load((int3)0));
+ u2.Store(18 * 4, t3.Load(0));
+ u2.Store(19 * 4, t4[0]);
+
+ u2.Store4(20 * 4, t5.Load4(0));
+
+ u2.Store4(24 * 4, t6.SampleCmpLevelZero(s3, (float2)0, 0.6f));
+ u2.Store4(28 * 4, t6.SampleCmpLevelZero(s3, (float2)0, 0.4f));
+
+ u2.Store2(32 * 4, u0.Load2(0));
+ u2.Store2(34 * 4, u0.Load2(8));
+
+ u2.Store3(36 * 4, u1[0].u);
+ u2.Store4(39 * 4, u1[0].f);
+
+ u2.Store(43 * 4, 0xdeadbeef);
+ }
+#endif
+ 0x43425844, 0x52d2c2d3, 0xaf60e190, 0xb897944f, 0x4a6a6653, 0x00000001, 0x00000650, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000005fc, 0x00050050, 0x0000017f, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000059, 0x00208e46, 0x00000001, 0x00000001,
+ 0x04000059, 0x00208e46, 0x00000002, 0x00000001, 0x0300005a, 0x00106000, 0x00000000, 0x0300005a,
+ 0x00106000, 0x00000001, 0x0300005a, 0x00106000, 0x00000002, 0x0300085a, 0x00106000, 0x00000003,
+ 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04001858, 0x00107000, 0x00000001, 0x00004444,
+ 0x04001858, 0x00107000, 0x00000002, 0x00003333, 0x04000858, 0x00107000, 0x00000003, 0x00005555,
+ 0x040000a2, 0x00107000, 0x00000004, 0x00000004, 0x030000a1, 0x00107000, 0x00000005, 0x04001858,
+ 0x00107000, 0x00000006, 0x00005555, 0x0300009d, 0x0011e000, 0x00000000, 0x0400009e, 0x0011e000,
+ 0x00000001, 0x00000010, 0x0300009d, 0x0011e000, 0x00000002, 0x02000068, 0x00000002, 0x0400009b,
+ 0x00000001, 0x00000001, 0x00000001, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000000, 0x06000036, 0x00100022, 0x00000000, 0x0020800a, 0x00000001, 0x00000000, 0x06000036,
+ 0x00100042, 0x00000000, 0x0020800a, 0x00000002, 0x00000000, 0x05000036, 0x00100082, 0x00000000,
+ 0x00004001, 0x00000000, 0x070000a6, 0x0011e0f2, 0x00000002, 0x00004001, 0x00000000, 0x00100e46,
+ 0x00000000, 0x90000048, 0x800000c2, 0x00155543, 0x001000f2, 0x00000000, 0x00004002, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x00004001,
+ 0x00000000, 0x0500001c, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x070000a6, 0x0011e0f2,
+ 0x00000002, 0x00004001, 0x00000010, 0x00100e46, 0x00000000, 0x90000048, 0x800000c2, 0x00155543,
+ 0x001000f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00107e46,
+ 0x00000000, 0x00106000, 0x00000001, 0x00004001, 0x00000000, 0x0500001c, 0x001000f2, 0x00000000,
+ 0x00100e46, 0x00000000, 0x070000a6, 0x0011e0f2, 0x00000002, 0x00004001, 0x00000020, 0x00100e46,
+ 0x00000000, 0x90000048, 0x800000c2, 0x00155543, 0x001000f2, 0x00000000, 0x00004002, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000002, 0x00004001,
+ 0x00000000, 0x0500001c, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x070000a6, 0x0011e0f2,
+ 0x00000002, 0x00004001, 0x00000030, 0x00100e46, 0x00000000, 0x8c00002d, 0x80000042, 0x00155543,
+ 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00107e46,
+ 0x00000003, 0x0500001c, 0x00100042, 0x00000000, 0x0010000a, 0x00000000, 0x8b0000a7, 0x80002302,
+ 0x00199983, 0x00100012, 0x00000001, 0x00004001, 0x00000000, 0x00004001, 0x00000000, 0x00107006,
+ 0x00000004, 0x0500001c, 0x00100082, 0x00000000, 0x0010000a, 0x00000001, 0x8c00002d, 0x800000c2,
+ 0x00111103, 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00107e46, 0x00000001, 0x8c00002d, 0x800000c2, 0x000cccc3, 0x00100022, 0x00000000, 0x00004002,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00107e16, 0x00000002, 0x070000a6, 0x0011e0f2,
+ 0x00000002, 0x00004001, 0x00000040, 0x00100e46, 0x00000000, 0x890000a5, 0x800002c2, 0x00199983,
+ 0x001000f2, 0x00000000, 0x00004001, 0x00000000, 0x00107e46, 0x00000005, 0x070000a6, 0x0011e0f2,
+ 0x00000002, 0x00004001, 0x00000050, 0x00100e46, 0x00000000, 0x90000047, 0x800000c2, 0x00155543,
+ 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00107006,
+ 0x00000006, 0x00106000, 0x00000003, 0x00004001, 0x3f19999a, 0x0500001c, 0x00100012, 0x00000000,
+ 0x0010000a, 0x00000000, 0x070000a6, 0x0011e0f2, 0x00000002, 0x00004001, 0x00000060, 0x00100006,
+ 0x00000000, 0x90000047, 0x800000c2, 0x00155543, 0x00100012, 0x00000000, 0x00004002, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00107006, 0x00000006, 0x00106000, 0x00000003, 0x00004001,
+ 0x3ecccccd, 0x0500001c, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x070000a6, 0x0011e0f2,
+ 0x00000002, 0x00004001, 0x00000070, 0x00100006, 0x00000000, 0x890000a5, 0x800002c2, 0x00199983,
+ 0x00100032, 0x00000000, 0x00004001, 0x00000000, 0x0011e046, 0x00000000, 0x890000a5, 0x800002c2,
+ 0x00199983, 0x001000c2, 0x00000000, 0x00004001, 0x00000008, 0x0011e406, 0x00000000, 0x070000a6,
+ 0x0011e0f2, 0x00000002, 0x00004001, 0x00000080, 0x00100e46, 0x00000000, 0x8b0000a7, 0x80008302,
+ 0x00199983, 0x001000f2, 0x00000000, 0x00004001, 0x00000000, 0x00004001, 0x00000000, 0x0011ee46,
+ 0x00000001, 0x070000a6, 0x0011e072, 0x00000002, 0x00004001, 0x00000090, 0x00100246, 0x00000000,
+ 0x0500001c, 0x00100012, 0x00000000, 0x0010003a, 0x00000000, 0x070000a6, 0x0011e0f2, 0x00000002,
+ 0x00004001, 0x0000009c, 0x00100006, 0x00000000, 0x070000a6, 0x0011e012, 0x00000002, 0x00004001,
+ 0x000000ac, 0x00004001, 0xdeadbeef, 0x0100003e,
+ };
+ static const float cb0_data = 10.0f;
+ static const UINT cb1_data = 11;
+ static const INT cb2_data = -1;
+ static const struct vec4 t0_data = {1.0f, 2.0f, 3.0f, 4.0f};
+ static const UINT t1_data = 111;
+ static const INT t2_data = 222;
+ static const float t3_data = 333.3f;
+ static const float t4_data = 44.44f;
+ static const struct uvec4 t5_data = {50, 51, 52, 53};
+ static const struct uvec4 u0_data = {10, 20, 30, 40};
+ static const struct data u1_data = {{5, 6, 7}, 10.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(device,
+ D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+ sampler_size = ID3D12Device_GetDescriptorHandleIncrementSize(device,
+ D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER);
+
+ cpu_sampler_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 2);
+ cpu_sampler_heap2 = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 2);
+ sampler_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 4);
+
+ cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 30);
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 30);
+
+ /* create samplers */
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(cpu_sampler_heap);
+ memset(&sampler_desc, 0, sizeof(sampler_desc));
+ sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT;
+ sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ ID3D12Device_CreateSampler(context.device, &sampler_desc, cpu_handle);
+ sampler_desc.Filter = D3D12_FILTER_COMPARISON_MIN_MAG_MIP_POINT;
+ sampler_desc.ComparisonFunc = D3D12_COMPARISON_FUNC_GREATER;
+ cpu_handle.ptr += sampler_size;
+ ID3D12Device_CreateSampler(context.device, &sampler_desc, cpu_handle);
+
+ /* create CBVs */
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(cpu_heap);
+ cb = create_upload_buffer(context.device,
+ 3 * D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT, NULL);
+ update_buffer_data(cb, 0, sizeof(cb0_data), &cb0_data);
+ update_buffer_data(cb, D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT, sizeof(cb1_data), &cb1_data);
+ update_buffer_data(cb, 2 * D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT, sizeof(cb2_data), &cb2_data);
+ cbv_desc.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(cb);
+ cbv_desc.SizeInBytes = D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT;
+ for (i = 0; i < 3; ++i)
+ {
+ ID3D12Device_CreateConstantBufferView(context.device, &cbv_desc, cpu_handle);
+ cbv_desc.BufferLocation += D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT;
+ cpu_handle.ptr += descriptor_size;
+ }
+
+ /* create SRVs */
+ cpu_handle = get_cpu_descriptor_handle(&context, cpu_heap, 10);
+
+ t[0] = create_default_texture(context.device,
+ 1, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = &t0_data;
+ data.RowPitch = sizeof(t0_data);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(t[0], &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, t[0],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ t[1] = create_default_texture(context.device,
+ 1, 1, DXGI_FORMAT_R32_UINT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = &t1_data;
+ data.RowPitch = sizeof(t1_data);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(t[1], &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, t[1],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ t[2] = create_default_texture(context.device,
+ 1, 1, DXGI_FORMAT_R32_SINT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = &t2_data;
+ data.RowPitch = sizeof(t2_data);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(t[2], &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, t[2],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ t[3] = create_default_buffer(device, sizeof(t3_data),
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(t[3], 0, sizeof(t3_data), &t3_data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, t[3],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ t[4] = create_default_buffer(device, sizeof(t4_data),
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(t[4], 0, sizeof(t4_data), &t4_data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, t[4],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ t[5] = create_default_buffer(device, sizeof(t5_data),
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(t[5], 0, sizeof(t5_data), &t5_data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, t[5],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ init_depth_stencil(&ds, device, 32, 32, 1, 1, DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL);
+ t[6] = ds.texture;
+ ID3D12Resource_AddRef(t[6]);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 0.5f, 0, 0, NULL);
+ transition_resource_state(command_list, t[6],
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ for (i = 0; i < 3; ++i)
+ {
+ ID3D12Device_CreateShaderResourceView(device, t[i], NULL, cpu_handle);
+ cpu_handle.ptr += descriptor_size;
+ }
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.Buffer.FirstElement = 0;
+ srv_desc.Buffer.NumElements = 1;
+ ID3D12Device_CreateShaderResourceView(device, t[3], &srv_desc, cpu_handle);
+ cpu_handle.ptr += descriptor_size;
+
+ srv_desc.Format = DXGI_FORMAT_UNKNOWN;
+ srv_desc.Buffer.StructureByteStride = sizeof(t4_data);
+ ID3D12Device_CreateShaderResourceView(device, t[4], &srv_desc, cpu_handle);
+ cpu_handle.ptr += descriptor_size;
+
+ srv_desc.Format = DXGI_FORMAT_R32_TYPELESS;
+ srv_desc.Buffer.NumElements = 4;
+ srv_desc.Buffer.StructureByteStride = 0;
+ srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_RAW;
+ ID3D12Device_CreateShaderResourceView(device, t[5], &srv_desc, cpu_handle);
+ cpu_handle.ptr += descriptor_size;
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.Texture2D.MipLevels = 1;
+ ID3D12Device_CreateShaderResourceView(device, t[6], &srv_desc, cpu_handle);
+
+ /* create UAVs */
+ cpu_handle = get_cpu_descriptor_handle(&context, cpu_heap, 20);
+
+ u[0] = create_default_buffer(device, sizeof(u0_data),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(u[0], 0, sizeof(u0_data), &u0_data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, u[0],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ u[1] = create_default_buffer(device, sizeof(struct uvec4),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(u[1], 0, sizeof(u1_data), &u1_data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, u[0],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ u[2] = create_default_buffer(device, 44 * 4,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = DXGI_FORMAT_R32_TYPELESS;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.FirstElement = 0;
+ uav_desc.Buffer.NumElements = 4;
+ uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_RAW;
+ ID3D12Device_CreateUnorderedAccessView(device, u[0], NULL, &uav_desc, cpu_handle);
+ cpu_handle.ptr += descriptor_size;
+
+ uav_desc.Format = DXGI_FORMAT_UNKNOWN;
+ uav_desc.Buffer.NumElements = 1;
+ uav_desc.Buffer.StructureByteStride = sizeof(u1_data);
+ uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE;
+ ID3D12Device_CreateUnorderedAccessView(device, u[1], NULL, &uav_desc, cpu_handle);
+ cpu_handle.ptr += descriptor_size;
+
+ uav_desc.Format = DXGI_FORMAT_R32_TYPELESS;
+ uav_desc.Buffer.NumElements = 44;
+ uav_desc.Buffer.StructureByteStride = 0;
+ uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_RAW;
+ ID3D12Device_CreateUnorderedAccessView(device, u[2], NULL, &uav_desc, cpu_handle);
+
+ /* root signature */
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV;
+ descriptor_ranges[0].NumDescriptors = 3;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_ranges[0];
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER;
+ descriptor_ranges[1].NumDescriptors = 4;
+ descriptor_ranges[1].BaseShaderRegister = 0;
+ descriptor_ranges[1].RegisterSpace = 0;
+ descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[1].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[1].DescriptorTable.pDescriptorRanges = &descriptor_ranges[1];
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ descriptor_ranges[2].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_ranges[2].NumDescriptors = 7;
+ descriptor_ranges[2].BaseShaderRegister = 0;
+ descriptor_ranges[2].RegisterSpace = 0;
+ descriptor_ranges[2].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[2].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[2].DescriptorTable.pDescriptorRanges = &descriptor_ranges[2];
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ descriptor_ranges[3].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[3].NumDescriptors = 2;
+ descriptor_ranges[3].BaseShaderRegister = 0;
+ descriptor_ranges[3].RegisterSpace = 0;
+ descriptor_ranges[3].OffsetInDescriptorsFromTableStart = 0;
+ descriptor_ranges[4].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[4].NumDescriptors = 1;
+ descriptor_ranges[4].BaseShaderRegister = 2;
+ descriptor_ranges[4].RegisterSpace = 0;
+ descriptor_ranges[4].OffsetInDescriptorsFromTableStart = 2;
+ root_parameters[3].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[3].DescriptorTable.NumDescriptorRanges = 2;
+ root_parameters[3].DescriptorTable.pDescriptorRanges = &descriptor_ranges[3];
+ root_parameters[3].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = 4;
+ root_signature_desc.pParameters = root_parameters;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+
+ /* copy descriptors */
+ dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 5);
+ dst_range_sizes[0] = 2;
+ src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 0);
+ src_range_sizes[0] = 2;
+ /* cb0-cb1 */
+ ID3D12Device_CopyDescriptors(device, 1, dst_handles, dst_range_sizes,
+ 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+ dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 7);
+ dst_range_sizes[0] = 1;
+ src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 2);
+ src_range_sizes[0] = 1;
+ /* cb2 */
+ ID3D12Device_CopyDescriptors(device, 1, dst_handles, dst_range_sizes,
+ 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ ID3D12Device_CopyDescriptorsSimple(device, 2,
+ get_cpu_sampler_handle(&context, cpu_sampler_heap2, 0),
+ get_cpu_sampler_handle(&context, cpu_sampler_heap, 0),
+ D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER);
+
+ dst_handles[0] = get_cpu_sampler_handle(&context, sampler_heap, 0);
+ dst_range_sizes[0] = 4;
+ src_handles[0] = get_cpu_sampler_handle(&context, cpu_sampler_heap2, 0);
+ src_handles[1] = get_cpu_sampler_handle(&context, cpu_sampler_heap2, 0);
+ src_handles[2] = get_cpu_sampler_handle(&context, cpu_sampler_heap2, 0);
+ src_handles[3] = get_cpu_sampler_handle(&context, cpu_sampler_heap2, 1);
+ /* s0-s3 */
+ ID3D12Device_CopyDescriptors(device, 1, dst_handles, dst_range_sizes,
+ 4, src_handles, NULL, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER);
+
+ dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 9);
+ dst_range_sizes[0] = 4;
+ dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 9);
+ dst_range_sizes[1] = 0;
+ dst_handles[2] = get_cpu_descriptor_handle(&context, heap, 13);
+ dst_range_sizes[2] = 3;
+ dst_handles[3] = get_cpu_descriptor_handle(&context, heap, 13);
+ dst_range_sizes[3] = 0;
+ src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 10);
+ src_range_sizes[0] = 8;
+ /* t0-t6 */
+ ID3D12Device_CopyDescriptors(device, 4, dst_handles, dst_range_sizes,
+ 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ /* copy 1 uninitialized descriptor (19) */
+ dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 19);
+ dst_range_sizes[0] = 2;
+ dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 21);
+ dst_range_sizes[1] = 1;
+ src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 19);
+ src_range_sizes[0] = 2;
+ src_handles[1] = get_cpu_descriptor_handle(&context, cpu_heap, 21);
+ src_range_sizes[1] = 1;
+ /* u1-u2 */
+ ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes,
+ 2, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ /* u2 */
+ ID3D12Device_CopyDescriptorsSimple(device, 1,
+ get_cpu_descriptor_handle(&context, heap, 22),
+ get_cpu_descriptor_handle(&context, cpu_heap, 22),
+ D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ /* range sizes equal to 0 */
+ dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 19);
+ dst_range_sizes[0] = 0;
+ dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 19);
+ dst_range_sizes[1] = 0;
+ src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 0);
+ src_range_sizes[0] = 1;
+ src_handles[1] = get_cpu_descriptor_handle(&context, cpu_heap, 0);
+ src_range_sizes[1] = 4;
+ ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes,
+ 2, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+ dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 19);
+ dst_range_sizes[0] = 4;
+ dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 19);
+ dst_range_sizes[1] = 4;
+ src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 0);
+ src_range_sizes[0] = 0;
+ src_handles[1] = get_cpu_descriptor_handle(&context, cpu_heap, 0);
+ src_range_sizes[1] = 0;
+ ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes,
+ 2, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ heaps[0] = sampler_heap; heaps[1] = heap;
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 5));
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 1,
+ get_gpu_sampler_handle(&context, sampler_heap, 0));
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 2,
+ get_gpu_descriptor_handle(&context, heap, 9));
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 3,
+ get_gpu_descriptor_handle(&context, heap, 20));
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ transition_sub_resource_state(command_list, u[2], 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(u[2], DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ result = get_readback_data(&rb, 0, 0, 0, sizeof(*result));
+ ok(result[ 0] == cb0_data, "Got unexpected value %#x.\n", result[0]);
+ ok(result[ 1] == cb1_data, "Got unexpected value %#x.\n", result[1]);
+ ok(result[ 2] == cb2_data, "Got unexpected value %#x.\n", result[2]);
+ ok(result[ 3] == 0, "Got unexpected value %#x.\n", result[3]);
+ ok(result[ 4] == t0_data.x, "Got unexpected value %#x.\n", result[4]);
+ ok(result[ 5] == t0_data.y, "Got unexpected value %#x.\n", result[5]);
+ ok(result[ 6] == t0_data.z, "Got unexpected value %#x.\n", result[6]);
+ ok(result[ 7] == t0_data.w, "Got unexpected value %#x.\n", result[7]);
+ ok(result[ 8] == t0_data.x, "Got unexpected value %#x.\n", result[8]);
+ ok(result[ 9] == t0_data.y, "Got unexpected value %#x.\n", result[9]);
+ ok(result[10] == t0_data.z, "Got unexpected value %#x.\n", result[10]);
+ ok(result[11] == t0_data.w, "Got unexpected value %#x.\n", result[11]);
+ ok(result[12] == t0_data.x, "Got unexpected value %#x.\n", result[12]);
+ ok(result[13] == t0_data.y, "Got unexpected value %#x.\n", result[13]);
+ ok(result[14] == t0_data.z, "Got unexpected value %#x.\n", result[14]);
+ ok(result[15] == t0_data.w, "Got unexpected value %#x.\n", result[15]);
+ ok(result[16] == t1_data, "Got unexpected value %#x.\n", result[16]);
+ ok(result[17] == t2_data, "Got unexpected value %#x.\n", result[17]);
+ ok(result[18] == (unsigned int)t3_data, "Got unexpected value %#x.\n", result[18]);
+ ok(result[19] == (unsigned int)t4_data, "Got unexpected value %#x.\n", result[19]);
+ ok(result[20] == t5_data.x, "Got unexpected value %#x.\n", result[20]);
+ ok(result[21] == t5_data.y, "Got unexpected value %#x.\n", result[21]);
+ ok(result[22] == t5_data.z, "Got unexpected value %#x.\n", result[22]);
+ ok(result[23] == t5_data.w, "Got unexpected value %#x.\n", result[23]);
+ ok(result[24] == 1, "Got unexpected value %#x.\n", result[24]);
+ ok(result[25] == 1, "Got unexpected value %#x.\n", result[25]);
+ ok(result[26] == 1, "Got unexpected value %#x.\n", result[26]);
+ ok(result[27] == 1, "Got unexpected value %#x.\n", result[27]);
+ ok(result[28] == 0, "Got unexpected value %#x.\n", result[28]);
+ ok(result[29] == 0, "Got unexpected value %#x.\n", result[29]);
+ ok(result[30] == 0, "Got unexpected value %#x.\n", result[30]);
+ ok(result[31] == 0, "Got unexpected value %#x.\n", result[31]);
+ ok(result[32] == u0_data.x, "Got unexpected value %#x.\n", result[32]);
+ ok(result[33] == u0_data.y, "Got unexpected value %#x.\n", result[33]);
+ ok(result[34] == u0_data.z, "Got unexpected value %#x.\n", result[34]);
+ ok(result[35] == u0_data.w, "Got unexpected value %#x.\n", result[35]);
+ ok(result[36] == u1_data.u[0], "Got unexpected value %#x.\n", result[36]);
+ ok(result[37] == u1_data.u[1], "Got unexpected value %#x.\n", result[37]);
+ ok(result[38] == u1_data.u[2], "Got unexpected value %#x.\n", result[38]);
+ ok(result[39] == u1_data.f, "Got unexpected value %#x.\n", result[39]);
+ ok(result[40] == u1_data.f, "Got unexpected value %#x.\n", result[40]);
+ ok(result[41] == u1_data.f, "Got unexpected value %#x.\n", result[41]);
+ ok(result[42] == u1_data.f, "Got unexpected value %#x.\n", result[42]);
+ ok(result[43] == 0xdeadbeef, "Got unexpected value %#x.\n", result[43]);
+ assert(rb.width == 44);
+ release_resource_readback(&rb);
+
+ ID3D12DescriptorHeap_Release(cpu_heap);
+ ID3D12DescriptorHeap_Release(cpu_sampler_heap);
+ ID3D12DescriptorHeap_Release(cpu_sampler_heap2);
+ ID3D12DescriptorHeap_Release(heap);
+ ID3D12DescriptorHeap_Release(sampler_heap);
+ ID3D12Resource_Release(cb);
+ for (i = 0; i < ARRAY_SIZE(t); ++i)
+ ID3D12Resource_Release(t[i]);
+ for (i = 0; i < ARRAY_SIZE(u); ++i)
+ ID3D12Resource_Release(u[i]);
+ destroy_depth_stencil(&ds);
+ destroy_test_context(&context);
+}
+
+static void test_copy_descriptors_range_sizes(void)
+{
+ D3D12_CPU_DESCRIPTOR_HANDLE dst_handles[1], src_handles[1];
+ D3D12_CPU_DESCRIPTOR_HANDLE green_handle, blue_handle;
+ ID3D12Resource *green_texture, *blue_texture;
+ UINT dst_range_sizes[1], src_range_sizes[1];
+ ID3D12GraphicsCommandList *command_list;
+ ID3D12DescriptorHeap *cpu_heap;
+ struct test_context_desc desc;
+ D3D12_SUBRESOURCE_DATA data;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i;
+ D3D12_BOX box;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ Texture2D t;
+ SamplerState s;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p;
+
+ p.x = position.x / 32.0f;
+ p.y = position.y / 32.0f;
+ return t.Sample(s, p);
+ }
+#endif
+ 0x43425844, 0x7a0c3929, 0x75ff3ca4, 0xccb318b2, 0xe6965b4c, 0x00000001, 0x00000140, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a4, 0x00000050,
+ 0x00000029, 0x0100086a, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000,
+ 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002,
+ 0x3d000000, 0x3d000000, 0x00000000, 0x00000000, 0x8b000045, 0x800000c2, 0x00155543, 0x001020f2,
+ 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f};
+ static const struct vec4 blue = {0.0f, 0.0f, 1.0f, 1.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = desc.rt_height = 6;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 10);
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 8);
+
+ green_handle = get_cpu_descriptor_handle(&context, cpu_heap, 0);
+ blue_handle = get_cpu_descriptor_handle(&context, cpu_heap, 1);
+
+ green_texture = create_default_texture(context.device,
+ 1, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = &green;
+ data.RowPitch = sizeof(green);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(green_texture, &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, green_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+ ID3D12Device_CreateShaderResourceView(device, green_texture, NULL, green_handle);
+
+ blue_texture = create_default_texture(context.device,
+ 1, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = &blue;
+ data.RowPitch = sizeof(blue);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(blue_texture, &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, blue_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+ ID3D12Device_CreateShaderResourceView(device, blue_texture, NULL, blue_handle);
+
+ context.root_signature = create_texture_root_signature(context.device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 0, 0);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ /* copy descriptors */
+ dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 1);
+ dst_range_sizes[0] = 1;
+ src_handles[0] = blue_handle;
+ src_range_sizes[0] = 1;
+ ID3D12Device_CopyDescriptors(device, 1, dst_handles, dst_range_sizes,
+ 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 2);
+ dst_range_sizes[0] = 1;
+ src_handles[0] = green_handle;
+ src_range_sizes[0] = 1;
+ ID3D12Device_CopyDescriptors(device, 1, dst_handles, dst_range_sizes,
+ 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 3);
+ src_handles[0] = blue_handle;
+ src_range_sizes[0] = 1;
+ ID3D12Device_CopyDescriptors(device, 1, dst_handles, NULL,
+ 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 4);
+ src_handles[0] = green_handle;
+ src_range_sizes[0] = 1;
+ ID3D12Device_CopyDescriptors(device, 1, dst_handles, NULL,
+ 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 5);
+ src_handles[0] = blue_handle;
+ ID3D12Device_CopyDescriptors(device, 1, dst_handles, NULL,
+ 1, src_handles, NULL, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 0);
+ src_handles[0] = green_handle;
+ ID3D12Device_CopyDescriptors(device, 1, dst_handles, NULL,
+ 1, src_handles, NULL, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ for (i = 0; i < desc.rt_width; ++i)
+ {
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, i));
+ set_viewport(&context.viewport, i, 0.0f, 1.0f, desc.rt_height, 0.0f, 1.0f);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ }
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (i = 0; i < desc.rt_width; ++i)
+ {
+ set_box(&box, i, 0, 0, i + 1, desc.rt_height, 1);
+ check_readback_data_uint(&rb, &box, i % 2 ? 0xffff0000 : 0xff00ff00, 0);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12DescriptorHeap_Release(cpu_heap);
+ ID3D12DescriptorHeap_Release(heap);
+ ID3D12Resource_Release(blue_texture);
+ ID3D12Resource_Release(green_texture);
+ destroy_test_context(&context);
+}
+
+static void test_descriptors_visibility(void)
+{
+ ID3D12Resource *vs_raw_buffer, *ps_raw_buffer;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[2];
+ D3D12_STATIC_SAMPLER_DESC sampler_desc[2];
+ ID3D12Resource *vs_texture, *ps_texture;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[6];
+ ID3D12Resource *vs_cb, *ps_cb;
+ struct test_context_desc desc;
+ D3D12_SUBRESOURCE_DATA data;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ HRESULT hr;
+
+ static const DWORD vs_code[] =
+ {
+#if 0
+ ByteAddressBuffer b;
+ Texture2D t;
+ SamplerState s;
+
+ float4 cb;
+
+ float4 main(uint id : SV_VertexID) : SV_Position
+ {
+ float2 coords = float2((id << 1) & 2, id & 2);
+ uint i;
+
+ if (cb.x != 4.0 || cb.y != 8.0 || cb.z != 16.0 || cb.w != 32.0)
+ return (float4)0;
+
+ for (i = 0; i <= 6; ++i)
+ {
+ if (b.Load(4 * i) != i)
+ return (float4)0;
+ }
+
+ if (any(t.SampleLevel(s, (float2)0, 0) != float4(1.0, 1.0, 0.0, 1.0)))
+ return (float4)0;
+
+ return float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);
+ }
+#endif
+ 0x43425844, 0x046e4d13, 0xd2103a18, 0x8576703b, 0x6f58933a, 0x00000001, 0x0000043c, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x000003a0, 0x00010050,
+ 0x000000e8, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000,
+ 0x00000000, 0x030000a1, 0x00107000, 0x00000000, 0x04001858, 0x00107000, 0x00000001, 0x00005555,
+ 0x04000060, 0x00101012, 0x00000000, 0x00000006, 0x04000067, 0x001020f2, 0x00000000, 0x00000001,
+ 0x02000068, 0x00000002, 0x0b000039, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000,
+ 0x00004002, 0x40800000, 0x41000000, 0x41800000, 0x42000000, 0x0700003c, 0x00100012, 0x00000000,
+ 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0700003c, 0x00100012, 0x00000000, 0x0010002a,
+ 0x00000000, 0x0010000a, 0x00000000, 0x0700003c, 0x00100012, 0x00000000, 0x0010003a, 0x00000000,
+ 0x0010000a, 0x00000000, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, 0x01000015, 0x05000036,
+ 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x0700004f, 0x00100022, 0x00000000,
+ 0x00004001, 0x00000006, 0x0010000a, 0x00000000, 0x03040003, 0x0010001a, 0x00000000, 0x07000029,
+ 0x00100022, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000002, 0x890000a5, 0x800002c2,
+ 0x00199983, 0x00100022, 0x00000000, 0x0010001a, 0x00000000, 0x00107006, 0x00000000, 0x07000027,
+ 0x00100022, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0304001f, 0x0010001a,
+ 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x0100003e, 0x01000015, 0x0700001e, 0x00100012, 0x00000000, 0x0010000a, 0x00000000,
+ 0x00004001, 0x00000001, 0x01000016, 0x90000048, 0x800000c2, 0x00155543, 0x001000f2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x00106000,
+ 0x00000000, 0x00004001, 0x00000000, 0x0a000039, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000,
+ 0x00004002, 0x3f800000, 0x3f800000, 0x00000000, 0x3f800000, 0x0700003c, 0x00100032, 0x00000000,
+ 0x00100ae6, 0x00000000, 0x00100046, 0x00000000, 0x0700003c, 0x00100012, 0x00000000, 0x0010001a,
+ 0x00000000, 0x0010000a, 0x00000000, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2,
+ 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, 0x01000015,
+ 0x0b00008c, 0x00100012, 0x00000000, 0x00004001, 0x00000001, 0x00004001, 0x00000001, 0x0010100a,
+ 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100022, 0x00000000, 0x0010100a, 0x00000000,
+ 0x00004001, 0x00000002, 0x05000056, 0x00100032, 0x00000001, 0x00100046, 0x00000000, 0x0f000032,
+ 0x00102032, 0x00000000, 0x00100046, 0x00000001, 0x00004002, 0x40000000, 0xc0000000, 0x00000000,
+ 0x00000000, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, 0x08000036, 0x001020c2,
+ 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ ByteAddressBuffer b;
+ Texture2D t;
+ SamplerState s;
+
+ float4 cb;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ if (cb.x != 1.0 || cb.y != 2.0 || cb.z != 3.0 || cb.w != 4.0)
+ return float4(1.0, 0.0, 0.0, 1.0);
+
+ if (b.Load(0) != 2 || b.Load(4) != 4 || b.Load(8) != 8)
+ return float4(1.0, 0.0, 0.0, 1.0);
+
+ return t.Sample(s, float2(position.x / 32.0, position.y / 32.0));
+ }
+#endif
+ 0x43425844, 0x1b1aafc1, 0xeab215f6, 0x77d65b25, 0x03cbe695, 0x00000001, 0x000002dc, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000240, 0x00000050,
+ 0x00000090, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000,
+ 0x00000000, 0x030000a1, 0x00107000, 0x00000000, 0x04001858, 0x00107000, 0x00000001, 0x00005555,
+ 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068,
+ 0x00000001, 0x0b000039, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004002,
+ 0x3f800000, 0x40000000, 0x40400000, 0x40800000, 0x0700003c, 0x00100012, 0x00000000, 0x0010001a,
+ 0x00000000, 0x0010000a, 0x00000000, 0x0700003c, 0x00100012, 0x00000000, 0x0010002a, 0x00000000,
+ 0x0010000a, 0x00000000, 0x0700003c, 0x00100012, 0x00000000, 0x0010003a, 0x00000000, 0x0010000a,
+ 0x00000000, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002,
+ 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x890000a5, 0x800002c2,
+ 0x00199983, 0x00100072, 0x00000000, 0x00004001, 0x00000000, 0x00107246, 0x00000000, 0x0a000027,
+ 0x00100072, 0x00000000, 0x00100246, 0x00000000, 0x00004002, 0x00000002, 0x00000004, 0x00000008,
+ 0x00000000, 0x0700003c, 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000,
+ 0x0700003c, 0x00100012, 0x00000000, 0x0010002a, 0x00000000, 0x0010000a, 0x00000000, 0x0304001f,
+ 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000,
+ 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0a000038, 0x00100032, 0x00000000, 0x00101046,
+ 0x00000000, 0x00004002, 0x3d000000, 0x3d000000, 0x00000000, 0x00000000, 0x8b000045, 0x800000c2,
+ 0x00155543, 0x001000f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000001, 0x00106000,
+ 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const struct vec4 vs_cb_data = {4.0f, 8.0f, 16.0f, 32.0f};
+ static const struct vec4 ps_cb_data = {1.0f, 2.0f, 3.0f, 4.0f};
+ static const uint32_t vs_buffer_data[] = {0, 1, 2, 3, 4, 5, 6};
+ static const uint32_t ps_buffer_data[] = {2, 4, 8};
+ static const float vs_texture_data[] = {1.0f, 1.0f, 0.0f, 1.0f};
+ static const float ps_texture_data[] = {0.0f, 1.0f, 0.0f, 1.0f};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ sampler_desc[0].Filter = D3D12_FILTER_MIN_MAG_MIP_POINT;
+ sampler_desc[0].AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc[0].AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc[0].AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc[0].MipLODBias = 0.0f;
+ sampler_desc[0].MaxAnisotropy = 0;
+ sampler_desc[0].ComparisonFunc = D3D12_COMPARISON_FUNC_NEVER;
+ sampler_desc[0].BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE;
+ sampler_desc[0].MinLOD = 0.0f;
+ sampler_desc[0].MaxLOD = 0.0f;
+ sampler_desc[0].ShaderRegister = 0;
+ sampler_desc[0].RegisterSpace = 0;
+ sampler_desc[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX;
+
+ sampler_desc[1] = sampler_desc[0];
+ sampler_desc[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[0].Descriptor.ShaderRegister = 0;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[1].Descriptor.ShaderRegister = 0;
+ root_parameters[1].Descriptor.RegisterSpace = 0;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_SRV;
+ root_parameters[2].Descriptor.ShaderRegister = 0;
+ root_parameters[2].Descriptor.RegisterSpace = 0;
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX;
+ root_parameters[3].ParameterType = D3D12_ROOT_PARAMETER_TYPE_SRV;
+ root_parameters[3].Descriptor.ShaderRegister = 0;
+ root_parameters[3].Descriptor.RegisterSpace = 0;
+ root_parameters[3].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 1;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ root_parameters[4].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[4].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[4].DescriptorTable.pDescriptorRanges = &descriptor_ranges[0];
+ root_parameters[4].ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX;
+ descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_ranges[1].NumDescriptors = 1;
+ descriptor_ranges[1].BaseShaderRegister = 1;
+ descriptor_ranges[1].RegisterSpace = 0;
+ descriptor_ranges[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ root_parameters[5].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[5].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[5].DescriptorTable.pDescriptorRanges = &descriptor_ranges[1];
+ root_parameters[5].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = 6;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 2;
+ root_signature_desc.pStaticSamplers = sampler_desc;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_pipeline_state(device,
+ context.root_signature, context.render_target_desc.Format,
+ &vs, &ps, NULL);
+
+ vs_cb = create_upload_buffer(device, sizeof(vs_cb_data), &vs_cb_data);
+ ps_cb = create_upload_buffer(device, sizeof(ps_cb_data), &ps_cb_data);
+
+ vs_raw_buffer = create_upload_buffer(device, sizeof(vs_buffer_data), vs_buffer_data);
+ ps_raw_buffer = create_upload_buffer(device, sizeof(ps_buffer_data), ps_buffer_data);
+
+ vs_texture = create_default_texture(device,
+ 1, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = vs_texture_data;
+ data.RowPitch = sizeof(vs_texture_data);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(vs_texture, &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, vs_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+
+ ps_texture = create_default_texture(device,
+ 1, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = ps_texture_data;
+ data.RowPitch = sizeof(ps_texture_data);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(ps_texture, &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, ps_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2);
+ ID3D12Device_CreateShaderResourceView(device, vs_texture, NULL,
+ get_cpu_descriptor_handle(&context, heap, 0));
+ ID3D12Device_CreateShaderResourceView(device, ps_texture, NULL,
+ get_cpu_descriptor_handle(&context, heap, 1));
+
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(vs_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list,
+ 1, ID3D12Resource_GetGPUVirtualAddress(ps_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootShaderResourceView(command_list,
+ 2, ID3D12Resource_GetGPUVirtualAddress(vs_raw_buffer));
+ ID3D12GraphicsCommandList_SetGraphicsRootShaderResourceView(command_list,
+ 3, ID3D12Resource_GetGPUVirtualAddress(ps_raw_buffer));
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list,
+ 4, get_gpu_descriptor_handle(&context, heap, 0));
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list,
+ 5, get_gpu_descriptor_handle(&context, heap, 1));
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12Resource_Release(vs_cb);
+ ID3D12Resource_Release(ps_cb);
+ ID3D12Resource_Release(vs_texture);
+ ID3D12Resource_Release(ps_texture);
+ ID3D12Resource_Release(vs_raw_buffer);
+ ID3D12Resource_Release(ps_raw_buffer);
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_create_null_descriptors(void)
+{
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc;
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ D3D12_DESCRIPTOR_HEAP_DESC heap_desc;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12Device *device;
+ HRESULT hr;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+
+ heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
+ heap_desc.NumDescriptors = 16;
+ heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
+ heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc,
+ &IID_ID3D12DescriptorHeap, (void **)&heap);
+ ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr);
+
+ cbv_desc.BufferLocation = 0;
+ cbv_desc.SizeInBytes = 0;
+ ID3D12Device_CreateConstantBufferView(device, &cbv_desc,
+ get_cpu_descriptor_handle(&context, heap, 0));
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_R32_TYPELESS;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.Buffer.FirstElement = 0;
+ srv_desc.Buffer.NumElements = 1;
+ srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_RAW;
+ ID3D12Device_CreateShaderResourceView(device, NULL, &srv_desc,
+ get_cpu_descriptor_handle(&context, heap, 1));
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.Texture2D.MipLevels = 1;
+ ID3D12Device_CreateShaderResourceView(device, NULL, &srv_desc,
+ get_cpu_descriptor_handle(&context, heap, 2));
+
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = DXGI_FORMAT_R32_UINT;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.FirstElement = 0;
+ uav_desc.Buffer.NumElements = 1;
+ ID3D12Device_CreateUnorderedAccessView(device, NULL, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, heap, 3));
+
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = DXGI_FORMAT_R32_UINT;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE2D;
+ uav_desc.Texture2D.MipSlice = 0;
+ uav_desc.Texture2D.PlaneSlice = 0;
+ ID3D12Device_CreateUnorderedAccessView(device, NULL, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, heap, 3));
+
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_null_cbv(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ D3D12_DESCRIPTOR_RANGE descriptor_range;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int index;
+ HRESULT hr;
+
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ uint index;
+
+ cbuffer null_cb
+ {
+ float4 data[1024];
+ };
+
+ float4 main() : SV_Target
+ {
+ return data[index];
+ }
+#endif
+ 0x43425844, 0xa69026e2, 0xccf934be, 0x11f0a922, 0x95e9ab51, 0x00000001, 0x000000f0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000078, 0x00000050, 0x0000001e,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000859, 0x00208e46, 0x00000001,
+ 0x00000400, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x06000036, 0x00100012,
+ 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x07000036, 0x001020f2, 0x00000000, 0x04208e46,
+ 0x00000001, 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+ device = context.device;
+
+ descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV;
+ descriptor_range.NumDescriptors = 1;
+ descriptor_range.BaseShaderRegister = 1;
+ descriptor_range.RegisterSpace = 0;
+ descriptor_range.OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 1;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);
+ root_signature_desc.pParameters = root_parameters;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 16);
+
+ cbv_desc.BufferLocation = 0;
+ cbv_desc.SizeInBytes = 0; /* Size doesn't appear to matter for NULL CBV. */
+ ID3D12Device_CreateConstantBufferView(device, &cbv_desc,
+ ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap));
+
+ for (index = 0; index < 1200; index += 100)
+ {
+ vkd3d_test_set_context("index %u", index);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap));
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 1, &index, 0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_null_srv(void)
+{
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ struct uvec4 location;
+ ID3D12Device *device;
+ unsigned int i, j;
+
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const DWORD ps_sample_code[] =
+ {
+#if 0
+ Texture2D t;
+ SamplerState s;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t.Sample(s, float2(position.x / 32.0f, position.y / 32.0f));
+ }
+#endif
+ 0x43425844, 0xe096fa11, 0xeb01c081, 0x961588d4, 0x27c031af, 0x00000001, 0x00000140, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a4, 0x00000050,
+ 0x00000029, 0x0100086a, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000,
+ 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002,
+ 0x3d000000, 0x3d000000, 0x00000000, 0x00000000, 0x8b000045, 0x800000c2, 0x00155543, 0x001020f2,
+ 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_sample = {ps_sample_code, sizeof(ps_sample_code)};
+ static const DWORD ps_ld_code[] =
+ {
+#if 0
+ Texture2D t;
+
+ uint4 location;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t.Load(location.xyz);
+ }
+#endif
+ 0x43425844, 0xfa13670e, 0x291af510, 0xc253cc12, 0x9474950b, 0x00000001, 0x00000100, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050,
+ 0x00000019, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04001858, 0x00107000,
+ 0x00000000, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x8a00002d, 0x800000c2, 0x00155543,
+ 0x001020f2, 0x00000000, 0x00208a46, 0x00000000, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_ld = {ps_ld_code, sizeof(ps_ld_code)};
+ static const DWORD ps_buffer_code[] =
+ {
+#if 0
+ ByteAddressBuffer t;
+
+ uint location;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t.Load(location);
+ }
+#endif
+ 0x43425844, 0x70170f6b, 0x16097169, 0x714f155c, 0x1e3d860f, 0x00000001, 0x00000118, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000007c, 0x00000050,
+ 0x0000001f, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x030000a1, 0x00107000,
+ 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x8a0000a5, 0x800002c2,
+ 0x00199983, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00107006, 0x00000000,
+ 0x05000056, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_buffer = {ps_buffer_code, sizeof(ps_buffer_code)};
+ static const DXGI_FORMAT formats[] =
+ {
+ DXGI_FORMAT_R32_FLOAT,
+ DXGI_FORMAT_R32_UINT,
+ DXGI_FORMAT_R8G8B8A8_UNORM,
+ };
+ /* component mapping is ignored for NULL SRVs */
+ static const unsigned int component_mappings[] =
+ {
+ D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING,
+ D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1),
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+ device = context.device;
+
+ context.root_signature = create_texture_root_signature(context.device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 4, 0);
+
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps_sample, NULL);
+
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 16);
+
+ for (i = 0; i < ARRAY_SIZE(formats); ++i)
+ {
+ for (j = 0; j < ARRAY_SIZE(component_mappings); ++j)
+ {
+ vkd3d_test_set_context("format %#x, component mapping %#x", formats[i], component_mappings[j]);
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = formats[i];
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+ srv_desc.Shader4ComponentMapping = component_mappings[j];
+ srv_desc.Texture2D.MipLevels = 1;
+ ID3D12Device_CreateShaderResourceView(device, NULL, &srv_desc,
+ ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap));
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap));
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps_ld, NULL);
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.Texture2D.MipLevels = 1;
+ ID3D12Device_CreateShaderResourceView(device, NULL, &srv_desc,
+ ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap));
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap));
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ location.x = 10;
+ location.y = 20;
+ location.z = 0;
+ location.w = 0;
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &location, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0);
+
+ /* buffer */
+ ID3D12PipelineState_Release(context.pipeline_state);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps_buffer, NULL);
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_R32_TYPELESS;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.Buffer.FirstElement = 0;
+ srv_desc.Buffer.NumElements = 1024;
+ srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_RAW;
+ ID3D12Device_CreateShaderResourceView(device, NULL, &srv_desc,
+ ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap));
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap));
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ location.x = 0;
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &location, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0);
+
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_null_uav(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[1];
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ const D3D12_SHADER_BYTECODE *current_ps;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ ID3D12DescriptorHeap *uav_heap;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const DWORD ps_ld_texture_code[] =
+ {
+#if 0
+ RWTexture2D<float> u;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ float2 s;
+ u.GetDimensions(s.x, s.y);
+ return u[s * float2(position.x / 640.0f, position.y / 480.0f)];
+ }
+#endif
+ 0x43425844, 0x85c096ab, 0x210d7572, 0xdb1951af, 0x4dadced7, 0x00000001, 0x00000194, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f8, 0x00000050,
+ 0x0000003e, 0x0100086a, 0x0400189c, 0x0011e000, 0x00000001, 0x00005555, 0x04002064, 0x00101032,
+ 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x8900003d,
+ 0x800000c2, 0x00155543, 0x00100032, 0x00000000, 0x00004001, 0x00000000, 0x0011ee46, 0x00000001,
+ 0x07000038, 0x001000f2, 0x00000000, 0x00100546, 0x00000000, 0x00101546, 0x00000000, 0x0a000038,
+ 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x3b088889,
+ 0x3b088889, 0x0500001c, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x890000a3, 0x800000c2,
+ 0x00155543, 0x00100012, 0x00000000, 0x00100e46, 0x00000000, 0x0011ee46, 0x00000001, 0x05000036,
+ 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_ld_texture = {ps_ld_texture_code, sizeof(ps_ld_texture_code)};
+ static const DWORD ps_ld_buffer_code[] =
+ {
+#if 0
+ RWByteAddressBuffer u;
+
+ uint location;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return u.Load(4 * location);
+ }
+#endif
+ 0x43425844, 0xde636789, 0x7bc99233, 0x8b0609b6, 0x4b9a958e, 0x00000001, 0x00000134, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000098, 0x00000050,
+ 0x00000026, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300009d, 0x0011e000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x08000029, 0x00100012,
+ 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x890000a5, 0x800002c2,
+ 0x00199983, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0011e006, 0x00000001, 0x05000056,
+ 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_ld_buffer = {ps_ld_buffer_code, sizeof(ps_ld_buffer_code)};
+ static const struct test
+ {
+ const D3D12_SHADER_BYTECODE *ps;
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ uint32_t location;
+ }
+ tests[] =
+ {
+ {&ps_ld_texture, {DXGI_FORMAT_R32_UINT, D3D12_UAV_DIMENSION_TEXTURE2D}, 0},
+ {&ps_ld_buffer,
+ {DXGI_FORMAT_R32_TYPELESS, D3D12_UAV_DIMENSION_BUFFER, .Buffer = {0, 1024, .Flags = D3D12_BUFFER_UAV_FLAG_RAW}},
+ 0},
+ {&ps_ld_buffer,
+ {DXGI_FORMAT_R32_TYPELESS, D3D12_UAV_DIMENSION_BUFFER, .Buffer = {0, 1024, .Flags = D3D12_BUFFER_UAV_FLAG_RAW}},
+ 1024},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 1;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 1;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ uav_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+
+ current_ps = NULL;
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ const struct test *test = &tests[i];
+
+ vkd3d_test_set_context("Test %u", i);
+
+ if (current_ps != test->ps)
+ {
+ if (context.pipeline_state)
+ ID3D12PipelineState_Release(context.pipeline_state);
+ current_ps = tests[i].ps;
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, current_ps, NULL);
+ }
+
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(uav_heap);
+ ID3D12Device_CreateUnorderedAccessView(device, NULL, NULL, &test->uav_desc, cpu_handle);
+
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &uav_heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(uav_heap));
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(command_list, 1, test->location, 0);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12DescriptorHeap_Release(uav_heap);
+ destroy_test_context(&context);
+}
+
+static void test_null_vbv(void)
+{
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ D3D12_VERTEX_BUFFER_VIEW vbv[2];
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *vb;
+
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const DWORD vs_code[] =
+ {
+#if 0
+ struct vs_data
+ {
+ float4 pos : SV_POSITION;
+ float4 color : COLOR;
+ };
+
+ void main(in struct vs_data vs_input, out struct vs_data vs_output)
+ {
+ vs_output.pos = vs_input.pos;
+ vs_output.color = vs_input.color;
+ }
+#endif
+ 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f,
+ 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040,
+ 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067,
+ 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2,
+ 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ struct ps_data
+ {
+ float4 pos : SV_POSITION;
+ float4 color : COLOR;
+ };
+
+ float4 main(struct ps_data ps_input) : SV_Target
+ {
+ return ps_input.color;
+ }
+#endif
+ 0x43425844, 0x89803e59, 0x3f798934, 0xf99181df, 0xf5556512, 0x00000001, 0x000000f4, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040,
+ 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036,
+ 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const struct vec4 positions[] =
+ {
+ {-1.0f, -1.0f, 0.0f, 1.0f},
+ {-1.0f, 1.0f, 0.0f, 1.0f},
+ { 1.0f, -1.0f, 0.0f, 1.0f},
+ { 1.0f, 1.0f, 0.0f, 1.0f},
+ };
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_empty_root_signature(context.device,
+ D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT);
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout);
+
+ vb = create_upload_buffer(context.device, sizeof(positions), positions);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+
+ vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv[0].StrideInBytes = sizeof(*positions);
+ vbv[0].SizeInBytes = sizeof(positions);
+ vbv[1] = vbv[0];
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ vbv[1].BufferLocation = 0;
+ vbv[1].StrideInBytes = 0;
+ vbv[1].SizeInBytes = 0;
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0);
+
+ ID3D12Resource_Release(vb);
+ destroy_test_context(&context);
+}
+
+#define check_copyable_footprints(a, b, c, d, e, f, g, h) \
+ check_copyable_footprints_(__LINE__, a, b, c, d, e, f, g, h)
+static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_DESC *desc,
+ unsigned int sub_resource_idx, unsigned int sub_resource_count, uint64_t base_offset,
+ const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts, const UINT *row_counts,
+ const uint64_t *row_sizes, uint64_t *total_size)
+{
+ unsigned int miplevel, width, height, depth, row_count, row_size, row_pitch;
+ uint64_t offset, size, total;
+ unsigned int i;
+
+ offset = total = 0;
+ for (i = 0; i < sub_resource_count; ++i)
+ {
+ miplevel = (sub_resource_idx + i) % desc->MipLevels;
+ width = align(max(1, desc->Width >> miplevel), format_block_width(desc->Format));
+ height = align(max(1, desc->Height >> miplevel), format_block_height(desc->Format));
+ depth = desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D ? desc->DepthOrArraySize : 1;
+ depth = max(1, depth >> miplevel);
+ row_count = height / format_block_height(desc->Format);
+ row_size = (width / format_block_width(desc->Format)) * format_size(desc->Format);
+ row_pitch = align(row_size, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT);
+
+ if (layouts)
+ {
+ const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *l = &layouts[i];
+ const D3D12_SUBRESOURCE_FOOTPRINT *f = &l->Footprint;
+
+ ok_(line)(l->Offset == base_offset + offset,
+ "Got offset %"PRIu64", expected %"PRIu64".\n", l->Offset, base_offset + offset);
+ ok_(line)(f->Format == desc->Format, "Got format %#x, expected %#x.\n", f->Format, desc->Format);
+ ok_(line)(f->Width == width, "Got width %u, expected %u.\n", f->Width, width);
+ ok_(line)(f->Height == height, "Got height %u, expected %u.\n", f->Height, height);
+ ok_(line)(f->Depth == depth, "Got depth %u, expected %u.\n", f->Depth, depth);
+ ok_(line)(f->RowPitch == row_pitch, "Got row pitch %u, expected %u.\n", f->RowPitch, row_pitch);
+ }
+
+ if (row_counts)
+ ok_(line)(row_counts[i] == row_count, "Got row count %u, expected %u.\n", row_counts[i], row_count);
+
+ if (row_sizes)
+ ok_(line)(row_sizes[i] == row_size, "Got row size %"PRIu64", expected %u.\n", row_sizes[i], row_size);
+
+ size = max(0, row_count - 1) * row_pitch + row_size;
+ size = max(0, depth - 1) * align(size, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT) + size;
+
+ total = offset + size;
+ offset = align(total, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT);
+ }
+
+ if (total_size)
+ ok_(line)(*total_size == total, "Got total size %"PRIu64", expected %"PRIu64".\n", *total_size, total);
+}
+
+static void test_get_copyable_footprints(void)
+{
+ D3D12_PLACED_SUBRESOURCE_FOOTPRINT layouts[10];
+ uint64_t row_sizes[10], total_size;
+ D3D12_RESOURCE_DESC resource_desc;
+ unsigned int sub_resource_count;
+ unsigned int i, j, k, l;
+ ID3D12Device *device;
+ UINT row_counts[10];
+ ULONG refcount;
+
+ static const struct
+ {
+ D3D12_RESOURCE_DIMENSION dimension;
+ unsigned int width;
+ unsigned int height;
+ unsigned int depth_or_array_size;
+ unsigned int miplevel_count;
+ bool test_with_compressed;
+ }
+ resources[] =
+ {
+ {D3D12_RESOURCE_DIMENSION_BUFFER, 4, 1, 1, 1, false},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE1D, 4, 1, 1, 1, false},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE1D, 4, 1, 1, 2, false},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE1D, 3, 1, 1, 1, false},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE1D, 4, 1, 2, 1, false},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 4, 4, 1, 1, true},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 4, 4, 2, 1, true},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 4, 4, 1, 2, true},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 3, 1, 1, 2, false},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 3, 2, 1, 2, false},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 3, 1, 1, 1, false},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 3, 2, 1, 1, false},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE3D, 4, 4, 1, 1, true},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE3D, 4, 4, 2, 1, true},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE3D, 4, 4, 2, 2, true},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE3D, 8, 8, 8, 4, true},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE3D, 3, 2, 2, 2, false},
+ };
+ static const struct
+ {
+ DXGI_FORMAT format;
+ bool is_compressed;
+ }
+ formats[] =
+ {
+ {DXGI_FORMAT_R32G32B32A32_FLOAT, false},
+ {DXGI_FORMAT_R32G32B32A32_UINT, false},
+ {DXGI_FORMAT_R32_UINT, false},
+ {DXGI_FORMAT_R8G8B8A8_UNORM, false},
+ {DXGI_FORMAT_BC1_UNORM, true},
+ {DXGI_FORMAT_BC2_UNORM, true},
+ {DXGI_FORMAT_BC3_UNORM, true},
+ {DXGI_FORMAT_BC4_UNORM, true},
+ {DXGI_FORMAT_BC5_UNORM, true},
+ {DXGI_FORMAT_BC6H_UF16, true},
+ {DXGI_FORMAT_BC6H_SF16, true},
+ {DXGI_FORMAT_BC7_UNORM, true},
+ };
+ static const uint64_t base_offsets[] =
+ {
+ 0, 1, 2, 30, 255, 512, 513, 600, 4096, 4194304, ~(uint64_t)0,
+ };
+ static const struct
+ {
+ D3D12_RESOURCE_DESC resource_desc;
+ unsigned int sub_resource_idx;
+ unsigned int sub_resource_count;
+ }
+ invalid_descs[] =
+ {
+ {
+ {D3D12_RESOURCE_DIMENSION_BUFFER, 0, 3, 2, 1, 1, DXGI_FORMAT_R32_UINT,
+ {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1,
+ },
+ {
+ {D3D12_RESOURCE_DIMENSION_TEXTURE1D, 0, 4, 2, 1, 1, DXGI_FORMAT_R32_UINT,
+ {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1,
+ },
+ {
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 4, 4, 1, 1, DXGI_FORMAT_R32_UINT,
+ {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 2,
+ },
+ {
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 3, 1, 1, 2, DXGI_FORMAT_BC1_UNORM,
+ {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 2,
+ },
+ {
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 3, 1, 1, 1, DXGI_FORMAT_BC1_UNORM,
+ {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1,
+ },
+ {
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 3, 1, 1, 2, DXGI_FORMAT_BC7_UNORM,
+ {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 2,
+ },
+ {
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 3, 1, 1, 1, DXGI_FORMAT_BC7_UNORM,
+ {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1,
+ },
+ {
+ {D3D12_RESOURCE_DIMENSION_TEXTURE3D, 3, 2, 2, 2, 2, DXGI_FORMAT_BC1_UNORM,
+ {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1,
+ },
+ };
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(resources); ++i)
+ {
+ const bool is_buffer = resources[i].dimension == D3D12_RESOURCE_DIMENSION_BUFFER;
+
+ resource_desc.Dimension = resources[i].dimension;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = resources[i].width;
+ resource_desc.Height = resources[i].height;
+ resource_desc.DepthOrArraySize = resources[i].depth_or_array_size;
+ resource_desc.MipLevels = resources[i].miplevel_count;
+
+ for (j = 0; j < ARRAY_SIZE(formats); ++j)
+ {
+ if (formats[j].is_compressed && !resources[i].test_with_compressed)
+ continue;
+ if (is_buffer && j > 0)
+ continue;
+
+ if (is_buffer)
+ resource_desc.Format = DXGI_FORMAT_UNKNOWN;
+ else
+ resource_desc.Format = formats[j].format;
+
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = is_buffer ? D3D12_TEXTURE_LAYOUT_ROW_MAJOR : D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_NONE;
+
+ sub_resource_count = resource_desc.MipLevels;
+ if (resources[i].dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D)
+ sub_resource_count *= resource_desc.DepthOrArraySize;
+ assert(sub_resource_count <= ARRAY_SIZE(layouts));
+
+ for (k = 0; k < ARRAY_SIZE(base_offsets); ++k)
+ {
+ vkd3d_test_set_context("resource %u, format %#x, offset %#"PRIx64,
+ i, resource_desc.Format, base_offsets[k]);
+
+ memset(layouts, 0, sizeof(layouts));
+ memset(row_counts, 0, sizeof(row_counts));
+ memset(row_sizes, 0, sizeof(row_sizes));
+ total_size = 0;
+ ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k],
+ layouts, row_counts, row_sizes, &total_size);
+ check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k],
+ layouts, row_counts, row_sizes, &total_size);
+
+ memset(layouts, 0, sizeof(layouts));
+ ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k],
+ layouts, NULL, NULL, NULL);
+ check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k],
+ layouts, NULL, NULL, NULL);
+ memset(row_counts, 0, sizeof(row_counts));
+ ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k],
+ NULL, row_counts, NULL, NULL);
+ check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k],
+ NULL, row_counts, NULL, NULL);
+ memset(row_sizes, 0, sizeof(row_sizes));
+ ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k],
+ NULL, NULL, row_sizes, NULL);
+ check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k],
+ NULL, NULL, row_sizes, NULL);
+ total_size = 0;
+ ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k],
+ NULL, NULL, NULL, &total_size);
+ check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k],
+ NULL, NULL, NULL, &total_size);
+
+ for (l = 0; l < sub_resource_count; ++l)
+ {
+ vkd3d_test_set_context("resource %u, format %#x, offset %#"PRIx64", sub-resource %u",
+ i, resource_desc.Format, base_offsets[k], l);
+
+ memset(layouts, 0, sizeof(layouts));
+ memset(row_counts, 0, sizeof(row_counts));
+ memset(row_sizes, 0, sizeof(row_sizes));
+ total_size = 0;
+ ID3D12Device_GetCopyableFootprints(device, &resource_desc, l, 1, base_offsets[k],
+ layouts, row_counts, row_sizes, &total_size);
+ check_copyable_footprints(&resource_desc, l, 1, base_offsets[k],
+ layouts, row_counts, row_sizes, &total_size);
+ }
+ }
+ }
+ }
+ vkd3d_test_set_context(NULL);
+
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 512;
+ resource_desc.Height = 512;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ resource_desc.SampleDesc.Count = 4;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+ memset(layouts, 0, sizeof(layouts));
+ memset(row_counts, 0, sizeof(row_counts));
+ memset(row_sizes, 0, sizeof(row_sizes));
+ total_size = 0;
+ ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, 1, 0,
+ layouts, row_counts, row_sizes, &total_size);
+ check_copyable_footprints(&resource_desc, 0, 1, 0,
+ layouts, row_counts, row_sizes, &total_size);
+
+ for (i = 0; i < ARRAY_SIZE(invalid_descs); ++i)
+ {
+ resource_desc = invalid_descs[i].resource_desc;
+
+ memset(layouts, 0, sizeof(layouts));
+ memset(row_counts, 0, sizeof(row_counts));
+ memset(row_sizes, 0, sizeof(row_sizes));
+ total_size = 0;
+ ID3D12Device_GetCopyableFootprints(device, &resource_desc,
+ invalid_descs[i].sub_resource_idx, invalid_descs[i].sub_resource_count, 0,
+ layouts, row_counts, row_sizes, &total_size);
+
+ for (j = 0; j < invalid_descs[i].sub_resource_count; ++j)
+ {
+ const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *l = &layouts[j];
+
+ ok(l->Offset == ~(uint64_t)0, "Got offset %"PRIu64".\n", l->Offset);
+ ok(l->Footprint.Format == ~(DXGI_FORMAT)0, "Got format %#x.\n", l->Footprint.Format);
+ ok(l->Footprint.Width == ~0u, "Got width %u.\n", l->Footprint.Width);
+ ok(l->Footprint.Height == ~0u, "Got height %u.\n", l->Footprint.Height);
+ ok(l->Footprint.Depth == ~0u, "Got depth %u.\n", l->Footprint.Depth);
+ ok(l->Footprint.RowPitch == ~0u, "Got row pitch %u.\n", l->Footprint.RowPitch);
+
+ ok(row_counts[j] == ~0u, "Got row count %u.\n", row_counts[j]);
+ ok(row_sizes[j] == ~(uint64_t)0, "Got row size %"PRIu64".\n", row_sizes[j]);
+ }
+
+ ok(total_size == ~(uint64_t)0, "Got total size %"PRIu64".\n", total_size);
+ }
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_depth_clip(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ struct depth_stencil_resource ds;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *vb;
+ unsigned int i;
+ float depth;
+ HRESULT hr;
+
+ static const DWORD vs_code[] =
+ {
+#if 0
+ float4 main(float4 p : POSITION) : SV_Position
+ {
+ return p;
+ }
+#endif
+ 0x43425844, 0x92767590, 0x06a6dba7, 0x0ae078b2, 0x7b5eb8f6, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040,
+ 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_depth_code[] =
+ {
+#if 0
+ float depth;
+
+ float4 main(float4 p : SV_Position, out float out_depth : SV_Depth) : SV_Target
+ {
+ out_depth = depth;
+ return float4(0, 1, 0, 1);
+ }
+#endif
+ 0x43425844, 0x6744db20, 0x3e266cd1, 0xc50630b3, 0xd7455b94, 0x00000001, 0x00000120, 0x00000003,
+ 0x0000002c, 0x00000060, 0x000000b4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000042, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, 0x00000e01,
+ 0x545f5653, 0x65677261, 0x56530074, 0x7065445f, 0xab006874, 0x52444853, 0x00000064, 0x00000040,
+ 0x00000019, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000065, 0x0000c001, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x3f800000,
+ 0x00000000, 0x3f800000, 0x05000036, 0x0000c001, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_depth = {ps_depth_code, sizeof(ps_depth_code)};
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"position", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const struct vec4 vertices[] =
+ {
+ {-1.0f, -1.0f, 0.0f, 1.0f},
+ {-1.0f, 1.0f, 0.0f, 1.0f},
+ { 1.0f, -1.0f, 0.0f, 1.0f},
+ { 1.0f, 1.0f, 0.0f, 1.0f},
+
+ {-1.0f, -1.0f, 0.5f, 1.0f},
+ {-1.0f, 1.0f, 0.5f, 1.0f},
+ { 1.0f, -1.0f, 0.5f, 1.0f},
+ { 1.0f, 1.0f, 0.5f, 1.0f},
+
+ {-1.0f, -1.0f, -0.5f, 1.0f},
+ {-1.0f, 1.0f, -0.5f, 1.0f},
+ { 1.0f, -1.0f, -0.5f, 1.0f},
+ { 1.0f, 1.0f, -0.5f, 1.0f},
+
+ {-1.0f, -1.0f, 1.0f, 1.0f},
+ {-1.0f, 1.0f, 1.0f, 1.0f},
+ { 1.0f, -1.0f, 1.0f, 1.0f},
+ { 1.0f, 1.0f, 1.0f, 1.0f},
+
+ {-1.0f, -1.0f, 1.5f, 1.0f},
+ {-1.0f, 1.0f, 1.5f, 1.0f},
+ { 1.0f, -1.0f, 1.5f, 1.0f},
+ { 1.0f, 1.0f, 1.5f, 1.0f},
+ };
+ struct result
+ {
+ uint32_t expected_color;
+ float expected_depth;
+ };
+ static const struct
+ {
+ struct result depth_clip;
+ struct result no_depth_clip;
+ }
+ tests[] =
+ {
+ {{0xff00ff00, 0.0f }, {0xff00ff00, 0.0f}},
+ {{0xff00ff00, 0.5f }, {0xff00ff00, 0.5f}},
+ {{0xffffffff, 0.125f}, {0xff00ff00, 0.0f}},
+ {{0xff00ff00, 1.0f }, {0xff00ff00, 1.0f}},
+ {{0xffffffff, 0.125f}, {0xff00ff00, 1.0f}},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_32bit_constants_root_signature_(__LINE__, context.device,
+ 0, 4, D3D12_SHADER_VISIBILITY_PIXEL, D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT);
+
+ init_depth_stencil(&ds, context.device, 32, 32, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL);
+
+ vb = create_upload_buffer(context.device, sizeof(vertices), vertices);
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*vertices);
+ vbv.SizeInBytes = sizeof(vertices);
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, &vs, NULL, &input_layout);
+ pso_desc.RasterizerState.DepthClipEnable = true;
+ pso_desc.DepthStencilState.DepthEnable = true;
+ pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL;
+ pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS;
+ pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ const struct result *result = &tests[i].depth_clip;
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list,
+ ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 0.125f, 0, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 4 * i, 0);
+
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(ds.texture, 0, queue, command_list, result->expected_depth, 2);
+ reset_command_list(command_list, context.allocator);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, result->expected_color, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ pso_desc.RasterizerState.DepthClipEnable = false;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ const struct result *result = &tests[i].no_depth_clip;
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list,
+ ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 0.125f, 0, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 4 * i, 0);
+
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(ds.texture, 0, queue, command_list, result->expected_depth, 2);
+ reset_command_list(command_list, context.allocator);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, result->expected_color, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ pso_desc.PS = ps_depth;
+ pso_desc.RasterizerState.DepthClipEnable = true;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list,
+ ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 0.125f, 0, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ depth = 2.0f;
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 1, &depth, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ bug_if(!is_depth_clip_enable_supported(context.device))
+ check_sub_resource_float(ds.texture, 0, queue, command_list, 1.0f, 2);
+ reset_command_list(command_list, context.allocator);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12Resource_Release(vb);
+ destroy_depth_stencil(&ds);
+ destroy_test_context(&context);
+}
+
+#define check_depth_stencil_sampling(a, b, c, d, e, f, g) \
+ check_depth_stencil_sampling_(__LINE__, a, b, c, d, e, f, g)
+static void check_depth_stencil_sampling_(unsigned int line, struct test_context *context,
+ ID3D12PipelineState *pso, ID3D12Resource *cb, ID3D12Resource *texture,
+ D3D12_CPU_DESCRIPTOR_HANDLE dsv_handle, ID3D12DescriptorHeap *srv_heap,
+ float expected_value)
+{
+ static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f};
+ ID3D12GraphicsCommandList *command_list;
+ ID3D12CommandQueue *queue;
+ HRESULT hr;
+
+ command_list = context->list;
+ queue = context->queue;
+
+ transition_sub_resource_state(command_list, texture, 0,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, black, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, false, NULL);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &srv_heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(srv_heap));
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_sub_resource_state(command_list, context->render_target, 0,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float_(line, context->render_target, 0, queue, command_list, expected_value, 2);
+
+ reset_command_list(command_list, context->allocator);
+ transition_sub_resource_state(command_list, context->render_target, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ transition_sub_resource_state(command_list, texture, 0,
+ D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE);
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok_(line)(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+ exec_command_list(queue, command_list);
+ wait_queue_idle(context->device, queue);
+}
+
+static void test_depth_stencil_sampling(void)
+{
+ ID3D12PipelineState *pso_compare, *pso_depth, *pso_stencil, *pso_depth_stencil;
+ D3D12_CPU_DESCRIPTOR_HANDLE dsv_handle, srv_cpu_handle;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_STATIC_SAMPLER_DESC sampler_desc[2];
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_range;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ ID3D12GraphicsCommandList *command_list;
+ struct depth_stencil_resource ds;
+ ID3D12DescriptorHeap *srv_heap;
+ struct test_context_desc desc;
+ ID3D12Resource *cb, *texture;
+ unsigned int descriptor_size;
+ struct test_context context;
+ struct vec4 ps_constant;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD ps_compare_code[] =
+ {
+#if 0
+ Texture2D t;
+ SamplerComparisonState s : register(s1);
+
+ float ref;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t.SampleCmp(s, float2(position.x / 640.0f, position.y / 480.0f), ref);
+ }
+#endif
+ 0x43425844, 0xbea899fb, 0xcbeaa744, 0xbad6daa0, 0xd4363d30, 0x00000001, 0x00000164, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000c8, 0x00000040,
+ 0x00000032, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300085a, 0x00106000, 0x00000001,
+ 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001,
+ 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000,
+ 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x0c000046,
+ 0x00100012, 0x00000000, 0x00100046, 0x00000000, 0x00107006, 0x00000000, 0x00106000, 0x00000001,
+ 0x0020800a, 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_compare = {ps_compare_code, sizeof(ps_compare_code)};
+ static const DWORD ps_sample_code[] =
+ {
+#if 0
+ Texture2D t;
+ SamplerState s;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t.Sample(s, float2(position.x / 640.0f, position.y / 480.0f));
+ }
+#endif
+ 0x43425844, 0x7472c092, 0x5548f00e, 0xf4e007f1, 0x5970429c, 0x00000001, 0x00000134, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040,
+ 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555,
+ 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068,
+ 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd,
+ 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000,
+ 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_sample = {ps_sample_code, sizeof(ps_sample_code)};
+ static const DWORD ps_stencil_code[] =
+ {
+#if 0
+ Texture2D<uint4> t : register(t1);
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ float2 s;
+ t.GetDimensions(s.x, s.y);
+ return t.Load(int3(float3(s.x * position.x / 640.0f, s.y * position.y / 480.0f, 0))).y;
+ }
+#endif
+ 0x43425844, 0x78574912, 0x1b7763f5, 0x0124de83, 0x39954d6c, 0x00000001, 0x000001a0, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000104, 0x00000040,
+ 0x00000041, 0x04001858, 0x00107000, 0x00000001, 0x00004444, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0700003d, 0x001000f2,
+ 0x00000000, 0x00004001, 0x00000000, 0x00107e46, 0x00000001, 0x07000038, 0x00100032, 0x00000000,
+ 0x00100046, 0x00000000, 0x00101046, 0x00000000, 0x0a000038, 0x00100032, 0x00000000, 0x00100046,
+ 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x0500001b, 0x00100032,
+ 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x0700002d, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000,
+ 0x00107e46, 0x00000001, 0x05000056, 0x001020f2, 0x00000000, 0x00100556, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_stencil = {ps_stencil_code, sizeof(ps_stencil_code)};
+ static const DWORD ps_depth_stencil_code[] =
+ {
+#if 0
+ SamplerState samp;
+ Texture2D depth_tex;
+ Texture2D<uint4> stencil_tex;
+
+ float main(float4 position: SV_Position) : SV_Target
+ {
+ float2 s, p;
+ float depth, stencil;
+ depth_tex.GetDimensions(s.x, s.y);
+ p = float2(s.x * position.x / 640.0f, s.y * position.y / 480.0f);
+ depth = depth_tex.Sample(samp, p).r;
+ stencil = stencil_tex.Load(int3(float3(p.x, p.y, 0))).y;
+ return depth + stencil;
+ }
+#endif
+ 0x43425844, 0x348f8377, 0x977d1ee0, 0x8cca4f35, 0xff5c5afc, 0x00000001, 0x000001fc, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x00000e01, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000160, 0x00000040,
+ 0x00000058, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555,
+ 0x04001858, 0x00107000, 0x00000001, 0x00004444, 0x04002064, 0x00101032, 0x00000000, 0x00000001,
+ 0x03000065, 0x00102012, 0x00000000, 0x02000068, 0x00000002, 0x0700003d, 0x001000f2, 0x00000000,
+ 0x00004001, 0x00000000, 0x00107e46, 0x00000000, 0x07000038, 0x00100032, 0x00000000, 0x00100046,
+ 0x00000000, 0x00101046, 0x00000000, 0x0a000038, 0x00100032, 0x00000000, 0x00100046, 0x00000000,
+ 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x0500001b, 0x00100032, 0x00000001,
+ 0x00100046, 0x00000000, 0x09000045, 0x001000f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46,
+ 0x00000000, 0x00106000, 0x00000000, 0x08000036, 0x001000c2, 0x00000001, 0x00004002, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x0700002d, 0x001000f2, 0x00000001, 0x00100e46, 0x00000001,
+ 0x00107e46, 0x00000001, 0x05000056, 0x00100022, 0x00000000, 0x0010001a, 0x00000001, 0x07000000,
+ 0x00102012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_depth_stencil = {ps_depth_stencil_code, sizeof(ps_depth_stencil_code)};
+ static const struct test
+ {
+ DXGI_FORMAT typeless_format;
+ DXGI_FORMAT dsv_format;
+ DXGI_FORMAT depth_view_format;
+ DXGI_FORMAT stencil_view_format;
+ }
+ tests[] =
+ {
+ {DXGI_FORMAT_R32G8X24_TYPELESS, DXGI_FORMAT_D32_FLOAT_S8X24_UINT,
+ DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS, DXGI_FORMAT_X32_TYPELESS_G8X24_UINT},
+ {DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT,
+ DXGI_FORMAT_R32_FLOAT},
+ {DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT,
+ DXGI_FORMAT_R24_UNORM_X8_TYPELESS, DXGI_FORMAT_X24_TYPELESS_G8_UINT},
+ {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_D16_UNORM,
+ DXGI_FORMAT_R16_UNORM},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 640;
+ desc.rt_height = 480;
+ desc.rt_format = DXGI_FORMAT_R32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+
+ sampler_desc[0].Filter = D3D12_FILTER_MIN_MAG_MIP_POINT;
+ sampler_desc[0].AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc[0].AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc[0].AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+ sampler_desc[0].MipLODBias = 0.0f;
+ sampler_desc[0].MaxAnisotropy = 0;
+ sampler_desc[0].ComparisonFunc = D3D12_COMPARISON_FUNC_NEVER;
+ sampler_desc[0].BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE;
+ sampler_desc[0].MinLOD = 0.0f;
+ sampler_desc[0].MaxLOD = 0.0f;
+ sampler_desc[0].ShaderRegister = 0;
+ sampler_desc[0].RegisterSpace = 0;
+ sampler_desc[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+
+ sampler_desc[1] = sampler_desc[0];
+ sampler_desc[1].Filter = D3D12_FILTER_COMPARISON_MIN_MAG_MIP_POINT;
+ sampler_desc[1].ComparisonFunc = D3D12_COMPARISON_FUNC_GREATER;
+ sampler_desc[1].ShaderRegister = 1;
+
+ descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_range.NumDescriptors = 2;
+ descriptor_range.BaseShaderRegister = 0;
+ descriptor_range.RegisterSpace = 0;
+ descriptor_range.OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[1].Descriptor.ShaderRegister = 0;
+ root_parameters[1].Descriptor.RegisterSpace = 0;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 2;
+ root_signature_desc.pStaticSamplers = sampler_desc;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ pso_compare = create_pipeline_state(device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps_compare, NULL);
+ pso_depth = create_pipeline_state(device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps_sample, NULL);
+ pso_stencil = create_pipeline_state(device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps_stencil, NULL);
+ pso_depth_stencil = create_pipeline_state(device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps_depth_stencil, NULL);
+
+ srv_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2);
+ descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(device,
+ D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ memset(&ps_constant, 0, sizeof(ps_constant));
+ cb = create_upload_buffer(device, sizeof(ps_constant), &ps_constant);
+
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ reset_command_list(command_list, context.allocator);
+
+ init_depth_stencil(&ds, device, context.render_target_desc.Width,
+ context.render_target_desc.Height, 1, 1, tests[i].typeless_format,
+ tests[i].dsv_format, NULL);
+ texture = ds.texture;
+ dsv_handle = ds.dsv_handle;
+
+ srv_cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(srv_heap);
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = tests[i].depth_view_format;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.Texture2D.MipLevels = 1;
+ ID3D12Device_CreateShaderResourceView(device, texture, &srv_desc, srv_cpu_handle);
+ srv_cpu_handle.ptr += descriptor_size;
+ ID3D12Device_CreateShaderResourceView(device, NULL, &srv_desc, srv_cpu_handle);
+
+ ps_constant.x = 0.5f;
+ update_buffer_data(cb, 0, sizeof(ps_constant), &ps_constant);
+
+ /* pso_compare */
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL);
+ check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f);
+
+ reset_command_list(command_list, context.allocator);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 0.0f, 0, 0, NULL);
+ check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 1.0f);
+
+ reset_command_list(command_list, context.allocator);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 0.5f, 0, 0, NULL);
+ check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f);
+
+ reset_command_list(command_list, context.allocator);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 0.6f, 0, 0, NULL);
+ check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f);
+
+ ps_constant.x = 0.7f;
+ update_buffer_data(cb, 0, sizeof(ps_constant), &ps_constant);
+
+ reset_command_list(command_list, context.allocator);
+ check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 1.0f);
+
+ /* pso_depth */
+ reset_command_list(command_list, context.allocator);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL);
+ check_depth_stencil_sampling(&context, pso_depth, cb, texture, dsv_handle, srv_heap, 1.0f);
+
+ reset_command_list(command_list, context.allocator);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 0.2f, 0, 0, NULL);
+ check_depth_stencil_sampling(&context, pso_depth, cb, texture, dsv_handle, srv_heap, 0.2f);
+
+ if (!tests[i].stencil_view_format)
+ {
+ destroy_depth_stencil(&ds);
+ continue;
+ }
+ if (is_amd_windows_device(device))
+ {
+ skip("Reads from depth/stencil shader resource views return stale values on some AMD drivers.\n");
+ destroy_depth_stencil(&ds);
+ continue;
+ }
+
+ srv_desc.Format = tests[i].stencil_view_format;
+ srv_desc.Texture2D.PlaneSlice = 1;
+ ID3D12Device_CreateShaderResourceView(device, texture, &srv_desc, srv_cpu_handle);
+
+ /* pso_stencil */
+ reset_command_list(command_list, context.allocator);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle,
+ D3D12_CLEAR_FLAG_STENCIL, 0.0f, 0, 0, NULL);
+ check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 0.0f);
+
+ reset_command_list(command_list, context.allocator);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle,
+ D3D12_CLEAR_FLAG_STENCIL, 0.0f, 100, 0, NULL);
+ check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 100.0f);
+
+ reset_command_list(command_list, context.allocator);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle,
+ D3D12_CLEAR_FLAG_STENCIL, 0.0f, 255, 0, NULL);
+ check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 255.0f);
+
+ /* pso_depth_stencil */
+ reset_command_list(command_list, context.allocator);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, 0.3f, 3, 0, NULL);
+ check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 3.3f);
+
+ reset_command_list(command_list, context.allocator);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, 1.0f, 3, 0, NULL);
+ check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 4.0f);
+
+ reset_command_list(command_list, context.allocator);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, 0.0f, 0, 0, NULL);
+ check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 0.0f);
+
+ destroy_depth_stencil(&ds);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12Resource_Release(cb);
+ ID3D12DescriptorHeap_Release(srv_heap);
+ ID3D12PipelineState_Release(pso_compare);
+ ID3D12PipelineState_Release(pso_depth);
+ ID3D12PipelineState_Release(pso_stencil);
+ ID3D12PipelineState_Release(pso_depth_stencil);
+ destroy_test_context(&context);
+}
+
+static void test_depth_load(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[2];
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ D3D12_ROOT_PARAMETER root_parameters[1];
+ ID3D12GraphicsCommandList *command_list;
+ ID3D12PipelineState *pipeline_state;
+ struct depth_stencil_resource ds;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *texture;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD cs_code[] =
+ {
+#if 0
+ Texture2D<float> t;
+ RWTexture2D<float> u;
+
+ [numthreads(1, 1, 1)]
+ void main(uint2 id : SV_GroupID)
+ {
+ u[id] = t[id];
+ }
+#endif
+ 0x43425844, 0x6ddce3d0, 0x24b47ad3, 0x7f6772d2, 0x6a644890, 0x00000001, 0x00000110, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000bc, 0x00050050, 0x0000002f, 0x0100086a,
+ 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x0400189c, 0x0011e000, 0x00000000, 0x00005555,
+ 0x0200005f, 0x00021032, 0x02000068, 0x00000001, 0x0400009b, 0x00000001, 0x00000001, 0x00000001,
+ 0x04000036, 0x00100032, 0x00000000, 0x00021046, 0x08000036, 0x001000c2, 0x00000000, 0x00004002,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8900002d, 0x800000c2, 0x00155543, 0x00100012,
+ 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x060000a4, 0x0011e0f2, 0x00000000,
+ 0x00021546, 0x00100006, 0x00000000, 0x0100003e,
+ };
+ static const DWORD ps_code[] =
+ {
+#if 0
+ Texture2D<float> t;
+
+ float main(float4 position : SV_Position) : SV_Target
+ {
+ return t[int2(position.x, position.y)];
+ }
+#endif
+ 0x43425844, 0x0beace24, 0x5e10b05b, 0x742de364, 0xb2b65d2b, 0x00000001, 0x00000140, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x00000e01, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000a4, 0x00000040,
+ 0x00000029, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x00102012, 0x00000000, 0x02000068, 0x00000001, 0x0500001b, 0x00100032,
+ 0x00000000, 0x00101046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x0700002d, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000,
+ 0x00107e46, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const float tests[] = {0.00f, 0.25f, 0.75f, 1.00f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[1].NumDescriptors = 1;
+ descriptor_ranges[1].BaseShaderRegister = 0;
+ descriptor_ranges[1].RegisterSpace = 0;
+ descriptor_ranges[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 2;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ pipeline_state = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2);
+
+ init_depth_stencil(&ds, device, context.render_target_desc.Width,
+ context.render_target_desc.Height, 1, 1, DXGI_FORMAT_R32_TYPELESS,
+ DXGI_FORMAT_D32_FLOAT, NULL);
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.Texture2D.MipLevels = 1;
+ ID3D12Device_CreateShaderResourceView(device, ds.texture, &srv_desc,
+ get_cpu_descriptor_handle(&context, heap, 0));
+
+ texture = create_default_texture(device, 32, 32, DXGI_FORMAT_R16_UNORM,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ ID3D12Device_CreateUnorderedAccessView(device, texture, NULL, NULL,
+ get_cpu_descriptor_handle(&context, heap, 1));
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, tests[i], 0, 0, NULL);
+ transition_sub_resource_state(command_list, ds.texture, 0,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap));
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap));
+ ID3D12GraphicsCommandList_Dispatch(command_list, 32, 32, 1);
+
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i], 2);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, texture, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint16(texture, 0, queue, command_list, tests[i] * UINT16_MAX, 2);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ transition_sub_resource_state(command_list, texture, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ transition_sub_resource_state(command_list, ds.texture, 0,
+ D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE);
+ }
+ vkd3d_test_set_context(NULL);
+
+ destroy_depth_stencil(&ds);
+ ID3D12Resource_Release(texture);
+ ID3D12DescriptorHeap_Release(heap);
+ ID3D12PipelineState_Release(pipeline_state);
+ destroy_test_context(&context);
+}
+
+static void test_depth_read_only_view(void)
+{
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_DEPTH_STENCIL_VIEW_DESC dsv_desc;
+ D3D12_CPU_DESCRIPTOR_HANDLE dsv_handle;
+ struct depth_stencil_resource ds;
+ struct test_context_desc desc;
+ D3D12_CLEAR_VALUE clear_value;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float4 color;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ return color;
+ }
+#endif
+ 0x43425844, 0xd18ead43, 0x8b8264c1, 0x9c0a062d, 0xfc843226, 0x00000001, 0x000000e0, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050,
+ 0x00000011, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2,
+ 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f};
+ static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_32bit_constants_root_signature(device,
+ 0, 4, D3D12_SHADER_VISIBILITY_PIXEL);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, &ps, NULL);
+ pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT;
+ pso_desc.DepthStencilState.DepthEnable = true;
+ pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ZERO;
+ pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_GREATER;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(SUCCEEDED(hr), "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_DSV, 1);
+
+ clear_value.Format = DXGI_FORMAT_D32_FLOAT;
+ clear_value.DepthStencil.Depth = 0.5f;
+ clear_value.DepthStencil.Stencil = 0;
+ init_depth_stencil(&ds, device, context.render_target_desc.Width,
+ context.render_target_desc.Height, 1, 1, DXGI_FORMAT_R32_TYPELESS,
+ DXGI_FORMAT_D32_FLOAT, &clear_value);
+ memset(&dsv_desc, 0, sizeof(dsv_desc));
+ dsv_desc.Format = DXGI_FORMAT_D32_FLOAT;
+ dsv_desc.ViewDimension = D3D12_DSV_DIMENSION_TEXTURE2D;
+ dsv_desc.Flags = D3D12_DSV_FLAG_READ_ONLY_DEPTH;
+ dsv_handle = get_cpu_descriptor_handle(&context, heap, 0);
+ ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, dsv_handle);
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 0.5f, 0, 0, NULL);
+ transition_sub_resource_state(command_list, ds.texture, 0,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_DEPTH_READ);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, &dsv_handle);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+
+ context.viewport.MinDepth = 0.6f;
+ context.viewport.MaxDepth = 0.6f;
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, green, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ context.viewport.MinDepth = 0.4f;
+ context.viewport.MaxDepth = 0.4f;
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, red, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, ds.texture, 0,
+ D3D12_RESOURCE_STATE_DEPTH_READ, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(ds.texture, 0, queue, command_list, 0.5f, 2);
+
+ destroy_depth_stencil(&ds);
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_stencil_load(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[2];
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ D3D12_ROOT_PARAMETER root_parameters[1];
+ ID3D12GraphicsCommandList *command_list;
+ ID3D12PipelineState *pipeline_state;
+ struct depth_stencil_resource ds;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ struct uvec4 uvec4 = {0};
+ ID3D12Resource *texture;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD cs_code[] =
+ {
+#if 0
+ Texture2D<uint4> t;
+ RWTexture2D<uint4> u;
+
+ [numthreads(1, 1, 1)]
+ void main(uint2 id : SV_GroupID)
+ {
+ u[id] = t[id];
+ }
+#endif
+ 0x43425844, 0x0b41fa64, 0xd64df766, 0xc4c98283, 0xb810dc2b, 0x00000001, 0x00000110, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000bc, 0x00050050, 0x0000002f, 0x0100086a,
+ 0x04001858, 0x00107000, 0x00000000, 0x00004444, 0x0400189c, 0x0011e000, 0x00000000, 0x00004444,
+ 0x0200005f, 0x00021032, 0x02000068, 0x00000001, 0x0400009b, 0x00000001, 0x00000001, 0x00000001,
+ 0x04000036, 0x00100032, 0x00000000, 0x00021046, 0x08000036, 0x001000c2, 0x00000000, 0x00004002,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8900002d, 0x800000c2, 0x00111103, 0x001000f2,
+ 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x060000a4, 0x0011e0f2, 0x00000000,
+ 0x00021546, 0x00100e46, 0x00000000, 0x0100003e,
+ };
+ static const DWORD ps_code[] =
+ {
+#if 0
+ Texture2D<uint4> t;
+
+ uint4 main(float4 position : SV_Position) : SV_Target
+ {
+ return t[int2(position.x, position.y)];
+ }
+#endif
+ 0x43425844, 0x9ad18dbc, 0x98de0e54, 0xe3c15d5b, 0xac8b580a, 0x00000001, 0x00000138, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000009c, 0x00000050,
+ 0x00000027, 0x0100086a, 0x04001858, 0x00107000, 0x00000000, 0x00004444, 0x04002064, 0x00101032,
+ 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0500001b,
+ 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8900002d, 0x800000c2, 0x00111103, 0x001020f2,
+ 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static unsigned int tests[] = {0, 50, 75, 100, 150, 200, 255};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_UINT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[1].NumDescriptors = 1;
+ descriptor_ranges[1].BaseShaderRegister = 0;
+ descriptor_ranges[1].RegisterSpace = 0;
+ descriptor_ranges[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 2;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ pipeline_state = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2);
+
+ init_depth_stencil(&ds, device, context.render_target_desc.Width,
+ context.render_target_desc.Height, 1, 1, DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, NULL);
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = DXGI_FORMAT_X24_TYPELESS_G8_UINT;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+ srv_desc.Shader4ComponentMapping = D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1,
+ D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1);
+ srv_desc.Texture2D.MipLevels = 1;
+ srv_desc.Texture2D.PlaneSlice = 1;
+ ID3D12Device_CreateShaderResourceView(device, ds.texture, &srv_desc,
+ get_cpu_descriptor_handle(&context, heap, 0));
+
+ texture = create_default_texture(device, 32, 32, DXGI_FORMAT_R32G32B32A32_UINT,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ ID3D12Device_CreateUnorderedAccessView(device, texture, NULL, NULL,
+ get_cpu_descriptor_handle(&context, heap, 1));
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ uvec4.x = uvec4.y = uvec4.z = uvec4.w = tests[i];
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_STENCIL, 0.0f, tests[i], 0, NULL);
+ transition_sub_resource_state(command_list, ds.texture, 0,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap));
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap));
+ ID3D12GraphicsCommandList_Dispatch(command_list, 32, 32, 1);
+
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &uvec4);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, texture, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uvec4(texture, 0, queue, command_list, &uvec4);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ transition_sub_resource_state(command_list, texture, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ transition_sub_resource_state(command_list, ds.texture, 0,
+ D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE);
+ }
+ vkd3d_test_set_context(NULL);
+
+ destroy_depth_stencil(&ds);
+ ID3D12Resource_Release(texture);
+ ID3D12DescriptorHeap_Release(heap);
+ ID3D12PipelineState_Release(pipeline_state);
+ destroy_test_context(&context);
+}
+
+static void test_typed_buffer_uav(void)
+{
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_descriptor_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_descriptor_handle;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[1];
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[1];
+ ID3D12DescriptorHeap *descriptor_heap;
+ ID3D12RootSignature *root_signature;
+ ID3D12PipelineState *pipeline_state;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *resource;
+ ID3D12Device *device;
+ HRESULT hr;
+
+ static const DWORD cs_code[] =
+ {
+#if 0
+ RWBuffer<float> buffer;
+
+ [numthreads(32, 1, 1)]
+ void main(uint3 group_id : SV_groupID, uint group_index : SV_GroupIndex)
+ {
+ uint global_index = 32 * group_id.x + group_index;
+ buffer[global_index] = 0.5f;
+ }
+#endif
+ 0x43425844, 0xcc416762, 0xde23c7b7, 0x4012ae1f, 0xaed30ba4, 0x00000001, 0x000000e0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x0000008c, 0x00050050, 0x00000023, 0x0100086a,
+ 0x0400089c, 0x0011e000, 0x00000000, 0x00005555, 0x0200005f, 0x00024000, 0x0200005f, 0x00021012,
+ 0x02000068, 0x00000001, 0x0400009b, 0x00000020, 0x00000001, 0x00000001, 0x07000023, 0x00100012,
+ 0x00000000, 0x0002100a, 0x00004001, 0x00000020, 0x0002400a, 0x0a0000a4, 0x0011e0f2, 0x00000000,
+ 0x00100006, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e,
+ };
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ pipeline_state = create_compute_pipeline_state(device, root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+
+ descriptor_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+
+ cpu_descriptor_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(descriptor_heap);
+ gpu_descriptor_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap);
+
+ resource = create_default_buffer(device, 64 * sizeof(float),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ uav_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.FirstElement = 0;
+ uav_desc.Buffer.NumElements = 64;
+ uav_desc.Buffer.StructureByteStride = 0;
+ uav_desc.Buffer.CounterOffsetInBytes = 0;
+ uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE;
+ ID3D12Device_CreateUnorderedAccessView(device, resource, NULL, &uav_desc, cpu_descriptor_handle);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 2, 1, 1);
+
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_buffer_readback_with_command_list(resource, uav_desc.Format, &rb, queue, command_list);
+ check_readback_data_float(&rb, NULL, 0.5f, 0);
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(resource);
+ ID3D12RootSignature_Release(root_signature);
+ ID3D12PipelineState_Release(pipeline_state);
+ ID3D12DescriptorHeap_Release(descriptor_heap);
+ destroy_test_context(&context);
+}
+
+static void test_typed_uav_store(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[1];
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ ID3D12DescriptorHeap *descriptor_heap;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *resource;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD cs_float_code[] =
+ {
+#if 0
+ RWTexture2D<float> u;
+
+ float f;
+
+ [numthreads(1, 1, 1)]
+ void main(uint2 id : SV_GroupID)
+ {
+ u[id] = f;
+ }
+#endif
+ 0x43425844, 0xc3add41b, 0x67df51b1, 0x2b887930, 0xcb1ee991, 0x00000001, 0x000000b8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400189c, 0x0011e000, 0x00000000, 0x00005555,
+ 0x0200005f, 0x00021032, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x070000a4, 0x0011e0f2,
+ 0x00000000, 0x00021546, 0x00208006, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const struct
+ {
+ DXGI_FORMAT format;
+ float constant;
+ union
+ {
+ float f;
+ uint16_t u16;
+ } result;
+ }
+ tests[] =
+ {
+ {DXGI_FORMAT_R16_FLOAT, 1.0f, {.u16 = 0x3c00}},
+ {DXGI_FORMAT_R16_FLOAT, 0.5f, {.u16 = 0x3800}},
+
+ {DXGI_FORMAT_R16_UNORM, 0.5f, {.u16 = 32768}},
+
+ {DXGI_FORMAT_R32_FLOAT, 0.0f, {.f = 0.0f}},
+ {DXGI_FORMAT_R32_FLOAT, 0.5f, {.f = 0.5f}},
+ {DXGI_FORMAT_R32_FLOAT, 1.0f, {.f = 1.0f}},
+ };
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 1;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_float_code, sizeof(cs_float_code)));
+
+ descriptor_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ resource = create_default_texture(device, 32, 32, tests[i].format,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ ID3D12Device_CreateUnorderedAccessView(device, resource, NULL, NULL,
+ ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(descriptor_heap));
+
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap));
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstants(command_list, 1,
+ 1, &tests[i].constant, 0);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 32, 32, 1);
+
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ switch (tests[i].format)
+ {
+ default:
+ trace("Unhandled format %#x.\n", tests[i].format);
+ /* fall-through */
+ case DXGI_FORMAT_R32_FLOAT:
+ check_sub_resource_float(resource, 0, queue, command_list, tests[i].result.f, 2);
+ break;
+ case DXGI_FORMAT_R16_FLOAT:
+ case DXGI_FORMAT_R16_UNORM:
+ check_sub_resource_uint16(resource, 0, queue, command_list, tests[i].result.u16, 2);
+ break;
+ }
+
+ ID3D12Resource_Release(resource);
+
+ reset_command_list(command_list, context.allocator);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12DescriptorHeap_Release(descriptor_heap);
+ destroy_test_context(&context);
+}
+
+static void test_compute_shader_registers(void)
+{
+ struct data
+ {
+ unsigned int group_id[3];
+ unsigned int group_index;
+ unsigned int dispatch_id[3];
+ unsigned int thread_id[3];
+ };
+
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_descriptor_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_descriptor_handle;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[1];
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ unsigned int i, x, y, group_x, group_y;
+ ID3D12DescriptorHeap *descriptor_heap;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *resource;
+ const struct data *data;
+ struct uvec4 dimensions;
+ ID3D12Device *device;
+ HRESULT hr;
+
+ static const DWORD cs_code[] =
+ {
+#if 0
+ struct data
+ {
+ uint3 group_id;
+ uint group_index;
+ uint3 dispatch_id;
+ uint3 group_thread_id;
+ };
+
+ RWStructuredBuffer<data> u;
+
+ uint2 dim;
+
+ [numthreads(3, 2, 1)]
+ void main(uint3 group_id : SV_GroupID,
+ uint group_index : SV_GroupIndex,
+ uint3 dispatch_id : SV_DispatchThreadID,
+ uint3 group_thread_id : SV_GroupThreadID)
+ {
+ uint i = dispatch_id.x + dispatch_id.y * 3 * dim.x;
+ u[i].group_id = group_id;
+ u[i].group_index = group_index;
+ u[i].dispatch_id = dispatch_id;
+ u[i].group_thread_id = group_thread_id;
+ }
+#endif
+ 0x43425844, 0xf0bce218, 0xfc1e8267, 0xe6d57544, 0x342df592, 0x00000001, 0x000001a4, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000150, 0x00050050, 0x00000054, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400009e, 0x0011e000, 0x00000000, 0x00000028,
+ 0x0200005f, 0x00024000, 0x0200005f, 0x00021072, 0x0200005f, 0x00022072, 0x0200005f, 0x00020072,
+ 0x02000068, 0x00000002, 0x0400009b, 0x00000003, 0x00000002, 0x00000001, 0x04000036, 0x00100072,
+ 0x00000000, 0x00021246, 0x04000036, 0x00100082, 0x00000000, 0x0002400a, 0x08000026, 0x0000d000,
+ 0x00100012, 0x00000001, 0x0002001a, 0x0020800a, 0x00000000, 0x00000000, 0x08000023, 0x00100012,
+ 0x00000001, 0x0010000a, 0x00000001, 0x00004001, 0x00000003, 0x0002000a, 0x090000a8, 0x0011e0f2,
+ 0x00000000, 0x0010000a, 0x00000001, 0x00004001, 0x00000000, 0x00100e46, 0x00000000, 0x04000036,
+ 0x00100072, 0x00000000, 0x00020246, 0x04000036, 0x00100082, 0x00000000, 0x0002200a, 0x090000a8,
+ 0x0011e0f2, 0x00000000, 0x0010000a, 0x00000001, 0x00004001, 0x00000010, 0x00100e46, 0x00000000,
+ 0x080000a8, 0x0011e032, 0x00000000, 0x0010000a, 0x00000001, 0x00004001, 0x00000020, 0x00022596,
+ 0x0100003e,
+ };
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 4;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+
+ resource = create_default_buffer(device, 10240,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ descriptor_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_descriptor_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(descriptor_heap);
+ gpu_descriptor_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap);
+
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = DXGI_FORMAT_UNKNOWN;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.FirstElement = 0;
+ uav_desc.Buffer.NumElements = 256;
+ uav_desc.Buffer.StructureByteStride = 40;
+ ID3D12Device_CreateUnorderedAccessView(device, resource, NULL, &uav_desc, cpu_descriptor_handle);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle);
+ dimensions.x = 2;
+ dimensions.y = 3;
+ dimensions.z = 1;
+ dimensions.w = 0;
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstants(command_list, 1, 4, &dimensions, 0);
+ ID3D12GraphicsCommandList_Dispatch(command_list, dimensions.x, dimensions.y, dimensions.z);
+
+ transition_resource_state(command_list, resource,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_buffer_readback_with_command_list(resource, uav_desc.Format, &rb, queue, command_list);
+ i = 0;
+ data = rb.data;
+ for (y = 0; y < dimensions.y; ++y)
+ {
+ for (group_y = 0; group_y < 2; ++group_y)
+ {
+ for (x = 0; x < dimensions.x; ++x)
+ {
+ for (group_x = 0; group_x < 3; ++group_x)
+ {
+ const unsigned int dispatch_id[2] = {x * 3 + group_x, y * 2 + group_y};
+ const unsigned int group_index = group_y * 3 + group_x;
+ const struct data *d = &data[i];
+
+ ok(d->group_id[0] == x && d->group_id[1] == y && !d->group_id[2],
+ "Got group id (%u, %u, %u), expected (%u, %u, %u) at %u (%u, %u, %u, %u).\n",
+ d->group_id[0], d->group_id[1], d->group_id[2], x, y, 0,
+ i, x, y, group_x, group_y);
+ ok(d->group_index == group_index,
+ "Got group index %u, expected %u at %u (%u, %u, %u, %u).\n",
+ d->group_index, group_index, i, x, y, group_x, group_y);
+ ok(d->dispatch_id[0] == dispatch_id[0] && d->dispatch_id[1] == dispatch_id[1]
+ && !d->dispatch_id[2],
+ "Got dispatch id (%u, %u, %u), expected (%u, %u, %u) "
+ "at %u (%u, %u, %u, %u).\n",
+ d->dispatch_id[0], d->dispatch_id[1], d->dispatch_id[2],
+ dispatch_id[0], dispatch_id[1], 0,
+ i, x, y, group_x, group_y);
+ ok(d->thread_id[0] == group_x && d->thread_id[1] == group_y && !d->thread_id[2],
+ "Got group thread id (%u, %u, %u), expected (%u, %u, %u) "
+ "at %u (%u, %u, %u, %u).\n",
+ d->thread_id[0], d->thread_id[1], d->thread_id[2], group_x, group_y, 0,
+ i, x, y, group_x, group_y);
+ ++i;
+ }
+ }
+ }
+ }
+ release_resource_readback(&rb);
+
+ ID3D12DescriptorHeap_Release(descriptor_heap);
+ ID3D12Resource_Release(resource);
+ destroy_test_context(&context);
+}
+
+static void test_tgsm(void)
+{
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_descriptor_handle;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[1];
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ ID3D12DescriptorHeap *cpu_descriptor_heap;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[1];
+ ID3D12DescriptorHeap *descriptor_heap;
+ ID3D12Resource *buffer, *buffer2;
+ unsigned int data, expected;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ float float_data;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD raw_tgsm_code[] =
+ {
+#if 0
+ RWByteAddressBuffer u;
+ groupshared uint m;
+
+ [numthreads(32, 1, 1)]
+ void main(uint local_idx : SV_GroupIndex, uint group_id : SV_GroupID)
+ {
+ if (!local_idx)
+ m = group_id.x;
+ GroupMemoryBarrierWithGroupSync();
+ InterlockedAdd(m, group_id.x);
+ GroupMemoryBarrierWithGroupSync();
+ if (!local_idx)
+ u.Store(4 * group_id.x, m);
+ }
+#endif
+ 0x43425844, 0x467df6d9, 0x5f56edda, 0x5c96b787, 0x60c91fb8, 0x00000001, 0x00000148, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000f4, 0x00050050, 0x0000003d, 0x0100086a,
+ 0x0300009d, 0x0011e000, 0x00000000, 0x0200005f, 0x00024000, 0x0200005f, 0x00021012, 0x02000068,
+ 0x00000001, 0x0400009f, 0x0011f000, 0x00000000, 0x00000004, 0x0400009b, 0x00000020, 0x00000001,
+ 0x00000001, 0x0200001f, 0x0002400a, 0x060000a6, 0x0011f012, 0x00000000, 0x00004001, 0x00000000,
+ 0x0002100a, 0x01000015, 0x010018be, 0x060000ad, 0x0011f000, 0x00000000, 0x00004001, 0x00000000,
+ 0x0002100a, 0x010018be, 0x0200001f, 0x0002400a, 0x06000029, 0x00100012, 0x00000000, 0x0002100a,
+ 0x00004001, 0x00000002, 0x070000a5, 0x00100022, 0x00000000, 0x00004001, 0x00000000, 0x0011f006,
+ 0x00000000, 0x070000a6, 0x0011e012, 0x00000000, 0x0010000a, 0x00000000, 0x0010001a, 0x00000000,
+ 0x01000015, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE cs_raw_tgsm = {raw_tgsm_code, sizeof(raw_tgsm_code)};
+ static const DWORD structured_tgsm_code[] =
+ {
+#if 0
+ #define GROUP_SIZE 32
+
+ RWByteAddressBuffer u;
+ RWByteAddressBuffer u2;
+ groupshared uint m[GROUP_SIZE];
+
+ [numthreads(GROUP_SIZE, 1, 1)]
+ void main(uint local_idx : SV_GroupIndex, uint group_id : SV_GroupID)
+ {
+ uint sum, original, i;
+
+ if (!local_idx)
+ {
+ for (i = 0; i < GROUP_SIZE; ++i)
+ m[i] = 2 * group_id.x;
+ }
+ GroupMemoryBarrierWithGroupSync();
+ InterlockedAdd(m[local_idx], 1);
+ GroupMemoryBarrierWithGroupSync();
+ for (i = 0, sum = 0; i < GROUP_SIZE; sum += m[i++]);
+ u.InterlockedExchange(4 * group_id.x, sum, original);
+ u2.Store(4 * group_id.x, original);
+ }
+#endif
+ 0x43425844, 0x9d906c94, 0x81f5ad92, 0x11e860b2, 0x3623c824, 0x00000001, 0x000002c0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x0000026c, 0x00050050, 0x0000009b, 0x0100086a,
+ 0x0300009d, 0x0011e000, 0x00000000, 0x0300009d, 0x0011e000, 0x00000001, 0x0200005f, 0x00024000,
+ 0x0200005f, 0x00021012, 0x02000068, 0x00000002, 0x050000a0, 0x0011f000, 0x00000000, 0x00000004,
+ 0x00000020, 0x0400009b, 0x00000020, 0x00000001, 0x00000001, 0x0200001f, 0x0002400a, 0x06000029,
+ 0x00100012, 0x00000000, 0x0002100a, 0x00004001, 0x00000001, 0x05000036, 0x00100022, 0x00000000,
+ 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100042, 0x00000000, 0x0010001a, 0x00000000,
+ 0x00004001, 0x00000020, 0x03040003, 0x0010002a, 0x00000000, 0x090000a8, 0x0011f012, 0x00000000,
+ 0x0010001a, 0x00000000, 0x00004001, 0x00000000, 0x0010000a, 0x00000000, 0x0700001e, 0x00100022,
+ 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x01000015, 0x010018be,
+ 0x04000036, 0x00100012, 0x00000000, 0x0002400a, 0x05000036, 0x00100022, 0x00000000, 0x00004001,
+ 0x00000000, 0x070000ad, 0x0011f000, 0x00000000, 0x00100046, 0x00000000, 0x00004001, 0x00000001,
+ 0x010018be, 0x08000036, 0x00100032, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x01000030, 0x07000050, 0x00100042, 0x00000000, 0x0010001a, 0x00000000, 0x00004001,
+ 0x00000020, 0x03040003, 0x0010002a, 0x00000000, 0x0700001e, 0x00100022, 0x00000001, 0x0010001a,
+ 0x00000000, 0x00004001, 0x00000001, 0x090000a7, 0x00100042, 0x00000000, 0x0010001a, 0x00000000,
+ 0x00004001, 0x00000000, 0x0011f006, 0x00000000, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a,
+ 0x00000000, 0x0010002a, 0x00000000, 0x05000036, 0x00100032, 0x00000000, 0x00100046, 0x00000001,
+ 0x01000016, 0x06000029, 0x00100022, 0x00000000, 0x0002100a, 0x00004001, 0x00000002, 0x090000b8,
+ 0x00100012, 0x00000001, 0x0011e000, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000,
+ 0x070000a6, 0x0011e012, 0x00000001, 0x0010001a, 0x00000000, 0x0010000a, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE cs_structured_tgsm = {structured_tgsm_code, sizeof(structured_tgsm_code)};
+ static const DWORD structured_tgsm_float_code[] =
+ {
+#if 0
+ #define GROUP_SIZE 32
+
+ struct data
+ {
+ float f;
+ uint u;
+ };
+
+ RWBuffer<float> u;
+ RWBuffer<uint> u2;
+ groupshared data m[GROUP_SIZE];
+
+ [numthreads(GROUP_SIZE, 1, 1)]
+ void main(uint local_idx : SV_GroupIndex, uint group_id : SV_GroupID,
+ uint thread_id : SV_DispatchThreadID)
+ {
+ uint i;
+ if (!local_idx)
+ {
+ for (i = 0; i < GROUP_SIZE; ++i)
+ {
+ m[i].f = group_id.x;
+ m[i].u = group_id.x;
+ }
+ }
+ GroupMemoryBarrierWithGroupSync();
+ for (i = 0; i < local_idx; ++i)
+ {
+ m[local_idx].f += group_id.x;
+ m[local_idx].u += group_id.x;
+ }
+ u[thread_id.x] = m[local_idx].f;
+ u2[thread_id.x] = m[local_idx].u;
+ }
+#endif
+ 0x43425844, 0xaadf1a71, 0x16f60224, 0x89b6ce76, 0xb66fb96f, 0x00000001, 0x000002ac, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000258, 0x00050050, 0x00000096, 0x0100086a,
+ 0x0400089c, 0x0011e000, 0x00000000, 0x00005555, 0x0400089c, 0x0011e000, 0x00000001, 0x00004444,
+ 0x0200005f, 0x00024000, 0x0200005f, 0x00021012, 0x0200005f, 0x00020012, 0x02000068, 0x00000002,
+ 0x050000a0, 0x0011f000, 0x00000000, 0x00000008, 0x00000020, 0x0400009b, 0x00000020, 0x00000001,
+ 0x00000001, 0x0200001f, 0x0002400a, 0x04000056, 0x00100012, 0x00000000, 0x0002100a, 0x04000036,
+ 0x00100022, 0x00000000, 0x0002100a, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x00000000,
+ 0x01000030, 0x07000050, 0x00100082, 0x00000000, 0x0010002a, 0x00000000, 0x00004001, 0x00000020,
+ 0x03040003, 0x0010003a, 0x00000000, 0x090000a8, 0x0011f032, 0x00000000, 0x0010002a, 0x00000000,
+ 0x00004001, 0x00000000, 0x00100046, 0x00000000, 0x0700001e, 0x00100042, 0x00000000, 0x0010002a,
+ 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x01000015, 0x010018be, 0x04000056, 0x00100012,
+ 0x00000000, 0x0002100a, 0x05000036, 0x00100022, 0x00000000, 0x00004001, 0x00000000, 0x01000030,
+ 0x06000050, 0x00100042, 0x00000000, 0x0010001a, 0x00000000, 0x0002400a, 0x03040003, 0x0010002a,
+ 0x00000000, 0x080000a7, 0x001000c2, 0x00000000, 0x0002400a, 0x00004001, 0x00000000, 0x0011f406,
+ 0x00000000, 0x07000000, 0x00100012, 0x00000001, 0x0010000a, 0x00000000, 0x0010002a, 0x00000000,
+ 0x0600001e, 0x00100022, 0x00000001, 0x0010003a, 0x00000000, 0x0002100a, 0x080000a8, 0x0011f032,
+ 0x00000000, 0x0002400a, 0x00004001, 0x00000000, 0x00100046, 0x00000001, 0x0700001e, 0x00100022,
+ 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x080000a7, 0x00100032,
+ 0x00000000, 0x0002400a, 0x00004001, 0x00000000, 0x0011f046, 0x00000000, 0x060000a4, 0x0011e0f2,
+ 0x00000000, 0x00020006, 0x00100006, 0x00000000, 0x060000a4, 0x0011e0f2, 0x00000001, 0x00020006,
+ 0x00100556, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE cs_structured_tgsm_float
+ = {structured_tgsm_float_code, sizeof(structured_tgsm_float_code)};
+ static const unsigned int zero[4] = {0};
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[0].NumDescriptors = 2;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ buffer = create_default_buffer(device, 1024,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ descriptor_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2);
+ cpu_descriptor_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2);
+
+ gpu_descriptor_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap);
+
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = DXGI_FORMAT_R32_TYPELESS;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.FirstElement = 0;
+ uav_desc.Buffer.NumElements = 256;
+ uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_RAW;
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 0));
+ ID3D12Device_CreateUnorderedAccessView(device, NULL, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 1));
+
+ /* cs_raw_tgsm */
+ context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, cs_raw_tgsm);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 64, 1, 1);
+
+ transition_resource_state(command_list, buffer,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < 64; ++i)
+ {
+ data = get_readback_uint(&rb, i, 0, 0);
+ expected = 33 * i;
+ ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+
+ /* cs_structured_tgsm */
+ reset_command_list(command_list, context.allocator);
+
+ context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, cs_structured_tgsm);
+
+ buffer2 = create_default_buffer(device, 1024,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12Device_CreateUnorderedAccessView(device, buffer2, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 1));
+
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, cpu_descriptor_heap, 0));
+ ID3D12Device_CreateUnorderedAccessView(device, buffer2, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, cpu_descriptor_heap, 1));
+
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list,
+ get_gpu_descriptor_handle(&context, descriptor_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_descriptor_heap, 0),
+ buffer, zero, 0, NULL);
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list,
+ get_gpu_descriptor_handle(&context, descriptor_heap, 1),
+ get_cpu_descriptor_handle(&context, cpu_descriptor_heap, 1),
+ buffer2, zero, 0, NULL);
+
+ gpu_descriptor_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 32, 1, 1);
+
+ transition_resource_state(command_list, buffer,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, buffer2,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < 32; ++i)
+ {
+ expected = 64 * i + 32;
+ data = get_readback_uint(&rb, i, 0, 0);
+ ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i);
+ }
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+ get_buffer_readback_with_command_list(buffer2, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < 32; ++i)
+ {
+ expected = 64 * i + 32;
+ data = get_readback_uint(&rb, i, 0, 0);
+ ok(data == expected || !data, "Got %u, expected %u (index %u).\n", data, expected, i);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+
+ /* cs_structured_tgsm_float */
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, buffer,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ transition_resource_state(command_list, buffer2,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ context.pipeline_state = create_compute_pipeline_state(device,
+ context.root_signature, cs_structured_tgsm_float);
+
+ uav_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ uav_desc.Buffer.Flags = 0;
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 0));
+ uav_desc.Format = DXGI_FORMAT_R32_UINT;
+ ID3D12Device_CreateUnorderedAccessView(device, buffer2, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 1));
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 3, 1, 1);
+
+ transition_resource_state(command_list, buffer,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, buffer2,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < 96; ++i)
+ {
+ expected = (i % 32 + 1) * (i / 32);
+ float_data = get_readback_float(&rb, i, 0);
+ ok(float_data == expected, "Got %.8e, expected %u (index %u).\n", float_data, expected, i);
+ }
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+ get_buffer_readback_with_command_list(buffer2, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < 96; ++i)
+ {
+ expected = (i % 32 + 1) * (i / 32);
+ data = get_readback_uint(&rb, i, 0, 0);
+ ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(buffer);
+ ID3D12Resource_Release(buffer2);
+ ID3D12DescriptorHeap_Release(cpu_descriptor_heap);
+ ID3D12DescriptorHeap_Release(descriptor_heap);
+ destroy_test_context(&context);
+}
+
+static void test_uav_load(void)
+{
+ struct texture
+ {
+ unsigned int width;
+ unsigned int height;
+ unsigned int miplevel_count;
+ unsigned int array_size;
+ DXGI_FORMAT format;
+ D3D12_SUBRESOURCE_DATA data[3];
+ };
+
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, rtv_float, rtv_uint, rtv_sint;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[1];
+ ID3D12DescriptorHeap *rtv_heap, *uav_heap;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ const D3D12_SHADER_BYTECODE *current_ps;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_RENDER_TARGET_VIEW_DESC rtv_desc;
+ const struct texture *current_texture;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ ID3D12Resource *texture, *rt_texture;
+ D3D12_RESOURCE_DESC resource_desc;
+ D3D12_CLEAR_VALUE clear_value;
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ unsigned int rtv_size;
+ ID3D12Device *device;
+ unsigned int i, x, y;
+ HRESULT hr;
+
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const DWORD ps_ld_2d_float_code[] =
+ {
+#if 0
+ RWTexture2D<float> u;
+
+ float main(float4 position : SV_Position) : SV_Target
+ {
+ float2 s;
+ u.GetDimensions(s.x, s.y);
+ return u[s * float2(position.x / 640.0f, position.y / 480.0f)];
+ }
+#endif
+ 0x43425844, 0xd5996e04, 0x6bede909, 0x0a7ad18e, 0x5eb277fb, 0x00000001, 0x00000194, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x00000e01, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f8, 0x00000050,
+ 0x0000003e, 0x0100086a, 0x0400189c, 0x0011e000, 0x00000001, 0x00005555, 0x04002064, 0x00101032,
+ 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000000, 0x02000068, 0x00000001, 0x8900003d,
+ 0x800000c2, 0x00155543, 0x00100032, 0x00000000, 0x00004001, 0x00000000, 0x0011ee46, 0x00000001,
+ 0x07000038, 0x001000f2, 0x00000000, 0x00100546, 0x00000000, 0x00101546, 0x00000000, 0x0a000038,
+ 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x3b088889,
+ 0x3b088889, 0x0500001c, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x890000a3, 0x800000c2,
+ 0x00155543, 0x00100012, 0x00000000, 0x00100e46, 0x00000000, 0x0011ee46, 0x00000001, 0x05000036,
+ 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_ld_2d_float = {ps_ld_2d_float_code, sizeof(ps_ld_2d_float_code)};
+ static const DWORD ps_ld_2d_uint_code[] =
+ {
+#if 0
+ RWTexture2D<uint> u;
+
+ uint main(float4 position : SV_Position) : SV_Target
+ {
+ float2 s;
+ u.GetDimensions(s.x, s.y);
+ return u[s * float2(position.x / 640.0f, position.y / 480.0f)];
+ }
+#endif
+ 0x43425844, 0x2cc0af18, 0xb28eca73, 0x9651215b, 0xebe3f361, 0x00000001, 0x00000194, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001,
+ 0x00000000, 0x00000e01, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f8, 0x00000050,
+ 0x0000003e, 0x0100086a, 0x0400189c, 0x0011e000, 0x00000001, 0x00004444, 0x04002064, 0x00101032,
+ 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000000, 0x02000068, 0x00000001, 0x8900003d,
+ 0x800000c2, 0x00111103, 0x00100032, 0x00000000, 0x00004001, 0x00000000, 0x0011ee46, 0x00000001,
+ 0x07000038, 0x001000f2, 0x00000000, 0x00100546, 0x00000000, 0x00101546, 0x00000000, 0x0a000038,
+ 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x3b088889,
+ 0x3b088889, 0x0500001c, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x890000a3, 0x800000c2,
+ 0x00111103, 0x00100012, 0x00000000, 0x00100e46, 0x00000000, 0x0011ee46, 0x00000001, 0x05000036,
+ 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_ld_2d_uint = {ps_ld_2d_uint_code, sizeof(ps_ld_2d_uint_code)};
+ static const DWORD ps_ld_2d_int_code[] =
+ {
+#if 0
+ RWTexture2D<int> u;
+
+ int main(float4 position : SV_Position) : SV_Target
+ {
+ float2 s;
+ u.GetDimensions(s.x, s.y);
+ return u[s * float2(position.x / 640.0f, position.y / 480.0f)];
+ }
+#endif
+ 0x43425844, 0x7deee248, 0xe7c48698, 0x9454db00, 0x921810e7, 0x00000001, 0x00000194, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000002,
+ 0x00000000, 0x00000e01, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f8, 0x00000050,
+ 0x0000003e, 0x0100086a, 0x0400189c, 0x0011e000, 0x00000001, 0x00003333, 0x04002064, 0x00101032,
+ 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000000, 0x02000068, 0x00000001, 0x8900003d,
+ 0x800000c2, 0x000cccc3, 0x00100032, 0x00000000, 0x00004001, 0x00000000, 0x0011ee46, 0x00000001,
+ 0x07000038, 0x001000f2, 0x00000000, 0x00100546, 0x00000000, 0x00101546, 0x00000000, 0x0a000038,
+ 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x3b088889,
+ 0x3b088889, 0x0500001c, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x890000a3, 0x800000c2,
+ 0x000cccc3, 0x00100012, 0x00000000, 0x00100e46, 0x00000000, 0x0011ee46, 0x00000001, 0x05000036,
+ 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_ld_2d_int = {ps_ld_2d_int_code, sizeof(ps_ld_2d_int_code)};
+ static const DWORD ps_ld_2d_uint_arr_code[] =
+ {
+#if 0
+ RWTexture2DArray<uint> u;
+
+ uint layer;
+
+ uint main(float4 position : SV_Position) : SV_Target
+ {
+ float3 s;
+ u.GetDimensions(s.x, s.y, s.z);
+ s.z = layer;
+ return u[s * float3(position.x / 640.0f, position.y / 480.0f, 1.0f)];
+ }
+#endif
+ 0x43425844, 0xa7630358, 0xd7e7228f, 0xa9f1be03, 0x838554f1, 0x00000001, 0x000001bc, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001,
+ 0x00000000, 0x00000e01, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000120, 0x00000050,
+ 0x00000048, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400409c, 0x0011e000,
+ 0x00000001, 0x00004444, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x00102012,
+ 0x00000000, 0x02000068, 0x00000001, 0x8900003d, 0x80000202, 0x00111103, 0x00100032, 0x00000000,
+ 0x00004001, 0x00000000, 0x0011ee46, 0x00000001, 0x07000038, 0x00100032, 0x00000000, 0x00100046,
+ 0x00000000, 0x00101046, 0x00000000, 0x06000056, 0x001000c2, 0x00000000, 0x00208006, 0x00000000,
+ 0x00000000, 0x0a000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3acccccd,
+ 0x3b088889, 0x3f800000, 0x3f800000, 0x0500001c, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000,
+ 0x890000a3, 0x80000202, 0x00111103, 0x00100012, 0x00000000, 0x00100e46, 0x00000000, 0x0011ee46,
+ 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_ld_2d_uint_arr = {ps_ld_2d_uint_arr_code, sizeof(ps_ld_2d_uint_arr_code)};
+ static const float float_data[] =
+ {
+ 0.50f, 0.25f, 1.00f, 0.00f,
+ -1.00f, -2.00f, -3.00f, -4.00f,
+ -0.50f, -0.25f, -1.00f, -0.00f,
+ 1.00f, 2.00f, 3.00f, 4.00f,
+ };
+ static const unsigned int uint_data[] =
+ {
+ 0x00, 0x10, 0x20, 0x30,
+ 0x40, 0x50, 0x60, 0x70,
+ 0x80, 0x90, 0xa0, 0xb0,
+ 0xc0, 0xd0, 0xe0, 0xf0,
+ };
+ static const unsigned int uint_data2[] =
+ {
+ 0xffff, 0xffff, 0xffff, 0xffff,
+ 0xffff, 0xc000, 0xc000, 0xffff,
+ 0xffff, 0xc000, 0xc000, 0xffff,
+ 0xffff, 0xffff, 0xffff, 0xffff,
+ };
+ static const unsigned int uint_data3[] =
+ {
+ 0xaa, 0xaa, 0xcc, 0xcc,
+ 0xaa, 0xaa, 0xdd, 0xdd,
+ 0xbb, 0xbb, 0xee, 0xee,
+ 0xbb, 0xbb, 0xff, 0xff,
+ };
+ static const int int_data[] =
+ {
+ -1, 0x10, 0x20, 0x30,
+ 0x40, 0x50, 0x60, -777,
+ -666, 0x90, -555, 0xb0,
+ 0xc0, 0xd0, 0xe0, -101,
+ };
+ static const struct texture float_2d = {4, 4, 1, 1, DXGI_FORMAT_R32_FLOAT,
+ {{float_data, 4 * sizeof(*float_data), 0}}};
+ static const struct texture uint_2d = {4, 4, 1, 1, DXGI_FORMAT_R32_UINT,
+ {{uint_data, 4 * sizeof(*uint_data), 0}}};
+ static const struct texture uint2d_arr = {4, 4, 1, 3, DXGI_FORMAT_R32_UINT,
+ {{uint_data, 4 * sizeof(*uint_data), 0},
+ {uint_data2, 4 * sizeof(*uint_data2), 0},
+ {uint_data3, 4 * sizeof(*uint_data3), 0}}};
+ static const struct texture int_2d = {4, 4, 1, 1, DXGI_FORMAT_R32_SINT,
+ {{int_data, 4 * sizeof(*int_data), 0}}};
+
+ static const struct test
+ {
+ const D3D12_SHADER_BYTECODE *ps;
+ const struct texture *texture;
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ unsigned int constant;
+ const DWORD *expected_colors;
+ }
+ tests[] =
+ {
+#define TEX_2D D3D12_UAV_DIMENSION_TEXTURE2D
+#define TEX_2D_ARRAY D3D12_UAV_DIMENSION_TEXTURE2DARRAY
+#define R32_FLOAT DXGI_FORMAT_R32_FLOAT
+#define R32_UINT DXGI_FORMAT_R32_UINT
+#define R32_SINT DXGI_FORMAT_R32_SINT
+ {&ps_ld_2d_float, &float_2d, {R32_FLOAT, TEX_2D, .Texture2D = {0}}, 0, (const DWORD *)float_data},
+ {&ps_ld_2d_uint, &uint_2d, {R32_UINT, TEX_2D, .Texture2D = {0}}, 0, (const DWORD *)uint_data},
+ {&ps_ld_2d_int, &int_2d, {R32_SINT, TEX_2D, .Texture2D = {0}}, 0, (const DWORD *)int_data},
+
+ {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, .Texture2DArray = {0, 0, ~0u}}, 0,
+ (const DWORD *)uint_data},
+ {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, .Texture2DArray = {0, 0, ~0u}}, 1,
+ (const DWORD *)uint_data2},
+ {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, .Texture2DArray = {0, 0, ~0u}}, 2,
+ (const DWORD *)uint_data3},
+ {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, .Texture2DArray = {0, 1, ~0u}}, 0,
+ (const DWORD *)uint_data2},
+ {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, .Texture2DArray = {0, 1, ~0u}}, 1,
+ (const DWORD *)uint_data3},
+ {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, .Texture2DArray = {0, 2, ~0u}}, 0,
+ (const DWORD *)uint_data3},
+#undef TEX_2D
+#undef TEX_2D_ARRAY
+#undef R32_FLOAT
+#undef R32_UINT
+#undef R32_SINT
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 1;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 1;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ set_viewport(&context.viewport, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f);
+ set_rect(&context.scissor_rect, 0, 0, 640, 480);
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 640;
+ resource_desc.Height = 480;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_R32_TYPELESS;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+ clear_value.Format = DXGI_FORMAT_R32_FLOAT;
+ clear_value.Color[0] = 1.0f;
+ clear_value.Color[1] = 1.0f;
+ clear_value.Color[2] = 1.0f;
+ clear_value.Color[3] = 1.0f;
+ hr = ID3D12Device_CreateCommittedResource(device,
+ &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value,
+ &IID_ID3D12Resource, (void **)&rt_texture);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+
+ rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 3);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap);
+ rtv_size = ID3D12Device_GetDescriptorHandleIncrementSize(device,
+ D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
+
+ memset(&rtv_desc, 0, sizeof(rtv_desc));
+ rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D;
+ rtv_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ ID3D12Device_CreateRenderTargetView(device, rt_texture, &rtv_desc, cpu_handle);
+ rtv_float = cpu_handle;
+ cpu_handle.ptr += rtv_size;
+
+ rtv_desc.Format = DXGI_FORMAT_R32_UINT;
+ ID3D12Device_CreateRenderTargetView(device, rt_texture, &rtv_desc, cpu_handle);
+ rtv_uint = cpu_handle;
+ cpu_handle.ptr += rtv_size;
+
+ rtv_desc.Format = DXGI_FORMAT_R32_SINT;
+ ID3D12Device_CreateRenderTargetView(device, rt_texture, &rtv_desc, cpu_handle);
+ rtv_sint = cpu_handle;
+
+ uav_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
+
+ texture = NULL;
+ current_ps = NULL;
+ current_texture = NULL;
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ const struct test *test = &tests[i];
+
+ if (current_ps != test->ps)
+ {
+ if (context.pipeline_state)
+ ID3D12PipelineState_Release(context.pipeline_state);
+ current_ps = tests[i].ps;
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, test->uav_desc.Format, NULL, current_ps, NULL);
+ }
+
+ if (current_texture != test->texture)
+ {
+ if (texture)
+ ID3D12Resource_Release(texture);
+
+ current_texture = test->texture;
+
+ resource_desc.Width = current_texture->width;
+ resource_desc.Height = current_texture->height;
+ resource_desc.MipLevels = current_texture->miplevel_count;
+ resource_desc.DepthOrArraySize = current_texture->array_size;
+ resource_desc.Format = current_texture->format;
+ hr = ID3D12Device_CreateCommittedResource(device,
+ &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+ D3D12_RESOURCE_STATE_COPY_DEST, NULL,
+ &IID_ID3D12Resource, (void **)&texture);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+
+ upload_texture_data(texture, current_texture->data,
+ resource_desc.MipLevels * resource_desc.DepthOrArraySize, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ }
+
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(uav_heap);
+ ID3D12Device_CreateUnorderedAccessView(device, texture, NULL, &test->uav_desc, cpu_handle);
+
+ switch (test->uav_desc.Format)
+ {
+ default:
+ trace("Unhandled format %#x.\n", test->uav_desc.Format);
+ /* fall-through */
+ case DXGI_FORMAT_R32_FLOAT:
+ cpu_handle = rtv_float;
+ break;
+ case DXGI_FORMAT_R32_UINT:
+ cpu_handle = rtv_uint;
+ break;
+ case DXGI_FORMAT_R32_SINT:
+ cpu_handle = rtv_sint;
+ break;
+ }
+
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &uav_heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(uav_heap));
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(command_list, 1, test->constant, 0);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &cpu_handle, false, NULL);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, cpu_handle, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_sub_resource_state(command_list, rt_texture, 0,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(rt_texture, 0, &rb, queue, command_list);
+ for (y = 0; y < 4; ++y)
+ {
+ for (x = 0; x < 4; ++x)
+ {
+ unsigned int expected = test->expected_colors[y * 4 + x];
+ unsigned int color = get_readback_uint(&rb, 80 + x * 160, 60 + y * 120, 0);
+ ok(compare_color(color, expected, 0),
+ "Test %u: Got 0x%08x, expected 0x%08x at (%u, %u).\n",
+ i, color, expected, x, y);
+ }
+ }
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, rt_texture, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ ID3D12Resource_Release(texture);
+
+ ID3D12DescriptorHeap_Release(rtv_heap);
+ ID3D12DescriptorHeap_Release(uav_heap);
+ ID3D12Resource_Release(rt_texture);
+ destroy_test_context(&context);
+}
+
+static void test_cs_uav_store(void)
+{
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_descriptor_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_descriptor_handle;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ const D3D12_SHADER_BYTECODE *current_shader;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[1];
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ ID3D12DescriptorHeap *cpu_descriptor_heap;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ ID3D12DescriptorHeap *descriptor_heap;
+ ID3D12RootSignature *root_signature;
+ ID3D12PipelineState *pipeline_state;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *resource;
+ ID3D12Device *device;
+ ID3D12Resource *cb;
+ struct vec4 input;
+ unsigned int i;
+ HRESULT hr;
+ RECT rect;
+
+ static const DWORD cs_1_thread_code[] =
+ {
+#if 0
+ RWTexture2D<float> u;
+
+ float value;
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ uint x, y, width, height;
+ u.GetDimensions(width, height);
+ for (y = 0; y < height; ++y)
+ {
+ for (x = 0; x < width; ++x)
+ u[uint2(x, y)] = value;
+ }
+ }
+#endif
+ 0x43425844, 0x6503503a, 0x4cd524e6, 0x2473915d, 0x93cf1201, 0x00000001, 0x000001c8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000174, 0x00050050, 0x0000005d, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400189c, 0x0011e000, 0x00000000, 0x00005555,
+ 0x02000068, 0x00000003, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x8900103d, 0x800000c2,
+ 0x00155543, 0x00100032, 0x00000000, 0x00004001, 0x00000000, 0x0011ee46, 0x00000000, 0x05000036,
+ 0x00100042, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100082, 0x00000000,
+ 0x0010002a, 0x00000000, 0x0010001a, 0x00000000, 0x03040003, 0x0010003a, 0x00000000, 0x05000036,
+ 0x001000e2, 0x00000001, 0x00100aa6, 0x00000000, 0x05000036, 0x00100082, 0x00000000, 0x00004001,
+ 0x00000000, 0x01000030, 0x07000050, 0x00100012, 0x00000002, 0x0010003a, 0x00000000, 0x0010000a,
+ 0x00000000, 0x03040003, 0x0010000a, 0x00000002, 0x05000036, 0x00100012, 0x00000001, 0x0010003a,
+ 0x00000000, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100e46, 0x00000001, 0x00208006, 0x00000000,
+ 0x00000000, 0x0700001e, 0x00100082, 0x00000000, 0x0010003a, 0x00000000, 0x00004001, 0x00000001,
+ 0x01000016, 0x0700001e, 0x00100042, 0x00000000, 0x0010002a, 0x00000000, 0x00004001, 0x00000001,
+ 0x01000016, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE cs_1_thread = {cs_1_thread_code, sizeof(cs_1_thread_code)};
+ static const DWORD cs_1_group_code[] =
+ {
+#if 0
+ RWTexture2D<float> u;
+
+ float value;
+
+ [numthreads(16, 16, 1)]
+ void main(uint3 threadID : SV_GroupThreadID)
+ {
+ uint2 count, size ;
+ u.GetDimensions(size.x, size.y);
+ count = size / (uint2)16;
+ for (uint y = 0; y < count.y; ++y)
+ for (uint x = 0; x < count.x; ++x)
+ u[count * threadID.xy + uint2(x, y)] = value;
+ }
+#endif
+ 0x43425844, 0x9fb86044, 0x352c196d, 0x92e14094, 0x46bb95a7, 0x00000001, 0x00000218, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000001c4, 0x00050050, 0x00000071, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400189c, 0x0011e000, 0x00000000, 0x00005555,
+ 0x0200005f, 0x00022032, 0x02000068, 0x00000004, 0x0400009b, 0x00000010, 0x00000010, 0x00000001,
+ 0x8900103d, 0x800000c2, 0x00155543, 0x00100032, 0x00000000, 0x00004001, 0x00000000, 0x0011ee46,
+ 0x00000000, 0x0a000055, 0x001000f2, 0x00000000, 0x00100546, 0x00000000, 0x00004002, 0x00000004,
+ 0x00000004, 0x00000004, 0x00000004, 0x05000036, 0x00100012, 0x00000001, 0x00004001, 0x00000000,
+ 0x01000030, 0x07000050, 0x00100022, 0x00000001, 0x0010000a, 0x00000001, 0x0010003a, 0x00000000,
+ 0x03040003, 0x0010001a, 0x00000001, 0x05000036, 0x001000e2, 0x00000002, 0x00100006, 0x00000001,
+ 0x05000036, 0x00100022, 0x00000001, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100042,
+ 0x00000001, 0x0010001a, 0x00000001, 0x0010000a, 0x00000000, 0x03040003, 0x0010002a, 0x00000001,
+ 0x05000036, 0x00100012, 0x00000002, 0x0010001a, 0x00000001, 0x08000023, 0x001000f2, 0x00000003,
+ 0x00100e46, 0x00000000, 0x00022546, 0x00100e46, 0x00000002, 0x080000a4, 0x0011e0f2, 0x00000000,
+ 0x00100e46, 0x00000003, 0x00208006, 0x00000000, 0x00000000, 0x0700001e, 0x00100022, 0x00000001,
+ 0x0010001a, 0x00000001, 0x00004001, 0x00000001, 0x01000016, 0x0700001e, 0x00100012, 0x00000001,
+ 0x0010000a, 0x00000001, 0x00004001, 0x00000001, 0x01000016, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE cs_1_group = {cs_1_group_code, sizeof(cs_1_group_code)};
+ static const DWORD cs_1_store_code[] =
+ {
+#if 0
+ RWTexture2D<float> u;
+
+ float value;
+
+ [numthreads(1, 1, 1)]
+ void main(uint3 groupID : SV_GroupID)
+ {
+ u[groupID.xy] = value;
+ }
+#endif
+ 0x43425844, 0xc3add41b, 0x67df51b1, 0x2b887930, 0xcb1ee991, 0x00000001, 0x000000b8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400189c, 0x0011e000, 0x00000000, 0x00005555,
+ 0x0200005f, 0x00021032, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x070000a4, 0x0011e0f2,
+ 0x00000000, 0x00021546, 0x00208006, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE cs_1_store = {cs_1_store_code, sizeof(cs_1_store_code)};
+ static const DWORD cs_dispatch_id_code[] =
+ {
+#if 0
+ RWTexture2D<float> u;
+
+ float value;
+
+ [numthreads(4, 4, 1)]
+ void main(uint3 id : SV_DispatchThreadID)
+ {
+ u[id.xy] = value;
+ }
+#endif
+ 0x43425844, 0x60166991, 0x4b595266, 0x7fb67d79, 0x485c4f0d, 0x00000001, 0x000000b8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400189c, 0x0011e000, 0x00000000, 0x00005555,
+ 0x0200005f, 0x00020032, 0x0400009b, 0x00000004, 0x00000004, 0x00000001, 0x070000a4, 0x0011e0f2,
+ 0x00000000, 0x00020546, 0x00208006, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE cs_dispatch_id = {cs_dispatch_id_code, sizeof(cs_dispatch_id_code)};
+ static const DWORD cs_group_index_code[] =
+ {
+#if 0
+ RWTexture2D<float> u;
+
+ float value;
+
+ [numthreads(32, 1, 1)]
+ void main(uint index : SV_GroupIndex)
+ {
+ uint2 size;
+ u.GetDimensions(size.x, size.y);
+ uint count = size.x * size.y / 32;
+ index *= count;
+ for (uint i = 0; i < count; ++i, ++index)
+ u[uint2(index % size.x, index / size.x)] = value;
+ }
+#endif
+ 0x43425844, 0xb685a70f, 0x94c2f263, 0x4f1d8eaa, 0xeab65731, 0x00000001, 0x000001f8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000001a4, 0x00050050, 0x00000069, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400189c, 0x0011e000, 0x00000000, 0x00005555,
+ 0x0200005f, 0x00024000, 0x02000068, 0x00000004, 0x0400009b, 0x00000020, 0x00000001, 0x00000001,
+ 0x8900103d, 0x800000c2, 0x00155543, 0x00100032, 0x00000000, 0x00004001, 0x00000000, 0x0011ee46,
+ 0x00000000, 0x08000026, 0x0000d000, 0x00100022, 0x00000000, 0x0010000a, 0x00000000, 0x0010001a,
+ 0x00000000, 0x07000055, 0x00100022, 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000005,
+ 0x07000026, 0x0000d000, 0x00100042, 0x00000000, 0x0002400a, 0x0010001a, 0x00000000, 0x05000036,
+ 0x00100012, 0x00000001, 0x0010002a, 0x00000000, 0x05000036, 0x00100022, 0x00000001, 0x00004001,
+ 0x00000000, 0x01000030, 0x07000050, 0x00100082, 0x00000000, 0x0010001a, 0x00000001, 0x0010001a,
+ 0x00000000, 0x03040003, 0x0010003a, 0x00000000, 0x0900004e, 0x00100012, 0x00000002, 0x00100012,
+ 0x00000003, 0x0010000a, 0x00000001, 0x0010000a, 0x00000000, 0x05000036, 0x001000e2, 0x00000003,
+ 0x00100006, 0x00000002, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100e46, 0x00000003, 0x00208006,
+ 0x00000000, 0x00000000, 0x0a00001e, 0x00100032, 0x00000001, 0x00100046, 0x00000001, 0x00004002,
+ 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x01000016, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE cs_group_index = {cs_group_index_code, sizeof(cs_group_index_code)};
+ static const float zero[4] = {0};
+ static const struct
+ {
+ const D3D12_SHADER_BYTECODE *shader;
+ float value;
+ }
+ tests[] =
+ {
+ {&cs_1_thread, 1.0f},
+ {&cs_1_thread, 0.5f},
+ {&cs_1_group, 2.0f},
+ {&cs_1_group, 4.0f},
+ {&cs_group_index, 0.3f},
+ {&cs_group_index, 0.1f},
+ };
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ cb = create_upload_buffer(context.device, sizeof(input), NULL);
+
+ resource = create_default_texture(device, 64, 64, DXGI_FORMAT_R32_FLOAT,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[1].Descriptor.ShaderRegister = 0;
+ root_parameters[1].Descriptor.RegisterSpace = 0;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ descriptor_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_descriptor_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_descriptor_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(descriptor_heap);
+ gpu_descriptor_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap);
+
+ uav_desc.Format = DXGI_FORMAT_R32_FLOAT;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE2D;
+ uav_desc.Texture2D.MipSlice = 0;
+ uav_desc.Texture2D.PlaneSlice = 0;
+ ID3D12Device_CreateUnorderedAccessView(device, resource, NULL, &uav_desc, cpu_descriptor_handle);
+ cpu_descriptor_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(cpu_descriptor_heap);
+ ID3D12Device_CreateUnorderedAccessView(device, resource, NULL, &uav_desc, cpu_descriptor_handle);
+
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+
+ current_shader = NULL;
+ pipeline_state = NULL;
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ if (current_shader != tests[i].shader)
+ {
+ if (pipeline_state)
+ ID3D12PipelineState_Release(pipeline_state);
+
+ current_shader = tests[i].shader;
+ pipeline_state = create_compute_pipeline_state(device, root_signature, *current_shader);
+ }
+
+ memset(&input, 0, sizeof(input));
+ input.x = tests[i].value;
+ update_buffer_data(cb, 0, sizeof(input), &input.x);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewFloat(command_list,
+ gpu_descriptor_handle, cpu_descriptor_handle, resource, zero, 0, NULL);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(resource, 0, queue, command_list, tests[i].value, 2);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12PipelineState_Release(pipeline_state);
+ pipeline_state = create_compute_pipeline_state(device, root_signature, cs_1_store);
+
+ memset(&input, 0, sizeof(input));
+ input.x = 1.0f;
+ update_buffer_data(cb, 0, sizeof(input), &input.x);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewFloat(command_list,
+ gpu_descriptor_handle, cpu_descriptor_handle, resource, zero, 0, NULL);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 64, 64, 1);
+
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(resource, 0, queue, command_list, 1.0f, 2);
+
+ memset(&input, 0, sizeof(input));
+ input.x = 0.5f;
+ update_buffer_data(cb, 0, sizeof(input), &input.x);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 16, 32, 1);
+
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list);
+ set_rect(&rect, 0, 0, 16, 32);
+ check_readback_data_float(&rb, &rect, 0.5f, 2);
+ set_rect(&rect, 0, 32, rb.width, rb.height);
+ check_readback_data_float(&rb, &rect, 1.0f, 2);
+ set_rect(&rect, 16, 0, rb.width, rb.height);
+ check_readback_data_float(&rb, &rect, 1.0f, 2);
+ release_resource_readback(&rb);
+
+ ID3D12PipelineState_Release(pipeline_state);
+ pipeline_state = create_compute_pipeline_state(device, root_signature, cs_dispatch_id);
+
+ memset(&input, 0, sizeof(input));
+ input.x = 0.6f;
+ update_buffer_data(cb, 0, sizeof(input), &input.x);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 15, 15, 1);
+
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list);
+ set_rect(&rect, 0, 0, 60, 60);
+ check_readback_data_float(&rb, &rect, 0.6f, 2);
+ set_rect(&rect, 0, 60, rb.width, rb.height);
+ check_readback_data_float(&rb, &rect, 1.0f, 2);
+ set_rect(&rect, 60, 0, rb.width, rb.height);
+ check_readback_data_float(&rb, &rect, 1.0f, 2);
+ release_resource_readback(&rb);
+
+ memset(&input, 0, sizeof(input));
+ input.x = 0.7f;
+ update_buffer_data(cb, 0, sizeof(input), &input.x);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list, 1,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 16, 16, 1);
+
+ transition_sub_resource_state(command_list, resource, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(resource, 0, queue, command_list, 0.7f, 2);
+
+ ID3D12Resource_Release(cb);
+ ID3D12Resource_Release(resource);
+ ID3D12PipelineState_Release(pipeline_state);
+ ID3D12RootSignature_Release(root_signature);
+ ID3D12DescriptorHeap_Release(cpu_descriptor_heap);
+ ID3D12DescriptorHeap_Release(descriptor_heap);
+ destroy_test_context(&context);
+}
+
+static unsigned int read_uav_counter(const struct test_context *context,
+ ID3D12Resource *counter_buffer, size_t offset)
+{
+ struct resource_readback rb;
+ uint32_t counter;
+
+ transition_sub_resource_state(context->list, counter_buffer, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(counter_buffer, DXGI_FORMAT_R32_UINT, &rb,
+ context->queue, context->list);
+ counter = get_readback_uint(&rb, offset / sizeof(counter), 0, 0);
+ release_resource_readback(&rb);
+ reset_command_list(context->list, context->allocator);
+ transition_sub_resource_state(context->list, counter_buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ return counter;
+}
+
+static int compare_id(const void *a, const void *b)
+{
+ return *(int *)a - *(int *)b;
+}
+
+static void test_uav_counters(void)
+{
+ ID3D12Resource *buffer, *out_buffer, *counter_buffer;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[1];
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[1];
+ ID3D12DescriptorHeap *descriptor_heap;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ uint32_t data, id[128];
+ ID3D12Device *device;
+ uint32_t counter;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD cs_producer_code[] =
+ {
+#if 0
+ RWStructuredBuffer<uint> u;
+
+ [numthreads(4, 1, 1)]
+ void main(uint3 dispatch_id : SV_DispatchThreadID)
+ {
+ uint counter = u.IncrementCounter();
+ u[counter] = dispatch_id.x;
+ }
+#endif
+ 0x43425844, 0x013163a8, 0xe7d371b8, 0x4f71e39a, 0xd479e584, 0x00000001, 0x000000c8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000074, 0x00050050, 0x0000001d, 0x0100086a,
+ 0x0480009e, 0x0011e000, 0x00000000, 0x00000004, 0x0200005f, 0x00020012, 0x02000068, 0x00000001,
+ 0x0400009b, 0x00000004, 0x00000001, 0x00000001, 0x050000b2, 0x00100012, 0x00000000, 0x0011e000,
+ 0x00000000, 0x080000a8, 0x0011e012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000000,
+ 0x0002000a, 0x0100003e,
+ };
+ static const DWORD cs_consumer_code[] =
+ {
+#if 0
+ RWStructuredBuffer<uint> u;
+ RWStructuredBuffer<uint> u2;
+
+ [numthreads(4, 1, 1)]
+ void main()
+ {
+ uint counter = u.DecrementCounter();
+ u2[counter] = u[counter];
+ }
+#endif
+ 0x43425844, 0x957ef3dd, 0x9f317559, 0x09c8f12d, 0xdbfd98c8, 0x00000001, 0x00000100, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000ac, 0x00050050, 0x0000002b, 0x0100086a,
+ 0x0480009e, 0x0011e000, 0x00000000, 0x00000004, 0x0400009e, 0x0011e000, 0x00000001, 0x00000004,
+ 0x02000068, 0x00000001, 0x0400009b, 0x00000004, 0x00000001, 0x00000001, 0x050000b3, 0x00100012,
+ 0x00000000, 0x0011e000, 0x00000000, 0x8b0000a7, 0x80002302, 0x00199983, 0x00100022, 0x00000000,
+ 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0011e006, 0x00000000, 0x090000a8, 0x0011e012,
+ 0x00000001, 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0010001a, 0x00000000, 0x0100003e,
+ };
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[0].NumDescriptors = 2;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_producer_code, sizeof(cs_producer_code)));
+
+ descriptor_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 3);
+
+ buffer = create_default_buffer(device, 1024,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ out_buffer = create_default_buffer(device, 1024,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ counter_buffer = create_default_buffer(device, 1024,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = DXGI_FORMAT_UNKNOWN;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.NumElements = 256;
+ uav_desc.Buffer.StructureByteStride = sizeof(uint32_t);
+ uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE;
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 0));
+ ID3D12Device_CreateUnorderedAccessView(device, out_buffer, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 1));
+
+ counter = 0;
+ upload_buffer_data(counter_buffer, 0, sizeof(counter), &counter, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, counter_buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ /* produce */
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap));
+ ID3D12GraphicsCommandList_Dispatch(command_list, 16, 1, 1);
+
+ counter = read_uav_counter(&context, counter_buffer, 0);
+ ok(counter == 64, "Got unexpected value %u.\n", counter);
+ transition_sub_resource_state(command_list, buffer, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ memcpy(id, rb.data, 64 * sizeof(*id));
+ release_resource_readback(&rb);
+ qsort(id, 64, sizeof(*id), compare_id);
+ for (i = 0; i < 64; ++i)
+ {
+ if (id[i] != i)
+ break;
+ }
+ ok(i == 64, "Got unexpected id %u at %u.\n", id[i], i);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ context.pipeline_state = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_consumer_code, sizeof(cs_consumer_code)));
+
+ /* consume */
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap));
+ ID3D12GraphicsCommandList_Dispatch(command_list, 16, 1, 1);
+
+ transition_sub_resource_state(command_list, out_buffer, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ counter = read_uav_counter(&context, counter_buffer, 0);
+ ok(!counter, "Got unexpected value %u.\n", counter);
+ get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ memcpy(id, rb.data, 64 * sizeof(*id));
+ release_resource_readback(&rb);
+ qsort(id, 64, sizeof(*id), compare_id);
+ for (i = 0; i < 64; ++i)
+ {
+ if (id[i] != i)
+ break;
+ }
+ ok(i == 64, "Got unexpected id %u at %u.\n", id[i], i);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, counter_buffer, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ transition_sub_resource_state(command_list, buffer, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ transition_sub_resource_state(command_list, out_buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ /* produce on CPU */
+ counter = 8;
+ for (i = 0; i < counter; ++i)
+ id[i] = 0xdeadbeef;
+ upload_buffer_data(buffer, 0, counter * sizeof(*id), id, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ upload_buffer_data(counter_buffer, 0, sizeof(counter), &counter, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+
+ transition_sub_resource_state(command_list, counter_buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ transition_sub_resource_state(command_list, buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ /* consume */
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap));
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ transition_sub_resource_state(command_list, out_buffer, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ counter = read_uav_counter(&context, counter_buffer, 0);
+ ok(!counter, "Got unexpected value %u.\n", counter);
+
+ get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < 8; ++i)
+ {
+ data = get_readback_uint(&rb, i, 0, 0);
+ ok(data == 0xdeadbeef, "Got data %u at %u.\n", data, i);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(buffer);
+ ID3D12Resource_Release(out_buffer);
+ ID3D12Resource_Release(counter_buffer);
+ ID3D12DescriptorHeap_Release(descriptor_heap);
+ destroy_test_context(&context);
+}
+
+static void test_decrement_uav_counter(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[1];
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ ID3D12Resource *buffer, *counter_buffer;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[1];
+ ID3D12DescriptorHeap *descriptor_heap;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ uint32_t counter;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD cs_code[] =
+ {
+#if 0
+ RWStructuredBuffer<uint> u;
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ InterlockedMin(u[0], u.DecrementCounter());
+ }
+#endif
+ 0x43425844, 0xceb0e9d3, 0x64ea7417, 0xbd37d26f, 0x589c63c2, 0x00000001, 0x000000c8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000074, 0x00050050, 0x0000001d, 0x0100086a,
+ 0x0480009e, 0x0011e000, 0x00000000, 0x00000004, 0x02000068, 0x00000001, 0x0400009b, 0x00000001,
+ 0x00000001, 0x00000001, 0x050000b3, 0x00100012, 0x00000000, 0x0011e000, 0x00000000, 0x0a0000b1,
+ 0x0011e000, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0010000a,
+ 0x00000000, 0x0100003e,
+ };
+ static const struct
+ {
+ uint32_t initial_value;
+ unsigned int decrement_count;
+ uint32_t expected_value;
+ uint32_t expected_min_value;
+ }
+ tests[] =
+ {
+ {0x00000000, 1, 0xffffffff, 0xffffffff},
+ {0x00000001, 1, 0x00000000, 0x00000000},
+ {0xffffffff, 1, 0xfffffffe, 0xfffffffe},
+ {0x00000010, 16, 0x00000000, 0x00000000},
+ {0x00000010, 17, 0xffffffff, 0x00000000},
+ };
+
+ if (!init_compute_test_context(&context))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+
+ descriptor_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+
+ buffer = create_default_buffer(device, 1024,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ counter_buffer = create_default_buffer(device, 1024,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = DXGI_FORMAT_UNKNOWN;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.NumElements = 256;
+ uav_desc.Buffer.StructureByteStride = sizeof(uint32_t);
+ uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE;
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc,
+ get_cpu_descriptor_handle(&context, descriptor_heap, 0));
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ transition_sub_resource_state(command_list, buffer, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ counter = 0xffffffff;
+ upload_buffer_data(buffer, 0, sizeof(counter), &counter, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ transition_sub_resource_state(command_list, counter_buffer, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ counter = tests[i].initial_value;
+ upload_buffer_data(counter_buffer, 0, sizeof(counter), &counter, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, counter_buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap));
+ ID3D12GraphicsCommandList_Dispatch(command_list, tests[i].decrement_count, 1, 1);
+
+ counter = read_uav_counter(&context, counter_buffer, 0);
+ ok(counter == tests[i].expected_value, "Got %u, expected %u.\n",
+ counter, tests[i].expected_value);
+
+ counter = read_uav_counter(&context, buffer, 0);
+ ok(counter == tests[i].expected_min_value, "Got %u, expected %u.\n",
+ counter, tests[i].expected_min_value);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12Resource_Release(buffer);
+ ID3D12Resource_Release(counter_buffer);
+ ID3D12DescriptorHeap_Release(descriptor_heap);
+ destroy_test_context(&context);
+}
+
+static void test_atomic_instructions(void)
+{
+ ID3D12Resource *ps_buffer, *cs_buffer, *cs_buffer2;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[3];
+ ID3D12PipelineState *pipeline_state;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i, j;
+ bool is_todo;
+ HRESULT hr;
+
+ static const DWORD ps_atomics_code[] =
+ {
+#if 0
+ RWByteAddressBuffer u;
+
+ uint4 v;
+ int4 i;
+
+ void main()
+ {
+ u.InterlockedAnd(0 * 4, v.x);
+ u.InterlockedCompareStore(1 * 4, v.y, v.x);
+ u.InterlockedAdd(2 * 4, v.x);
+ u.InterlockedOr(3 * 4, v.x);
+ u.InterlockedMax(4 * 4, i.x);
+ u.InterlockedMin(5 * 4, i.x);
+ u.InterlockedMax(6 * 4, v.x);
+ u.InterlockedMin(7 * 4, v.x);
+ u.InterlockedXor(8 * 4, v.x);
+ }
+#endif
+ 0x43425844, 0x24c6a30c, 0x2ce4437d, 0xdee8a0df, 0xd18cb4bc, 0x00000001, 0x000001ac, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000158, 0x00000050, 0x00000056, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300009d, 0x0011e000, 0x00000000, 0x080000a9,
+ 0x0011e000, 0x00000000, 0x00004001, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0b0000ac,
+ 0x0011e000, 0x00000000, 0x00004001, 0x00000004, 0x0020801a, 0x00000000, 0x00000000, 0x0020800a,
+ 0x00000000, 0x00000000, 0x080000ad, 0x0011e000, 0x00000000, 0x00004001, 0x00000008, 0x0020800a,
+ 0x00000000, 0x00000000, 0x080000aa, 0x0011e000, 0x00000000, 0x00004001, 0x0000000c, 0x0020800a,
+ 0x00000000, 0x00000000, 0x080000ae, 0x0011e000, 0x00000000, 0x00004001, 0x00000010, 0x0020800a,
+ 0x00000000, 0x00000001, 0x080000af, 0x0011e000, 0x00000000, 0x00004001, 0x00000014, 0x0020800a,
+ 0x00000000, 0x00000001, 0x080000b0, 0x0011e000, 0x00000000, 0x00004001, 0x00000018, 0x0020800a,
+ 0x00000000, 0x00000000, 0x080000b1, 0x0011e000, 0x00000000, 0x00004001, 0x0000001c, 0x0020800a,
+ 0x00000000, 0x00000000, 0x080000ab, 0x0011e000, 0x00000000, 0x00004001, 0x00000020, 0x0020800a,
+ 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_atomics = {ps_atomics_code, sizeof(ps_atomics_code)};
+ static const DWORD cs_atomics_code[] =
+ {
+#if 0
+ RWByteAddressBuffer u;
+ RWByteAddressBuffer u2;
+
+ uint4 v;
+ int4 i;
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ uint r;
+ u.InterlockedAnd(0 * 4, v.x, r);
+ u2.Store(0 * 4, r);
+ u.InterlockedCompareExchange(1 * 4, v.y, v.x, r);
+ u2.Store(1 * 4, r);
+ u.InterlockedAdd(2 * 4, v.x, r);
+ u2.Store(2 * 4, r);
+ u.InterlockedOr(3 * 4, v.x, r);
+ u2.Store(3 * 4, r);
+ u.InterlockedMax(4 * 4, i.x, r);
+ u2.Store(4 * 4, r);
+ u.InterlockedMin(5 * 4, i.x, r);
+ u2.Store(5 * 4, r);
+ u.InterlockedMax(6 * 4, v.x, r);
+ u2.Store(6 * 4, r);
+ u.InterlockedMin(7 * 4, v.x, r);
+ u2.Store(7 * 4, r);
+ u.InterlockedXor(8 * 4, v.x, r);
+ u2.Store(8 * 4, r);
+ }
+#endif
+ 0x43425844, 0x859a96e3, 0x1a35e463, 0x1e89ce58, 0x5cfe430a, 0x00000001, 0x0000026c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000218, 0x00050050, 0x00000086, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300009d, 0x0011e000, 0x00000000, 0x0300009d,
+ 0x0011e000, 0x00000001, 0x02000068, 0x00000001, 0x0400009b, 0x00000001, 0x00000001, 0x00000001,
+ 0x0a0000b5, 0x00100012, 0x00000000, 0x0011e000, 0x00000000, 0x00004001, 0x00000000, 0x0020800a,
+ 0x00000000, 0x00000000, 0x0d0000b9, 0x00100022, 0x00000000, 0x0011e000, 0x00000000, 0x00004001,
+ 0x00000004, 0x0020801a, 0x00000000, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0a0000b4,
+ 0x00100042, 0x00000000, 0x0011e000, 0x00000000, 0x00004001, 0x00000008, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0a0000b6, 0x00100082, 0x00000000, 0x0011e000, 0x00000000, 0x00004001, 0x0000000c,
+ 0x0020800a, 0x00000000, 0x00000000, 0x070000a6, 0x0011e0f2, 0x00000001, 0x00004001, 0x00000000,
+ 0x00100e46, 0x00000000, 0x0a0000ba, 0x00100012, 0x00000000, 0x0011e000, 0x00000000, 0x00004001,
+ 0x00000010, 0x0020800a, 0x00000000, 0x00000001, 0x0a0000bb, 0x00100022, 0x00000000, 0x0011e000,
+ 0x00000000, 0x00004001, 0x00000014, 0x0020800a, 0x00000000, 0x00000001, 0x0a0000bc, 0x00100042,
+ 0x00000000, 0x0011e000, 0x00000000, 0x00004001, 0x00000018, 0x0020800a, 0x00000000, 0x00000000,
+ 0x0a0000bd, 0x00100082, 0x00000000, 0x0011e000, 0x00000000, 0x00004001, 0x0000001c, 0x0020800a,
+ 0x00000000, 0x00000000, 0x070000a6, 0x0011e0f2, 0x00000001, 0x00004001, 0x00000010, 0x00100e46,
+ 0x00000000, 0x0a0000b7, 0x00100012, 0x00000000, 0x0011e000, 0x00000000, 0x00004001, 0x00000020,
+ 0x0020800a, 0x00000000, 0x00000000, 0x070000a6, 0x0011e012, 0x00000001, 0x00004001, 0x00000020,
+ 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static D3D12_SHADER_BYTECODE cs_atomics = {cs_atomics_code, sizeof(cs_atomics_code)};
+ static const char * const instructions[] =
+ {
+ "atomic_and", "atomic_cmp_store", "atomic_iadd", "atomic_or",
+ "atomic_imax", "atomic_imin", "atomic_umax", "atomic_umin", "atomic_xor",
+ };
+ static const char * const imm_instructions[] =
+ {
+ "imm_atomic_and", "imm_atomic_cmp_exch", "imm_atomic_iadd", "imm_atomic_or",
+ "imm_atomic_imax", "imm_atomic_imin", "imm_atomic_umax", "imm_atomic_umin", "imm_atomic_xor",
+ };
+ static const struct test
+ {
+ struct uvec4 v;
+ struct ivec4 i;
+ unsigned int input[ARRAY_SIZE(instructions)];
+ unsigned int expected_result[ARRAY_SIZE(instructions)];
+ }
+ tests[] =
+ {
+ {{ 1, 0 }, {-1}, {0xffff, 0, 1, 0, 0, 0, 0, 0, 0xff }, { 1, 1, 2, 1, 0, ~0u, 1, 0, 0xfe}},
+ {{~0u, ~0u}, { 0}, {0xffff, 0xf, 1, 0, 0, 0, 0, 9, ~0u}, {0xffff, 0xf, 0, ~0u, 0, 0, ~0u, 9, 0}},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 1;
+ desc.rt_height = 1;
+ desc.rt_format = DXGI_FORMAT_R32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[0].Descriptor.ShaderRegister = 0;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[1].Descriptor.ShaderRegister = 1;
+ root_parameters[1].Descriptor.RegisterSpace = 0;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[2].Constants.ShaderRegister = 0;
+ root_parameters[2].Constants.RegisterSpace = 0;
+ root_parameters[2].Constants.Num32BitValues = 8;
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 3;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ ps_buffer = create_default_buffer(device, sizeof(tests->input),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ cs_buffer = create_default_buffer(device, sizeof(tests->input),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ cs_buffer2 = create_default_buffer(device, sizeof(tests->input),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+
+ context.pipeline_state = create_pipeline_state(context.device, context.root_signature, 0, NULL, &ps_atomics, NULL);
+
+ pipeline_state = create_compute_pipeline_state(device, context.root_signature, cs_atomics);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ const struct test *test = &tests[i];
+
+ upload_buffer_data(ps_buffer, 0, sizeof(test->input), test->input, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+
+ upload_buffer_data(cs_buffer, 0, sizeof(test->input), test->input, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+
+ transition_sub_resource_state(command_list, ps_buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ transition_sub_resource_state(command_list, cs_buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ transition_sub_resource_state(command_list, cs_buffer2, 0,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetGraphicsRootUnorderedAccessView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(ps_buffer));
+ ID3D12GraphicsCommandList_SetGraphicsRootUnorderedAccessView(command_list,
+ 1, ID3D12Resource_GetGPUVirtualAddress(cs_buffer));
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 2, 4, &test->v, 0);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 2, 4, &test->i, 4);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(cs_buffer));
+ ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list,
+ 1, ID3D12Resource_GetGPUVirtualAddress(cs_buffer2));
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstants(command_list, 2, 4, &test->v, 0);
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstants(command_list, 2, 4, &test->i, 4);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ transition_sub_resource_state(command_list, ps_buffer, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(ps_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (j = 0; j < ARRAY_SIZE(instructions); ++j)
+ {
+ unsigned int value = get_readback_uint(&rb, j, 0, 0);
+ unsigned int expected = test->expected_result[j];
+
+ is_todo = test->i.x < 0
+ && (!strcmp(instructions[j], "atomic_imax") || !strcmp(instructions[j], "atomic_imin"));
+
+ bug_if(is_todo && is_nvidia_device(device))
+ todo_if(is_todo)
+ ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' "
+ "with inputs (%u, %u), (%d), %#x (%d).\n",
+ i, value, value, expected, expected, instructions[j],
+ test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]);
+ }
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+
+ transition_sub_resource_state(command_list, cs_buffer, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(cs_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (j = 0; j < ARRAY_SIZE(instructions); ++j)
+ {
+ bool todo_instruction = !strcmp(imm_instructions[j], "imm_atomic_imax")
+ || !strcmp(imm_instructions[j], "imm_atomic_imin");
+ unsigned int value = get_readback_uint(&rb, j, 0, 0);
+ unsigned int expected = test->expected_result[j];
+
+ bug_if(test->i.x < 0 && todo_instruction && is_nvidia_device(device))
+ todo_if(test->i.x < 0 && todo_instruction)
+ ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' "
+ "with inputs (%u, %u), (%d), %#x (%d).\n",
+ i, value, value, expected, expected, imm_instructions[j],
+ test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]);
+ }
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+
+ transition_sub_resource_state(command_list, cs_buffer2, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(cs_buffer2, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (j = 0; j < ARRAY_SIZE(instructions); ++j)
+ {
+ unsigned int out_value = get_readback_uint(&rb, j, 0, 0);
+ ok(out_value == test->input[j], "Got original value %u, expected %u for '%s'.\n",
+ out_value, test->input[j], imm_instructions[j]);
+ }
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+
+ transition_sub_resource_state(command_list, ps_buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST);
+ transition_sub_resource_state(command_list, cs_buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST);
+ transition_sub_resource_state(command_list, cs_buffer2, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST);
+ }
+
+ ID3D12Resource_Release(ps_buffer);
+ ID3D12Resource_Release(cs_buffer);
+ ID3D12Resource_Release(cs_buffer2);
+ ID3D12PipelineState_Release(pipeline_state);
+ destroy_test_context(&context);
+}
+
+static void test_buffer_srv(void)
+{
+ struct buffer
+ {
+ unsigned int byte_count;
+ unsigned int data_offset;
+ const void *data;
+ unsigned int structure_byte_stride;
+ };
+
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ const D3D12_SHADER_BYTECODE *current_shader;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[1];
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle;
+ ID3D12DescriptorHeap *descriptor_heap;
+ const struct buffer *current_buffer;
+ unsigned int color, expected_color;
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *buffer;
+ ID3D12Device *device;
+ unsigned int i, x, y;
+ HRESULT hr;
+
+ static const DWORD ps_float4_code[] =
+ {
+#if 0
+ Buffer<float4> b;
+
+ float2 size;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p;
+ int2 coords;
+ p.x = position.x / 640.0f;
+ p.y = position.y / 480.0f;
+ coords = int2(p.x * size.x, p.y * size.y);
+ return b.Load(coords.y * size.x + coords.x);
+ }
+#endif
+ 0x43425844, 0xf10ea650, 0x311f5c38, 0x3a888b7f, 0x58230334, 0x00000001, 0x000001a0, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000104, 0x00000040,
+ 0x00000041, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000858, 0x00107000, 0x00000000,
+ 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x08000038, 0x00100032, 0x00000000, 0x00101516, 0x00000000, 0x00208516,
+ 0x00000000, 0x00000000, 0x0a000038, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002,
+ 0x3b088889, 0x3acccccd, 0x00000000, 0x00000000, 0x05000043, 0x00100032, 0x00000000, 0x00100046,
+ 0x00000000, 0x0a000032, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0010001a, 0x00000000, 0x0500001b, 0x00100012, 0x00000000, 0x0010000a, 0x00000000,
+ 0x0700002d, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_float4 = {ps_float4_code, sizeof(ps_float4_code)};
+ static const DWORD ps_structured_code[] =
+ {
+#if 0
+ StructuredBuffer<float4> b;
+
+ float2 size;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ float2 p;
+ int2 coords;
+ p.x = position.x / 640.0f;
+ p.y = position.y / 480.0f;
+ coords = int2(p.x * size.x, p.y * size.y);
+ return b[coords.y * size.x + coords.x];
+ }
+#endif
+ 0x43425844, 0x246caabb, 0xf1e7d6b9, 0xcbe720dc, 0xcdc23036, 0x00000001, 0x000001c0, 0x00000004,
+ 0x00000030, 0x00000064, 0x00000098, 0x000001b0, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f,
+ 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000110,
+ 0x00000040, 0x00000044, 0x0100486a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x040000a2,
+ 0x00107000, 0x00000000, 0x00000010, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065,
+ 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x08000038, 0x00100032, 0x00000000, 0x00101516,
+ 0x00000000, 0x00208516, 0x00000000, 0x00000000, 0x0a000038, 0x00100032, 0x00000000, 0x00100046,
+ 0x00000000, 0x00004002, 0x3b088889, 0x3acccccd, 0x00000000, 0x00000000, 0x05000043, 0x00100032,
+ 0x00000000, 0x00100046, 0x00000000, 0x0a000032, 0x00100012, 0x00000000, 0x0010000a, 0x00000000,
+ 0x0020800a, 0x00000000, 0x00000000, 0x0010001a, 0x00000000, 0x0500001c, 0x00100012, 0x00000000,
+ 0x0010000a, 0x00000000, 0x090000a7, 0x001020f2, 0x00000000, 0x0010000a, 0x00000000, 0x00004001,
+ 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000002, 0x00000000,
+ };
+ static const D3D12_SHADER_BYTECODE ps_structured = {ps_structured_code, sizeof(ps_structured_code)};
+ static const unsigned int rgba16[] =
+ {
+ 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00,
+ 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000,
+ 0xffffffff, 0xff000000, 0xff000000, 0xff000000,
+ };
+ static const unsigned int rgba4[] =
+ {
+ 0xffffffff, 0xff0000ff,
+ 0xff000000, 0xff00ff00,
+ };
+ static const BYTE r4[] =
+ {
+ 0xde, 0xad,
+ 0xba, 0xbe,
+ };
+ static const struct vec4 rgba_float[] =
+ {
+ {1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 0.0f, 0.0f, 1.0f},
+ {0.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f},
+ };
+ static const struct buffer rgba16_buffer = {sizeof(rgba16), 0, &rgba16};
+ static const struct buffer rgba16_offset_buffer = {256 + sizeof(rgba16), 256, &rgba16};
+ static const struct buffer rgba4_buffer = {sizeof(rgba4), 0, &rgba4};
+ static const struct buffer r4_buffer = {sizeof(r4), 0, &r4};
+ static const struct buffer r4_offset_buffer = {256 + sizeof(r4), 256, &r4};
+ static const struct buffer float_buffer = {sizeof(rgba_float), 0, &rgba_float, sizeof(*rgba_float)};
+ static const struct buffer float_offset_buffer = {256 + sizeof(rgba_float), 256,
+ &rgba_float, sizeof(*rgba_float)};
+ static const unsigned int rgba16_colors2x2[] =
+ {
+ 0xff0000ff, 0xff0000ff, 0xff00ffff, 0xff00ffff,
+ 0xff0000ff, 0xff0000ff, 0xff00ffff, 0xff00ffff,
+ 0xff00ff00, 0xff00ff00, 0xffffff00, 0xffffff00,
+ 0xff00ff00, 0xff00ff00, 0xffffff00, 0xffffff00,
+ };
+ static const unsigned int rgba16_colors1x1[] =
+ {
+ 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff,
+ 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff,
+ 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff,
+ 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff,
+ };
+ static const unsigned int rgba4_colors[] =
+ {
+ 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff,
+ 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff,
+ 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00,
+ 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00,
+ };
+ static const unsigned int r4_colors[] =
+ {
+ 0xff0000de, 0xff0000de, 0xff0000ad, 0xff0000ad,
+ 0xff0000de, 0xff0000de, 0xff0000ad, 0xff0000ad,
+ 0xff0000ba, 0xff0000ba, 0xff0000be, 0xff0000be,
+ 0xff0000ba, 0xff0000ba, 0xff0000be, 0xff0000be,
+ };
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+ static const struct test
+ {
+ const D3D12_SHADER_BYTECODE *shader;
+ const struct buffer *buffer;
+ DXGI_FORMAT srv_format;
+ unsigned int srv_first_element;
+ unsigned int srv_element_count;
+ struct vec2 size;
+ const unsigned int *expected_colors;
+ }
+ tests[] =
+ {
+ {&ps_float4, &rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, {4.0f, 4.0f}, rgba16},
+ {&ps_float4, &rgba16_offset_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 64, 16, {4.0f, 4.0f}, rgba16},
+ {&ps_float4, &rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 4, {2.0f, 2.0f}, rgba16_colors2x2},
+ {&ps_float4, &rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 1, {1.0f, 1.0f}, rgba16_colors1x1},
+ {&ps_float4, &rgba4_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 4, {2.0f, 2.0f}, rgba4_colors},
+ {&ps_float4, &r4_buffer, DXGI_FORMAT_R8_UNORM, 0, 4, {2.0f, 2.0f}, r4_colors},
+ {&ps_float4, &r4_offset_buffer, DXGI_FORMAT_R8_UNORM, 256, 4, {2.0f, 2.0f}, r4_colors},
+ {&ps_structured, &float_buffer, DXGI_FORMAT_UNKNOWN, 0, 4, {2.0f, 2.0f}, rgba4_colors},
+ {&ps_structured, &float_offset_buffer, DXGI_FORMAT_UNKNOWN, 16, 4, {2.0f, 2.0f}, rgba4_colors},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 640;
+ desc.rt_height = 480;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 0;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 2;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ descriptor_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(descriptor_heap);
+ gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap);
+
+ buffer = NULL;
+ current_shader = NULL;
+ current_buffer = NULL;
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ const struct test *test = &tests[i];
+
+ vkd3d_test_set_context("Test %u", i);
+
+ if (current_shader != test->shader)
+ {
+ if (context.pipeline_state)
+ ID3D12PipelineState_Release(context.pipeline_state);
+ current_shader = tests[i].shader;
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format,
+ NULL, current_shader, NULL);
+ }
+
+ if (current_buffer != test->buffer)
+ {
+ if (buffer)
+ ID3D12Resource_Release(buffer);
+
+ current_buffer = test->buffer;
+
+ buffer = create_default_buffer(device, current_buffer->byte_count,
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+
+ upload_buffer_data(buffer, current_buffer->data_offset,
+ current_buffer->byte_count - current_buffer->data_offset,
+ current_buffer->data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+
+ transition_sub_resource_state(command_list, buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+ }
+
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = test->srv_format;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.Buffer.FirstElement = test->srv_first_element;
+ srv_desc.Buffer.NumElements = test->srv_element_count;
+ srv_desc.Buffer.StructureByteStride = current_buffer->structure_byte_stride;
+ ID3D12Device_CreateShaderResourceView(device, buffer, &srv_desc, cpu_handle);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 2, &test->size.x, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (y = 0; y < 4; ++y)
+ {
+ for (x = 0; x < 4; ++x)
+ {
+ color = get_readback_uint(&rb, 80 + x * 160, 60 + y * 120, 0);
+ expected_color = test->expected_colors[y * 4 + x];
+ ok(compare_color(color, expected_color, 1),
+ "Test %u: Got 0x%08x, expected 0x%08x at (%u, %u).\n",
+ i, color, expected_color, x, y);
+ }
+ }
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12DescriptorHeap_Release(descriptor_heap);
+ ID3D12Resource_Release(buffer);
+ destroy_test_context(&context);
+}
+
+static void test_create_query_heap(void)
+{
+ ID3D12Device *device;
+ D3D12_QUERY_HEAP_DESC heap_desc;
+ ID3D12QueryHeap *query_heap;
+ ULONG refcount;
+ HRESULT hr;
+ int i;
+
+ static const D3D12_QUERY_HEAP_TYPE types[] =
+ {
+ D3D12_QUERY_HEAP_TYPE_OCCLUSION,
+ D3D12_QUERY_HEAP_TYPE_TIMESTAMP,
+ D3D12_QUERY_HEAP_TYPE_PIPELINE_STATISTICS,
+ };
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(types); ++i)
+ {
+ heap_desc.Type = types[i];
+ heap_desc.Count = 1;
+ heap_desc.NodeMask = 0;
+
+ hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap);
+ ok(hr == S_OK, "Failed to create query heap, type %u, hr %#x.\n", types[i], hr);
+
+ ID3D12QueryHeap_Release(query_heap);
+ }
+
+ heap_desc.Type = D3D12_QUERY_HEAP_TYPE_SO_STATISTICS;
+ heap_desc.Count = 1;
+ heap_desc.NodeMask = 0;
+
+ hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap);
+ if (hr != E_NOTIMPL)
+ {
+ ok(hr == S_OK, "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr);
+ ID3D12QueryHeap_Release(query_heap);
+ }
+ else
+ {
+ skip("Stream output is not supported.\n");
+ }
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_query_timestamp(void)
+{
+ uint64_t timestamps[4], timestamp_frequency, timestamp_diff, time_diff;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_QUERY_HEAP_DESC heap_desc;
+ struct test_context_desc desc;
+ ID3D12QueryHeap *query_heap;
+ struct resource_readback rb;
+ struct test_context context;
+ time_t time_start, time_end;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *resource;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ time_start = time(NULL);
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ hr = ID3D12CommandQueue_GetTimestampFrequency(queue, ×tamp_frequency);
+ ok(SUCCEEDED(hr), "Failed to get timestamp frequency, hr %#x.\n", hr);
+
+ heap_desc.Type = D3D12_QUERY_HEAP_TYPE_TIMESTAMP;
+ heap_desc.Count = ARRAY_SIZE(timestamps);
+ heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap);
+ ok(SUCCEEDED(hr), "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr);
+
+ resource = create_readback_buffer(device, sizeof(timestamps));
+
+ for (i = 0; i < ARRAY_SIZE(timestamps); ++i)
+ ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, i);
+
+ ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap,
+ D3D12_QUERY_TYPE_TIMESTAMP, 0, 1, resource, 0);
+ ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap,
+ D3D12_QUERY_TYPE_TIMESTAMP, 1, 3, resource, sizeof(uint64_t));
+
+ get_buffer_readback_with_command_list(resource, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list);
+
+ time_end = time(NULL) + 1;
+
+ for (i = 0; i < ARRAY_SIZE(timestamps); ++i)
+ timestamps[i] = get_readback_uint64(&rb, i, 0);
+
+ for (i = 0; i < ARRAY_SIZE(timestamps) - 1; ++i)
+ {
+ ok(timestamps[i] <= timestamps[i + 1], "Expected timestamps to monotonically increase, "
+ "but got %"PRIu64" > %"PRIu64".\n", timestamps[i], timestamps[i + 1]);
+ }
+
+ time_diff = (uint64_t)difftime(time_end, time_start) * timestamp_frequency;
+ timestamp_diff = timestamps[ARRAY_SIZE(timestamps) - 1] - timestamps[0];
+
+ ok(timestamp_diff <= time_diff, "Expected timestamp difference to be bounded by CPU time difference, "
+ "but got %"PRIu64" > %"PRIu64".\n", timestamp_diff, time_diff);
+
+ release_resource_readback(&rb);
+ ID3D12QueryHeap_Release(query_heap);
+ ID3D12Resource_Release(resource);
+ destroy_test_context(&context);
+}
+
+static void test_query_pipeline_statistics(void)
+{
+ D3D12_QUERY_DATA_PIPELINE_STATISTICS *pipeline_statistics;
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ D3D12_QUERY_HEAP_DESC heap_desc;
+ ID3D12QueryHeap *query_heap;
+ ID3D12Resource *resource;
+ struct resource_readback rb;
+ unsigned int pixel_count, i;
+ HRESULT hr;
+
+ if (!init_test_context(&context, NULL))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ heap_desc.Type = D3D12_QUERY_HEAP_TYPE_PIPELINE_STATISTICS;
+ heap_desc.Count = 2;
+ heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap);
+ ok(SUCCEEDED(hr), "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr);
+
+ resource = create_readback_buffer(device, 2 * sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS));
+
+ /* First query: do nothing. */
+ ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_PIPELINE_STATISTICS, 0);
+ ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_PIPELINE_STATISTICS, 0);
+ ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, D3D12_QUERY_TYPE_PIPELINE_STATISTICS, 0, 1,
+ resource, 0);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ /* Second query: draw something simple. */
+ ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_PIPELINE_STATISTICS, 1);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_PIPELINE_STATISTICS, 1);
+ ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, D3D12_QUERY_TYPE_PIPELINE_STATISTICS, 1, 1,
+ resource, sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS));
+
+ get_buffer_readback_with_command_list(resource, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list);
+
+ for (i = 0; i < sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS) / sizeof(uint64_t); ++i)
+ {
+ uint64_t value = get_readback_uint64(&rb, i, 0);
+ ok(!value, "Element %d: Got %"PRIu64", expected 0.\n", i, value);
+ }
+
+ pipeline_statistics = get_readback_data(&rb, 1, 0, 0, sizeof(*pipeline_statistics));
+
+ /* We read 3 vertices that formed one primitive. */
+ ok(pipeline_statistics->IAVertices == 3, "IAVertices: Got %"PRIu64", expected 3.\n",
+ pipeline_statistics->IAVertices);
+ ok(pipeline_statistics->IAPrimitives == 1, "IAPrimitives: Got %"PRIu64", expected 1.\n",
+ pipeline_statistics->IAPrimitives);
+ ok(pipeline_statistics->VSInvocations == 3, "VSInvocations: Got %"PRIu64", expected 3.\n",
+ pipeline_statistics->VSInvocations);
+
+ /* No geometry shader output primitives.
+ * Depending on the graphics card, the geometry shader might still have been invoked, so
+ * GSInvocations might be whatever. */
+ ok(pipeline_statistics->GSPrimitives == 0, "GSPrimitives: Got %"PRIu64", expected 0.\n",
+ pipeline_statistics->GSPrimitives);
+
+ /* One primitive sent to the rasterizer, but it might have been broken up into smaller pieces then. */
+ ok(pipeline_statistics->CInvocations == 1, "CInvocations: Got %"PRIu64", expected 1.\n",
+ pipeline_statistics->CInvocations);
+ ok(pipeline_statistics->CPrimitives > 0, "CPrimitives: Got %"PRIu64", expected > 0.\n",
+ pipeline_statistics->CPrimitives);
+
+ /* Exact number of pixel shader invocations depends on the graphics card. */
+ pixel_count = context.render_target_desc.Width * context.render_target_desc.Height;
+ ok(pipeline_statistics->PSInvocations >= pixel_count, "PSInvocations: Got %"PRIu64", expected >= %u.\n",
+ pipeline_statistics->PSInvocations, pixel_count);
+
+ /* We used no tessellation or compute shaders at all. */
+ ok(pipeline_statistics->HSInvocations == 0, "HSInvocations: Got %"PRIu64", expected 0.\n",
+ pipeline_statistics->HSInvocations);
+ ok(pipeline_statistics->DSInvocations == 0, "DSInvocations: Got %"PRIu64", expected 0.\n",
+ pipeline_statistics->DSInvocations);
+ ok(pipeline_statistics->CSInvocations == 0, "CSInvocations: Got %"PRIu64", expected 0.\n",
+ pipeline_statistics->CSInvocations);
+
+ release_resource_readback(&rb);
+ ID3D12QueryHeap_Release(query_heap);
+ ID3D12Resource_Release(resource);
+ destroy_test_context(&context);
+}
+
+static void test_query_occlusion(void)
+{
+ struct test_context_desc desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ struct depth_stencil_resource ds;
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ D3D12_QUERY_HEAP_DESC heap_desc;
+ ID3D12QueryHeap *query_heap;
+ ID3D12Resource *resource;
+ struct resource_readback rb;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float depth;
+
+ float main() : SV_Depth
+ {
+ return depth;
+ }
+#endif
+ 0x43425844, 0x91af6cd0, 0x7e884502, 0xcede4f54, 0x6f2c9326, 0x00000001, 0x000000b0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff,
+ 0x00000e01, 0x445f5653, 0x68747065, 0xababab00, 0x52444853, 0x00000038, 0x00000040, 0x0000000e,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x02000065, 0x0000c001, 0x05000036, 0x0000c001,
+ 0x0020800a, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const struct
+ {
+ D3D12_QUERY_TYPE type;
+ bool draw;
+ float clear_depth;
+ float depth;
+ }
+ tests[] =
+ {
+ {D3D12_QUERY_TYPE_OCCLUSION, false, 1.0f, 0.5f},
+ {D3D12_QUERY_TYPE_OCCLUSION, true, 1.0f, 0.5f},
+ {D3D12_QUERY_TYPE_BINARY_OCCLUSION, false, 1.0f, 0.5f},
+ {D3D12_QUERY_TYPE_BINARY_OCCLUSION, true, 1.0f, 0.5f},
+ {D3D12_QUERY_TYPE_OCCLUSION, false, 0.0f, 0.5f},
+ {D3D12_QUERY_TYPE_OCCLUSION, true, 0.0f, 0.5f},
+ {D3D12_QUERY_TYPE_BINARY_OCCLUSION, false, 0.0f, 0.5f},
+ {D3D12_QUERY_TYPE_BINARY_OCCLUSION, true, 0.0f, 0.5f},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ init_depth_stencil(&ds, context.device, 640, 480, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL);
+ set_viewport(&context.viewport, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f);
+ set_rect(&context.scissor_rect, 0, 0, 640, 480);
+
+ context.root_signature = create_32bit_constants_root_signature(context.device,
+ 0, 1, D3D12_SHADER_VISIBILITY_PIXEL);
+ init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL);
+ pso_desc.NumRenderTargets = 0;
+ pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT;
+ pso_desc.DepthStencilState.DepthEnable = true;
+ pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL;
+ pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_LESS;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(SUCCEEDED(hr), "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ heap_desc.Type = D3D12_QUERY_HEAP_TYPE_OCCLUSION;
+ heap_desc.Count = ARRAY_SIZE(tests);
+ heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap);
+ ok(SUCCEEDED(hr), "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr);
+
+ resource = create_readback_buffer(device, ARRAY_SIZE(tests) * sizeof(uint64_t));
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, tests[i].clear_depth, 0, 0, NULL);
+
+ ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, tests[i].type, i);
+
+ if (tests[i].draw)
+ {
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 1, &tests[i].depth, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ }
+
+ ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, tests[i].type, i);
+ ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, tests[i].type, i, 1,
+ resource, i * sizeof(uint64_t));
+ }
+ vkd3d_test_set_context(NULL);
+
+ get_buffer_readback_with_command_list(resource, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list);
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ const bool samples_passed = tests[i].draw && tests[i].clear_depth > tests[i].depth;
+ const uint64_t result = get_readback_uint64(&rb, i, 0);
+ uint64_t expected_result;
+
+ if (tests[i].type == D3D12_QUERY_TYPE_BINARY_OCCLUSION)
+ expected_result = samples_passed ? 1 : 0;
+ else
+ expected_result = samples_passed ? 640 * 480 : 0;
+
+ ok(result == expected_result || (expected_result && result >= expected_result),
+ "Test %u: Got unexpected result %"PRIu64".\n", i, result);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12QueryHeap_Release(query_heap);
+ ID3D12Resource_Release(resource);
+ destroy_depth_stencil(&ds);
+ destroy_test_context(&context);
+}
+
+static void test_resolve_non_issued_query_data(void)
+{
+ static const uint64_t initial_data[] = {0xdeadbeef, 0xdeadbeef, 0xdeadbabe, 0xdeadbeef};
+ ID3D12Resource *readback_buffer, *upload_buffer;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_QUERY_HEAP_DESC heap_desc;
+ struct test_context_desc desc;
+ ID3D12QueryHeap *query_heap;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ uint64_t *timestamps;
+ HRESULT hr;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ heap_desc.Type = D3D12_QUERY_HEAP_TYPE_TIMESTAMP;
+ heap_desc.Count = ARRAY_SIZE(initial_data);
+ heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap);
+ ok(SUCCEEDED(hr), "Failed to create query heap, hr %#x.\n", hr);
+
+ readback_buffer = create_readback_buffer(device, sizeof(initial_data));
+ upload_buffer = create_upload_buffer(context.device, sizeof(initial_data), initial_data);
+
+ ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, 0);
+ ID3D12GraphicsCommandList_CopyResource(command_list, readback_buffer, upload_buffer);
+ ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, 3);
+ ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap,
+ D3D12_QUERY_TYPE_TIMESTAMP, 0, 4, readback_buffer, 0);
+
+ get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list);
+ timestamps = get_readback_data(&rb, 0, 0, 0, sizeof(*timestamps));
+ ok(timestamps[0] != initial_data[0] && timestamps[0] > 0,
+ "Got unexpected timestamp %#"PRIx64".\n", timestamps[0]);
+ ok(!timestamps[1], "Got unexpected timestamp %#"PRIx64".\n", timestamps[1]);
+ ok(!timestamps[2], "Got unexpected timestamp %#"PRIx64".\n", timestamps[2]);
+ ok(timestamps[3] != initial_data[3] && timestamps[3] > 0,
+ "Got unexpected timestamp %#"PRIx64".\n", timestamps[3]);
+ release_resource_readback(&rb);
+
+ ID3D12QueryHeap_Release(query_heap);
+ ID3D12Resource_Release(readback_buffer);
+ ID3D12Resource_Release(upload_buffer);
+ destroy_test_context(&context);
+}
+
+static void test_resolve_query_data_in_different_command_list(void)
+{
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_QUERY_HEAP_DESC heap_desc;
+ ID3D12Resource *readback_buffer;
+ struct resource_readback rb;
+ ID3D12QueryHeap *query_heap;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ const unsigned int readback_buffer_capacity = 4;
+
+ if (!init_test_context(&context, NULL))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ heap_desc.Type = D3D12_QUERY_HEAP_TYPE_OCCLUSION;
+ heap_desc.Count = 1;
+ heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap);
+ ok(SUCCEEDED(hr), "Failed to create query heap, hr %#x.\n", hr);
+
+ readback_buffer = create_readback_buffer(device, readback_buffer_capacity * sizeof(uint64_t));
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+ for (i = 0; i < readback_buffer_capacity / 2; ++i)
+ {
+ ID3D12GraphicsCommandList_ResolveQueryData(command_list,
+ query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(uint64_t));
+ }
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+ exec_command_list(queue, command_list);
+ wait_queue_idle(context.device, queue);
+
+ reset_command_list(command_list, context.allocator);
+ for (; i < readback_buffer_capacity; ++i)
+ {
+ ID3D12GraphicsCommandList_ResolveQueryData(command_list,
+ query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(uint64_t));
+ }
+
+ get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list);
+ for (i = 0; i < readback_buffer_capacity; ++i)
+ {
+ uint64_t expected_result = context.render_target_desc.Width * context.render_target_desc.Height;
+ uint64_t result = get_readback_uint64(&rb, i, 0);
+
+ ok(result == expected_result, "Got unexpected result %"PRIu64" at %u.\n", result, i);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12QueryHeap_Release(query_heap);
+ ID3D12Resource_Release(readback_buffer);
+ destroy_test_context(&context);
+}
+
+static void test_resolve_query_data_in_reordered_command_list(void)
+{
+ ID3D12GraphicsCommandList *command_lists[2];
+ ID3D12CommandAllocator *command_allocator;
+ D3D12_QUERY_HEAP_DESC heap_desc;
+ ID3D12Resource *readback_buffer;
+ struct resource_readback rb;
+ ID3D12QueryHeap *query_heap;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ uint64_t result;
+ HRESULT hr;
+
+ if (!init_test_context(&context, NULL))
+ return;
+ device = context.device;
+ command_lists[0] = context.list;
+ queue = context.queue;
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ &IID_ID3D12CommandAllocator, (void **)&command_allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_lists[1]);
+ ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr);
+
+ heap_desc.Type = D3D12_QUERY_HEAP_TYPE_OCCLUSION;
+ heap_desc.Count = 1;
+ heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap);
+ ok(SUCCEEDED(hr), "Failed to create query heap, hr %#x.\n", hr);
+
+ readback_buffer = create_readback_buffer(device, sizeof(uint64_t));
+
+ /* Read query results in the second command list. */
+ ID3D12GraphicsCommandList_ResolveQueryData(command_lists[1],
+ query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, 0);
+ hr = ID3D12GraphicsCommandList_Close(command_lists[1]);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+
+ /* Produce query results in the first command list. */
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_lists[0], 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_lists[0], context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_lists[0], context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_lists[0], D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_lists[0], 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_lists[0], 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_BeginQuery(command_lists[0], query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_lists[0], 3, 1, 0, 0);
+ ID3D12GraphicsCommandList_EndQuery(command_lists[0], query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0);
+ hr = ID3D12GraphicsCommandList_Close(command_lists[0]);
+ ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+
+ ID3D12CommandQueue_ExecuteCommandLists(queue,
+ ARRAY_SIZE(command_lists), (ID3D12CommandList **)command_lists);
+ wait_queue_idle(device, queue);
+
+ reset_command_list(command_lists[0], context.allocator);
+ get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_lists[0]);
+ result = get_readback_uint64(&rb, 0, 0);
+ todo ok(result == context.render_target_desc.Width * context.render_target_desc.Height,
+ "Got unexpected result %"PRIu64".\n", result);
+ release_resource_readback(&rb);
+
+ ID3D12GraphicsCommandList_Release(command_lists[1]);
+ ID3D12CommandAllocator_Release(command_allocator);
+ ID3D12QueryHeap_Release(query_heap);
+ ID3D12Resource_Release(readback_buffer);
+ destroy_test_context(&context);
+}
+
+static void test_execute_indirect(void)
+{
+ ID3D12Resource *argument_buffer, *count_buffer, *uav;
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ ID3D12CommandSignature *command_signature;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ D3D12_ROOT_PARAMETER root_parameter;
+ ID3D12PipelineState *pipeline_state;
+ ID3D12RootSignature *root_signature;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ D3D12_INDEX_BUFFER_VIEW ibv;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *vb, *ib;
+ unsigned int i;
+ D3D12_BOX box;
+ HRESULT hr;
+
+ static const struct
+ {
+ struct vec4 position;
+ uint32_t color;
+ }
+ vertices[] =
+ {
+ {{-1.0f, -1.0f, 0.0f, 1.0f}, 0xffffff00},
+ {{-1.0f, 1.0f, 0.0f, 1.0f}, 0xffffff00},
+ {{ 1.0f, -1.0f, 0.0f, 1.0f}, 0xffffff00},
+ {{ 1.0f, 1.0f, 0.0f, 1.0f}, 0xffffff00},
+
+ {{-1.0f, -1.0f, 0.0f, 1.0f}, 0xff00ff00},
+ {{-1.0f, 0.5f, 0.0f, 1.0f}, 0xff00ff00},
+ {{ 0.5f, -1.0f, 0.0f, 1.0f}, 0xff00ff00},
+ {{ 0.5f, 0.5f, 0.0f, 1.0f}, 0xff00ff00},
+
+ {{-1.0f, -1.0f, 0.0f, 1.0f}, 0xff00ff00},
+ {{-1.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00},
+ {{ 1.0f, -1.0f, 0.0f, 1.0f}, 0xff00ff00},
+ {{ 1.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00},
+ };
+ static const uint32_t indices[] = {0, 1, 2, 3, 2, 1};
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const DWORD vs_code[] =
+ {
+#if 0
+ struct vs_data
+ {
+ float4 pos : SV_POSITION;
+ float4 color : COLOR;
+ };
+
+ void main(in struct vs_data vs_input, out struct vs_data vs_output)
+ {
+ vs_output.pos = vs_input.pos;
+ vs_output.color = vs_input.color;
+ }
+#endif
+ 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f,
+ 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040,
+ 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067,
+ 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2,
+ 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ struct ps_data
+ {
+ float4 pos : SV_POSITION;
+ float4 color : COLOR;
+ };
+
+ float4 main(struct ps_data ps_input) : SV_Target
+ {
+ return ps_input.color;
+ }
+#endif
+ 0x43425844, 0x89803e59, 0x3f798934, 0xf99181df, 0xf5556512, 0x00000001, 0x000000f4, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040,
+ 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036,
+ 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const DWORD cs_code[] =
+ {
+#if 0
+ RWByteAddressBuffer o;
+
+ [numthreads(1, 1, 1)]
+ void main(uint3 group_id : SV_groupID)
+ {
+ uint idx = group_id.x + group_id.y * 2 + group_id.z * 6;
+ o.Store(idx * 4, idx);
+ }
+#endif
+ 0x43425844, 0xfdd6a339, 0xf3b8096e, 0xb5977014, 0xcdb26cfd, 0x00000001, 0x00000118, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000c4, 0x00050050, 0x00000031, 0x0100086a,
+ 0x0300009d, 0x0011e000, 0x00000000, 0x0200005f, 0x00021072, 0x02000068, 0x00000001, 0x0400009b,
+ 0x00000001, 0x00000001, 0x00000001, 0x06000029, 0x00100012, 0x00000000, 0x0002101a, 0x00004001,
+ 0x00000001, 0x0600001e, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0002100a, 0x08000023,
+ 0x00100012, 0x00000000, 0x0002102a, 0x00004001, 0x00000006, 0x0010000a, 0x00000000, 0x07000029,
+ 0x00100022, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000002, 0x070000a6, 0x0011e012,
+ 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static const struct argument_data
+ {
+ D3D12_DRAW_ARGUMENTS draws[4];
+ D3D12_DISPATCH_ARGUMENTS dispatch;
+ D3D12_DRAW_INDEXED_ARGUMENTS indexed_draws[2];
+ }
+ argument_data =
+ {
+ {{6, 1, 4, 0}, {6, 1, 8, 0}, {6, 1, 0, 0}},
+ {2, 3, 4},
+ {{6, 1, 0, 0, 0}, {6, 1, 0, 4, 0}},
+ };
+ static const uint32_t count_data[] = {2, 1};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout);
+
+ vb = create_upload_buffer(context.device, sizeof(vertices), vertices);
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*vertices);
+ vbv.SizeInBytes = sizeof(vertices);
+
+ ib = create_upload_buffer(context.device, sizeof(indices), indices);
+ ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib);
+ ibv.SizeInBytes = sizeof(indices);
+ ibv.Format = DXGI_FORMAT_R32_UINT;
+
+ argument_buffer = create_upload_buffer(context.device, sizeof(argument_data), &argument_data);
+ count_buffer = create_upload_buffer(context.device, sizeof(count_data), count_data);
+
+ command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 2, argument_buffer, 0, NULL, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 4, argument_buffer, 0,
+ count_buffer, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+
+ ID3D12CommandSignature_Release(command_signature);
+ command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH);
+
+ uav = create_default_buffer(context.device, 2 * 3 * 4 * sizeof(UINT),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameter.Descriptor.ShaderRegister = 0;
+ root_parameter.Descriptor.RegisterSpace = 0;
+ root_parameter.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = &root_parameter;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(context.device, &root_signature_desc, &root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature);
+ pipeline_state = create_compute_pipeline_state(context.device, root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(uav));
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 1, argument_buffer,
+ offsetof(struct argument_data, dispatch), NULL, 0);
+
+ transition_sub_resource_state(command_list, uav, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(uav, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < rb.width; ++i)
+ {
+ unsigned int ret = get_readback_uint(&rb, i, 0, 0);
+ ok(ret == i, "Got unexpected result %#x at index %u.\n", ret, i);
+ }
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12CommandSignature_Release(command_signature);
+ command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature,
+ ARRAY_SIZE(argument_data.indexed_draws), argument_buffer,
+ offsetof(struct argument_data, indexed_draws), NULL, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ set_box(&box, 0, 0, 0, 32, 8, 1);
+ check_readback_data_uint(&rb, &box, 0xffffff00, 0);
+ set_box(&box, 24, 8, 0, 32, 32, 1);
+ check_readback_data_uint(&rb, &box, 0xffffff00, 0);
+ set_box(&box, 0, 8, 0, 24, 32, 1);
+ check_readback_data_uint(&rb, &box, 0xff00ff00, 0);
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature,
+ ARRAY_SIZE(argument_data.indexed_draws), argument_buffer,
+ offsetof(struct argument_data, indexed_draws), count_buffer, sizeof(uint32_t));
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffff00, 0);
+
+ ID3D12PipelineState_Release(pipeline_state);
+ ID3D12RootSignature_Release(root_signature);
+ ID3D12Resource_Release(ib);
+ ID3D12Resource_Release(uav);
+ ID3D12Resource_Release(vb);
+ ID3D12CommandSignature_Release(command_signature);
+ ID3D12Resource_Release(argument_buffer);
+ ID3D12Resource_Release(count_buffer);
+ destroy_test_context(&context);
+}
+
+static void test_dispatch_zero_thread_groups(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ ID3D12CommandSignature *command_signature;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ ID3D12Resource *argument_buffer, *uav;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ unsigned int ret, i;
+ HRESULT hr;
+
+ static const DWORD cs_code[] =
+ {
+#if 0
+ RWByteAddressBuffer o;
+
+ uint v;
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ o.Store(0, v);
+ }
+#endif
+ 0x43425844, 0x3ad946e3, 0x83e33b81, 0x83532aa4, 0x40831f89, 0x00000001, 0x000000b0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x0000005c, 0x00050050, 0x00000017, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300009d, 0x0011e000, 0x00000000, 0x0400009b,
+ 0x00000001, 0x00000001, 0x00000001, 0x080000a6, 0x0011e012, 0x00000000, 0x00004001, 0x00000000,
+ 0x0020800a, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_DISPATCH_ARGUMENTS argument_data[] =
+ {
+ {1, 1, 1},
+ {0, 3, 4},
+ {0, 0, 4},
+ {0, 0, 0},
+ {4, 0, 0},
+ {4, 0, 3},
+ {4, 2, 0},
+ {0, 2, 0},
+ {0, 0, 0},
+ };
+
+ if (!init_compute_test_context(&context))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ argument_buffer = create_upload_buffer(context.device, sizeof(argument_data), &argument_data);
+
+ command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH);
+
+ uav = create_default_buffer(context.device, 2 * 256, /* minTexelBufferOffsetAlignment */
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[0].Descriptor.ShaderRegister = 0;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 1;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ context.pipeline_state = create_compute_pipeline_state(context.device, context.root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+
+ ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(uav));
+ for (i = 0; i < ARRAY_SIZE(argument_data); ++i)
+ {
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstant(command_list,
+ 1, 10 + i, 0);
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature,
+ 1, argument_buffer, i * sizeof(*argument_data), NULL, 0);
+ }
+
+ ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(uav) + 256);
+ for (i = 0; i < ARRAY_SIZE(argument_data); ++i)
+ {
+ const D3D12_DISPATCH_ARGUMENTS *arg = &argument_data[i];
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstant(command_list,
+ 1, 50 + i, 0);
+ ID3D12GraphicsCommandList_Dispatch(command_list,
+ arg->ThreadGroupCountX, arg->ThreadGroupCountY, arg->ThreadGroupCountZ);
+ }
+
+ transition_sub_resource_state(command_list, uav, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(uav, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ ret = get_readback_uint(&rb, 0, 0, 0);
+ ok(ret == 10, "Got unexpected result %#x.\n", ret);
+ ret = get_readback_uint(&rb, 64, 0, 0);
+ ok(ret == 50, "Got unexpected result %#x.\n", ret);
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(uav);
+ ID3D12CommandSignature_Release(command_signature);
+ ID3D12Resource_Release(argument_buffer);
+ destroy_test_context(&context);
+}
+
+static void test_zero_vertex_stride(void)
+{
+ ID3D12PipelineState *instance_pipeline_state;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ D3D12_VERTEX_BUFFER_VIEW vbv[2];
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *vb[2];
+
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"sv_position", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"color", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const D3D12_INPUT_ELEMENT_DESC instance_layout_desc[] =
+ {
+ {"sv_position", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"color", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 0},
+ };
+ static const DWORD vs_code[] =
+ {
+#if 0
+ struct vs_data
+ {
+ float4 pos : SV_POSITION;
+ float4 color : COLOR;
+ };
+
+ void main(in struct vs_data vs_input, out struct vs_data vs_output)
+ {
+ vs_output.pos = vs_input.pos;
+ vs_output.color = vs_input.color;
+ }
+#endif
+ 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f,
+ 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040,
+ 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067,
+ 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2,
+ 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ struct ps_data
+ {
+ float4 pos : SV_POSITION;
+ float4 color : COLOR;
+ };
+
+ float4 main(struct ps_data ps_input) : SV_Target
+ {
+ return ps_input.color;
+ }
+#endif
+ 0x43425844, 0x89803e59, 0x3f798934, 0xf99181df, 0xf5556512, 0x00000001, 0x000000f4, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040,
+ 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036,
+ 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const struct vec4 positions[] =
+ {
+ {-1.0f, -1.0f, 0.0f, 1.0f},
+ {-1.0f, 1.0f, 0.0f, 1.0f},
+ { 1.0f, -1.0f, 0.0f, 1.0f},
+ { 1.0f, 1.0f, 0.0f, 1.0f},
+ };
+ static const struct vec4 colors[] =
+ {
+ {0.0f, 1.0f, 0.0f, 1.0f},
+ {1.0f, 0.0f, 0.0f, 1.0f},
+ {0.5f, 0.5f, 0.5f, 1.0f},
+ {1.0f, 0.0f, 1.0f, 1.0f},
+ {1.0f, 0.0f, 1.0f, 1.0f},
+ {1.0f, 0.0f, 1.0f, 1.0f},
+ {1.0f, 0.0f, 1.0f, 1.0f},
+ {1.0f, 0.0f, 1.0f, 1.0f},
+ {1.0f, 0.0f, 1.0f, 1.0f},
+ };
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_empty_root_signature(context.device,
+ D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT);
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout);
+
+ input_layout.pInputElementDescs = instance_layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(instance_layout_desc);
+ instance_pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout);
+
+ memset(vbv, 0, sizeof(vbv));
+ vb[0] = create_upload_buffer(context.device, sizeof(positions), positions);
+ vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]);
+ vbv[0].StrideInBytes = sizeof(*positions);
+ vbv[0].SizeInBytes = sizeof(positions);
+
+ vb[1] = create_upload_buffer(context.device, sizeof(colors), colors);
+ vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]) + 2 * sizeof(*colors);
+ vbv[1].StrideInBytes = 0;
+ vbv[1].SizeInBytes = sizeof(colors);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff808080, 2);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, instance_pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12Resource_Release(vb[1]);
+ ID3D12Resource_Release(vb[0]);
+ ID3D12PipelineState_Release(instance_pipeline_state);
+ destroy_test_context(&context);
+}
+
+static void test_instance_id(void)
+{
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12CommandSignature *command_signature;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ D3D12_CPU_DESCRIPTOR_HANDLE rtvs[2];
+ D3D12_VERTEX_BUFFER_VIEW vbv[3];
+ ID3D12Resource *argument_buffer;
+ ID3D12Resource *render_target;
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *vb[3];
+ unsigned int i, j;
+ HRESULT hr;
+
+ D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"position", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"color", 0, DXGI_FORMAT_R8_UNORM, 1, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1},
+ {"v_offset", 0, DXGI_FORMAT_R32_FLOAT, 2, D3D12_APPEND_ALIGNED_ELEMENT,
+ D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1},
+ };
+ static const DWORD vs_code[] =
+ {
+#if 0
+ struct vs_in
+ {
+ float4 position : Position;
+ float color : Color;
+ float v_offset : V_Offset;
+ uint instance_id : SV_InstanceId;
+ };
+
+ struct vs_out
+ {
+ float4 position : SV_Position;
+ float color : Color;
+ uint instance_id : InstanceId;
+ };
+
+ void main(vs_in i, out vs_out o)
+ {
+ o.position = i.position;
+ o.position.x += i.v_offset;
+ o.color = i.color;
+ o.instance_id = i.instance_id;
+ }
+#endif
+ 0x43425844, 0xcde3cfbf, 0xe2e3d090, 0xe2eb1038, 0x7e5ad1cf, 0x00000001, 0x00000204, 0x00000003,
+ 0x0000002c, 0x000000c4, 0x0000013c, 0x4e475349, 0x00000090, 0x00000004, 0x00000008, 0x00000068,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000071, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000101, 0x00000077, 0x00000000, 0x00000000, 0x00000003, 0x00000002,
+ 0x00000101, 0x00000080, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000101, 0x69736f50,
+ 0x6e6f6974, 0x6c6f4300, 0x5600726f, 0x66664f5f, 0x00746573, 0x495f5653, 0x6174736e, 0x4965636e,
+ 0xabab0064, 0x4e47534f, 0x00000070, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001,
+ 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001,
+ 0x00000e01, 0x00000062, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000e01, 0x505f5653,
+ 0x7469736f, 0x006e6f69, 0x6f6c6f43, 0x6e490072, 0x6e617473, 0x64496563, 0xababab00, 0x52444853,
+ 0x000000c0, 0x00010040, 0x00000030, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101012,
+ 0x00000001, 0x0300005f, 0x00101012, 0x00000002, 0x04000060, 0x00101012, 0x00000003, 0x00000008,
+ 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, 0x03000065,
+ 0x00102012, 0x00000002, 0x07000000, 0x00102012, 0x00000000, 0x0010100a, 0x00000000, 0x0010100a,
+ 0x00000002, 0x05000036, 0x001020e2, 0x00000000, 0x00101e56, 0x00000000, 0x05000036, 0x00102012,
+ 0x00000001, 0x0010100a, 0x00000001, 0x05000036, 0x00102012, 0x00000002, 0x0010100a, 0x00000003,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ struct vs_out
+ {
+ float4 position : SV_Position;
+ float color : Color;
+ uint instance_id : InstanceId;
+ };
+
+ void main(vs_out i, out float4 o0 : SV_Target0, out uint4 o1 : SV_Target1)
+ {
+ o0 = float4(i.color, i.color, i.color, 1.0f);
+ o1 = i.instance_id;
+ }
+#endif
+ 0x43425844, 0xda0ad0bb, 0x4743f5f5, 0xfbc6d0b1, 0x7c8e7df5, 0x00000001, 0x00000170, 0x00000003,
+ 0x0000002c, 0x000000a4, 0x000000f0, 0x4e475349, 0x00000070, 0x00000003, 0x00000008, 0x00000050,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000101, 0x00000062, 0x00000000, 0x00000000, 0x00000001, 0x00000002,
+ 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x6f6c6f43, 0x6e490072, 0x6e617473, 0x64496563,
+ 0xababab00, 0x4e47534f, 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000000, 0x0000000f, 0x00000038, 0x00000001, 0x00000000, 0x00000001, 0x00000001,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000078, 0x00000040, 0x0000001e,
+ 0x03001062, 0x00101012, 0x00000001, 0x03000862, 0x00101012, 0x00000002, 0x03000065, 0x001020f2,
+ 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x00102072, 0x00000000, 0x00101006,
+ 0x00000001, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x05000036, 0x001020f2,
+ 0x00000001, 0x00101006, 0x00000002, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const struct vec4 stream0[] =
+ {
+ {-1.00f, 0.0f, 0.0f, 1.0f},
+ {-1.00f, 1.0f, 0.0f, 1.0f},
+ {-0.75f, 0.0f, 0.0f, 1.0f},
+ {-0.75f, 1.0f, 0.0f, 1.0f},
+ /* indirect draws data */
+ {-1.00f, -1.0f, 0.0f, 1.0f},
+ {-1.00f, 0.0f, 0.0f, 1.0f},
+ {-0.75f, -1.0f, 0.0f, 1.0f},
+ {-0.75f, 0.0f, 0.0f, 1.0f},
+ };
+ static const BYTE stream1[] =
+ {
+ 0xf0,
+ 0x80,
+ 0x10,
+ 0x40,
+
+ 0xaa,
+ 0xbb,
+ 0xcc,
+ 0x90,
+ };
+ static const float stream2[] =
+ {
+ 0.00f,
+ 0.25f,
+ 0.50f,
+ 0.75f,
+
+ 1.00f,
+ 1.25f,
+ 1.50f,
+ 1.75f,
+ };
+ static const D3D12_DRAW_ARGUMENTS argument_data[] =
+ {
+ {4, 4, 4, 0},
+ {4, 4, 4, 4},
+ };
+ static const struct
+ {
+ unsigned int color_step_rate;
+ unsigned int expected_colors[16];
+ }
+ tests[] =
+ {
+ {0, {0xfff0f0f0, 0xfff0f0f0, 0xfff0f0f0, 0xfff0f0f0, 0xffaaaaaa, 0xffaaaaaa, 0xffaaaaaa, 0xffaaaaaa,
+ 0xfff0f0f0, 0xfff0f0f0, 0xfff0f0f0, 0xfff0f0f0, 0xffaaaaaa, 0xffaaaaaa, 0xffaaaaaa, 0xffaaaaaa}},
+ {1, {0xfff0f0f0, 0xff808080, 0xff101010, 0xff404040, 0xffaaaaaa, 0xffbbbbbb, 0xffcccccc, 0xff909090,
+ 0xfff0f0f0, 0xff808080, 0xff101010, 0xff404040, 0xffaaaaaa, 0xffbbbbbb, 0xffcccccc, 0xff909090}},
+ {2, {0xfff0f0f0, 0xfff0f0f0, 0xff808080, 0xff808080, 0xffaaaaaa, 0xffaaaaaa, 0xffbbbbbb, 0xffbbbbbb,
+ 0xfff0f0f0, 0xfff0f0f0, 0xff808080, 0xff808080, 0xffaaaaaa, 0xffaaaaaa, 0xffbbbbbb, 0xffbbbbbb}},
+ };
+ static const struct
+ {
+ D3D12_BOX box;
+ unsigned int instance_id;
+ }
+ expected_results[] =
+ {
+ {{ 0, 0, 0, 10, 10, 1}, 0},
+ {{10, 0, 0, 20, 10, 1}, 1},
+ {{20, 0, 0, 30, 10, 1}, 2},
+ {{30, 0, 0, 40, 10, 1}, 3},
+ {{40, 0, 0, 50, 10, 1}, 0},
+ {{50, 0, 0, 60, 10, 1}, 1},
+ {{60, 0, 0, 70, 10, 1}, 2},
+ {{70, 0, 0, 80, 10, 1}, 3},
+ /* indirect draws results */
+ {{ 0, 10, 0, 10, 20, 1}, 0},
+ {{10, 10, 0, 20, 20, 1}, 1},
+ {{20, 10, 0, 30, 20, 1}, 2},
+ {{30, 10, 0, 40, 20, 1}, 3},
+ {{40, 10, 0, 50, 20, 1}, 0},
+ {{50, 10, 0, 60, 20, 1}, 1},
+ {{60, 10, 0, 70, 20, 1}, 2},
+ {{70, 10, 0, 80, 20, 1}, 3},
+ };
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+ assert(ARRAY_SIZE(tests->expected_colors) == ARRAY_SIZE(expected_results));
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 80;
+ desc.rt_height = 20;
+ desc.rt_descriptor_count = 2;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_empty_root_signature(context.device,
+ D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT);
+
+ rtvs[0] = context.rtv;
+ rtvs[1] = get_cpu_rtv_handle(&context, context.rtv_heap, 1);
+
+ desc.rt_format = DXGI_FORMAT_R32_UINT;
+ create_render_target(&context, &desc, &render_target, &rtvs[1]);
+
+ vb[0] = create_upload_buffer(context.device, sizeof(stream0), stream0);
+ vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]);
+ vbv[0].StrideInBytes = sizeof(*stream0);
+ vbv[0].SizeInBytes = sizeof(stream0);
+
+ vb[1] = create_upload_buffer(context.device, sizeof(stream1), stream1);
+ vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]);
+ vbv[1].StrideInBytes = sizeof(*stream1);
+ vbv[1].SizeInBytes = sizeof(stream1);
+
+ vb[2] = create_upload_buffer(context.device, sizeof(stream2), stream2);
+ vbv[2].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[2]);
+ vbv[2].StrideInBytes = sizeof(*stream2);
+ vbv[2].SizeInBytes = sizeof(stream2);
+
+ command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW);
+
+ argument_buffer = create_upload_buffer(context.device, sizeof(argument_data), &argument_data);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ layout_desc[1].InstanceDataStepRate = tests[i].color_step_rate;
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ init_pipeline_state_desc(&pso_desc, context.root_signature, 0, &vs, &ps, &input_layout);
+ pso_desc.NumRenderTargets = 2;
+ pso_desc.RTVFormats[0] = DXGI_FORMAT_R8G8B8A8_UNORM;
+ pso_desc.RTVFormats[1] = DXGI_FORMAT_R32_UINT;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtvs[0], white, 0, NULL);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtvs[1], white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 2, rtvs, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 4);
+
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature,
+ 2, argument_buffer, 0, NULL, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ for (j = 0; j < ARRAY_SIZE(expected_results); ++j)
+ check_readback_data_uint(&rb, &expected_results[j].box, tests[i].expected_colors[j], 1);
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(render_target, 0, &rb, queue, command_list);
+ for (j = 0; j < ARRAY_SIZE(expected_results); ++j)
+ check_readback_data_uint(&rb, &expected_results[j].box, expected_results[j].instance_id, 0);
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ transition_resource_state(command_list, render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ context.pipeline_state = NULL;
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12CommandSignature_Release(command_signature);
+ ID3D12Resource_Release(argument_buffer);
+ ID3D12Resource_Release(render_target);
+ for (i = 0; i < ARRAY_SIZE(vb); ++i)
+ ID3D12Resource_Release(vb[i]);
+ destroy_test_context(&context);
+}
+
+static void test_vertex_id(void)
+{
+ static const DWORD vs_code[] =
+ {
+#if 0
+ uint4 main(uint id : ID, uint instance_id : SV_InstanceID, uint vertex_id : SV_VertexID) : OUTPUT
+ {
+ return uint4(id, instance_id, vertex_id, 0);
+ }
+#endif
+ 0x43425844, 0x5625197b, 0x588ccf8f, 0x48694905, 0x961d19ca, 0x00000001, 0x00000170, 0x00000003,
+ 0x0000002c, 0x000000a4, 0x000000d4, 0x4e475349, 0x00000070, 0x00000003, 0x00000008, 0x00000050,
+ 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000101, 0x00000053, 0x00000000, 0x00000008,
+ 0x00000001, 0x00000001, 0x00000101, 0x00000061, 0x00000000, 0x00000006, 0x00000001, 0x00000002,
+ 0x00000101, 0x53004449, 0x6e495f56, 0x6e617473, 0x44496563, 0x5f565300, 0x74726556, 0x44497865,
+ 0xababab00, 0x4e47534f, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+ 0x00000001, 0x00000000, 0x0000000f, 0x5054554f, 0xab005455, 0x52444853, 0x00000094, 0x00010040,
+ 0x00000025, 0x0300005f, 0x00101012, 0x00000000, 0x04000060, 0x00101012, 0x00000001, 0x00000008,
+ 0x04000060, 0x00101012, 0x00000002, 0x00000006, 0x03000065, 0x001020f2, 0x00000000, 0x05000036,
+ 0x00102012, 0x00000000, 0x0010100a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010100a,
+ 0x00000001, 0x05000036, 0x00102042, 0x00000000, 0x0010100a, 0x00000002, 0x05000036, 0x00102082,
+ 0x00000000, 0x00004001, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"ID", 0, DXGI_FORMAT_R32_UINT, 0, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const D3D12_SO_DECLARATION_ENTRY so_declaration[] =
+ {
+ {0, "OUTPUT", 0, 0, 4, 0},
+ };
+ static const unsigned int strides[] = {16};
+ static const unsigned int vertices[] =
+ {
+ 0,
+ 1,
+ 2,
+
+ 3,
+ 4,
+ 5,
+
+ 6,
+ 7,
+ 8,
+
+ 5,
+ 6,
+ 7,
+
+ 0xa,
+ 0xb,
+ 0xc,
+ 0xd,
+
+ 0xe,
+ 0xf,
+ };
+ static const unsigned int indices[] =
+ {
+ 6, 7, 8,
+
+ 0, 1, 2,
+
+ 0, 1, 2, 3,
+
+ 8, 9,
+ };
+ static const D3D12_DRAW_ARGUMENTS argument_data[] =
+ {
+ {4, 1, 12, 1},
+ {2, 3, 16, 0},
+ };
+ static const D3D12_DRAW_INDEXED_ARGUMENTS indexed_argument_data[] =
+ {
+ {4, 1, 6, 12, 1},
+ {2, 3, 10, 8, 0},
+ };
+ struct uvec4 expected_values[] =
+ {
+ {0, 0, 0},
+ {1, 0, 1},
+ {2, 0, 2},
+ {0, 1, 0},
+ {1, 1, 1},
+ {2, 1, 2},
+
+ {3, 0, 0},
+ {4, 0, 1},
+ {5, 0, 2},
+
+ {6, 0, 6},
+ {7, 0, 7},
+ {8, 0, 8},
+ {6, 1, 6},
+ {7, 1, 7},
+ {8, 1, 8},
+
+ {5, 0, 0},
+ {6, 0, 1},
+ {7, 0, 2},
+
+ {0xa, 0, 0},
+ {0xb, 0, 1},
+ {0xc, 0, 2},
+ {0xd, 0, 3},
+
+ {0xe, 0, 0},
+ {0xf, 0, 1},
+ {0xe, 1, 0},
+ {0xf, 1, 1},
+ {0xe, 2, 0},
+ {0xf, 2, 1},
+
+ {0xa, 0, 0},
+ {0xb, 0, 1},
+ {0xc, 0, 2},
+ {0xd, 0, 3},
+
+ {0xe, 0, 8},
+ {0xf, 0, 9},
+ {0xe, 1, 8},
+ {0xf, 1, 9},
+ {0xe, 2, 8},
+ {0xf, 2, 9},
+ };
+
+ bool found_values[ARRAY_SIZE(expected_values)] = {0};
+ bool used_values[ARRAY_SIZE(expected_values)] = {0};
+ ID3D12Resource *args_buffer, *indexed_args_buffer;
+ ID3D12CommandSignature *indexed_command_signature;
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12Resource *counter_buffer, *so_buffer;
+ ID3D12CommandSignature *command_signature;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv;
+ ID3D12Resource *upload_buffer;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ D3D12_INDEX_BUFFER_VIEW ibv;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *vb, *ib;
+ ID3D12Device *device;
+ unsigned int count;
+ unsigned int i, j;
+ HRESULT hr;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT
+ | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature, 0, &vs, NULL, &input_layout);
+ memset(&pso_desc.PS, 0, sizeof(pso_desc.PS));
+ pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration);
+ pso_desc.StreamOutput.pSODeclaration = so_declaration;
+ pso_desc.StreamOutput.pBufferStrides = strides;
+ pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides);
+ pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM;
+ pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ if (hr == E_NOTIMPL)
+ {
+ skip("Stream output is not supported.\n");
+ destroy_test_context(&context);
+ return;
+ }
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ vb = create_upload_buffer(context.device, sizeof(vertices), vertices);
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*vertices);
+ vbv.SizeInBytes = sizeof(vertices);
+
+ ib = create_upload_buffer(context.device, sizeof(indices), indices);
+ ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib);
+ ibv.SizeInBytes = sizeof(indices);
+ ibv.Format = DXGI_FORMAT_R32_UINT;
+
+ args_buffer = create_upload_buffer(device, sizeof(argument_data), &argument_data);
+ indexed_args_buffer = create_upload_buffer(device, sizeof(indexed_argument_data), &indexed_argument_data);
+
+ command_signature = create_command_signature(device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW);
+ indexed_command_signature = create_command_signature(device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED);
+
+ count = 0;
+ upload_buffer = create_upload_buffer(device, sizeof(count), &count);
+
+ counter_buffer = create_default_buffer(device, 32,
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ so_buffer = create_default_buffer(device, 1024,
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT);
+ sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer);
+ sobv.SizeInBytes = 1024;
+ sobv.BufferFilledSizeLocation = ID3D12Resource_GetGPUVirtualAddress(counter_buffer);
+
+ ID3D12GraphicsCommandList_CopyBufferRegion(command_list, counter_buffer, 0,
+ upload_buffer, 0, sizeof(count));
+
+ transition_resource_state(command_list, counter_buffer,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT);
+
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_POINTLIST);
+ ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+
+ ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv);
+
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 2, 0, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 3, 16);
+
+ ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 2, 0, 0, 0);
+ ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 1, 3, 9, 7);
+
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list,
+ command_signature, 1, args_buffer, 0, NULL, 0);
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list,
+ command_signature, 1, args_buffer, sizeof(*argument_data), NULL, 0);
+
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list,
+ indexed_command_signature, 1, indexed_args_buffer, 0, NULL, 0);
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list,
+ indexed_command_signature, 1, indexed_args_buffer, sizeof(*indexed_argument_data), NULL, 0);
+
+ transition_resource_state(command_list, counter_buffer,
+ D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, so_buffer,
+ D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_buffer_readback_with_command_list(counter_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ count = get_readback_uint(&rb, 0, 0, 0);
+ ok(count == ARRAY_SIZE(expected_values) * sizeof(struct vec4), "Got counter value %u, expected %uu.\n",
+ count, (unsigned int)(ARRAY_SIZE(expected_values) * sizeof(struct vec4)));
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+ count /= sizeof(struct vec4);
+
+ count = min(count, ARRAY_SIZE(used_values));
+ get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list);
+ for (i = 0; i < ARRAY_SIZE(expected_values); ++i)
+ {
+ for (j = 0; j < count; ++j)
+ {
+ if (!used_values[j] && compare_uvec4(get_readback_uvec4(&rb, j, 0), &expected_values[i]))
+ {
+ found_values[i] = true;
+ used_values[j] = true;
+ break;
+ }
+ }
+ }
+
+ for (i = 0; i < count; ++i)
+ {
+ const struct uvec4 *v = get_readback_uvec4(&rb, i, 0);
+ ok(used_values[i], "Found unexpected value {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", v->x, v->y, v->z, v->w);
+ }
+ release_resource_readback(&rb);
+
+ for (i = 0; i < ARRAY_SIZE(expected_values); ++i)
+ {
+ ok(found_values[i], "Failed to find value {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n",
+ expected_values[i].x, expected_values[i].y, expected_values[i].z, expected_values[i].w);
+ }
+
+ ID3D12CommandSignature_Release(command_signature);
+ ID3D12CommandSignature_Release(indexed_command_signature);
+ ID3D12Resource_Release(args_buffer);
+ ID3D12Resource_Release(counter_buffer);
+ ID3D12Resource_Release(ib);
+ ID3D12Resource_Release(indexed_args_buffer);
+ ID3D12Resource_Release(so_buffer);
+ ID3D12Resource_Release(upload_buffer);
+ ID3D12Resource_Release(vb);
+ destroy_test_context(&context);
+}
+
+static void test_copy_texture(void)
+{
+ D3D12_TEXTURE_COPY_LOCATION src_location, dst_location;
+ ID3D12Resource *src_texture, *dst_texture;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_SUBRESOURCE_DATA texture_data;
+ struct depth_stencil_resource ds;
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int x, y, i;
+ D3D12_BOX box;
+
+ static const unsigned int clear_data[] =
+ {
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ };
+ static const unsigned int bitmap_data[] =
+ {
+ 0xff00ff00, 0xff00ff01, 0xff00ff02, 0xff00ff03,
+ 0xff00ff10, 0xff00ff12, 0xff00ff12, 0xff00ff13,
+ 0xff00ff20, 0xff00ff21, 0xff00ff22, 0xff00ff23,
+ 0xff00ff30, 0xff00ff31, 0xff00ff32, 0xff00ff33,
+ };
+ static const unsigned int result_data[] =
+ {
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0xff00ff00, 0xff00ff01, 0x00000000,
+ 0x00000000, 0xff00ff10, 0xff00ff12, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ };
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ Texture2D<float> t;
+
+ float main(float4 position : SV_Position) : SV_Target
+ {
+ return t[int2(position.x, position.y)];
+ }
+#endif
+ 0x43425844, 0x0beace24, 0x5e10b05b, 0x742de364, 0xb2b65d2b, 0x00000001, 0x00000140, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x00000e01, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000a4, 0x00000040,
+ 0x00000029, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000,
+ 0x00000001, 0x03000065, 0x00102012, 0x00000000, 0x02000068, 0x00000001, 0x0500001b, 0x00100032,
+ 0x00000000, 0x00101046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x0700002d, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000,
+ 0x00107e46, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const float depth_values[] = {0.0f, 0.5f, 0.7f, 1.0f};
+ static const D3D12_RESOURCE_STATES resource_states[] =
+ {
+ D3D12_RESOURCE_STATE_COPY_SOURCE,
+ D3D12_RESOURCE_STATE_GENERIC_READ,
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32_FLOAT;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ for (i = 0; i < ARRAY_SIZE(resource_states); ++i)
+ {
+ src_texture = create_default_texture(device, 4, 4, DXGI_FORMAT_R8G8B8A8_UNORM,
+ 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ texture_data.pData = bitmap_data;
+ texture_data.RowPitch = 4 * sizeof(*bitmap_data);
+ texture_data.SlicePitch = texture_data.RowPitch * 4;
+ upload_texture_data(src_texture, &texture_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+
+ dst_texture = create_default_texture(device, 4, 4, DXGI_FORMAT_R8G8B8A8_UNORM,
+ 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ texture_data.pData = clear_data;
+ texture_data.RowPitch = 4 * sizeof(*bitmap_data);
+ texture_data.SlicePitch = texture_data.RowPitch * 4;
+ upload_texture_data(dst_texture, &texture_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, src_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, resource_states[i]);
+
+ src_location.pResource = src_texture;
+ src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ src_location.SubresourceIndex = 0;
+ dst_location.pResource = dst_texture;
+ dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ dst_location.SubresourceIndex = 0;
+ set_box(&box, 0, 0, 0, 2, 2, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 1, 1, 0, &src_location, &box);
+
+ transition_resource_state(command_list, dst_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(dst_texture, 0, &rb, queue, command_list);
+ for (y = 0; y < 4; ++y)
+ {
+ for (x = 0; x < 4; ++x)
+ {
+ unsigned int color = get_readback_uint(&rb, x, y, 0);
+ unsigned int expected = result_data[y * 4 + x];
+
+ ok(color == expected,
+ "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n",
+ color, x, y, expected);
+ }
+ }
+ release_resource_readback(&rb);
+ ID3D12Resource_Release(src_texture);
+ ID3D12Resource_Release(dst_texture);
+ reset_command_list(command_list, context.allocator);
+ }
+
+ context.root_signature = create_texture_root_signature(device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 0, 0);
+ context.pipeline_state = create_pipeline_state(device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+
+ for (i = 0; i < ARRAY_SIZE(depth_values); ++i)
+ {
+ init_depth_stencil(&ds, device, context.render_target_desc.Width,
+ context.render_target_desc.Height, 1, 1, DXGI_FORMAT_D32_FLOAT,
+ DXGI_FORMAT_D32_FLOAT, NULL);
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, depth_values[i], 0, 0, NULL);
+ transition_sub_resource_state(command_list, ds.texture, 0,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, resource_states[i % ARRAY_SIZE(resource_states)]);
+
+ dst_texture = create_default_texture(device, 32, 32, DXGI_FORMAT_R32_FLOAT,
+ 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ ID3D12Device_CreateShaderResourceView(device, dst_texture, NULL,
+ ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap));
+
+ src_location.pResource = ds.texture;
+ src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ src_location.SubresourceIndex = 0;
+ dst_location.pResource = dst_texture;
+ dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ dst_location.SubresourceIndex = 0;
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0,
+ &src_location, NULL);
+ transition_sub_resource_state(command_list, dst_texture, 0,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap));
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(context.render_target, 0, queue, command_list, depth_values[i], 2);
+
+ destroy_depth_stencil(&ds);
+ ID3D12Resource_Release(dst_texture);
+
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, context.render_target, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+static void test_copy_texture_buffer(void)
+{
+ D3D12_TEXTURE_COPY_LOCATION src_location, dst_location;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_SUBRESOURCE_DATA texture_data;
+ ID3D12Resource *dst_buffers[4];
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12Resource *src_texture;
+ unsigned int got, expected;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int x, y;
+ unsigned int *ptr;
+ unsigned int i;
+ D3D12_BOX box;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ ptr = calloc(64 * 32, sizeof(*ptr));
+ ok(ptr, "Failed to allocate memory.\n");
+
+ for (i = 0; i < 64 * 32; ++i)
+ ptr[i] = i;
+
+ src_texture = create_default_texture(device,
+ 64, 32, DXGI_FORMAT_R32_UINT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ texture_data.pData = ptr;
+ texture_data.RowPitch = 64 * sizeof(*ptr);
+ texture_data.SlicePitch = texture_data.RowPitch * 32;
+ upload_texture_data(src_texture, &texture_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, src_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ free(ptr);
+
+ for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i)
+ {
+ dst_buffers[i] = create_default_buffer(device,
+ 64 * 32 * sizeof(*ptr), 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ }
+
+ dst_location.pResource = dst_buffers[0];
+ dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT;
+ dst_location.PlacedFootprint.Offset = 0;
+ dst_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_R32_UINT;
+ dst_location.PlacedFootprint.Footprint.Width = 64;
+ dst_location.PlacedFootprint.Footprint.Height = 32;
+ dst_location.PlacedFootprint.Footprint.Depth = 1;
+ dst_location.PlacedFootprint.Footprint.RowPitch = 64 * sizeof(*ptr);
+
+ src_location.pResource = src_texture;
+ src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ src_location.SubresourceIndex = 0;
+
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 0, 0, &src_location, NULL);
+
+ dst_location.pResource = dst_buffers[1];
+ for (y = 0; y < 32; ++y)
+ {
+ set_box(&box, 0, y, 0, 64, y + 1, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 31 - y, 0, &src_location, &box);
+ }
+
+ dst_location.pResource = dst_buffers[2];
+ for (x = 0; x < 64; ++x)
+ {
+ set_box(&box, x, 0, 0, x + 1, 32, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 63 - x, 0, 0, &src_location, &box);
+ }
+
+ dst_location.pResource = dst_buffers[3];
+ set_box(&box, 0, 0, 0, 32, 32, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 0, 0, &src_location, &box);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 32, 0, 0, &src_location, &box);
+
+ /* empty box */
+ set_box(&box, 128, 0, 0, 32, 32, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 0, 0, &src_location, &box);
+
+ for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i)
+ {
+ transition_resource_state(command_list, dst_buffers[i],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ }
+
+ got = expected = 0;
+ get_buffer_readback_with_command_list(dst_buffers[0], DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (i = 0; i < 64 * 32; ++i)
+ {
+ got = get_readback_uint(&rb, i, 0, 0);
+ expected = i;
+
+ if (got != expected)
+ break;
+ }
+ release_resource_readback(&rb);
+ ok(got == expected, "Got unexpected value 0x%08x at %u, expected 0x%08x.\n", got, i, expected);
+
+ reset_command_list(command_list, context.allocator);
+ got = expected = 0;
+ get_buffer_readback_with_command_list(dst_buffers[1], DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (y = 0; y < 32; ++y)
+ {
+ for (x = 0; x < 64; ++x)
+ {
+ got = get_readback_uint(&rb, 64 * y + x, 0, 0);
+ expected = 64 * (31 - y) + x;
+
+ if (got != expected)
+ break;
+ }
+ if (got != expected)
+ break;
+ }
+ release_resource_readback(&rb);
+ ok(got == expected, "Got unexpected value 0x%08x at (%u, %u), expected 0x%08x.\n", got, x, y, expected);
+
+ reset_command_list(command_list, context.allocator);
+ got = expected = 0;
+ get_buffer_readback_with_command_list(dst_buffers[2], DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (y = 0; y < 32; ++y)
+ {
+ for (x = 0; x < 64; ++x)
+ {
+ got = get_readback_uint(&rb, 64 * y + x, 0, 0);
+ expected = 64 * y + 63 - x;
+
+ if (got != expected)
+ break;
+ }
+ if (got != expected)
+ break;
+ }
+ release_resource_readback(&rb);
+ ok(got == expected, "Got unexpected value 0x%08x at (%u, %u), expected 0x%08x.\n", got, x, y, expected);
+
+ reset_command_list(command_list, context.allocator);
+ got = expected = 0;
+ get_buffer_readback_with_command_list(dst_buffers[3], DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (y = 0; y < 32; ++y)
+ {
+ for (x = 0; x < 64; ++x)
+ {
+ got = get_readback_uint(&rb, 64 * y + x, 0, 0);
+ expected = 64 * y + x % 32;
+
+ if (got != expected)
+ break;
+ }
+ if (got != expected)
+ break;
+ }
+ release_resource_readback(&rb);
+ ok(got == expected, "Got unexpected value 0x%08x at (%u, %u), expected 0x%08x.\n", got, x, y, expected);
+
+ ID3D12Resource_Release(src_texture);
+ for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i)
+ ID3D12Resource_Release(dst_buffers[i]);
+ destroy_test_context(&context);
+}
+
+static void test_copy_buffer_texture(void)
+{
+ D3D12_TEXTURE_COPY_LOCATION src_location, dst_location;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12Resource *zero_buffer;
+ ID3D12Resource *dst_texture;
+ ID3D12Resource *src_buffer;
+ unsigned int got, expected;
+ ID3D12CommandQueue *queue;
+ unsigned int buffer_size;
+ ID3D12Device *device;
+ unsigned int x, y, z;
+ unsigned int *ptr;
+ unsigned int i;
+ D3D12_BOX box;
+ HRESULT hr;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ buffer_size = 128 * 100 * 64;
+
+ zero_buffer = create_upload_buffer(device, buffer_size * sizeof(*ptr) + D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT, NULL);
+ hr = ID3D12Resource_Map(zero_buffer, 0, NULL, (void **)&ptr);
+ ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr);
+ memset(ptr, 0, buffer_size * sizeof(*ptr) + D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT);
+ for (i = 0; i < D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT / sizeof(*ptr); ++i)
+ ptr[i] = 0xdeadbeef;
+ ID3D12Resource_Unmap(zero_buffer, 0, NULL);
+
+ src_buffer = create_upload_buffer(device, buffer_size * sizeof(*ptr), NULL);
+ hr = ID3D12Resource_Map(src_buffer, 0, NULL, (void **)&ptr);
+ ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr);
+ for (z = 0; z < 64; ++z)
+ {
+ for (y = 0; y < 100; ++y)
+ {
+ for (x = 0; x < 128; ++x)
+ {
+ ptr[z * 128 * 100 + y * 128 + x] = (z + 1) << 16 | (y + 1) << 8 | (x + 1);
+ }
+ }
+ }
+ ID3D12Resource_Unmap(src_buffer, 0, NULL);
+
+ dst_texture = create_default_texture3d(device, 128, 100, 64, 2,
+ DXGI_FORMAT_R32_UINT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+
+ dst_location.pResource = dst_texture;
+ dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ dst_location.SubresourceIndex = 0;
+
+ src_location.pResource = zero_buffer;
+ src_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT;
+ src_location.PlacedFootprint.Offset = D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT;
+ src_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_R32_UINT;
+ src_location.PlacedFootprint.Footprint.Width = 128;
+ src_location.PlacedFootprint.Footprint.Height = 100;
+ src_location.PlacedFootprint.Footprint.Depth = 64;
+ src_location.PlacedFootprint.Footprint.RowPitch = 128 * sizeof(*ptr);
+
+ /* fill with 0 */
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 0, 0, &src_location, NULL);
+
+ src_location.pResource = src_buffer;
+ src_location.PlacedFootprint.Offset = 0;
+
+ /* copy region 1 */
+ set_box(&box, 64, 16, 8, 128, 100, 64);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 64, 16, 8, &src_location, &box);
+
+ /* empty boxes */
+ for (z = 0; z < 2; ++z)
+ {
+ for (y = 0; y < 4; ++y)
+ {
+ for (x = 0; x < 8; ++x)
+ {
+ set_box(&box, x, y, z, x, y, z);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 0, 0, &src_location, &box);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, x, y, z, &src_location, &box);
+ }
+ }
+ }
+
+ /* copy region 2 */
+ set_box(&box, 0, 0, 0, 4, 4, 4);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 2, 2, 2, &src_location, &box);
+
+ /* fill sub-resource 1 */
+ dst_location.SubresourceIndex = 1;
+ set_box(&box, 0, 0, 0, 64, 50, 32);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 0, 0, &src_location, &box);
+
+ transition_resource_state(command_list, dst_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ got = expected = 0;
+ get_texture_readback_with_command_list(dst_texture, 0, &rb, queue, command_list);
+ for (z = 0; z < 64; ++z)
+ {
+ for (y = 0; y < 100; ++y)
+ {
+ for (x = 0; x < 128; ++x)
+ {
+ got = get_readback_uint(&rb, x, y, z);
+
+ if (2 <= x && x < 6 && 2 <= y && y < 6 && 2 <= z && z < 6)
+ expected = (z - 1) << 16 | (y - 1) << 8 | (x - 1); /* copy region 1 */
+ else if (64 <= x && 16 <= y && 8 <= z)
+ expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1); /* copy region 2 */
+ else
+ expected = 0;
+
+ if (got != expected)
+ break;
+ }
+ if (got != expected)
+ break;
+ }
+ if (got != expected)
+ break;
+ }
+ release_resource_readback(&rb);
+ ok(got == expected,
+ "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n",
+ got, x, y, z, expected);
+
+ reset_command_list(command_list, context.allocator);
+ got = expected = 0;
+ get_texture_readback_with_command_list(dst_texture, 1, &rb, queue, command_list);
+ for (z = 0; z < 32; ++z)
+ {
+ for (y = 0; y < 50; ++y)
+ {
+ for (x = 0; x < 64; ++x)
+ {
+ got = get_readback_uint(&rb, x, y, z);
+ expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1);
+
+ if (got != expected)
+ break;
+ }
+ if (got != expected)
+ break;
+ }
+ if (got != expected)
+ break;
+ }
+ release_resource_readback(&rb);
+ ok(got == expected,
+ "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n",
+ got, x, y, z, expected);
+
+ ID3D12Resource_Release(dst_texture);
+ ID3D12Resource_Release(src_buffer);
+ ID3D12Resource_Release(zero_buffer);
+ destroy_test_context(&context);
+}
+
+static void test_copy_block_compressed_texture(void)
+{
+ D3D12_TEXTURE_COPY_LOCATION src_location, dst_location;
+ ID3D12Resource *dst_buffer, *src_buffer;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ unsigned int x, y, block_id;
+ struct test_context context;
+ struct resource_readback rb;
+ struct uvec4 got, expected;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *texture;
+ ID3D12Device *device;
+ unsigned int *ptr;
+ D3D12_BOX box;
+ HRESULT hr;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ dst_buffer = create_default_buffer(device, 4096, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ src_buffer = create_upload_buffer(device, 4096, NULL);
+ hr = ID3D12Resource_Map(src_buffer, 0, NULL, (void **)&ptr);
+ ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr);
+ for (x = 0; x < 4096 / format_size(DXGI_FORMAT_BC2_UNORM); ++x)
+ {
+ block_id = x << 8;
+ *ptr++ = block_id | 0;
+ *ptr++ = block_id | 1;
+ *ptr++ = block_id | 2;
+ *ptr++ = block_id | 3;
+ }
+ ID3D12Resource_Unmap(src_buffer, 0, NULL);
+
+ texture = create_default_texture2d(device, 8, 8, 1, 4, DXGI_FORMAT_BC2_UNORM,
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+
+ /* copy from buffer to texture */
+ dst_location.pResource = texture;
+ dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ dst_location.SubresourceIndex = 0;
+
+ src_location.pResource = src_buffer;
+ src_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT;
+ src_location.PlacedFootprint.Offset = 0;
+ src_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_BC2_UNORM;
+ src_location.PlacedFootprint.Footprint.Width = 32;
+ src_location.PlacedFootprint.Footprint.Height = 32;
+ src_location.PlacedFootprint.Footprint.Depth = 1;
+ src_location.PlacedFootprint.Footprint.RowPitch
+ = 32 / format_block_width(DXGI_FORMAT_BC2_UNORM) * format_size(DXGI_FORMAT_BC2_UNORM);
+ src_location.PlacedFootprint.Footprint.RowPitch
+ = align(src_location.PlacedFootprint.Footprint.RowPitch, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT);
+
+ set_box(&box, 4, 4, 0, 8, 8, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 0, 0, &src_location, &box);
+ set_box(&box, 28, 0, 0, 32, 4, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 4, 0, 0, &src_location, &box);
+ set_box(&box, 0, 24, 0, 4, 28, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 4, 0, &src_location, &box);
+ set_box(&box, 16, 16, 0, 20, 20, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 4, 4, 0, &src_location, &box);
+
+ /* miplevels smaller than 4x4 */
+ dst_location.SubresourceIndex = 2;
+ set_box(&box, 4, 0, 0, 8, 4, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 0, 0, &src_location, &box);
+ dst_location.SubresourceIndex = 3;
+ set_box(&box, 8, 0, 0, 12, 4, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 0, 0, &src_location, &box);
+
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ /* copy from texture to buffer */
+ dst_location.pResource = dst_buffer;
+ dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT;
+ dst_location.PlacedFootprint.Offset = 0;
+ dst_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_BC2_UNORM;
+ dst_location.PlacedFootprint.Footprint.Width = 8;
+ dst_location.PlacedFootprint.Footprint.Height = 24;
+ dst_location.PlacedFootprint.Footprint.Depth = 1;
+ dst_location.PlacedFootprint.Footprint.RowPitch
+ = 8 / format_block_width(DXGI_FORMAT_BC2_UNORM) * format_size(DXGI_FORMAT_BC2_UNORM);
+ dst_location.PlacedFootprint.Footprint.RowPitch
+ = align(dst_location.PlacedFootprint.Footprint.RowPitch, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT);
+
+ src_location.pResource = texture;
+ src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ src_location.SubresourceIndex = 0;
+
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 0, 0, &src_location, NULL);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 8, 0, &src_location, NULL);
+ set_box(&box, 0, 0, 0, 8, 8, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list,
+ &dst_location, 0, 16, 0, &src_location, &box);
+
+ transition_resource_state(command_list, dst_buffer,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(texture, 0, &rb, queue, command_list);
+ for (y = 0; y < 8 / format_block_height(DXGI_FORMAT_BC2_UNORM); ++y)
+ {
+ for (x = 0; x < 8 / format_block_width(DXGI_FORMAT_BC2_UNORM); ++x)
+ {
+ if (x == 0 && y == 0)
+ block_id = 33;
+ else if (x == 1 && y == 0)
+ block_id = 7;
+ else if (x == 0 && y == 1)
+ block_id = 192;
+ else
+ block_id = 132;
+
+ expected.x = block_id << 8 | 0;
+ expected.y = block_id << 8 | 1;
+ expected.z = block_id << 8 | 2;
+ expected.w = block_id << 8 | 3;
+ got = *get_readback_uvec4(&rb, x, y);
+
+ if (!compare_uvec4(&got, &expected))
+ break;
+ }
+ if (!compare_uvec4(&got, &expected))
+ break;
+ }
+ release_resource_readback(&rb);
+ ok(compare_uvec4(&got, &expected),
+ "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u), expected {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n",
+ got.x, got.y, got.z, got.w, x, y, expected.x, expected.y, expected.z, expected.w);
+
+ reset_command_list(command_list, context.allocator);
+ get_texture_readback_with_command_list(texture, 2, &rb, queue, command_list);
+ block_id = 1;
+ expected.x = block_id << 8 | 0;
+ expected.y = block_id << 8 | 1;
+ expected.z = block_id << 8 | 2;
+ expected.w = block_id << 8 | 3;
+ got = *get_readback_uvec4(&rb, 0, 0);
+ release_resource_readback(&rb);
+ ok(compare_uvec4(&got, &expected),
+ "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x}, expected {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n",
+ got.x, got.y, got.z, got.w, expected.x, expected.y, expected.z, expected.w);
+
+ reset_command_list(command_list, context.allocator);
+ get_texture_readback_with_command_list(texture, 3, &rb, queue, command_list);
+ block_id = 2;
+ expected.x = block_id << 8 | 0;
+ expected.y = block_id << 8 | 1;
+ expected.z = block_id << 8 | 2;
+ expected.w = block_id << 8 | 3;
+ got = *get_readback_uvec4(&rb, 0, 0);
+ release_resource_readback(&rb);
+ ok(compare_uvec4(&got, &expected),
+ "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x}, expected {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n",
+ got.x, got.y, got.z, got.w, expected.x, expected.y, expected.z, expected.w);
+
+ reset_command_list(command_list, context.allocator);
+ get_buffer_readback_with_command_list(dst_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ for (y = 0; y < 24 / format_block_height(DXGI_FORMAT_BC2_UNORM); ++y)
+ {
+ unsigned int row_offset = dst_location.PlacedFootprint.Footprint.RowPitch / sizeof(got) * y;
+
+ for (x = 0; x < 4 / format_block_width(DXGI_FORMAT_BC2_UNORM); ++x)
+ {
+ if (x == 0 && y % 2 == 0)
+ block_id = 33;
+ else if (x == 1 && y % 2 == 0)
+ block_id = 7;
+ else if (x == 0 && y % 2 == 1)
+ block_id = 192;
+ else
+ block_id = 132;
+
+ expected.x = block_id << 8 | 0;
+ expected.y = block_id << 8 | 1;
+ expected.z = block_id << 8 | 2;
+ expected.w = block_id << 8 | 3;
+ got = *get_readback_uvec4(&rb, x + row_offset, 0);
+
+ if (!compare_uvec4(&got, &expected))
+ break;
+ }
+ if (!compare_uvec4(&got, &expected))
+ break;
+ }
+ release_resource_readback(&rb);
+ ok(compare_uvec4(&got, &expected),
+ "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u), expected {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n",
+ got.x, got.y, got.z, got.w, x, y, expected.x, expected.y, expected.z, expected.w);
+
+ ID3D12Resource_Release(texture);
+ ID3D12Resource_Release(src_buffer);
+ ID3D12Resource_Release(dst_buffer);
+ destroy_test_context(&context);
+}
+
+static void test_separate_bindings(void)
+{
+ ID3D12Resource *cs_raw_buffer, *cs_raw_uav_buffer;
+ ID3D12Resource *ps_raw_buffer, *ps_raw_uav_buffer;
+ ID3D12Resource *cs_textures[2], *ps_textures[2];
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[2];
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[4];
+ ID3D12PipelineState *compute_pso;
+ ID3D12Resource *cs_cb, *ps_cb;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ D3D12_SUBRESOURCE_DATA data;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD cs_code[] =
+ {
+#if 0
+ ByteAddressBuffer t0;
+
+ RWByteAddressBuffer u1 : register(u1);
+
+ cbuffer cb0
+ {
+ float4 cb0;
+ };
+
+ Texture2D t1;
+ RWTexture2D<float> u2 : register(u2);
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ uint ret = 0xffffffff;
+
+ if (t0.Load(0) != 2)
+ ret = 0;
+ if (any(cb0 != float4(4, 8, 16, 32)))
+ ret = 0;
+ if (any(t1.Load(0) != float4(4, 8, 16, 32)))
+ ret = 0;
+ if (u2[(int2)0] != 4)
+ ret = 0;
+
+ u1.Store(0, ret);
+ }
+#endif
+ 0x43425844, 0x5ef0e316, 0x8a886806, 0x06279aa8, 0x10936fa5, 0x00000001, 0x000002bc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000268, 0x00050050, 0x0000009a, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x030000a1, 0x00107000, 0x00000000, 0x04001858,
+ 0x00107000, 0x00000001, 0x00005555, 0x0300009d, 0x0011e000, 0x00000001, 0x0400189c, 0x0011e000,
+ 0x00000002, 0x00005555, 0x02000068, 0x00000002, 0x0400009b, 0x00000001, 0x00000001, 0x00000001,
+ 0x8c00002d, 0x800000c2, 0x00155543, 0x001000f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x0a000039, 0x001000f2, 0x00000000, 0x00100e46,
+ 0x00000000, 0x00004002, 0x40800000, 0x41000000, 0x41800000, 0x42000000, 0x0700003c, 0x00100032,
+ 0x00000000, 0x00100ae6, 0x00000000, 0x00100046, 0x00000000, 0x0700003c, 0x00100012, 0x00000000,
+ 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0b000039, 0x001000f2, 0x00000001, 0x00208e46,
+ 0x00000000, 0x00000000, 0x00004002, 0x40800000, 0x41000000, 0x41800000, 0x42000000, 0x0700003c,
+ 0x00100062, 0x00000000, 0x00100ba6, 0x00000001, 0x00100106, 0x00000001, 0x0700003c, 0x00100022,
+ 0x00000000, 0x0010002a, 0x00000000, 0x0010001a, 0x00000000, 0x0700003c, 0x00100012, 0x00000000,
+ 0x0010000a, 0x00000000, 0x0010001a, 0x00000000, 0x8c0000a3, 0x800000c2, 0x00155543, 0x00100022,
+ 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0011ee16, 0x00000002,
+ 0x07000039, 0x00100022, 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x40800000, 0x0700003c,
+ 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x890000a5, 0x800002c2,
+ 0x00199983, 0x00100022, 0x00000000, 0x00004001, 0x00000000, 0x00107006, 0x00000000, 0x07000020,
+ 0x00100022, 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000002, 0x09000037, 0x00100012,
+ 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0010001a, 0x00000000, 0x070000a6,
+ 0x0011e012, 0x00000001, 0x00004001, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static const DWORD ps_code[] =
+ {
+#if 0
+ ByteAddressBuffer t0;
+
+ RWByteAddressBuffer u1 : register(u1);
+
+ cbuffer cb0
+ {
+ float4 cb0;
+ };
+
+ Texture2D t1;
+ RWTexture2D<float> u2 : register(u2);
+
+ float4 main() : SV_Target0
+ {
+ bool ret = true;
+
+ if (t0.Load(0) != 1)
+ ret = false;
+ if (u1.Load(0) != 2)
+ ret = false;
+ if (any(cb0 != float4(1, 2, 3, 4)))
+ ret = false;
+ if (any(t1.Load(0) != float4(1, 2, 3, 4)))
+ ret = false;
+ if (u2[(int2)0] != 1)
+ ret = false;
+
+ return ret ? float4(0, 1, 0, 1) : float4(1, 0, 0, 1);
+ }
+#endif
+ 0x43425844, 0xb5db404c, 0xd1dd05ca, 0xf5c1284d, 0x58d71b13, 0x00000001, 0x00000358, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000002e0, 0x00000050, 0x000000b8,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x030000a1, 0x00107000, 0x00000000,
+ 0x04001858, 0x00107000, 0x00000001, 0x00005555, 0x0300009d, 0x0011e000, 0x00000001, 0x0400189c,
+ 0x0011e000, 0x00000002, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002,
+ 0x0b000039, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004002, 0x3f800000,
+ 0x40000000, 0x40400000, 0x40800000, 0x0700003c, 0x00100032, 0x00000000, 0x00100ae6, 0x00000000,
+ 0x00100046, 0x00000000, 0x0700003c, 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a,
+ 0x00000000, 0x890000a5, 0x800002c2, 0x00199983, 0x00100022, 0x00000000, 0x00004001, 0x00000000,
+ 0x0011e006, 0x00000001, 0x07000027, 0x00100022, 0x00000000, 0x0010001a, 0x00000000, 0x00004001,
+ 0x00000002, 0x0700003c, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0010001a, 0x00000000,
+ 0x8c00002d, 0x800000c2, 0x00155543, 0x001000f2, 0x00000001, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x0a000039, 0x001000f2, 0x00000001, 0x00100e46,
+ 0x00000001, 0x00004002, 0x3f800000, 0x40000000, 0x40400000, 0x40800000, 0x0700003c, 0x00100062,
+ 0x00000000, 0x00100ba6, 0x00000001, 0x00100106, 0x00000001, 0x0700003c, 0x00100022, 0x00000000,
+ 0x0010002a, 0x00000000, 0x0010001a, 0x00000000, 0x0700003c, 0x00100012, 0x00000000, 0x0010001a,
+ 0x00000000, 0x0010000a, 0x00000000, 0x8c0000a3, 0x800000c2, 0x00155543, 0x00100022, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0011ee16, 0x00000002, 0x07000039,
+ 0x00100022, 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x3f800000, 0x0700003c, 0x00100012,
+ 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x890000a5, 0x800002c2, 0x00199983,
+ 0x00100022, 0x00000000, 0x00004001, 0x00000000, 0x00107006, 0x00000000, 0x07000020, 0x00100022,
+ 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x09000037, 0x00100012, 0x00000000,
+ 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0010001a, 0x00000000, 0x0f000037, 0x001020f2,
+ 0x00000000, 0x00100006, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000,
+ 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const struct vec4 cs_data = {4.0f, 8.0f, 16.0f, 32.0f};
+ static const struct vec4 ps_data = {1.0f, 2.0f, 3.0f, 4.0f};
+ static const float cs_texture_data = 4.0f;
+ static const float ps_texture_data = 1.0f;
+ static const uint32_t cs_raw_data = 2;
+ static const uint32_t ps_raw_data = 1;
+ static const uint32_t ps_raw_uav_data = 2;
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[0].Descriptor.ShaderRegister = 0;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_SRV;
+ root_parameters[1].Descriptor.ShaderRegister = 0;
+ root_parameters[1].Descriptor.RegisterSpace = 0;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[2].Descriptor.ShaderRegister = 1;
+ root_parameters[2].Descriptor.RegisterSpace = 0;
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 1;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[1].NumDescriptors = 1;
+ descriptor_ranges[1].BaseShaderRegister = 2;
+ descriptor_ranges[1].RegisterSpace = 0;
+ descriptor_ranges[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ root_parameters[3].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[3].DescriptorTable.NumDescriptorRanges = 2;
+ root_parameters[3].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[3].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = 4;
+ root_signature_desc.pParameters = root_parameters;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+
+ compute_pso = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+
+ context.pipeline_state = create_pipeline_state(device,
+ context.root_signature, context.render_target_desc.Format,
+ NULL, &ps, NULL);
+
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 20);
+
+ cs_cb = create_upload_buffer(device, sizeof(cs_data), &cs_data);
+ ps_cb = create_upload_buffer(device, sizeof(ps_data), &ps_data);
+
+ cs_raw_buffer = create_upload_buffer(device, sizeof(cs_raw_data), &cs_raw_data);
+ ps_raw_buffer = create_upload_buffer(device, sizeof(ps_raw_data), &ps_raw_data);
+
+ cs_raw_uav_buffer = create_default_buffer(device, sizeof(uint32_t),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ ps_raw_uav_buffer = create_default_buffer(device, sizeof(ps_raw_uav_data),
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(ps_raw_uav_buffer, 0, sizeof(ps_raw_uav_data), &ps_raw_uav_data, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, ps_raw_uav_buffer,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ cs_textures[0] = create_default_texture(device,
+ 1, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = &cs_data;
+ data.RowPitch = sizeof(cs_data);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(cs_textures[0], &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, cs_textures[0],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
+ cs_textures[1] = create_default_texture(device, 1, 1, DXGI_FORMAT_R32_FLOAT,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = &cs_texture_data;
+ data.RowPitch = sizeof(cs_texture_data);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(cs_textures[1], &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, cs_textures[1],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ps_textures[0] = create_default_texture(device,
+ 1, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = &ps_data;
+ data.RowPitch = sizeof(ps_data);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(ps_textures[0], &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, ps_textures[0],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+ ps_textures[1] = create_default_texture(device, 1, 1, DXGI_FORMAT_R32_FLOAT,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ data.pData = &ps_texture_data;
+ data.RowPitch = sizeof(ps_texture_data);
+ data.SlicePitch = data.RowPitch;
+ upload_texture_data(ps_textures[1], &data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, ps_textures[1],
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ ID3D12Device_CreateShaderResourceView(device, cs_textures[0], NULL,
+ get_cpu_descriptor_handle(&context, heap, 0));
+ ID3D12Device_CreateUnorderedAccessView(device, cs_textures[1], NULL, NULL,
+ get_cpu_descriptor_handle(&context, heap, 1));
+
+ ID3D12Device_CreateShaderResourceView(device, ps_textures[0], NULL,
+ get_cpu_descriptor_handle(&context, heap, 10));
+ ID3D12Device_CreateUnorderedAccessView(device, ps_textures[1], NULL, NULL,
+ get_cpu_descriptor_handle(&context, heap, 11));
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+
+ ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(cs_cb));
+ ID3D12GraphicsCommandList_SetComputeRootShaderResourceView(command_list,
+ 1, ID3D12Resource_GetGPUVirtualAddress(cs_raw_buffer));
+ ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list,
+ 2, ID3D12Resource_GetGPUVirtualAddress(cs_raw_uav_buffer));
+ ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list,
+ 3, get_gpu_descriptor_handle(&context, heap, 0));
+
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(ps_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootShaderResourceView(command_list,
+ 1, ID3D12Resource_GetGPUVirtualAddress(ps_raw_buffer));
+ ID3D12GraphicsCommandList_SetGraphicsRootUnorderedAccessView(command_list,
+ 2, ID3D12Resource_GetGPUVirtualAddress(ps_raw_uav_buffer));
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list,
+ 3, get_gpu_descriptor_handle(&context, heap, 10));
+
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, compute_pso);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, cs_raw_uav_buffer,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(cs_raw_uav_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ check_readback_data_uint(&rb, NULL, 0xffffffff, 0);
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(cs_cb);
+ ID3D12Resource_Release(ps_cb);
+ ID3D12Resource_Release(cs_raw_buffer);
+ ID3D12Resource_Release(cs_raw_uav_buffer);
+ ID3D12Resource_Release(ps_raw_buffer);
+ ID3D12Resource_Release(ps_raw_uav_buffer);
+ for (i = 0; i < ARRAY_SIZE(cs_textures); ++i)
+ ID3D12Resource_Release(cs_textures[i]);
+ for (i = 0; i < ARRAY_SIZE(ps_textures); ++i)
+ ID3D12Resource_Release(ps_textures[i]);
+ ID3D12DescriptorHeap_Release(heap);
+ ID3D12PipelineState_Release(compute_pso);
+ destroy_test_context(&context);
+}
+
+static void test_face_culling(void)
+{
+ ID3D12PipelineState *color_pso, *ccw_color_pso, *pso;
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f};
+ static const DWORD vs_ccw_code[] =
+ {
+#if 0
+ void main(uint id : SV_VertexID, out float4 position : SV_Position)
+ {
+ float2 coords = float2((id << 1) & 2, id & 2);
+ position = float4(coords * float2(2, 2) + float2(-1, -1), 0, 1);
+ }
+#endif
+ 0x43425844, 0xdcd52e92, 0x3f4a3922, 0xa376c4ed, 0x2bc626c0, 0x00000001, 0x0000018c, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x000000f0, 0x00010050,
+ 0x0000003c, 0x0100086a, 0x04000060, 0x00101012, 0x00000000, 0x00000006, 0x04000067, 0x001020f2,
+ 0x00000000, 0x00000001, 0x02000068, 0x00000001, 0x0b00008c, 0x00100012, 0x00000000, 0x00004001,
+ 0x00000001, 0x00004001, 0x00000001, 0x0010100a, 0x00000000, 0x00004001, 0x00000000, 0x07000001,
+ 0x00100042, 0x00000000, 0x0010100a, 0x00000000, 0x00004001, 0x00000002, 0x05000056, 0x00100032,
+ 0x00000000, 0x00100086, 0x00000000, 0x0f000032, 0x00102032, 0x00000000, 0x00100046, 0x00000000,
+ 0x00004002, 0x40000000, 0x40000000, 0x00000000, 0x00000000, 0x00004002, 0xbf800000, 0xbf800000,
+ 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs_ccw = {vs_ccw_code, sizeof(vs_ccw_code)};
+ static const DWORD ps_color_code[] =
+ {
+#if 0
+ float4 color;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ return color;
+ }
+#endif
+ 0x43425844, 0xd18ead43, 0x8b8264c1, 0x9c0a062d, 0xfc843226, 0x00000001, 0x000000e0, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050,
+ 0x00000011, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2,
+ 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_color = {ps_color_code, sizeof(ps_color_code)};
+ static const DWORD ps_front_code[] =
+ {
+#if 0
+ float4 main(uint front : SV_IsFrontFace) : SV_Target
+ {
+ return (front == ~0u) ? float4(0.0f, 1.0f, 0.0f, 1.0f) : float4(0.0f, 0.0f, 1.0f, 1.0f);
+ }
+#endif
+ 0x43425844, 0x92002fad, 0xc5c620b9, 0xe7a154fb, 0x78b54e63, 0x00000001, 0x00000128, 0x00000003,
+ 0x0000002c, 0x00000064, 0x00000098, 0x4e475349, 0x00000030, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000009, 0x00000001, 0x00000000, 0x00000101, 0x495f5653, 0x6f724673, 0x6146746e,
+ 0xab006563, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000088,
+ 0x00000040, 0x00000022, 0x04000863, 0x00101012, 0x00000000, 0x00000009, 0x03000065, 0x001020f2,
+ 0x00000000, 0x02000068, 0x00000001, 0x07000020, 0x00100012, 0x00000000, 0x0010100a, 0x00000000,
+ 0x00004001, 0xffffffff, 0x0f000037, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x00004002,
+ 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x00004002, 0x00000000, 0x00000000, 0x3f800000,
+ 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_front = {ps_front_code, sizeof(ps_front_code)};
+ static const struct
+ {
+ D3D12_CULL_MODE cull_mode;
+ bool front_ccw;
+ bool expected_cw;
+ bool expected_ccw;
+ }
+ tests[] =
+ {
+ {D3D12_CULL_MODE_NONE, false, true, true},
+ {D3D12_CULL_MODE_NONE, true, true, true},
+ {D3D12_CULL_MODE_FRONT, false, false, true},
+ {D3D12_CULL_MODE_FRONT, true, true, false},
+ {D3D12_CULL_MODE_BACK, false, true, false},
+ {D3D12_CULL_MODE_BACK, true, false, true},
+ };
+ static const bool front_tests[] = {false, true};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_32bit_constants_root_signature(device,
+ 0, 4, D3D12_SHADER_VISIBILITY_PIXEL);
+
+ color_pso = create_pipeline_state(device, context.root_signature,
+ context.render_target_desc.Format, NULL, &ps_color, NULL);
+ ccw_color_pso = create_pipeline_state(device, context.root_signature,
+ context.render_target_desc.Format, &vs_ccw, &ps_color, NULL);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, color_pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, ccw_color_pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, &ps_color, NULL);
+ pso_desc.RasterizerState.CullMode = tests[i].cull_mode;
+ pso_desc.RasterizerState.FrontCounterClockwise = tests[i].front_ccw;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pso);
+ ok(SUCCEEDED(hr), "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list,
+ tests[i].expected_cw ? 0xff00ff00 : 0xffffffff, 0);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12PipelineState_Release(pso);
+ pso_desc.VS = vs_ccw;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pso);
+ ok(SUCCEEDED(hr), "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list,
+ tests[i].expected_ccw ? 0xff00ff00 : 0xffffffff, 0);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12PipelineState_Release(pso);
+ }
+ vkd3d_test_set_context(NULL);
+
+ /* Test SV_IsFrontFace. */
+ for (i = 0; i < ARRAY_SIZE(front_tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, &ps_front, NULL);
+ pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE;
+ pso_desc.RasterizerState.FrontCounterClockwise = front_tests[i];
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pso);
+ ok(SUCCEEDED(hr), "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list,
+ front_tests[i] ? 0xffff0000 : 0xff00ff00, 0);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12PipelineState_Release(pso);
+ pso_desc.VS = vs_ccw;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pso);
+ ok(SUCCEEDED(hr), "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list,
+ front_tests[i] ? 0xff00ff00 : 0xffff0000, 0);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12PipelineState_Release(pso);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12PipelineState_Release(color_pso);
+ ID3D12PipelineState_Release(ccw_color_pso);
+ destroy_test_context(&context);
+}
+
+static void draw_thread_main(void *thread_data)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ struct test_context *context = thread_data;
+ ID3D12GraphicsCommandList *command_list;
+ ID3D12CommandAllocator *allocator;
+ D3D12_CPU_DESCRIPTOR_HANDLE rtv;
+ ID3D12Resource *render_target;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ queue = context->queue;
+ device = context->device;
+ heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1);
+ rtv = get_cpu_descriptor_handle(context, heap, 0);
+ create_render_target(context, NULL, &render_target, &rtv);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ &IID_ID3D12CommandAllocator, (void **)&allocator);
+ ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list);
+ ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr);
+
+ for (i = 0; i < 100; ++i)
+ {
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context->pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(render_target, 0, queue, command_list, 0xff00ff00, 0);
+ reset_command_list(command_list, allocator);
+ transition_resource_state(command_list, render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+
+ ID3D12DescriptorHeap_Release(heap);
+ ID3D12Resource_Release(render_target);
+ ID3D12CommandAllocator_Release(allocator);
+ ID3D12GraphicsCommandList_Release(command_list);
+}
+
+static void test_multithread_command_queue_exec(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ HANDLE threads[10];
+ unsigned int i;
+
+ if (!init_test_context(&context, NULL))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ for (i = 0; i < ARRAY_SIZE(threads); ++i)
+ {
+ threads[i] = create_thread(draw_thread_main, &context);
+ ok(threads[i], "Failed to create thread %u.\n", i);
+ }
+
+ for (i = 0; i < 100; ++i)
+ {
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+
+ for (i = 0; i < ARRAY_SIZE(threads); ++i)
+ ok(join_thread(threads[i]), "Failed to join thread %u.\n", i);
+
+ destroy_test_context(&context);
+}
+
+static void test_geometry_shader(void)
+{
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ D3D12_CPU_DESCRIPTOR_HANDLE rtvs[2];
+ ID3D12PipelineState *pso_5_0, *pso;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *texture;
+ ID3D12Device *device;
+ ID3D12Resource *vb;
+ unsigned int color;
+ unsigned int i;
+ HRESULT hr;
+
+ static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f};
+ static const struct
+ {
+ struct vec4 position;
+ unsigned int color;
+ }
+ vertex[] =
+ {
+ {{0.0f, 0.0f, 1.0f, 1.0f}, 0xffffff00},
+ };
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+#if 0
+ struct vs_data
+ {
+ float4 pos : SV_POSITION;
+ float4 color : COLOR;
+ };
+
+ void main(in struct vs_data vs_input, out struct vs_data vs_output)
+ {
+ vs_output.pos = vs_input.pos;
+ vs_output.color = vs_input.color;
+ }
+#endif
+ static const DWORD vs_code[] =
+ {
+ 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f,
+ 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040,
+ 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067,
+ 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2,
+ 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+#if 0
+ struct gs_data
+ {
+ float4 pos : SV_POSITION;
+ float4 color : COLOR;
+ };
+
+ [maxvertexcount(4)]
+ void main(point struct gs_data vin[1], inout TriangleStream<gs_data> vout)
+ {
+ float offset = 0.2 * vin[0].pos.w;
+ gs_data v;
+
+ v.color = vin[0].color;
+
+ v.pos = float4(vin[0].pos.x - offset, vin[0].pos.y - offset, vin[0].pos.z, 1.0);
+ vout.Append(v);
+ v.pos = float4(vin[0].pos.x - offset, vin[0].pos.y + offset, vin[0].pos.z, 1.0);
+ vout.Append(v);
+ v.pos = float4(vin[0].pos.x + offset, vin[0].pos.y - offset, vin[0].pos.z, 1.0);
+ vout.Append(v);
+ v.pos = float4(vin[0].pos.x + offset, vin[0].pos.y + offset, vin[0].pos.z, 1.0);
+ vout.Append(v);
+ }
+#endif
+ static const DWORD gs_code[] =
+ {
+ 0x43425844, 0x70616045, 0x96756e1f, 0x1caeecb8, 0x3749528c, 0x00000001, 0x0000034c, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f,
+ 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000270, 0x00020040,
+ 0x0000009c, 0x05000061, 0x002010f2, 0x00000001, 0x00000000, 0x00000001, 0x0400005f, 0x002010f2,
+ 0x00000001, 0x00000001, 0x02000068, 0x00000001, 0x0100085d, 0x0100285c, 0x04000067, 0x001020f2,
+ 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000004, 0x0f000032,
+ 0x00100032, 0x00000000, 0x80201ff6, 0x00000041, 0x00000000, 0x00000000, 0x00004002, 0x3e4ccccd,
+ 0x3e4ccccd, 0x00000000, 0x00000000, 0x00201046, 0x00000000, 0x00000000, 0x05000036, 0x00102032,
+ 0x00000000, 0x00100046, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000,
+ 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2,
+ 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x01000013, 0x05000036, 0x00102012, 0x00000000,
+ 0x0010000a, 0x00000000, 0x0e000032, 0x00100052, 0x00000000, 0x00201ff6, 0x00000000, 0x00000000,
+ 0x00004002, 0x3e4ccccd, 0x00000000, 0x3e4ccccd, 0x00000000, 0x00201106, 0x00000000, 0x00000000,
+ 0x05000036, 0x00102022, 0x00000000, 0x0010002a, 0x00000000, 0x06000036, 0x00102042, 0x00000000,
+ 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000,
+ 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x01000013, 0x05000036,
+ 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010001a,
+ 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036,
+ 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46,
+ 0x00000000, 0x00000001, 0x01000013, 0x05000036, 0x00102032, 0x00000000, 0x00100086, 0x00000000,
+ 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082,
+ 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000,
+ 0x00000001, 0x01000013, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE gs = {gs_code, sizeof(gs_code)};
+ static const DWORD gs_5_0_code[] =
+ {
+ 0x43425844, 0x57251c23, 0x4971d115, 0x8fee0b13, 0xba149ea1, 0x00000001, 0x00000384, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000dc, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052,
+ 0x3547534f, 0x00000054, 0x00000002, 0x00000008, 0x00000000, 0x00000040, 0x00000000, 0x00000001,
+ 0x00000003, 0x00000000, 0x0000000f, 0x00000000, 0x0000004c, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000001, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x58454853,
+ 0x000002a0, 0x00020050, 0x000000a8, 0x0100086a, 0x05000061, 0x002010f2, 0x00000001, 0x00000000,
+ 0x00000001, 0x0400005f, 0x002010f2, 0x00000001, 0x00000001, 0x02000068, 0x00000001, 0x0100085d,
+ 0x0300008f, 0x00110000, 0x00000000, 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001,
+ 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000004, 0x0f000032, 0x00100032, 0x00000000,
+ 0x80201ff6, 0x00000041, 0x00000000, 0x00000000, 0x00004002, 0x3e4ccccd, 0x3e4ccccd, 0x00000000,
+ 0x00000000, 0x00201046, 0x00000000, 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00100046,
+ 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036,
+ 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46,
+ 0x00000000, 0x00000001, 0x03000075, 0x00110000, 0x00000000, 0x05000036, 0x00102012, 0x00000000,
+ 0x0010000a, 0x00000000, 0x0e000032, 0x00100052, 0x00000000, 0x00201ff6, 0x00000000, 0x00000000,
+ 0x00004002, 0x3e4ccccd, 0x00000000, 0x3e4ccccd, 0x00000000, 0x00201106, 0x00000000, 0x00000000,
+ 0x05000036, 0x00102022, 0x00000000, 0x0010002a, 0x00000000, 0x06000036, 0x00102042, 0x00000000,
+ 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000,
+ 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x03000075, 0x00110000,
+ 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022,
+ 0x00000000, 0x0010001a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000,
+ 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2,
+ 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x03000075, 0x00110000, 0x00000000, 0x05000036,
+ 0x00102032, 0x00000000, 0x00100086, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a,
+ 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036,
+ 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x03000075, 0x00110000, 0x00000000,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE gs_5_0 = {gs_5_0_code, sizeof(gs_5_0_code)};
+#if 0
+ struct ps_data
+ {
+ float4 pos : SV_POSITION;
+ float4 color : COLOR;
+ };
+
+ float4 main(struct ps_data ps_input) : SV_Target
+ {
+ return ps_input.color;
+ }
+#endif
+ static const DWORD ps_code[] =
+ {
+ 0x43425844, 0x89803e59, 0x3f798934, 0xf99181df, 0xf5556512, 0x00000001, 0x000000f4, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040,
+ 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036,
+ 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 640;
+ desc.rt_height = 480;
+ desc.rt_descriptor_count = 2;
+ desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ rtvs[0] = context.rtv;
+ rtvs[1] = get_cpu_rtv_handle(&context, context.rtv_heap, 1);
+ create_render_target(&context, &desc, &texture, &rtvs[1]);
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, &vs, &ps, &input_layout);
+ pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT;
+ pso_desc.GS = gs_5_0;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pso_5_0);
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+ pso_desc.GS = gs;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pso);
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ vb = create_upload_buffer(context.device, sizeof(vertex), vertex);
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*vertex);
+ vbv.SizeInBytes = sizeof(vertex);
+
+ for (i = 0; i < ARRAY_SIZE(rtvs); ++i)
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtvs[i], red, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtvs[0], false, NULL);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso_5_0);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_POINTLIST);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 1, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtvs[1], false, NULL);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso_5_0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 1, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ color = get_readback_uint(&rb, 320, 190, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 255, 240, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 320, 240, 0);
+ ok(compare_color(color, 0xffffff00, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 385, 240, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 320, 290, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ get_texture_readback_with_command_list(texture, 0, &rb, queue, command_list);
+ color = get_readback_uint(&rb, 320, 190, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 255, 240, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 320, 240, 0);
+ ok(compare_color(color, 0xffffff00, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 385, 240, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 320, 290, 0);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(vb);
+ ID3D12Resource_Release(texture);
+ ID3D12PipelineState_Release(pso);
+ ID3D12PipelineState_Release(pso_5_0);
+ destroy_test_context(&context);
+}
+
+static void test_layered_rendering(void)
+{
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ ID3D12Resource *vb;
+ HRESULT hr;
+
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const struct
+ {
+ uint32_t color;
+ struct vec4 position;
+ uint32_t layer;
+ }
+ vertices[] =
+ {
+ {0x00000000, {-1.0f, -1.0f, 0.0f, 1.0f}, 2},
+ {0x00000000, {-1.0f, 1.0f, 0.0f, 1.0f}, 2},
+ {0x00000000, { 1.0f, -1.0f, 0.0f, 1.0f}, 2},
+ {0x00000000, { 1.0f, 1.0f, 0.0f, 1.0f}, 2},
+ {0xff00ff00, {-1.0f, -1.0f, 0.0f, 1.0f}, 0},
+ {0xff00ff00, {-1.0f, 1.0f, 0.0f, 1.0f}, 0},
+ {0xff00ff00, { 1.0f, -1.0f, 0.0f, 1.0f}, 0},
+ {0xff00ff00, { 1.0f, 1.0f, 0.0f, 1.0f}, 0},
+ {0xffffff00, {-1.0f, -1.0f, 0.0f, 1.0f}, 3},
+ {0xffffff00, {-1.0f, 1.0f, 0.0f, 1.0f}, 3},
+ {0xffffff00, { 1.0f, -1.0f, 0.0f, 1.0f}, 3},
+ {0xffffff00, { 1.0f, 1.0f, 0.0f, 1.0f}, 3},
+ };
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 4, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"LAYER", 0, DXGI_FORMAT_R32_UINT, 0, 20, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const DWORD vs_code[] =
+ {
+#if 0
+ struct vertex
+ {
+ float4 color : COLOR;
+ float4 position : SV_Position;
+ uint layer : LAYER;
+ };
+
+ struct vertex main(in vertex v)
+ {
+ return v;
+ }
+#endif
+ 0x43425844, 0x96d7f39a, 0x03d06cd5, 0x32c1fa04, 0xd509128f, 0x00000001, 0x000001ac, 0x00000003,
+ 0x0000002c, 0x0000009c, 0x0000010c, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000056, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x00000062, 0x00000000, 0x00000000, 0x00000001, 0x00000002,
+ 0x00000101, 0x4f4c4f43, 0x56530052, 0x736f505f, 0x6f697469, 0x414c006e, 0x00524559, 0x4e47534f,
+ 0x00000068, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x00000056, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000000f, 0x00000062,
+ 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000e01, 0x4f4c4f43, 0x56530052, 0x736f505f,
+ 0x6f697469, 0x414c006e, 0x00524559, 0x58454853, 0x00000098, 0x00010050, 0x00000026, 0x0100086a,
+ 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x0300005f, 0x00101012,
+ 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000001, 0x00000001,
+ 0x03000065, 0x00102012, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000,
+ 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, 0x05000036, 0x00102012, 0x00000002,
+ 0x0010100a, 0x00000002, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD gs_code[] =
+ {
+#if 0
+ struct gs_in
+ {
+ float4 color : COLOR;
+ float4 position : SV_Position;
+ uint layer : LAYER;
+ };
+
+ struct gs_out
+ {
+ float4 color : COLOR;
+ float4 position : SV_Position;
+ uint layer : SV_RenderTargetArrayIndex;
+ };
+
+ [maxvertexcount(3)]
+ void main(triangle gs_in vin[3], inout TriangleStream<gs_out> vout)
+ {
+ gs_out o;
+
+ o.color = vin[0].color;
+ o.position = vin[0].position;
+ o.layer = vin[0].layer;
+ vout.Append(o);
+
+ o.color = vin[1].color;
+ o.position = vin[1].position;
+ o.layer = vin[1].layer;
+ vout.Append(o);
+
+ o.color = vin[2].color;
+ o.position = vin[2].position;
+ o.layer = vin[2].layer;
+ vout.Append(o);
+ }
+#endif
+ 0x43425844, 0x29d7c0a0, 0xcf146fd1, 0x5cd36ca7, 0xab2b10ff, 0x00000001, 0x000002bc, 0x00000003,
+ 0x0000002c, 0x0000009c, 0x0000012c, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000056, 0x00000000, 0x00000001,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x00000062, 0x00000000, 0x00000000, 0x00000001, 0x00000002,
+ 0x00000101, 0x4f4c4f43, 0x56530052, 0x736f505f, 0x6f697469, 0x414c006e, 0x00524559, 0x3547534f,
+ 0x00000088, 0x00000003, 0x00000008, 0x00000000, 0x0000005c, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000000, 0x00000062, 0x00000000, 0x00000001, 0x00000003, 0x00000001,
+ 0x0000000f, 0x00000000, 0x0000006e, 0x00000000, 0x00000004, 0x00000001, 0x00000002, 0x00000e01,
+ 0x4f4c4f43, 0x56530052, 0x736f505f, 0x6f697469, 0x5653006e, 0x6e65525f, 0x54726564, 0x65677261,
+ 0x72724174, 0x6e497961, 0x00786564, 0x58454853, 0x00000188, 0x00020050, 0x00000062, 0x0100086a,
+ 0x0400005f, 0x002010f2, 0x00000003, 0x00000000, 0x05000061, 0x002010f2, 0x00000003, 0x00000001,
+ 0x00000001, 0x0400005f, 0x00201012, 0x00000003, 0x00000002, 0x0100185d, 0x0300008f, 0x00110000,
+ 0x00000000, 0x0100285c, 0x03000065, 0x001020f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000001,
+ 0x00000001, 0x04000067, 0x00102012, 0x00000002, 0x00000004, 0x0200005e, 0x00000003, 0x06000036,
+ 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x06000036, 0x001020f2, 0x00000001,
+ 0x00201e46, 0x00000000, 0x00000001, 0x06000036, 0x00102012, 0x00000002, 0x0020100a, 0x00000000,
+ 0x00000002, 0x03000075, 0x00110000, 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46,
+ 0x00000001, 0x00000000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000001, 0x00000001,
+ 0x06000036, 0x00102012, 0x00000002, 0x0020100a, 0x00000001, 0x00000002, 0x03000075, 0x00110000,
+ 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000002, 0x00000000, 0x06000036,
+ 0x001020f2, 0x00000001, 0x00201e46, 0x00000002, 0x00000001, 0x06000036, 0x00102012, 0x00000002,
+ 0x0020100a, 0x00000002, 0x00000002, 0x03000075, 0x00110000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE gs = {gs_code, sizeof(gs_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float4 main(float4 color : COLOR) : SV_Target0
+ {
+ return color;
+ }
+#endif
+ 0x43425844, 0xdccf00bf, 0xcc96375e, 0xba21f157, 0xe47b8b1c, 0x00000001, 0x000000d4, 0x00000003,
+ 0x0000002c, 0x0000005c, 0x00000090, 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x4f4c4f43, 0xabab0052, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000003c, 0x00000050, 0x0000000f,
+ 0x0100086a, 0x03001062, 0x001010f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x05000036,
+ 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_array_size = 4;
+ desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, &vs, &ps, &input_layout);
+ pso_desc.GS = gs;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ vb = create_upload_buffer(context.device, sizeof(vertices), vertices);
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*vertices);
+ vbv.SizeInBytes = sizeof(vertices);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 12, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+ reset_command_list(command_list, context.allocator);
+ check_sub_resource_uint(context.render_target, 1, queue, command_list, 0xffffffff, 0);
+ reset_command_list(command_list, context.allocator);
+ check_sub_resource_uint(context.render_target, 2, queue, command_list, 0x00000000, 0);
+ reset_command_list(command_list, context.allocator);
+ check_sub_resource_uint(context.render_target, 3, queue, command_list, 0xffffff00, 0);
+
+ ID3D12Resource_Release(vb);
+ destroy_test_context(&context);
+}
+
+static void test_ps_layer(void)
+{
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const DWORD vs_code[] =
+ {
+#if 0
+ void main(in uint vertex_id : SV_VertexID, out uint layer : LAYER)
+ {
+ layer = vertex_id;
+ }
+#endif
+ 0x43425844, 0xd2b4abd8, 0xf9adf7df, 0xed1b4eb0, 0x4bf54391, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000090, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978,
+ 0x4e47534f, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001,
+ 0x00000000, 0x00000e01, 0x4559414c, 0xabab0052, 0x58454853, 0x00000040, 0x00010050, 0x00000010,
+ 0x0100086a, 0x04000060, 0x00101012, 0x00000000, 0x00000006, 0x03000065, 0x00102012, 0x00000000,
+ 0x05000036, 0x00102012, 0x00000000, 0x0010100a, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD gs_code[] =
+ {
+#if 0
+ struct gs_in
+ {
+ uint layer : LAYER;
+ };
+
+ struct gs_out
+ {
+ float4 position : SV_Position;
+ uint layer : SV_RenderTargetArrayIndex;
+ };
+
+ [maxvertexcount(3)]
+ void main(point gs_in vin[1], inout TriangleStream<gs_out> vout)
+ {
+ gs_out o;
+
+ o.layer = vin[0].layer;
+
+ o.position = float4(-1, 1, 0, 1);
+ vout.Append(o);
+
+ o.position = float4(3, 1, 0, 1);
+ vout.Append(o);
+
+ o.position = float4(-1, -3, 0, 1);
+ vout.Append(o);
+ }
+#endif
+ 0x43425844, 0x2589d822, 0x7557587c, 0x7d7e9cc0, 0x6bad86aa, 0x00000001, 0x000001fc, 0x00000003,
+ 0x0000002c, 0x0000005c, 0x000000cc, 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000101, 0x4559414c, 0xabab0052, 0x3547534f,
+ 0x00000068, 0x00000002, 0x00000008, 0x00000000, 0x00000040, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000000, 0x0000004c, 0x00000000, 0x00000004, 0x00000001, 0x00000001,
+ 0x00000e01, 0x505f5653, 0x7469736f, 0x006e6f69, 0x525f5653, 0x65646e65, 0x72615472, 0x41746567,
+ 0x79617272, 0x65646e49, 0xabab0078, 0x58454853, 0x00000128, 0x00020050, 0x0000004a, 0x0100086a,
+ 0x0400005f, 0x00201012, 0x00000001, 0x00000000, 0x0100085d, 0x0300008f, 0x00110000, 0x00000000,
+ 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x04000067, 0x00102012, 0x00000001,
+ 0x00000004, 0x0200005e, 0x00000003, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0xbf800000,
+ 0x3f800000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a, 0x00000000,
+ 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002,
+ 0x40400000, 0x3f800000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a,
+ 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000,
+ 0x00004002, 0xbf800000, 0xc0400000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001,
+ 0x0020100a, 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE gs = {gs_code, sizeof(gs_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float4 main(float4 p : SV_Position, uint layer : SV_RenderTargetArrayIndex) : SV_Target0
+ {
+ return layer / 255.0;
+ }
+#endif
+ 0x43425844, 0x53474926, 0xbd247b84, 0x389660f4, 0x331cf598, 0x00000001, 0x00000140, 0x00000003,
+ 0x0000002c, 0x00000094, 0x000000c8, 0x4e475349, 0x00000060, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000004,
+ 0x00000001, 0x00000001, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x525f5653, 0x65646e65,
+ 0x72615472, 0x41746567, 0x79617272, 0x65646e49, 0xabab0078, 0x4e47534f, 0x0000002c, 0x00000001,
+ 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653,
+ 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c, 0x0100086a, 0x04000864,
+ 0x00101012, 0x00000001, 0x00000004, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001,
+ 0x05000056, 0x00100012, 0x00000000, 0x0010100a, 0x00000001, 0x0a000038, 0x001020f2, 0x00000000,
+ 0x00100006, 0x00000000, 0x00004002, 0x3b808081, 0x3b808081, 0x3b808081, 0x3b808081, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const unsigned int expected_results[] =
+ {
+ 0x00000000,
+ 0x01010101,
+ 0x02020202,
+ 0x03030303,
+ 0x04040404,
+ 0x05050505,
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_array_size = 6;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, &vs, &ps, NULL);
+ pso_desc.GS = gs;
+ pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_POINTLIST);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 6, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ for (i = 0; i < ARRAY_SIZE(expected_results); ++i)
+ {
+ check_sub_resource_uint(context.render_target, i, queue, command_list, expected_results[i], 0);
+ reset_command_list(command_list, context.allocator);
+ }
+
+ destroy_test_context(&context);
+}
+
+static void test_nop_tessellation_shaders(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ struct vec4 tess_factors;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD hs_cb_code[] =
+ {
+#if 0
+ float4 tess_factor;
+
+ struct data
+ {
+ float4 position : SV_Position;
+ };
+
+ struct patch_constant_data
+ {
+ float edges[3] : SV_TessFactor;
+ float inside : SV_InsideTessFactor;
+ };
+
+ void patch_constant(InputPatch<data, 3> input, out patch_constant_data output)
+ {
+ output.edges[0] = tess_factor.x;
+ output.edges[1] = tess_factor.y;
+ output.edges[2] = tess_factor.z;
+ output.inside = tess_factor.w;
+ }
+
+ [domain("tri")]
+ [outputcontrolpoints(3)]
+ [partitioning("integer")]
+ [outputtopology("triangle_cw")]
+ [patchconstantfunc("patch_constant")]
+ data hs_main(InputPatch<data, 3> input, uint i : SV_OutputControlPointID)
+ {
+ return input[i];
+ }
+#endif
+ 0x43425844, 0x7e698b53, 0x830de202, 0x4287601f, 0x4315faa4, 0x00000001, 0x00000228, 0x00000004,
+ 0x00000030, 0x00000064, 0x00000098, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f,
+ 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001,
+ 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000008c,
+ 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d, 0x00000003, 0x00000000, 0x00000e01,
+ 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x00000068, 0x00000002,
+ 0x0000000d, 0x00000003, 0x00000002, 0x00000e01, 0x00000076, 0x00000000, 0x0000000e, 0x00000003,
+ 0x00000003, 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469,
+ 0x46737365, 0x6f746361, 0xabab0072, 0x58454853, 0x000000f4, 0x00030050, 0x0000003d, 0x01000071,
+ 0x01001893, 0x01001894, 0x01001095, 0x01000896, 0x01001897, 0x0100086a, 0x04000059, 0x00208e46,
+ 0x00000000, 0x00000001, 0x01000073, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x06000036,
+ 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x04000067,
+ 0x00102012, 0x00000001, 0x00000012, 0x06000036, 0x00102012, 0x00000001, 0x0020801a, 0x00000000,
+ 0x00000000, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000002, 0x00000013, 0x06000036,
+ 0x00102012, 0x00000002, 0x0020802a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x04000067,
+ 0x00102012, 0x00000003, 0x00000014, 0x06000036, 0x00102012, 0x00000003, 0x0020803a, 0x00000000,
+ 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE hs_cb = {hs_cb_code, sizeof(hs_cb_code)};
+#if 0
+ struct data
+ {
+ float4 position : SV_Position;
+ };
+
+ struct patch_constant_data
+ {
+ float edges[3] : SV_TessFactor;
+ float inside : SV_InsideTessFactor;
+ };
+
+ void patch_constant(InputPatch<data, 3> input, out patch_constant_data output)
+ {
+ output.edges[0] = output.edges[1] = output.edges[2] = 1.0f;
+ output.inside = 1.0f;
+ }
+
+ [domain("tri")]
+ [outputcontrolpoints(3)]
+ [partitioning("integer")]
+ [outputtopology("triangle_cw")]
+ [patchconstantfunc("patch_constant")]
+ data hs_main(InputPatch<data, 3> input, uint i : SV_OutputControlPointID)
+ {
+ return input[i];
+ }
+
+ [domain("tri")]
+ void ds_main(patch_constant_data input,
+ float3 tess_coord : SV_DomainLocation,
+ const OutputPatch<data, 3> patch,
+ out data output)
+ {
+ output.position = tess_coord.x * patch[0].position
+ + tess_coord.y * patch[1].position
+ + tess_coord.z * patch[2].position;
+ }
+#endif
+ static const DWORD hs_code[] =
+ {
+ 0x43425844, 0x0e9a8861, 0x39351e76, 0x0e10883f, 0x6054b5a1, 0x00000001, 0x0000020c, 0x00000004,
+ 0x00000030, 0x00000064, 0x00000098, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f,
+ 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001,
+ 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000008c,
+ 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d, 0x00000003, 0x00000000, 0x00000e01,
+ 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x00000068, 0x00000002,
+ 0x0000000d, 0x00000003, 0x00000002, 0x00000e01, 0x00000076, 0x00000000, 0x0000000e, 0x00000003,
+ 0x00000003, 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469,
+ 0x46737365, 0x6f746361, 0xabab0072, 0x58454853, 0x000000d8, 0x00030050, 0x00000036, 0x01000071,
+ 0x01001893, 0x01001894, 0x01001095, 0x01000896, 0x01001897, 0x0100086a, 0x01000073, 0x02000099,
+ 0x00000003, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x04000067,
+ 0x00102012, 0x00000001, 0x00000012, 0x04000067, 0x00102012, 0x00000002, 0x00000013, 0x02000068,
+ 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000003, 0x04000036, 0x00100012, 0x00000000,
+ 0x0001700a, 0x06000036, 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e,
+ 0x01000073, 0x04000067, 0x00102012, 0x00000003, 0x00000014, 0x05000036, 0x00102012, 0x00000003,
+ 0x00004001, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)};
+ static const DWORD ds_code[] =
+ {
+ 0x43425844, 0x8ed11021, 0x414dff74, 0x426849eb, 0x312f4860, 0x00000001, 0x000001e0, 0x00000004,
+ 0x00000030, 0x00000064, 0x000000f8, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f,
+ 0x006e6f69, 0x47534350, 0x0000008c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d,
+ 0x00000003, 0x00000000, 0x00000001, 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001,
+ 0x00000001, 0x00000068, 0x00000002, 0x0000000d, 0x00000003, 0x00000002, 0x00000001, 0x00000076,
+ 0x00000000, 0x0000000e, 0x00000003, 0x00000003, 0x00000001, 0x545f5653, 0x46737365, 0x6f746361,
+ 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c,
+ 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f,
+ 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x000000ac, 0x00040050, 0x0000002b, 0x01001893,
+ 0x01001095, 0x0100086a, 0x0200005f, 0x0001c072, 0x0400005f, 0x002190f2, 0x00000003, 0x00000000,
+ 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x02000068, 0x00000001, 0x07000038, 0x001000f2,
+ 0x00000000, 0x0001c556, 0x00219e46, 0x00000001, 0x00000000, 0x09000032, 0x001000f2, 0x00000000,
+ 0x0001c006, 0x00219e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x09000032, 0x001020f2,
+ 0x00000000, 0x0001caa6, 0x00219e46, 0x00000002, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)};
+ static const DWORD hs_index_range_code[] =
+ {
+#if 0
+ float4 tess_factor;
+
+ struct data
+ {
+ float4 position : SV_Position;
+ };
+
+ struct patch_constant_data
+ {
+ float edges[3] : SV_TessFactor;
+ float inside : SV_InsideTessFactor;
+ };
+
+ void patch_constant(InputPatch<data, 3> input, out patch_constant_data output)
+ {
+ output.edges[0] = tess_factor.x;
+ output.edges[1] = 1.0f;
+ output.edges[2] = 1.0f;
+ output.inside = tess_factor.y;
+ }
+
+ [domain("tri")]
+ [outputcontrolpoints(3)]
+ [partitioning("integer")]
+ [outputtopology("triangle_cw")]
+ [patchconstantfunc("patch_constant")]
+ data hs_main(InputPatch<data, 3> input, uint i : SV_OutputControlPointID)
+ {
+ return input[i];
+ }
+#endif
+ 0x43425844, 0xf9d52cfc, 0xb299036a, 0x66bf56b7, 0x6161e921, 0x00000001, 0x00000244, 0x00000004,
+ 0x00000030, 0x00000064, 0x00000098, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f,
+ 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001,
+ 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000008c,
+ 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d, 0x00000003, 0x00000000, 0x00000e01,
+ 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x00000068, 0x00000002,
+ 0x0000000d, 0x00000003, 0x00000002, 0x00000e01, 0x00000076, 0x00000000, 0x0000000e, 0x00000003,
+ 0x00000003, 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469,
+ 0x46737365, 0x6f746361, 0xabab0072, 0x58454853, 0x00000110, 0x00030050, 0x00000044, 0x01000071,
+ 0x01001893, 0x01001894, 0x01001095, 0x01000896, 0x01001897, 0x0100086a, 0x04000059, 0x00208e46,
+ 0x00000000, 0x00000001, 0x01000073, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x06000036,
+ 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x02000099,
+ 0x00000002, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000001, 0x00000012, 0x04000067,
+ 0x00102012, 0x00000002, 0x00000013, 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000001,
+ 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, 0x00d02012, 0x00000001,
+ 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, 0x01000073, 0x04000067, 0x00102012,
+ 0x00000003, 0x00000014, 0x06000036, 0x00102012, 0x00000003, 0x0020801a, 0x00000000, 0x00000000,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE hs_index_range = {hs_index_range_code, sizeof(hs_index_range_code)};
+ static const D3D12_SHADER_BYTECODE *hull_shaders[] = {&hs_cb, &hs, &hs_index_range};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_32bit_constants_root_signature(context.device,
+ 0, 4, D3D12_SHADER_VISIBILITY_HULL);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, NULL, NULL);
+ pso_desc.HS = hs_cb;
+ pso_desc.DS = ds;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr);
+ ID3D12PipelineState_Release(context.pipeline_state);
+
+ for (i = 0; i < ARRAY_SIZE(hull_shaders); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ pso_desc.HS = *hull_shaders[i];
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ tess_factors.x = tess_factors.y = tess_factors.z = tess_factors.w = 1.0f;
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &tess_factors.x, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ context.pipeline_state = NULL;
+ }
+ vkd3d_test_set_context(NULL);
+
+ destroy_test_context(&context);
+}
+
+struct triangle
+{
+ struct vec4 v[3];
+};
+
+#define check_triangles(a, b, c, d, e) check_triangles_(__LINE__, a, b, c, d, e)
+static void check_triangles_(unsigned int line, ID3D12Resource *buffer,
+ ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list,
+ const struct triangle *triangles, unsigned int triangle_count)
+{
+ const struct triangle *current, *expected;
+ struct resource_readback rb;
+ unsigned int i, j, offset;
+ bool all_match = true;
+
+ get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list);
+
+ for (i = 0; i < triangle_count; ++i)
+ {
+ current = get_readback_data(&rb, i, 0, 0, sizeof(*current));
+ expected = &triangles[i];
+
+ offset = ~0u;
+ for (j = 0; j < ARRAY_SIZE(expected->v); ++j)
+ {
+ if (compare_vec4(¤t->v[0], &expected->v[j], 0))
+ {
+ offset = j;
+ break;
+ }
+ }
+
+ if (offset == ~0u)
+ {
+ all_match = false;
+ break;
+ }
+
+ for (j = 0; j < ARRAY_SIZE(expected->v); ++j)
+ {
+ if (!compare_vec4(¤t->v[j], &expected->v[(j + offset) % 3], 0))
+ {
+ all_match = false;
+ break;
+ }
+ }
+ if (!all_match)
+ break;
+ }
+
+ ok_(line)(all_match, "Triangle %u vertices {%.8e, %.8e, %.8e, %.8e}, "
+ "{%.8e, %.8e, %.8e, %.8e}, {%.8e, %.8e, %.8e, %.8e} "
+ "do not match {%.8e, %.8e, %.8e, %.8e}, {%.8e, %.8e, %.8e, %.8e}, "
+ "{%.8e, %.8e, %.8e, %.8e}.\n", i,
+ current->v[0].x, current->v[0].y, current->v[0].z, current->v[0].w,
+ current->v[1].x, current->v[1].y, current->v[1].z, current->v[1].w,
+ current->v[2].x, current->v[2].y, current->v[2].z, current->v[2].w,
+ expected->v[0].x, expected->v[0].y, expected->v[0].z, expected->v[0].w,
+ expected->v[1].x, expected->v[1].y, expected->v[1].z, expected->v[1].w,
+ expected->v[2].x, expected->v[2].y, expected->v[2].z, expected->v[2].w);
+
+ release_resource_readback(&rb);
+}
+
+static void test_quad_tessellation(void)
+{
+ static const DWORD vs_code[] =
+ {
+#if 0
+ void main(float4 in_position : POSITION, out float4 out_position : SV_POSITION)
+ {
+ out_position = in_position;
+ }
+#endif
+ 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040,
+ 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+#if 0
+ struct point_data
+ {
+ float4 position : SV_POSITION;
+ };
+
+ struct patch_constant_data
+ {
+ float edges[4] : SV_TessFactor;
+ float inside[2] : SV_InsideTessFactor;
+ };
+
+ float4 tess_factors;
+ float2 inside_tess_factors;
+
+ patch_constant_data patch_constant(InputPatch<point_data, 4> input)
+ {
+ patch_constant_data output;
+
+ output.edges[0] = tess_factors.x;
+ output.edges[1] = tess_factors.y;
+ output.edges[2] = tess_factors.z;
+ output.edges[3] = tess_factors.w;
+ output.inside[0] = inside_tess_factors.x;
+ output.inside[1] = inside_tess_factors.y;
+
+ return output;
+ }
+
+ [domain("quad")]
+ [outputcontrolpoints(4)]
+ [outputtopology("triangle_ccw")]
+ [partitioning("integer")]
+ [patchconstantfunc("patch_constant")]
+ point_data hs_main(InputPatch<point_data, 4> input,
+ uint i : SV_OutputControlPointID)
+ {
+ return input[i];
+ }
+
+ [domain("quad")]
+ point_data ds_main(patch_constant_data input,
+ float2 tess_coord : SV_DomainLocation,
+ const OutputPatch<point_data, 4> patch)
+ {
+ point_data output;
+
+ float4 a = lerp(patch[0].position, patch[1].position, tess_coord.x);
+ float4 b = lerp(patch[2].position, patch[3].position, tess_coord.x);
+ output.position = lerp(a, b, tess_coord.y);
+
+ return output;
+ }
+#endif
+ static const DWORD hs_quad_ccw_code[] =
+ {
+ 0x43425844, 0xdf8df700, 0x58b08fb1, 0xbd23d2c3, 0xcf884094, 0x00000001, 0x000002b8, 0x00000004,
+ 0x00000030, 0x00000064, 0x00000098, 0x0000015c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f,
+ 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x47534350, 0x000000bc,
+ 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000e01,
+ 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000e01, 0x00000098, 0x00000002,
+ 0x0000000b, 0x00000003, 0x00000002, 0x00000e01, 0x00000098, 0x00000003, 0x0000000b, 0x00000003,
+ 0x00000003, 0x00000e01, 0x000000a6, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, 0x00000e01,
+ 0x000000a6, 0x00000001, 0x0000000c, 0x00000003, 0x00000005, 0x00000e01, 0x545f5653, 0x46737365,
+ 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x58454853,
+ 0x00000154, 0x00030050, 0x00000055, 0x01000071, 0x01002093, 0x01002094, 0x01001895, 0x01000896,
+ 0x01002097, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x01000073, 0x04000067,
+ 0x00102012, 0x00000000, 0x0000000b, 0x06000036, 0x00102012, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000001, 0x0000000c, 0x06000036,
+ 0x00102012, 0x00000001, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x04000067,
+ 0x00102012, 0x00000002, 0x0000000d, 0x06000036, 0x00102012, 0x00000002, 0x0020802a, 0x00000000,
+ 0x00000000, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000003, 0x0000000e, 0x06000036,
+ 0x00102012, 0x00000003, 0x0020803a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x04000067,
+ 0x00102012, 0x00000004, 0x0000000f, 0x06000036, 0x00102012, 0x00000004, 0x0020800a, 0x00000000,
+ 0x00000001, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000005, 0x00000010, 0x06000036,
+ 0x00102012, 0x00000005, 0x0020801a, 0x00000000, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE hs_quad_ccw = {hs_quad_ccw_code, sizeof(hs_quad_ccw_code)};
+ static const DWORD ds_code[] =
+ {
+ 0x43425844, 0xeb6b7631, 0x07f5469e, 0xed0cbf4a, 0x7158b3a6, 0x00000001, 0x00000284, 0x00000004,
+ 0x00000030, 0x00000064, 0x00000128, 0x0000015c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f,
+ 0x004e4f49, 0x47534350, 0x000000bc, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b,
+ 0x00000003, 0x00000000, 0x00000001, 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001,
+ 0x00000001, 0x00000098, 0x00000002, 0x0000000b, 0x00000003, 0x00000002, 0x00000001, 0x00000098,
+ 0x00000003, 0x0000000b, 0x00000003, 0x00000003, 0x00000001, 0x000000a6, 0x00000000, 0x0000000c,
+ 0x00000003, 0x00000004, 0x00000001, 0x000000a6, 0x00000001, 0x0000000c, 0x00000003, 0x00000005,
+ 0x00000001, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365,
+ 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000,
+ 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x58454853,
+ 0x00000120, 0x00040050, 0x00000048, 0x01002093, 0x01001895, 0x0100086a, 0x0200005f, 0x0001c032,
+ 0x0400005f, 0x002190f2, 0x00000004, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001,
+ 0x02000068, 0x00000002, 0x0a000000, 0x001000f2, 0x00000000, 0x80219e46, 0x00000041, 0x00000002,
+ 0x00000000, 0x00219e46, 0x00000003, 0x00000000, 0x09000032, 0x001000f2, 0x00000000, 0x0001c006,
+ 0x00100e46, 0x00000000, 0x00219e46, 0x00000002, 0x00000000, 0x0a000000, 0x001000f2, 0x00000001,
+ 0x80219e46, 0x00000041, 0x00000000, 0x00000000, 0x00219e46, 0x00000001, 0x00000000, 0x09000032,
+ 0x001000f2, 0x00000001, 0x0001c006, 0x00100e46, 0x00000001, 0x00219e46, 0x00000000, 0x00000000,
+ 0x08000000, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x80100e46, 0x00000041, 0x00000001,
+ 0x08000032, 0x001020f2, 0x00000000, 0x0001c556, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)};
+#if 0
+ ...
+ [outputtopology("triangle_cw")]
+ ...
+#endif
+ static const DWORD hs_quad_cw_code[] =
+ {
+ 0x43425844, 0x1ab30cc8, 0x94174771, 0x61f4cdd0, 0xa287f62c, 0x00000001, 0x000002b8, 0x00000004,
+ 0x00000030, 0x00000064, 0x00000098, 0x0000015c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f,
+ 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x47534350, 0x000000bc,
+ 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000e01,
+ 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000e01, 0x00000098, 0x00000002,
+ 0x0000000b, 0x00000003, 0x00000002, 0x00000e01, 0x00000098, 0x00000003, 0x0000000b, 0x00000003,
+ 0x00000003, 0x00000e01, 0x000000a6, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, 0x00000e01,
+ 0x000000a6, 0x00000001, 0x0000000c, 0x00000003, 0x00000005, 0x00000e01, 0x545f5653, 0x46737365,
+ 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x58454853,
+ 0x00000154, 0x00030050, 0x00000055, 0x01000071, 0x01002093, 0x01002094, 0x01001895, 0x01000896,
+ 0x01001897, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x01000073, 0x04000067,
+ 0x00102012, 0x00000000, 0x0000000b, 0x06000036, 0x00102012, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000001, 0x0000000c, 0x06000036,
+ 0x00102012, 0x00000001, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x04000067,
+ 0x00102012, 0x00000002, 0x0000000d, 0x06000036, 0x00102012, 0x00000002, 0x0020802a, 0x00000000,
+ 0x00000000, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000003, 0x0000000e, 0x06000036,
+ 0x00102012, 0x00000003, 0x0020803a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x04000067,
+ 0x00102012, 0x00000004, 0x0000000f, 0x06000036, 0x00102012, 0x00000004, 0x0020800a, 0x00000000,
+ 0x00000001, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000005, 0x00000010, 0x06000036,
+ 0x00102012, 0x00000005, 0x0020801a, 0x00000000, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE hs_quad_cw = {hs_quad_cw_code, sizeof(hs_quad_cw_code)};
+ static const struct vec4 quad[] =
+ {
+ {-1.0f, -1.0f, 0.0f, 1.0f},
+ {-1.0f, 1.0f, 0.0f, 1.0f},
+ { 1.0f, -1.0f, 0.0f, 1.0f},
+ { 1.0f, 1.0f, 0.0f, 1.0f},
+ };
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const D3D12_SO_DECLARATION_ENTRY so_declaration[] =
+ {
+ {0, "SV_POSITION", 0, 0, 4, 0},
+ };
+ unsigned int strides[] = {16};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const BYTE zero_data[2048];
+ static const struct triangle expected_quad_ccw[] =
+ {
+ {{{-1.0f, -1.0f, 0.0f, 1.0f},
+ { 1.0f, -1.0f, 0.0f, 1.0f},
+ {-1.0f, 1.0f, 0.0f, 1.0f}}},
+ {{{-1.0f, 1.0f, 0.0f, 1.0f},
+ { 1.0f, -1.0f, 0.0f, 1.0f},
+ { 1.0f, 1.0f, 0.0f, 1.0f}}},
+ {{{ 0.0f, 0.0f, 0.0f, 0.0f},
+ { 0.0f, 0.0f, 0.0f, 0.0f},
+ { 0.0f, 0.0f, 0.0f, 0.0f}}},
+ };
+ static const struct triangle expected_quad_cw[] =
+ {
+ {{{-1.0f, -1.0f, 0.0f, 1.0f},
+ {-1.0f, 1.0f, 0.0f, 1.0f},
+ { 1.0f, -1.0f, 0.0f, 1.0f}}},
+ {{{-1.0f, 1.0f, 0.0f, 1.0f},
+ { 1.0f, 1.0f, 0.0f, 1.0f},
+ { 1.0f, -1.0f, 0.0f, 1.0f}}},
+ {{{ 0.0f, 0.0f, 0.0f, 0.0f},
+ { 0.0f, 0.0f, 0.0f, 0.0f},
+ { 0.0f, 0.0f, 0.0f, 0.0f}}},
+ };
+ struct
+ {
+ float tess_factors[4];
+ float inside_tess_factors[2];
+ uint32_t padding[2];
+ } constant;
+
+ ID3D12Resource *vb, *so_buffer, *upload_buffer, *readback_buffer;
+ D3D12_QUERY_DATA_SO_STATISTICS *so_statistics;
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_QUERY_HEAP_DESC query_heap_desc;
+ D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct resource_readback rb;
+ ID3D12QueryHeap *query_heap;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ unsigned int i;
+ HRESULT hr;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ query_heap_desc.Type = D3D12_QUERY_HEAP_TYPE_SO_STATISTICS;
+ query_heap_desc.Count = 2;
+ query_heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateQueryHeap(device, &query_heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap);
+ if (hr == E_NOTIMPL)
+ {
+ skip("Stream output is not supported.\n");
+ destroy_test_context(&context);
+ return;
+ }
+ ok(hr == S_OK, "Failed to create query heap, hr %#x.\n", hr);
+
+ context.root_signature = create_32bit_constants_root_signature_(__LINE__,
+ device, 0, 6, D3D12_SHADER_VISIBILITY_HULL,
+ D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT
+ | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT);
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, NULL, &input_layout);
+ pso_desc.VS = vs;
+ pso_desc.HS = hs_quad_cw;
+ pso_desc.DS = ds;
+ pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration);
+ pso_desc.StreamOutput.pSODeclaration = so_declaration;
+ pso_desc.StreamOutput.pBufferStrides = strides;
+ pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides);
+ pso_desc.StreamOutput.RasterizedStream = 0;
+ pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH;
+
+ vb = create_upload_buffer(device, sizeof(quad), quad);
+
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*quad);
+ vbv.SizeInBytes = sizeof(quad);
+
+ upload_buffer = create_upload_buffer(device, sizeof(zero_data), &zero_data);
+
+ so_buffer = create_default_buffer(device, sizeof(zero_data),
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+
+ ID3D12GraphicsCommandList_CopyBufferRegion(command_list, so_buffer, 0,
+ upload_buffer, 0, sizeof(zero_data));
+ transition_resource_state(command_list, so_buffer,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT);
+
+ sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer);
+ sobv.SizeInBytes = 1024;
+ sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes;
+
+ for (i = 0; i < ARRAY_SIZE(constant.tess_factors); ++i)
+ constant.tess_factors[i] = 1.0f;
+ for (i = 0; i < ARRAY_SIZE(constant.inside_tess_factors); ++i)
+ constant.inside_tess_factors[i] = 1.0f;
+
+ pso_desc.HS = hs_quad_ccw;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 6, &constant, 0);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ transition_resource_state(command_list, so_buffer,
+ D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_triangles(so_buffer, queue, command_list, expected_quad_ccw, ARRAY_SIZE(expected_quad_ccw));
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, so_buffer,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST);
+ ID3D12GraphicsCommandList_CopyBufferRegion(command_list, so_buffer, 0,
+ upload_buffer, 0, sizeof(zero_data));
+ transition_resource_state(command_list, so_buffer,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ pso_desc.HS = hs_quad_cw;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 6, &constant, 0);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ transition_resource_state(command_list, so_buffer,
+ D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_triangles(so_buffer, queue, command_list, expected_quad_cw, ARRAY_SIZE(expected_quad_cw));
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, so_buffer,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST);
+ ID3D12GraphicsCommandList_CopyBufferRegion(command_list, so_buffer, 0,
+ upload_buffer, 0, sizeof(zero_data));
+ transition_resource_state(command_list, so_buffer,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv);
+
+ ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0);
+
+ for (i = 0; i < ARRAY_SIZE(constant.tess_factors); ++i)
+ constant.tess_factors[i] = 2.0f;
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 6, &constant, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ constant.tess_factors[0] = 0.0f; /* A patch is discarded. */
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 6, &constant, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0);
+
+ ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 1);
+
+ constant.tess_factors[0] = 5.0f;
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 6, &constant, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 1);
+
+ readback_buffer = create_readback_buffer(device, 2 * sizeof(*so_statistics));
+ ID3D12GraphicsCommandList_ResolveQueryData(command_list,
+ query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0, 2, readback_buffer, 0);
+
+ get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list);
+ so_statistics = get_readback_data(&rb, 0, 0, 0, sizeof(*so_statistics));
+ ok(so_statistics[0].NumPrimitivesWritten == 8, "Got unexpected primitives written %u.\n",
+ (unsigned int)so_statistics[0].NumPrimitivesWritten);
+ ok(so_statistics[0].PrimitivesStorageNeeded == 8, "Got unexpected primitives storage needed %u.\n",
+ (unsigned int)so_statistics[0].PrimitivesStorageNeeded);
+ ok(so_statistics[1].NumPrimitivesWritten == 11, "Got unexpected primitives written %u.\n",
+ (unsigned int)so_statistics[1].NumPrimitivesWritten);
+ ok(so_statistics[1].PrimitivesStorageNeeded == 11, "Got unexpected primitives storage needed %u.\n",
+ (unsigned int)so_statistics[1].PrimitivesStorageNeeded);
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(readback_buffer);
+ ID3D12Resource_Release(so_buffer);
+ ID3D12Resource_Release(upload_buffer);
+ ID3D12Resource_Release(vb);
+ ID3D12QueryHeap_Release(query_heap);
+ destroy_test_context(&context);
+}
+
+static void test_tessellation_dcl_index_range(void)
+{
+ static const DWORD vs_code[] =
+ {
+#if 0
+ void main(float4 in_position : POSITION, out float4 out_position : SV_POSITION)
+ {
+ out_position = in_position;
+ }
+#endif
+ 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040,
+ 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+#if 0
+ struct point_data
+ {
+ float4 position : SV_POSITION;
+ };
+
+ struct patch_constant_data
+ {
+ float edges[4] : SV_TessFactor;
+ float inside[2] : SV_InsideTessFactor;
+ };
+
+ patch_constant_data patch_constant(InputPatch<point_data, 4> input)
+ {
+ patch_constant_data output;
+
+ output.edges[0] = 1.0f;
+ output.edges[1] = 1.0f;
+ output.edges[2] = 1.0f;
+ output.edges[3] = 1.0f;
+ output.inside[0] = 1.0f;
+ output.inside[1] = 1.0f;
+
+ return output;
+ }
+
+ [domain("quad")]
+ [outputcontrolpoints(4)]
+ [outputtopology("triangle_cw")]
+ [partitioning("integer")]
+ [patchconstantfunc("patch_constant")]
+ point_data hs_main(InputPatch<point_data, 4> input,
+ uint i : SV_OutputControlPointID)
+ {
+ return input[i];
+ }
+
+ [domain("quad")]
+ point_data ds_main(patch_constant_data input,
+ float2 tess_coord : SV_DomainLocation,
+ const OutputPatch<point_data, 4> patch)
+ {
+ point_data output;
+
+ float4 a = lerp(patch[0].position, patch[1].position, tess_coord.x);
+ float4 b = lerp(patch[2].position, patch[3].position, tess_coord.x);
+ output.position = lerp(a, b, tess_coord.y);
+
+ return output;
+ }
+#endif
+ static const DWORD hs_code[] =
+ {
+ 0x43425844, 0x0a619042, 0x424471f9, 0x9f0f4ff1, 0x065efacc, 0x00000001, 0x0000029c, 0x00000004,
+ 0x00000030, 0x00000064, 0x00000098, 0x0000015c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f,
+ 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001,
+ 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x47534350, 0x000000bc,
+ 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000e01,
+ 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000e01, 0x00000098, 0x00000002,
+ 0x0000000b, 0x00000003, 0x00000002, 0x00000e01, 0x00000098, 0x00000003, 0x0000000b, 0x00000003,
+ 0x00000003, 0x00000e01, 0x000000a6, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, 0x00000e01,
+ 0x000000a6, 0x00000001, 0x0000000c, 0x00000003, 0x00000005, 0x00000e01, 0x545f5653, 0x46737365,
+ 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x58454853,
+ 0x00000138, 0x00030050, 0x0000004e, 0x01000071, 0x01002093, 0x01002094, 0x01001895, 0x01000896,
+ 0x01001897, 0x0100086a, 0x01000073, 0x02000099, 0x00000004, 0x0200005f, 0x00017000, 0x04000067,
+ 0x00102012, 0x00000000, 0x0000000b, 0x04000067, 0x00102012, 0x00000001, 0x0000000c, 0x04000067,
+ 0x00102012, 0x00000002, 0x0000000d, 0x04000067, 0x00102012, 0x00000003, 0x0000000e, 0x02000068,
+ 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000004, 0x04000036, 0x00100012, 0x00000000,
+ 0x0001700a, 0x06000036, 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e,
+ 0x01000073, 0x02000099, 0x00000002, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000004,
+ 0x0000000f, 0x04000067, 0x00102012, 0x00000005, 0x00000010, 0x02000068, 0x00000001, 0x0400005b,
+ 0x00102012, 0x00000004, 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036,
+ 0x00d02012, 0x00000004, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)};
+ static const DWORD ds_code[] =
+ {
+ 0x43425844, 0x4f187d50, 0x6743fe93, 0x10dfbe63, 0xf8cfd202, 0x00000001, 0x00000284, 0x00000004,
+ 0x00000030, 0x00000064, 0x00000128, 0x0000015c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f,
+ 0x004e4f49, 0x47534350, 0x000000bc, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b,
+ 0x00000003, 0x00000000, 0x00000001, 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001,
+ 0x00000001, 0x00000098, 0x00000002, 0x0000000b, 0x00000003, 0x00000002, 0x00000001, 0x00000098,
+ 0x00000003, 0x0000000b, 0x00000003, 0x00000003, 0x00000001, 0x000000a6, 0x00000000, 0x0000000c,
+ 0x00000003, 0x00000004, 0x00000001, 0x000000a6, 0x00000001, 0x0000000c, 0x00000003, 0x00000005,
+ 0x00000001, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365,
+ 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000,
+ 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x58454853,
+ 0x00000120, 0x00040050, 0x00000048, 0x01002093, 0x01001895, 0x0100086a, 0x0200005f, 0x0001c032,
+ 0x0400005f, 0x002190f2, 0x00000004, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001,
+ 0x02000068, 0x00000002, 0x0a000000, 0x001000f2, 0x00000000, 0x80219e46, 0x00000041, 0x00000002,
+ 0x00000000, 0x00219e46, 0x00000003, 0x00000000, 0x09000032, 0x001000f2, 0x00000000, 0x0001c006,
+ 0x00100e46, 0x00000000, 0x00219e46, 0x00000002, 0x00000000, 0x0a000000, 0x001000f2, 0x00000001,
+ 0x80219e46, 0x00000041, 0x00000000, 0x00000000, 0x00219e46, 0x00000001, 0x00000000, 0x09000032,
+ 0x001000f2, 0x00000001, 0x0001c006, 0x00100e46, 0x00000001, 0x00219e46, 0x00000000, 0x00000000,
+ 0x08000000, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x80100e46, 0x00000041, 0x00000001,
+ 0x08000032, 0x001020f2, 0x00000000, 0x0001c556, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)};
+ static const struct vec4 quad[] =
+ {
+ {-1.0f, -1.0f, 0.0f, 1.0f},
+ {-1.0f, 1.0f, 0.0f, 1.0f},
+ { 1.0f, -1.0f, 0.0f, 1.0f},
+ { 1.0f, 1.0f, 0.0f, 1.0f},
+ };
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ ID3D12Resource *vb;
+ HRESULT hr;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, NULL, &input_layout);
+ pso_desc.VS = vs;
+ pso_desc.HS = hs;
+ pso_desc.DS = ds;
+ pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr);
+
+ vb = create_upload_buffer(device, sizeof(quad), quad);
+
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*quad);
+ vbv.SizeInBytes = sizeof(quad);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12Resource_Release(vb);
+ destroy_test_context(&context);
+}
+
+static void test_hull_shader_control_point_phase(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ HRESULT hr;
+
+ static const DWORD vs_code[] =
+ {
+#if 0
+ void main()
+ {
+ }
+#endif
+ 0x43425844, 0x590b08ae, 0x11d28adb, 0x825a5628, 0x34c0c208, 0x00000001, 0x00000064, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000010, 0x00010050, 0x00000004, 0x0100086a,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+#if 0
+ struct data
+ {
+ float4 position : SV_Position;
+ };
+
+ struct patch_constant_data
+ {
+ float edges[3] : SV_TessFactor;
+ float inside : SV_InsideTessFactor;
+ };
+
+ void patch_constant(out patch_constant_data output)
+ {
+ output.edges[0] = output.edges[1] = output.edges[2] = 1.0f;
+ output.inside = 1.0f;
+ }
+
+ [domain("tri")]
+ [outputcontrolpoints(3)]
+ [partitioning("integer")]
+ [outputtopology("triangle_cw")]
+ [patchconstantfunc("patch_constant")]
+ data hs_main(uint i : SV_OutputControlPointID)
+ {
+ data output;
+
+ if (i == 0)
+ output.position = float4(-1, 1, 0, 1);
+ else if (i == 1)
+ output.position = float4(3, 1, 0, 1);
+ else
+ output.position = float4(-1, -3, 0, 1);
+
+ return output;
+ }
+
+ [domain("tri")]
+ void ds_main(patch_constant_data input,
+ float3 tess_coord : SV_DomainLocation,
+ const OutputPatch<data, 3> patch,
+ out data output)
+ {
+ uint index = uint(tess_coord.y + 2 * tess_coord.z);
+ output.position = patch[index].position;
+ }
+#endif
+ static const DWORD hs_code[] =
+ {
+ 0x43425844, 0x4204890e, 0x43f4f8e0, 0xbff7edfd, 0x0a48b715, 0x00000001, 0x0000028c, 0x00000004,
+ 0x00000030, 0x00000040, 0x00000074, 0x00000108, 0x4e475349, 0x00000008, 0x00000000, 0x00000008,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000008c, 0x00000004,
+ 0x00000008, 0x00000068, 0x00000000, 0x0000000d, 0x00000003, 0x00000000, 0x00000e01, 0x00000068,
+ 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x00000068, 0x00000002, 0x0000000d,
+ 0x00000003, 0x00000002, 0x00000e01, 0x00000076, 0x00000000, 0x0000000e, 0x00000003, 0x00000003,
+ 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365,
+ 0x6f746361, 0xabab0072, 0x58454853, 0x0000017c, 0x00030050, 0x0000005f, 0x01000071, 0x01000893,
+ 0x01001894, 0x01001095, 0x01000896, 0x01001897, 0x0100086a, 0x01000072, 0x0200005f, 0x00016000,
+ 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x06000020, 0x00100012, 0x00000000,
+ 0x00016001, 0x00004001, 0x00000001, 0x0f000037, 0x001000f2, 0x00000000, 0x00100006, 0x00000000,
+ 0x00004002, 0x40400000, 0x3f800000, 0x00000000, 0x3f800000, 0x00004002, 0xbf800000, 0xc0400000,
+ 0x00000000, 0x3f800000, 0x0b000037, 0x001020f2, 0x00000000, 0x00016001, 0x00100e46, 0x00000000,
+ 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000073, 0x02000099,
+ 0x00000003, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x04000067,
+ 0x00102012, 0x00000001, 0x00000012, 0x04000067, 0x00102012, 0x00000002, 0x00000013, 0x02000068,
+ 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000003, 0x04000036, 0x00100012, 0x00000000,
+ 0x0001700a, 0x06000036, 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e,
+ 0x01000073, 0x04000067, 0x00102012, 0x00000003, 0x00000014, 0x05000036, 0x00102012, 0x00000003,
+ 0x00004001, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)};
+ static const DWORD ds_code[] =
+ {
+ 0x43425844, 0x33c6120a, 0x2d46da82, 0x2c17dddf, 0x252ae7e0, 0x00000001, 0x000001c8, 0x00000004,
+ 0x00000030, 0x00000064, 0x000000f8, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f,
+ 0x006e6f69, 0x47534350, 0x0000008c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d,
+ 0x00000003, 0x00000000, 0x00000001, 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001,
+ 0x00000001, 0x00000068, 0x00000002, 0x0000000d, 0x00000003, 0x00000002, 0x00000001, 0x00000076,
+ 0x00000000, 0x0000000e, 0x00000003, 0x00000003, 0x00000001, 0x545f5653, 0x46737365, 0x6f746361,
+ 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c,
+ 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f,
+ 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x00000094, 0x00040050, 0x00000025, 0x01001893,
+ 0x01001095, 0x0100086a, 0x0200005f, 0x0001c062, 0x0400005f, 0x002190f2, 0x00000003, 0x00000000,
+ 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x02000068, 0x00000001, 0x07000032, 0x00100012,
+ 0x00000000, 0x0001c02a, 0x00004001, 0x40000000, 0x0001c01a, 0x0500001c, 0x00100012, 0x00000000,
+ 0x0010000a, 0x00000000, 0x07000036, 0x001020f2, 0x00000000, 0x00a19e46, 0x0010000a, 0x00000000,
+ 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, NULL, NULL);
+ pso_desc.VS = vs;
+ pso_desc.HS = hs;
+ pso_desc.DS = ds;
+ pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ destroy_test_context(&context);
+}
+
+static void test_hull_shader_fork_phase(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ HRESULT hr;
+
+ static const DWORD vs_code[] =
+ {
+#if 0
+ float4 main() : SV_Position
+ {
+ return float4(-1, -1, 0, 0);
+ }
+#endif
+ 0x43425844, 0x9f5f70e7, 0x57507df4, 0xbf1a4a34, 0xdb2531df, 0x00000001, 0x000000b8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000,
+ 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x00000040, 0x00010050, 0x00000010,
+ 0x0100086a, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x08000036, 0x001020f2, 0x00000000,
+ 0x00004002, 0xbf800000, 0xbf800000, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+#if 0
+ struct data
+ {
+ float4 position : SV_Position;
+ };
+
+ struct patch_constant_data
+ {
+ float edges[4] : SV_TessFactor;
+ float inside[2] : SV_InsideTessFactor;
+ float3 center : CENTER;
+ };
+
+ void patch_constant(OutputPatch<data, 4> control_points,
+ out patch_constant_data output)
+ {
+ uint i;
+
+ output = (patch_constant_data)0;
+
+ for (i = 0; i < 4; ++i)
+ {
+ output.edges[i] = 1.0;
+ }
+
+ for (i = 0; i < 2; ++i)
+ {
+ output.inside[i] = 1.0;
+ }
+
+ for (i = 0; i < 4; ++i)
+ {
+ output.center += control_points[i].position.xyz;
+ }
+ output.center /= 4;
+ }
+
+ [domain("quad")]
+ [outputcontrolpoints(4)]
+ [partitioning("integer")]
+ [outputtopology("triangle_cw")]
+ [patchconstantfunc("patch_constant")]
+ data hs_main(InputPatch<data, 1> input,
+ uint i : SV_OutputControlPointID)
+ {
+ data o = (data)0;
+ const float4 vertices[] =
+ {
+ float4(0, 0, 0, 1),
+ float4(0, 2, 0, 1),
+ float4(2, 0, 0, 1),
+ float4(2, 2, 0, 1),
+ };
+
+ o.position = input[0].position + vertices[i];
+
+ return o;
+ }
+
+ [domain("quad")]
+ void ds_main(patch_constant_data input,
+ float2 tess_coord : SV_DomainLocation,
+ const OutputPatch<data, 4> patch,
+ out float4 position : SV_Position,
+ out float4 color : COLOR)
+ {
+ float4 a = lerp(patch[0].position, patch[1].position, tess_coord.x);
+ float4 b = lerp(patch[2].position, patch[3].position, tess_coord.x);
+ position = lerp(a, b, tess_coord.y);
+
+ color = float4(input.center, 1.0);
+ }
+#endif
+ static const DWORD hs_code[] =
+ {
+ 0x43425844, 0xcecdcc7a, 0x1e0454ae, 0x8c490947, 0x7e33bb11, 0x00000001, 0x000005a4, 0x00000004,
+ 0x00000030, 0x00000064, 0x00000098, 0x0000017c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f,
+ 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001,
+ 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x000000dc,
+ 0x00000007, 0x00000008, 0x000000b0, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000e01,
+ 0x000000be, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000010e, 0x000000b0, 0x00000001,
+ 0x0000000b, 0x00000003, 0x00000001, 0x00000e01, 0x000000b0, 0x00000002, 0x0000000b, 0x00000003,
+ 0x00000002, 0x00000e01, 0x000000b0, 0x00000003, 0x0000000b, 0x00000003, 0x00000003, 0x00000e01,
+ 0x000000c5, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, 0x00000e01, 0x000000c5, 0x00000001,
+ 0x0000000c, 0x00000003, 0x00000005, 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x45430072,
+ 0x5245544e, 0x5f565300, 0x69736e49, 0x65546564, 0x61467373, 0x726f7463, 0xababab00, 0x58454853,
+ 0x00000420, 0x00030050, 0x00000108, 0x01000071, 0x01000893, 0x01002094, 0x01001895, 0x01000896,
+ 0x01001897, 0x0100086a, 0x00001835, 0x00000012, 0x3f800000, 0x00000000, 0x00000000, 0x00000000,
+ 0x3f800000, 0x00000000, 0x40000000, 0x00000000, 0x3f800000, 0x40000000, 0x00000000, 0x00000000,
+ 0x3f800000, 0x40000000, 0x40000000, 0x00000000, 0x01000072, 0x0200005f, 0x00016000, 0x0400005f,
+ 0x002010f2, 0x00000001, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001,
+ 0x04000036, 0x00100012, 0x00000000, 0x00016001, 0x06000036, 0x00100032, 0x00000000, 0x00909596,
+ 0x0010000a, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x3f800000, 0x08000000, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00201e46,
+ 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000004, 0x0200005f, 0x00017000,
+ 0x04000067, 0x00102012, 0x00000000, 0x0000000b, 0x04000067, 0x00102012, 0x00000001, 0x0000000c,
+ 0x04000067, 0x00102012, 0x00000002, 0x0000000d, 0x04000067, 0x00102012, 0x00000003, 0x0000000e,
+ 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000004, 0x04000036, 0x00100012,
+ 0x00000000, 0x0001700a, 0x06000036, 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000,
+ 0x0100003e, 0x01000073, 0x02000099, 0x00000002, 0x0200005f, 0x00017000, 0x04000067, 0x00102012,
+ 0x00000004, 0x0000000f, 0x04000067, 0x00102012, 0x00000005, 0x00000010, 0x02000068, 0x00000001,
+ 0x0400005b, 0x00102012, 0x00000004, 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a,
+ 0x07000036, 0x00d02012, 0x00000004, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e,
+ 0x01000073, 0x0400005f, 0x0021a012, 0x00000004, 0x00000000, 0x03000065, 0x00102022, 0x00000000,
+ 0x02000068, 0x00000001, 0x09000000, 0x00100012, 0x00000000, 0x0021a00a, 0x00000001, 0x00000000,
+ 0x0021a00a, 0x00000000, 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000,
+ 0x0021a00a, 0x00000002, 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000,
+ 0x0021a00a, 0x00000003, 0x00000000, 0x07000038, 0x00102022, 0x00000000, 0x0010000a, 0x00000000,
+ 0x00004001, 0x3e800000, 0x0100003e, 0x01000073, 0x0400005f, 0x0021a022, 0x00000004, 0x00000000,
+ 0x03000065, 0x00102042, 0x00000000, 0x02000068, 0x00000001, 0x09000000, 0x00100012, 0x00000000,
+ 0x0021a01a, 0x00000001, 0x00000000, 0x0021a01a, 0x00000000, 0x00000000, 0x08000000, 0x00100012,
+ 0x00000000, 0x0010000a, 0x00000000, 0x0021a01a, 0x00000002, 0x00000000, 0x08000000, 0x00100012,
+ 0x00000000, 0x0010000a, 0x00000000, 0x0021a01a, 0x00000003, 0x00000000, 0x07000038, 0x00102042,
+ 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x3e800000, 0x0100003e, 0x01000073, 0x0400005f,
+ 0x0021a042, 0x00000004, 0x00000000, 0x03000065, 0x00102082, 0x00000000, 0x02000068, 0x00000001,
+ 0x09000000, 0x00100012, 0x00000000, 0x0021a02a, 0x00000001, 0x00000000, 0x0021a02a, 0x00000000,
+ 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0021a02a, 0x00000002,
+ 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0021a02a, 0x00000003,
+ 0x00000000, 0x07000038, 0x00102082, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x3e800000,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)};
+ static const DWORD ds_code[] =
+ {
+ 0x43425844, 0x6a721eb5, 0xa3ba6439, 0x3f31e765, 0x07e272c6, 0x00000001, 0x00000304, 0x00000004,
+ 0x00000030, 0x00000064, 0x00000148, 0x0000019c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008,
+ 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f,
+ 0x006e6f69, 0x47534350, 0x000000dc, 0x00000007, 0x00000008, 0x000000b0, 0x00000000, 0x0000000b,
+ 0x00000003, 0x00000000, 0x00000001, 0x000000be, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x00000e0e, 0x000000b0, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000001, 0x000000b0,
+ 0x00000002, 0x0000000b, 0x00000003, 0x00000002, 0x00000001, 0x000000b0, 0x00000003, 0x0000000b,
+ 0x00000003, 0x00000003, 0x00000001, 0x000000c5, 0x00000000, 0x0000000c, 0x00000003, 0x00000004,
+ 0x00000001, 0x000000c5, 0x00000001, 0x0000000c, 0x00000003, 0x00000005, 0x00000001, 0x545f5653,
+ 0x46737365, 0x6f746361, 0x45430072, 0x5245544e, 0x5f565300, 0x69736e49, 0x65546564, 0x61467373,
+ 0x726f7463, 0xababab00, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000,
+ 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000001, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x58454853,
+ 0x00000160, 0x00040050, 0x00000058, 0x01002093, 0x01001895, 0x0100086a, 0x0300005f, 0x0011b0e2,
+ 0x00000000, 0x0200005f, 0x0001c032, 0x0400005f, 0x002190f2, 0x00000004, 0x00000000, 0x04000067,
+ 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000002,
+ 0x0a000000, 0x001000f2, 0x00000000, 0x80219e46, 0x00000041, 0x00000002, 0x00000000, 0x00219e46,
+ 0x00000003, 0x00000000, 0x09000032, 0x001000f2, 0x00000000, 0x0001c006, 0x00100e46, 0x00000000,
+ 0x00219e46, 0x00000002, 0x00000000, 0x0a000000, 0x001000f2, 0x00000001, 0x80219e46, 0x00000041,
+ 0x00000000, 0x00000000, 0x00219e46, 0x00000001, 0x00000000, 0x09000032, 0x001000f2, 0x00000001,
+ 0x0001c006, 0x00100e46, 0x00000001, 0x00219e46, 0x00000000, 0x00000000, 0x08000000, 0x001000f2,
+ 0x00000000, 0x00100e46, 0x00000000, 0x80100e46, 0x00000041, 0x00000001, 0x08000032, 0x001020f2,
+ 0x00000000, 0x0001c556, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x05000036, 0x00102072,
+ 0x00000001, 0x0011b796, 0x00000000, 0x05000036, 0x00102082, 0x00000001, 0x00004001, 0x3f800000,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float4 main(in float4 p : SV_Position, in float4 color : COLOR) : SV_Target
+ {
+ return color;
+ }
+#endif
+ 0x43425844, 0xbd83f517, 0x8974e87a, 0xaf402223, 0xaec7f351, 0x00000001, 0x000000f8, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000003c, 0x00000050,
+ 0x0000000f, 0x0100086a, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, NULL, NULL);
+ pso_desc.VS = vs;
+ pso_desc.HS = hs;
+ pso_desc.DS = ds;
+ pso_desc.PS = ps;
+ pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 1, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff000000, 0);
+
+ destroy_test_context(&context);
+}
+
+static void test_line_tessellation(void)
+{
+ ID3D12Resource *vb, *so_buffer, *readback_buffer;
+ D3D12_QUERY_DATA_SO_STATISTICS *so_statistics;
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_QUERY_HEAP_DESC query_heap_desc;
+ D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct resource_readback rb;
+ ID3D12QueryHeap *query_heap;
+ struct test_context context;
+ const struct vec4 *expected;
+ ID3D12CommandQueue *queue;
+ struct vec4 *data;
+ bool broken_warp;
+ unsigned int i;
+ HRESULT hr;
+
+#if 0
+ struct data
+ {
+ float4 position : SV_Position;
+ float3 color : COLOR;
+ float line_density : LINE_DENSITY;
+ float line_detail : LINE_DETAIL;
+ };
+
+ data vs_main(data input)
+ {
+ return input;
+ }
+
+ struct patch_constant_data
+ {
+ float tess_factor[2] : SV_TessFactor;
+ float3 color : COLOR;
+ uint prim_id : PRIMITIVE_ID;
+ };
+
+ void patch_constant(OutputPatch<data, 1> control_points,
+ uint prim_id : SV_PrimitiveID,
+ out patch_constant_data output)
+ {
+ output.tess_factor[0] = control_points[0].line_density;
+ output.tess_factor[1] = control_points[0].line_detail;
+ output.color = control_points[0].color;
+ output.prim_id = prim_id;
+ }
+
+ [domain("isoline")]
+ [outputcontrolpoints(1)]
+ [partitioning("integer")]
+ [outputtopology("line")]
+ [patchconstantfunc("patch_constant")]
+ data hs_main(InputPatch<data, 1> input)
+ {
+ return input[0];
+ }
+
+ [domain("isoline")]
+ void ds_main(patch_constant_data input,
+ float tess_factor[2] : SV_TessFactor,
+ float2 tess_coord : SV_DomainLocation,
+ float3 color : COLOR,
+ uint prim_id : PRIMITIVE_ID,
+ const OutputPatch<data, 1> patch,
+ out float4 position : SV_Position,
+ out float4 out_color : COLOR,
+ out float4 out_prim_id : PRIMITIVE_ID)
+ {
+ position = patch[0].position;
+ out_color = float4(color, 1.0);
+ out_prim_id = prim_id;
+ }
+#endif
+ static const DWORD vs_code[] =
+ {
+ 0x43425844, 0x43d2f821, 0xc4bcdf60, 0xadbf5ed0, 0xe55b715d, 0x00000001, 0x00000230, 0x00000003,
+ 0x0000002c, 0x000000c8, 0x00000164, 0x4e475349, 0x00000094, 0x00000004, 0x00000008, 0x00000068,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000074, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000707, 0x0000007a, 0x00000000, 0x00000000, 0x00000003, 0x00000002,
+ 0x00000101, 0x00000087, 0x00000000, 0x00000000, 0x00000003, 0x00000003, 0x00000101, 0x505f5653,
+ 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0x494c0052, 0x445f454e, 0x49534e45, 0x4c005954, 0x5f454e49,
+ 0x41544544, 0xab004c49, 0x4e47534f, 0x00000094, 0x00000004, 0x00000008, 0x00000068, 0x00000000,
+ 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000001, 0x00000807, 0x0000007a, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000708,
+ 0x00000087, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000e01, 0x505f5653, 0x7469736f,
+ 0x006e6f69, 0x4f4c4f43, 0x494c0052, 0x445f454e, 0x49534e45, 0x4c005954, 0x5f454e49, 0x41544544,
+ 0xab004c49, 0x58454853, 0x000000c4, 0x00010050, 0x00000031, 0x0100086a, 0x0300005f, 0x001010f2,
+ 0x00000000, 0x0300005f, 0x00101072, 0x00000001, 0x0300005f, 0x00101012, 0x00000002, 0x0300005f,
+ 0x00101012, 0x00000003, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x00102072,
+ 0x00000001, 0x03000065, 0x00102082, 0x00000001, 0x03000065, 0x00102012, 0x00000002, 0x05000036,
+ 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102072, 0x00000001, 0x00101246,
+ 0x00000001, 0x05000036, 0x00102082, 0x00000001, 0x0010100a, 0x00000002, 0x05000036, 0x00102012,
+ 0x00000002, 0x0010100a, 0x00000003, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD hs_code[] =
+ {
+ 0x43425844, 0x130f1b8c, 0x02c24095, 0x18ab42ad, 0xbb861b50, 0x00000001, 0x00000448, 0x00000004,
+ 0x00000030, 0x000000cc, 0x00000168, 0x000001fc, 0x4e475349, 0x00000094, 0x00000004, 0x00000008,
+ 0x00000068, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000074, 0x00000000,
+ 0x00000000, 0x00000003, 0x00000001, 0x00000707, 0x0000007a, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000001, 0x00000808, 0x00000087, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000101,
+ 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0x494c0052, 0x445f454e, 0x49534e45, 0x4c005954,
+ 0x5f454e49, 0x41544544, 0xab004c49, 0x4e47534f, 0x00000094, 0x00000004, 0x00000008, 0x00000068,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000807, 0x0000007a, 0x00000000, 0x00000000, 0x00000003, 0x00000001,
+ 0x00000708, 0x00000087, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000e01, 0x505f5653,
+ 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0x494c0052, 0x445f454e, 0x49534e45, 0x4c005954, 0x5f454e49,
+ 0x41544544, 0xab004c49, 0x47534350, 0x0000008c, 0x00000004, 0x00000008, 0x00000068, 0x00000000,
+ 0x00000010, 0x00000003, 0x00000000, 0x00000e01, 0x00000076, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000010e, 0x00000068, 0x00000001, 0x0000000f, 0x00000003, 0x00000001, 0x00000e01,
+ 0x0000007c, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000d02, 0x545f5653, 0x46737365,
+ 0x6f746361, 0x4f430072, 0x00524f4c, 0x4d495250, 0x56495449, 0x44495f45, 0xababab00, 0x58454853,
+ 0x00000244, 0x00030050, 0x00000091, 0x01000071, 0x01000893, 0x01000894, 0x01000895, 0x01000896,
+ 0x01001097, 0x0100086a, 0x01000072, 0x0400005f, 0x002010f2, 0x00000001, 0x00000000, 0x0400005f,
+ 0x00201072, 0x00000001, 0x00000001, 0x0400005f, 0x00201082, 0x00000001, 0x00000001, 0x0400005f,
+ 0x00201012, 0x00000001, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x00102072,
+ 0x00000001, 0x03000065, 0x00102082, 0x00000001, 0x03000065, 0x00102012, 0x00000002, 0x06000036,
+ 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x06000036, 0x001020f2, 0x00000001,
+ 0x00201e46, 0x00000000, 0x00000001, 0x06000036, 0x00102012, 0x00000002, 0x0020100a, 0x00000000,
+ 0x00000002, 0x0100003e, 0x01000073, 0x0400005f, 0x0021a082, 0x00000001, 0x00000001, 0x04000067,
+ 0x00102012, 0x00000000, 0x00000016, 0x06000036, 0x00102012, 0x00000000, 0x0021a03a, 0x00000000,
+ 0x00000001, 0x0100003e, 0x01000073, 0x0400005f, 0x0021a012, 0x00000001, 0x00000002, 0x04000067,
+ 0x00102012, 0x00000001, 0x00000015, 0x06000036, 0x00102012, 0x00000001, 0x0021a00a, 0x00000000,
+ 0x00000002, 0x0100003e, 0x01000073, 0x0400005f, 0x0021a012, 0x00000001, 0x00000001, 0x03000065,
+ 0x00102022, 0x00000000, 0x06000036, 0x00102022, 0x00000000, 0x0021a00a, 0x00000000, 0x00000001,
+ 0x0100003e, 0x01000073, 0x0400005f, 0x0021a022, 0x00000001, 0x00000001, 0x03000065, 0x00102042,
+ 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0021a01a, 0x00000000, 0x00000001, 0x0100003e,
+ 0x01000073, 0x0400005f, 0x0021a042, 0x00000001, 0x00000001, 0x03000065, 0x00102082, 0x00000000,
+ 0x06000036, 0x00102082, 0x00000000, 0x0021a02a, 0x00000000, 0x00000001, 0x0100003e, 0x01000073,
+ 0x0200005f, 0x0000b000, 0x03000065, 0x00102022, 0x00000001, 0x04000036, 0x00102022, 0x00000001,
+ 0x0000b001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)};
+ static const DWORD ds_code[] =
+ {
+ 0x43425844, 0xc78d05dd, 0x4b270467, 0xb480a2fb, 0x02f0edc7, 0x00000001, 0x0000029c, 0x00000004,
+ 0x00000030, 0x000000cc, 0x00000160, 0x000001d8, 0x4e475349, 0x00000094, 0x00000004, 0x00000008,
+ 0x00000068, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000074, 0x00000000,
+ 0x00000000, 0x00000003, 0x00000001, 0x00000007, 0x0000007a, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000001, 0x00000008, 0x00000087, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000001,
+ 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0x494c0052, 0x445f454e, 0x49534e45, 0x4c005954,
+ 0x5f454e49, 0x41544544, 0xab004c49, 0x47534350, 0x0000008c, 0x00000004, 0x00000008, 0x00000068,
+ 0x00000000, 0x00000010, 0x00000003, 0x00000000, 0x00000001, 0x00000076, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000000, 0x00000e0e, 0x00000068, 0x00000001, 0x0000000f, 0x00000003, 0x00000001,
+ 0x00000001, 0x0000007c, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000202, 0x545f5653,
+ 0x46737365, 0x6f746361, 0x4f430072, 0x00524f4c, 0x4d495250, 0x56495449, 0x44495f45, 0xababab00,
+ 0x4e47534f, 0x00000070, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f,
+ 0x00000062, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x505f5653, 0x7469736f,
+ 0x006e6f69, 0x4f4c4f43, 0x52500052, 0x54494d49, 0x5f455649, 0xab004449, 0x58454853, 0x000000bc,
+ 0x00040050, 0x0000002f, 0x01000893, 0x01000895, 0x0100086a, 0x0300005f, 0x0011b0e2, 0x00000000,
+ 0x0300005f, 0x0011b022, 0x00000001, 0x0400005f, 0x002190f2, 0x00000001, 0x00000000, 0x04000067,
+ 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x03000065, 0x001020f2,
+ 0x00000002, 0x06000036, 0x001020f2, 0x00000000, 0x00219e46, 0x00000000, 0x00000000, 0x05000036,
+ 0x00102072, 0x00000001, 0x0011b796, 0x00000000, 0x05000036, 0x00102082, 0x00000001, 0x00004001,
+ 0x3f800000, 0x05000056, 0x001020f2, 0x00000002, 0x0011b556, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)};
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"COLOR", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"LINE_DENSITY", 0, DXGI_FORMAT_R32_FLOAT, 0, 32, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"LINE_DETAIL", 0, DXGI_FORMAT_R32_FLOAT, 0, 36, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const D3D12_SO_DECLARATION_ENTRY so_declaration[] =
+ {
+ {0, "SV_POSITION", 0, 0, 4, 0},
+ {0, "COLOR", 0, 0, 4, 0},
+ {0, "PRIMITIVE_ID", 0, 0, 4, 0},
+ };
+ unsigned int strides[] = {48};
+ static const struct
+ {
+ struct vec4 position;
+ struct vec4 color;
+ float line_density;
+ float line_detail;
+ }
+ vertices[] =
+ {
+ {{0.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 0.0f}, 1.0f, 1.0f},
+ {{1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.5f, 0.0f}, 2.0f, 1.0f},
+ {{2.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f}, 1.0f, 2.0f},
+ {{3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f}, 2.0f, 2.0f},
+ };
+ static const struct vec4 expected_data[] =
+ {
+ {0.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 0.0f, 0.0f},
+ {0.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 0.0f, 0.0f},
+
+ {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.5f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f},
+ {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.5f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f},
+ {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.5f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f},
+ {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.5f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f},
+
+ {2.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, {2.0f, 2.0f, 2.0f, 2.0f},
+ {2.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, {2.0f, 2.0f, 2.0f, 2.0f},
+ {2.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, {2.0f, 2.0f, 2.0f, 2.0f},
+ {2.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, {2.0f, 2.0f, 2.0f, 2.0f},
+
+ {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f},
+ {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f},
+ {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f},
+ {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f},
+ {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f},
+ {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f},
+ {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f},
+ {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT
+ | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ query_heap_desc.Type = D3D12_QUERY_HEAP_TYPE_SO_STATISTICS;
+ query_heap_desc.Count = 2;
+ query_heap_desc.NodeMask = 0;
+ hr = ID3D12Device_CreateQueryHeap(context.device, &query_heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap);
+ if (hr == E_NOTIMPL)
+ {
+ skip("Stream output is not supported.\n");
+ destroy_test_context(&context);
+ return;
+ }
+ ok(hr == S_OK, "Failed to create query heap, hr %#x.\n", hr);
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ DXGI_FORMAT_UNKNOWN, NULL, NULL, &input_layout);
+ pso_desc.VS = vs;
+ pso_desc.HS = hs;
+ pso_desc.DS = ds;
+ memset(&pso_desc.PS, 0, sizeof(pso_desc.PS));
+ pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH;
+ pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration);
+ pso_desc.StreamOutput.pSODeclaration = so_declaration;
+ pso_desc.StreamOutput.pBufferStrides = strides;
+ pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides);
+ pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr);
+
+ vb = create_upload_buffer(context.device, sizeof(vertices), vertices);
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*vertices);
+ vbv.SizeInBytes = sizeof(vertices);
+
+ so_buffer = create_default_buffer(context.device, 4096,
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT);
+ sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer);
+ sobv.SizeInBytes = 1024;
+ sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes;
+
+ ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0);
+
+ ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv);
+
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0);
+
+ readback_buffer = create_readback_buffer(context.device, sizeof(*so_statistics));
+ ID3D12GraphicsCommandList_ResolveQueryData(command_list,
+ query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0, 1, readback_buffer, 0);
+
+ get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list);
+ so_statistics = get_readback_data(&rb, 0, 0, 0, sizeof(*so_statistics));
+ broken_warp = broken_on_warp(so_statistics[0].NumPrimitivesWritten != 9);
+ ok(so_statistics[0].NumPrimitivesWritten == 9 || broken_warp, "Got unexpected primitives written %u.\n",
+ (unsigned int)so_statistics[0].NumPrimitivesWritten);
+ ok(so_statistics[0].PrimitivesStorageNeeded == 9 || broken_warp, "Got unexpected primitives storage needed %u.\n",
+ (unsigned int)so_statistics[0].PrimitivesStorageNeeded);
+ release_resource_readback(&rb);
+
+ if (broken_warp)
+ {
+ skip("Broken on WARP.\n");
+ goto done;
+ }
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, so_buffer,
+ D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list);
+ for (i = 0; i < ARRAY_SIZE(expected_data) / 3 ; ++i)
+ {
+ data = get_readback_data(&rb, i, 0, 0, 3 * sizeof(*data));
+ expected = &expected_data[3 * i + 0];
+ ok(compare_vec4(data, expected, 1),
+ "Got position {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n",
+ data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i);
+ ++data;
+ expected = &expected_data[3 * i + 1];
+ bug_if(is_nvidia_device(context.device))
+ ok(compare_vec4(data, expected, 1),
+ "Got color {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n",
+ data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i);
+ ++data;
+ expected = &expected_data[3 * i + 2];
+ ok(compare_vec4(data, expected, 1),
+ "Got primitive ID {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n",
+ data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i);
+ }
+ release_resource_readback(&rb);
+
+done:
+ ID3D12QueryHeap_Release(query_heap);
+ ID3D12Resource_Release(readback_buffer);
+ ID3D12Resource_Release(so_buffer);
+ ID3D12Resource_Release(vb);
+ destroy_test_context(&context);
+}
+
+static void test_tessellation_primitive_id(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ D3D12_ROOT_PARAMETER root_parameters[1];
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct test_context context;
+ ID3D12Resource *raw_buffer;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *vb;
+ HRESULT hr;
+
+#if 0
+ ByteAddressBuffer b;
+
+ struct data
+ {
+ float4 position : POSITION;
+ float ref_buffer_data : REF_BUFFER_DATA;
+ };
+
+ struct ds_data
+ {
+ float4 position : POSITION;
+ float ref_buffer_data : REF_BUFFER_DATA;
+ uint primitive_id : PRIM_ID;
+ uint invocation_id : CP_ID;
+ };
+
+ struct ps_data
+ {
+ float4 position : SV_POSITION;
+ float4 color : COLOR;
+ };
+
+ struct patch_constant_data
+ {
+ float edges[3] : SV_TessFactor;
+ float inside : SV_InsideTessFactor;
+ float buffer_data : BUFFER_DATA;
+ uint primitive_id : PATCH_PRIM_ID;
+ };
+
+ data vs_main(in data input)
+ {
+ return input;
+ }
+
+ void patch_constant(uint prim_id : SV_PrimitiveID, out patch_constant_data output)
+ {
+ output.edges[0] = output.edges[1] = output.edges[2] = 4.0f;
+ output.inside = 4.0f;
+ output.buffer_data = b.Load(4 * prim_id);
+ output.primitive_id = prim_id;
+ }
+
+ [domain("tri")]
+ [outputcontrolpoints(3)]
+ [partitioning("integer")]
+ [outputtopology("triangle_cw")]
+ [patchconstantfunc("patch_constant")]
+ ds_data hs_main(const InputPatch<data, 3> input,
+ uint prim_id : SV_PrimitiveID, uint i : SV_OutputControlPointID)
+ {
+ ds_data output;
+ output.position = input[i].position;
+ output.ref_buffer_data = input[i].ref_buffer_data;
+ output.primitive_id = prim_id;
+ output.invocation_id = i;
+ return output;
+ }
+
+ [domain("tri")]
+ void ds_main(patch_constant_data input,
+ float3 tess_coord : SV_DomainLocation,
+ const OutputPatch<ds_data, 3> patch,
+ out ps_data output)
+ {
+ uint i;
+
+ output.position = tess_coord.x * patch[0].position
+ + tess_coord.y * patch[1].position
+ + tess_coord.z * patch[2].position;
+
+ for (i = 0; i < 3; ++i)
+ {
+ if (patch[i].ref_buffer_data != input.buffer_data)
+ {
+ output.color = float4(1, patch[i].ref_buffer_data / 255.0f, input.buffer_data / 255.0f, 0);
+ return;
+ }
+ }
+
+ for (i = 0; i < 3; ++i)
+ {
+ if (patch[i].primitive_id != input.primitive_id)
+ {
+ output.color = float4(1, 0, 1, 1);
+ return;
+ }
+ }
+
+ if (patch[0].invocation_id != 0 || patch[1].invocation_id != 1 || patch[2].invocation_id != 2)
+ {
+ output.color = float4(1, 1, 0, 1);
+ return;
+ }
+
+ output.color = float4(0, 1, 0, 1);
+ }
+#endif
+ static const DWORD vs_code[] =
+ {
+ 0x43425844, 0x1cf34a89, 0x09f0ca02, 0x1d9d7e25, 0x4161cddd, 0x00000001, 0x00000154, 0x00000003,
+ 0x0000002c, 0x00000088, 0x000000e4, 0x4e475349, 0x00000054, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000101, 0x49534f50, 0x4e4f4954, 0x46455200, 0x4655425f, 0x5f524546,
+ 0x41544144, 0xababab00, 0x4e47534f, 0x00000054, 0x00000002, 0x00000008, 0x00000038, 0x00000000,
+ 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000041, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000001, 0x00000e01, 0x49534f50, 0x4e4f4954, 0x46455200, 0x4655425f, 0x5f524546, 0x41544144,
+ 0xababab00, 0x58454853, 0x00000068, 0x00010050, 0x0000001a, 0x0100086a, 0x0300005f, 0x001010f2,
+ 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x03000065,
+ 0x00102012, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036,
+ 0x00102012, 0x00000001, 0x0010100a, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD hs_code[] =
+ {
+ 0x43425844, 0x23a919a7, 0xf5fdd1b4, 0x4f5a835f, 0xca389c71, 0x00000001, 0x00000464, 0x00000004,
+ 0x00000030, 0x0000008c, 0x00000124, 0x00000200, 0x4e475349, 0x00000054, 0x00000002, 0x00000008,
+ 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000,
+ 0x00000000, 0x00000003, 0x00000001, 0x00000101, 0x49534f50, 0x4e4f4954, 0x46455200, 0x4655425f,
+ 0x5f524546, 0x41544144, 0xababab00, 0x4e47534f, 0x00000090, 0x00000004, 0x00000008, 0x00000068,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000071, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000e01, 0x00000081, 0x00000000, 0x00000000, 0x00000001, 0x00000002,
+ 0x00000e01, 0x00000089, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000d02, 0x49534f50,
+ 0x4e4f4954, 0x46455200, 0x4655425f, 0x5f524546, 0x41544144, 0x49525000, 0x44495f4d, 0x5f504300,
+ 0xab004449, 0x47534350, 0x000000d4, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000d,
+ 0x00000003, 0x00000000, 0x00000e01, 0x000000a6, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x00000d02, 0x00000098, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x000000b2,
+ 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000d02, 0x00000098, 0x00000002, 0x0000000d,
+ 0x00000003, 0x00000002, 0x00000e01, 0x000000c0, 0x00000000, 0x0000000e, 0x00000003, 0x00000003,
+ 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x55420072, 0x52454646, 0x5441445f, 0x41500041,
+ 0x5f484354, 0x4d495250, 0x0044495f, 0x495f5653, 0x6469736e, 0x73655465, 0x63614673, 0x00726f74,
+ 0x58454853, 0x0000025c, 0x00030050, 0x00000097, 0x01000071, 0x01001893, 0x01001894, 0x01001095,
+ 0x01000896, 0x01001897, 0x0100086a, 0x030000a1, 0x00107000, 0x00000000, 0x01000072, 0x0200005f,
+ 0x00016000, 0x0200005f, 0x0000b000, 0x0400005f, 0x002010f2, 0x00000003, 0x00000000, 0x0400005f,
+ 0x00201012, 0x00000003, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x00102012,
+ 0x00000001, 0x03000065, 0x00102012, 0x00000002, 0x03000065, 0x00102022, 0x00000002, 0x02000068,
+ 0x00000001, 0x04000036, 0x00100012, 0x00000000, 0x00016001, 0x07000036, 0x001020f2, 0x00000000,
+ 0x00a01e46, 0x0010000a, 0x00000000, 0x00000000, 0x07000036, 0x00102012, 0x00000001, 0x00a0100a,
+ 0x0010000a, 0x00000000, 0x00000001, 0x04000036, 0x00102012, 0x00000002, 0x0000b001, 0x04000036,
+ 0x00102022, 0x00000002, 0x00016001, 0x0100003e, 0x01000073, 0x02000099, 0x00000003, 0x0200005f,
+ 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x04000067, 0x00102012, 0x00000001,
+ 0x00000012, 0x04000067, 0x00102012, 0x00000002, 0x00000013, 0x02000068, 0x00000001, 0x0400005b,
+ 0x00102012, 0x00000000, 0x00000003, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x06000036,
+ 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x40800000, 0x0100003e, 0x01000073, 0x04000067,
+ 0x00102012, 0x00000003, 0x00000014, 0x05000036, 0x00102012, 0x00000003, 0x00004001, 0x40800000,
+ 0x0100003e, 0x01000073, 0x0200005f, 0x0000b000, 0x03000065, 0x00102022, 0x00000000, 0x02000068,
+ 0x00000001, 0x06000029, 0x00100012, 0x00000000, 0x0000b001, 0x00004001, 0x00000002, 0x890000a5,
+ 0x800002c2, 0x00199983, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00107006, 0x00000000,
+ 0x05000056, 0x00102022, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e, 0x01000073, 0x0200005f,
+ 0x0000b000, 0x03000065, 0x00102022, 0x00000001, 0x04000036, 0x00102022, 0x00000001, 0x0000b001,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)};
+ static const DWORD ds_code[] =
+ {
+ 0x43425844, 0x4b659bb4, 0x3eb61f16, 0xaa8397b6, 0xd60e8c43, 0x00000001, 0x000005ec, 0x00000004,
+ 0x00000030, 0x000000c8, 0x000001a4, 0x000001f8, 0x4e475349, 0x00000090, 0x00000004, 0x00000008,
+ 0x00000068, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000071, 0x00000000,
+ 0x00000000, 0x00000003, 0x00000001, 0x00000101, 0x00000081, 0x00000000, 0x00000000, 0x00000001,
+ 0x00000002, 0x00000101, 0x00000089, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000202,
+ 0x49534f50, 0x4e4f4954, 0x46455200, 0x4655425f, 0x5f524546, 0x41544144, 0x49525000, 0x44495f4d,
+ 0x5f504300, 0xab004449, 0x47534350, 0x000000d4, 0x00000006, 0x00000008, 0x00000098, 0x00000000,
+ 0x0000000d, 0x00000003, 0x00000000, 0x00000001, 0x000000a6, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x00000202, 0x00000098, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000001,
+ 0x000000b2, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000202, 0x00000098, 0x00000002,
+ 0x0000000d, 0x00000003, 0x00000002, 0x00000001, 0x000000c0, 0x00000000, 0x0000000e, 0x00000003,
+ 0x00000003, 0x00000001, 0x545f5653, 0x46737365, 0x6f746361, 0x55420072, 0x52454646, 0x5441445f,
+ 0x41500041, 0x5f484354, 0x4d495250, 0x0044495f, 0x495f5653, 0x6469736e, 0x73655465, 0x63614673,
+ 0x00726f74, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001,
+ 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001,
+ 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x58454853, 0x000003ec,
+ 0x00040050, 0x000000fb, 0x01001893, 0x01001095, 0x0100086a, 0x0300005f, 0x0011b022, 0x00000000,
+ 0x0300005f, 0x0011b022, 0x00000001, 0x0200005f, 0x0001c072, 0x0400005f, 0x002190f2, 0x00000003,
+ 0x00000000, 0x0400005f, 0x00219012, 0x00000003, 0x00000001, 0x0400005f, 0x00219012, 0x00000003,
+ 0x00000002, 0x0400005f, 0x00219022, 0x00000003, 0x00000002, 0x04000067, 0x001020f2, 0x00000000,
+ 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000002, 0x07000038, 0x001000f2,
+ 0x00000000, 0x0001c556, 0x00219e46, 0x00000001, 0x00000000, 0x09000032, 0x001000f2, 0x00000000,
+ 0x0001c006, 0x00219e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x09000032, 0x001000f2,
+ 0x00000000, 0x0001caa6, 0x00219e46, 0x00000002, 0x00000000, 0x00100e46, 0x00000000, 0x05000036,
+ 0x00100012, 0x00000001, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100022, 0x00000001,
+ 0x0010000a, 0x00000001, 0x00004001, 0x00000003, 0x03040003, 0x0010001a, 0x00000001, 0x09000039,
+ 0x00100022, 0x00000001, 0x0011b01a, 0x00000000, 0x00a1900a, 0x0010000a, 0x00000001, 0x00000001,
+ 0x0304001f, 0x0010001a, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000,
+ 0x08000036, 0x00102092, 0x00000001, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x00000000,
+ 0x09000038, 0x00102022, 0x00000001, 0x00004001, 0x3b808081, 0x00a1900a, 0x0010000a, 0x00000001,
+ 0x00000001, 0x07000038, 0x00102042, 0x00000001, 0x0011b01a, 0x00000000, 0x00004001, 0x3b808081,
+ 0x0100003e, 0x01000015, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a, 0x00000001, 0x00004001,
+ 0x00000001, 0x01000016, 0x05000036, 0x00100012, 0x00000001, 0x00004001, 0x00000000, 0x01000030,
+ 0x07000050, 0x00100022, 0x00000001, 0x0010000a, 0x00000001, 0x00004001, 0x00000003, 0x03040003,
+ 0x0010001a, 0x00000001, 0x09000027, 0x00100022, 0x00000001, 0x0011b01a, 0x00000001, 0x00a1900a,
+ 0x0010000a, 0x00000001, 0x00000002, 0x0304001f, 0x0010001a, 0x00000001, 0x05000036, 0x001020f2,
+ 0x00000000, 0x00100e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f800000,
+ 0x00000000, 0x3f800000, 0x3f800000, 0x0100003e, 0x01000015, 0x0700001e, 0x00100012, 0x00000001,
+ 0x0010000a, 0x00000001, 0x00004001, 0x00000001, 0x01000016, 0x08000027, 0x00100012, 0x00000001,
+ 0x00004001, 0x00000000, 0x0021901a, 0x00000000, 0x00000002, 0x08000027, 0x00100022, 0x00000001,
+ 0x00004001, 0x00000001, 0x0021901a, 0x00000001, 0x00000002, 0x0700003c, 0x00100012, 0x00000001,
+ 0x0010001a, 0x00000001, 0x0010000a, 0x00000001, 0x08000027, 0x00100022, 0x00000001, 0x00004001,
+ 0x00000002, 0x0021901a, 0x00000002, 0x00000002, 0x0700003c, 0x00100012, 0x00000001, 0x0010001a,
+ 0x00000001, 0x0010000a, 0x00000001, 0x0304001f, 0x0010000a, 0x00000001, 0x05000036, 0x001020f2,
+ 0x00000000, 0x00100e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f800000,
+ 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x05000036, 0x001020f2, 0x00000000,
+ 0x00100e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x00000000, 0x3f800000,
+ 0x00000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float4 main(in float4 p : SV_Position, in float4 color : COLOR) : SV_Target
+ {
+ return color;
+ }
+#endif
+ 0x43425844, 0xbd83f517, 0x8974e87a, 0xaf402223, 0xaec7f351, 0x00000001, 0x000000f8, 0x00000003,
+ 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000003c, 0x00000050,
+ 0x0000000f, 0x0100086a, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"REF_BUFFER_DATA", 0, DXGI_FORMAT_R32_FLOAT, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const struct
+ {
+ struct vec4 position;
+ float ref_buffer_data;
+ }
+ vertices[] =
+ {
+ {{-1.0f, -1.0f, 0.0f, 1.0f}, 1.0f},
+ {{-1.0f, 1.0f, 0.0f, 1.0f}, 1.0f},
+ {{ 1.0f, -1.0f, 0.0f, 1.0f}, 1.0f},
+
+ {{-1.0f, 1.0f, 0.0f, 1.0f}, 2.0f},
+ {{ 1.0f, 1.0f, 0.0f, 1.0f}, 2.0f},
+ {{ 1.0f, -1.0f, 0.0f, 1.0f}, 2.0f},
+ };
+ static const uint32_t buffer_data[] = {1, 2};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_SRV;
+ root_parameters[0].Descriptor.ShaderRegister = 0;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_HULL;
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
+ hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, NULL, &input_layout);
+ pso_desc.VS = vs;
+ pso_desc.HS = hs;
+ pso_desc.DS = ds;
+ pso_desc.PS = ps;
+ pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr);
+
+ vb = create_upload_buffer(context.device, sizeof(vertices), vertices);
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*vertices);
+ vbv.SizeInBytes = sizeof(vertices);
+
+ raw_buffer = create_upload_buffer(context.device, sizeof(buffer_data), buffer_data);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_SetGraphicsRootShaderResourceView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(raw_buffer));
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 6, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ bug_if(is_nvidia_device(context.device))
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12Resource_Release(vb);
+ ID3D12Resource_Release(raw_buffer);
+ destroy_test_context(&context);
+}
+
+static void test_render_a8(void)
+{
+ static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f};
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ void main(out float4 target : SV_Target)
+ {
+ target = float4(0.0f, 0.25f, 0.5f, 1.0f);
+ }
+#endif
+ 0x43425844, 0x2f09e5ff, 0xaa135d5e, 0x7860f4b5, 0x5c7b8cbc, 0x00000001, 0x000000b4, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000003c, 0x00000050, 0x0000000f,
+ 0x0100086a, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002,
+ 0x00000000, 0x3e800000, 0x3f000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_A8_UNORM;
+ desc.ps = &ps;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, black, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint8(context.render_target, 0, queue, command_list, 0xff, 0);
+
+ destroy_test_context(&context);
+}
+
+static void test_cpu_descriptors_lifetime(void)
+{
+ static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f};
+ static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f};
+ ID3D12Resource *red_resource, *blue_resource;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_RESOURCE_DESC resource_desc;
+ ID3D12DescriptorHeap *rtv_heap;
+ D3D12_CLEAR_VALUE clear_value;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ HRESULT hr;
+
+ if (!init_test_context(&context, NULL))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1);
+ rtv_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap);
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 32;
+ resource_desc.Height = 32;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+ clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ clear_value.Color[0] = 1.0f;
+ clear_value.Color[1] = 0.0f;
+ clear_value.Color[2] = 0.0f;
+ clear_value.Color[3] = 1.0f;
+ hr = ID3D12Device_CreateCommittedResource(device,
+ &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value,
+ &IID_ID3D12Resource, (void **)&red_resource);
+ ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
+ clear_value.Color[0] = 0.0f;
+ clear_value.Color[1] = 0.0f;
+ clear_value.Color[2] = 1.0f;
+ clear_value.Color[3] = 1.0f;
+ hr = ID3D12Device_CreateCommittedResource(device,
+ &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value,
+ &IID_ID3D12Resource, (void **)&blue_resource);
+ ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
+
+ ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, red, 0, NULL);
+ /* Destroy the previous RTV and create a new one in its place. */
+ ID3D12Device_CreateRenderTargetView(device, blue_resource, NULL, rtv_handle);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, blue, 0, NULL);
+
+ /* Destroy the CPU descriptor heap. */
+ ID3D12DescriptorHeap_Release(rtv_heap);
+
+ transition_resource_state(command_list, red_resource,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, blue_resource,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(red_resource, 0, queue, command_list, 0xff0000ff, 0);
+ reset_command_list(command_list, context.allocator);
+ check_sub_resource_uint(blue_resource, 0, queue, command_list, 0xffff0000, 0);
+
+ rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1);
+ rtv_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap);
+
+ /* Try again with OMSetRenderTargets(). */
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, red_resource,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ transition_resource_state(command_list, blue_resource,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, red, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv_handle, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ /* Destroy the previous RTV and create a new one in its place. */
+ ID3D12Device_CreateRenderTargetView(device, blue_resource, NULL, rtv_handle);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, blue, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv_handle, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ /* Destroy the previous RTV and create a new one in its place. */
+ ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle);
+
+ /* Destroy the CPU descriptor heap. */
+ ID3D12DescriptorHeap_Release(rtv_heap);
+
+ transition_resource_state(command_list, red_resource,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, blue_resource,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(red_resource, 0, queue, command_list, 0xff00ff00, 0);
+ reset_command_list(command_list, context.allocator);
+ check_sub_resource_uint(blue_resource, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12Resource_Release(blue_resource);
+ ID3D12Resource_Release(red_resource);
+ destroy_test_context(&context);
+}
+
+static void check_clip_distance(struct test_context *context,
+ ID3D12PipelineState *pso, D3D12_VERTEX_BUFFER_VIEW vbv[2], ID3D12Resource *vb,
+ ID3D12Resource *vs_cb, ID3D12Resource *gs_cb)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ struct vertex
+ {
+ float clip_distance0;
+ float clip_distance1;
+ };
+
+ ID3D12GraphicsCommandList *command_list = context->list;
+ ID3D12CommandQueue *queue = context->queue;
+ struct resource_readback rb;
+ struct vertex vertices[4];
+ unsigned int i;
+ D3D12_BOX box;
+
+ for (i = 0; i < ARRAY_SIZE(vertices); ++i)
+ vertices[i].clip_distance0 = 1.0f;
+ update_buffer_data(vb, 0, sizeof(vertices), vertices);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(vs_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2,
+ ID3D12Resource_GetGPUVirtualAddress(gs_cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context->render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context->render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context->allocator);
+ transition_resource_state(command_list, context->render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ for (i = 0; i < ARRAY_SIZE(vertices); ++i)
+ vertices[i].clip_distance0 = 0.0f;
+ update_buffer_data(vb, 0, sizeof(vertices), vertices);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(vs_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2,
+ ID3D12Resource_GetGPUVirtualAddress(gs_cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context->render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context->render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context->allocator);
+ transition_resource_state(command_list, context->render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ for (i = 0; i < ARRAY_SIZE(vertices); ++i)
+ vertices[i].clip_distance0 = -1.0f;
+ update_buffer_data(vb, 0, sizeof(vertices), vertices);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(vs_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2,
+ ID3D12Resource_GetGPUVirtualAddress(gs_cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context->render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context->render_target, 0, queue, command_list, 0xffffffff, 0);
+
+ reset_command_list(command_list, context->allocator);
+ transition_resource_state(command_list, context->render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ for (i = 0; i < ARRAY_SIZE(vertices); ++i)
+ vertices[i].clip_distance0 = i < 2 ? 1.0f : -1.0f;
+ update_buffer_data(vb, 0, sizeof(vertices), vertices);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(vs_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2,
+ ID3D12Resource_GetGPUVirtualAddress(gs_cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context->render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context->render_target, 0, &rb, queue, command_list);
+ set_box(&box, 0, 0, 0, 320, 480, 1);
+ check_readback_data_uint(&rb, &box, 0xff00ff00, 1);
+ set_box(&box, 320, 0, 0, 320, 480, 1);
+ check_readback_data_uint(&rb, &box, 0xffffffff, 1);
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context->allocator);
+ transition_resource_state(command_list, context->render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ for (i = 0; i < ARRAY_SIZE(vertices); ++i)
+ vertices[i].clip_distance0 = i % 2 ? 1.0f : -1.0f;
+ update_buffer_data(vb, 0, sizeof(vertices), vertices);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(vs_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2,
+ ID3D12Resource_GetGPUVirtualAddress(gs_cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context->render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context->render_target, 0, &rb, queue, command_list);
+ set_box(&box, 0, 0, 0, 640, 240, 1);
+ check_readback_data_uint(&rb, &box, 0xff00ff00, 0);
+ set_box(&box, 0, 240, 0, 640, 240, 1);
+ check_readback_data_uint(&rb, &box, 0xffffffff, 0);
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context->allocator);
+ transition_resource_state(command_list, context->render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+}
+
+static void test_clip_distance(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ D3D12_ROOT_PARAMETER root_parameters[3];
+ ID3D12GraphicsCommandList *command_list;
+ ID3D12Resource *vs_cb, *gs_cb, *vb[2];
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ D3D12_VERTEX_BUFFER_VIEW vbv[2];
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12PipelineState *pso;
+ ID3D12Device *device;
+ unsigned int i;
+ D3D12_BOX box;
+ HRESULT hr;
+
+ static const DWORD vs_code[] =
+ {
+#if 0
+ bool use_constant;
+ float clip_distance;
+
+ struct input
+ {
+ float4 position : POSITION;
+ float distance0 : CLIP_DISTANCE0;
+ float distance1 : CLIP_DISTANCE1;
+ };
+
+ struct vertex
+ {
+ float4 position : SV_POSITION;
+ float user_clip : CLIP_DISTANCE;
+ float clip : SV_ClipDistance;
+ };
+
+ void main(input vin, out vertex vertex)
+ {
+ vertex.position = vin.position;
+ vertex.user_clip = vin.distance0;
+ vertex.clip = vin.distance0;
+ if (use_constant)
+ vertex.clip = clip_distance;
+ }
+#endif
+ 0x43425844, 0x09dfef58, 0x88570f2e, 0x1ebcf953, 0x9f97e22a, 0x00000001, 0x000001dc, 0x00000003,
+ 0x0000002c, 0x0000009c, 0x00000120, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000059, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000101, 0x00000059, 0x00000001, 0x00000000, 0x00000003, 0x00000002,
+ 0x00000001, 0x49534f50, 0x4e4f4954, 0x494c4300, 0x49445f50, 0x4e415453, 0xab004543, 0x4e47534f,
+ 0x0000007c, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000,
+ 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000e01, 0x0000006a,
+ 0x00000000, 0x00000002, 0x00000003, 0x00000002, 0x00000e01, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x50494c43, 0x5349445f, 0x434e4154, 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065,
+ 0x52444853, 0x000000b4, 0x00010040, 0x0000002d, 0x04000059, 0x00208e46, 0x00000000, 0x00000001,
+ 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x04000067, 0x001020f2,
+ 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, 0x04000067, 0x00102012, 0x00000002,
+ 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102012,
+ 0x00000001, 0x0010100a, 0x00000001, 0x0b000037, 0x00102012, 0x00000002, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0010100a, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD vs_multiple_code[] =
+ {
+#if 0
+ bool use_constant;
+ float clip_distance0;
+ float clip_distance1;
+
+ struct input
+ {
+ float4 position : POSITION;
+ float distance0 : CLIP_DISTANCE0;
+ float distance1 : CLIP_DISTANCE1;
+ };
+
+ struct vertex
+ {
+ float4 position : SV_POSITION;
+ float user_clip : CLIP_DISTANCE;
+ float2 clip : SV_ClipDistance;
+ };
+
+ void main(input vin, out vertex vertex)
+ {
+ vertex.position = vin.position;
+ vertex.user_clip = vin.distance0;
+ vertex.clip.x = vin.distance0;
+ if (use_constant)
+ vertex.clip.x = clip_distance0;
+ vertex.clip.y = vin.distance1;
+ if (use_constant)
+ vertex.clip.y = clip_distance1;
+ }
+#endif
+ 0x43425844, 0xef5cc236, 0xe2fbfa69, 0x560b6591, 0x23037999, 0x00000001, 0x00000214, 0x00000003,
+ 0x0000002c, 0x0000009c, 0x00000120, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000059, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000101, 0x00000059, 0x00000001, 0x00000000, 0x00000003, 0x00000002,
+ 0x00000101, 0x49534f50, 0x4e4f4954, 0x494c4300, 0x49445f50, 0x4e415453, 0xab004543, 0x4e47534f,
+ 0x0000007c, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000,
+ 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000e01, 0x0000006a,
+ 0x00000000, 0x00000002, 0x00000003, 0x00000002, 0x00000c03, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x50494c43, 0x5349445f, 0x434e4154, 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065,
+ 0x52444853, 0x000000ec, 0x00010040, 0x0000003b, 0x04000059, 0x00208e46, 0x00000000, 0x00000001,
+ 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x0300005f, 0x00101012,
+ 0x00000002, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001,
+ 0x04000067, 0x00102032, 0x00000002, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46,
+ 0x00000000, 0x05000036, 0x00102012, 0x00000001, 0x0010100a, 0x00000001, 0x0b000037, 0x00102012,
+ 0x00000002, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0010100a,
+ 0x00000001, 0x0b000037, 0x00102022, 0x00000002, 0x0020800a, 0x00000000, 0x00000000, 0x0020802a,
+ 0x00000000, 0x00000000, 0x0010100a, 0x00000002, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs_multiple = {vs_multiple_code, sizeof(vs_multiple_code)};
+ static const DWORD gs_code[] =
+ {
+#if 0
+ bool use_constant;
+ float clip_distance;
+
+ struct vertex
+ {
+ float4 position : SV_POSITION;
+ float user_clip : CLIP_DISTANCE;
+ float clip : SV_ClipDistance;
+ };
+
+ [maxvertexcount(3)]
+ void main(triangle vertex input[3], inout TriangleStream<vertex> output)
+ {
+ vertex o;
+ o = input[0];
+ o.clip = input[0].user_clip;
+ if (use_constant)
+ o.clip = clip_distance;
+ output.Append(o);
+ o = input[1];
+ o.clip = input[1].user_clip;
+ if (use_constant)
+ o.clip = clip_distance;
+ output.Append(o);
+ o = input[2];
+ o.clip = input[2].user_clip;
+ if (use_constant)
+ o.clip = clip_distance;
+ output.Append(o);
+ }
+#endif
+ 0x43425844, 0x9b0823e9, 0xab3ed100, 0xba0ff618, 0x1bbd1cb8, 0x00000001, 0x00000338, 0x00000003,
+ 0x0000002c, 0x000000b0, 0x00000134, 0x4e475349, 0x0000007c, 0x00000003, 0x00000008, 0x00000050,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x0000005c, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000101, 0x0000006a, 0x00000000, 0x00000002, 0x00000003, 0x00000002,
+ 0x00000001, 0x505f5653, 0x5449534f, 0x004e4f49, 0x50494c43, 0x5349445f, 0x434e4154, 0x56530045,
+ 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, 0x4e47534f, 0x0000007c, 0x00000003, 0x00000008,
+ 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000,
+ 0x00000000, 0x00000003, 0x00000001, 0x00000e01, 0x0000006a, 0x00000000, 0x00000002, 0x00000003,
+ 0x00000002, 0x00000e01, 0x505f5653, 0x5449534f, 0x004e4f49, 0x50494c43, 0x5349445f, 0x434e4154,
+ 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, 0x52444853, 0x000001fc, 0x00020040,
+ 0x0000007f, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x05000061, 0x002010f2, 0x00000003,
+ 0x00000000, 0x00000001, 0x0400005f, 0x00201012, 0x00000003, 0x00000001, 0x0400005f, 0x00201012,
+ 0x00000003, 0x00000002, 0x02000068, 0x00000001, 0x0100185d, 0x0100285c, 0x04000067, 0x001020f2,
+ 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, 0x04000067, 0x00102012, 0x00000002,
+ 0x00000002, 0x0200005e, 0x00000003, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000000,
+ 0x00000000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a, 0x00000000, 0x00000001, 0x0c000037,
+ 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000,
+ 0x0020100a, 0x00000000, 0x00000001, 0x05000036, 0x00102012, 0x00000002, 0x0010000a, 0x00000000,
+ 0x01000013, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x06000036,
+ 0x00102012, 0x00000001, 0x0020100a, 0x00000001, 0x00000001, 0x0c000037, 0x00100012, 0x00000000,
+ 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0020100a, 0x00000001,
+ 0x00000001, 0x05000036, 0x00102012, 0x00000002, 0x0010000a, 0x00000000, 0x01000013, 0x06000036,
+ 0x001020f2, 0x00000000, 0x00201e46, 0x00000002, 0x00000000, 0x06000036, 0x00102012, 0x00000001,
+ 0x0020100a, 0x00000002, 0x00000001, 0x0c000037, 0x00100012, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0020100a, 0x00000002, 0x00000001, 0x05000036,
+ 0x00102012, 0x00000002, 0x0010000a, 0x00000000, 0x01000013, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE gs = {gs_code, sizeof(gs_code)};
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"CLIP_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"CLIP_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 4, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const struct vec4 quad[] =
+ {
+ {-1.0f, -1.0f},
+ {-1.0f, 1.0f},
+ { 1.0f, -1.0f},
+ { 1.0f, 1.0f},
+ };
+ struct
+ {
+ float clip_distance0;
+ float clip_distance1;
+ }
+ vertices[] =
+ {
+ {1.0f, 1.0f},
+ {1.0f, 1.0f},
+ {1.0f, 1.0f},
+ {1.0f, 1.0f},
+ };
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ struct
+ {
+ bool use_constant;
+ float clip_distance0;
+ float clip_distance1;
+ float padding;
+ } cb_data;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 640;
+ desc.rt_height = 480;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[0].Descriptor.ShaderRegister = 0;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[1].Descriptor.ShaderRegister = 1;
+ root_parameters[1].Descriptor.RegisterSpace = 0;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[2].Descriptor.ShaderRegister = 0;
+ root_parameters[2].Descriptor.RegisterSpace = 0;
+ root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_GEOMETRY;
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, &vs, NULL, &input_layout);
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pso);
+ ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr);
+
+ vb[0] = create_upload_buffer(device, sizeof(quad), quad);
+ vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]);
+ vbv[0].StrideInBytes = sizeof(*quad);
+ vbv[0].SizeInBytes = sizeof(quad);
+
+ vb[1] = create_upload_buffer(device, sizeof(vertices), vertices);
+ vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]);
+ vbv[1].StrideInBytes = sizeof(*vertices);
+ vbv[1].SizeInBytes = sizeof(vertices);
+
+ memset(&cb_data, 0, sizeof(cb_data));
+ vs_cb = create_upload_buffer(device, sizeof(cb_data), &cb_data);
+ gs_cb = create_upload_buffer(device, sizeof(cb_data), &cb_data);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(vs_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2,
+ ID3D12Resource_GetGPUVirtualAddress(gs_cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+
+ /* vertex shader */
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ check_clip_distance(&context, pso, vbv, vb[1], vs_cb, gs_cb);
+
+ cb_data.use_constant = true;
+ cb_data.clip_distance0 = -1.0f;
+ update_buffer_data(vs_cb, 0, sizeof(cb_data), &cb_data);
+
+ ID3D12PipelineState_Release(pso);
+
+ /* geometry shader */
+ pso_desc.GS = gs;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pso);
+ ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr);
+
+ check_clip_distance(&context, pso, vbv, vb[1], vs_cb, gs_cb);
+
+ cb_data.use_constant = true;
+ cb_data.clip_distance0 = 1.0f;
+ update_buffer_data(gs_cb, 0, sizeof(cb_data), &cb_data);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(vs_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2,
+ ID3D12Resource_GetGPUVirtualAddress(gs_cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12PipelineState_Release(pso);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* multiple clip distances */
+ pso_desc.VS = vs_multiple;
+ memset(&pso_desc.GS, 0, sizeof(pso_desc.GS));
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&pso);
+ ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr);
+
+ cb_data.use_constant = false;
+ update_buffer_data(vs_cb, 0, sizeof(cb_data), &cb_data);
+
+ for (i = 0; i < ARRAY_SIZE(vertices); ++i)
+ vertices[i].clip_distance0 = 1.0f;
+ update_buffer_data(vb[1], 0, sizeof(vertices), vertices);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(vs_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2,
+ ID3D12Resource_GetGPUVirtualAddress(gs_cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ for (i = 0; i < ARRAY_SIZE(vertices); ++i)
+ {
+ vertices[i].clip_distance0 = i < 2 ? 1.0f : -1.0f;
+ vertices[i].clip_distance1 = i % 2 ? 1.0f : -1.0f;
+ }
+ update_buffer_data(vb[1], 0, sizeof(vertices), vertices);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(vs_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2,
+ ID3D12Resource_GetGPUVirtualAddress(gs_cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ set_box(&box, 0, 0, 0, 320, 240, 1);
+ check_readback_data_uint(&rb, &box, 0xff00ff00, 1);
+ set_box(&box, 0, 240, 0, 320, 480, 1);
+ check_readback_data_uint(&rb, &box, 0xffffffff, 1);
+ set_box(&box, 320, 0, 0, 640, 480, 1);
+ check_readback_data_uint(&rb, &box, 0xffffffff, 1);
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ cb_data.use_constant = true;
+ cb_data.clip_distance0 = 0.0f;
+ cb_data.clip_distance1 = 0.0f;
+ update_buffer_data(vs_cb, 0, sizeof(cb_data), &cb_data);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(vs_cb));
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2,
+ ID3D12Resource_GetGPUVirtualAddress(gs_cb));
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pso);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12PipelineState_Release(pso);
+ for (i = 0; i < ARRAY_SIZE(vb); ++i)
+ ID3D12Resource_Release(vb[i]);
+ ID3D12Resource_Release(vs_cb);
+ ID3D12Resource_Release(gs_cb);
+ destroy_test_context(&context);
+}
+
+static void test_combined_clip_and_cull_distances(void)
+{
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ D3D12_VERTEX_BUFFER_VIEW vbv[2];
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *vb[2];
+ ID3D12Device *device;
+ unsigned int i, j, k;
+
+ static const DWORD vs_code[] =
+ {
+#if 0
+ struct input
+ {
+ float4 position : POSITION;
+ float clip0 : CLIP_DISTANCE0;
+ float clip1 : CLIP_DISTANCE1;
+ float clip2 : CLIP_DISTANCE2;
+ float clip3 : CLIP_DISTANCE3;
+ float cull0 : CULL_DISTANCE0;
+ float cull1 : CULL_DISTANCE1;
+ float cull2 : CULL_DISTANCE2;
+ float cull3 : CULL_DISTANCE3;
+ };
+
+ struct vertex
+ {
+ float4 position : SV_Position;
+ float3 clip0 : SV_ClipDistance1;
+ float3 cull0 : SV_CullDistance1;
+ float clip1 : SV_ClipDistance2;
+ float cull1 : SV_CullDistance2;
+ };
+
+ void main(input vin, out vertex vertex)
+ {
+ vertex.position = vin.position;
+ vertex.clip0 = float3(vin.clip0, vin.clip1, vin.clip2);
+ vertex.cull0 = float3(vin.cull0, vin.cull1, vin.cull2);
+ vertex.clip1 = vin.clip3;
+ vertex.cull1 = vin.cull3;
+ }
+#endif
+ 0x43425844, 0xa24fb3ea, 0x92e2c2b0, 0xb599b1b9, 0xd671f830, 0x00000001, 0x00000374, 0x00000003,
+ 0x0000002c, 0x0000013c, 0x000001f0, 0x4e475349, 0x00000108, 0x00000009, 0x00000008, 0x000000e0,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x000000e9, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000101, 0x000000e9, 0x00000001, 0x00000000, 0x00000003, 0x00000002,
+ 0x00000101, 0x000000e9, 0x00000002, 0x00000000, 0x00000003, 0x00000003, 0x00000101, 0x000000e9,
+ 0x00000003, 0x00000000, 0x00000003, 0x00000004, 0x00000101, 0x000000f7, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000005, 0x00000101, 0x000000f7, 0x00000001, 0x00000000, 0x00000003, 0x00000006,
+ 0x00000101, 0x000000f7, 0x00000002, 0x00000000, 0x00000003, 0x00000007, 0x00000101, 0x000000f7,
+ 0x00000003, 0x00000000, 0x00000003, 0x00000008, 0x00000101, 0x49534f50, 0x4e4f4954, 0x494c4300,
+ 0x49445f50, 0x4e415453, 0x43004543, 0x5f4c4c55, 0x54534944, 0x45434e41, 0xababab00, 0x4e47534f,
+ 0x000000ac, 0x00000005, 0x00000008, 0x00000080, 0x00000000, 0x00000001, 0x00000003, 0x00000000,
+ 0x0000000f, 0x0000008c, 0x00000000, 0x00000002, 0x00000003, 0x00000001, 0x00000807, 0x0000008c,
+ 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000708, 0x0000009c, 0x00000000, 0x00000003,
+ 0x00000003, 0x00000002, 0x00000807, 0x0000009c, 0x00000001, 0x00000003, 0x00000003, 0x00000002,
+ 0x00000708, 0x505f5653, 0x7469736f, 0x006e6f69, 0x435f5653, 0x4470696c, 0x61747369, 0x0065636e,
+ 0x435f5653, 0x446c6c75, 0x61747369, 0x0065636e, 0x52444853, 0x0000017c, 0x00010040, 0x0000005f,
+ 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x0300005f, 0x00101012,
+ 0x00000002, 0x0300005f, 0x00101012, 0x00000003, 0x0300005f, 0x00101012, 0x00000004, 0x0300005f,
+ 0x00101012, 0x00000005, 0x0300005f, 0x00101012, 0x00000006, 0x0300005f, 0x00101012, 0x00000007,
+ 0x0300005f, 0x00101012, 0x00000008, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x04000067,
+ 0x00102072, 0x00000001, 0x00000002, 0x04000067, 0x00102082, 0x00000001, 0x00000002, 0x04000067,
+ 0x00102072, 0x00000002, 0x00000003, 0x04000067, 0x00102082, 0x00000002, 0x00000003, 0x05000036,
+ 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102012, 0x00000001, 0x0010100a,
+ 0x00000001, 0x05000036, 0x00102022, 0x00000001, 0x0010100a, 0x00000002, 0x05000036, 0x00102042,
+ 0x00000001, 0x0010100a, 0x00000003, 0x05000036, 0x00102082, 0x00000001, 0x0010100a, 0x00000004,
+ 0x05000036, 0x00102012, 0x00000002, 0x0010100a, 0x00000005, 0x05000036, 0x00102022, 0x00000002,
+ 0x0010100a, 0x00000006, 0x05000036, 0x00102042, 0x00000002, 0x0010100a, 0x00000007, 0x05000036,
+ 0x00102082, 0x00000002, 0x0010100a, 0x00000008, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"CLIP_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"CLIP_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 4, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"CLIP_DISTANCE", 2, DXGI_FORMAT_R32_FLOAT, 1, 8, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"CLIP_DISTANCE", 3, DXGI_FORMAT_R32_FLOAT, 1, 12, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"CULL_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"CULL_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 20, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"CULL_DISTANCE", 2, DXGI_FORMAT_R32_FLOAT, 1, 24, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ {"CULL_DISTANCE", 3, DXGI_FORMAT_R32_FLOAT, 1, 28, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const struct vec4 quad[] =
+ {
+ {-1.0f, -1.0f},
+ {-1.0f, 1.0f},
+ { 1.0f, -1.0f},
+ { 1.0f, 1.0f},
+ };
+ struct
+ {
+ float clip_distance[4];
+ float cull_distance[4];
+ }
+ vertices[4] =
+ {
+ {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}},
+ {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}},
+ {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}},
+ {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}},
+ };
+ static const struct test
+ {
+ float vertices[4];
+ bool triangle_visible[2];
+ }
+ cull_distance_tests[] =
+ {
+ {{-1.0f, 1.0f, 1.0f, 1.0f}, {true, true}},
+ {{ 1.0f, -1.0f, 1.0f, 1.0f}, {true, true}},
+ {{ 1.0f, 1.0f, 1.0f, -1.0f}, {true, true}},
+ {{-1.0f, -1.0f, 1.0f, 1.0f}, {true, true}},
+ {{-1.0f, 1.0f, -1.0f, 1.0f}, {true, true}},
+ {{-1.0f, 1.0f, 1.0f, -1.0f}, {true, true}},
+ {{ 1.0f, -1.0f, -1.0f, 1.0f}, {true, true}},
+ {{ 1.0f, -1.0f, 1.0f, -1.0f}, {true, true}},
+ {{ 1.0f, 1.0f, -1.0f, -1.0f}, {true, true}},
+
+ {{-1.0f, -1.0f, -1.0f, 1.0f}, {false, true}},
+ {{-1.0f, -1.0f, 1.0f, -1.0f}, {true, true}},
+ {{-1.0f, -1.0f, 1.0f, -1.0f}, {true, true}},
+ {{-1.0f, 1.0f, -1.0f, -1.0f}, {true, true}},
+ {{ 1.0f, -1.0f, -1.0f, -1.0f}, {true, false}},
+
+ {{-1.0f, -1.0f, -1.0f, -1.0f}, {false, false}},
+ };
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = 640;
+ desc.rt_height = 480;
+ desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+
+ context.pipeline_state = create_pipeline_state(device, context.root_signature,
+ context.render_target_desc.Format, &vs, NULL, &input_layout);
+
+ vb[0] = create_upload_buffer(device, sizeof(quad), quad);
+ vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]);
+ vbv[0].StrideInBytes = sizeof(*quad);
+ vbv[0].SizeInBytes = sizeof(quad);
+
+ vb[1] = create_upload_buffer(device, sizeof(vertices), vertices);
+ vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]);
+ vbv[1].StrideInBytes = sizeof(*vertices);
+ vbv[1].SizeInBytes = sizeof(vertices);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ for (i = 0; i < ARRAY_SIZE(vertices->cull_distance); ++i)
+ {
+ for (j = 0; j < ARRAY_SIZE(cull_distance_tests); ++j)
+ {
+ const struct test *test = &cull_distance_tests[j];
+ unsigned int expected_color[ARRAY_SIZE(test->triangle_visible)];
+ unsigned int color;
+
+ for (k = 0; k < ARRAY_SIZE(vertices); ++k)
+ vertices[k].cull_distance[i] = test->vertices[k];
+ update_buffer_data(vb[1], 0, sizeof(vertices), vertices);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ for (k = 0; k < ARRAY_SIZE(expected_color); ++k)
+ expected_color[k] = test->triangle_visible[k] ? 0xff00ff00 : 0xffffffff;
+
+ if (expected_color[0] == expected_color[1])
+ {
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, expected_color[0], 0);
+ }
+ else
+ {
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ color = get_readback_uint(&rb, 160, 240, 0);
+ ok(color == expected_color[0], "Got unexpected color 0x%08x.\n", color);
+ color = get_readback_uint(&rb, 480, 240, 0);
+ ok(color == expected_color[1], "Got unexpected color 0x%08x.\n", color);
+ release_resource_readback(&rb);
+ }
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+
+ for (j = 0; j < ARRAY_SIZE(vertices); ++j)
+ vertices[j].cull_distance[i] = 1.0f;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(vertices->clip_distance); ++i)
+ {
+ for (j = 0; j < ARRAY_SIZE(vertices); ++j)
+ vertices[j].clip_distance[i] = -1.0f;
+ update_buffer_data(vb[1], 0, sizeof(vertices), vertices);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ for (j = 0; j < ARRAY_SIZE(vertices); ++j)
+ vertices[j].clip_distance[i] = 1.0f;
+ }
+
+ memset(vertices, 0, sizeof(vertices));
+ update_buffer_data(vb[1], 0, sizeof(vertices), vertices);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ for (i = 0; i < ARRAY_SIZE(vb); ++i)
+ ID3D12Resource_Release(vb[i]);
+ destroy_test_context(&context);
+}
+
+static void test_resource_allocation_info(void)
+{
+ D3D12_RESOURCE_ALLOCATION_INFO info;
+ D3D12_RESOURCE_DESC desc;
+ ID3D12Device *device;
+ unsigned int i, j;
+ ULONG refcount;
+ uint64_t size;
+
+ static const unsigned int alignments[] =
+ {
+ 0,
+ D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT,
+ D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT,
+ D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT,
+ };
+ static const unsigned int buffer_sizes[] =
+ {
+ 1,
+ 16,
+ 256,
+ 1024,
+ D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT,
+ D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT + 1,
+ D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT,
+ D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + 1,
+ D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT,
+ D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT + 1,
+ };
+ static const struct
+ {
+ unsigned int width;
+ unsigned int height;
+ unsigned int array_size;
+ unsigned int miplevels;
+ DXGI_FORMAT format;
+ }
+ texture_tests[] =
+ {
+ { 4, 4, 1, 1, DXGI_FORMAT_R8_UINT},
+ { 8, 8, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM},
+ {16, 16, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM},
+ {16, 16, 6, 1, DXGI_FORMAT_R8G8B8A8_UNORM},
+
+ {1024, 1024, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM},
+ {1024, 1024, 1, 2, DXGI_FORMAT_R8G8B8A8_UNORM},
+ {1024, 1024, 1, 3, DXGI_FORMAT_R8G8B8A8_UNORM},
+ {1024, 1024, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM},
+ };
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
+ desc.Alignment = 0;
+ desc.Width = 32;
+ desc.Height = 1;
+ desc.DepthOrArraySize = 1;
+ desc.MipLevels = 1;
+ desc.Format = DXGI_FORMAT_UNKNOWN;
+ desc.SampleDesc.Count = 1;
+ desc.SampleDesc.Quality = 0;
+ desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
+ desc.Flags = 0;
+
+ for (i = 0; i < ARRAY_SIZE(alignments); ++i)
+ {
+ for (j = 0; j < ARRAY_SIZE(buffer_sizes); ++j)
+ {
+ desc.Alignment = alignments[i];
+ desc.Width = buffer_sizes[j];
+ info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc);
+ if (!desc.Alignment || desc.Alignment == D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)
+ {
+ check_alignment(info.SizeInBytes, info.Alignment);
+ }
+ else
+ {
+ ok(info.SizeInBytes == ~(uint64_t)0,
+ "Got unexpected size %"PRIu64".\n", info.SizeInBytes);
+ ok(info.Alignment == D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT,
+ "Got unexpected alignment %"PRIu64".\n", info.Alignment);
+ }
+ }
+ }
+
+ desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ desc.SampleDesc.Count = 1;
+ desc.SampleDesc.Quality = 0;
+ desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ desc.Flags = 0;
+
+ for (i = 0; i < ARRAY_SIZE(texture_tests); ++i)
+ {
+ desc.Width = texture_tests[i].width;
+ desc.Height = texture_tests[i].height;
+ desc.DepthOrArraySize = texture_tests[i].array_size;
+ desc.MipLevels = texture_tests[i].miplevels;
+ desc.Format = texture_tests[i].format;
+
+ desc.Alignment = 0;
+ info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc);
+ ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT,
+ "Got unexpected alignment %"PRIu64".\n", info.Alignment);
+ check_alignment(info.SizeInBytes, info.Alignment);
+
+ desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+ info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc);
+ ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT,
+ "Got unexpected alignment %"PRIu64".\n", info.Alignment);
+ check_alignment(info.SizeInBytes, info.Alignment);
+
+ desc.Alignment = D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT;
+ info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc);
+ ok(info.Alignment >= D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT,
+ "Got unexpected alignment %"PRIu64".\n", info.Alignment);
+ size = desc.Width * desc.Height * desc.DepthOrArraySize * format_size(desc.Format);
+ if (size <= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)
+ {
+ check_alignment(info.SizeInBytes, info.Alignment);
+ }
+ else
+ {
+ ok(info.SizeInBytes == ~(uint64_t)0,
+ "Got unexpected size %"PRIu64".\n", info.SizeInBytes);
+ ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT,
+ "Got unexpected alignment %"PRIu64".\n", info.Alignment);
+ }
+ }
+
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_suballocate_small_textures(void)
+{
+ D3D12_GPU_VIRTUAL_ADDRESS gpu_address;
+ D3D12_RESOURCE_ALLOCATION_INFO info;
+ D3D12_RESOURCE_DESC resource_desc;
+ ID3D12Resource *textures[10];
+ D3D12_HEAP_DESC heap_desc;
+ ID3D12Device *device;
+ ID3D12Heap *heap;
+ unsigned int i;
+ ULONG refcount;
+ HRESULT hr;
+
+ if (!(device = create_device()))
+ {
+ skip("Failed to create device.\n");
+ return;
+ }
+
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 32;
+ resource_desc.Height = 32;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = 0;
+
+ resource_desc.Alignment = D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT;
+
+ info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &resource_desc);
+ trace("Size %"PRIu64", alignment %"PRIu64".\n", info.SizeInBytes, info.Alignment);
+ check_alignment(info.SizeInBytes, info.Alignment);
+ if (info.Alignment != D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT)
+ {
+ resource_desc.Alignment = 0;
+ info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &resource_desc);
+ trace("Size %"PRIu64", alignment %"PRIu64".\n", info.SizeInBytes, info.Alignment);
+ check_alignment(info.SizeInBytes, info.Alignment);
+ }
+
+ ok(info.Alignment >= D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, "Got alignment %"PRIu64".\n", info.Alignment);
+
+ heap_desc.SizeInBytes = ARRAY_SIZE(textures) * info.SizeInBytes;
+ memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties));
+ heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ heap_desc.Alignment = 0;
+ heap_desc.Flags = D3D12_HEAP_FLAG_DENY_BUFFERS | D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES;
+ hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap);
+ ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ {
+ hr = ID3D12Device_CreatePlacedResource(device, heap, i * info.SizeInBytes,
+ &resource_desc, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE,
+ NULL, &IID_ID3D12Resource, (void **)&textures[i]);
+ ok(hr == S_OK, "Failed to create placed resource %u, hr %#x.\n", i, hr);
+
+ check_interface(textures[i], &IID_ID3D12Object, true);
+ check_interface(textures[i], &IID_ID3D12DeviceChild, true);
+ check_interface(textures[i], &IID_ID3D12Pageable, true);
+ check_interface(textures[i], &IID_ID3D12Resource, true);
+
+ gpu_address = ID3D12Resource_GetGPUVirtualAddress(textures[i]);
+ ok(!gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address);
+ }
+
+ refcount = get_refcount(heap);
+ ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount);
+
+ for (i = 0; i < ARRAY_SIZE(textures); ++i)
+ {
+ refcount = ID3D12Resource_Release(textures[i]);
+ ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount);
+ }
+
+ refcount = ID3D12Heap_Release(heap);
+ ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount);
+ refcount = ID3D12Device_Release(device);
+ ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
+}
+
+static void test_command_list_initial_pipeline_state(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ ID3D12GraphicsCommandList *command_list;
+ ID3D12PipelineState *pipeline_state;
+ ID3D12CommandAllocator *allocator;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ void main(out float4 target : SV_Target)
+ {
+ target = float4(0.0f, 0.25f, 0.5f, 1.0f);
+ }
+#endif
+ 0x43425844, 0x2f09e5ff, 0xaa135d5e, 0x7860f4b5, 0x5c7b8cbc, 0x00000001, 0x000000b4, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000003c, 0x00000050, 0x0000000f,
+ 0x0100086a, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002,
+ 0x00000000, 0x3e800000, 0x3f000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ if (!init_test_context(&context, NULL))
+ return;
+ queue = context.queue;
+
+ pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ hr = ID3D12Device_CreateCommandAllocator(context.device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ &IID_ID3D12CommandAllocator, (void **)&allocator);
+ ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(context.device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ allocator, pipeline_state, &IID_ID3D12GraphicsCommandList, (void **)&command_list);
+ ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff804000, 1);
+
+ hr = ID3D12CommandAllocator_Reset(allocator);
+ ok(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr);
+ hr = ID3D12GraphicsCommandList_Reset(command_list, allocator, context.pipeline_state);
+ ok(hr == S_OK, "Failed to reset command list, hr %#x.\n", hr);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12CommandAllocator_Release(allocator);
+ ID3D12GraphicsCommandList_Release(command_list);
+ ID3D12PipelineState_Release(pipeline_state);
+ destroy_test_context(&context);
+}
+
+static void test_blend_factor(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ unsigned int i;
+ HRESULT hr;
+
+ static const struct
+ {
+ float blend_factor[4];
+ unsigned int expected_color;
+ }
+ tests[] =
+ {
+ {{0.0f, 0.0f, 0.0f, 0.0f}, 0xffffffff},
+ {{0.0f, 1.0f, 0.0f, 1.0f}, 0xffffffff},
+ {{0.5f, 0.5f, 0.5f, 0.5f}, 0xff80ff80},
+ {{1.0f, 1.0f, 1.0f, 1.0f}, 0xff00ff00},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, NULL, NULL);
+ pso_desc.BlendState.RenderTarget[0].BlendEnable = true;
+ pso_desc.BlendState.RenderTarget[0].SrcBlend = D3D12_BLEND_BLEND_FACTOR;
+ pso_desc.BlendState.RenderTarget[0].DestBlend = D3D12_BLEND_INV_BLEND_FACTOR;
+ pso_desc.BlendState.RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD;
+ pso_desc.BlendState.RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_BLEND_FACTOR;
+ pso_desc.BlendState.RenderTarget[0].DestBlendAlpha = D3D12_BLEND_INV_BLEND_FACTOR;
+ pso_desc.BlendState.RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_OMSetBlendFactor(command_list, tests[i].blend_factor);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_color, 1);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ destroy_test_context(&context);
+}
+
+static void test_dual_source_blending(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float4 c0;
+ float4 c1;
+
+ void main(out float4 o0 : SV_Target0, out float4 o1 : SV_Target1)
+ {
+ o0 = c0;
+ o1 = c1;
+ }
+#endif
+ 0x43425844, 0x823a4ecf, 0xd409abf6, 0xe76697ab, 0x9b53c9a5, 0x00000001, 0x000000f8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000088, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x00000038, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x545f5653,
+ 0x65677261, 0xabab0074, 0x58454853, 0x00000068, 0x00000050, 0x0000001a, 0x0100086a, 0x04000059,
+ 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2,
+ 0x00000001, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x06000036,
+ 0x001020f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const struct
+ {
+ struct
+ {
+ struct vec4 c0;
+ struct vec4 c1;
+ } constants;
+ unsigned int expected_color;
+ }
+ tests[] =
+ {
+ {{{0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, 0x00000000},
+ {{{0.0f, 0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f, 1.0f}}, 0xff0000ff},
+ {{{1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, 0xff0000ff},
+ {{{1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 1.0f, 0.0f}}, 0xffffffff},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_32bit_constants_root_signature(context.device,
+ 0, sizeof(tests->constants) / sizeof(uint32_t), D3D12_SHADER_VISIBILITY_PIXEL);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, &ps, NULL);
+ pso_desc.BlendState.RenderTarget[0].BlendEnable = true;
+ pso_desc.BlendState.RenderTarget[0].SrcBlend = D3D12_BLEND_SRC_COLOR;
+ pso_desc.BlendState.RenderTarget[0].DestBlend = D3D12_BLEND_SRC1_COLOR;
+ pso_desc.BlendState.RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD;
+ pso_desc.BlendState.RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_SRC_ALPHA;
+ pso_desc.BlendState.RenderTarget[0].DestBlendAlpha = D3D12_BLEND_SRC1_ALPHA;
+ pso_desc.BlendState.RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 8, &tests[i].constants, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_color, 1);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ pso_desc.BlendState.IndependentBlendEnable = true;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+ ID3D12PipelineState_Release(context.pipeline_state);
+ context.pipeline_state = NULL;
+
+ pso_desc.BlendState.RenderTarget[1] = pso_desc.BlendState.RenderTarget[0];
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ pso_desc.BlendState.RenderTarget[1].DestBlendAlpha = D3D12_BLEND_SRC_ALPHA;
+ pso_desc.BlendState.RenderTarget[1].DestBlend = D3D12_BLEND_SRC_COLOR;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ context.pipeline_state = NULL;
+
+ pso_desc.NumRenderTargets = 2;
+ pso_desc.RTVFormats[1] = pso_desc.RTVFormats[0];
+ pso_desc.BlendState.IndependentBlendEnable = false;
+ pso_desc.BlendState.RenderTarget[0].BlendEnable = true;
+ pso_desc.BlendState.RenderTarget[0].SrcBlend = D3D12_BLEND_SRC_COLOR;
+ pso_desc.BlendState.RenderTarget[0].DestBlend = D3D12_BLEND_SRC1_COLOR;
+ pso_desc.BlendState.RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD;
+ pso_desc.BlendState.RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_SRC_ALPHA;
+ pso_desc.BlendState.RenderTarget[0].DestBlendAlpha = D3D12_BLEND_SRC1_ALPHA;
+ pso_desc.BlendState.RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ destroy_test_context(&context);
+}
+
+static void test_multisample_rendering(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ ID3D12PipelineState *ms_pipeline_state;
+ D3D12_CPU_DESCRIPTOR_HANDLE ms_rtv;
+ ID3D12Resource *ms_render_target;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ uint32_t sample;
+ unsigned int i;
+ HRESULT hr;
+
+ static const DWORD ps_color_code[] =
+ {
+#if 0
+ float4 main(uint id : SV_SampleIndex) : SV_Target
+ {
+ switch (id)
+ {
+ case 0: return float4(1.0f, 0.0f, 0.0f, 1.0f);
+ case 1: return float4(0.0f, 1.0f, 0.0f, 1.0f);
+ case 2: return float4(0.0f, 0.0f, 1.0f, 1.0f);
+ default: return float4(0.0f, 0.0f, 0.0f, 1.0f);
+ }
+ }
+#endif
+ 0x43425844, 0x94c35f48, 0x04c6b0f7, 0x407d8214, 0xc24f01e5, 0x00000001, 0x00000194, 0x00000003,
+ 0x0000002c, 0x00000064, 0x00000098, 0x4e475349, 0x00000030, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x0000000a, 0x00000001, 0x00000000, 0x00000101, 0x535f5653, 0x6c706d61, 0x646e4965,
+ 0xab007865, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f4,
+ 0x00000050, 0x0000003d, 0x0100086a, 0x04000863, 0x00101012, 0x00000000, 0x0000000a, 0x03000065,
+ 0x001020f2, 0x00000000, 0x0300004c, 0x0010100a, 0x00000000, 0x03000006, 0x00004001, 0x00000000,
+ 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000,
+ 0x0100003e, 0x03000006, 0x00004001, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, 0x00004002,
+ 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x03000006, 0x00004001, 0x00000002,
+ 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000,
+ 0x0100003e, 0x0100000a, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000,
+ 0x00000000, 0x3f800000, 0x0100003e, 0x01000017, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_color = {ps_color_code, sizeof(ps_color_code)};
+ static const DWORD ps_resolve_code[] =
+ {
+#if 0
+ Texture2DMS<float4> t;
+
+ uint sample;
+ uint rt_size;
+
+ float4 main(float4 position : SV_Position) : SV_Target
+ {
+ float3 p;
+ t.GetDimensions(p.x, p.y, p.z);
+ p *= float3(position.x / rt_size, position.y / rt_size, 0);
+ return t.Load((int2)p.xy, sample);
+ }
+#endif
+ 0x43425844, 0x68a4590b, 0xc1ec3070, 0x1b957c43, 0x0c080741, 0x00000001, 0x000001c8, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000012c, 0x00000050,
+ 0x0000004b, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04002058, 0x00107000,
+ 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2,
+ 0x00000000, 0x02000068, 0x00000001, 0x06000056, 0x00100012, 0x00000000, 0x0020801a, 0x00000000,
+ 0x00000000, 0x0700000e, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00100006, 0x00000000,
+ 0x8900003d, 0x80000102, 0x00155543, 0x001000c2, 0x00000000, 0x00004001, 0x00000000, 0x001074e6,
+ 0x00000000, 0x07000038, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00100ae6, 0x00000000,
+ 0x0500001b, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8c00002e, 0x80000102, 0x00155543,
+ 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_resolve = {ps_resolve_code, sizeof(ps_resolve_code)};
+ static const unsigned int expected_colors[] = {0xff0000ff, 0xff00ff00, 0xffff0000, 0xff000000};
+
+ if (use_warp_device)
+ {
+ skip("Sample shading tests fail on WARP.\n");
+ return;
+ }
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = desc.rt_height = 32;
+ desc.rt_descriptor_count = 2;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_texture_root_signature(context.device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 2, 0);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, &ps_resolve, NULL);
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ pso_desc.PS = ps_color;
+ pso_desc.SampleDesc.Count = 4;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&ms_pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ ms_rtv = get_cpu_rtv_handle(&context, context.rtv_heap, 1);
+ desc.sample_desc.Count = 4;
+ create_render_target(&context, &desc, &ms_render_target, &ms_rtv);
+
+ heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ ID3D12Device_CreateShaderResourceView(context.device, ms_render_target, NULL,
+ get_cpu_descriptor_handle(&context, heap, 0));
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, ms_rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &ms_rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, ms_pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 0));
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, ms_render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_DEST);
+ ID3D12GraphicsCommandList_ResolveSubresource(command_list,
+ context.render_target, 0, ms_render_target, 0, context.render_target_desc.Format);
+ transition_resource_state(command_list, ms_render_target,
+ D3D12_RESOURCE_STATE_RESOLVE_SOURCE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff404040, 2);
+
+ for (i = 0; i < ARRAY_SIZE(expected_colors); ++i)
+ {
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 0));
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 1, &desc.rt_width, 1);
+
+ sample = i;
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 1, &sample, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, expected_colors[i], 0);
+ }
+
+ ID3D12DescriptorHeap_Release(heap);
+ ID3D12Resource_Release(ms_render_target);
+ ID3D12PipelineState_Release(ms_pipeline_state);
+ destroy_test_context(&context);
+}
+
+static void test_sample_mask(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_CPU_DESCRIPTOR_HANDLE ms_rtv;
+ ID3D12Resource *ms_render_target;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ uint32_t sample_mask;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ uint mask;
+
+ float4 main(in float4 pos : SV_Position, out uint sample_mask : SV_Coverage) : SV_Target
+ {
+ sample_mask = mask;
+ return float4(0.0, 1.0, 0.0, 1.0);
+ }
+#endif
+ 0x43425844, 0xfab05c6c, 0xeba1b017, 0xf4493502, 0x72ce5d05, 0x00000001, 0x00000128, 0x00000003,
+ 0x0000002c, 0x00000060, 0x000000b8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x00000050, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000042, 0x00000000, 0x00000000, 0x00000001, 0xffffffff, 0x00000e01,
+ 0x545f5653, 0x65677261, 0x56530074, 0x766f435f, 0x67617265, 0xabab0065, 0x58454853, 0x00000068,
+ 0x00000050, 0x0000001a, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065,
+ 0x001020f2, 0x00000000, 0x02000065, 0x0000f000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002,
+ 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x05000036, 0x0000f001, 0x0020800a, 0x00000000,
+ 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_descriptor_count = 2;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_32bit_constants_root_signature(context.device,
+ 0, 1, D3D12_SHADER_VISIBILITY_PIXEL);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, &ps, NULL);
+ pso_desc.SampleDesc.Count = 4;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ ms_rtv = get_cpu_rtv_handle(&context, context.rtv_heap, 1);
+ desc.sample_desc.Count = 4;
+ create_render_target(&context, &desc, &ms_render_target, &ms_rtv);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, ms_rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &ms_rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ sample_mask = 0xa;
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 1, &sample_mask, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, ms_render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_DEST);
+ ID3D12GraphicsCommandList_ResolveSubresource(command_list,
+ context.render_target, 0, ms_render_target, 0, context.render_target_desc.Format);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff7fff7f, 2);
+
+ ID3D12Resource_Release(ms_render_target);
+ destroy_test_context(&context);
+}
+
+static void test_coverage(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ D3D12_DESCRIPTOR_RANGE descriptor_ranges[1];
+ ID3D12DescriptorHeap *cpu_heap, *gpu_heap;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[1];
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *texture;
+ unsigned int i;
+ HRESULT hr;
+
+ static const float black[4];
+ static const unsigned int zero[4];
+ static const DWORD ps_code[] =
+ {
+#if 0
+ RWTexture2D<uint> u;
+
+ float4 main(float4 position : SV_Position, uint coverage : SV_Coverage) : SV_Target
+ {
+ InterlockedOr(u[uint2(position.x, position.y)], coverage);
+ return float4(0.0, 1.0, 0.0, 1.0);
+ }
+#endif
+ 0x43425844, 0x53236006, 0x68a61a42, 0x5d0a06e7, 0x05a9405b, 0x00000001, 0x00000134, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000098, 0x00000050,
+ 0x00000026, 0x0100086a, 0x0400189c, 0x0011e000, 0x00000001, 0x00004444, 0x04002064, 0x00101032,
+ 0x00000000, 0x00000001, 0x0200005f, 0x00023001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068,
+ 0x00000001, 0x0500001c, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x060000aa, 0x0011e000,
+ 0x00000001, 0x00100046, 0x00000000, 0x0002300a, 0x08000036, 0x001020f2, 0x00000000, 0x00004002,
+ 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ static const struct
+ {
+ unsigned int sample_mask;
+ unsigned int expected_color;
+ }
+ tests[] =
+ {
+ {0x01, 0x40004000},
+ {0x03, 0x7f007f00},
+ {0x07, 0xbf00bf00},
+ {0x09, 0x7f007f00},
+ {0x0d, 0xbf00bf00},
+ {0x0f, 0xff00ff00},
+ {0xff, 0xff00ff00},
+ { ~0u, 0xff00ff00},
+ };
+
+ if (use_warp_device)
+ {
+ skip("Sample shading tests fail on WARP.\n");
+ return;
+ }
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = desc.rt_height = 32;
+ desc.sample_desc.Count = 4;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_ranges[0].NumDescriptors = 1;
+ descriptor_ranges[0].BaseShaderRegister = 1;
+ descriptor_ranges[0].RegisterSpace = 0;
+ descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0;
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameters[0].DescriptorTable.NumDescriptorRanges = ARRAY_SIZE(descriptor_ranges);
+ root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ texture = create_default_texture(context.device, desc.rt_width, desc.rt_height, DXGI_FORMAT_R32_UINT,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ cpu_heap = create_cpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ gpu_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ ID3D12Device_CreateUnorderedAccessView(context.device, texture, NULL, NULL,
+ get_cpu_descriptor_handle(&context, cpu_heap, 0));
+ ID3D12Device_CopyDescriptorsSimple(context.device, 1,
+ get_cpu_descriptor_handle(&context, gpu_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_heap, 0),
+ D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("sample mask %#x", tests[i].sample_mask);
+
+ if (context.pipeline_state)
+ ID3D12PipelineState_Release(context.pipeline_state);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, &ps, NULL);
+ pso_desc.SampleMask = tests[i].sample_mask;
+ pso_desc.SampleDesc.Count = desc.sample_desc.Count;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_heap, 0),
+ texture, zero, 0, NULL);
+
+ uav_barrier(command_list, texture);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, black, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list,
+ 0, get_gpu_descriptor_handle(&context, gpu_heap, 0));
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_color, 2);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(texture, 0, queue, command_list, tests[i].sample_mask & 0xf, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RESOLVE_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12DescriptorHeap_Release(cpu_heap);
+ ID3D12DescriptorHeap_Release(gpu_heap);
+ ID3D12Resource_Release(texture);
+ destroy_test_context(&context);
+}
+
+static void test_shader_get_render_target_sample_count(void)
+{
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ HRESULT hr;
+
+ static const float black[4];
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float4 main() : SV_Target
+ {
+ return GetRenderTargetSampleCount();
+ }
+
+#endif
+ 0x43425844, 0x74404d37, 0xad6f88e4, 0xb006ea57, 0xf07d9e2a, 0x00000001, 0x000000a4, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000002c, 0x00000050, 0x0000000b,
+ 0x0100086a, 0x03000065, 0x001020f2, 0x00000000, 0x0400006f, 0x001020f2, 0x00000000, 0x0000e00a,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const struct vec4 sample_count = {8.0f, 8.0f, 8.0f, 8.0f};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.sample_desc.Count = 8;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, NULL, &ps, NULL);
+ pso_desc.SampleDesc.Count = desc.sample_desc.Count;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, black, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &sample_count, 0);
+
+ destroy_test_context(&context);
+}
+
+static void test_shader_sample_position(void)
+{
+ D3D12_TEXTURE_COPY_LOCATION src_location, dst_location;
+ ID3D12Resource *texture, *readback_texture;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_RESOURCE_DESC resource_desc;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ uint32_t sample_index;
+ unsigned int i;
+ D3D12_BOX box;
+ HRESULT hr;
+
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ uint index;
+ Texture2DMS<float4> t;
+
+ float4 main() : SV_Target
+ {
+ return float4(t.GetSamplePosition(index), 0, 0);
+ }
+#endif
+ 0x43425844, 0x89611945, 0x2b7e06f0, 0x953a72bb, 0x1590618f, 0x00000001, 0x000000f8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000080, 0x00000050, 0x00000020,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04002058, 0x00107000, 0x00000000,
+ 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x0900006e, 0x00102032, 0x00000000, 0x00107046,
+ 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.rt_width = desc.rt_height = 1;
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_texture_root_signature(context.device,
+ D3D12_SHADER_VISIBILITY_PIXEL, 1, 0);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+ resource_desc = ID3D12Resource_GetDesc(context.render_target);
+ resource_desc.SampleDesc.Count = 4;
+ hr = ID3D12Device_CreateCommittedResource(context.device,
+ &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+ D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&texture);
+ ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
+
+ heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 16);
+ readback_texture = create_default_texture(context.device, 4, 1, DXGI_FORMAT_R32G32B32A32_FLOAT,
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ ID3D12Device_CreateShaderResourceView(context.device, texture, NULL,
+ ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap));
+
+ transition_resource_state(command_list,
+ texture, D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+
+ for (sample_index = 0; sample_index < resource_desc.SampleDesc.Count; ++sample_index)
+ {
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, heap, 0));
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 1, &sample_index, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ src_location.pResource = context.render_target;
+ src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ src_location.SubresourceIndex = 0;
+ dst_location.pResource = readback_texture;
+ dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ dst_location.SubresourceIndex = 0;
+ set_box(&box, 0, 0, 0, 1, 1, 1);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, sample_index, 0, 0, &src_location, &box);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+ }
+
+ transition_resource_state(command_list, readback_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(readback_texture, 0, &rb, queue, command_list);
+ for (i = 0; i < resource_desc.SampleDesc.Count; ++i)
+ {
+ const struct vec4 *position = get_readback_vec4(&rb, i, 0);
+
+ vkd3d_test_set_context("Sample %u", i);
+
+ ok(-1.0f <= position->x && position->x <= 1.0f, "Unexpected x %.8e.\n", position->x);
+ ok(-1.0f <= position->y && position->y <= 1.0f, "Unexpected y %.8e.\n", position->y);
+ ok(!position->z, "Unexpected z %.8e.\n", position->z);
+ ok(!position->w, "Unexpected w %.8e.\n", position->w);
+
+ if (vkd3d_test_state.debug_level > 0)
+ trace("Sample %u position {%.8e, %.8e}.\n", i, position->x, position->y);
+
+ vkd3d_test_set_context(NULL);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12DescriptorHeap_Release(heap);
+ ID3D12Resource_Release(texture);
+ ID3D12Resource_Release(readback_texture);
+ destroy_test_context(&context);
+}
+
+static void test_shader_eval_attribute(void)
+{
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ HRESULT hr;
+
+ static const DWORD vs_code[] =
+ {
+#if 0
+ void main(uint id : SV_VertexID, out float4 position : SV_Position,
+ out float2 attr : ATTR, out centroid float2 ref : REF)
+ {
+ float2 coords = float2((id << 1) & 2, id & 2);
+ position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);
+ attr = ref = position.xy;
+ }
+#endif
+ 0x43425844, 0x9289815f, 0xc6ff580d, 0xa7184c61, 0x4920e2eb, 0x00000001, 0x0000021c, 0x00000003,
+ 0x0000002c, 0x00000060, 0x000000d0, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978,
+ 0x4e47534f, 0x00000068, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000c03,
+ 0x00000061, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000c03, 0x505f5653, 0x7469736f,
+ 0x006e6f69, 0x52545441, 0x46455200, 0xababab00, 0x58454853, 0x00000144, 0x00010050, 0x00000051,
+ 0x0100086a, 0x04000060, 0x00101012, 0x00000000, 0x00000006, 0x04000067, 0x001020f2, 0x00000000,
+ 0x00000001, 0x03000065, 0x00102032, 0x00000001, 0x03000065, 0x00102032, 0x00000002, 0x02000068,
+ 0x00000001, 0x0b00008c, 0x00100012, 0x00000000, 0x00004001, 0x00000001, 0x00004001, 0x00000001,
+ 0x0010100a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100042, 0x00000000, 0x0010100a,
+ 0x00000000, 0x00004001, 0x00000002, 0x05000056, 0x00100032, 0x00000000, 0x00100086, 0x00000000,
+ 0x0f000032, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x40000000, 0xc0000000,
+ 0x00000000, 0x00000000, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, 0x05000036,
+ 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002,
+ 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x05000036, 0x00102032, 0x00000001, 0x00100046,
+ 0x00000000, 0x05000036, 0x00102032, 0x00000002, 0x00100046, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_eval_sample_index_code[] =
+ {
+#if 0
+ float4 main(float4 p : SV_Position, float2 attr : ATTR,
+ sample float2 ref : REF, uint sample_id : SV_SampleIndex) : SV_Target
+ {
+ return float4(EvaluateAttributeAtSample(attr, sample_id) - ref, 0, 1);
+ }
+#endif
+ 0x43425844, 0x65f268a1, 0x2c1a3d53, 0xd39689a5, 0x2f556a12, 0x00000001, 0x000001a4, 0x00000003,
+ 0x0000002c, 0x000000c0, 0x000000f4, 0x4e475349, 0x0000008c, 0x00000004, 0x00000008, 0x00000068,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000303, 0x00000079, 0x00000000, 0x00000000, 0x00000003, 0x00000002,
+ 0x00000303, 0x0000007d, 0x00000000, 0x0000000a, 0x00000001, 0x00000003, 0x00000101, 0x505f5653,
+ 0x7469736f, 0x006e6f69, 0x52545441, 0x46455200, 0x5f565300, 0x706d6153, 0x6e49656c, 0x00786564,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a8, 0x00000050,
+ 0x0000002a, 0x0100086a, 0x03001062, 0x00101032, 0x00000001, 0x03003062, 0x00101032, 0x00000002,
+ 0x04000863, 0x00101012, 0x00000003, 0x0000000a, 0x03000065, 0x001020f2, 0x00000000, 0x02000068,
+ 0x00000001, 0x070000cc, 0x00100032, 0x00000000, 0x00101046, 0x00000001, 0x0010100a, 0x00000003,
+ 0x08000000, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x80101046, 0x00000041, 0x00000002,
+ 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000,
+ 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_eval_sample_index = {ps_eval_sample_index_code, sizeof(ps_eval_sample_index_code)};
+ static const DWORD vs_eval_centroid_code[] =
+ {
+#if 0
+ void main(uint id : SV_VertexID, out float4 position : SV_Position,
+ out float2 attr : ATTR, out float2 attr2 : ATTR2, out centroid float2 ref : REF)
+ {
+ float2 coords = float2((id << 1) & 2, id & 2);
+ position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);
+ attr = attr2 = ref = position.xy;
+ }
+#endif
+ 0x43425844, 0xed41033d, 0xa2906698, 0x319dcb84, 0x41750935, 0x00000001, 0x00000240, 0x00000003,
+ 0x0000002c, 0x00000060, 0x000000e8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978,
+ 0x4e47534f, 0x00000080, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000c03,
+ 0x00000074, 0x00000002, 0x00000000, 0x00000003, 0x00000001, 0x0000030c, 0x00000079, 0x00000000,
+ 0x00000000, 0x00000003, 0x00000002, 0x00000c03, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52545441,
+ 0x46455200, 0xababab00, 0x58454853, 0x00000150, 0x00010050, 0x00000054, 0x0100086a, 0x04000060,
+ 0x00101012, 0x00000000, 0x00000006, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065,
+ 0x00102032, 0x00000001, 0x03000065, 0x001020c2, 0x00000001, 0x03000065, 0x00102032, 0x00000002,
+ 0x02000068, 0x00000001, 0x0b00008c, 0x00100012, 0x00000000, 0x00004001, 0x00000001, 0x00004001,
+ 0x00000001, 0x0010100a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100042, 0x00000000,
+ 0x0010100a, 0x00000000, 0x00004001, 0x00000002, 0x05000056, 0x00100032, 0x00000000, 0x00100086,
+ 0x00000000, 0x0f000032, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x40000000,
+ 0xc0000000, 0x00000000, 0x00000000, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000,
+ 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000,
+ 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x05000036, 0x001020f2, 0x00000001,
+ 0x00100446, 0x00000000, 0x05000036, 0x00102032, 0x00000002, 0x00100046, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs_eval_centroid = {vs_eval_centroid_code, sizeof(vs_eval_centroid_code)};
+ static const DWORD ps_eval_centroid_code[] =
+ {
+#if 0
+ float4 main(float4 p : SV_Position, float2 attr : ATTR, float2 attr2 : ATTR2, centroid float2 ref : REF) : SV_Target
+ {
+ return float4(EvaluateAttributeCentroid(attr) - ref, 0, 1);
+ }
+#endif
+ 0x43425844, 0x8ec53803, 0xdfd9505b, 0x8d4ce8ad, 0xbbefe3d4, 0x00000001, 0x00000180, 0x00000003,
+ 0x0000002c, 0x000000b4, 0x000000e8, 0x4e475349, 0x00000080, 0x00000004, 0x00000008, 0x00000068,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000,
+ 0x00000003, 0x00000001, 0x00000303, 0x00000074, 0x00000002, 0x00000000, 0x00000003, 0x00000001,
+ 0x0000000c, 0x00000079, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000303, 0x505f5653,
+ 0x7469736f, 0x006e6f69, 0x52545441, 0x46455200, 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001,
+ 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653,
+ 0x65677261, 0xabab0074, 0x58454853, 0x00000090, 0x00000050, 0x00000024, 0x0100086a, 0x03001062,
+ 0x00101032, 0x00000001, 0x03001862, 0x00101032, 0x00000002, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x050000cd, 0x00100032, 0x00000000, 0x00101046, 0x00000001, 0x08000000,
+ 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x80101046, 0x00000041, 0x00000002, 0x08000036,
+ 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_eval_centroid = {ps_eval_centroid_code, sizeof(ps_eval_centroid_code)};
+ static const struct vec4 expected_vec4 = {0.0f, 0.0f, 0.0f, 1.0f};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+ if (use_warp_device)
+ {
+ skip("Sample shading tests fail on WARP.\n");
+ return;
+ }
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.rt_width = desc.rt_height = 32;
+ desc.sample_desc.Count = 4;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, &vs, &ps_eval_sample_index, NULL);
+ pso_desc.SampleDesc.Count = desc.sample_desc.Count;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RESOLVE_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12PipelineState_Release(context.pipeline_state);
+ pso_desc.VS = vs_eval_centroid;
+ pso_desc.PS = ps_eval_centroid;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE);
+ check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4, 0);
+
+ destroy_test_context(&context);
+}
+
+static void test_primitive_restart(void)
+{
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct test_context context;
+ D3D12_INDEX_BUFFER_VIEW ibv;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ unsigned int index_count;
+ ID3D12Resource *ib, *vb;
+ size_t buffer_size;
+ unsigned int i;
+ D3D12_BOX box;
+ HRESULT hr;
+ void *ptr;
+
+ static const DWORD vs_code[] =
+ {
+#if 0
+ float4 main(int4 p : POSITION) : SV_Position
+ {
+ return p;
+ }
+#endif
+ 0x43425844, 0x3fd50ab1, 0x580a1d14, 0x28f5f602, 0xd1083e3a, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040,
+ 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001,
+ 0x0500002b, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const struct
+ {
+ int8_t x, y;
+ }
+ quad[] =
+ {
+ {-1, -1},
+ {-1, 1},
+ { 1, -1},
+ { 1, 1},
+ };
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"position", 0, DXGI_FORMAT_R8G8_SINT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const uint16_t indices16[] = {0, 1, 2, 3};
+ static const uint32_t indices[] = {0, 1, 2, 3};
+ static const uint16_t indices16_max[] = {0, 1, 2, 0xffff};
+ static const uint32_t indices_max16[] = {0, 1, 2, 0xffff};
+ static const uint16_t indices16_restart[] = {0, 1, 2, 0xffff, 2, 1, 3};
+ static const uint32_t indices_restart[] = {0, 1, 2, 0xffffffff, 2, 1, 3};
+ static const struct
+ {
+ D3D12_INDEX_BUFFER_STRIP_CUT_VALUE strip_cut_value;
+ DXGI_FORMAT ib_format;
+ const void *indices;
+ size_t indices_size;
+ unsigned int last_index;
+ bool full_quad;
+ bool is_todo;
+ }
+ tests[] =
+ {
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true},
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true},
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true},
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, true},
+
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true},
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, false},
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16_restart, sizeof(indices16_restart), 0x0003, true},
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true},
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, false, true},
+
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true},
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true, true},
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true},
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, true},
+ {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices_restart, sizeof(indices_restart), 0x0003, true},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ context.root_signature = create_empty_root_signature(context.device,
+ D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT);
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, &vs, NULL, &input_layout);
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ buffer_size = (tests[i].last_index + 1) * sizeof(*quad);
+
+ vb = create_upload_buffer(context.device, buffer_size, NULL);
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*quad);
+ vbv.SizeInBytes = buffer_size;
+
+ pso_desc.IBStripCutValue = tests[i].strip_cut_value;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr);
+
+ ibv.Format = tests[i].ib_format;
+ ib = create_upload_buffer(context.device, tests[i].indices_size, tests[i].indices);
+ ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib);
+ ibv.SizeInBytes = tests[i].indices_size;
+ index_count = tests[i].indices_size / format_size(ibv.Format);
+
+ hr = ID3D12Resource_Map(vb, 0, NULL, &ptr);
+ ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr);
+ memcpy(ptr, quad, (ARRAY_SIZE(quad) - 1) * sizeof(*quad));
+ memcpy((BYTE *)ptr + tests[i].last_index * sizeof(*quad), &quad[ARRAY_SIZE(quad) - 1], sizeof(*quad));
+ ID3D12Resource_Unmap(vb, 0, NULL);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, index_count, 1, 0, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ if (tests[i].full_quad)
+ {
+ todo_if(tests[i].is_todo)
+ check_readback_data_uint(&rb, NULL, 0xff00ff00, 0);
+ }
+ else
+ {
+ set_box(&box, 16, 0, 0, 32, 10, 1);
+ todo_if(tests[i].is_todo)
+ check_readback_data_uint(&rb, &box, 0xffffffff, 0);
+ set_box(&box, 0, 16, 0, 16, 32, 1);
+ check_readback_data_uint(&rb, &box, 0xff00ff00, 0);
+ }
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ ID3D12Resource_Release(ib);
+ ID3D12Resource_Release(vb);
+ ID3D12PipelineState_Release(context.pipeline_state);
+ context.pipeline_state = NULL;
+ }
+ vkd3d_test_set_context(NULL);
+
+ destroy_test_context(&context);
+}
+
+static void test_vertex_shader_stream_output(void)
+{
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12Resource *counter_buffer, *so_buffer;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv;
+ ID3D12Resource *upload_buffer;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ unsigned int counter, i;
+ const struct vec4 *data;
+ ID3D12Device *device;
+ HRESULT hr;
+
+ static const D3D12_SO_DECLARATION_ENTRY so_declaration[] =
+ {
+ {0, "SV_Position", 0, 0, 4, 0},
+ };
+ static const struct vec4 expected_output[] =
+ {
+ {-1.0f, 1.0f, 0.0f, 1.0f},
+ { 3.0f, 1.0f, 0.0f, 1.0f},
+ {-1.0f,-3.0f, 0.0f, 1.0f},
+ };
+ unsigned int strides[] = {16};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, NULL, NULL);
+ pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration);
+ pso_desc.StreamOutput.pSODeclaration = so_declaration;
+ pso_desc.StreamOutput.pBufferStrides = strides;
+ pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides);
+ pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM;
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ if (hr == E_NOTIMPL)
+ {
+ skip("Stream output is not supported.\n");
+ destroy_test_context(&context);
+ return;
+ }
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ counter = 0;
+ upload_buffer = create_upload_buffer(device, sizeof(counter), &counter);
+
+ counter_buffer = create_default_buffer(device, 32,
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ so_buffer = create_default_buffer(device, 1024,
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT);
+ sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer);
+ sobv.SizeInBytes = 1024;
+ sobv.BufferFilledSizeLocation = ID3D12Resource_GetGPUVirtualAddress(counter_buffer);
+
+ ID3D12GraphicsCommandList_CopyBufferRegion(command_list, counter_buffer, 0,
+ upload_buffer, 0, sizeof(counter));
+
+ transition_resource_state(command_list, counter_buffer,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT);
+
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, counter_buffer,
+ D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, so_buffer,
+ D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_buffer_readback_with_command_list(counter_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ counter = get_readback_uint(&rb, 0, 0, 0);
+ ok(counter == 3 * sizeof(struct vec4), "Got unexpected counter %u.\n", counter);
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+ get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list);
+ for (i = 0; i < ARRAY_SIZE(expected_output); ++i)
+ {
+ const struct vec4 *expected = &expected_output[i];
+ data = get_readback_vec4(&rb, i, 0);
+ ok(compare_vec4(data, expected, 1),
+ "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n",
+ data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w);
+ }
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(counter_buffer);
+ ID3D12Resource_Release(upload_buffer);
+ ID3D12Resource_Release(so_buffer);
+ destroy_test_context(&context);
+}
+
+static void test_read_write_subresource(void)
+{
+ D3D12_TEXTURE_COPY_LOCATION src_location, dst_location;
+ uint32_t *dst_buffer, *zero_buffer, *ptr;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_SUBRESOURCE_DATA texture_data;
+ D3D12_RESOURCE_DESC resource_desc;
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12Resource *src_texture;
+ ID3D12Resource *dst_texture;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *rb_buffer;
+ unsigned int buffer_size;
+ unsigned int slice_pitch;
+ unsigned int x, y, z, i;
+ unsigned int row_pitch;
+ uint32_t got, expected;
+ ID3D12Device *device;
+ D3D12_BOX box;
+ HRESULT hr;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ row_pitch = 128 * sizeof(unsigned int);
+ slice_pitch = row_pitch * 100;
+ buffer_size = slice_pitch * 64;
+
+ /* Buffers are not supported */
+ rb_buffer = create_readback_buffer(device, buffer_size);
+ dst_buffer = malloc(buffer_size);
+ ok(dst_buffer, "Failed to allocate memory.\n");
+ zero_buffer = malloc(buffer_size);
+ ok(zero_buffer, "Failed to allocate memory.\n");
+ memset(zero_buffer, 0, buffer_size);
+
+ set_box(&box, 0, 0, 0, 1, 1, 1);
+ hr = ID3D12Resource_WriteToSubresource(rb_buffer, 0, &box, dst_buffer, row_pitch, slice_pitch);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12Resource_ReadFromSubresource(rb_buffer, dst_buffer, row_pitch, slice_pitch, 0, &box);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ ID3D12Resource_Release(rb_buffer);
+
+ /* Only texture on custom heaps is legal for ReadFromSubresource/WriteToSubresource */
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 128;
+ resource_desc.Height = 100;
+ resource_desc.DepthOrArraySize = 64;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = 0;
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_CUSTOM;
+ heap_properties.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_BACK;
+ heap_properties.MemoryPoolPreference = D3D12_MEMORY_POOL_L0;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&src_texture);
+ if (FAILED(hr))
+ {
+ skip("Failed to create texture on custom heap.\n");
+ goto done;
+ }
+
+ /* Invalid box */
+ set_box(&box, 0, 0, 0, 128, 100, 65);
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ set_box(&box, 0, 0, 65, 128, 100, 65);
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ set_box(&box, 128, 0, 0, 128, 100, 65);
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ /* NULL box */
+ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, dst_buffer, row_pitch, slice_pitch);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, NULL);
+ todo_if(is_nvidia_device(device))
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ /* Empty box */
+ set_box(&box, 128, 100, 64, 128, 100, 64);
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ set_box(&box, 0, 0, 0, 0, 0, 0);
+ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ for (i = 0; i < 2; ++i)
+ {
+ vkd3d_test_set_context("Test %u", i);
+
+ for (z = 0; z < 64; ++z)
+ {
+ for (y = 0; y < 100; ++y)
+ {
+ for (x = 0; x < 128; ++x)
+ {
+ ptr = &dst_buffer[z * 128 * 100 + y * 128 + x];
+ if (x < 2 && y< 2 && z < 2) /* Region 1 */
+ *ptr = (z + 1) << 16 | (y + 1) << 8 | (x + 1);
+ else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */
+ *ptr = (z + 2) << 16 | (y + 2) << 8 | (x + 2);
+ else
+ *ptr = 0xdeadbeef;
+ }
+ }
+ }
+
+ if (i)
+ {
+ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, zero_buffer, row_pitch, slice_pitch);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ /* Write region 1 */
+ set_box(&box, 0, 0, 0, 2, 2, 2);
+ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ /* Write region 2 */
+ set_box(&box, 2, 2, 2, 11, 13, 17);
+ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2],
+ row_pitch, slice_pitch);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ }
+ else
+ {
+ /* Upload the test data */
+ transition_resource_state(command_list, src_texture,
+ D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_STATE_COPY_DEST);
+ texture_data.pData = dst_buffer;
+ texture_data.RowPitch = row_pitch;
+ texture_data.SlicePitch = slice_pitch;
+ upload_texture_data(src_texture, &texture_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, src_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COMMON);
+ }
+
+ memset(dst_buffer, 0, buffer_size);
+
+ /* Read region 1 */
+ set_box(&box, 0, 0, 0, 2, 2, 2);
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box);
+ todo_if(is_nvidia_device(device))
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ /* Read region 2 */
+ set_box(&box, 2, 2, 2, 11, 13, 17);
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch,
+ slice_pitch, 0, &box);
+ todo_if(is_nvidia_device(device))
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ for (z = 0; z < 64; ++z)
+ {
+ for (y = 0; y < 100; ++y)
+ {
+ for (x = 0; x < 128; ++x)
+ {
+ if (x < 2 && y < 2 && z < 2) /* Region 1 */
+ expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1);
+ else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */
+ expected = (z + 2) << 16 | (y + 2) << 8 | (x + 2);
+ else /* Untouched */
+ expected = 0;
+
+ got = dst_buffer[z * 128 * 100 + y * 128 + x];
+ if (got != expected)
+ break;
+ }
+ if (got != expected)
+ break;
+ }
+ if (got != expected)
+ break;
+ }
+ todo_if(is_nvidia_device(device))
+ ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected);
+ }
+ vkd3d_test_set_context(NULL);
+
+ /* Test layout is the same */
+ dst_texture = create_default_texture3d(device, 128, 100, 64, 1, DXGI_FORMAT_R8G8B8A8_UNORM, 0,
+ D3D12_RESOURCE_STATE_COPY_DEST);
+ memset(dst_buffer, 0, buffer_size);
+ texture_data.pData = dst_buffer;
+ texture_data.RowPitch = row_pitch;
+ texture_data.SlicePitch = slice_pitch;
+ upload_texture_data(dst_texture, &texture_data, 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+
+ src_location.pResource = src_texture;
+ src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ src_location.SubresourceIndex = 0;
+ dst_location.pResource = dst_texture;
+ dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ dst_location.SubresourceIndex = 0;
+ set_box(&box, 0, 0, 0, 128, 100, 64);
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, &box);
+
+ transition_resource_state(command_list, dst_texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_texture_readback_with_command_list(dst_texture, 0, &rb, queue, command_list);
+ for (z = 0; z < 64; ++z)
+ {
+ for (y = 0; y < 100; ++y)
+ {
+ for (x = 0; x < 128; ++x)
+ {
+ if (x < 2 && y < 2 && z < 2) /* Region 1 */
+ expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1);
+ else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */
+ expected = (z + 2) << 16 | (y + 2) << 8 | (x + 2);
+ else /* Untouched */
+ expected = 0;
+
+ got = get_readback_uint(&rb, x, y, z);
+ if (got != expected)
+ break;
+ }
+ if (got != expected)
+ break;
+ }
+ if (got != expected)
+ break;
+ }
+ ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected);
+ release_resource_readback(&rb);
+
+ ID3D12Resource_Release(src_texture);
+ ID3D12Resource_Release(dst_texture);
+
+ /* Invalid box */
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Alignment = 0;
+ resource_desc.Width = 64;
+ resource_desc.Height = 32;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_BC1_UNORM;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = 0;
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_CUSTOM;
+ heap_properties.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_BACK;
+ heap_properties.MemoryPoolPreference = D3D12_MEMORY_POOL_L0;
+ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&src_texture);
+ ok(hr == S_OK, "Failed to create resource, hr %#x.\n", hr);
+
+ /* Unaligned coordinates for BC format */
+ set_box(&box, 0, 0, 0, 2, 2, 1);
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ set_box(&box, 2, 2, 0, 4, 4, 1);
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ set_box(&box, 2, 2, 0, 6, 6, 1);
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ /* Invalid coordinates for resource dimensions */
+ set_box(&box, 0, 0, 0, 64, 32, 2);
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ set_box(&box, 0, 0, 0, 68, 32, 1);
+ hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+ ID3D12Resource_Release(src_texture);
+
+done:
+ free(dst_buffer);
+ free(zero_buffer);
+ destroy_test_context(&context);
+}
+
+static void test_queue_wait(void)
+{
+ D3D12_TEXTURE_COPY_LOCATION dst_location, src_location;
+ ID3D12GraphicsCommandList *command_list;
+ ID3D12Resource *readback_buffer, *cb;
+ ID3D12CommandQueue *queue, *queue2;
+ D3D12_RESOURCE_DESC resource_desc;
+ uint64_t row_pitch, buffer_size;
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ ID3D12Fence *fence, *fence2;
+ struct test_context context;
+ ID3D12Device *device;
+ unsigned int ret;
+ uint64_t value;
+ float color[4];
+ HANDLE event;
+ HRESULT hr;
+
+ static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f};
+ static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const DWORD ps_code[] =
+ {
+#if 0
+ float4 color;
+
+ float4 main(float4 position : SV_POSITION) : SV_Target
+ {
+ return color;
+ }
+#endif
+ 0x43425844, 0xd18ead43, 0x8b8264c1, 0x9c0a062d, 0xfc843226, 0x00000001, 0x000000e0, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003,
+ 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050,
+ 0x00000011, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2,
+ 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ queue2 = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL);
+
+ event = create_event();
+ ok(event, "Failed to create event.\n");
+
+ hr = ID3D12Device_CreateFence(device, 1, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence);
+ ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence2);
+ ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+
+ context.root_signature = create_cb_root_signature(context.device,
+ 0, D3D12_SHADER_VISIBILITY_PIXEL, D3D12_ROOT_SIGNATURE_FLAG_NONE);
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ cb = create_upload_buffer(device, sizeof(color), NULL);
+
+ resource_desc = ID3D12Resource_GetDesc(context.render_target);
+
+ row_pitch = align(resource_desc.Width * format_size(resource_desc.Format), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT);
+ buffer_size = row_pitch * resource_desc.Height;
+ readback_buffer = create_readback_buffer(device, buffer_size);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0,
+ ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ dst_location.pResource = readback_buffer;
+ dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT;
+ dst_location.PlacedFootprint.Offset = 0;
+ dst_location.PlacedFootprint.Footprint.Format = resource_desc.Format;
+ dst_location.PlacedFootprint.Footprint.Width = resource_desc.Width;
+ dst_location.PlacedFootprint.Footprint.Height = resource_desc.Height;
+ dst_location.PlacedFootprint.Footprint.Depth = 1;
+ dst_location.PlacedFootprint.Footprint.RowPitch = row_pitch;
+ src_location.pResource = context.render_target;
+ src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+ src_location.SubresourceIndex = 0;
+ ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
+
+ /* Wait() with signaled fence */
+ update_buffer_data(cb, 0, sizeof(green), &green);
+ queue_wait(queue, fence, 1);
+ exec_command_list(queue, command_list);
+ wait_queue_idle(device, queue);
+ init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch);
+ check_readback_data_uint(&rb, NULL, 0xff00ff00, 0);
+ release_resource_readback(&rb);
+
+ if (!vkd3d_test_platform_is_windows())
+ {
+ skip("Wait() is not implemented yet.\n"); /* FIXME */
+ goto skip_tests;
+ }
+
+ /* Wait() before CPU signal */
+ update_buffer_data(cb, 0, sizeof(blue), &blue);
+ queue_wait(queue, fence, 2);
+ exec_command_list(queue, command_list);
+ queue_signal(queue, fence2, 1);
+ hr = ID3D12Fence_SetEventOnCompletion(fence2, 1, event);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch);
+ check_readback_data_uint(&rb, NULL, 0xff00ff00, 0);
+ release_resource_readback(&rb);
+ value = ID3D12Fence_GetCompletedValue(fence2);
+ ok(value == 0, "Got unexpected value %"PRIu64".\n", value);
+
+ hr = ID3D12Fence_Signal(fence, 2);
+ ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+ ret = wait_event(event, INFINITE);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch);
+ check_readback_data_uint(&rb, NULL, 0xffff0000, 0);
+ release_resource_readback(&rb);
+ value = ID3D12Fence_GetCompletedValue(fence2);
+ ok(value == 1, "Got unexpected value %"PRIu64".\n", value);
+
+ /* Wait() before GPU signal */
+ update_buffer_data(cb, 0, sizeof(green), &green);
+ queue_wait(queue, fence, 3);
+ exec_command_list(queue, command_list);
+ queue_signal(queue, fence2, 2);
+ hr = ID3D12Fence_SetEventOnCompletion(fence2, 2, event);
+ ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr);
+ ret = wait_event(event, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch);
+ check_readback_data_uint(&rb, NULL, 0xffff0000, 0);
+ release_resource_readback(&rb);
+ value = ID3D12Fence_GetCompletedValue(fence2);
+ ok(value == 1, "Got unexpected value %"PRIu64".\n", value);
+
+ queue_signal(queue2, fence, 3);
+ ret = wait_event(event, INFINITE);
+ ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret);
+ ret = wait_event(event, 0);
+ ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret);
+ init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch);
+ check_readback_data_uint(&rb, NULL, 0xff00ff00, 0);
+ release_resource_readback(&rb);
+ value = ID3D12Fence_GetCompletedValue(fence2);
+ ok(value == 2, "Got unexpected value %"PRIu64".\n", value);
+
+ /* update constant buffer after Wait() */
+ queue_wait(queue, fence, 5);
+ exec_command_list(queue, command_list);
+ hr = ID3D12Fence_Signal(fence, 4);
+ ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+ update_buffer_data(cb, 0, sizeof(blue), &blue);
+ hr = ID3D12Fence_Signal(fence, 5);
+ ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+ wait_queue_idle(device, queue);
+ init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch);
+ check_readback_data_uint(&rb, NULL, 0xffff0000, 0);
+ release_resource_readback(&rb);
+
+ hr = ID3D12Fence_Signal(fence, 6);
+ ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+ update_buffer_data(cb, 0, sizeof(green), &green);
+ exec_command_list(queue, command_list);
+ wait_queue_idle(device, queue);
+ init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch);
+ check_readback_data_uint(&rb, NULL, 0xff00ff00, 0);
+ release_resource_readback(&rb);
+
+skip_tests:
+ /* Signal() and Wait() in the same command queue */
+ update_buffer_data(cb, 0, sizeof(blue), &blue);
+ queue_signal(queue, fence, 7);
+ queue_wait(queue, fence, 7);
+ exec_command_list(queue, command_list);
+ wait_queue_idle(device, queue);
+ init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch);
+ check_readback_data_uint(&rb, NULL, 0xffff0000, 0);
+ release_resource_readback(&rb);
+
+ value = ID3D12Fence_GetCompletedValue(fence);
+ ok(value == 7, "Got unexpected value %"PRIu64".\n", value);
+
+ destroy_event(event);
+ ID3D12Fence_Release(fence);
+ ID3D12Fence_Release(fence2);
+ ID3D12Resource_Release(cb);
+ ID3D12CommandQueue_Release(queue2);
+ ID3D12Resource_Release(readback_buffer);
+ destroy_test_context(&context);
+}
+
+static void test_graphics_compute_queue_synchronization(void)
+{
+ ID3D12GraphicsCommandList *graphics_lists[2], *compute_lists[2];
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ ID3D12PipelineState *compute_pipeline_state;
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ ID3D12CommandQueue *queue, *compute_queue;
+ ID3D12DescriptorHeap *cpu_heap, *gpu_heap;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ ID3D12CommandAllocator *allocators[3];
+ struct test_context_desc desc;
+ struct resource_readback rb;
+ struct test_context context;
+ ID3D12Fence *fence, *fence2;
+ ID3D12Resource *buffer;
+ ID3D12Device *device;
+ uint32_t value;
+ unsigned int i;
+ HRESULT hr;
+
+ unsigned int clear_value[4] = {0};
+ static const DWORD cs_code[] =
+ {
+#if 0
+ uint expected_value;
+ RWByteAddressBuffer u : register(u1);
+
+ [numthreads(64, 1, 1)]
+ void main(void)
+ {
+ u.InterlockedCompareStore(0, expected_value, expected_value + 10);
+ }
+#endif
+ 0x43425844, 0x7909aab0, 0xf8576455, 0x58f9dd61, 0x3e7e64f0, 0x00000001, 0x000000e0, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x0000008c, 0x00050050, 0x00000023, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300009d, 0x0011e000, 0x00000001, 0x02000068,
+ 0x00000001, 0x0400009b, 0x00000040, 0x00000001, 0x00000001, 0x0800001e, 0x00100012, 0x00000000,
+ 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x0000000a, 0x0a0000ac, 0x0011e000, 0x00000001,
+ 0x00004001, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e,
+ };
+ static const DWORD ps_code[] =
+ {
+#if 0
+ uint expected_value;
+ RWByteAddressBuffer u;
+
+ float4 main(void) : SV_Target
+ {
+ u.InterlockedCompareStore(0, expected_value, expected_value + 2);
+ return float4(0, 1, 0, 1);
+ }
+#endif
+ 0x43425844, 0x82fbce04, 0xa014204c, 0xc4d46d91, 0x1081c7a7, 0x00000001, 0x00000120, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a8, 0x00000050, 0x0000002a,
+ 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300009d, 0x0011e000, 0x00000001,
+ 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0800001e, 0x00100012, 0x00000000,
+ 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0a0000ac, 0x0011e000, 0x00000001,
+ 0x00004001, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0010000a, 0x00000000, 0x08000036,
+ 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_root_signature = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ queue = context.queue;
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[0].Descriptor.ShaderRegister = 1;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
+ root_parameters[1].Constants.ShaderRegister = 0;
+ root_parameters[1].Constants.RegisterSpace = 0;
+ root_parameters[1].Constants.Num32BitValues = 1;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);
+ root_signature_desc.pParameters = root_parameters;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ compute_pipeline_state = create_compute_pipeline_state(device, context.root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+ context.pipeline_state = create_pipeline_state(context.device,
+ context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL);
+
+ compute_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COMPUTE, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL);
+ hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence);
+ ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence2);
+ ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+
+ buffer = create_default_buffer(device, 1024,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ &IID_ID3D12CommandAllocator, (void **)&allocators[0]);
+ ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+ allocators[0], NULL, &IID_ID3D12GraphicsCommandList, (void **)&graphics_lists[0]);
+ ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr);
+
+ graphics_lists[1] = context.list;
+ ID3D12GraphicsCommandList_AddRef(graphics_lists[1]);
+
+ for (i = 0; i < ARRAY_SIZE(compute_lists); ++i)
+ {
+ hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_COMPUTE,
+ &IID_ID3D12CommandAllocator, (void **)&allocators[i + 1]);
+ ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr);
+ hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_COMPUTE,
+ allocators[i + 1], NULL, &IID_ID3D12GraphicsCommandList, (void **)&compute_lists[i]);
+ ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr);
+ }
+
+ cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ gpu_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = DXGI_FORMAT_R32_UINT;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.NumElements = 1024 / sizeof(uint32_t);
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, cpu_heap, 0));
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc,
+ get_cpu_descriptor_handle(&context, gpu_heap, 0));
+
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(compute_lists[0],
+ get_gpu_descriptor_handle(&context, gpu_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_heap, 0),
+ buffer, clear_value, 0, NULL);
+ uav_barrier(compute_lists[0], buffer);
+
+ value = 0;
+ for (i = 0; i < ARRAY_SIZE(compute_lists); ++i)
+ {
+ command_list = compute_lists[i];
+
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, compute_pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(buffer));
+ ID3D12GraphicsCommandList_SetComputeRoot32BitConstants(command_list, 1, 1, &value, 0);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
+
+ value += 10;
+
+ command_list = graphics_lists[i];
+
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootUnorderedAccessView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(buffer));
+ ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 1, &value, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ hr = ID3D12GraphicsCommandList_Close(command_list);
+ ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
+
+ value += 2;
+ }
+
+ exec_command_list(compute_queue, compute_lists[0]);
+ queue_signal(compute_queue, fence, 1);
+
+ queue_wait(queue, fence, 1);
+ exec_command_list(queue, graphics_lists[0]);
+ queue_signal(queue, fence2, 1);
+
+ queue_wait(compute_queue, fence2, 1);
+ exec_command_list(compute_queue, compute_lists[1]);
+ queue_signal(compute_queue, fence, 2);
+
+ queue_wait(queue, fence, 2);
+ exec_command_list(queue, graphics_lists[1]);
+
+ hr = wait_for_fence(fence2, 1);
+ ok(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr);
+ reset_command_list(graphics_lists[0], allocators[0]);
+ command_list = graphics_lists[0];
+
+ transition_resource_state(command_list, buffer,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ value = get_readback_uint(&rb, 0, 0, 0);
+ ok(value == 24, "Got unexpected value %u.\n", value);
+ release_resource_readback(&rb);
+
+ ID3D12DescriptorHeap_Release(cpu_heap);
+ ID3D12DescriptorHeap_Release(gpu_heap);
+ for (i = 0; i < ARRAY_SIZE(graphics_lists); ++i)
+ ID3D12GraphicsCommandList_Release(graphics_lists[i]);
+ for (i = 0; i < ARRAY_SIZE(compute_lists); ++i)
+ ID3D12GraphicsCommandList_Release(compute_lists[i]);
+ for (i = 0; i < ARRAY_SIZE(allocators); ++i)
+ ID3D12CommandAllocator_Release(allocators[i]);
+ ID3D12Fence_Release(fence);
+ ID3D12Fence_Release(fence2);
+ ID3D12Resource_Release(buffer);
+ ID3D12CommandQueue_Release(compute_queue);
+ ID3D12PipelineState_Release(compute_pipeline_state);
+ destroy_test_context(&context);
+}
+
+static void test_early_depth_stencil_tests(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ ID3D12DescriptorHeap *cpu_heap, *gpu_heap;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_DESCRIPTOR_RANGE descriptor_range;
+ D3D12_ROOT_PARAMETER root_parameter;
+ struct depth_stencil_resource ds;
+ struct test_context_desc desc;
+ struct test_context context;
+ ID3D12CommandQueue *queue;
+ ID3D12Resource *texture;
+ HRESULT hr;
+
+ static const DWORD ps_code[] =
+ {
+#if 0
+ RWTexture2D<int> u;
+
+ [earlydepthstencil]
+ void main()
+ {
+ InterlockedAdd(u[uint2(0, 0)], 1);
+ }
+#endif
+ 0x43425844, 0xd8c9f845, 0xadb9dbe2, 0x4e8aea86, 0x80f0b053, 0x00000001, 0x0000009c, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000048, 0x00000050, 0x00000012, 0x0100286a,
+ 0x0400189c, 0x0011e000, 0x00000000, 0x00003333, 0x0a0000ad, 0x0011e000, 0x00000000, 0x00004002,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004001, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
+ static const UINT values[4] = {0};
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+ descriptor_range.NumDescriptors = 1;
+ descriptor_range.BaseShaderRegister = 0;
+ descriptor_range.RegisterSpace = 0;
+ descriptor_range.OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+ root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameter.DescriptorTable.NumDescriptorRanges = 1;
+ root_parameter.DescriptorTable.pDescriptorRanges = &descriptor_range;
+ root_parameter.ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = &root_parameter;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
+ hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL);
+ pso_desc.NumRenderTargets = 0;
+ pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT;
+ pso_desc.DepthStencilState.DepthEnable = true;
+ pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ZERO;
+ pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL;
+ hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+
+ init_depth_stencil(&ds, context.device, 1, 1, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL);
+ set_rect(&context.scissor_rect, 0, 0, 1, 1);
+
+ texture = create_default_texture(context.device, 1, 1, DXGI_FORMAT_R32_SINT,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ cpu_heap = create_cpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ gpu_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ ID3D12Device_CreateUnorderedAccessView(context.device, texture, NULL, NULL,
+ get_cpu_descriptor_handle(&context, cpu_heap, 0));
+ ID3D12Device_CreateUnorderedAccessView(context.device, texture, NULL, NULL,
+ get_cpu_descriptor_handle(&context, gpu_heap, 0));
+
+ set_viewport(&context.viewport, 0.0f, 0.0f, 1.0f, 100.0f, 0.5f, 0.5f);
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, gpu_heap, 0));
+
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_heap, 0), texture, values, 0, NULL);
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 0.6f, 0, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(ds.texture, 0, queue, command_list, 0.6f, 1);
+ reset_command_list(command_list, context.allocator);
+ check_sub_resource_uint(texture, 0, queue, command_list, 2, 1);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, false, &ds.dsv_handle);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0,
+ get_gpu_descriptor_handle(&context, gpu_heap, 0));
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 0.3f, 0, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 0.55f, 0, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle,
+ D3D12_CLEAR_FLAG_DEPTH, 0.5f, 0, 0, NULL);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ transition_resource_state(command_list, ds.texture,
+ D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_float(ds.texture, 0, queue, command_list, 0.5f, 1);
+ reset_command_list(command_list, context.allocator);
+ check_sub_resource_uint(texture, 0, queue, command_list, 4, 1);
+
+ ID3D12Resource_Release(texture);
+ ID3D12DescriptorHeap_Release(cpu_heap);
+ ID3D12DescriptorHeap_Release(gpu_heap);
+ destroy_depth_stencil(&ds);
+ destroy_test_context(&context);
+}
+
+static void prepare_instanced_draw(struct test_context *context)
+{
+ ID3D12GraphicsCommandList *command_list = context->list;
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context->pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect);
+}
+
+static void test_conditional_rendering(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ ID3D12Resource *conditions, *upload_buffer;
+ ID3D12CommandSignature *command_signature;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_ROOT_PARAMETER root_parameters[2];
+ ID3D12Resource *texture, *texture_copy;
+ D3D12_RENDER_TARGET_VIEW_DESC rtv_desc;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ ID3D12PipelineState *pipeline_state;
+ ID3D12RootSignature *root_signature;
+ D3D12_RESOURCE_DESC resource_desc;
+ struct test_context context;
+ ID3D12Resource *buffer, *cb;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ unsigned int i;
+ uint32_t value;
+ HRESULT hr;
+
+ static const uint64_t predicate_args[] = {0, 1, (uint64_t)1 << 32};
+ static const uint32_t r8g8b8a8_data[] = {0x28384858, 0x39495969};
+ static const D3D12_DRAW_ARGUMENTS draw_args = {3, 1, 0, 0};
+ static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f};
+ static const float ms_color[] = {0.345f, 0.282f, 0.219f, 0.156f};
+ static const uint32_t init_value = 0xdeadbeef;
+ static const D3D12_SUBRESOURCE_DATA copy_data[] =
+ {
+ {&r8g8b8a8_data[0], sizeof(r8g8b8a8_data[0]), sizeof(r8g8b8a8_data[0])},
+ {&r8g8b8a8_data[1], sizeof(r8g8b8a8_data[1]), sizeof(r8g8b8a8_data[1])}
+ };
+ static const DWORD cs_code[] =
+ {
+#if 0
+ cbuffer cb
+ {
+ unsigned int offset;
+ unsigned int value;
+ };
+
+ RWByteAddressBuffer b;
+
+ [numthreads(1, 1, 1)]
+ void main()
+ {
+ b.Store(4 * offset, value);
+ }
+#endif
+ 0x43425844, 0xaadc5460, 0x88c27e90, 0x2acacf4e, 0x4e06019a, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000084, 0x00050050, 0x00000021, 0x0100086a,
+ 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300009d, 0x0011e000, 0x00000000, 0x02000068,
+ 0x00000001, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x08000029, 0x00100012, 0x00000000,
+ 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x080000a6, 0x0011e012, 0x00000000,
+ 0x0010000a, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e,
+ };
+ static const struct
+ {
+ uint32_t offset;
+ uint32_t value;
+ uint32_t uav_offset;
+ }
+ input = {0, 4, 0};
+
+ if (!init_test_context(&context, NULL))
+ return;
+ command_list = context.list;
+ queue = context.queue;
+
+ if (is_intel_windows_device(context.device))
+ {
+ skip("Predicated rendering is broken on Intel.\n");
+ destroy_test_context(&context);
+ return;
+ }
+
+ conditions = create_default_buffer(context.device, sizeof(predicate_args),
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(conditions, 0, sizeof(predicate_args), &predicate_args, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, conditions,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PREDICATION);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+
+ /* Skip draw on zero. */
+ prepare_instanced_draw(&context);
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* Skip draw on non-zero. */
+ prepare_instanced_draw(&context);
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions,
+ sizeof(uint64_t), D3D12_PREDICATION_OP_NOT_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ /* Don't reset predication to test automatic reset on next SetPredication() call. */
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions,
+ sizeof(uint64_t), D3D12_PREDICATION_OP_EQUAL_ZERO);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* Skip clear on zero. */
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ bug_if(is_radv_device(context.device))
+ todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0);
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* Draw on zero. */
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ prepare_instanced_draw(&context);
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* Draw on non-zero. */
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ prepare_instanced_draw(&context);
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions,
+ sizeof(uint64_t), D3D12_PREDICATION_OP_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* 64-bit conditional 0x100000000 - fails due to Vulkan 32-bit values. */
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ prepare_instanced_draw(&context);
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions,
+ 2 * sizeof(uint64_t), D3D12_PREDICATION_OP_NOT_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
+ todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0);
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* Direct3D latches the value of the predicate upon beginning predicated rendering. */
+ buffer = create_default_buffer(context.device, sizeof(predicate_args),
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ transition_resource_state(command_list, conditions,
+ D3D12_RESOURCE_STATE_PREDICATION, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ ID3D12GraphicsCommandList_CopyResource(command_list, buffer, conditions);
+ transition_resource_state(command_list,
+ buffer, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PREDICATION);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ prepare_instanced_draw(&context);
+ ID3D12GraphicsCommandList_SetPredication(command_list, buffer, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO);
+
+ transition_resource_state(command_list, buffer,
+ D3D12_RESOURCE_STATE_PREDICATION, D3D12_RESOURCE_STATE_COPY_DEST);
+ ID3D12GraphicsCommandList_CopyBufferRegion(command_list, buffer, 0, conditions, sizeof(uint64_t), sizeof(uint64_t));
+ transition_resource_state(command_list,
+ buffer, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PREDICATION);
+ transition_resource_state(command_list,
+ conditions, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PREDICATION);
+
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12Resource_Release(buffer);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* SetPredication() and upload buffer. */
+ upload_buffer = create_upload_buffer(context.device, sizeof(predicate_args), predicate_args);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ prepare_instanced_draw(&context);
+ /* Skip. */
+ ID3D12GraphicsCommandList_SetPredication(command_list, upload_buffer,
+ 0, D3D12_PREDICATION_OP_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0);
+
+ ID3D12GraphicsCommandList_SetPredication(command_list, upload_buffer,
+ 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ /* ExecuteIndirect(). */
+ buffer = create_upload_buffer(context.device, sizeof(draw_args), &draw_args);
+
+ command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW);
+
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);
+ prepare_instanced_draw(&context);
+ /* Skip. */
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 1, buffer, 0, NULL, 0);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
+ prepare_instanced_draw(&context);
+ /* Draw. */
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 1, buffer, 0, NULL, 0);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0);
+
+ ID3D12Resource_Release(buffer);
+ ID3D12CommandSignature_Release(command_signature);
+ reset_command_list(command_list, context.allocator);
+
+ /* CopyResource(). */
+ texture = create_default_texture(context.device,
+ 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_texture_data(texture, ©_data[0], 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ texture_copy = create_default_texture(context.device,
+ 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_texture_data(texture_copy, ©_data[1], 1, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+
+ /* Skip. */
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_CopyResource(command_list, texture_copy, texture);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_resource_state(command_list, texture_copy,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(texture_copy, 0, &rb, queue, command_list);
+ todo check_readback_data_uint(&rb, NULL, r8g8b8a8_data[1], 0);
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, texture_copy,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST);
+
+ /* Copy. */
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_CopyResource(command_list, texture_copy, texture);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_resource_state(command_list, texture_copy,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 0);
+
+ /* Multisample texture. */
+ ID3D12Resource_Release(texture);
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+
+ memset(&resource_desc, 0, sizeof(resource_desc));
+ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+ resource_desc.Width = 1;
+ resource_desc.Height = 1;
+ resource_desc.DepthOrArraySize = 1;
+ resource_desc.MipLevels = 1;
+ resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ resource_desc.SampleDesc.Count = 4;
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+ hr = ID3D12Device_CreateCommittedResource(context.device, &heap_properties, D3D12_HEAP_FLAG_NONE,
+ &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&texture);
+ ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
+
+ memset(&rtv_desc, 0, sizeof(rtv_desc));
+ rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMS;
+ rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+ ID3D12Device_CreateRenderTargetView(context.device, texture, &rtv_desc,
+ get_cpu_rtv_handle(&context, context.rtv_heap, 0));
+
+ reset_command_list(command_list, context.allocator);
+ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, ms_color, 0, NULL);
+
+ /* ResolveSubresource(). */
+ transition_resource_state(command_list, texture_copy,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_texture_data(texture_copy, ©_data[1], 1, queue, command_list);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, texture_copy,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_RESOLVE_DEST);
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE);
+
+ /* Skip. */
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_ResolveSubresource(command_list,
+ texture_copy, 0, texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_resource_state(command_list, texture_copy,
+ D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_texture_readback_with_command_list(texture_copy, 0, &rb, queue, command_list);
+ bug_if(is_radv_device(context.device))
+ todo check_readback_data_uint(&rb, NULL, r8g8b8a8_data[1], 0);
+ release_resource_readback(&rb);
+
+ reset_command_list(command_list, context.allocator);
+ transition_resource_state(command_list, texture_copy,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_DEST);
+
+ /* Resolve. */
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_ResolveSubresource(command_list,
+ texture_copy, 0, texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_resource_state(command_list, texture_copy,
+ D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 2);
+
+ reset_command_list(command_list, context.allocator);
+
+ /* Dispatch(). */
+ cb = create_upload_buffer(context.device, sizeof(input), &input);
+
+ buffer = create_default_buffer(context.device, 512,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST);
+ upload_buffer_data(buffer, 0, sizeof(init_value), &init_value, queue, command_list);
+ reset_command_list(command_list, context.allocator);
+ transition_sub_resource_state(command_list, buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+
+ root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+ root_parameters[0].Descriptor.ShaderRegister = 0;
+ root_parameters[0].Descriptor.RegisterSpace = 0;
+ root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
+ root_parameters[1].Descriptor.ShaderRegister = 0;
+ root_parameters[1].Descriptor.RegisterSpace = 0;
+ root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = 2;
+ root_signature_desc.pParameters = root_parameters;
+ hr = create_root_signature(context.device, &root_signature_desc, &root_signature);
+ ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+
+ pipeline_state = create_compute_pipeline_state(context.device, root_signature,
+ shader_bytecode(cs_code, sizeof(cs_code)));
+
+ for (i = 0; i < 2; ++i)
+ {
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state);
+ ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature);
+ ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list,
+ 0, ID3D12Resource_GetGPUVirtualAddress(cb));
+ ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list,
+ 1, ID3D12Resource_GetGPUVirtualAddress(buffer));
+ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, i * sizeof(uint64_t),
+ D3D12_PREDICATION_OP_EQUAL_ZERO);
+ ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1);
+ ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0);
+
+ transition_sub_resource_state(command_list, buffer, 0,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
+ value = get_readback_uint(&rb, 0, 0, 0);
+ ok(value == (!i ? init_value : input.value), "Got %#x, expected %#x.\n", value, input.value);
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+
+ transition_sub_resource_state(command_list, buffer, 0,
+ D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ }
+
+ ID3D12Resource_Release(texture);
+ ID3D12Resource_Release(texture_copy);
+ ID3D12Resource_Release(conditions);
+ ID3D12Resource_Release(cb);
+ ID3D12Resource_Release(buffer);
+ ID3D12Resource_Release(upload_buffer);
+ ID3D12RootSignature_Release(root_signature);
+ ID3D12PipelineState_Release(pipeline_state);
+ destroy_test_context(&context);
+}
+static void test_bufinfo_instruction(void)
+{
+ D3D12_ROOT_SIGNATURE_DESC root_signature_desc;
+ D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
+ const D3D12_SHADER_BYTECODE *current_shader;
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc;
+ ID3D12GraphicsCommandList *command_list;
+ D3D12_DESCRIPTOR_RANGE descriptor_range;
+ D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle;
+ D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle;
+ D3D12_INPUT_LAYOUT_DESC input_layout;
+ D3D12_ROOT_PARAMETER root_parameter;
+ struct test_context_desc desc;
+ D3D12_VERTEX_BUFFER_VIEW vbv;
+ struct test_context context;
+ ID3D12Resource *vb, *buffer;
+ ID3D12DescriptorHeap *heap;
+ ID3D12CommandQueue *queue;
+ ID3D12Device *device;
+ HRESULT hr;
+ int i;
+ static const D3D12_INPUT_ELEMENT_DESC layout_desc[] =
+ {
+ {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0},
+ };
+ static const DWORD vs_code[] =
+ {
+#if 0
+ void main(float4 in_position : POSITION, out float4 out_position : SV_POSITION)
+ {
+ out_position = in_position;
+ }
+#endif
+ 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+ 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00,
+ 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003,
+ 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040,
+ 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)};
+ static const DWORD ps_srv_raw_code[] =
+ {
+#if 0
+ ByteAddressBuffer b;
+
+ uint4 main(void) : SV_Target
+ {
+ uint width;
+ b.GetDimensions(width);
+ return width;
+ }
+#endif
+ 0x43425844, 0x934bc27a, 0x3251cc9d, 0xa129bdd3, 0xf7cedcc4, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000060, 0x00000050, 0x00000018,
+ 0x0100086a, 0x030000a1, 0x00107000, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x02000068,
+ 0x00000001, 0x87000079, 0x800002c2, 0x00199983, 0x00100012, 0x00000000, 0x00107e46, 0x00000000,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_srv_raw = {ps_srv_raw_code, sizeof(ps_srv_raw_code)};
+ static const DWORD ps_srv_structured_code[] =
+ {
+#if 0
+ StructuredBuffer<bool> b;
+
+ uint4 main(void) : SV_Target
+ {
+ uint count, stride;
+ b.GetDimensions(count, stride);
+ return uint4(count, stride, 0, 1);
+ }
+#endif
+ 0x43425844, 0x313f910c, 0x2f60c646, 0x2d87455c, 0xb9988c2c, 0x00000001, 0x000000fc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000084, 0x00000050, 0x00000021,
+ 0x0100086a, 0x040000a2, 0x00107000, 0x00000000, 0x00000004, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x87000079, 0x80002302, 0x00199983, 0x00100012, 0x00000000, 0x00107e46,
+ 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2,
+ 0x00000000, 0x00004002, 0x00000000, 0x00000004, 0x00000000, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_srv_structured = {ps_srv_structured_code, sizeof(ps_srv_structured_code)};
+ static const DWORD ps_srv_typed_code[] =
+ {
+#if 0
+ Buffer<float> b;
+
+ uint4 main(void) : SV_Target
+ {
+ uint width;
+ b.GetDimensions(width);
+ return width;
+ }
+#endif
+ 0x43425844, 0x6ae6dbb0, 0x6289d227, 0xaf4e708e, 0x111efed1, 0x00000001, 0x000000dc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, 0x00000019,
+ 0x0100086a, 0x04000858, 0x00107000, 0x00000000, 0x00005555, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x87000079, 0x80000042, 0x00155543, 0x00100012, 0x00000000, 0x00107e46,
+ 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_srv_typed = {ps_srv_typed_code, sizeof(ps_srv_typed_code)};
+ static const DWORD ps_uav_raw_code[] =
+ {
+#if 0
+ RWByteAddressBuffer b;
+
+ uint4 main(void) : SV_Target
+ {
+ uint width;
+ b.GetDimensions(width);
+ return width;
+ }
+#endif
+ 0x43425844, 0xb06e9715, 0x99733b00, 0xaa536550, 0x703a01c5, 0x00000001, 0x000000d8, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000060, 0x00000050, 0x00000018,
+ 0x0100086a, 0x0300009d, 0x0011e000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068,
+ 0x00000001, 0x87000079, 0x800002c2, 0x00199983, 0x00100012, 0x00000000, 0x0011ee46, 0x00000001,
+ 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_uav_raw = {ps_uav_raw_code, sizeof(ps_uav_raw_code)};
+ static const DWORD ps_uav_structured_code[] =
+ {
+#if 0
+ struct s
+ {
+ uint4 u;
+ bool b;
+ };
+
+ RWStructuredBuffer<s> b;
+
+ uint4 main(void) : SV_Target
+ {
+ uint count, stride;
+ b.GetDimensions(count, stride);
+ return uint4(count, stride, 0, 1);
+ }
+#endif
+ 0x43425844, 0xe1900f85, 0x13c1f338, 0xbb19865e, 0x366df28f, 0x00000001, 0x000000fc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000084, 0x00000050, 0x00000021,
+ 0x0100086a, 0x0400009e, 0x0011e000, 0x00000001, 0x00000014, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x87000079, 0x8000a302, 0x00199983, 0x00100012, 0x00000000, 0x0011ee46,
+ 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2,
+ 0x00000000, 0x00004002, 0x00000000, 0x00000014, 0x00000000, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_uav_structured = {ps_uav_structured_code, sizeof(ps_uav_structured_code)};
+ static const DWORD ps_uav_structured32_code[] =
+ {
+#if 0
+ struct s
+ {
+ uint4 u;
+ bool4 b;
+ };
+
+ RWStructuredBuffer<s> b;
+
+ uint4 main(void) : SV_Target
+ {
+ uint count, stride;
+ b.GetDimensions(count, stride);
+ return uint4(count, stride, 0, 1);
+ }
+#endif
+ 0x43425844, 0xdd87a805, 0x28090470, 0xe4fa7c4d, 0x57963f52, 0x00000001, 0x000000fc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000084, 0x00000050, 0x00000021,
+ 0x0100086a, 0x0400009e, 0x0011e000, 0x00000001, 0x00000020, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x87000079, 0x80010302, 0x00199983, 0x00100012, 0x00000000, 0x0011ee46,
+ 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2,
+ 0x00000000, 0x00004002, 0x00000000, 0x00000020, 0x00000000, 0x00000001, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_uav_structured32 = {ps_uav_structured32_code, sizeof(ps_uav_structured32_code)};
+ static const DWORD ps_uav_typed_code[] =
+ {
+#if 0
+ RWBuffer<float> b;
+
+ uint4 main(void) : SV_Target
+ {
+ uint width;
+ b.GetDimensions(width);
+ return width;
+ }
+#endif
+ 0x43425844, 0x96b39f5f, 0x5fef24c7, 0xed404a41, 0x01c9d4fe, 0x00000001, 0x000000dc, 0x00000003,
+ 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f,
+ 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+ 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, 0x00000019,
+ 0x0100086a, 0x0400089c, 0x0011e000, 0x00000001, 0x00005555, 0x03000065, 0x001020f2, 0x00000000,
+ 0x02000068, 0x00000001, 0x87000079, 0x80000042, 0x00155543, 0x00100012, 0x00000000, 0x0011ee46,
+ 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e,
+ };
+ static const D3D12_SHADER_BYTECODE ps_uav_typed = {ps_uav_typed_code, sizeof(ps_uav_typed_code)};
+ static const struct test
+ {
+ const D3D12_SHADER_BYTECODE *ps;
+ BOOL uav;
+ BOOL raw;
+ unsigned int buffer_size;
+ unsigned int buffer_structure_byte_stride;
+ DXGI_FORMAT view_format;
+ unsigned int view_element_idx;
+ unsigned int view_element_count;
+ struct uvec4 expected_result;
+ }
+ tests[] =
+ {
+ {&ps_srv_raw, false, true, 100, 0, DXGI_FORMAT_R32_TYPELESS, 0, 25, {100, 100, 100, 100}},
+ {&ps_srv_raw, false, true, 500, 0, DXGI_FORMAT_R32_TYPELESS, 64, 4, { 16, 16, 16, 16}},
+ {&ps_srv_structured, false, false, 100, 4, DXGI_FORMAT_UNKNOWN, 0, 5, { 5, 4, 0, 1}},
+ {&ps_srv_structured, false, false, 100, 4, DXGI_FORMAT_UNKNOWN, 0, 2, { 2, 4, 0, 1}},
+ {&ps_srv_structured, false, false, 400, 4, DXGI_FORMAT_UNKNOWN, 64, 2, { 2, 4, 0, 1}},
+ {&ps_srv_typed, false, false, 200, 0, DXGI_FORMAT_R32_FLOAT, 0, 50, { 50, 50, 50, 50}},
+ {&ps_srv_typed, false, false, 400, 0, DXGI_FORMAT_R32_FLOAT, 64, 1, { 1, 1, 1, 1}},
+ {&ps_srv_typed, false, false, 100, 0, DXGI_FORMAT_R16_FLOAT, 0, 50, { 50, 50, 50, 50}},
+ {&ps_srv_typed, false, false, 400, 0, DXGI_FORMAT_R16_FLOAT, 128, 2, { 2, 2, 2, 2}},
+ {&ps_uav_raw, true, true, 100, 0, DXGI_FORMAT_R32_TYPELESS, 0, 25, {100, 100, 100, 100}},
+ {&ps_uav_raw, true, true, 512, 0, DXGI_FORMAT_R32_TYPELESS, 64, 64, {256, 256, 256, 256}},
+ {&ps_uav_structured, true, false, 100, 20, DXGI_FORMAT_UNKNOWN, 0, 5, { 5, 20, 0, 1}},
+ {&ps_uav_structured, true, false, 100, 20, DXGI_FORMAT_UNKNOWN, 0, 2, { 2, 20, 0, 1}},
+ {&ps_uav_structured32, true, false, 320, 32, DXGI_FORMAT_UNKNOWN, 8, 2, { 2, 32, 0, 1}},
+ {&ps_uav_typed, true, false, 200, 0, DXGI_FORMAT_R32_FLOAT, 0, 50, { 50, 50, 50, 50}},
+ {&ps_uav_typed, true, false, 400, 0, DXGI_FORMAT_R32_FLOAT, 64, 1, { 1, 1, 1, 1}},
+ {&ps_uav_typed, true, false, 100, 0, DXGI_FORMAT_R16_FLOAT, 0, 50, { 50, 50, 50, 50}},
+ {&ps_uav_typed, true, false, 400, 0, DXGI_FORMAT_R16_FLOAT, 128, 1, { 1, 1, 1, 1}},
+ };
+ static const struct vec4 quad[] =
+ {
+ {-1.0f, -1.0f, 0.0f, 1.0f},
+ {-1.0f, 1.0f, 0.0f, 1.0f},
+ { 1.0f, -1.0f, 0.0f, 1.0f},
+ { 1.0f, 1.0f, 0.0f, 1.0f},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.rt_width = desc.rt_height = 64;
+ desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+ desc.no_root_signature = true;
+ desc.no_pipeline = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
+ cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap);
+ gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap);
+
+ vb = create_upload_buffer(device, sizeof(quad), quad);
+ vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb);
+ vbv.StrideInBytes = sizeof(*quad);
+ vbv.SizeInBytes = sizeof(quad);
+
+ current_shader = NULL;
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ const struct test *test = &tests[i];
+
+ vkd3d_test_set_context("Test %u", i);
+
+ if (!context.root_signature || test->uav != tests[i - 1].uav)
+ {
+ if (context.root_signature)
+ ID3D12RootSignature_Release(context.root_signature);
+
+ descriptor_range.RangeType = test->uav
+ ? D3D12_DESCRIPTOR_RANGE_TYPE_UAV : D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+ descriptor_range.NumDescriptors = 1;
+ descriptor_range.BaseShaderRegister = test->uav ? 1 : 0;
+ descriptor_range.RegisterSpace = 0;
+ descriptor_range.OffsetInDescriptorsFromTableStart = 0;
+ root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+ root_parameter.DescriptorTable.NumDescriptorRanges = 1;
+ root_parameter.DescriptorTable.pDescriptorRanges = &descriptor_range;
+ root_parameter.ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
+ memset(&root_signature_desc, 0, sizeof(root_signature_desc));
+ root_signature_desc.NumParameters = 1;
+ root_signature_desc.pParameters = &root_parameter;
+ root_signature_desc.NumStaticSamplers = 0;
+ root_signature_desc.pStaticSamplers = NULL;
+ root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
+ hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature);
+ ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
+ }
+
+ if (current_shader != test->ps)
+ {
+ if (context.pipeline_state)
+ ID3D12PipelineState_Release(context.pipeline_state);
+
+ input_layout.pInputElementDescs = layout_desc;
+ input_layout.NumElements = ARRAY_SIZE(layout_desc);
+ current_shader = test->ps;
+ init_pipeline_state_desc(&pso_desc, context.root_signature,
+ context.render_target_desc.Format, &vs, current_shader, &input_layout);
+ hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc,
+ &IID_ID3D12PipelineState, (void **)&context.pipeline_state);
+ ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr);
+ }
+
+ if (test->uav)
+ {
+ buffer = create_default_buffer(device, test->buffer_size,
+ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+ memset(&uav_desc, 0, sizeof(uav_desc));
+ uav_desc.Format = test->view_format;
+ uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
+ uav_desc.Buffer.Flags = test->raw ? D3D12_BUFFER_UAV_FLAG_RAW : 0;
+ uav_desc.Buffer.FirstElement = test->view_element_idx;
+ uav_desc.Buffer.NumElements = test->view_element_count;
+ uav_desc.Buffer.StructureByteStride = test->buffer_structure_byte_stride;;
+ ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, cpu_handle);
+ }
+ else
+ {
+ buffer = create_default_buffer(device, test->buffer_size,
+ D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST);
+ memset(&srv_desc, 0, sizeof(srv_desc));
+ srv_desc.Format = test->view_format;
+ srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
+ srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+ srv_desc.Buffer.Flags = test->raw ? D3D12_BUFFER_SRV_FLAG_RAW : 0;
+ srv_desc.Buffer.FirstElement = test->view_element_idx;
+ srv_desc.Buffer.NumElements = test->view_element_count;
+ srv_desc.Buffer.StructureByteStride = test->buffer_structure_byte_stride;
+ ID3D12Device_CreateShaderResourceView(device, buffer, &srv_desc, cpu_handle);
+ }
+
+ ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL);
+ ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature);
+ ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);
+ ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv);
+ ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport);
+ ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);
+ ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap);
+ ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle);
+ ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0);
+
+ transition_resource_state(command_list, context.render_target,
+ D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
+ check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &test->expected_result);
+ reset_command_list(command_list, context.allocator);
+
+ ID3D12Resource_Release(buffer);
+ }
+ vkd3d_test_set_context(NULL);
+
+ ID3D12Resource_Release(vb);
+ ID3D12DescriptorHeap_Release(heap);
+ destroy_test_context(&context);
+}
+
+START_TEST(d3d12)
+{
+ parse_args(argc, argv);
+ enable_d3d12_debug_layer(argc, argv);
+ init_adapter_info();
+
+ pfn_D3D12CreateVersionedRootSignatureDeserializer = get_d3d12_pfn(D3D12CreateVersionedRootSignatureDeserializer);
+ pfn_D3D12SerializeVersionedRootSignature = get_d3d12_pfn(D3D12SerializeVersionedRootSignature);
+
+ run_test(test_create_device);
+ run_test(test_node_count);
+ run_test(test_check_feature_support);
+ run_test(test_format_support);
+ run_test(test_multisample_quality_levels);
+ run_test(test_create_command_allocator);
+ run_test(test_create_command_list);
+ run_test(test_create_command_queue);
+ run_test(test_create_command_signature);
+ run_test(test_create_committed_resource);
+ run_test(test_create_heap);
+ run_test(test_create_placed_resource);
+ run_test(test_create_reserved_resource);
+ run_test(test_create_descriptor_heap);
+ run_test(test_create_sampler);
+ run_test(test_create_unordered_access_view);
+ run_test(test_create_root_signature);
+ run_test(test_root_signature_limits);
+ run_test(test_create_compute_pipeline_state);
+ run_test(test_create_graphics_pipeline_state);
+ run_test(test_create_fence);
+ run_test(test_object_interface);
+ run_test(test_multithread_private_data);
+ run_test(test_reset_command_allocator);
+ run_test(test_cpu_signal_fence);
+ run_test(test_gpu_signal_fence);
+ run_test(test_multithread_fence_wait);
+ run_test(test_fence_values);
+ run_test(test_clear_depth_stencil_view);
+ run_test(test_clear_render_target_view);
+ run_test(test_clear_unordered_access_view_buffer);
+ run_test(test_clear_unordered_access_view_image);
+ run_test(test_set_render_targets);
+ run_test(test_draw_instanced);
+ run_test(test_draw_indexed_instanced);
+ run_test(test_draw_no_descriptor_bindings);
+ run_test(test_multiple_render_targets);
+ run_test(test_unknown_rtv_format);
+ run_test(test_unknown_dsv_format);
+ run_test(test_append_aligned_element);
+ run_test(test_gpu_virtual_address);
+ run_test(test_fragment_coords);
+ run_test(test_fractional_viewports);
+ run_test(test_scissor);
+ run_test(test_draw_depth_no_ps);
+ run_test(test_draw_depth_only);
+ run_test(test_draw_uav_only);
+ run_test(test_texture_resource_barriers);
+ run_test(test_device_removed_reason);
+ run_test(test_map_resource);
+ run_test(test_map_placed_resources);
+ run_test(test_bundle_state_inheritance);
+ run_test(test_shader_instructions);
+ run_test(test_compute_shader_instructions);
+ run_test(test_discard_instruction);
+ run_test(test_shader_interstage_interface);
+ run_test(test_shader_input_output_components);
+ run_test(test_root_signature_byte_code);
+ run_test(test_cs_constant_buffer);
+ run_test(test_constant_buffer_relative_addressing);
+ run_test(test_immediate_constant_buffer);
+ run_test(test_root_constants);
+ run_test(test_sample_instructions);
+ run_test(test_texture_ld);
+ run_test(test_gather);
+ run_test(test_gather_c);
+ run_test(test_sample_c_lz);
+ run_test(test_cube_maps);
+ run_test(test_multisample_array_texture);
+ run_test(test_resinfo);
+ run_test(test_srv_component_mapping);
+ run_test(test_descriptor_tables);
+ run_test(test_descriptor_tables_overlapping_bindings);
+ run_test(test_update_root_descriptors);
+ run_test(test_update_descriptor_tables);
+ run_test(test_update_descriptor_heap_after_closing_command_list);
+ run_test(test_update_compute_descriptor_tables);
+ run_test(test_update_descriptor_tables_after_root_signature_change);
+ run_test(test_copy_descriptors);
+ run_test(test_copy_descriptors_range_sizes);
+ run_test(test_descriptors_visibility);
+ run_test(test_create_null_descriptors);
+ run_test(test_null_cbv);
+ run_test(test_null_srv);
+ run_test(test_null_uav);
+ run_test(test_null_vbv);
+ run_test(test_get_copyable_footprints);
+ run_test(test_depth_clip);
+ run_test(test_depth_stencil_sampling);
+ run_test(test_depth_load);
+ run_test(test_depth_read_only_view);
+ run_test(test_stencil_load);
+ run_test(test_typed_buffer_uav);
+ run_test(test_typed_uav_store);
+ run_test(test_compute_shader_registers);
+ run_test(test_tgsm);
+ run_test(test_uav_load);
+ run_test(test_cs_uav_store);
+ run_test(test_uav_counters);
+ run_test(test_decrement_uav_counter);
+ run_test(test_atomic_instructions);
+ run_test(test_buffer_srv);
+ run_test(test_create_query_heap);
+ run_test(test_query_timestamp);
+ run_test(test_query_pipeline_statistics);
+ run_test(test_query_occlusion);
+ run_test(test_resolve_non_issued_query_data);
+ run_test(test_resolve_query_data_in_different_command_list);
+ run_test(test_resolve_query_data_in_reordered_command_list);
+ run_test(test_execute_indirect);
+ run_test(test_dispatch_zero_thread_groups);
+ run_test(test_zero_vertex_stride);
+ run_test(test_instance_id);
+ run_test(test_vertex_id);
+ run_test(test_copy_texture);
+ run_test(test_copy_texture_buffer);
+ run_test(test_copy_buffer_texture);
+ run_test(test_copy_block_compressed_texture);
+ run_test(test_separate_bindings);
+ run_test(test_face_culling);
+ run_test(test_multithread_command_queue_exec);
+ run_test(test_geometry_shader);
+ run_test(test_layered_rendering);
+ run_test(test_ps_layer);
+ run_test(test_nop_tessellation_shaders);
+ run_test(test_quad_tessellation);
+ run_test(test_tessellation_dcl_index_range);
+ run_test(test_hull_shader_control_point_phase);
+ run_test(test_hull_shader_fork_phase);
+ run_test(test_line_tessellation);
+ run_test(test_tessellation_primitive_id);
+ run_test(test_render_a8);
+ run_test(test_cpu_descriptors_lifetime);
+ run_test(test_clip_distance);
+ run_test(test_combined_clip_and_cull_distances);
+ run_test(test_resource_allocation_info);
+ run_test(test_suballocate_small_textures);
+ run_test(test_command_list_initial_pipeline_state);
+ run_test(test_blend_factor);
+ run_test(test_dual_source_blending);
+ run_test(test_multisample_rendering);
+ run_test(test_sample_mask);
+ run_test(test_coverage);
+ run_test(test_shader_get_render_target_sample_count);
+ run_test(test_shader_sample_position);
+ run_test(test_shader_eval_attribute);
+ run_test(test_primitive_restart);
+ run_test(test_vertex_shader_stream_output);
+ run_test(test_read_write_subresource);
+ run_test(test_queue_wait);
+ run_test(test_graphics_compute_queue_synchronization);
+ run_test(test_early_depth_stencil_tests);
+ run_test(test_conditional_rendering);
+ run_test(test_bufinfo_instruction);
+}
--
2.17.1
1
0
From: Hans-Kristian Arntzen <post(a)arntzen-software.no>
The GPU VA allocator was allocating memory in a way where dereferencing
GPU VA required a lock + bsearch() to find the right VA range.
Rather than going this route, we turn the common case into O(1) and
lock-free by creating a slab allocator which allows us to lookup a
pointer directly from a GPU VA with (VA - Base) / PageSize.
The number of allocations in the fast path must be limited since we
cannot trivially grow the allocator while remaining lock-free for
dereferences.
Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
This supersedes patch 171219.
libs/vkd3d/device.c | 226 +++++++++++++++++++++++++++++++++++++--------
libs/vkd3d/vkd3d_private.h | 28 ++++--
2 files changed, 204 insertions(+), 50 deletions(-)
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 2dee5e3..4d6f7c9 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -1822,11 +1822,70 @@ static void d3d12_device_destroy_pipeline_cache(struct d3d12_device *device)
pthread_mutex_destroy(&device->mutex);
}
-D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator,
- size_t alignment, size_t size, void *ptr)
+#define VKD3D_VA_FALLBACK_BASE 0x8000000000000000ull
+#define VKD3D_VA_SLAB_BASE 0x0000001000000000ull
+#define VKD3D_VA_SLAB_SIZE_SHIFT 32
+#define VKD3D_VA_SLAB_SIZE (1ull << VKD3D_VA_SLAB_SIZE_SHIFT)
+#define VKD3D_VA_SLAB_COUNT (64 * 1024)
+
+static D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate_slab(struct vkd3d_gpu_va_allocator *allocator,
+ size_t aligned_size, void *ptr)
+{
+ struct vkd3d_gpu_va_slab *slab;
+ D3D12_GPU_VIRTUAL_ADDRESS address;
+ unsigned slab_idx;
+
+ slab = allocator->free_slab;
+ allocator->free_slab = slab->ptr;
+ slab->size = aligned_size;
+ slab->ptr = ptr;
+
+ /* It is critical that the multiplication happens in 64-bit to not
+ * overflow. */
+ slab_idx = slab - allocator->slabs;
+ address = VKD3D_VA_SLAB_BASE + slab_idx * VKD3D_VA_SLAB_SIZE;
+
+ TRACE("Allocated address %#"PRIx64", slab %u, size %zu.\n", address, slab_idx, aligned_size);
+
+ return address;
+}
+
+static D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate_fallback(struct vkd3d_gpu_va_allocator *allocator,
+ size_t alignment, size_t aligned_size, void *ptr)
{
struct vkd3d_gpu_va_allocation *allocation;
D3D12_GPU_VIRTUAL_ADDRESS base, ceiling;
+
+ base = allocator->fallback_floor;
+ ceiling = ~(D3D12_GPU_VIRTUAL_ADDRESS)0;
+ ceiling -= alignment - 1;
+ if (aligned_size > ceiling || ceiling - aligned_size < base)
+ return 0;
+
+ base = (base + (alignment - 1)) & ~((D3D12_GPU_VIRTUAL_ADDRESS)alignment - 1);
+
+ if (!vkd3d_array_reserve((void **)&allocator->fallback_allocations, &allocator->fallback_allocations_size,
+ allocator->fallback_allocation_count + 1, sizeof(*allocator->fallback_allocations)))
+ return 0;
+
+ allocation = &allocator->fallback_allocations[allocator->fallback_allocation_count++];
+ allocation->base = base;
+ allocation->size = aligned_size;
+ allocation->ptr = ptr;
+
+ /* This pointer is bumped and never lowered on a free. However, this will
+ * only fail once we have exhausted 63 bits of address space. */
+ allocator->fallback_floor = base + aligned_size;
+
+ TRACE("Allocated address %#"PRIx64", size %zu.\n", base, aligned_size);
+
+ return base;
+}
+
+D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator,
+ size_t alignment, size_t size, void *ptr)
+{
+ D3D12_GPU_VIRTUAL_ADDRESS address;
int rc;
if (size > ~(size_t)0 - (alignment - 1))
@@ -1839,34 +1898,41 @@ D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_al
return 0;
}
- base = allocator->floor;
- ceiling = ~(D3D12_GPU_VIRTUAL_ADDRESS)0;
- ceiling -= alignment - 1;
- if (size > ceiling || ceiling - size < base)
- {
- pthread_mutex_unlock(&allocator->mutex);
- return 0;
- }
+ if (size <= VKD3D_VA_SLAB_SIZE && allocator->free_slab)
+ address = vkd3d_gpu_va_allocator_allocate_slab(allocator, size, ptr);
+ else
+ address = vkd3d_gpu_va_allocator_allocate_fallback(allocator, alignment, size, ptr);
- base = (base + (alignment - 1)) & ~((D3D12_GPU_VIRTUAL_ADDRESS)alignment - 1);
+ pthread_mutex_unlock(&allocator->mutex);
- if (!vkd3d_array_reserve((void **)&allocator->allocations, &allocator->allocations_size,
- allocator->allocation_count + 1, sizeof(*allocator->allocations)))
- {
- pthread_mutex_unlock(&allocator->mutex);
- return 0;
- }
+ return address;
+}
- allocation = &allocator->allocations[allocator->allocation_count++];
- allocation->base = base;
- allocation->size = size;
- allocation->ptr = ptr;
+static void *vkd3d_gpu_va_allocator_dereference_slab(struct vkd3d_gpu_va_allocator *allocator,
+ D3D12_GPU_VIRTUAL_ADDRESS address)
+{
+ const struct vkd3d_gpu_va_slab *slab;
+ D3D12_GPU_VIRTUAL_ADDRESS base_offset;
+ unsigned int slab_idx;
- allocator->floor = base + size;
+ base_offset = address - VKD3D_VA_SLAB_BASE;
+ slab_idx = base_offset >> VKD3D_VA_SLAB_SIZE_SHIFT;
- pthread_mutex_unlock(&allocator->mutex);
+ if (slab_idx >= VKD3D_VA_SLAB_COUNT)
+ {
+ ERR("Invalid slab index %u for address %#"PRIx64".\n", slab_idx, address);
+ return NULL;
+ }
- return allocation->base;
+ slab = &allocator->slabs[slab_idx];
+ base_offset -= slab_idx * VKD3D_VA_SLAB_SIZE;
+ if (base_offset >= slab->size)
+ {
+ ERR("Address %#"PRIx64" is %#"PRIx64" bytes into slab %u of size %zu.\n",
+ address, base_offset, slab_idx, slab->size);
+ return NULL;
+ }
+ return slab->ptr;
}
static int vkd3d_gpu_va_allocation_compare(const void *k, const void *e)
@@ -1881,30 +1947,94 @@ static int vkd3d_gpu_va_allocation_compare(const void *k, const void *e)
return 0;
}
-void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator,
+static void *vkd3d_gpu_va_allocator_dereference_fallback(struct vkd3d_gpu_va_allocator *allocator,
D3D12_GPU_VIRTUAL_ADDRESS address)
{
struct vkd3d_gpu_va_allocation *allocation;
+
+ allocation = bsearch(&address, allocator->fallback_allocations, allocator->fallback_allocation_count,
+ sizeof(*allocation), vkd3d_gpu_va_allocation_compare);
+
+ return allocation ? allocation->ptr : NULL;
+}
+
+void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator,
+ D3D12_GPU_VIRTUAL_ADDRESS address)
+{
+ void *ret;
int rc;
+ /* If we land in the non-fallback region, dereferencing VA is lock-less.
+ * The base pointer is immutable, and the only way we can have a data race
+ * is if some other thread is poking into the
+ * slab_mem_allocation[base_index] block. This can only happen if someone
+ * is trying to free the entry while we're dereferencing it, which would
+ * be a serious application bug. */
+ if (address < VKD3D_VA_FALLBACK_BASE)
+ return vkd3d_gpu_va_allocator_dereference_slab(allocator, address);
+
+ /* Slow fallback. */
if ((rc = pthread_mutex_lock(&allocator->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return NULL;
}
- allocation = bsearch(&address, allocator->allocations, allocator->allocation_count,
- sizeof(*allocation), vkd3d_gpu_va_allocation_compare);
+ ret = vkd3d_gpu_va_allocator_dereference_fallback(allocator, address);
pthread_mutex_unlock(&allocator->mutex);
- return allocation ? allocation->ptr : NULL;
+ return ret;
}
-void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address)
+static void vkd3d_gpu_va_allocator_free_slab(struct vkd3d_gpu_va_allocator *allocator,
+ D3D12_GPU_VIRTUAL_ADDRESS address)
+{
+ D3D12_GPU_VIRTUAL_ADDRESS base_offset;
+ struct vkd3d_gpu_va_slab *slab;
+ unsigned int slab_idx;
+
+ base_offset = address - VKD3D_VA_SLAB_BASE;
+ slab_idx = base_offset >> VKD3D_VA_SLAB_SIZE_SHIFT;
+
+ if (slab_idx >= VKD3D_VA_SLAB_COUNT)
+ {
+ ERR("Invalid slab index %u for address %#"PRIx64".\n", slab_idx, address);
+ return;
+ }
+
+ TRACE("Freeing address %#"PRIx64", slab %u.\n", address, slab_idx);
+
+ slab = &allocator->slabs[slab_idx];
+ slab->size = 0;
+ slab->ptr = allocator->free_slab;
+ allocator->free_slab = slab;
+}
+
+static void vkd3d_gpu_va_allocator_free_fallback(struct vkd3d_gpu_va_allocator *allocator,
+ D3D12_GPU_VIRTUAL_ADDRESS address)
{
struct vkd3d_gpu_va_allocation *allocation;
unsigned int index;
+
+ allocation = bsearch(&address, allocator->fallback_allocations, allocator->fallback_allocation_count,
+ sizeof(*allocation), vkd3d_gpu_va_allocation_compare);
+
+ if (!allocation || allocation->base != address)
+ {
+ ERR("Address %#"PRIx64" does not match any allocation.\n", address);
+ return;
+ }
+
+ index = allocation - allocator->fallback_allocations;
+ --allocator->fallback_allocation_count;
+ if (index != allocator->fallback_allocation_count)
+ memmove(&allocator->fallback_allocations[index], &allocator->fallback_allocations[index + 1],
+ (allocator->fallback_allocation_count - index) * sizeof(*allocation));
+}
+
+void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address)
+{
int rc;
if ((rc = pthread_mutex_lock(&allocator->mutex)))
@@ -1913,32 +2043,45 @@ void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12
return;
}
- allocation = bsearch(&address, allocator->allocations, allocator->allocation_count,
- sizeof(*allocation), vkd3d_gpu_va_allocation_compare);
- if (allocation && allocation->base == address)
+ if (address < VKD3D_VA_FALLBACK_BASE)
{
- index = allocation - allocator->allocations;
- --allocator->allocation_count;
- if (index != allocator->allocation_count)
- {
- memmove(&allocator->allocations[index], &allocator->allocations[index + 1],
- (allocator->allocation_count - index) * sizeof(*allocation));
- }
+ vkd3d_gpu_va_allocator_free_slab(allocator, address);
+ pthread_mutex_unlock(&allocator->mutex);
+ return;
}
+ vkd3d_gpu_va_allocator_free_fallback(allocator, address);
+
pthread_mutex_unlock(&allocator->mutex);
}
static bool vkd3d_gpu_va_allocator_init(struct vkd3d_gpu_va_allocator *allocator)
{
+ unsigned int i;
int rc;
memset(allocator, 0, sizeof(*allocator));
- allocator->floor = 0x1000;
+ allocator->fallback_floor = VKD3D_VA_FALLBACK_BASE;
+
+ /* To remain lock-less, we cannot grow the slabs array after the fact. If
+ * we commit to a maximum number of allocations here, we can dereference
+ * without taking a lock as the base pointer never changes. We would be
+ * able to grow more seamlessly using an array of pointers, but that would
+ * make dereferencing slightly less efficient. */
+ if (!(allocator->slabs = vkd3d_calloc(VKD3D_VA_SLAB_COUNT, sizeof(*allocator->slabs))))
+ return false;
+
+ /* Mark all slabs as free. */
+ allocator->free_slab = &allocator->slabs[0];
+ for (i = 0; i < VKD3D_VA_SLAB_COUNT - 1; ++i)
+ {
+ allocator->slabs[i].ptr = &allocator->slabs[i + 1];
+ }
if ((rc = pthread_mutex_init(&allocator->mutex, NULL)))
{
ERR("Failed to initialize mutex, error %d.\n", rc);
+ vkd3d_free(allocator->slabs);
return false;
}
@@ -1954,7 +2097,8 @@ static void vkd3d_gpu_va_allocator_cleanup(struct vkd3d_gpu_va_allocator *alloca
ERR("Failed to lock mutex, error %d.\n", rc);
return;
}
- vkd3d_free(allocator->allocations);
+ vkd3d_free(allocator->slabs);
+ vkd3d_free(allocator->fallback_allocations);
pthread_mutex_unlock(&allocator->mutex);
pthread_mutex_destroy(&allocator->mutex);
}
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 520dab1..1cb40f2 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -202,20 +202,30 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker,
HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker,
struct d3d12_device *device) DECLSPEC_HIDDEN;
+struct vkd3d_gpu_va_allocation
+{
+ D3D12_GPU_VIRTUAL_ADDRESS base;
+ SIZE_T size;
+ void *ptr;
+};
+
+struct vkd3d_gpu_va_slab
+{
+ SIZE_T size;
+ void *ptr;
+};
+
struct vkd3d_gpu_va_allocator
{
pthread_mutex_t mutex;
- D3D12_GPU_VIRTUAL_ADDRESS floor;
+ D3D12_GPU_VIRTUAL_ADDRESS fallback_floor;
+ struct vkd3d_gpu_va_allocation *fallback_allocations;
+ size_t fallback_allocations_size;
+ size_t fallback_allocation_count;
- struct vkd3d_gpu_va_allocation
- {
- D3D12_GPU_VIRTUAL_ADDRESS base;
- SIZE_T size;
- void *ptr;
- } *allocations;
- size_t allocations_size;
- size_t allocation_count;
+ struct vkd3d_gpu_va_slab *slabs;
+ struct vkd3d_gpu_va_slab *free_slab;
};
D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator,
--
2.11.0
4
5
20 Nov '19
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
dlls/dmloader/loader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 9120abec535..0da8323e7e5 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -608,7 +608,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 *
do {
DMUS_OBJECTDESC Desc;
DM_STRUCT_INIT(&Desc);
- Desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_DATE;
+ Desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_DATE;
Desc.guidClass = *rguidClass;
lstrcpyW (Desc.wszFileName, FileData.cFileName);
FileTimeToLocalFileTime (&FileData.ftCreationTime, &Desc.ftDate);
--
2.24.0
2
1
[PATCH] vkd3d: Fix printf warning about size_t vs SIZE_T mismatch.
by Hans-Kristian Arntzen 20 Nov '19
by Hans-Kristian Arntzen 20 Nov '19
20 Nov '19
Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no>
---
libs/vkd3d/vkd3d_private.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 84b5ff2..c6bfe96 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -205,13 +205,13 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker,
struct vkd3d_gpu_va_allocation
{
D3D12_GPU_VIRTUAL_ADDRESS base;
- SIZE_T size;
+ size_t size;
void *ptr;
};
struct vkd3d_gpu_va_slab
{
- SIZE_T size;
+ size_t size;
void *ptr;
};
--
2.24.0
1
0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/windowscodecs/bitmap.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c
index b517603456..3d7d775b34 100644
--- a/dlls/windowscodecs/bitmap.c
+++ b/dlls/windowscodecs/bitmap.c
@@ -80,11 +80,6 @@ static inline BitmapImpl *impl_from_IMILUnknown1(IMILUnknown1 *iface)
return CONTAINING_RECORD(iface, BitmapImpl, IMILUnknown1_iface);
}
-static inline BitmapImpl *impl_from_IMILUnknown2(IMILUnknown2 *iface)
-{
- return CONTAINING_RECORD(iface, BitmapImpl, IMILUnknown2_iface);
-}
-
static inline BitmapLockImpl *impl_from_IWICBitmapLock(IWICBitmapLock *iface)
{
return CONTAINING_RECORD(iface, BitmapLockImpl, IWICBitmapLock_iface);
--
2.24.0
2
1
20 Nov '19
From: Paul Gofman <gofmanp(a)gmail.com>
Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
After much deliberation, I renamed the "buffer accounting" fields in
struct d3dx_parameter_block and param_get_data_...(). I also got rid
of a bunch of unnecessary casts.
dlls/d3dx9_36/effect.c | 241 +++++++++++++++++++++++++----------
dlls/d3dx9_36/tests/effect.c | 38 ++++--
2 files changed, 204 insertions(+), 75 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index a573d88fcf8..84e71cd1b71 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -36,6 +36,7 @@ static const char parameter_block_magic_string[4] = {'@', '!', '#', '\xFE'};
#define PARAMETER_FLAG_SHARED 1
#define INITIAL_POOL_SIZE 16
+#define INITIAL_PARAM_BLOCK_SIZE 1024
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
@@ -153,6 +154,15 @@ struct d3dx_parameter_block
{
char magic_string[ARRAY_SIZE(parameter_block_magic_string)];
struct list entry;
+ size_t size;
+ size_t offset;
+ BYTE *buffer;
+};
+
+struct d3dx_recorded_parameter
+{
+ struct d3dx_parameter *param;
+ unsigned int bytes;
};
struct d3dx_effect
@@ -706,11 +716,27 @@ static void free_technique(struct d3dx_technique *technique)
technique->name = NULL;
}
+static unsigned int get_recorded_parameter_size(const struct d3dx_recorded_parameter *record)
+{
+ return sizeof(*record) + record->bytes;
+}
+
static void free_parameter_block(struct d3dx_parameter_block *block)
{
+ struct d3dx_recorded_parameter *record;
+
if (!block)
return;
+ record = (struct d3dx_recorded_parameter *)block->buffer;
+ while ((BYTE *)record < block->buffer + block->offset)
+ {
+ free_parameter_object_data(record->param, record + 1, record->bytes);
+ record = (struct d3dx_recorded_parameter *)((BYTE *)record + get_recorded_parameter_size(record));
+ }
+ assert((BYTE *)record == block->buffer + block->offset);
+
+ heap_free(block->buffer);
heap_free(block);
}
@@ -778,14 +804,12 @@ static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector)
}
}
-static void set_vector(struct d3dx_parameter *param, const D3DXVECTOR4 *vector)
+static void set_vector(struct d3dx_parameter *param, const D3DXVECTOR4 *vector, void *dst_data)
{
UINT i;
for (i = 0; i < param->columns; ++i)
- {
- set_number((FLOAT *)param->data + i, param->type, (FLOAT *)vector + i, D3DXPT_FLOAT);
- }
+ set_number((FLOAT *)dst_data + i, param->type, (FLOAT *)vector + i, D3DXPT_FLOAT);
}
static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix, BOOL transpose)
@@ -806,31 +830,33 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix, BOOL tr
}
}
-static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix)
+static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix, void *dst_data)
{
UINT i, k;
if (param->type == D3DXPT_FLOAT)
{
if (param->columns == 4)
- memcpy(param->data, matrix->u.m, param->rows * 4 * sizeof(float));
+ {
+ memcpy(dst_data, matrix->u.m, param->rows * 4 * sizeof(float));
+ }
else
+ {
for (i = 0; i < param->rows; ++i)
- memcpy((float *)param->data + i * param->columns, matrix->u.m + i, param->columns * sizeof(float));
+ memcpy((float *)dst_data + i * param->columns, matrix->u.m + i, param->columns * sizeof(float));
+ }
return;
}
for (i = 0; i < param->rows; ++i)
{
for (k = 0; k < param->columns; ++k)
- {
- set_number((FLOAT *)param->data + i * param->columns + k, param->type,
+ set_number((FLOAT *)dst_data + i * param->columns + k, param->type,
&matrix->u.m[i][k], D3DXPT_FLOAT);
- }
}
}
-static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX *matrix)
+static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX *matrix, void *dst_data)
{
UINT i, k;
@@ -838,7 +864,7 @@ static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX
{
for (k = 0; k < param->columns; ++k)
{
- set_number((FLOAT *)param->data + i * param->columns + k, param->type,
+ set_number((FLOAT *)dst_data + i * param->columns + k, param->type,
&matrix->u.m[k][i], D3DXPT_FLOAT);
}
}
@@ -857,7 +883,8 @@ static HRESULT set_string(char **param_data, const char *string)
return D3D_OK;
}
-static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigned int bytes)
+static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigned int bytes,
+ void *dst_data)
{
unsigned int i, count;
@@ -873,7 +900,7 @@ static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigne
case D3DXPT_TEXTURECUBE:
for (i = 0; i < count; ++i)
{
- IUnknown *old_texture = ((IUnknown **)param->data)[i];
+ IUnknown *old_texture = ((IUnknown **)dst_data)[i];
IUnknown *new_texture = ((IUnknown **)data)[i];
if (new_texture == old_texture)
@@ -890,7 +917,7 @@ static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigne
case D3DXPT_INT:
case D3DXPT_FLOAT:
TRACE("Copy %u bytes.\n", bytes);
- memcpy(param->data, data, bytes);
+ memcpy(dst_data, data, bytes);
break;
case D3DXPT_STRING:
@@ -898,7 +925,7 @@ static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigne
HRESULT hr;
for (i = 0; i < count; ++i)
- if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i])))
+ if (FAILED(hr = set_string(&((char **)dst_data)[i], ((const char **)data)[i])))
return hr;
break;
}
@@ -1248,6 +1275,43 @@ static ULONG64 next_effect_update_version(struct d3dx_effect *effect)
return next_update_version(get_version_counter_ptr(effect));
}
+static void *record_parameter(struct d3dx_effect *effect, struct d3dx_parameter *param, unsigned int bytes)
+{
+ struct d3dx_parameter_block *block = effect->current_parameter_block;
+ struct d3dx_recorded_parameter new_record, *record;
+ unsigned int new_size, alloc_size;
+
+ new_record.param = param;
+ new_record.bytes = bytes;
+ new_size = block->offset + get_recorded_parameter_size(&new_record);
+
+ if (new_size > block->size)
+ {
+ BYTE *new_alloc;
+
+ alloc_size = max(block->size * 2, max(new_size, INITIAL_PARAM_BLOCK_SIZE));
+ if (block->size)
+ new_alloc = heap_realloc(block->buffer, alloc_size);
+ else
+ new_alloc = heap_alloc(alloc_size);
+
+ if (!new_alloc)
+ {
+ ERR("Out of memory.\n");
+ return param->data;
+ }
+ /* Data update functions may want to free some references upon setting value. */
+ memset(new_alloc + block->size, 0, alloc_size - block->size);
+
+ block->size = alloc_size;
+ block->buffer = new_alloc;
+ }
+ record = (struct d3dx_recorded_parameter *)(block->buffer + block->offset);
+ *record = new_record;
+ block->offset = new_size;
+ return record + 1;
+}
+
static void set_dirty(struct d3dx_parameter *param)
{
struct d3dx_shared_data *shared_data;
@@ -1260,6 +1324,17 @@ static void set_dirty(struct d3dx_parameter *param)
top_param->update_version = new_update_version;
}
+static void *param_get_data_and_dirtify(struct d3dx_effect *effect, struct d3dx_parameter *param,
+ unsigned int bytes, BOOL value_changed)
+{
+ assert(bytes <= param->bytes);
+
+ if (value_changed && !effect->current_parameter_block)
+ set_dirty(param);
+
+ return effect->current_parameter_block ? record_parameter(effect, param, bytes) : param->data;
+}
+
static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value)
{
static const struct
@@ -2364,10 +2439,7 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame
}
if (data && param->bytes <= bytes)
- {
- set_dirty(param);
- return set_value(param, data, bytes);
- }
+ return set_value(param, data, bytes, param_get_data_and_dirtify(effect, param, param->bytes, TRUE));
WARN("Invalid argument specified.\n");
@@ -2448,8 +2520,8 @@ static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE paramet
if (param && !param->element_count && param->rows == 1 && param->columns == 1)
{
- set_number(param->data, param->type, &b, D3DXPT_BOOL);
- set_dirty(param);
+ set_number(param_get_data_and_dirtify(effect, param, sizeof(int), TRUE),
+ param->type, &b, D3DXPT_BOOL);
return D3D_OK;
}
@@ -2481,6 +2553,7 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
+ DWORD *data;
TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count);
@@ -2495,12 +2568,12 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
+ data = param_get_data_and_dirtify(effect, param, size * sizeof(int), TRUE);
for (i = 0; i < size; ++i)
{
/* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */
- set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT);
+ set_number(data + i, param->type, &b[i], D3DXPT_INT);
}
- set_dirty(param);
return D3D_OK;
case D3DXPC_OBJECT:
@@ -2558,9 +2631,8 @@ static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE paramete
DWORD value;
set_number(&value, param->type, &n, D3DXPT_INT);
- if (value != *(DWORD *)param->data)
- set_dirty(param);
- *(DWORD *)param->data = value;
+ *(DWORD *)param_get_data_and_dirtify(effect, param, sizeof(int),
+ value != *(DWORD *)param->data) = value;
return D3D_OK;
}
@@ -2569,14 +2641,19 @@ static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE paramete
&& ((param->class == D3DXPC_VECTOR && param->columns != 2)
|| (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1)))
{
+ float *data;
+
TRACE("Vector fixup.\n");
- *(float *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE;
- ((float *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE;
- ((float *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE;
+ data = param_get_data_and_dirtify(effect, param,
+ min(4, param->rows * param->columns) * sizeof(float), TRUE);
+
+ data[0] = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE;
+ data[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE;
+ data[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE;
if (param->rows * param->columns > 3)
- ((float *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE;
- set_dirty(param);
+ data[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE;
+
return D3D_OK;
}
}
@@ -2628,6 +2705,7 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
+ DWORD *data;
TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count);
@@ -2642,9 +2720,9 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
+ data = param_get_data_and_dirtify(effect, param, size * sizeof(int), TRUE);
for (i = 0; i < size; ++i)
- set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT);
- set_dirty(param);
+ set_number(data + i, param->type, &n[i], D3DXPT_INT);
return D3D_OK;
case D3DXPC_OBJECT:
@@ -2698,9 +2776,8 @@ static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parame
DWORD value;
set_number(&value, param->type, &f, D3DXPT_FLOAT);
- if (value != *(DWORD *)param->data)
- set_dirty(param);
- *(DWORD *)param->data = value;
+ *(DWORD *)param_get_data_and_dirtify(effect, param, sizeof(float),
+ value != *(DWORD *)param->data) = value;
return D3D_OK;
}
@@ -2733,6 +2810,7 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
+ DWORD *data;
TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count);
@@ -2747,9 +2825,9 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
+ data = param_get_data_and_dirtify(effect, param, size * sizeof(float), TRUE);
for (i = 0; i < size; ++i)
- set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT);
- set_dirty(param);
+ set_number(data + i, param->type, &f[i], D3DXPT_FLOAT);
return D3D_OK;
case D3DXPC_OBJECT:
@@ -2806,7 +2884,6 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
- set_dirty(param);
if (param->type == D3DXPT_INT && param->bytes == 4)
{
DWORD tmp;
@@ -2817,16 +2894,17 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param
tmp += ((DWORD)(max(min(vector->x, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16;
tmp += ((DWORD)(max(min(vector->w, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24;
- *(int *)param->data = tmp;
+ *(int *)param_get_data_and_dirtify(effect, param, sizeof(int), TRUE) = tmp;
return D3D_OK;
}
if (param->type == D3DXPT_FLOAT)
{
- memcpy(param->data, vector, param->columns * sizeof(float));
+ memcpy(param_get_data_and_dirtify(effect, param, param->columns * sizeof(float), TRUE),
+ vector, param->columns * sizeof(float));
return D3D_OK;
}
- set_vector(param, vector);
+ set_vector(param, vector, param_get_data_and_dirtify(effect, param, param->columns * sizeof(float), TRUE));
return D3D_OK;
case D3DXPC_MATRIX_ROWS:
@@ -2899,26 +2977,33 @@ static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE
if (param && param->element_count && param->element_count >= count)
{
unsigned int i;
+ BYTE *data;
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_VECTOR:
- set_dirty(param);
+ data = param_get_data_and_dirtify(effect, param, count * param->columns * sizeof(float), TRUE);
+
if (param->type == D3DXPT_FLOAT)
{
if (param->columns == 4)
- memcpy(param->data, vector, count * 4 * sizeof(float));
+ {
+ memcpy(data, vector, count * 4 * sizeof(float));
+ }
else
+ {
for (i = 0; i < count; ++i)
- memcpy((float *)param->data + param->columns * i, vector + i,
+ memcpy((float *)data + param->columns * i, vector + i,
param->columns * sizeof(float));
+ }
return D3D_OK;
}
for (i = 0; i < count; ++i)
- set_vector(¶m->members[i], &vector[i]);
+ set_vector(¶m->members[i], &vector[i], data + i * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -2993,8 +3078,8 @@ static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE param
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_matrix(param, matrix);
- set_dirty(param);
+ set_matrix(param, matrix, param_get_data_and_dirtify(effect, param,
+ param->rows * param->columns * sizeof(float), TRUE));
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3059,15 +3144,20 @@ static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE
if (param && param->element_count >= count)
{
unsigned int i;
+ BYTE *data;
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
+ data = param_get_data_and_dirtify(effect, param, count * param->rows
+ * param->columns * sizeof(float), TRUE);
+
for (i = 0; i < count; ++i)
- set_matrix(¶m->members[i], &matrix[i]);
+ set_matrix(¶m->members[i], &matrix[i],
+ data + i * param->rows * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3139,13 +3229,18 @@ static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DX
if (param && count <= param->element_count)
{
unsigned int i;
+ BYTE *data;
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
+ data = param_get_data_and_dirtify(effect, param, count * param->rows
+ * param->columns * sizeof(float), TRUE);
+
for (i = 0; i < count; ++i)
- set_matrix(¶m->members[i], matrix[i]);
+ set_matrix(¶m->members[i], matrix[i], data + i * param->rows
+ * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3219,8 +3314,8 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHAN
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
- set_matrix_transpose(param, matrix);
+ set_matrix_transpose(param, matrix, param_get_data_and_dirtify(effect, param,
+ param->rows * param->columns * sizeof(float), TRUE));
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3289,15 +3384,20 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3
if (param && param->element_count >= count)
{
unsigned int i;
+ BYTE *data;
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
+ data = param_get_data_and_dirtify(effect, param, count * param->rows
+ * param->columns * sizeof(float), TRUE);
+
for (i = 0; i < count; ++i)
- set_matrix_transpose(¶m->members[i], &matrix[i]);
+ set_matrix_transpose(¶m->members[i], &matrix[i], data
+ + i * param->rows * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3369,13 +3469,18 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposePointerArray(ID3DXEffect *if
if (param && count <= param->element_count)
{
unsigned int i;
+ BYTE *data;
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
+ data = param_get_data_and_dirtify(effect, param, count * param->rows
+ * param->columns * sizeof(float), TRUE);
+
for (i = 0; i < count; ++i)
- set_matrix_transpose(¶m->members[i], matrix[i]);
+ set_matrix_transpose(¶m->members[i], matrix[i], data
+ + i * param->rows * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3442,10 +3547,7 @@ static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE param
TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string));
if (param && param->type == D3DXPT_STRING)
- {
- set_dirty(param);
- return set_string(param->data, string);
- }
+ return set_string(param_get_data_and_dirtify(effect, param, sizeof(void *), TRUE), string);
WARN("Parameter not found.\n");
@@ -3484,7 +3586,11 @@ static HRESULT WINAPI d3dx_effect_SetTexture(ID3DXEffect *iface, D3DXHANDLE para
|| param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D
|| param->type == D3DXPT_TEXTURECUBE))
{
- IDirect3DBaseTexture9 *old_texture = *(IDirect3DBaseTexture9 **)param->data;
+ IDirect3DBaseTexture9 **data = param_get_data_and_dirtify(effect, param,
+ sizeof(void *), texture != *(IDirect3DBaseTexture9 **)param->data);
+ IDirect3DBaseTexture9 *old_texture = *data;
+
+ *data = texture;
if (texture == old_texture)
return D3D_OK;
@@ -3494,9 +3600,6 @@ static HRESULT WINAPI d3dx_effect_SetTexture(ID3DXEffect *iface, D3DXHANDLE para
if (old_texture)
IDirect3DBaseTexture9_Release(old_texture);
- *(IDirect3DBaseTexture9 **)param->data = texture;
- set_dirty(param);
-
return D3D_OK;
}
@@ -4137,6 +4240,10 @@ static D3DXHANDLE WINAPI d3dx_effect_EndParameterBlock(ID3DXEffect *iface)
return NULL;
}
ret = effect->current_parameter_block;
+
+ ret->buffer = heap_realloc(ret->buffer, ret->offset);
+ ret->size = ret->offset;
+
effect->current_parameter_block = NULL;
list_add_tail(&effect->parameter_block_list, &ret->entry);
return (D3DXHANDLE)ret;
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index f1cbe49287c..706ae126b82 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -8020,12 +8020,12 @@ static void test_effect_parameter_block(void)
IDirect3DTexture9 *texture, *tex_test;
D3DXHANDLE block, block2, handle;
ID3DXEffect *effect, *effect2;
+ D3DXMATRIX mat, mat_arr[2];
IDirect3DDevice9 *device;
ID3DXEffectPool *pool;
float float_array[4];
float float_value;
IDirect3D9 *d3d;
- D3DXMATRIX mat;
ULONG refcount;
HWND window;
HRESULT hr;
@@ -8115,9 +8115,7 @@ static void test_effect_parameter_block(void)
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetTexture(effect, "tex1", (IDirect3DBaseTexture9 **)&tex_test);
- todo_wine ok(hr == D3D_OK && !tex_test, "Got unexpected hr %#x, tex_test %p.\n", hr, tex_test);
- if (tex_test)
- IDirect3DTexture9_Release(tex_test);
+ ok(hr == D3D_OK && !tex_test, "Got unexpected hr %#x, tex_test %p.\n", hr, tex_test);
/* Child parameters and array members are recorded separately (the whole
* parameter is not updated when parameter block is applied). */
@@ -8126,13 +8124,13 @@ static void test_effect_parameter_block(void)
hr = effect->lpVtbl->SetFloat(effect, "ts1[0].fv", 28.0f);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetFloat(effect, "ts1[0].fv", &float_value);
- todo_wine ok(hr == D3D_OK && float_value == 12.0, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
+ ok(hr == D3D_OK && float_value == 12.0, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
float_array[0] = -29.0f;
hr = effect->lpVtbl->SetFloatArray(effect, "ts1[0].v2", float_array, 1);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v2", float_array, 1);
- todo_wine ok(hr == D3D_OK && float_array[0] == 13.0, "Got unexpected hr %#x, float_array[0] %g.\n",
+ ok(hr == D3D_OK && float_array[0] == 13.0, "Got unexpected hr %#x, float_array[0] %g.\n",
hr, float_array[0]);
memset(&mat, 0, sizeof(mat));
@@ -8140,13 +8138,13 @@ static void test_effect_parameter_block(void)
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetMatrix(effect, "m3x2row", &mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- todo_wine ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n");
+ ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n");
hr = effect->lpVtbl->SetMatrix(effect, "m3x2column", &test_mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetMatrix(effect, "m3x2column", &mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- todo_wine ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n");
+ ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n");
/* Setting shared parameter through effect2 is not recorded to effect
* parameter block. */
@@ -8321,6 +8319,30 @@ static void test_effect_parameter_block(void)
refcount = pool->lpVtbl->Release(pool);
ok(!refcount, "Got unexpected refcount %u.\n", refcount);
+ hr = D3DXCreateEffect(device, test_effect_parameter_value_blob_float, sizeof(test_effect_parameter_value_blob_float),
+ NULL, NULL, 0, NULL, &effect, NULL);
+ hr = effect->lpVtbl->BeginParameterBlock(effect);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ mat_arr[0] = mat_arr[1] = test_mat;
+ hr = effect->lpVtbl->SetMatrixArray(effect, "f33_2", mat_arr, 2);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ block = effect->lpVtbl->EndParameterBlock(effect);
+ ok(!!block, "Got unexpected block %p.\n", block);
+
+ memset(mat_arr, 0, sizeof(mat_arr));
+ hr = effect->lpVtbl->SetMatrixArray(effect, "f33_2", mat_arr, 2);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ hr = effect->lpVtbl->ApplyParameterBlock(effect, block);
+ todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr);
+
+ hr = effect->lpVtbl->GetMatrixArray(effect, "f33_2", mat_arr, 2);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(!memcmp(&mat_arr[0], &test_mat, sizeof(test_mat))
+ && !memcmp(&mat_arr[1], &test_mat, sizeof(test_mat)), "Got unexpected matrix array.\n");
+
+ refcount = effect->lpVtbl->Release(effect);
+ ok(!refcount, "Got unexpected refcount %u.\n", refcount);
+
refcount = IDirect3DDevice9_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);
IDirect3D9_Release(d3d);
--
2.21.0
1
1
[PATCH] xmllite: Avoid extra read from stream when identifying comment node.
by Jeff Smith 20 Nov '19
by Jeff Smith 20 Nov '19
20 Nov '19
Signed-off-by: Jeff Smith <whydoubt(a)gmail.com>
---
dlls/xmllite/reader.c | 5 +++--
dlls/xmllite/tests/reader.c | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c
index eddc4d8eec..5299871136 100644
--- a/dlls/xmllite/reader.c
+++ b/dlls/xmllite/reader.c
@@ -1459,7 +1459,7 @@ static HRESULT reader_parse_comment(xmlreader *reader)
reader_init_strvalue(start, reader_get_cur(reader)-start, &value);
TRACE("%s\n", debug_strval(reader, &value));
- /* skip rest of markup '->' */
+ /* skip rest of markup '-->' */
reader_skipn(reader, 3);
reader_set_strvalue(reader, StringValue_Value, &value);
@@ -1472,8 +1472,9 @@ static HRESULT reader_parse_comment(xmlreader *reader)
}
}
- reader_skipn(reader, 1);
ptr++;
+ if (*ptr)
+ reader_skipn(reader, 1);
}
return S_OK;
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index 41adad1598..0bbdabbb96 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -1579,7 +1579,6 @@ static void test_read_pending(void)
ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr);
/* newer versions are happy when it's enough data to detect node type,
older versions keep reading until it fails to read more */
-todo_wine
ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall);
ok(type == XmlNodeType_Comment || broken(type == XmlNodeType_None), "got %d\n", type);
--
2.23.0
2
3
[PATCH vkd3d v2 1/2] vkd3d: Return valid node masks in external resource heap properties.
by Conor McCarthy 20 Nov '19
by Conor McCarthy 20 Nov '19
20 Nov '19
Hitman 2 calls GetHeapProperties() for each swapchain buffer and checks if
the creation node mask is 1. If not then it fails to store the resource
pointers for later rendering.
Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com>
---
Supersedes 173580.
---
libs/vkd3d/resource.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 256c0b9..c5f55fd 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -1534,6 +1534,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_GetHeapProperties(ID3D12Resource
{
memset(heap_properties, 0, sizeof(*heap_properties));
heap_properties->Type = D3D12_HEAP_TYPE_DEFAULT;
+ heap_properties->CreationNodeMask = 1;
+ heap_properties->VisibleNodeMask = 1;
}
if (flags)
*flags = D3D12_HEAP_FLAG_NONE;
--
2.24.0
1
1
[PATCH vkd3d v2 1/2] vkd3d: Add stub for ID3D12GraphicsCommandList2::WriteBufferImmediate().
by Conor McCarthy 20 Nov '19
by Conor McCarthy 20 Nov '19
20 Nov '19
ID3D12GraphicsCommandList2 and WriteBufferImmediate() are used by
Hitman 2, but implementing the function on top of an AMD extension has
no effect on game behaviour. It's commonly used to write debug info.
A stub for ID3D12GraphicsCommandList1::SetViewInstanceMask() is also
added to fill out the Vtable.
Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com>
---
Supersedes 173221.
---
include/vkd3d_d3d12.idl | 27 ++++
libs/vkd3d/command.c | 276 ++++++++++++++++++++-----------------
libs/vkd3d/device.c | 4 +-
libs/vkd3d/vkd3d_private.h | 2 +-
4 files changed, 181 insertions(+), 128 deletions(-)
diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl
index ec8b83d..8246424 100644
--- a/include/vkd3d_d3d12.idl
+++ b/include/vkd3d_d3d12.idl
@@ -1820,6 +1820,19 @@ typedef enum D3D12_PREDICATION_OP
D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1,
} D3D12_PREDICATION_OP;
+typedef struct D3D12_WRITEBUFFERIMMEDIATE_PARAMETER
+{
+ D3D12_GPU_VIRTUAL_ADDRESS Dest;
+ UINT32 Value;
+} D3D12_WRITEBUFFERIMMEDIATE_PARAMETER;
+
+typedef enum D3D12_WRITEBUFFERIMMEDIATE_MODE
+{
+ D3D12_WRITEBUFFERIMMEDIATE_MODE_DEFAULT = 0,
+ D3D12_WRITEBUFFERIMMEDIATE_MODE_MARKER_IN = 1,
+ D3D12_WRITEBUFFERIMMEDIATE_MODE_MARKER_OUT = 2,
+} D3D12_WRITEBUFFERIMMEDIATE_MODE;
+
[
uuid(8efb471d-616c-4f49-90f7-127bb763fa51),
object,
@@ -2000,6 +2013,20 @@ interface ID3D12GraphicsCommandList1 : ID3D12GraphicsCommandList
UINT dst_sub_resource_idx, UINT dst_x, UINT dst_y,
ID3D12Resource *src_resource, UINT src_sub_resource_idx,
D3D12_RECT *src_rect, DXGI_FORMAT format, D3D12_RESOLVE_MODE mode);
+
+ void SetViewInstanceMask(UINT mask);
+}
+
+[
+ uuid(38c3e585-ff17-412c-9150-4fc6f9d72a28),
+ object,
+ local,
+ pointer_default(unique)
+]
+interface ID3D12GraphicsCommandList2 : ID3D12GraphicsCommandList1
+{
+ void WriteBufferImmediate(UINT count, const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *params,
+ const D3D12_WRITEBUFFERIMMEDIATE_MODE *modes);
}
typedef enum D3D12_TILE_RANGE_FLAGS
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 297054b..76ea121 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -1807,9 +1807,9 @@ HRESULT d3d12_command_allocator_create(struct d3d12_device *device,
}
/* ID3D12CommandList */
-static inline struct d3d12_command_list *impl_from_ID3D12GraphicsCommandList1(ID3D12GraphicsCommandList1 *iface)
+static inline struct d3d12_command_list *impl_from_ID3D12GraphicsCommandList2(ID3D12GraphicsCommandList2 *iface)
{
- return CONTAINING_RECORD(iface, struct d3d12_command_list, ID3D12GraphicsCommandList1_iface);
+ return CONTAINING_RECORD(iface, struct d3d12_command_list, ID3D12GraphicsCommandList2_iface);
}
static void d3d12_command_list_invalidate_current_framebuffer(struct d3d12_command_list *list)
@@ -2159,19 +2159,20 @@ static void d3d12_command_list_track_resource_usage(struct d3d12_command_list *l
}
}
-static HRESULT STDMETHODCALLTYPE d3d12_command_list_QueryInterface(ID3D12GraphicsCommandList1 *iface,
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_QueryInterface(ID3D12GraphicsCommandList2 *iface,
REFIID iid, void **object)
{
TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object);
- if (IsEqualGUID(iid, &IID_ID3D12GraphicsCommandList1)
+ if (IsEqualGUID(iid, &IID_ID3D12GraphicsCommandList2)
+ || IsEqualGUID(iid, &IID_ID3D12GraphicsCommandList1)
|| IsEqualGUID(iid, &IID_ID3D12GraphicsCommandList)
|| IsEqualGUID(iid, &IID_ID3D12CommandList)
|| IsEqualGUID(iid, &IID_ID3D12DeviceChild)
|| IsEqualGUID(iid, &IID_ID3D12Object)
|| IsEqualGUID(iid, &IID_IUnknown))
{
- ID3D12GraphicsCommandList1_AddRef(iface);
+ ID3D12GraphicsCommandList2_AddRef(iface);
*object = iface;
return S_OK;
}
@@ -2182,9 +2183,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_QueryInterface(ID3D12Graphic
return E_NOINTERFACE;
}
-static ULONG STDMETHODCALLTYPE d3d12_command_list_AddRef(ID3D12GraphicsCommandList1 *iface)
+static ULONG STDMETHODCALLTYPE d3d12_command_list_AddRef(ID3D12GraphicsCommandList2 *iface)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
ULONG refcount = InterlockedIncrement(&list->refcount);
TRACE("%p increasing refcount to %u.\n", list, refcount);
@@ -2192,9 +2193,9 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_AddRef(ID3D12GraphicsCommandLi
return refcount;
}
-static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandList1 *iface)
+static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandList2 *iface)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
ULONG refcount = InterlockedDecrement(&list->refcount);
TRACE("%p decreasing refcount to %u.\n", list, refcount);
@@ -2217,66 +2218,66 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL
return refcount;
}
-static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetPrivateData(ID3D12GraphicsCommandList1 *iface,
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetPrivateData(ID3D12GraphicsCommandList2 *iface,
REFGUID guid, UINT *data_size, void *data)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data);
return vkd3d_get_private_data(&list->private_store, guid, data_size, data);
}
-static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateData(ID3D12GraphicsCommandList1 *iface,
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateData(ID3D12GraphicsCommandList2 *iface,
REFGUID guid, UINT data_size, const void *data)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data);
return vkd3d_set_private_data(&list->private_store, guid, data_size, data);
}
-static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateDataInterface(ID3D12GraphicsCommandList1 *iface,
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateDataInterface(ID3D12GraphicsCommandList2 *iface,
REFGUID guid, const IUnknown *data)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
return vkd3d_set_private_data_interface(&list->private_store, guid, data);
}
-static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetName(ID3D12GraphicsCommandList1 *iface, const WCHAR *name)
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetName(ID3D12GraphicsCommandList2 *iface, const WCHAR *name)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, name %s.\n", iface, debugstr_w(name, list->device->wchar_size));
return name ? S_OK : E_INVALIDARG;
}
-static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetDevice(ID3D12GraphicsCommandList1 *iface, REFIID iid, void **device)
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetDevice(ID3D12GraphicsCommandList2 *iface, REFIID iid, void **device)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device);
return d3d12_device_query_interface(list->device, iid, device);
}
-static D3D12_COMMAND_LIST_TYPE STDMETHODCALLTYPE d3d12_command_list_GetType(ID3D12GraphicsCommandList1 *iface)
+static D3D12_COMMAND_LIST_TYPE STDMETHODCALLTYPE d3d12_command_list_GetType(ID3D12GraphicsCommandList2 *iface)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p.\n", iface);
return list->type;
}
-static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandList1 *iface)
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandList2 *iface)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct vkd3d_vk_device_procs *vk_procs;
VkResult vr;
@@ -2320,7 +2321,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL
static void d3d12_command_list_reset_state(struct d3d12_command_list *list,
ID3D12PipelineState *initial_pipeline_state)
{
- ID3D12GraphicsCommandList1 *iface = &list->ID3D12GraphicsCommandList1_iface;
+ ID3D12GraphicsCommandList2 *iface = &list->ID3D12GraphicsCommandList2_iface;
memset(list->strides, 0, sizeof(list->strides));
list->primitive_topology = D3D_PRIMITIVE_TOPOLOGY_POINTLIST;
@@ -2350,14 +2351,14 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list,
memset(list->so_counter_buffers, 0, sizeof(list->so_counter_buffers));
memset(list->so_counter_buffer_offsets, 0, sizeof(list->so_counter_buffer_offsets));
- ID3D12GraphicsCommandList1_SetPipelineState(iface, initial_pipeline_state);
+ ID3D12GraphicsCommandList2_SetPipelineState(iface, initial_pipeline_state);
}
-static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandList1 *iface,
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandList2 *iface,
ID3D12CommandAllocator *allocator, ID3D12PipelineState *initial_pipeline_state)
{
struct d3d12_command_allocator *allocator_impl = unsafe_impl_from_ID3D12CommandAllocator(allocator);
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
HRESULT hr;
TRACE("iface %p, allocator %p, initial_pipeline_state %p.\n",
@@ -2384,7 +2385,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandL
return hr;
}
-static HRESULT STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCommandList1 *iface,
+static HRESULT STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCommandList2 *iface,
ID3D12PipelineState *pipeline_state)
{
FIXME("iface %p, pipline_state %p stub!\n", iface, pipeline_state);
@@ -2987,11 +2988,11 @@ static void d3d12_command_list_check_index_buffer_strip_cut_value(struct d3d12_c
}
}
-static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCommandList2 *iface,
UINT vertex_count_per_instance, UINT instance_count, UINT start_vertex_location,
UINT start_instance_location)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct vkd3d_vk_device_procs *vk_procs;
TRACE("iface %p, vertex_count_per_instance %u, instance_count %u, "
@@ -3011,11 +3012,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCom
instance_count, start_vertex_location, start_instance_location));
}
-static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12GraphicsCommandList2 *iface,
UINT index_count_per_instance, UINT instance_count, UINT start_vertex_location,
INT base_vertex_location, UINT start_instance_location)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct vkd3d_vk_device_procs *vk_procs;
TRACE("iface %p, index_count_per_instance %u, instance_count %u, start_vertex_location %u, "
@@ -3037,10 +3038,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap
instance_count, start_vertex_location, base_vertex_location, start_instance_location));
}
-static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandList2 *iface,
UINT x, UINT y, UINT z)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct vkd3d_vk_device_procs *vk_procs;
TRACE("iface %p, x %u, y %u, z %u.\n", iface, x, y, z);
@@ -3056,10 +3057,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandL
VK_CALL(vkCmdDispatch(list->vk_command_buffer, x, y, z));
}
-static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12GraphicsCommandList2 *iface,
ID3D12Resource *dst, UINT64 dst_offset, ID3D12Resource *src, UINT64 src_offset, UINT64 byte_count)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
struct d3d12_resource *dst_resource, *src_resource;
const struct vkd3d_vk_device_procs *vk_procs;
VkBufferCopy buffer_copy;
@@ -3339,11 +3340,11 @@ static bool validate_d3d12_box(const D3D12_BOX *box)
&& box->back > box->front;
}
-static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12GraphicsCommandList2 *iface,
const D3D12_TEXTURE_COPY_LOCATION *dst, UINT dst_x, UINT dst_y, UINT dst_z,
const D3D12_TEXTURE_COPY_LOCATION *src, const D3D12_BOX *src_box)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
struct d3d12_resource *dst_resource, *src_resource;
const struct vkd3d_format *src_format, *dst_format;
const struct vkd3d_vk_device_procs *vk_procs;
@@ -3474,10 +3475,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic
}
}
-static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsCommandList2 *iface,
ID3D12Resource *dst, ID3D12Resource *src)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
struct d3d12_resource *dst_resource, *src_resource;
const struct vkd3d_format *src_format, *dst_format;
const struct vkd3d_vk_device_procs *vk_procs;
@@ -3544,7 +3545,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm
}
}
-static void STDMETHODCALLTYPE d3d12_command_list_CopyTiles(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_CopyTiles(ID3D12GraphicsCommandList2 *iface,
ID3D12Resource *tiled_resource, const D3D12_TILED_RESOURCE_COORDINATE *tile_region_start_coordinate,
const D3D12_TILE_REGION_SIZE *tile_region_size, ID3D12Resource *buffer, UINT64 buffer_offset,
D3D12_TILE_COPY_FLAGS flags)
@@ -3555,11 +3556,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTiles(ID3D12GraphicsCommand
buffer, buffer_offset, flags);
}
-static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12GraphicsCommandList2 *iface,
ID3D12Resource *dst, UINT dst_sub_resource_idx,
ID3D12Resource *src, UINT src_sub_resource_idx, DXGI_FORMAT format)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct vkd3d_format *src_format, *dst_format, *vk_format;
struct d3d12_resource *dst_resource, *src_resource;
const struct vkd3d_vk_device_procs *vk_procs;
@@ -3630,10 +3631,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &vk_image_resolve));
}
-static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12GraphicsCommandList2 *iface,
D3D12_PRIMITIVE_TOPOLOGY topology)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, topology %#x.\n", iface, topology);
@@ -3650,11 +3651,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr
d3d12_command_list_invalidate_current_pipeline(list);
}
-static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCommandList2 *iface,
UINT viewport_count, const D3D12_VIEWPORT *viewports)
{
VkViewport vk_viewports[D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct vkd3d_vk_device_procs *vk_procs;
unsigned int i;
@@ -3686,10 +3687,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCo
VK_CALL(vkCmdSetViewport(list->vk_command_buffer, 0, viewport_count, vk_viewports));
}
-static void STDMETHODCALLTYPE d3d12_command_list_RSSetScissorRects(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_RSSetScissorRects(ID3D12GraphicsCommandList2 *iface,
UINT rect_count, const D3D12_RECT *rects)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
VkRect2D vk_rects[D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
const struct vkd3d_vk_device_procs *vk_procs;
unsigned int i;
@@ -3714,10 +3715,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetScissorRects(ID3D12Graphic
VK_CALL(vkCmdSetScissor(list->vk_command_buffer, 0, rect_count, vk_rects));
}
-static void STDMETHODCALLTYPE d3d12_command_list_OMSetBlendFactor(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_OMSetBlendFactor(ID3D12GraphicsCommandList2 *iface,
const FLOAT blend_factor[4])
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct vkd3d_vk_device_procs *vk_procs;
TRACE("iface %p, blend_factor %p.\n", iface, blend_factor);
@@ -3726,10 +3727,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetBlendFactor(ID3D12Graphics
VK_CALL(vkCmdSetBlendConstants(list->vk_command_buffer, blend_factor));
}
-static void STDMETHODCALLTYPE d3d12_command_list_OMSetStencilRef(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_OMSetStencilRef(ID3D12GraphicsCommandList2 *iface,
UINT stencil_ref)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct vkd3d_vk_device_procs *vk_procs;
TRACE("iface %p, stencil_ref %u.\n", iface, stencil_ref);
@@ -3738,11 +3739,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetStencilRef(ID3D12GraphicsC
VK_CALL(vkCmdSetStencilReference(list->vk_command_buffer, VK_STENCIL_FRONT_AND_BACK, stencil_ref));
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12GraphicsCommandList2 *iface,
ID3D12PipelineState *pipeline_state)
{
struct d3d12_pipeline_state *state = unsafe_impl_from_ID3D12PipelineState(pipeline_state);
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state);
@@ -3793,10 +3794,10 @@ static unsigned int d3d12_find_ds_multiplanar_transition(const D3D12_RESOURCE_BA
return 0;
}
-static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList2 *iface,
UINT barrier_count, const D3D12_RESOURCE_BARRIER *barriers)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
bool have_aliasing_barriers = false, have_split_barriers = false;
const struct vkd3d_vk_device_procs *vk_procs;
const struct vkd3d_vulkan_info *vk_info;
@@ -4026,13 +4027,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC
WARN("Issuing split barrier(s) on D3D12_RESOURCE_BARRIER_FLAG_END_ONLY.\n");
}
-static void STDMETHODCALLTYPE d3d12_command_list_ExecuteBundle(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_ExecuteBundle(ID3D12GraphicsCommandList2 *iface,
ID3D12GraphicsCommandList *command_list)
{
FIXME("iface %p, command_list %p stub!\n", iface, command_list);
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetDescriptorHeaps(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetDescriptorHeaps(ID3D12GraphicsCommandList2 *iface,
UINT heap_count, ID3D12DescriptorHeap *const *heaps)
{
TRACE("iface %p, heap_count %u, heaps %p.\n", iface, heap_count, heaps);
@@ -4056,10 +4057,10 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis
d3d12_command_list_invalidate_root_parameters(list, bind_point);
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList2 *iface,
ID3D12RootSignature *root_signature)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_signature %p.\n", iface, root_signature);
@@ -4067,10 +4068,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12G
unsafe_impl_from_ID3D12RootSignature(root_signature));
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12GraphicsCommandList2 *iface,
ID3D12RootSignature *root_signature)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_signature %p.\n", iface, root_signature);
@@ -4092,10 +4093,10 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l
bindings->descriptor_table_active_mask |= (uint64_t)1 << index;
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList2 *iface,
UINT root_parameter_index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_parameter_index %u, base_descriptor %#"PRIx64".\n",
iface, root_parameter_index, base_descriptor.ptr);
@@ -4104,10 +4105,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(I
root_parameter_index, base_descriptor);
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootDescriptorTable(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootDescriptorTable(ID3D12GraphicsCommandList2 *iface,
UINT root_parameter_index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_parameter_index %u, base_descriptor %#"PRIx64".\n",
iface, root_parameter_index, base_descriptor.ptr);
@@ -4129,10 +4130,10 @@ static void d3d12_command_list_set_root_constants(struct d3d12_command_list *lis
c->stage_flags, c->offset + offset * sizeof(uint32_t), count * sizeof(uint32_t), data));
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstant(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstant(ID3D12GraphicsCommandList2 *iface,
UINT root_parameter_index, UINT data, UINT dst_offset)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_parameter_index %u, data 0x%08x, dst_offset %u.\n",
iface, root_parameter_index, data, dst_offset);
@@ -4141,10 +4142,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstant(ID3
root_parameter_index, dst_offset, 1, &data);
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstant(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstant(ID3D12GraphicsCommandList2 *iface,
UINT root_parameter_index, UINT data, UINT dst_offset)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_parameter_index %u, data 0x%08x, dst_offset %u.\n",
iface, root_parameter_index, data, dst_offset);
@@ -4153,10 +4154,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstant(ID
root_parameter_index, dst_offset, 1, &data);
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstants(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstants(ID3D12GraphicsCommandList2 *iface,
UINT root_parameter_index, UINT constant_count, const void *data, UINT dst_offset)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_parameter_index %u, constant_count %u, data %p, dst_offset %u.\n",
iface, root_parameter_index, constant_count, data, dst_offset);
@@ -4165,10 +4166,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstants(ID
root_parameter_index, dst_offset, constant_count, data);
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstants(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstants(ID3D12GraphicsCommandList2 *iface,
UINT root_parameter_index, UINT constant_count, const void *data, UINT dst_offset)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_parameter_index %u, constant_count %u, data %p, dst_offset %u.\n",
iface, root_parameter_index, constant_count, data, dst_offset);
@@ -4221,9 +4222,9 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list,
}
static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootConstantBufferView(
- ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
+ ID3D12GraphicsCommandList2 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n",
iface, root_parameter_index, address);
@@ -4232,9 +4233,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootConstantBufferVie
}
static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootConstantBufferView(
- ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
+ ID3D12GraphicsCommandList2 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n",
iface, root_parameter_index, address);
@@ -4293,9 +4294,9 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li
}
static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootShaderResourceView(
- ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
+ ID3D12GraphicsCommandList2 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n",
iface, root_parameter_index, address);
@@ -4305,9 +4306,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootShaderResourceVie
}
static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootShaderResourceView(
- ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
+ ID3D12GraphicsCommandList2 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n",
iface, root_parameter_index, address);
@@ -4317,9 +4318,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootShaderResourceVi
}
static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootUnorderedAccessView(
- ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
+ ID3D12GraphicsCommandList2 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n",
iface, root_parameter_index, address);
@@ -4329,9 +4330,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootUnorderedAccessVi
}
static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootUnorderedAccessView(
- ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
+ ID3D12GraphicsCommandList2 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n",
iface, root_parameter_index, address);
@@ -4340,10 +4341,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootUnorderedAccessV
root_parameter_index, address);
}
-static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12GraphicsCommandList2 *iface,
const D3D12_INDEX_BUFFER_VIEW *view)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct vkd3d_vk_device_procs *vk_procs;
struct d3d12_resource *resource;
enum VkIndexType index_type;
@@ -4378,10 +4379,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics
view->BufferLocation - resource->gpu_address, index_type));
}
-static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12GraphicsCommandList2 *iface,
UINT start_slot, UINT view_count, const D3D12_VERTEX_BUFFER_VIEW *views)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct vkd3d_null_resources *null_resources;
struct vkd3d_gpu_va_allocator *gpu_va_allocator;
VkDeviceSize offsets[ARRAY_SIZE(list->strides)];
@@ -4430,10 +4431,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi
d3d12_command_list_invalidate_current_pipeline(list);
}
-static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsCommandList2 *iface,
UINT start_slot, UINT view_count, const D3D12_STREAM_OUTPUT_BUFFER_VIEW *views)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
VkDeviceSize offsets[ARRAY_SIZE(list->so_counter_buffers)];
VkDeviceSize sizes[ARRAY_SIZE(list->so_counter_buffers)];
VkBuffer buffers[ARRAY_SIZE(list->so_counter_buffers)];
@@ -4495,11 +4496,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsComm
VK_CALL(vkCmdBindTransformFeedbackBuffersEXT(list->vk_command_buffer, first, count, buffers, offsets, sizes));
}
-static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12GraphicsCommandList2 *iface,
UINT render_target_descriptor_count, const D3D12_CPU_DESCRIPTOR_HANDLE *render_target_descriptors,
BOOL single_descriptor_handle, const D3D12_CPU_DESCRIPTOR_HANDLE *depth_stencil_descriptor)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct d3d12_rtv_desc *rtv_desc;
const struct d3d12_dsv_desc *dsv_desc;
VkFormat prev_dsv_format;
@@ -4700,12 +4701,12 @@ static void d3d12_command_list_clear(struct d3d12_command_list *list,
}
}
-static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12GraphicsCommandList2 *iface,
D3D12_CPU_DESCRIPTOR_HANDLE dsv, D3D12_CLEAR_FLAGS flags, float depth, UINT8 stencil,
UINT rect_count, const D3D12_RECT *rects)
{
const union VkClearValue clear_value = {.depthStencil = {depth, stencil}};
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct d3d12_dsv_desc *dsv_desc = d3d12_dsv_desc_from_cpu_handle(dsv);
struct VkAttachmentDescription attachment_desc;
struct VkAttachmentReference ds_reference;
@@ -4749,10 +4750,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra
&clear_value, rect_count, rects);
}
-static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12GraphicsCommandList2 *iface,
D3D12_CPU_DESCRIPTOR_HANDLE rtv, const FLOAT color[4], UINT rect_count, const D3D12_RECT *rects)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct d3d12_rtv_desc *rtv_desc = d3d12_rtv_desc_from_cpu_handle(rtv);
struct VkAttachmentDescription attachment_desc;
struct VkAttachmentReference color_reference;
@@ -4803,11 +4804,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra
&clear_value, rect_count, rects);
}
-static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID3D12GraphicsCommandList2 *iface,
D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource,
const UINT values[4], UINT rect_count, const D3D12_RECT *rects)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const struct vkd3d_vk_device_procs *vk_procs;
const struct vkd3d_vulkan_info *vk_info;
const struct d3d12_desc *cpu_descriptor;
@@ -4900,11 +4901,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID
}
}
-static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList2 *iface,
D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource,
const float values[4], UINT rect_count, const D3D12_RECT *rects)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
struct d3d12_resource *resource_impl;
FIXME("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p stub!\n",
@@ -4915,16 +4916,16 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(I
d3d12_command_list_track_resource_usage(list, resource_impl);
}
-static void STDMETHODCALLTYPE d3d12_command_list_DiscardResource(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_DiscardResource(ID3D12GraphicsCommandList2 *iface,
ID3D12Resource *resource, const D3D12_DISCARD_REGION *region)
{
FIXME_ONCE("iface %p, resource %p, region %p stub!\n", iface, resource, region);
}
-static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsCommandList2 *iface,
ID3D12QueryHeap *heap, D3D12_QUERY_TYPE type, UINT index)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap);
const struct vkd3d_vk_device_procs *vk_procs;
VkQueryControlFlags flags = 0;
@@ -4951,10 +4952,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsComman
VK_CALL(vkCmdBeginQuery(list->vk_command_buffer, query_heap->vk_query_pool, index, flags));
}
-static void STDMETHODCALLTYPE d3d12_command_list_EndQuery(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_EndQuery(ID3D12GraphicsCommandList2 *iface,
ID3D12QueryHeap *heap, D3D12_QUERY_TYPE type, UINT index)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap);
const struct vkd3d_vk_device_procs *vk_procs;
@@ -4996,12 +4997,12 @@ static size_t get_query_stride(D3D12_QUERY_TYPE type)
return sizeof(uint64_t);
}
-static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12GraphicsCommandList2 *iface,
ID3D12QueryHeap *heap, D3D12_QUERY_TYPE type, UINT start_index, UINT query_count,
ID3D12Resource *dst_buffer, UINT64 aligned_dst_buffer_offset)
{
const struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap);
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
struct d3d12_resource *buffer = unsafe_impl_from_ID3D12Resource(dst_buffer);
const struct vkd3d_vk_device_procs *vk_procs;
unsigned int i, first, count;
@@ -5077,10 +5078,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics
}
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCommandList2 *iface,
ID3D12Resource *buffer, UINT64 aligned_buffer_offset, D3D12_PREDICATION_OP operation)
{
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
struct d3d12_resource *resource = unsafe_impl_from_ID3D12Resource(buffer);
const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info;
const struct vkd3d_vk_device_procs *vk_procs;
@@ -5149,19 +5150,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCo
}
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetMarker(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetMarker(ID3D12GraphicsCommandList2 *iface,
UINT metadata, const void *data, UINT size)
{
FIXME("iface %p, metadata %#x, data %p, size %u stub!\n", iface, metadata, data, size);
}
-static void STDMETHODCALLTYPE d3d12_command_list_BeginEvent(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_BeginEvent(ID3D12GraphicsCommandList2 *iface,
UINT metadata, const void *data, UINT size)
{
FIXME("iface %p, metadata %#x, data %p, size %u stub!\n", iface, metadata, data, size);
}
-static void STDMETHODCALLTYPE d3d12_command_list_EndEvent(ID3D12GraphicsCommandList1 *iface)
+static void STDMETHODCALLTYPE d3d12_command_list_EndEvent(ID3D12GraphicsCommandList2 *iface)
{
FIXME("iface %p stub!\n", iface);
}
@@ -5170,14 +5171,14 @@ STATIC_ASSERT(sizeof(VkDispatchIndirectCommand) == sizeof(D3D12_DISPATCH_ARGUMEN
STATIC_ASSERT(sizeof(VkDrawIndexedIndirectCommand) == sizeof(D3D12_DRAW_INDEXED_ARGUMENTS));
STATIC_ASSERT(sizeof(VkDrawIndirectCommand) == sizeof(D3D12_DRAW_ARGUMENTS));
-static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsCommandList2 *iface,
ID3D12CommandSignature *command_signature, UINT max_command_count, ID3D12Resource *arg_buffer,
UINT64 arg_buffer_offset, ID3D12Resource *count_buffer, UINT64 count_buffer_offset)
{
struct d3d12_command_signature *sig_impl = unsafe_impl_from_ID3D12CommandSignature(command_signature);
struct d3d12_resource *count_impl = unsafe_impl_from_ID3D12Resource(count_buffer);
struct d3d12_resource *arg_impl = unsafe_impl_from_ID3D12Resource(arg_buffer);
- struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
const D3D12_COMMAND_SIGNATURE_DESC *signature_desc;
const struct vkd3d_vk_device_procs *vk_procs;
unsigned int i;
@@ -5271,7 +5272,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC
}
}
-static void STDMETHODCALLTYPE d3d12_command_list_AtomicCopyBufferUINT(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_AtomicCopyBufferUINT(ID3D12GraphicsCommandList2 *iface,
ID3D12Resource *dst_buffer, UINT64 dst_offset,
ID3D12Resource *src_buffer, UINT64 src_offset,
UINT dependent_resource_count, ID3D12Resource * const *dependent_resources,
@@ -5284,7 +5285,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_AtomicCopyBufferUINT(ID3D12Grap
dependent_resource_count, dependent_resources, dependent_sub_resource_ranges);
}
-static void STDMETHODCALLTYPE d3d12_command_list_AtomicCopyBufferUINT64(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_AtomicCopyBufferUINT64(ID3D12GraphicsCommandList2 *iface,
ID3D12Resource *dst_buffer, UINT64 dst_offset,
ID3D12Resource *src_buffer, UINT64 src_offset,
UINT dependent_resource_count, ID3D12Resource * const *dependent_resources,
@@ -5297,20 +5298,20 @@ static void STDMETHODCALLTYPE d3d12_command_list_AtomicCopyBufferUINT64(ID3D12Gr
dependent_resource_count, dependent_resources, dependent_sub_resource_ranges);
}
-static void STDMETHODCALLTYPE d3d12_command_list_OMSetDepthBounds(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_OMSetDepthBounds(ID3D12GraphicsCommandList2 *iface,
FLOAT min, FLOAT max)
{
FIXME("iface %p, min %.8e, max %.8e stub!\n", iface, min, max);
}
-static void STDMETHODCALLTYPE d3d12_command_list_SetSamplePositions(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_SetSamplePositions(ID3D12GraphicsCommandList2 *iface,
UINT sample_count, UINT pixel_count, D3D12_SAMPLE_POSITION *sample_positions)
{
FIXME("iface %p, sample_count %u, pixel_count %u, sample_positions %p stub!\n",
iface, sample_count, pixel_count, sample_positions);
}
-static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresourceRegion(ID3D12GraphicsCommandList1 *iface,
+static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresourceRegion(ID3D12GraphicsCommandList2 *iface,
ID3D12Resource *dst_resource, UINT dst_sub_resource_idx, UINT dst_x, UINT dst_y,
ID3D12Resource *src_resource, UINT src_sub_resource_idx,
D3D12_RECT *src_rect, DXGI_FORMAT format, D3D12_RESOLVE_MODE mode)
@@ -5322,7 +5323,29 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresourceRegion(ID3D12
src_resource, src_sub_resource_idx, src_rect, format, mode);
}
-static const struct ID3D12GraphicsCommandList1Vtbl d3d12_command_list_vtbl =
+static void STDMETHODCALLTYPE d3d12_command_list_SetViewInstanceMask(ID3D12GraphicsCommandList2 *iface, UINT mask)
+{
+ FIXME("iface %p, mask %u stub!\n", iface, mask);
+}
+
+static void STDMETHODCALLTYPE d3d12_command_list_WriteBufferImmediate(ID3D12GraphicsCommandList2 *iface,
+ UINT count, const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *params,
+ const D3D12_WRITEBUFFERIMMEDIATE_MODE *modes)
+{
+ struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface);
+ struct d3d12_resource *resource;
+ UINT i;
+
+ FIXME("iface %p, count %u, params %p, modes %p stub!\n", iface, count, params, modes);
+
+ for (i = 0; i < count; ++i)
+ {
+ resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, params[i].Dest);
+ d3d12_command_list_track_resource_usage(list, resource);
+ }
+}
+
+static const struct ID3D12GraphicsCommandList2Vtbl d3d12_command_list_vtbl =
{
/* IUnknown methods */
d3d12_command_list_QueryInterface,
@@ -5395,6 +5418,9 @@ static const struct ID3D12GraphicsCommandList1Vtbl d3d12_command_list_vtbl =
d3d12_command_list_OMSetDepthBounds,
d3d12_command_list_SetSamplePositions,
d3d12_command_list_ResolveSubresourceRegion,
+ d3d12_command_list_SetViewInstanceMask,
+ /* ID3D12GraphicsCommandList2 methods */
+ d3d12_command_list_WriteBufferImmediate,
};
static struct d3d12_command_list *unsafe_impl_from_ID3D12CommandList(ID3D12CommandList *iface)
@@ -5402,7 +5428,7 @@ static struct d3d12_command_list *unsafe_impl_from_ID3D12CommandList(ID3D12Comma
if (!iface)
return NULL;
assert(iface->lpVtbl == (struct ID3D12CommandListVtbl *)&d3d12_command_list_vtbl);
- return CONTAINING_RECORD(iface, struct d3d12_command_list, ID3D12GraphicsCommandList1_iface);
+ return CONTAINING_RECORD(iface, struct d3d12_command_list, ID3D12GraphicsCommandList2_iface);
}
static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d3d12_device *device,
@@ -5411,7 +5437,7 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d
{
HRESULT hr;
- list->ID3D12GraphicsCommandList1_iface.lpVtbl = &d3d12_command_list_vtbl;
+ list->ID3D12GraphicsCommandList2_iface.lpVtbl = &d3d12_command_list_vtbl;
list->refcount = 1;
list->type = type;
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 0624318..8611b30 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -2307,8 +2307,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device *if
initial_pipeline_state, &object)))
return hr;
- return return_interface(&object->ID3D12GraphicsCommandList1_iface,
- &IID_ID3D12GraphicsCommandList1, riid, command_list);
+ return return_interface(&object->ID3D12GraphicsCommandList2_iface,
+ &IID_ID3D12GraphicsCommandList2, riid, command_list);
}
/* Direct3D feature levels restrict which formats can be optionally supported. */
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 84b5ff2..b5d0be5 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -914,7 +914,7 @@ struct vkd3d_pipeline_bindings
/* ID3D12CommandList */
struct d3d12_command_list
{
- ID3D12GraphicsCommandList1 ID3D12GraphicsCommandList1_iface;
+ ID3D12GraphicsCommandList2 ID3D12GraphicsCommandList2_iface;
LONG refcount;
D3D12_COMMAND_LIST_TYPE type;
--
2.24.0
1
1
Signed-off-by: Jeff Smith <whydoubt(a)gmail.com>
---
dlls/msvcrt/tests/time.c | 209 ++++++++++++---------------------------
1 file changed, 63 insertions(+), 146 deletions(-)
diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c
index cf79e5971e..c8acd848bf 100644
--- a/dlls/msvcrt/tests/time.c
+++ b/dlls/msvcrt/tests/time.c
@@ -588,13 +588,59 @@ static void test_daylight(void)
static void test_strftime(void)
{
+ const struct {
+ const char *format;
+ } tests_einval[] = {
+ {"%C"},
+ {"%D"},
+ {"%e"},
+ {"%F"},
+ {"%h"},
+ {"%n"},
+ {"%R"},
+ {"%t"},
+ {"%T"},
+ {"%u"},
+ };
+
+ const struct {
+ const char *format;
+ const char *ret;
+ struct tm tm;
+ BOOL todo;
+ } tests[] = {
+ {"e%#%e", "e%e", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%c", "01/01/70 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%c", "02/30/70 00:00:00", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE},
+ {"%x", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%X", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%a", "Thu", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%A", "Thursday", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%b", "Jan", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%B", "January", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%#d", "1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%H", "00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%I", "12", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%j", "001", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%m", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%#M", "0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%p", "AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%U", "00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%W", "00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%U", "01", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }},
+ {"%W", "00", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }},
+ {"%U", "53", { 0, 0, 0, 1, 0, 70, 0, 365, 0 }},
+ {"%W", "52", { 0, 0, 0, 1, 0, 70, 0, 365, 0 }},
+ };
+
static const wchar_t cW[] = { '%','c',0 };
- static const char expected[] = "01/01/70 00:00:00";
time_t gmt;
struct tm* gmt_tm;
char buf[256], bufA[256];
WCHAR bufW[256];
long retA, retW;
+ int i;
if (!p_strftime || !p_wcsftime || !p_gmtime)
{
@@ -608,55 +654,13 @@ static void test_strftime(void)
gmt_tm = p_gmtime(&gmt);
ok(gmt_tm != NULL, "gmtime failed\n");
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%C", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%D", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%e", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%F", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%h", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%n", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%R", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%t", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%T", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%u", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
+ for (i=0; i<ARRAY_SIZE(tests_einval); i++)
+ {
+ errno = 0xdeadbeef;
+ retA = p_strftime(bufA, 256, tests_einval[i].format, gmt_tm);
+ ok(retA == 0, "%d) ret = %ld\n", i, retA);
+ ok(errno==EINVAL || broken(errno==0xdeadbeef), "%d) errno = %d\n", i, errno);
+ }
errno = 0xdeadbeef;
retA = p_strftime(NULL, 0, "copy", gmt_tm);
@@ -691,14 +695,17 @@ static void test_strftime(void)
ok(errno == EINVAL, "errno = %d\n", errno);
}
- retA = p_strftime(bufA, 256, "e%#%e", gmt_tm);
- ok(retA == 3, "expected 3, got %ld\n", retA);
- ok(!strcmp(bufA, "e%e"), "got %s\n", bufA);
+ for (i=0; i<ARRAY_SIZE(tests); i++)
+ {
+ retA = p_strftime(bufA, 256, tests[i].format, &tests[i].tm);
+ todo_wine_if(tests[i].todo) {
+ ok(retA == strlen(tests[i].ret), "%d) ret = %ld\n", i, retA);
+ ok(!strcmp(bufA, tests[i].ret), "%d) buf = \"%s\", expected \"%s\"\n",
+ i, bufA, tests[i].ret);
+ }
+ }
retA = p_strftime(bufA, 256, "%c", gmt_tm);
- ok(retA == 17, "expected 17, got %ld\n", retA);
- ok(strcmp(bufA, expected) == 0, "expected %s, got %s\n", expected, bufA);
-
retW = p_wcsftime(bufW, 256, cW, gmt_tm);
ok(retW == 17, "expected 17, got %ld\n", retW);
ok(retA == retW, "expected %ld, got %ld\n", retA, retW);
@@ -707,96 +714,6 @@ static void test_strftime(void)
buf[retA] = 0;
ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf);
- retA = p_strftime(bufA, 256, "%x", gmt_tm);
- ok(retA == 8, "expected 8, got %ld\n", retA);
- ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%X", gmt_tm);
- ok(retA == 8, "expected 8, got %ld\n", retA);
- ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%a", gmt_tm);
- ok(retA == 3, "expected 3, got %ld\n", retA);
- ok(!strcmp(bufA, "Thu"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%A", gmt_tm);
- ok(retA == 8, "expected 8, got %ld\n", retA);
- ok(!strcmp(bufA, "Thursday"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%b", gmt_tm);
- ok(retA == 3, "expected 3, got %ld\n", retA);
- ok(!strcmp(bufA, "Jan"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%B", gmt_tm);
- ok(retA == 7, "expected 7, got %ld\n", retA);
- ok(!strcmp(bufA, "January"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%d", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "01"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%#d", gmt_tm);
- ok(retA == 1, "expected 1, got %ld\n", retA);
- ok(!strcmp(bufA, "1"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%H", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "00"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%I", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "12"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%j", gmt_tm);
- ok(retA == 3, "expected 3, got %ld\n", retA);
- ok(!strcmp(bufA, "001"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%m", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "01"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%#M", gmt_tm);
- ok(retA == 1, "expected 1, got %ld\n", retA);
- ok(!strcmp(bufA, "0"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%p", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "AM"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%U", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "00"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%W", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "00"), "got %s\n", bufA);
-
- gmt_tm->tm_wday = 0;
- retA = p_strftime(bufA, 256, "%U", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "01"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%W", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "00"), "got %s\n", bufA);
-
- gmt_tm->tm_yday = 365;
- retA = p_strftime(bufA, 256, "%U", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "53"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%W", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "52"), "got %s\n", bufA);
-
- gmt_tm->tm_mon = 1;
- gmt_tm->tm_mday = 30;
- retA = p_strftime(bufA, 256, "%c", gmt_tm);
- todo_wine {
- ok(retA == 17, "expected 17, got %ld\n", retA);
- ok(!strcmp(bufA, "02/30/70 00:00:00"), "got %s\n", bufA);
- }
-
if(!setlocale(LC_ALL, "Japanese_Japan.932")) {
win_skip("Japanese_Japan.932 locale not available\n");
return;
--
2.23.0
3
8
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/winhttp/Makefile.in | 2 +
dlls/winhttp/cookie.c | 36 +++---
dlls/winhttp/handle.c | 3 +-
dlls/winhttp/main.c | 5 +-
dlls/winhttp/net.c | 15 ++-
dlls/winhttp/request.c | 218 ++++++++++++++++-----------------
dlls/winhttp/session.c | 90 +++++++-------
dlls/winhttp/url.c | 48 ++++----
dlls/winhttp/winhttp_private.h | 9 +-
9 files changed, 208 insertions(+), 218 deletions(-)
diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in
index f4fc317c5f..6e9f8b82e4 100644
--- a/dlls/winhttp/Makefile.in
+++ b/dlls/winhttp/Makefile.in
@@ -3,6 +3,8 @@ IMPORTLIB = winhttp
IMPORTS = uuid jsproxy user32 advapi32 ws2_32
DELAYIMPORTS = oleaut32 ole32 crypt32 secur32 iphlpapi dhcpcsvc
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
cookie.c \
handle.c \
diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c
index 40c11c6f71..3166290eab 100644
--- a/dlls/winhttp/cookie.c
+++ b/dlls/winhttp/cookie.c
@@ -16,12 +16,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-#include "ws2tcpip.h"
#include <stdarg.h>
+#include <wchar.h>
#include "windef.h"
#include "winbase.h"
+#include "ws2tcpip.h"
#include "winhttp.h"
#include "wine/debug.h"
@@ -69,7 +69,7 @@ static struct cookie *find_cookie( struct domain *domain, const WCHAR *path, con
LIST_FOR_EACH( item, &domain->cookies )
{
cookie = LIST_ENTRY( item, struct cookie, entry );
- if (!strcmpW( cookie->path, path ) && !strcmpW( cookie->name, name ))
+ if (!wcscmp( cookie->path, path ) && !wcscmp( cookie->name, name ))
{
TRACE("found %s=%s\n", debugstr_w(cookie->name), debugstr_w(cookie->value));
return cookie;
@@ -82,8 +82,8 @@ static BOOL domain_match( const WCHAR *name, struct domain *domain, BOOL partial
{
TRACE("comparing %s with %s\n", debugstr_w(name), debugstr_w(domain->name));
- if (partial && !strstrW( name, domain->name )) return FALSE;
- else if (!partial && strcmpW( name, domain->name )) return FALSE;
+ if (partial && !wcsstr( name, domain->name )) return FALSE;
+ else if (!partial && wcscmp( name, domain->name )) return FALSE;
return TRUE;
}
@@ -165,7 +165,7 @@ static struct cookie *parse_cookie( const WCHAR *string )
const WCHAR *p;
int len;
- if (!(p = strchrW( string, '=' ))) p = string + strlenW( string );
+ if (!(p = wcschr( string, '=' ))) p = string + lstrlenW( string );
len = p - string;
while (len && string[len - 1] == ' ') len--;
if (!len) return NULL;
@@ -184,7 +184,7 @@ static struct cookie *parse_cookie( const WCHAR *string )
if (*p++ == '=')
{
while (*p == ' ') p++;
- len = strlenW( p );
+ len = lstrlenW( p );
while (len && p[len - 1] == ' ') len--;
if (!(cookie->value = heap_alloc( (len + 1) * sizeof(WCHAR) )))
@@ -272,9 +272,9 @@ BOOL set_cookies( struct request *request, const WCHAR *cookies )
struct cookie *cookie;
int len, used;
- len = strlenW( cookies );
+ len = lstrlenW( cookies );
if (!(buffer = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE;
- strcpyW( buffer, cookies );
+ lstrcpyW( buffer, cookies );
p = buffer;
while (*p && *p != ';') p++;
@@ -284,15 +284,15 @@ BOOL set_cookies( struct request *request, const WCHAR *cookies )
heap_free( buffer );
return FALSE;
}
- len = strlenW( p );
+ len = lstrlenW( p );
while (len && (attr = parse_attr( p, &used )))
{
- if (!strcmpiW( attr->name, domainW ))
+ if (!wcsicmp( attr->name, domainW ))
{
domain = attr;
cookie_domain = attr->value;
}
- else if (!strcmpiW( attr->name, pathW ))
+ else if (!wcsicmp( attr->name, pathW ))
{
path = attr;
cookie_path = attr->value;
@@ -308,7 +308,7 @@ BOOL set_cookies( struct request *request, const WCHAR *cookies )
if (!cookie_domain && !(cookie_domain = strdupW( request->connect->servername ))) goto end;
if (!cookie_path && !(cookie_path = strdupW( request->path ))) goto end;
- if ((p = strrchrW( cookie_path, '/' )) && p != cookie_path) *p = 0;
+ if ((p = wcsrchr( cookie_path, '/' )) && p != cookie_path) *p = 0;
ret = add_cookie( session, cookie, cookie_domain, cookie_path );
end:
@@ -342,14 +342,14 @@ BOOL add_cookie_headers( struct request *request )
TRACE("comparing path %s with %s\n", debugstr_w(request->path), debugstr_w(cookie->path));
- if (strstrW( request->path, cookie->path ) == request->path)
+ if (wcsstr( request->path, cookie->path ) == request->path)
{
static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '};
- int len, len_cookie = ARRAY_SIZE( cookieW ), len_name = strlenW( cookie->name );
+ int len, len_cookie = ARRAY_SIZE( cookieW ), len_name = lstrlenW( cookie->name );
WCHAR *header;
len = len_cookie + len_name;
- if (cookie->value) len += strlenW( cookie->value ) + 1;
+ if (cookie->value) len += lstrlenW( cookie->value ) + 1;
if (!(header = heap_alloc( (len + 1) * sizeof(WCHAR) )))
{
LeaveCriticalSection( &session->cs );
@@ -357,11 +357,11 @@ BOOL add_cookie_headers( struct request *request )
}
memcpy( header, cookieW, len_cookie * sizeof(WCHAR) );
- strcpyW( header + len_cookie, cookie->name );
+ lstrcpyW( header + len_cookie, cookie->name );
if (cookie->value)
{
header[len_cookie + len_name] = '=';
- strcpyW( header + len_cookie + len_name + 1, cookie->value );
+ lstrcpyW( header + len_cookie + len_name + 1, cookie->value );
}
TRACE("%s\n", debugstr_w(header));
diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c
index 6711cd9172..9c77d5166a 100644
--- a/dlls/winhttp/handle.c
+++ b/dlls/winhttp/handle.c
@@ -18,12 +18,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-#include "ws2tcpip.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
+#include "ws2tcpip.h"
#include "winhttp.h"
#include "wine/debug.h"
diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c
index e6c084b979..3b570fee6d 100644
--- a/dlls/winhttp/main.c
+++ b/dlls/winhttp/main.c
@@ -16,13 +16,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define COBJMACROS
-#include "config.h"
-#include "ws2tcpip.h"
#include <stdarg.h>
+#define COBJMACROS
#include "windef.h"
#include "winbase.h"
+#include "ws2tcpip.h"
#include "objbase.h"
#include "rpcproxy.h"
#include "httprequest.h"
diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c
index a1ad0461d4..c9da098f52 100644
--- a/dlls/winhttp/net.c
+++ b/dlls/winhttp/net.c
@@ -17,20 +17,17 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-#define NONAMELESSUNION
-#include "ws2tcpip.h"
-#include <stdarg.h>
-#include <stdio.h>
#include <assert.h>
+#include <stdarg.h>
+#define NONAMELESSUNION
#include "windef.h"
#include "winbase.h"
+#include "ws2tcpip.h"
#include "winhttp.h"
#include "schannel.h"
#include "wine/debug.h"
-#include "wine/library.h"
#include "winhttp_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(winhttp);
@@ -207,7 +204,9 @@ struct netconn *netconn_create( struct hostdata *host, const struct sockaddr_sto
addr_len = sizeof(struct sockaddr_in6);
break;
default:
- assert(0);
+ ERR( "unhandled family %u\n", conn->sockaddr.ss_family );
+ heap_free( conn );
+ return NULL;
}
if (timeout > 0) set_blocking( conn, FALSE );
@@ -374,7 +373,7 @@ BOOL netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD securi
heap_free(read_buf);
if(status != SEC_E_OK || res != ERROR_SUCCESS) {
- WARN("Failed to initialize security context failed: %08x\n", status);
+ WARN("Failed to initialize security context: %08x\n", status);
heap_free(conn->ssl_buf);
conn->ssl_buf = NULL;
DeleteSecurityContext(&ctx);
diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index 46a47f3bc2..0fd1d1abe9 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define COBJMACROS
-#include "config.h"
-#include "ws2tcpip.h"
-#include <stdarg.h>
#include <assert.h>
+#include <stdarg.h>
+#include <wchar.h>
+#define COBJMACROS
#include "windef.h"
#include "winbase.h"
+#include "ws2tcpip.h"
#include "ole2.h"
#include "initguid.h"
#include "httprequest.h"
@@ -300,7 +300,7 @@ static struct header *parse_header( const WCHAR *string )
int len;
p = string;
- if (!(q = strchrW( p, ':' )))
+ if (!(q = wcschr( p, ':' )))
{
WARN("no ':' in line %s\n", debugstr_w(string));
return NULL;
@@ -331,7 +331,7 @@ static struct header *parse_header( const WCHAR *string )
q++; /* skip past colon */
while (*q == ' ') q++;
- len = strlenW( q );
+ len = lstrlenW( q );
if (!(header->value = heap_alloc( (len + 1) * sizeof(WCHAR) )))
{
@@ -352,7 +352,7 @@ static int get_header_index( struct request *request, const WCHAR *field, int re
for (index = 0; index < request->num_headers; index++)
{
- if (strcmpiW( request->headers[index].field, field )) continue;
+ if (wcsicmp( request->headers[index].field, field )) continue;
if (request_only && !request->headers[index].is_request) continue;
if (!request_only && request->headers[index].is_request) continue;
@@ -438,8 +438,8 @@ BOOL process_header( struct request *request, const WCHAR *field, const WCHAR *v
int len, len_orig, len_value;
struct header *header = &request->headers[index];
- len_orig = strlenW( header->value );
- len_value = strlenW( value );
+ len_orig = lstrlenW( header->value );
+ len_value = lstrlenW( value );
len = len_orig + len_value + 2;
if (!(tmp = heap_realloc( header->value, (len + 1) * sizeof(WCHAR) ))) return FALSE;
@@ -469,7 +469,7 @@ BOOL add_request_headers( struct request *request, const WCHAR *headers, DWORD l
WCHAR *buffer, *p, *q;
struct header *header;
- if (len == ~0u) len = strlenW( headers );
+ if (len == ~0u) len = lstrlenW( headers );
if (!len) return TRUE;
if (!(buffer = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE;
memcpy( buffer, headers, len * sizeof(WCHAR) );
@@ -548,24 +548,24 @@ static WCHAR *build_absolute_request_path( struct request *request, const WCHAR
static const WCHAR fmt[] = {'%','s',':','/','/','%','s',0};
const WCHAR *scheme;
WCHAR *ret;
- int len;
+ int len, offset;
scheme = (request->netconn ? request->netconn->secure : (request->hdr.flags & WINHTTP_FLAG_SECURE)) ? https : http;
- len = strlenW( scheme ) + strlenW( request->connect->hostname ) + 4; /* '://' + nul */
+ len = lstrlenW( scheme ) + lstrlenW( request->connect->hostname ) + 4; /* '://' + nul */
if (request->connect->hostport) len += 6; /* ':' between host and port, up to 5 for port */
- len += strlenW( request->path );
+ len += lstrlenW( request->path );
if ((ret = heap_alloc( len * sizeof(WCHAR) )))
{
- len = sprintfW( ret, fmt, scheme, request->connect->hostname );
+ offset = swprintf( ret, len, fmt, scheme, request->connect->hostname );
if (request->connect->hostport)
{
static const WCHAR port_fmt[] = {':','%','u',0};
- len += sprintfW( ret + len, port_fmt, request->connect->hostport );
+ offset += swprintf( ret + offset, len - offset, port_fmt, request->connect->hostport );
}
- strcpyW( ret + len, request->path );
- if (path) *path = ret + len;
+ lstrcpyW( ret + offset, request->path );
+ if (path) *path = ret + offset;
}
return ret;
@@ -578,39 +578,39 @@ static WCHAR *build_request_string( struct request *request )
WCHAR *path, *ret;
unsigned int i, len;
- if (!strcmpiW( request->connect->hostname, request->connect->servername )) path = request->path;
+ if (!wcsicmp( request->connect->hostname, request->connect->servername )) path = request->path;
else if (!(path = build_absolute_request_path( request, NULL ))) return NULL;
- len = strlenW( request->verb ) + 1 /* ' ' */;
- len += strlenW( path ) + 1 /* ' ' */;
- len += strlenW( request->version );
+ len = lstrlenW( request->verb ) + 1 /* ' ' */;
+ len += lstrlenW( path ) + 1 /* ' ' */;
+ len += lstrlenW( request->version );
for (i = 0; i < request->num_headers; i++)
{
if (request->headers[i].is_request)
- len += strlenW( request->headers[i].field ) + strlenW( request->headers[i].value ) + 4; /* '\r\n: ' */
+ len += lstrlenW( request->headers[i].field ) + lstrlenW( request->headers[i].value ) + 4; /* '\r\n: ' */
}
len += 4; /* '\r\n\r\n' */
if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) )))
{
- strcpyW( ret, request->verb );
- strcatW( ret, spaceW );
- strcatW( ret, path );
- strcatW( ret, spaceW );
- strcatW( ret, request->version );
+ lstrcpyW( ret, request->verb );
+ lstrcatW( ret, spaceW );
+ lstrcatW( ret, path );
+ lstrcatW( ret, spaceW );
+ lstrcatW( ret, request->version );
for (i = 0; i < request->num_headers; i++)
{
if (request->headers[i].is_request)
{
- strcatW( ret, crlfW );
- strcatW( ret, request->headers[i].field );
- strcatW( ret, colonW );
- strcatW( ret, request->headers[i].value );
+ lstrcatW( ret, crlfW );
+ lstrcatW( ret, request->headers[i].field );
+ lstrcatW( ret, colonW );
+ lstrcatW( ret, request->headers[i].value );
}
}
- strcatW( ret, twocrlfW );
+ lstrcatW( ret, twocrlfW );
}
if (path != request->path) heap_free( path );
@@ -681,7 +681,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na
headers = request->raw_headers;
if (!headers) return FALSE;
- len = strlenW( headers ) * sizeof(WCHAR);
+ len = lstrlenW( headers ) * sizeof(WCHAR);
if (!buffer || len + sizeof(WCHAR) > *buflen)
{
len += sizeof(WCHAR);
@@ -698,7 +698,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na
return ret;
}
case WINHTTP_QUERY_VERSION:
- len = strlenW( request->version ) * sizeof(WCHAR);
+ len = lstrlenW( request->version ) * sizeof(WCHAR);
if (!buffer || len + sizeof(WCHAR) > *buflen)
{
len += sizeof(WCHAR);
@@ -706,7 +706,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na
}
else
{
- strcpyW( buffer, request->version );
+ lstrcpyW( buffer, request->version );
TRACE("returning string: %s\n", debugstr_w(buffer));
ret = TRUE;
}
@@ -714,7 +714,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na
return ret;
case WINHTTP_QUERY_STATUS_TEXT:
- len = strlenW( request->status_text ) * sizeof(WCHAR);
+ len = lstrlenW( request->status_text ) * sizeof(WCHAR);
if (!buffer || len + sizeof(WCHAR) > *buflen)
{
len += sizeof(WCHAR);
@@ -722,7 +722,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na
}
else
{
- strcpyW( buffer, request->status_text );
+ lstrcpyW( buffer, request->status_text );
TRACE("returning string: %s\n", debugstr_w(buffer));
ret = TRUE;
}
@@ -730,7 +730,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na
return ret;
case WINHTTP_QUERY_REQUEST_METHOD:
- len = strlenW( request->verb ) * sizeof(WCHAR);
+ len = lstrlenW( request->verb ) * sizeof(WCHAR);
if (!buffer || len + sizeof(WCHAR) > *buflen)
{
len += sizeof(WCHAR);
@@ -738,7 +738,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na
}
else
{
- strcpyW( buffer, request->verb );
+ lstrcpyW( buffer, request->verb );
TRACE("returning string: %s\n", debugstr_w(buffer));
ret = TRUE;
}
@@ -780,7 +780,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na
else
{
int *number = buffer;
- *number = atoiW( header->value );
+ *number = wcstol( header->value, NULL, 10 );
TRACE("returning number: %d\n", *number);
ret = TRUE;
}
@@ -803,7 +803,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na
}
else if (header->value)
{
- len = strlenW( header->value ) * sizeof(WCHAR);
+ len = lstrlenW( header->value ) * sizeof(WCHAR);
if (!buffer || len + sizeof(WCHAR) > *buflen)
{
len += sizeof(WCHAR);
@@ -811,7 +811,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na
}
else
{
- strcpyW( buffer, header->value );
+ lstrcpyW( buffer, header->value );
TRACE("returning string: %s\n", debugstr_w(buffer));
ret = TRUE;
}
@@ -885,7 +885,7 @@ static DWORD auth_scheme_from_header( const WCHAR *header )
for (i = 0; i < ARRAY_SIZE( auth_schemes ); i++)
{
- if (!strncmpiW( header, auth_schemes[i].str, auth_schemes[i].len ) &&
+ if (!wcsnicmp( header, auth_schemes[i].str, auth_schemes[i].len ) &&
(header[auth_schemes[i].len] == ' ' || !header[auth_schemes[i].len])) return auth_schemes[i].scheme;
}
return 0;
@@ -1194,8 +1194,8 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem
if (!username || !password) return FALSE;
if ((!authinfo && !(authinfo = alloc_authinfo())) || authinfo->finished) return FALSE;
- userlen = WideCharToMultiByte( CP_UTF8, 0, username, strlenW( username ), NULL, 0, NULL, NULL );
- passlen = WideCharToMultiByte( CP_UTF8, 0, password, strlenW( password ), NULL, 0, NULL, NULL );
+ userlen = WideCharToMultiByte( CP_UTF8, 0, username, lstrlenW( username ), NULL, 0, NULL, NULL );
+ passlen = WideCharToMultiByte( CP_UTF8, 0, password, lstrlenW( password ), NULL, 0, NULL, NULL );
authinfo->data_len = userlen + 1 + passlen;
if (!(authinfo->data = heap_alloc( authinfo->data_len ))) return FALSE;
@@ -1228,7 +1228,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem
first = TRUE;
domain = (WCHAR *)username;
- user = strchrW( username, '\\' );
+ user = wcschr( username, '\\' );
if (user) user++;
else
@@ -1238,11 +1238,11 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem
}
id.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE;
id.User = user;
- id.UserLength = strlenW( user );
+ id.UserLength = lstrlenW( user );
id.Domain = domain;
id.DomainLength = domain ? user - domain - 1 : 0;
id.Password = (WCHAR *)password;
- id.PasswordLength = strlenW( password );
+ id.PasswordLength = lstrlenW( password );
status = AcquireCredentialsHandleW( NULL, (SEC_WCHAR *)auth_schemes[scheme].str,
SECPKG_CRED_OUTBOUND, NULL, &id, NULL, NULL,
@@ -1268,8 +1268,8 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem
}
else if (authinfo->finished) return FALSE;
- if ((strlenW( auth_value ) < auth_schemes[authinfo->scheme].len ||
- strncmpiW( auth_value, auth_schemes[authinfo->scheme].str, auth_schemes[authinfo->scheme].len )))
+ if ((lstrlenW( auth_value ) < auth_schemes[authinfo->scheme].len ||
+ wcsnicmp( auth_value, auth_schemes[authinfo->scheme].str, auth_schemes[authinfo->scheme].len )))
{
ERR("authentication scheme changed from %s to %s\n",
debugstr_w(auth_schemes[authinfo->scheme].str), debugstr_w(auth_value));
@@ -1288,7 +1288,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem
p = auth_value + auth_schemes[scheme].len;
if (*p == ' ')
{
- int len = strlenW( ++p );
+ int len = lstrlenW( ++p );
in.cbBuffer = decode_base64( p, len, NULL );
if (!(in.pvBuffer = heap_alloc( in.cbBuffer ))) {
destroy_authinfo( authinfo );
@@ -1368,10 +1368,10 @@ static WCHAR *build_proxy_connect_string( struct request *request )
static const WCHAR twocrlfW[] = {'\r','\n','\r','\n',0};
WCHAR *ret, *host;
unsigned int i;
- int len;
+ int len = lstrlenW( request->connect->hostname ) + 7;
- if (!(host = heap_alloc( (strlenW( request->connect->hostname ) + 7) * sizeof(WCHAR) ))) return NULL;
- len = sprintfW( host, fmtW, request->connect->hostname, request->connect->hostport );
+ if (!(host = heap_alloc( len * sizeof(WCHAR) ))) return NULL;
+ len = swprintf( host, len, fmtW, request->connect->hostname, request->connect->hostport );
len += ARRAY_SIZE(connectW);
len += ARRAY_SIZE(http1_1);
@@ -1379,29 +1379,29 @@ static WCHAR *build_proxy_connect_string( struct request *request )
for (i = 0; i < request->num_headers; i++)
{
if (request->headers[i].is_request)
- len += strlenW( request->headers[i].field ) + strlenW( request->headers[i].value ) + 4; /* '\r\n: ' */
+ len += lstrlenW( request->headers[i].field ) + lstrlenW( request->headers[i].value ) + 4; /* '\r\n: ' */
}
len += 4; /* '\r\n\r\n' */
if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) )))
{
- strcpyW( ret, connectW );
- strcatW( ret, spaceW );
- strcatW( ret, host );
- strcatW( ret, spaceW );
- strcatW( ret, http1_1 );
+ lstrcpyW( ret, connectW );
+ lstrcatW( ret, spaceW );
+ lstrcatW( ret, host );
+ lstrcatW( ret, spaceW );
+ lstrcatW( ret, http1_1 );
for (i = 0; i < request->num_headers; i++)
{
if (request->headers[i].is_request)
{
- strcatW( ret, crlfW );
- strcatW( ret, request->headers[i].field );
- strcatW( ret, colonW );
- strcatW( ret, request->headers[i].value );
+ lstrcatW( ret, crlfW );
+ lstrcatW( ret, request->headers[i].field );
+ lstrcatW( ret, colonW );
+ lstrcatW( ret, request->headers[i].value );
}
}
- strcatW( ret, twocrlfW );
+ lstrcatW( ret, twocrlfW );
}
heap_free( host );
@@ -1599,7 +1599,7 @@ static BOOL open_connection( struct request *request )
LIST_FOR_EACH_ENTRY( iter, &connection_pool, struct hostdata, entry )
{
- if (iter->port == port && !strcmpW( connect->servername, iter->hostname ) && !is_secure == !iter->secure)
+ if (iter->port == port && !wcscmp( connect->servername, iter->hostname ) && !is_secure == !iter->secure)
{
host = iter;
host->ref++;
@@ -1656,7 +1656,7 @@ static BOOL open_connection( struct request *request )
if (!connect->resolved)
{
- len = strlenW( host->hostname ) + 1;
+ len = lstrlenW( host->hostname ) + 1;
send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, host->hostname, len );
if (!netconn_resolve( host->hostname, port, &connect->sockaddr, request->resolve_timeout ))
@@ -1671,7 +1671,7 @@ static BOOL open_connection( struct request *request )
release_host( host );
return FALSE;
}
- len = strlenW( addressW ) + 1;
+ len = lstrlenW( addressW ) + 1;
send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, addressW, len );
}
@@ -1701,7 +1701,7 @@ static BOOL open_connection( struct request *request )
if (is_secure)
{
if (connect->session->proxy_server &&
- strcmpiW( connect->hostname, connect->servername ))
+ wcsicmp( connect->hostname, connect->servername ))
{
if (!secure_proxy_connect( request ))
{
@@ -1726,7 +1726,7 @@ static BOOL open_connection( struct request *request )
}
}
- send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, addressW, strlenW(addressW) + 1 );
+ send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, addressW, lstrlenW(addressW) + 1 );
}
else
{
@@ -1778,9 +1778,9 @@ static BOOL add_host_header( struct request *request, DWORD modifier )
{
return process_header( request, attr_host, connect->hostname, modifier, TRUE );
}
- len = strlenW( connect->hostname ) + 7; /* sizeof(":65335") */
+ len = lstrlenW( connect->hostname ) + 7; /* sizeof(":65335") */
if (!(host = heap_alloc( len * sizeof(WCHAR) ))) return FALSE;
- sprintfW( host, fmt, connect->hostname, port );
+ swprintf( host, len, fmt, connect->hostname, port );
ret = process_header( request, attr_host, host, modifier, TRUE );
heap_free( host );
return ret;
@@ -1933,9 +1933,9 @@ static void finished_reading( struct request *request )
else if (query_headers( request, WINHTTP_QUERY_CONNECTION, NULL, connection, &size, NULL ) ||
query_headers( request, WINHTTP_QUERY_PROXY_CONNECTION, NULL, connection, &size, NULL ))
{
- if (!strcmpiW( connection, closeW )) close = TRUE;
+ if (!wcsicmp( connection, closeW )) close = TRUE;
}
- else if (!strcmpW( request->version, http1_0 )) close = TRUE;
+ else if (!wcscmp( request->version, http1_0 )) close = TRUE;
if (close)
{
close_connection( request );
@@ -2092,7 +2092,7 @@ static DWORD str_to_wire( const WCHAR *src, int src_len, char *dst, enum escape_
DWORD len;
char *utf8;
- if (src_len < 0) src_len = strlenW( src );
+ if (src_len < 0) src_len = lstrlenW( src );
len = WideCharToMultiByte( CP_UTF8, 0, src, src_len, NULL, 0, NULL, NULL );
if (!(utf8 = heap_alloc( len ))) return 0;
@@ -2111,16 +2111,16 @@ static char *build_wire_path( struct request *request, DWORD *ret_len )
enum escape_flags path_flags, query_flags;
char *ret;
- if (!strcmpiW( request->connect->hostname, request->connect->servername )) start = full_path = request->path;
+ if (!wcsicmp( request->connect->hostname, request->connect->servername )) start = full_path = request->path;
else if (!(full_path = build_absolute_request_path( request, &start ))) return NULL;
- len = strlenW( full_path );
- if ((path = strchrW( start, '/' )))
+ len = lstrlenW( full_path );
+ if ((path = wcschr( start, '/' )))
{
- len_path = strlenW( path );
- if ((query = strchrW( path, '?' )))
+ len_path = lstrlenW( path );
+ if ((query = wcschr( path, '?' )))
{
- len_query = strlenW( query );
+ len_query = lstrlenW( query );
len_path -= len_query;
}
}
@@ -2222,10 +2222,10 @@ static BOOL send_request( struct request *request, const WCHAR *headers, DWORD h
if (request->creds[TARGET_SERVER][SCHEME_BASIC].username)
do_authorization( request, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC );
- if (total_len || (request->verb && !strcmpW( request->verb, postW )))
+ if (total_len || (request->verb && !wcscmp( request->verb, postW )))
{
WCHAR length[21]; /* decimal long int + null */
- sprintfW( length, length_fmt, total_len );
+ swprintf( length, ARRAY_SIZE(length), length_fmt, total_len );
process_header( request, attr_content_length, length, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE );
}
if (!(request->hdr.disable_flags & WINHTTP_DISABLE_KEEP_ALIVE))
@@ -2315,7 +2315,7 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade
return FALSE;
}
- if (headers && !headers_len) headers_len = strlenW( headers );
+ if (headers && !headers_len) headers_len = lstrlenW( headers );
if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC)
{
@@ -2452,7 +2452,7 @@ static DWORD set_content_length( struct request *request, DWORD status )
WCHAR encoding[20];
DWORD buflen = sizeof(request->content_length);
- if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED || !strcmpW( request->verb, headW ))
+ if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED || !wcscmp( request->verb, headW ))
request->content_length = 0;
else
{
@@ -2462,7 +2462,7 @@ static DWORD set_content_length( struct request *request, DWORD status )
buflen = sizeof(encoding);
if (query_headers( request, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, encoding, &buflen, NULL ) &&
- !strcmpiW( encoding, chunkedW ))
+ !wcsicmp( encoding, chunkedW ))
{
request->content_length = ~0u;
request->read_chunked = TRUE;
@@ -2520,7 +2520,7 @@ static BOOL read_reply( struct request *request )
static const WCHAR crlf[] = {'\r','\n',0};
char buffer[MAX_REPLY_LEN];
- DWORD buflen, len, offset, crlf_len = 2; /* strlenW(crlf) */
+ DWORD buflen, len, offset, crlf_len = 2; /* lstrlenW(crlf) */
char *status_code, *status_text;
WCHAR *versionW, *status_textW, *raw_headers;
WCHAR status_codeW[4]; /* sizeof("nnn") */
@@ -2621,7 +2621,7 @@ static void record_cookies( struct request *request )
for (i = 0; i < request->num_headers; i++)
{
struct header *set_cookie = &request->headers[i];
- if (!strcmpiW( set_cookie->field, attr_set_cookie ) && !set_cookie->is_request)
+ if (!wcsicmp( set_cookie->field, attr_set_cookie ) && !set_cookie->is_request)
{
set_cookies( request, set_cookie->value );
}
@@ -2670,12 +2670,12 @@ static BOOL handle_redirect( struct request *request, DWORD status )
}
else
{
- if ((p = strrchrW( request->path, '/' ))) *p = 0;
- len = strlenW( request->path ) + 1 + len_loc;
+ if ((p = wcsrchr( request->path, '/' ))) *p = 0;
+ len = lstrlenW( request->path ) + 1 + len_loc;
if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end;
- strcpyW( path, request->path );
- strcatW( path, slashW );
- memcpy( path + strlenW(path), location, len_loc * sizeof(WCHAR) );
+ lstrcpyW( path, request->path );
+ lstrcatW( path, slashW );
+ memcpy( path + lstrlenW(path), location, len_loc * sizeof(WCHAR) );
path[len_loc] = 0;
}
heap_free( request->path );
@@ -2705,7 +2705,7 @@ static BOOL handle_redirect( struct request *request, DWORD status )
hostname[len] = 0;
port = uc.nPort ? uc.nPort : (uc.nScheme == INTERNET_SCHEME_HTTPS ? 443 : 80);
- if (strcmpiW( connect->hostname, hostname ) || connect->serverport != port)
+ if (wcsicmp( connect->hostname, hostname ) || connect->serverport != port)
{
heap_free( connect->hostname );
connect->hostname = hostname;
@@ -2739,7 +2739,7 @@ static BOOL handle_redirect( struct request *request, DWORD status )
if ((index = get_header_index( request, attr_content_type, 0, TRUE )) >= 0) delete_header( request, index );
if ((index = get_header_index( request, attr_content_length, 0, TRUE )) >= 0 ) delete_header( request, index );
- if (status != HTTP_STATUS_REDIRECT_KEEP_VERB && !strcmpW( request->verb, postW ))
+ if (status != HTTP_STATUS_REDIRECT_KEEP_VERB && !wcscmp( request->verb, postW ))
{
heap_free( request->verb );
request->verb = strdupW( getW );
@@ -2762,7 +2762,7 @@ static BOOL is_passport_request( struct request *request )
if (!(request->connect->session->passport_flags & WINHTTP_ENABLE_PASSPORT_AUTH) ||
!query_headers( request, WINHTTP_QUERY_WWW_AUTHENTICATE, NULL, buf, &len, NULL )) return FALSE;
- if (!strncmpiW( buf, passportW, ARRAY_SIZE(passportW) ) &&
+ if (!wcsnicmp( buf, passportW, ARRAY_SIZE(passportW) ) &&
(buf[ARRAY_SIZE(passportW)] == ' ' || !buf[ARRAY_SIZE(passportW)])) return TRUE;
return FALSE;
@@ -2772,7 +2772,7 @@ static BOOL handle_passport_redirect( struct request *request )
{
static const WCHAR status401W[] = {'4','0','1',0};
DWORD flags = WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE;
- int i, len = strlenW( request->raw_headers );
+ int i, len = lstrlenW( request->raw_headers );
WCHAR *p = request->raw_headers;
if (!process_header( request, attr_status, status401W, flags, FALSE )) return FALSE;
@@ -3677,14 +3677,14 @@ static HRESULT WINAPI winhttp_request_SetRequestHeader(
err = ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND;
goto done;
}
- len = strlenW( header ) + 4;
- if (value) len += strlenW( value );
+ len = lstrlenW( header ) + 4;
+ if (value) len += lstrlenW( value );
if (!(str = heap_alloc( (len + 1) * sizeof(WCHAR) )))
{
err = ERROR_OUTOFMEMORY;
goto done;
}
- sprintfW( str, fmtW, header, value ? value : emptyW );
+ swprintf( str, len + 1, fmtW, header, value ? value : emptyW );
if (!WinHttpAddRequestHeaders( request->hrequest, str, len,
WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE ))
{
@@ -3843,7 +3843,7 @@ static HRESULT request_receive( struct winhttp_request *request )
return HRESULT_FROM_WIN32( GetLastError() );
}
if ((err = wait_for_completion( request ))) return HRESULT_FROM_WIN32( err );
- if (!strcmpW( request->verb, headW ))
+ if (!wcscmp( request->verb, headW ))
{
request->state = REQUEST_STATE_RESPONSE_RECEIVED;
return S_OK;
@@ -3920,9 +3920,9 @@ static void request_set_utf8_content_type( struct winhttp_request *request )
WCHAR headerW[64];
int len;
- len = sprintfW( headerW, fmtW, attr_content_type, text_plainW );
+ len = swprintf( headerW, ARRAY_SIZE(headerW), fmtW, attr_content_type, text_plainW );
WinHttpAddRequestHeaders( request->hrequest, headerW, len, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW );
- len = sprintfW( headerW, fmtW, attr_content_type, charset_utf8W );
+ len = swprintf( headerW, ARRAY_SIZE(headerW), fmtW, attr_content_type, charset_utf8W );
WinHttpAddRequestHeaders( request->hrequest, headerW, len, WINHTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON );
}
@@ -3936,14 +3936,14 @@ static HRESULT request_send( struct winhttp_request *request )
DWORD err;
if ((err = request_set_parameters( request ))) return HRESULT_FROM_WIN32( err );
- if (strcmpW( request->verb, getW ))
+ if (wcscmp( request->verb, getW ))
{
VariantInit( &data );
if (V_VT( &request->data ) == VT_BSTR)
{
UINT cp = CP_ACP;
const WCHAR *str = V_BSTR( &request->data );
- int i, len = strlenW( str );
+ int i, len = lstrlenW( str );
for (i = 0; i < len; i++)
{
@@ -4153,14 +4153,14 @@ static DWORD request_get_codepage( struct winhttp_request *request, UINT *codepa
{
return GetLastError();
}
- if ((p = strstrW( buffer, charsetW )))
+ if ((p = wcsstr( buffer, charsetW )))
{
- p += strlenW( charsetW );
+ p += lstrlenW( charsetW );
while (*p == ' ') p++;
if (*p++ == '=')
{
while (*p == ' ') p++;
- if (!strcmpiW( p, utf8W )) *codepage = CP_UTF8;
+ if (!wcsicmp( p, utf8W )) *codepage = CP_UTF8;
}
}
heap_free( buffer );
@@ -4506,7 +4506,7 @@ static HRESULT WINAPI winhttp_request_put_Option(
request->url_codepage = V_UI4( &cp );
TRACE("URL codepage: %u\n", request->url_codepage);
}
- else if (V_VT( &value ) == VT_BSTR && !strcmpiW( V_BSTR( &value ), utf8W ))
+ else if (V_VT( &value ) == VT_BSTR && !wcsicmp( V_BSTR( &value ), utf8W ))
{
TRACE("URL codepage: UTF-8\n");
request->url_codepage = CP_UTF8;
diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
index 042b4f7203..690b42ab56 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -16,9 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
#include <stdarg.h>
-#include <stdlib.h>
#include "windef.h"
#include "winbase.h"
@@ -379,7 +377,7 @@ static BOOL domain_matches(LPCWSTR server, LPCWSTR domain)
static const WCHAR localW[] = { '<','l','o','c','a','l','>',0 };
BOOL ret = FALSE;
- if (!strcmpiW( domain, localW ) && !strchrW( server, '.' ))
+ if (!wcsicmp( domain, localW ) && !wcschr( server, '.' ))
ret = TRUE;
else if (*domain == '*')
{
@@ -391,12 +389,12 @@ static BOOL domain_matches(LPCWSTR server, LPCWSTR domain)
* the wildcard exactly. E.g. if the wildcard is *.a.b, and the
* hostname is www.foo.a.b, it matches, but a.b does not.
*/
- dot = strchrW( server, '.' );
+ dot = wcschr( server, '.' );
if (dot)
{
- int len = strlenW( dot + 1 );
+ int len = lstrlenW( dot + 1 );
- if (len > strlenW( domain + 2 ))
+ if (len > lstrlenW( domain + 2 ))
{
LPCWSTR ptr;
@@ -404,8 +402,8 @@ static BOOL domain_matches(LPCWSTR server, LPCWSTR domain)
* could be a subdomain. Compare the last portion of the
* server's domain.
*/
- ptr = dot + len + 1 - strlenW( domain + 2 );
- if (!strcmpiW( ptr, domain + 2 ))
+ ptr = dot + len + 1 - lstrlenW( domain + 2 );
+ if (!wcsicmp( ptr, domain + 2 ))
{
/* This is only a match if the preceding character is
* a '.', i.e. that it is a matching domain. E.g.
@@ -416,12 +414,12 @@ static BOOL domain_matches(LPCWSTR server, LPCWSTR domain)
}
}
else
- ret = !strcmpiW( dot + 1, domain + 2 );
+ ret = !wcsicmp( dot + 1, domain + 2 );
}
}
}
else
- ret = !strcmpiW( server, domain );
+ ret = !wcsicmp( server, domain );
return ret;
}
@@ -438,9 +436,9 @@ static BOOL should_bypass_proxy(struct session *session, LPCWSTR server)
do {
LPCWSTR tmp = ptr;
- ptr = strchrW( ptr, ';' );
+ ptr = wcschr( ptr, ';' );
if (!ptr)
- ptr = strchrW( tmp, ' ' );
+ ptr = wcschr( tmp, ' ' );
if (ptr)
{
if (ptr - tmp < MAX_HOST_NAME_LENGTH)
@@ -468,9 +466,9 @@ BOOL set_server_for_hostname( struct connect *connect, const WCHAR *server, INTE
{
LPCWSTR colon;
- if ((colon = strchrW( session->proxy_server, ':' )))
+ if ((colon = wcschr( session->proxy_server, ':' )))
{
- if (!connect->servername || strncmpiW( connect->servername,
+ if (!connect->servername || wcsnicmp( connect->servername,
session->proxy_server, colon - session->proxy_server - 1 ))
{
heap_free( connect->servername );
@@ -485,14 +483,14 @@ BOOL set_server_for_hostname( struct connect *connect, const WCHAR *server, INTE
(colon - session->proxy_server) * sizeof(WCHAR) );
connect->servername[colon - session->proxy_server] = 0;
if (*(colon + 1))
- connect->serverport = atoiW( colon + 1 );
+ connect->serverport = wcstol( colon + 1, NULL, 10 );
else
connect->serverport = INTERNET_DEFAULT_PORT;
}
}
else
{
- if (!connect->servername || strcmpiW( connect->servername,
+ if (!connect->servername || wcsicmp( connect->servername,
session->proxy_server ))
{
heap_free( connect->servername );
@@ -635,7 +633,7 @@ static void request_destroy( struct object_header *hdr )
static void str_to_buffer( WCHAR *buffer, const WCHAR *str, LPDWORD buflen )
{
int len = 0;
- if (str) len = strlenW( str );
+ if (str) len = lstrlenW( str );
if (buffer && *buflen > len)
{
if (str) memcpy( buffer, str, len * sizeof(WCHAR) );
@@ -1075,13 +1073,13 @@ static BOOL add_accept_types_header( struct request *request, const WCHAR **type
static WCHAR *get_request_path( const WCHAR *object )
{
- int len = object ? strlenW(object) : 0;
+ int len = object ? lstrlenW(object) : 0;
WCHAR *p, *ret;
if (!object || object[0] != '/') len++;
if (!(p = ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL;
if (!object || object[0] != '/') *p++ = '/';
- if (object) strcpyW( p, object );
+ if (object) lstrcpyW( p, object );
ret[len] = 0;
return ret;
}
@@ -1421,12 +1419,12 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai )
if (!reverse_lookup( ai, name, sizeof(name) )) hostname = name;
- len = strlenW( httpW ) + strlen( hostname ) + strlenW( wpadW );
+ len = lstrlenW( httpW ) + strlen( hostname ) + lstrlenW( wpadW );
if (!(ret = p = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) return NULL;
- strcpyW( p, httpW );
- p += strlenW( httpW );
+ lstrcpyW( p, httpW );
+ p += lstrlenW( httpW );
while (*hostname) { *p++ = *hostname++; }
- strcpyW( p, wpadW );
+ lstrcpyW( p, wpadW );
return ret;
}
@@ -2007,9 +2005,9 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
if (info->dwAccessType == WINHTTP_ACCESS_TYPE_NAMED_PROXY)
{
- size += strlenW( info->lpszProxy );
+ size += lstrlenW( info->lpszProxy );
if (info->lpszProxyBypass)
- size += strlenW( info->lpszProxyBypass );
+ size += lstrlenW( info->lpszProxyBypass );
}
buf = heap_alloc( size );
if (buf)
@@ -2025,14 +2023,14 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
BYTE *dst;
hdr->flags = PROXY_TYPE_PROXY;
- *len++ = strlenW( info->lpszProxy );
+ *len++ = lstrlenW( info->lpszProxy );
for (dst = (BYTE *)len, src = info->lpszProxy; *src;
src++, dst++)
*dst = *src;
len = (DWORD *)dst;
if (info->lpszProxyBypass)
{
- *len++ = strlenW( info->lpszProxyBypass );
+ *len++ = lstrlenW( info->lpszProxyBypass );
for (dst = (BYTE *)len, src = info->lpszProxyBypass; *src;
src++, dst++)
*dst = *src;
@@ -2176,7 +2174,7 @@ BOOL WINAPI WinHttpTimeFromSystemTime( const SYSTEMTIME *time, LPWSTR string )
return FALSE;
}
- sprintfW( string, format,
+ swprintf( string, WINHTTP_TIME_FORMAT_BUFSIZE / sizeof(WCHAR), format,
wkday[time->wDayOfWeek],
time->wDay,
month[time->wMonth - 1],
@@ -2215,15 +2213,15 @@ BOOL WINAPI WinHttpTimeToSystemTime( LPCWSTR string, SYSTEMTIME *time )
SetLastError( ERROR_SUCCESS );
- while (*s && !isalphaW( *s )) s++;
+ while (*s && !iswalpha( *s )) s++;
if (s[0] == '\0' || s[1] == '\0' || s[2] == '\0') return TRUE;
time->wDayOfWeek = 7;
for (i = 0; i < 7; i++)
{
- if (toupperW( wkday[i][0] ) == toupperW( s[0] ) &&
- toupperW( wkday[i][1] ) == toupperW( s[1] ) &&
- toupperW( wkday[i][2] ) == toupperW( s[2] ) )
+ if (towupper( wkday[i][0] ) == towupper( s[0] ) &&
+ towupper( wkday[i][1] ) == towupper( s[1] ) &&
+ towupper( wkday[i][2] ) == towupper( s[2] ) )
{
time->wDayOfWeek = i;
break;
@@ -2231,19 +2229,19 @@ BOOL WINAPI WinHttpTimeToSystemTime( LPCWSTR string, SYSTEMTIME *time )
}
if (time->wDayOfWeek > 6) return TRUE;
- while (*s && !isdigitW( *s )) s++;
- time->wDay = strtolW( s, &end, 10 );
+ while (*s && !iswdigit( *s )) s++;
+ time->wDay = wcstol( s, &end, 10 );
s = end;
- while (*s && !isalphaW( *s )) s++;
+ while (*s && !iswalpha( *s )) s++;
if (s[0] == '\0' || s[1] == '\0' || s[2] == '\0') return TRUE;
time->wMonth = 0;
for (i = 0; i < 12; i++)
{
- if (toupperW( month[i][0]) == toupperW( s[0] ) &&
- toupperW( month[i][1]) == toupperW( s[1] ) &&
- toupperW( month[i][2]) == toupperW( s[2] ) )
+ if (towupper( month[i][0]) == towupper( s[0] ) &&
+ towupper( month[i][1]) == towupper( s[1] ) &&
+ towupper( month[i][2]) == towupper( s[2] ) )
{
time->wMonth = i + 1;
break;
@@ -2251,24 +2249,24 @@ BOOL WINAPI WinHttpTimeToSystemTime( LPCWSTR string, SYSTEMTIME *time )
}
if (time->wMonth == 0) return TRUE;
- while (*s && !isdigitW( *s )) s++;
+ while (*s && !iswdigit( *s )) s++;
if (*s == '\0') return TRUE;
- time->wYear = strtolW( s, &end, 10 );
+ time->wYear = wcstol( s, &end, 10 );
s = end;
- while (*s && !isdigitW( *s )) s++;
+ while (*s && !iswdigit( *s )) s++;
if (*s == '\0') return TRUE;
- time->wHour = strtolW( s, &end, 10 );
+ time->wHour = wcstol( s, &end, 10 );
s = end;
- while (*s && !isdigitW( *s )) s++;
+ while (*s && !iswdigit( *s )) s++;
if (*s == '\0') return TRUE;
- time->wMinute = strtolW( s, &end, 10 );
+ time->wMinute = wcstol( s, &end, 10 );
s = end;
- while (*s && !isdigitW( *s )) s++;
+ while (*s && !iswdigit( *s )) s++;
if (*s == '\0') return TRUE;
- time->wSecond = strtolW( s, &end, 10 );
+ time->wSecond = wcstol( s, &end, 10 );
time->wMilliseconds = 0;
return TRUE;
diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c
index e1255bd6b1..d405090409 100644
--- a/dlls/winhttp/url.c
+++ b/dlls/winhttp/url.c
@@ -16,12 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-#include "ws2tcpip.h"
-#include <stdarg.h>
-
+#include <wchar.h>
#include "windef.h"
#include "winbase.h"
+#include "ws2tcpip.h"
#include "winreg.h"
#include "winhttp.h"
#include "shlwapi.h"
@@ -74,12 +72,12 @@ static WCHAR *decode_url( LPCWSTR url, DWORD *len )
q = ret;
while (*len > 0)
{
- if (p[0] == '%' && isxdigitW( p[1] ) && isxdigitW( p[2] ))
+ if (p[0] == '%' && iswxdigit( p[1] ) && iswxdigit( p[2] ))
{
hex[0] = p[1];
hex[1] = p[2];
hex[2] = 0;
- *q++ = strtolW( hex, NULL, 16 );
+ *q++ = wcstol( hex, NULL, 16 );
p += 3;
*len -= 3;
}
@@ -139,7 +137,7 @@ static DWORD escape_url( const WCHAR *url, DWORD *len, WCHAR **ret )
const WCHAR *p;
DWORD len_base, len_path;
- if ((p = strrchrW( url, '/' )))
+ if ((p = wcsrchr( url, '/' )))
{
len_base = p - url;
if (!escape_string( p, *len - len_base, NULL, &len_path )) return ERROR_INVALID_PARAMETER;
@@ -164,7 +162,7 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret )
{
const WCHAR *p = str;
DWORD port = 0;
- while (len && isdigitW( *p ))
+ while (len && iswdigit( *p ))
{
if ((port = port * 10 + *p - '0') > 65535) return ERROR_WINHTTP_INVALID_URL;
p++; len--;
@@ -191,7 +189,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN
SetLastError( ERROR_INVALID_PARAMETER );
return FALSE;
}
- if (!len) len = strlenW( url );
+ if (!len) len = lstrlenW( url );
if (flags & ICU_ESCAPE)
{
@@ -211,13 +209,13 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN
}
url = url_decoded;
}
- if (!(p = strchrW( url, ':' )))
+ if (!(p = wcschr( url, ':' )))
{
SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME );
return FALSE;
}
- if (p - url == 4 && !strncmpiW( url, scheme_http, 4 )) scheme_number = INTERNET_SCHEME_HTTP;
- else if (p - url == 5 && !strncmpiW( url, scheme_https, 5 )) scheme_number = INTERNET_SCHEME_HTTPS;
+ if (p - url == 4 && !wcsnicmp( url, scheme_http, 4 )) scheme_number = INTERNET_SCHEME_HTTP;
+ else if (p - url == 5 && !wcsnicmp( url, scheme_https, 5 )) scheme_number = INTERNET_SCHEME_HTTPS;
else
{
err = ERROR_WINHTTP_UNRECOGNIZED_SCHEME;
@@ -248,10 +246,10 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN
password.str = &uc->lpszPassword;
password.len = &uc->dwPasswordLength;
- if ((q = memchrW( p, '@', len - (p - url) )) && !(memchrW( p, '/', q - p )))
+ if ((q = wmemchr( p, '@', len - (p - url) )) && !(wmemchr( p, '/', q - p )))
{
- if ((r = memchrW( p, ':', q - p )))
+ if ((r = wmemchr( p, ':', q - p )))
{
if ((err = set_component( &username, p, r - p, flags, &overflow ))) goto exit;
r++;
@@ -279,9 +277,9 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN
extra.str = &uc->lpszExtraInfo;
extra.len = &uc->dwExtraInfoLength;
- if ((q = memchrW( p, '/', len - (p - url) )))
+ if ((q = wmemchr( p, '/', len - (p - url) )))
{
- if ((r = memchrW( p, ':', q - p )))
+ if ((r = wmemchr( p, ':', q - p )))
{
if ((err = set_component( &hostname, p, r - p, flags, &overflow ))) goto exit;
r++;
@@ -294,7 +292,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN
if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT;
}
- if ((r = memchrW( q, '?', len - (q - url) )))
+ if ((r = wmemchr( q, '?', len - (q - url) )))
{
if (*extra.len)
{
@@ -311,7 +309,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN
}
else
{
- if ((r = memchrW( p, ':', len - (p - url) )))
+ if ((r = wmemchr( p, ':', len - (p - url) )))
{
if ((err = set_component( &hostname, p, r - p, flags, &overflow ))) goto exit;
r++;
@@ -345,8 +343,8 @@ exit:
static INTERNET_SCHEME get_scheme( const WCHAR *scheme, DWORD len )
{
- if (!strncmpW( scheme, scheme_http, len )) return INTERNET_SCHEME_HTTP;
- if (!strncmpW( scheme, scheme_https, len )) return INTERNET_SCHEME_HTTPS;
+ if (!wcsncmp( scheme, scheme_http, len )) return INTERNET_SCHEME_HTTP;
+ if (!wcsncmp( scheme, scheme_https, len )) return INTERNET_SCHEME_HTTPS;
return 0;
}
@@ -369,7 +367,7 @@ static DWORD get_comp_length( DWORD len, DWORD flags, WCHAR *comp )
DWORD ret;
unsigned int i;
- ret = len ? len : strlenW( comp );
+ ret = len ? len : lstrlenW( comp );
if (!(flags & ICU_ESCAPE)) return ret;
for (i = 0; i < len; i++) if (need_escape( comp[i] )) ret += 2;
return ret;
@@ -391,7 +389,7 @@ static BOOL get_url_length( URL_COMPONENTS *uc, DWORD flags, DWORD *len )
{
scheme = uc->nScheme;
if (!scheme) scheme = INTERNET_SCHEME_HTTP;
- *len += strlenW( get_scheme_string( scheme ) );
+ *len += lstrlenW( get_scheme_string( scheme ) );
}
*len += 3; /* "://" */
@@ -421,7 +419,7 @@ static BOOL get_url_length( URL_COMPONENTS *uc, DWORD flags, DWORD *len )
{
WCHAR port[sizeof("65535")];
- *len += sprintfW( port, formatW, uc->nPort );
+ *len += swprintf( port, ARRAY_SIZE(port), formatW, uc->nPort );
*len += 1; /* ":" */
}
if (uc->lpszUrlPath && *uc->lpszUrlPath != '/') *len += 1; /* '/' */
@@ -480,7 +478,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW
if (!scheme) scheme = INTERNET_SCHEME_HTTP;
schemeW = get_scheme_string( scheme );
- len = strlenW( schemeW );
+ len = lstrlenW( schemeW );
memcpy( url, schemeW, len * sizeof(WCHAR) );
url += len;
}
@@ -513,7 +511,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW
if (!uses_default_port( scheme, uc->nPort ))
{
*url++ = ':';
- url += sprintfW( url, formatW, uc->nPort );
+ url += swprintf( url, sizeof("65535"), formatW, uc->nPort );
}
/* add slash between hostname and path if necessary */
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index 734a1ad52a..a820241734 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -19,13 +19,8 @@
#ifndef _WINE_WINHTTP_PRIVATE_H_
#define _WINE_WINHTTP_PRIVATE_H_
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
-
#include "wine/heap.h"
#include "wine/list.h"
-#include "wine/unicode.h"
#include "ole2.h"
#include "sspi.h"
@@ -304,8 +299,8 @@ static inline WCHAR *strdupW( const WCHAR *src )
WCHAR *dst;
if (!src) return NULL;
- dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) );
- if (dst) strcpyW( dst, src );
+ dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) );
+ if (dst) lstrcpyW( dst, src );
return dst;
}
--
2.20.1
2
1
20 Nov '19
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/winhttp/winhttp_private.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index 93cf0f7125..734a1ad52a 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -314,7 +314,7 @@ static inline WCHAR *strdupAW( const char *src )
WCHAR *dst = NULL;
if (src)
{
- DWORD len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 );
+ int len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 );
if ((dst = heap_alloc( len * sizeof(WCHAR) )))
MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len );
}
@@ -341,7 +341,7 @@ static inline char *strdupWA_sized( const WCHAR *src, DWORD size )
int len = WideCharToMultiByte( CP_ACP, 0, src, size, NULL, 0, NULL, NULL ) + 1;
if ((dst = heap_alloc( len )))
{
- WideCharToMultiByte( CP_ACP, 0, src, len, dst, size, NULL, NULL );
+ WideCharToMultiByte( CP_ACP, 0, src, size, dst, len, NULL, NULL );
dst[len - 1] = 0;
}
}
--
2.20.1
1
0
[PATCH 1/3] winhttp: Add support for detecting the proxy config URL via DHCP.
by Hans Leidekker 20 Nov '19
by Hans Leidekker 20 Nov '19
20 Nov '19
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/winhttp/Makefile.in | 3 +-
dlls/winhttp/session.c | 214 ++++++++++++++++++++++-----------------
2 files changed, 121 insertions(+), 96 deletions(-)
diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in
index 659b5821df..f4fc317c5f 100644
--- a/dlls/winhttp/Makefile.in
+++ b/dlls/winhttp/Makefile.in
@@ -1,8 +1,7 @@
MODULE = winhttp.dll
IMPORTLIB = winhttp
IMPORTS = uuid jsproxy user32 advapi32 ws2_32
-DELAYIMPORTS = oleaut32 ole32 crypt32 secur32
-EXTRALIBS = $(CORESERVICES_LIBS)
+DELAYIMPORTS = oleaut32 ole32 crypt32 secur32 iphlpapi dhcpcsvc
C_SRCS = \
cookie.c \
diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
index ef4bb17469..042b4f7203 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -20,14 +20,6 @@
#include <stdarg.h>
#include <stdlib.h>
-#ifdef HAVE_CORESERVICES_CORESERVICES_H
-#define GetCurrentThread MacGetCurrentThread
-#define LoadResource MacLoadResource
-#include <CoreServices/CoreServices.h>
-#undef GetCurrentThread
-#undef LoadResource
-#endif
-
#include "windef.h"
#include "winbase.h"
#include "winsock2.h"
@@ -36,6 +28,8 @@
#include "winhttp.h"
#include "winreg.h"
#include "winternl.h"
+#include "iphlpapi.h"
+#include "dhcpcsdk.h"
#define COBJMACROS
#include "ole2.h"
#include "dispex.h"
@@ -1310,6 +1304,80 @@ BOOL WINAPI WinHttpSetOption( HINTERNET handle, DWORD option, LPVOID buffer, DWO
return ret;
}
+static IP_ADAPTER_ADDRESSES *get_adapters(void)
+{
+ ULONG err, size = 1024, flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST |
+ GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME;
+ IP_ADAPTER_ADDRESSES *tmp, *ret;
+
+ if (!(ret = heap_alloc( size ))) return NULL;
+ err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size );
+ while (err == ERROR_BUFFER_OVERFLOW)
+ {
+ if (!(tmp = heap_realloc( ret, size ))) break;
+ ret = tmp;
+ err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size );
+ }
+ if (err == ERROR_SUCCESS) return ret;
+ heap_free( ret );
+ return NULL;
+}
+
+static WCHAR *detect_autoproxyconfig_url_dhcp(void)
+{
+ IP_ADAPTER_ADDRESSES *adapters, *ptr;
+ DHCPCAPI_PARAMS_ARRAY send_params, recv_params;
+ DHCPCAPI_PARAMS param;
+ WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1], *ret = NULL;
+ DWORD err, size;
+ BYTE *tmp, *buf = NULL;
+
+ if (!(adapters = get_adapters())) return NULL;
+
+ memset( &send_params, 0, sizeof(send_params) );
+ memset( ¶m, 0, sizeof(param) );
+ param.OptionId = OPTION_MSFT_IE_PROXY;
+ recv_params.nParams = 1;
+ recv_params.Params = ¶m;
+
+ for (ptr = adapters; ptr; ptr = ptr->Next)
+ {
+ MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) );
+ TRACE( "adapter '%s' type %u dhcpv4 enabled %d\n", wine_dbgstr_w(name), ptr->IfType, ptr->Dhcpv4Enabled );
+
+ if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue;
+ /* FIXME: also skip adapters where DHCP is disabled */
+
+ size = 256;
+ if (!(buf = heap_alloc( size ))) goto done;
+ err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params,
+ buf, &size, NULL );
+ while (err == ERROR_MORE_DATA)
+ {
+ if (!(tmp = heap_realloc( buf, size ))) goto done;
+ buf = tmp;
+ err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params,
+ buf, &size, NULL );
+ }
+ if (err == ERROR_SUCCESS && param.nBytesData)
+ {
+ int len = MultiByteToWideChar( CP_ACP, 0, (const char *)param.Data, param.nBytesData, NULL, 0 );
+ if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) )))
+ {
+ MultiByteToWideChar( CP_ACP, 0, (const char *)param.Data, param.nBytesData, ret, len );
+ ret[len] = 0;
+ }
+ TRACE("returning %s\n", debugstr_w(ret));
+ break;
+ }
+ }
+
+done:
+ heap_free( buf );
+ heap_free( adapters );
+ return ret;
+}
+
static char *get_computer_name( COMPUTER_NAME_FORMAT format )
{
char *ret;
@@ -1362,50 +1430,57 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai )
return ret;
}
-static BOOL get_system_proxy_autoconfig_url( char *buf, DWORD buflen )
+static WCHAR *detect_autoproxyconfig_url_dns(void)
{
-#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
- CFDictionaryRef settings = CFNetworkCopySystemProxySettings();
- const void *ref;
- BOOL ret = FALSE;
-
- if (!settings) return FALSE;
+ char *fqdn, *domain, *p;
+ WCHAR *ret;
- if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString )))
+ if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return NULL;
+ if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain )))
{
- CFRelease( settings );
- return FALSE;
+ heap_free( fqdn );
+ return NULL;
}
- if (CFStringGetCString( ref, buf, buflen, kCFStringEncodingASCII ))
+ p = fqdn;
+ while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain ))
{
- TRACE( "returning %s\n", debugstr_a(buf) );
- ret = TRUE;
+ char *name;
+ struct addrinfo *ai;
+ int res;
+
+ if (!(name = heap_alloc( sizeof("wpad") + strlen(p) )))
+ {
+ heap_free( fqdn );
+ heap_free( domain );
+ return NULL;
+ }
+ strcpy( name, "wpad" );
+ strcat( name, p );
+ res = getaddrinfo( name, NULL, NULL, &ai );
+ if (!res)
+ {
+ ret = build_wpad_url( name, ai );
+ freeaddrinfo( ai );
+ if (ret)
+ {
+ TRACE("returning %s\n", debugstr_w(ret));
+ heap_free( name );
+ break;
+ }
+ }
+ heap_free( name );
+ p++;
}
- CFRelease( settings );
+ heap_free( domain );
+ heap_free( fqdn );
return ret;
-#else
- static BOOL first = TRUE;
- if (first)
- {
- FIXME( "no support on this platform\n" );
- first = FALSE;
- }
- else
- TRACE( "no support on this platform\n" );
- return FALSE;
-#endif
}
-#define INTERNET_MAX_URL_LENGTH 2084
-
/***********************************************************************
* WinHttpDetectAutoProxyConfigUrl (winhttp.@)
*/
BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url )
{
- BOOL ret = FALSE;
- char system_url[INTERNET_MAX_URL_LENGTH + 1];
-
TRACE("0x%08x, %p\n", flags, url);
if (!flags || !url)
@@ -1413,71 +1488,22 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url )
SetLastError( ERROR_INVALID_PARAMETER );
return FALSE;
}
- if (get_system_proxy_autoconfig_url( system_url, sizeof(system_url) ))
- {
- WCHAR *urlW;
-
- if (!(urlW = strdupAW( system_url ))) return FALSE;
- *url = urlW;
- SetLastError( ERROR_SUCCESS );
- return TRUE;
- }
+ *url = NULL;
if (flags & WINHTTP_AUTO_DETECT_TYPE_DHCP)
{
- static int fixme_shown;
- if (!fixme_shown++) FIXME("discovery via DHCP not supported\n");
+ *url = detect_autoproxyconfig_url_dhcp();
}
if (flags & WINHTTP_AUTO_DETECT_TYPE_DNS_A)
{
- char *fqdn, *domain, *p;
-
- if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return FALSE;
- if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain )))
- {
- heap_free( fqdn );
- return FALSE;
- }
- p = fqdn;
- while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain ))
- {
- struct addrinfo *ai;
- char *name;
- int res;
-
- if (!(name = heap_alloc( sizeof("wpad") + strlen(p) )))
- {
- heap_free( fqdn );
- heap_free( domain );
- return FALSE;
- }
- strcpy( name, "wpad" );
- strcat( name, p );
- res = getaddrinfo( name, NULL, NULL, &ai );
- if (!res)
- {
- *url = build_wpad_url( name, ai );
- freeaddrinfo( ai );
- if (*url)
- {
- TRACE("returning %s\n", debugstr_w(*url));
- heap_free( name );
- ret = TRUE;
- break;
- }
- }
- heap_free( name );
- p++;
- }
- heap_free( domain );
- heap_free( fqdn );
+ if (!*url) *url = detect_autoproxyconfig_url_dns();
}
- if (!ret)
+ if (!*url)
{
SetLastError( ERROR_WINHTTP_AUTODETECTION_FAILED );
- *url = NULL;
+ return FALSE;
}
- else SetLastError( ERROR_SUCCESS );
- return ret;
+ SetLastError( ERROR_SUCCESS );
+ return TRUE;
}
static const WCHAR Connections[] = {
--
2.20.1
1
0
[PATCH] mountmgr.sys: Fix the build on macOS when dbus libraries are present.
by Hans Leidekker 20 Nov '19
by Hans Leidekker 20 Nov '19
20 Nov '19
Reported by Gijs Vermeulen.
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/mountmgr.sys/dbus.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c
index f85c2e3707..fbdcdb9e2e 100644
--- a/dlls/mountmgr.sys/dbus.c
+++ b/dlls/mountmgr.sys/dbus.c
@@ -771,6 +771,8 @@ void initialize_dbus(void)
CloseHandle( handle );
}
+#if !defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) || !defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H)
+
/* The udisks dispatch loop will block all threads using the same connection, so we'll
use a private connection. Multiple threads can make methods calls at the same time
on the same connection, according to the documentation.
@@ -1033,6 +1035,7 @@ ULONG get_dhcp_request_param( const WCHAR *adapter, struct mountmgr_dhcp_request
p_dbus_message_unref( reply );
return ret;
}
+#endif
#else /* SONAME_LIBDBUS_1 */
--
2.20.1
1
0
[PATCH v3 1/4] server: Add support for additional fields in set_console_output_info.
by Gijs Vermeulen 20 Nov '19
by Gijs Vermeulen 20 Nov '19
20 Nov '19
Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com>
---
programs/wineconsole/wineconsole.c | 3 +++
server/console.c | 34 +++++++++++++++++++++++++-----
server/protocol.def | 33 ++++++++++++++++-------------
3 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
index 439099c37a..ebcfce1011 100644
--- a/programs/wineconsole/wineconsole.c
+++ b/programs/wineconsole/wineconsole.c
@@ -458,6 +458,9 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf
req->max_height = (r.bottom - r.top - GetSystemMetrics(SM_CYCAPTION)) / cfg->cell_height;
req->font_width = cfg->cell_width;
req->font_height = cfg->cell_height;
+ req->font_weight = cfg->font_weight;
+ req->font_pitch_family = FIXED_PITCH | FF_DONTCARE;
+ wine_server_add_data( req, cfg->face_name, lstrlenW(cfg->face_name) * sizeof(WCHAR) );
wine_server_call( req );
}
SERVER_END_REQ;
diff --git a/server/console.c b/server/console.c
index 7d1fc5d268..d40da275e9 100644
--- a/server/console.c
+++ b/server/console.c
@@ -131,6 +131,9 @@ struct font_info
{
short int width;
short int height;
+ short int weight;
+ short int pitch_family;
+ struct unicode_str face_name;
};
struct screen_buffer
@@ -433,6 +436,10 @@ static struct screen_buffer *create_console_output( struct console_input *consol
screen_buffer->data = NULL;
screen_buffer->font.width = 0;
screen_buffer->font.height = 0;
+ screen_buffer->font.weight = FW_NORMAL;
+ screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE;
+ screen_buffer->font.face_name.str = NULL;
+ screen_buffer->font.face_name.len = 0;
memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) );
list_add_head( &screen_buffer_list, &screen_buffer->entry );
@@ -896,6 +903,8 @@ static int set_console_output_info( struct screen_buffer *screen_buffer,
const struct set_console_output_info_request *req )
{
struct console_renderer_event evt;
+ data_size_t font_name_len, offset;
+ WCHAR *font_name;
memset(&evt.u, 0, sizeof(evt.u));
if (req->mask & SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM)
@@ -1039,15 +1048,29 @@ static int set_console_output_info( struct screen_buffer *screen_buffer,
screen_buffer->max_width = req->max_width;
screen_buffer->max_height = req->max_height;
}
+ if (req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE)
+ {
+ memcpy( screen_buffer->color_map, get_req_data(), min( get_req_data_size(), sizeof(screen_buffer->color_map) ));
+ }
if (req->mask & SET_CONSOLE_OUTPUT_INFO_FONT)
{
screen_buffer->font.width = req->font_width;
screen_buffer->font.height = req->font_height;
- }
- if (req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE)
- {
- memcpy( screen_buffer->color_map, get_req_data(),
- min( sizeof(screen_buffer->color_map), get_req_data_size() ));
+ screen_buffer->font.weight = req->font_weight;
+ screen_buffer->font.pitch_family = req->font_pitch_family;
+ offset = req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE ? sizeof(screen_buffer->color_map) : 0;
+ if (get_req_data_size() > offset)
+ {
+ font_name_len = (get_req_data_size() - offset) / sizeof(WCHAR) * sizeof(WCHAR);
+ font_name = mem_alloc( font_name_len );
+ if (font_name)
+ {
+ memcpy( font_name, (char*)get_req_data() + offset, font_name_len );
+ free( (WCHAR *)screen_buffer->font.face_name.str );
+ screen_buffer->font.face_name.str = font_name;
+ screen_buffer->font.face_name.len = font_name_len;
+ }
+ }
}
return 1;
@@ -1183,6 +1206,7 @@ static void screen_buffer_destroy( struct object *obj )
}
if (screen_buffer->fd) release_object( screen_buffer->fd );
free( screen_buffer->data );
+ free( (WCHAR *)screen_buffer->font.face_name.str );
}
static struct fd *screen_buffer_get_fd( struct object *obj )
diff --git a/server/protocol.def b/server/protocol.def
index 3a0df20bdb..4dc9a278ad 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1615,25 +1615,28 @@ struct console_renderer_event
/* Set info about a console (output only) */
@REQ(set_console_output_info)
- obj_handle_t handle; /* handle to the console */
- int mask; /* setting mask (see below) */
- short int cursor_size; /* size of cursor (percentage filled) */
- short int cursor_visible;/* cursor visibility flag */
- short int cursor_x; /* position of cursor (x, y) */
+ obj_handle_t handle; /* handle to the console */
+ int mask; /* setting mask (see below) */
+ short int cursor_size; /* size of cursor (percentage filled) */
+ short int cursor_visible; /* cursor visibility flag */
+ short int cursor_x; /* position of cursor (x, y) */
short int cursor_y;
- short int width; /* width of the screen buffer */
- short int height; /* height of the screen buffer */
- short int attr; /* default fill attributes (screen colors) */
- short int popup_attr; /* pop-up color attributes */
- short int win_left; /* window actually displayed by renderer */
- short int win_top; /* the rect area is expressed within the */
- short int win_right; /* boundaries of the screen buffer */
+ short int width; /* width of the screen buffer */
+ short int height; /* height of the screen buffer */
+ short int attr; /* default fill attributes (screen colors) */
+ short int popup_attr; /* pop-up color attributes */
+ short int win_left; /* window actually displayed by renderer */
+ short int win_top; /* the rect area is expressed within the */
+ short int win_right; /* boundaries of the screen buffer */
short int win_bottom;
- short int max_width; /* maximum size (width x height) for the window */
+ short int max_width; /* maximum size (width x height) for the window */
short int max_height;
- short int font_width; /* font size (width x height) */
+ short int font_width; /* font size (width x height) */
short int font_height;
- VARARG(colors,uints); /* color table */
+ short int font_weight; /* font weight */
+ short int font_pitch_family; /* font pitch & family */
+ VARARG(colors,uints); /* color table */
+ VARARG(face_name,unicode_str); /* font face name */
@END
#define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001
#define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x0002
--
2.24.0
2
6
[PATCH v2] wineboot: Automatically create ProfileList key for current user.
by Dmitry Timoshkov 20 Nov '19
by Dmitry Timoshkov 20 Nov '19
20 Nov '19
This patch aims to replace the appropriate patchset from wine-staging.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
programs/wineboot/wineboot.c | 43 ++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index cd5c9505b3..9710b78ab7 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -61,6 +61,7 @@
#include <unistd.h>
#include <windows.h>
#include <winternl.h>
+#include <sddl.h>
#include <wine/svcctl.h>
#include <wine/asm.h>
#include <wine/debug.h>
@@ -1174,6 +1175,47 @@ static void install_root_pnp_devices(void)
SetupDiDestroyDeviceInfoList(set);
}
+static void update_user_profile(void)
+{
+ static const WCHAR profile_list[] = {'S','o','f','t','w','a','r','e','\\',
+ 'M','i','c','r','o','s','o','f','t','\\',
+ 'W','i','n','d','o','w','s',' ','N','T','\\',
+ 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
+ 'P','r','o','f','i','l','e','L','i','s','t',0};
+ static const WCHAR profile_image_path[] = {'P','r','o','f','i','l','e','I','m','a','g','e','P','a','t','h',0};
+ char token_buf[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD) * SID_MAX_SUB_AUTHORITIES];
+ HANDLE token;
+ WCHAR profile[MAX_PATH], *sid;
+ DWORD size;
+ HKEY hkey, profile_hkey;
+
+ if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token))
+ return;
+
+ size = sizeof(token_buf);
+ GetTokenInformation(token, TokenUser, token_buf, size, &size);
+ CloseHandle(token);
+
+ ConvertSidToStringSidW(((TOKEN_USER *)token_buf)->User.Sid, &sid);
+
+ if (!RegCreateKeyExW(HKEY_LOCAL_MACHINE, profile_list, 0, NULL, 0,
+ KEY_ALL_ACCESS, NULL, &hkey, NULL))
+ {
+ if (!RegCreateKeyExW(hkey, sid, 0, NULL, 0,
+ KEY_ALL_ACCESS, NULL, &profile_hkey, NULL))
+ {
+ if (SHGetSpecialFolderPathW(NULL, profile, CSIDL_PROFILE, TRUE))
+ set_reg_value(profile_hkey, profile_image_path, profile);
+
+ RegCloseKey(profile_hkey);
+ }
+
+ RegCloseKey(hkey);
+ }
+
+ LocalFree(sid);
+}
+
/* execute rundll32 on the wine.inf file if necessary */
static void update_wineprefix( BOOL force )
{
@@ -1218,6 +1260,7 @@ static void update_wineprefix( BOOL force )
DestroyWindow( hwnd );
}
install_root_pnp_devices();
+ update_user_profile();
WINE_MESSAGE( "wine: configuration in '%s' has been updated.\n", prettyprint_configdir() );
}
--
2.20.1
1
0
[PATCH v2] ntdll: Fix find_free_area outside of reserved areas with zero_bits != 0.
by Rémi Bernon 20 Nov '19
by Rémi Bernon 20 Nov '19
20 Nov '19
The search was initiated with base == 0, which returns NULL immediately
if MEM_TOP_DOWN is not used. Using address_space_start instead fixes
this issue.
Then we assumed that all mmapped regions are known by Wine view tree,
which is obviously not the case with external allocations. This could
lead to memory corruption when find_free_area returns an expected free
region which is already mmapped. Using MAP_FIXED forces mmap to succeed
and corrupts the mapping.
This patch uses safe mmap calls to check if the expected free memory is
actually free, and iterates over the expected free ranges until it
succeeds.
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
Based on a patch from Paul Gofman <gofmanp(a)gmail.com>
v2: Fix try_map_free_area step condition.
dlls/ntdll/virtual.c | 62 +++++++++++++++++++++++++++++++++++++-------
1 file changed, 52 insertions(+), 10 deletions(-)
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 68249de902e..b2c17f2c005 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -496,6 +496,35 @@ static struct file_view *find_view_range( const void *addr, size_t size )
return NULL;
}
+/***********************************************************************
+ * try_map_free_area
+ *
+ * Try mmaping some expected free memory region, eventually stepping and
+ * retrying inside it, and return where it actually succeeded, or NULL.
+ */
+static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+ void *start, size_t size, int unix_prot )
+{
+ void *ptr;
+
+ while (start && base <= start && (char*)start + size <= (char*)end)
+ {
+ if ((ptr = wine_anon_mmap( start, size, unix_prot, 0 )) == start)
+ return start;
+ TRACE( "Found free area is already mapped, start %p.\n", start );
+
+ if (ptr != (void *)-1)
+ munmap( ptr, size );
+
+ if ((step > 0 && (char *)end - (char *)start < step) ||
+ (step < 0 && (char *)start - (char *)base < -step) ||
+ step == 0)
+ break;
+ start = (char *)start + step;
+ }
+
+ return NULL;
+}
/***********************************************************************
* find_free_area
@@ -503,9 +532,11 @@ static struct file_view *find_view_range( const void *addr, size_t size )
* Find a free area between views inside the specified range.
* The csVirtual section must be held by caller.
*/
-static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down )
+static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down,
+ int map_area, int unix_prot )
{
struct wine_rb_entry *first = NULL, *ptr = views_tree.root;
+ ptrdiff_t step = top_down ? -(mask + 1) : (mask + 1);
void *start;
/* find the first (resp. last) view inside the range */
@@ -538,7 +569,10 @@ static void *find_free_area( void *base, void *end, size_t size, size_t mask, in
{
struct file_view *view = WINE_RB_ENTRY_VALUE( first, struct file_view, entry );
- if ((char *)view->base + view->size <= (char *)start) break;
+ if (!map_area && (char *)view->base + view->size <= (char *)start) break;
+ if (map_area && (start = try_map_free_area( (char *)view->base + view->size,
+ (char *)start + size, step,
+ start, size, unix_prot ))) break;
start = ROUND_ADDR( (char *)view->base - size, mask );
/* stop if remaining space is not large enough */
if (!start || start >= end || start < base) return NULL;
@@ -554,13 +588,17 @@ static void *find_free_area( void *base, void *end, size_t size, size_t mask, in
{
struct file_view *view = WINE_RB_ENTRY_VALUE( first, struct file_view, entry );
- if ((char *)view->base >= (char *)start + size) break;
+ if (!map_area && (char *)view->base >= (char *)start + size) break;
+ if (map_area && (start = try_map_free_area( start, view->base, step,
+ start, size, unix_prot ))) break;
start = ROUND_ADDR( (char *)view->base + view->size + mask, mask );
/* stop if remaining space is not large enough */
if (!start || start >= end || (char *)end - (char *)start < size) return NULL;
first = wine_rb_next( first );
}
}
+
+ if (!first && map_area) return try_map_free_area( base, end, step, start, size, unix_prot );
return start;
}
@@ -1054,13 +1092,13 @@ static int alloc_reserved_area_callback( void *start, size_t size, void *arg )
{
/* range is split in two by the preloader reservation, try first part */
if ((alloc->result = find_free_area( start, preload_reserve_start, alloc->size,
- alloc->mask, alloc->top_down )))
+ alloc->mask, alloc->top_down, FALSE, 0 )))
return 1;
/* then fall through to try second part */
start = preload_reserve_end;
}
}
- if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down )))
+ if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down, FALSE, 0 )))
return 1;
return 0;
@@ -1163,14 +1201,18 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
goto done;
}
- for (;;)
+ if (zero_bits_64)
{
- if (!zero_bits_64)
- ptr = NULL;
- else if (!(ptr = find_free_area( (void*)0, alloc.limit, view_size, mask, top_down )))
+ if (!(ptr = find_free_area( address_space_start, alloc.limit, size,
+ mask, top_down, TRUE, VIRTUAL_GetUnixProt(vprot) )))
return STATUS_NO_MEMORY;
+ TRACE( "got mem with find_free_area %p-%p\n", ptr, (char *)ptr + size );
+ goto done;
+ }
- if ((ptr = wine_anon_mmap( ptr, view_size, VIRTUAL_GetUnixProt(vprot), ptr ? MAP_FIXED : 0 )) == (void *)-1)
+ for (;;)
+ {
+ if ((ptr = wine_anon_mmap( NULL, view_size, VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1)
{
if (errno == ENOMEM) return STATUS_NO_MEMORY;
return STATUS_INVALID_PARAMETER;
--
2.24.0.rc2
2
2
[PATCH] wineboot: Automatically create ProfileList key for current user.
by Dmitry Timoshkov 20 Nov '19
by Dmitry Timoshkov 20 Nov '19
20 Nov '19
This patch aims to replace the appropriate patchset from wine-staging.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
programs/wineboot/wineboot.c | 54 ++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index cd5c9505b3..4615f62a74 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -1174,6 +1174,59 @@ static void install_root_pnp_devices(void)
SetupDiDestroyDeviceInfoList(set);
}
+static void update_user_profile(void)
+{
+ static const WCHAR pfx[] = {'S',0};
+ static const WCHAR fmt[] = {'-','%','u',0};
+ static const WCHAR profile_list[] = {'S','o','f','t','w','a','r','e','\\',
+ 'M','i','c','r','o','s','o','f','t','\\',
+ 'W','i','n','d','o','w','s',' ','N','T','\\',
+ 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
+ 'P','r','o','f','i','l','e','L','i','s','t',0};
+ static const WCHAR profile_image_path[] = {'P','r','o','f','i','l','e','I','m','a','g','e','P','a','t','h',0};
+ char token_buf[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD) * SID_MAX_SUB_AUTHORITIES];
+ HANDLE token;
+ PISID sid;
+ WCHAR sid_buf[1 + 10 + 10 + 10 * SID_MAX_SUB_AUTHORITIES], profile[MAX_PATH], *p;
+ DWORD size, i;
+ HKEY hkey, profile_hkey;
+
+ if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token))
+ return;
+
+ size = sizeof(token_buf);
+ GetTokenInformation(token, TokenUser, token_buf, size, &size);
+ CloseHandle(token);
+
+ sid = ((TOKEN_USER *)token_buf)->User.Sid;
+
+ p = sid_buf;
+ lstrcpyW(p, pfx);
+ p += lstrlenW(pfx);
+ p += wsprintfW(p, fmt, sid->Revision);
+ p += wsprintfW(p, fmt, MAKELONG(MAKEWORD(sid->IdentifierAuthority.Value[5],
+ sid->IdentifierAuthority.Value[4]),
+ MAKEWORD(sid->IdentifierAuthority.Value[3],
+ sid->IdentifierAuthority.Value[2])));
+ for (i = 0; i < sid->SubAuthorityCount; i++)
+ p += wsprintfW(p, fmt, sid->SubAuthority[i]);
+
+ if (!RegCreateKeyExW(HKEY_LOCAL_MACHINE, profile_list, 0, NULL, 0,
+ KEY_ALL_ACCESS, NULL, &hkey, NULL))
+ {
+ if (!RegCreateKeyExW(hkey, sid_buf, 0, NULL, 0,
+ KEY_ALL_ACCESS, NULL, &profile_hkey, NULL))
+ {
+ if (SHGetSpecialFolderPathW(NULL, profile, CSIDL_PROFILE, TRUE))
+ set_reg_value(profile_hkey, profile_image_path, profile);
+
+ RegCloseKey(profile_hkey);
+ }
+
+ RegCloseKey(hkey);
+ }
+}
+
/* execute rundll32 on the wine.inf file if necessary */
static void update_wineprefix( BOOL force )
{
@@ -1218,6 +1271,7 @@ static void update_wineprefix( BOOL force )
DestroyWindow( hwnd );
}
install_root_pnp_devices();
+ update_user_profile();
WINE_MESSAGE( "wine: configuration in '%s' has been updated.\n", prettyprint_configdir() );
}
--
2.20.1
2
2
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48104
Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
---
v2:
- rename helper function;
- reorder max_z estimation.
dlls/ddraw/tests/ddraw7.c | 191 +++++++++++++++++++++++----------
dlls/wined3d/device.c | 7 +-
dlls/wined3d/state.c | 15 ++-
dlls/wined3d/wined3d_private.h | 8 ++
4 files changed, 159 insertions(+), 62 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 143f6d4b6b..20b0e09a95 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -277,7 +277,8 @@ static D3DCOLOR get_surface_color(IDirectDrawSurface7 *surface, UINT x, UINT y)
return color;
}
-static void check_rect(IDirectDrawSurface7 *surface, RECT r, const char *message)
+#define check_rect(a, b, c) check_rect_(__LINE__, a, b, c)
+static void check_rect_(unsigned int line, IDirectDrawSurface7 *surface, RECT r, const char *message)
{
LONG x_coords[2][2] =
{
@@ -308,7 +309,7 @@ static void check_rect(IDirectDrawSurface7 *surface, RECT r, const char *message
if (x < 0 || x >= 640 || y < 0 || y >= 480)
continue;
color = get_surface_color(surface, x, y);
- ok(color == expected, "%s: Pixel (%d, %d) has color %08x, expected %08x.\n",
+ ok_(__FILE__, line)(color == expected, "%s: Pixel (%d, %d) has color %08x, expected %08x.\n",
message, x, y, color, expected);
}
}
@@ -543,17 +544,17 @@ static void test_process_vertices(void)
}
hr = IDirect3DDevice7_GetDirect3D(device, &d3d7);
- ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
memset(&vb_desc, 0, sizeof(vb_desc));
vb_desc.dwSize = sizeof(vb_desc);
vb_desc.dwFVF = D3DFVF_XYZ;
vb_desc.dwNumVertices = 4;
hr = IDirect3D7_CreateVertexBuffer(d3d7, &vb_desc, &src_vb, 0);
- ok(SUCCEEDED(hr), "Failed to create source vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_Lock(src_vb, 0, (void **)&src_data, NULL);
- ok(SUCCEEDED(hr), "Failed to lock source vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
src_data[0].x = 0.0f;
src_data[0].y = 0.0f;
src_data[0].z = 0.0f;
@@ -567,7 +568,7 @@ static void test_process_vertices(void)
src_data[3].y = -0.5f;
src_data[3].z = 0.25f;
hr = IDirect3DVertexBuffer7_Unlock(src_vb);
- ok(SUCCEEDED(hr), "Failed to unlock source vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
memset(&vb_desc, 0, sizeof(vb_desc));
vb_desc.dwSize = sizeof(vb_desc);
@@ -575,7 +576,7 @@ static void test_process_vertices(void)
vb_desc.dwNumVertices = 4;
/* MSDN says that the last parameter must be 0 - check that. */
hr = IDirect3D7_CreateVertexBuffer(d3d7, &vb_desc, &dst_vb1, 4);
- ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
memset(&vb_desc, 0, sizeof(vb_desc));
vb_desc.dwSize = sizeof(vb_desc);
@@ -583,7 +584,7 @@ static void test_process_vertices(void)
vb_desc.dwNumVertices = 5;
/* MSDN says that the last parameter must be 0 - check that. */
hr = IDirect3D7_CreateVertexBuffer(d3d7, &vb_desc, &dst_vb2, 12345678);
- ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
memset(&vp, 0, sizeof(vp));
vp.dwX = 64;
@@ -593,15 +594,15 @@ static void test_process_vertices(void)
vp.dvMinZ = 0.0f;
vp.dvMaxZ = 1.0f;
hr = IDirect3DDevice7_SetViewport(device, &vp);
- ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb1, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
- ok(SUCCEEDED(hr), "Failed to process vertices, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb2, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
- ok(SUCCEEDED(hr), "Failed to process vertices, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_Lock(dst_vb1, 0, (void **)&dst_data, NULL);
- ok(SUCCEEDED(hr), "Failed to lock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
ok(compare_vec4(&dst_data[0], +1.280e+2f, +1.280e+2f, +0.000e+0f, +1.000e+0f, 4096),
"Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n",
dst_data[0].x, dst_data[0].y, dst_data[0].z, dst_data[0].w);
@@ -615,10 +616,10 @@ static void test_process_vertices(void)
"Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n",
dst_data[3].x, dst_data[3].y, dst_data[3].z, dst_data[3].w);
hr = IDirect3DVertexBuffer7_Unlock(dst_vb1);
- ok(SUCCEEDED(hr), "Failed to unlock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_Lock(dst_vb2, 0, (void **)&dst_data2, NULL);
- ok(SUCCEEDED(hr), "Failed to lock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
/* Small thing without much practical meaning, but I stumbled upon it,
* so let's check for it: If the output vertex buffer has no RHW value,
* the RHW value of the last vertex is written into the next vertex. */
@@ -626,7 +627,62 @@ static void test_process_vertices(void)
"Got unexpected vertex 4 {%.8e, %.8e, %.8e}.\n",
dst_data2[4].x, dst_data2[4].y, dst_data2[4].z);
hr = IDirect3DVertexBuffer7_Unlock(dst_vb2);
- ok(SUCCEEDED(hr), "Failed to unlock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ /* Test degenerate viewport z ranges. */
+ vp.dvMinZ = 0.0f;
+ vp.dvMaxZ = 0.0f;
+ hr = IDirect3DDevice7_SetViewport(device, &vp);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb1, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb2, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = IDirect3DVertexBuffer7_Lock(dst_vb1, 0, (void **)&dst_data, NULL);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ ok(compare_vec4(&dst_data[0], +1.280e+2f, +1.280e+2f, +0.000e+0f, +1.000e+0f, 4096),
+ "Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[0].x, dst_data[0].y, dst_data[0].z, dst_data[0].w);
+ ok(compare_vec4(&dst_data[1], +1.920e+2f, +6.400e+1f, +1.000e-3f, +1.000e+0f, 4096),
+ "Got unexpected vertex 1 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[1].x, dst_data[1].y, dst_data[1].z, dst_data[1].w);
+ ok(compare_vec4(&dst_data[2], +6.400e+1f, +1.920e+2f, +5.000e-4f, +1.000e+0f, 4096),
+ "Got unexpected vertex 2 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[2].x, dst_data[2].y, dst_data[2].z, dst_data[2].w);
+ ok(compare_vec4(&dst_data[3], +1.600e+2f, +1.600e+2f, +2.500e-4f, +1.000e+0f, 4096),
+ "Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[3].x, dst_data[3].y, dst_data[3].z, dst_data[3].w);
+ hr = IDirect3DVertexBuffer7_Unlock(dst_vb1);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ vp.dvMinZ = 1.0f;
+ vp.dvMaxZ = 0.0f;
+ hr = IDirect3DDevice7_SetViewport(device, &vp);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb1, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb2, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = IDirect3DVertexBuffer7_Lock(dst_vb1, 0, (void **)&dst_data, NULL);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ ok(compare_vec4(&dst_data[0], +1.280e+2f, +1.280e+2f, +1.000e+0f, +1.000e+0f, 4096),
+ "Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[0].x, dst_data[0].y, dst_data[0].z, dst_data[0].w);
+ ok(compare_vec4(&dst_data[1], +1.920e+2f, +6.400e+1f, +1.001e+0f, +1.000e+0f, 4096),
+ "Got unexpected vertex 1 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[1].x, dst_data[1].y, dst_data[1].z, dst_data[1].w);
+ ok(compare_vec4(&dst_data[2], +6.400e+1f, +1.920e+2f, +1.0005e+0f, +1.000e+0f, 4096),
+ "Got unexpected vertex 2 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[2].x, dst_data[2].y, dst_data[2].z, dst_data[2].w);
+ ok(compare_vec4(&dst_data[3], +1.600e+2f, +1.600e+2f, +1.00025e+0f, +1.000e+0f, 4096),
+ "Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[3].x, dst_data[3].y, dst_data[3].z, dst_data[3].w);
+ hr = IDirect3DVertexBuffer7_Unlock(dst_vb1);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
/* Try a more complicated viewport, same vertices. */
memset(&vp, 0, sizeof(vp));
@@ -637,13 +693,13 @@ static void test_process_vertices(void)
vp.dvMinZ = -2.0f;
vp.dvMaxZ = 4.0f;
hr = IDirect3DDevice7_SetViewport(device, &vp);
- ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb1, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
- ok(SUCCEEDED(hr), "Failed to process vertices, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_Lock(dst_vb1, 0, (void **)&dst_data, NULL);
- ok(SUCCEEDED(hr), "Failed to lock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
ok(compare_vec4(&dst_data[0], +1.330e+2f, +7.000e+1f, -2.000e+0f, +1.000e+0f, 4096),
"Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n",
dst_data[0].x, dst_data[0].y, dst_data[0].z, dst_data[0].w);
@@ -657,20 +713,20 @@ static void test_process_vertices(void)
"Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n",
dst_data[3].x, dst_data[3].y, dst_data[3].z, dst_data[3].w);
hr = IDirect3DVertexBuffer7_Unlock(dst_vb1);
- ok(SUCCEEDED(hr), "Failed to unlock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &world);
- ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &view);
- ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &proj);
- ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb1, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
- ok(SUCCEEDED(hr), "Failed to process vertices, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_Lock(dst_vb1, 0, (void **)&dst_data, NULL);
- ok(SUCCEEDED(hr), "Failed to lock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
ok(compare_vec4(&dst_data[0], +2.560e+2f, +7.000e+1f, -2.000e+0f, +3.333e-1f, 4096),
"Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n",
dst_data[0].x, dst_data[0].y, dst_data[0].z, dst_data[0].w);
@@ -684,7 +740,7 @@ static void test_process_vertices(void)
"Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n",
dst_data[3].x, dst_data[3].y, dst_data[3].z, dst_data[3].w);
hr = IDirect3DVertexBuffer7_Unlock(dst_vb1);
- ok(SUCCEEDED(hr), "Failed to unlock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
IDirect3DVertexBuffer7_Release(dst_vb2);
IDirect3DVertexBuffer7_Release(dst_vb1);
@@ -14877,24 +14933,27 @@ static void test_viewport(void)
static struct
{
D3DVIEWPORT7 vp;
+ float expected_z;
RECT expected_rect;
const char *message;
}
tests[] =
{
- {{ 0, 0, 640, 480}, { 0, 120, 479, 359}, "Viewport (0, 0) - (640, 480)"},
- {{ 0, 0, 320, 240}, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"},
- {{ 0, 0, 1280, 960}, { 0, 240, 639, 479}, "Viewport (0, 0) - (1280, 960)"},
- {{ 0, 0, 2000, 1600}, {-10, -10, -10, -10}, "Viewport (0, 0) - (2000, 1600)"},
- {{100, 100, 640, 480}, {100, 220, 579, 459}, "Viewport (100, 100) - (640, 480)"},
- {{ 0, 0, 8192, 8192}, {-10, -10, -10, -10}, "Viewport (0, 0) - (8192, 8192)"},
+ {{ 0, 0, 640, 480}, 0.001f, { 0, 120, 479, 359}, "Viewport (0, 0) - (640, 480)"},
+ {{ 0, 0, 640, 480, 0.5f, 0.0f}, 0.501f,
+ {0, 120, 479, 359}, "Viewport (0, 0, 0.5) - (640, 480, 0.0)"},
+ {{ 0, 0, 320, 240}, 0.001f, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"},
+ {{ 0, 0, 1280, 960}, 0.001f, { 0, 240, 639, 479}, "Viewport (0, 0) - (1280, 960)"},
+ {{ 0, 0, 2000, 1600}, 0.001f, {-10, -10, -10, -10}, "Viewport (0, 0) - (2000, 1600)"},
+ {{100, 100, 640, 480}, 0.001f, {100, 220, 579, 459}, "Viewport (100, 100) - (640, 480)"},
+ {{ 0, 0, 8192, 8192}, 0.001f, {-10, -10, -10, -10}, "Viewport (0, 0) - (8192, 8192)"},
};
static struct vec3 quad[] =
{
- {-1.5f, -0.5f, 0.1f},
- {-1.5f, 0.5f, 0.1f},
- { 0.5f, -0.5f, 0.1f},
- { 0.5f, 0.5f, 0.1f},
+ {-1.5f, -0.5f, 1.0f},
+ {-1.5f, 0.5f, 1.0f},
+ { 0.5f, -0.5f, 1.0f},
+ { 0.5f, 0.5f, 1.0f},
};
static const struct vec2 rt_sizes[] =
{
@@ -14902,6 +14961,7 @@ static void test_viewport(void)
};
IDirectDrawSurface7 *rt, *ds;
DDSURFACEDESC2 surface_desc;
+ const float z_eps = 0.0001;
IDirect3DDevice7 *device;
IDirectDraw7 *ddraw;
DDPIXELFORMAT z_fmt;
@@ -14921,18 +14981,16 @@ static void test_viewport(void)
}
hr = IDirect3DDevice7_GetDirect3D(device, &d3d);
- ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw);
- ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
IDirect3D7_Release(d3d);
- hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE);
- ok(SUCCEEDED(hr), "Failed to disable depth test, hr %#x.\n", hr);
hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE);
- ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice7_SetViewport(device, NULL);
- ok(hr == E_INVALIDARG, "Setting NULL viewport data returned unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
ds = get_depth_stencil(device);
memset(&surface_desc, 0, sizeof(surface_desc));
@@ -14951,56 +15009,79 @@ static void test_viewport(void)
surface_desc.dwHeight = rt_sizes[i].y;
surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE;
hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &rt, NULL);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x (i %u).\n", hr, i);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u).\n", hr, i);
surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT;
surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER;
U4(surface_desc).ddpfPixelFormat = z_fmt;
hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &ds, NULL);
- ok(SUCCEEDED(hr), "Failed to create depth buffer, hr %#x (i %u).\n", hr, i);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u).\n", hr, i);
hr = IDirectDrawSurface7_AddAttachedSurface(rt, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x (i %u).\n", hr, i);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u).\n", hr, i);
hr = IDirect3DDevice7_SetRenderTarget(device, rt, 0);
- ok(SUCCEEDED(hr), "Failed to set render target, hr %#x (i %u).\n", hr, i);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u).\n", hr, i);
}
else
{
hr = IDirect3DDevice7_GetRenderTarget(device, &rt);
- ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u).\n", hr, i);
}
for (j = 0; j < ARRAY_SIZE(tests); ++j)
{
- hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0);
- ok(SUCCEEDED(hr), "Failed to clear, hr %#x (i %u, j %u).\n", hr, i, j);
+ hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000,
+ tests[j].expected_z - z_eps, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_GREATER);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+
+ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, !i);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
hr = IDirect3DDevice7_SetViewport(device, &tests[j].vp);
if (tests[j].vp.dwX + tests[j].vp.dwWidth > rt_sizes[i].x
|| tests[j].vp.dwY + tests[j].vp.dwHeight > rt_sizes[i].y)
{
- ok(hr == E_INVALIDARG, "Setting the viewport returned unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
continue;
}
else
{
- ok(SUCCEEDED(hr), "Failed to set the viewport, hr %#x (i %u, j %u).\n", hr, i, j);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
}
hr = IDirect3DDevice7_BeginScene(device);
- ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x (i %u, j %u).\n", hr, i, j);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, quad, 4, 0);
- ok(SUCCEEDED(hr), "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
hr = IDirect3DDevice7_EndScene(device);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x (i %u, j %u).\n", hr, i, j);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
check_rect(rt, tests[j].expected_rect, tests[j].message);
+
+ if (!i)
+ {
+ hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000,
+ tests[j].expected_z + z_eps, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESS);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+
+ hr = IDirect3DDevice7_BeginScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+ hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, quad, 4, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+ hr = IDirect3DDevice7_EndScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+
+ check_rect(rt, tests[j].expected_rect, tests[j].message);
+ }
}
hr = IDirectDrawSurface7_DeleteAttachedSurface(rt, 0, ds);
- ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x (i %u).\n", hr, i);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u).\n", hr, i);
IDirectDrawSurface7_Release(ds);
-
IDirectDrawSurface7_Release(rt);
}
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 3049be69ef..d017a54245 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3573,6 +3573,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO
struct lights_settings ls;
unsigned int vertex_size;
BOOL do_clip, lighting;
+ float min_z, max_z;
unsigned int i;
BYTE *dest_ptr;
HRESULT hr;
@@ -3656,6 +3657,8 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO
init_transformed_lights(&ls, state, device->adapter->d3d_info.wined3d_creation_flags
& WINED3D_LEGACY_FFP_LIGHTING, lighting);
+ wined3d_viewport_get_z_range(&vp, &min_z, &max_z);
+
for (i = 0; i < dwCount; ++i)
{
const struct wined3d_stream_info_element *position_element = &stream_info->elements[WINED3D_FFP_POSITION];
@@ -3728,11 +3731,11 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO
x *= vp.width / 2;
y *= vp.height / 2;
- z *= vp.max_z - vp.min_z;
+ z *= max_z - min_z;
x += vp.width / 2 + vp.x;
y += vp.height / 2 + vp.y;
- z += vp.min_z;
+ z += min_z;
rhw = 1 / rhw;
} else {
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 0f84cc22f7..87e1ca4bac 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4037,6 +4037,7 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine
{
const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info;
struct wined3d_viewport vp[WINED3D_MAX_VIEWPORTS];
+ float min_z, max_z;
if (gl_info->supported[ARB_VIEWPORT_ARRAY])
{
@@ -4048,8 +4049,9 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine
get_viewports(context, state, state->viewport_count, vp);
for (i = 0; i < state->viewport_count; ++i)
{
- depth_ranges[i * 2] = vp[i].min_z;
- depth_ranges[i * 2 + 1] = vp[i].max_z;
+ wined3d_viewport_get_z_range(&vp[i], &min_z, &max_z);
+ depth_ranges[i * 2] = min_z;
+ depth_ranges[i * 2 + 1] = max_z;
viewports[i * 4] = vp[i].x;
viewports[i * 4 + 1] = vp[i].y;
@@ -4073,7 +4075,8 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine
else
{
get_viewports(context, state, 1, vp);
- gl_info->gl_ops.gl.p_glDepthRange(vp[0].min_z, vp[0].max_z);
+ wined3d_viewport_get_z_range(&vp[0], &min_z, &max_z);
+ gl_info->gl_ops.gl.p_glDepthRange(min_z, max_z);
gl_info->gl_ops.gl.p_glViewport(vp[0].x, vp[0].y, vp[0].width, vp[0].height);
}
checkGLcall("setting clip space and viewport");
@@ -4090,6 +4093,7 @@ static void viewport_miscpart_cc(struct wined3d_context *context,
GLdouble depth_ranges[2 * WINED3D_MAX_VIEWPORTS];
GLfloat viewports[4 * WINED3D_MAX_VIEWPORTS];
unsigned int i, reset_count = 0;
+ float min_z, max_z;
get_viewports(context, state, state->viewport_count, vp);
@@ -4097,8 +4101,9 @@ static void viewport_miscpart_cc(struct wined3d_context *context,
for (i = 0; i < state->viewport_count; ++i)
{
- depth_ranges[i * 2] = vp[i].min_z;
- depth_ranges[i * 2 + 1] = vp[i].max_z;
+ wined3d_viewport_get_z_range(&vp[i], &min_z, &max_z);
+ depth_ranges[i * 2] = min_z;
+ depth_ranges[i * 2 + 1] = max_z;
viewports[i * 4] = vp[i].x + pixel_center_offset;
viewports[i * 4 + 1] = vp[i].y + pixel_center_offset;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8ca2e73703..4fca229b92 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -5345,6 +5345,14 @@ static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_stat
return FALSE;
}
+static inline void wined3d_viewport_get_z_range(const struct wined3d_viewport *vp, float *min_z, float *max_z)
+{
+ *min_z = vp->min_z;
+
+ /* The magic constant is derived from tests. */
+ *max_z = max(vp->max_z, vp->min_z + 0.001f);
+}
+
/* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */
#define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"
--
2.23.0
3
4
[PATCH 1/3] d3d9: Track the viewport and scissor rect in the primary stateblock.
by Zebediah Figura 20 Nov '19
by Zebediah Figura 20 Nov '19
20 Nov '19
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
This is not particularly pretty, but there seems to me to be too much logic in
wined3d regarding these states to be worth duplicating.
dlls/d3d9/device.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 5ef0c9cdf66..76fddc59f18 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -522,6 +522,17 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d
}
}
+static void device_reset_viewport_state(struct d3d9_device *device)
+{
+ struct wined3d_viewport vp;
+ RECT rect;
+
+ wined3d_device_get_viewports(device->wined3d_device, NULL, &vp);
+ wined3d_stateblock_set_viewport(device->state, &vp);
+ wined3d_device_get_scissor_rects(device->wined3d_device, NULL, &rect);
+ wined3d_stateblock_set_scissor_rect(device->state, &rect);
+}
+
static HRESULT WINAPI d3d9_device_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out)
{
TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
@@ -1011,6 +1022,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device,
!!swapchain_desc.enable_auto_depth_stencil);
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE,
!!swapchain_desc.enable_auto_depth_stencil);
+ device_reset_viewport_state(device);
}
if (FAILED(hr = d3d9_device_get_swapchains(device)))
@@ -1902,7 +1914,11 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO
hr = wined3d_device_set_rendertarget_view(device->wined3d_device, idx, rtv, TRUE);
d3d9_surface_release_rendertarget_view(surface_impl, rtv);
if (SUCCEEDED(hr))
+ {
+ if (!idx)
+ device_reset_viewport_state(device);
device->render_targets[idx] = surface_impl;
+ }
wined3d_mutex_unlock();
return hr;
@@ -4636,6 +4652,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine
!!swapchain_desc->enable_auto_depth_stencil);
wined3d_device_set_render_state(device->wined3d_device,
WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil);
+ device_reset_viewport_state(device);
if (FAILED(hr = d3d9_device_get_swapchains(device)))
{
--
2.23.0
4
6
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
Also fix the same comment in ddraw4.c, merge with another similar
patch that I had in my queue.
Supersedes patch 174018.
dlls/ddraw/tests/ddraw1.c | 2 +-
dlls/ddraw/tests/ddraw2.c | 2 +-
dlls/ddraw/tests/ddraw4.c | 4 ++--
dlls/ddraw/tests/ddraw7.c | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 64c03c87d0c..fa65d0e722e 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -5083,7 +5083,7 @@ static void test_surface_attachment(void)
hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2);
todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr);
if (SUCCEEDED(hr))
- IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3);
+ IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2);
hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3);
ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr);
hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3);
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 77c8e32e6bd..541362c7488 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -6094,7 +6094,7 @@ static void test_surface_attachment(void)
hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2);
todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr);
if (SUCCEEDED(hr))
- IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3);
+ IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface2);
hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3);
ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr);
hr = IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3);
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index df20ccb09d3..e61d67d723d 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -7624,7 +7624,7 @@ static void test_surface_attachment(void)
hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2);
todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr);
if (SUCCEEDED(hr))
- IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3);
+ IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface2);
hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3);
ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr);
hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3);
@@ -16622,7 +16622,7 @@ static void test_surface_format_conversion_alpha(void)
{16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}
},
"R5G6B5", 2, 4, 4, 0, TRUE,
- /* Looks broken for sysmem texture convertions on Windows (at
+ /* Looks broken for sysmem texture conversions on Windows (at
* least with hardware device), the result is either error from
* _Blt() or a copy of the source data without any conversion. */
},
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 7c46f33cb7a..c1db7b2df6a 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -7496,7 +7496,7 @@ static void test_surface_attachment(void)
hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2);
todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr);
if (SUCCEEDED(hr))
- IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3);
+ IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface2);
hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3);
ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr);
hr = IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3);
@@ -16593,7 +16593,7 @@ static void test_surface_format_conversion_alpha(void)
{16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}
},
"R5G6B5", 2, 4, 4, 0, TRUE,
- /* Looks broken for sysmem texture convertions on Windows (at
+ /* Looks broken for sysmem texture conversions on Windows (at
* least with hardware device), the result is either error from
* _Blt() or a copy of the source data without any conversion. */
},
--
2.21.0
3
2
[PATCH 1/3] mfreadwrite: Start media source when stream selection changes.
by Nikolay Sivov 20 Nov '19
by Nikolay Sivov 20 Nov '19
20 Nov '19
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/mfreadwrite/main.c | 59 +++++++++++++++++++++++++++------
dlls/mfreadwrite/tests/mfplat.c | 50 ++++++++++++++++++++--------
2 files changed, 84 insertions(+), 25 deletions(-)
diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c
index f24de690bc..bffe5cc47f 100644
--- a/dlls/mfreadwrite/main.c
+++ b/dlls/mfreadwrite/main.c
@@ -99,6 +99,8 @@ struct media_stream
CONDITION_VARIABLE sample_event;
struct list samples;
enum media_stream_state state;
+ BOOL selected;
+ BOOL presented;
};
struct source_reader
@@ -820,6 +822,41 @@ static IMFSample *media_stream_pop_sample(struct media_stream *stream, DWORD *st
return ret;
}
+static HRESULT source_reader_start_source(struct source_reader *reader)
+{
+ BOOL selection_changed = FALSE;
+ PROPVARIANT position;
+ HRESULT hr = S_OK;
+ DWORD i;
+
+ if (reader->source_state == SOURCE_STATE_STARTED)
+ {
+ for (i = 0; i < reader->stream_count; ++i)
+ {
+ if (FAILED(hr = source_reader_get_stream_selection(reader, i, &reader->streams[i].selected)))
+ return hr;
+ selection_changed = reader->streams[i].selected ^ reader->streams[i].presented;
+ if (selection_changed)
+ break;
+ }
+ }
+
+ position.u.hVal.QuadPart = 0;
+ if (reader->source_state != SOURCE_STATE_STARTED || selection_changed)
+ {
+ position.vt = reader->source_state == SOURCE_STATE_STARTED ? VT_EMPTY : VT_I8;
+
+ /* Update cached stream selection if descriptor was accepted. */
+ if (SUCCEEDED(hr = IMFMediaSource_Start(reader->source, reader->descriptor, &GUID_NULL, &position)))
+ {
+ for (i = 0; i < reader->stream_count; ++i)
+ reader->streams[i].presented = reader->streams[i].selected;
+ }
+ }
+
+ return hr;
+}
+
static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD index, DWORD flags, DWORD *actual_index,
DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample)
{
@@ -867,20 +904,23 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind
EnterCriticalSection(&stream->cs);
- if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN))
+ if (SUCCEEDED(hr = source_reader_start_source(reader)))
{
- while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS)
+ if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN))
{
- if (stream->stream)
+ while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS)
{
- if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL)))
- WARN("Sample request failed, hr %#x.\n", hr);
+ if (stream->stream)
+ {
+ if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL)))
+ WARN("Sample request failed, hr %#x.\n", hr);
+ }
+ SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE);
}
- SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE);
}
- }
- *sample = media_stream_pop_sample(stream, stream_flags);
+ *sample = media_stream_pop_sample(stream, stream_flags);
+ }
LeaveCriticalSection(&stream->cs);
@@ -913,9 +953,6 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index,
TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample);
- /* FIXME: probably should happen once */
- IMFMediaSource_Start(reader->source, reader->descriptor, NULL, NULL);
-
if (reader->async_callback)
{
if (actual_index || stream_flags || timestamp || sample)
diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index 16bb92b80e..081d94c7d5 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -351,10 +351,11 @@ static HRESULT WINAPI test_source_Start(IMFMediaSource *iface, IMFPresentationDe
PROPVARIANT var;
int i;
-todo_wine {
- ok(time_format && IsEqualGUID(time_format, &GUID_NULL), "Unexpected time format %s.\n", wine_dbgstr_guid(time_format));
- ok(start_position && (start_position->vt == VT_I8 || start_position->vt == VT_EMPTY), "Unexpected position type.\n");
-}
+ ok(time_format && IsEqualGUID(time_format, &GUID_NULL), "Unexpected time format %s.\n",
+ wine_dbgstr_guid(time_format));
+ ok(start_position && (start_position->vt == VT_I8 || start_position->vt == VT_EMPTY),
+ "Unexpected position type.\n");
+
EnterCriticalSection(&source->cs);
event_type = source->state == SOURCE_RUNNING ? MESourceSeeked : MESourceStarted;
@@ -823,16 +824,6 @@ static void test_source_reader_from_media_source(void)
source = create_test_source();
ok(!!source, "Failed to create test source.\n");
- callback = create_async_callback();
-
- hr = MFCreateAttributes(&attributes, 1);
- ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr);
-
- hr = IMFAttributes_SetUnknown(attributes, &MF_SOURCE_READER_ASYNC_CALLBACK,
- (IUnknown *)&callback->IMFSourceReaderCallback_iface);
- ok(hr == S_OK, "Failed to set attribute value, hr %#x.\n", hr);
- IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface);
-
hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr);
@@ -882,10 +873,41 @@ todo_wine
IMFSourceReader_Release(reader);
IMFMediaSource_Release(source);
+ /* Request from stream 0. */
+ source = create_test_source();
+ ok(!!source, "Failed to create test source.\n");
+
+ hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
+ ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr);
+
+ hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE);
+ ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr);
+
+ hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, ×tamp, &sample);
+ ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr);
+ ok(actual_index == 0, "Unexpected stream index %u\n", actual_index);
+ ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags);
+ ok(timestamp == 123, "Unexpected timestamp.\n");
+ ok(!!sample, "Expected sample object.\n");
+ IMFSample_Release(sample);
+
+ IMFSourceReader_Release(reader);
+ IMFMediaSource_Release(source);
+
/* Async mode. */
source = create_test_source();
ok(!!source, "Failed to create test source.\n");
+ callback = create_async_callback();
+
+ hr = MFCreateAttributes(&attributes, 1);
+ ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr);
+
+ hr = IMFAttributes_SetUnknown(attributes, &MF_SOURCE_READER_ASYNC_CALLBACK,
+ (IUnknown *)&callback->IMFSourceReaderCallback_iface);
+ ok(hr == S_OK, "Failed to set attribute value, hr %#x.\n", hr);
+ IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface);
+
hr = MFCreateSourceReaderFromMediaSource(source, attributes, &reader);
ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr);
--
2.24.0
1
2
[PATCH 1/2] gdi32/tests: Fix some test SetDIBitsToDevice RLE8 test failures on Windows 2008+.
by Sven Baars 20 Nov '19
by Sven Baars 20 Nov '19
20 Nov '19
Signed-off-by: Sven Baars <sven.wine(a)gmail.com>
---
This patch and the next one supercede 173282.
dlls/gdi32/tests/bitmap.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c
index d651765006..c1651b5a2b 100644
--- a/dlls/gdi32/tests/bitmap.c
+++ b/dlls/gdi32/tests/bitmap.c
@@ -5532,14 +5532,23 @@ static void test_SetDIBitsToDevice_RLE8(void)
info->bmiHeader.biWidth = 2;
ret = SetDIBitsToDevice( hdc, 0, 0, 8, 8, 0, 0, 0, 8, rle8_data, info, DIB_RGB_COLORS );
ok( ret == 8, "got %d\n", ret );
- for (i = 0; i < 64; i++) ok( dib_bits[i] == bottom_up[i], "%d: got %08x\n", i, dib_bits[i] );
+ if (dib_bits[0] == 0xaaaaaaaa)
+ {
+ win_skip("SetDIBitsToDevice is broken on Windows 2008.\n");
+ goto cleanup;
+ }
+ for (i = 0; i < 64; i += 8)
+ {
+ ok( dib_bits[i] == bottom_up[i], "%d: got %08x\n", i, dib_bits[i] );
+ ok( dib_bits[i+1] == bottom_up[i+1], "%d: got %08x\n", i+1, dib_bits[i+1] );
+ }
memset( dib_bits, 0xaa, 64 * 4 );
info->bmiHeader.biWidth = 8;
info->bmiHeader.biHeight = 2;
ret = SetDIBitsToDevice( hdc, 0, 0, 8, 8, 0, 0, 0, 8, rle8_data, info, DIB_RGB_COLORS );
ok( ret == 2, "got %d\n", ret );
- for (i = 0; i < 64; i++) ok( dib_bits[i] == bottom_up[i], "%d: got %08x\n", i, dib_bits[i] );
+ for (i = 0; i < 16; i++) ok( dib_bits[i] == bottom_up[i], "%d: got %08x\n", i, dib_bits[i] );
memset( dib_bits, 0xaa, 64 * 4 );
info->bmiHeader.biHeight = 9;
@@ -5671,6 +5680,7 @@ static void test_SetDIBitsToDevice_RLE8(void)
for (i = 40; i < 64; i++) ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] );
memset( dib_bits, 0xaa, 64 * 4 );
+cleanup:
DeleteDC( hdc );
DeleteObject( dib );
HeapFree( GetProcessHeap(), 0, info );
--
2.17.1
3
4
[PATCH v3 1/2] kernel32/tests: Add test for GetSystemFirmwareTable regression
by John Chadwick 20 Nov '19
by John Chadwick 20 Nov '19
20 Nov '19
This adds an assertion to ensure that a typical usage of
GetSystemFirmwareTable with a preflight call works correctly.
Signed-off-by: John Chadwick <john(a)jchw.io>
---
This supersedes patch 174123.
dlls/kernel32/tests/version.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c
index c1b7c9c59d..db42fc5a29 100644
--- a/dlls/kernel32/tests/version.c
+++ b/dlls/kernel32/tests/version.c
@@ -737,6 +737,10 @@ static void test_GetSystemFirmwareTable(void)
pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, expected_len, &expected_len);
expected_len -= min_sfti_len;
+ len = pGetSystemFirmwareTable(RSMB, 0, NULL, 0);
+todo_wine
+ ok(len == expected_len, "Expected length %u, got %u\n", expected_len, len);
+
smbios_table = HeapAlloc(GetProcessHeap(), 0, expected_len);
len = pGetSystemFirmwareTable(RSMB, 0, smbios_table, expected_len);
ok(len == expected_len, "Expected length %u, got %u\n", expected_len, len);
--
2.23.0
1
1
[PATCH] server: Automatically create ProfileList key for current user.
by Dmitry Timoshkov 20 Nov '19
by Dmitry Timoshkov 20 Nov '19
20 Nov '19
This patch aims to replace the appropriate patchset from wine-staging,
the ProfileList key is populated on first user process creation, and
thus this emulates the "system login" phase. If this approach is not
acceptable I'd be interested to know a preferred way to add similar
functionality.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
server/object.h | 1 +
server/process.c | 3 ++
server/registry.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 75 insertions(+)
diff --git a/server/object.h b/server/object.h
index 4a486e0d63..0744fe4a8d 100644
--- a/server/object.h
+++ b/server/object.h
@@ -214,6 +214,7 @@ extern void debug_exit_thread( struct thread *thread );
extern unsigned int get_prefix_cpu_mask(void);
extern void init_registry(void);
extern void flush_registry(void);
+extern void init_profilelist(void);
/* signal functions */
diff --git a/server/process.c b/server/process.c
index 16bb5d57e7..5c7bd40c8a 100644
--- a/server/process.c
+++ b/server/process.c
@@ -1208,6 +1208,9 @@ DECL_HANDLER(new_process)
if (!(process = create_process( socket_fd, parent, req->inherit_all, sd ))) goto done;
+ if (running_processes == 1)
+ init_profilelist();
+
process->startup_info = (struct startup_info *)grab_object( info );
if (req->exe_file &&
diff --git a/server/registry.c b/server/registry.c
index 48a0f28c97..0a3c32640b 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -1762,6 +1762,77 @@ static WCHAR *format_user_registry_path( const SID *sid, struct unicode_str *pat
return p;
}
+static WCHAR *format_user_sid_path( const SID *sid, struct unicode_str *path )
+{
+ static const WCHAR prefixW[] = {'S',0};
+ static const WCHAR formatW[] = {'-','%','u',0};
+ WCHAR buffer[1 + 10 + 10 + 10 * SID_MAX_SUB_AUTHORITIES];
+ WCHAR *p = buffer;
+ unsigned int i;
+
+ strcpyW( p, prefixW );
+ p += strlenW( prefixW );
+ p += sprintfW( p, formatW, sid->Revision );
+ p += sprintfW( p, formatW, MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5],
+ sid->IdentifierAuthority.Value[4] ),
+ MAKEWORD( sid->IdentifierAuthority.Value[3],
+ sid->IdentifierAuthority.Value[2] )));
+ for (i = 0; i < sid->SubAuthorityCount; i++)
+ p += sprintfW( p, formatW, sid->SubAuthority[i] );
+
+ path->len = (p - buffer) * sizeof(WCHAR);
+ path->str = p = memdup( buffer, path->len );
+ return p;
+}
+
+void init_profilelist(void)
+{
+ static const WCHAR profile_list[] = {'M','a','c','h','i','n','e','\\',
+ 'S','o','f','t','w','a','r','e','\\',
+ 'M','i','c','r','o','s','o','f','t','\\',
+ 'W','i','n','d','o','w','s',' ','N','T','\\',
+ 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
+ 'P','r','o','f','i','l','e','L','i','s','t'};
+ static const WCHAR image_path[] = {'P','r','o','f','i','l','e','I','m','a','g','e','P','a','t','h'};
+ static const struct unicode_str profile_list_name = { profile_list, sizeof(profile_list) };
+ static const struct unicode_str image_path_name = { image_path, sizeof(image_path) };
+ static const WCHAR users[] = {'C',':','\\','u','s','e','r','s','\\'};
+ WCHAR *current_user_path, *profile;
+ struct unicode_str current_user_str;
+ struct key *key, *profile_key;
+ const char *user;
+ int len;
+
+ if (!(key = create_key_recursive( root_key, &profile_list_name, current_time )))
+ fatal_error( "could not create ProfileList key\n" );
+
+ current_user_path = format_user_sid_path( token_get_user( current->process->token ), ¤t_user_str );
+ if (!current_user_path ||
+ !(profile_key = create_key_recursive( key, ¤t_user_str, current_time )))
+ fatal_error( "could not create ProfileList\\SID registry key\n" );
+
+ if (debug_level)
+ {
+ fprintf( stderr, "profile: " );
+ dump_strW( current_user_str.str, current_user_str.len / sizeof(WCHAR), stderr, "\"\"" );
+ fprintf( stderr, "\"\n" );
+ }
+ free( current_user_path );
+
+ user = wine_get_user_name();
+
+ len = sizeof(users) + (strlen(user) + 1) * sizeof(WCHAR);
+ profile = mem_alloc( len );
+ memcpy( profile, users, sizeof(users) );
+ wine_utf8_mbstowcs( 0, user, strlen(user) + 1, profile + sizeof(users) / sizeof(WCHAR), len );
+
+ set_value( profile_key, &image_path_name, REG_EXPAND_SZ, profile, len );
+ free( profile );
+
+ release_object( profile_key );
+ release_object( key );
+}
+
/* get the cpu architectures that can be supported in the current prefix */
unsigned int get_prefix_cpu_mask(void)
{
--
2.20.1
2
1
20 Nov '19
In 71aba33f, GetSystemFirmwareTable was moved from kernel32 to
kernelbase. In the process, its error handling was refactored to use
NtQuerySystemInformation, and it began to return zero whenever
NtQuerySystemInformation failed. This prevents software from being able
to make 'preflight' calls to determine how large their buffer should be.
This patch simply restores the old behavior.
Signed-off-by: John Chadwick <john(a)jchw.io>
---
dlls/kernelbase/memory.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c
index 6be399bc97..c93d490e74 100644
--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -1161,13 +1161,10 @@ UINT WINAPI GetSystemFirmwareTable( DWORD provider, DWORD id, void *buffer, DWOR
info->Action = SystemFirmwareTable_Get;
info->TableID = id;
- if (set_ntstatus( NtQuerySystemInformation( SystemFirmwareTableInformation,
- info, buffer_size, &buffer_size )))
- {
- buffer_size -= offsetof( SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer );
- if (buffer_size <= size) memcpy( buffer, info->TableBuffer, buffer_size );
- }
- else buffer_size = 0;
+ set_ntstatus( NtQuerySystemInformation( SystemFirmwareTableInformation,
+ info, buffer_size, &buffer_size ));
+ buffer_size -= offsetof( SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer );
+ if (buffer_size <= size) memcpy( buffer, info->TableBuffer, buffer_size );
HeapFree( GetProcessHeap(), 0, info );
return buffer_size;
--
2.23.0
3
3
Not all XInput events contain axes information. In particular, libinput
does not seem to provide axes information on button_event.
In effect, before this patch, with some configurations, wintab32 clients
would see a point at 0, 0 before and after each stroke.
Signed-off-by: John Chadwick <john(a)jchw.io>
---
dlls/winex11.drv/wintab.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index fe3d4a8ff4..12eb89ac7f 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -929,13 +929,20 @@ static BOOL button_event( HWND hwnd, XEvent *event )
gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(button->time);
gMsgPacket.pkSerialNumber = gSerial++;
gMsgPacket.pkCursor = curnum;
- gMsgPacket.pkX = button->axis_data[0];
- gMsgPacket.pkY = button->axis_data[1];
- gMsgPacket.pkOrientation.orAzimuth = figure_deg(button->axis_data[3],button->axis_data[4]);
- gMsgPacket.pkOrientation.orAltitude = ((1000 - 15 * max(abs(button->axis_data[3]),
- abs(button->axis_data[4])))
- * (gMsgPacket.pkStatus & TPS_INVERT?-1:1));
- gMsgPacket.pkNormalPressure = button->axis_data[2];
+ if (button->axes_count > 0) {
+ gMsgPacket.pkX = button->axis_data[0];
+ gMsgPacket.pkY = button->axis_data[1];
+ gMsgPacket.pkOrientation.orAzimuth = figure_deg(button->axis_data[3],button->axis_data[4]);
+ gMsgPacket.pkOrientation.orAltitude = ((1000 - 15 * max(abs(button->axis_data[3]),
+ abs(button->axis_data[4])))
+ * (gMsgPacket.pkStatus & TPS_INVERT?-1:1));
+ gMsgPacket.pkNormalPressure = button->axis_data[2];
+ } else {
+ gMsgPacket.pkX = last_packet.pkX;
+ gMsgPacket.pkY = last_packet.pkY;
+ gMsgPacket.pkOrientation = last_packet.pkOrientation;
+ gMsgPacket.pkNormalPressure = last_packet.pkNormalPressure;
+ }
gMsgPacket.pkButtons = get_button_state(curnum);
gMsgPacket.pkChanged = get_changed_state(&gMsgPacket);
SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd);
--
2.23.0
1
0
20 Nov '19
In 71aba33f, GetSystemFirmwareTable was moved from kernel32 to
kernelbase. In the process, its error handling was refactored to use
NtQuerySystemInformation, and it began to return zero whenever
NtQuerySystemInformation failed. This prevents software from being able
to make 'preflight' calls to determine how large their buffer should be.
This patch simply restores the old behavior.
Signed-off-by: John Chadwick <john(a)jchw.io>
---
dlls/kernelbase/memory.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c
index 6be399bc97..c93d490e74 100644
--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -1161,13 +1161,10 @@ UINT WINAPI GetSystemFirmwareTable( DWORD provider, DWORD id, void *buffer, DWOR
info->Action = SystemFirmwareTable_Get;
info->TableID = id;
- if (set_ntstatus( NtQuerySystemInformation( SystemFirmwareTableInformation,
- info, buffer_size, &buffer_size )))
- {
- buffer_size -= offsetof( SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer );
- if (buffer_size <= size) memcpy( buffer, info->TableBuffer, buffer_size );
- }
- else buffer_size = 0;
+ set_ntstatus( NtQuerySystemInformation( SystemFirmwareTableInformation,
+ info, buffer_size, &buffer_size ));
+ buffer_size -= offsetof( SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer );
+ if (buffer_size <= size) memcpy( buffer, info->TableBuffer, buffer_size );
HeapFree( GetProcessHeap(), 0, info );
return buffer_size;
--
2.23.0
2
2
[PATCH v2 1/4] server: Add support for additional fields in set_console_output_info.
by Gijs Vermeulen 20 Nov '19
by Gijs Vermeulen 20 Nov '19
20 Nov '19
Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com>
---
programs/wineconsole/wineconsole.c | 3 +++
server/console.c | 34 +++++++++++++++++++++++++-----
server/protocol.def | 33 ++++++++++++++++-------------
3 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
index 439099c37a..ebcfce1011 100644
--- a/programs/wineconsole/wineconsole.c
+++ b/programs/wineconsole/wineconsole.c
@@ -458,6 +458,9 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf
req->max_height = (r.bottom - r.top - GetSystemMetrics(SM_CYCAPTION)) / cfg->cell_height;
req->font_width = cfg->cell_width;
req->font_height = cfg->cell_height;
+ req->font_weight = cfg->font_weight;
+ req->font_pitch_family = FIXED_PITCH | FF_DONTCARE;
+ wine_server_add_data( req, cfg->face_name, lstrlenW(cfg->face_name) * sizeof(WCHAR) );
wine_server_call( req );
}
SERVER_END_REQ;
diff --git a/server/console.c b/server/console.c
index 7d1fc5d268..a5f4063b72 100644
--- a/server/console.c
+++ b/server/console.c
@@ -131,6 +131,9 @@ struct font_info
{
short int width;
short int height;
+ short int weight;
+ short int pitch_family;
+ struct unicode_str face_name;
};
struct screen_buffer
@@ -433,6 +436,10 @@ static struct screen_buffer *create_console_output( struct console_input *consol
screen_buffer->data = NULL;
screen_buffer->font.width = 0;
screen_buffer->font.height = 0;
+ screen_buffer->font.weight = 400;
+ screen_buffer->font.pitch_family = 1;
+ screen_buffer->font.face_name.str = NULL;
+ screen_buffer->font.face_name.len = 0;
memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) );
list_add_head( &screen_buffer_list, &screen_buffer->entry );
@@ -896,6 +903,8 @@ static int set_console_output_info( struct screen_buffer *screen_buffer,
const struct set_console_output_info_request *req )
{
struct console_renderer_event evt;
+ data_size_t font_name_len, offset;
+ WCHAR *font_name;
memset(&evt.u, 0, sizeof(evt.u));
if (req->mask & SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM)
@@ -1039,15 +1048,29 @@ static int set_console_output_info( struct screen_buffer *screen_buffer,
screen_buffer->max_width = req->max_width;
screen_buffer->max_height = req->max_height;
}
+ if (req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE)
+ {
+ memcpy( screen_buffer->color_map, get_req_data(), min( get_req_data_size(), sizeof(screen_buffer->color_map) ));
+ }
if (req->mask & SET_CONSOLE_OUTPUT_INFO_FONT)
{
screen_buffer->font.width = req->font_width;
screen_buffer->font.height = req->font_height;
- }
- if (req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE)
- {
- memcpy( screen_buffer->color_map, get_req_data(),
- min( sizeof(screen_buffer->color_map), get_req_data_size() ));
+ screen_buffer->font.weight = req->font_weight;
+ screen_buffer->font.pitch_family = req->font_pitch_family;
+ offset = req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE ? sizeof(screen_buffer->color_map) : 0;
+ if (get_req_data_size() > offset)
+ {
+ font_name_len = (get_req_data_size() - offset) / sizeof(WCHAR) * sizeof(WCHAR);
+ font_name = mem_alloc( font_name_len );
+ if (font_name)
+ {
+ memcpy( font_name, (char*)get_req_data() + offset, font_name_len );
+ free( (WCHAR *)screen_buffer->font.face_name.str );
+ screen_buffer->font.face_name.str = font_name;
+ screen_buffer->font.face_name.len = font_name_len;
+ }
+ }
}
return 1;
@@ -1183,6 +1206,7 @@ static void screen_buffer_destroy( struct object *obj )
}
if (screen_buffer->fd) release_object( screen_buffer->fd );
free( screen_buffer->data );
+ free( (WCHAR *)screen_buffer->font.face_name.str );
}
static struct fd *screen_buffer_get_fd( struct object *obj )
diff --git a/server/protocol.def b/server/protocol.def
index 3a0df20bdb..4dc9a278ad 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1615,25 +1615,28 @@ struct console_renderer_event
/* Set info about a console (output only) */
@REQ(set_console_output_info)
- obj_handle_t handle; /* handle to the console */
- int mask; /* setting mask (see below) */
- short int cursor_size; /* size of cursor (percentage filled) */
- short int cursor_visible;/* cursor visibility flag */
- short int cursor_x; /* position of cursor (x, y) */
+ obj_handle_t handle; /* handle to the console */
+ int mask; /* setting mask (see below) */
+ short int cursor_size; /* size of cursor (percentage filled) */
+ short int cursor_visible; /* cursor visibility flag */
+ short int cursor_x; /* position of cursor (x, y) */
short int cursor_y;
- short int width; /* width of the screen buffer */
- short int height; /* height of the screen buffer */
- short int attr; /* default fill attributes (screen colors) */
- short int popup_attr; /* pop-up color attributes */
- short int win_left; /* window actually displayed by renderer */
- short int win_top; /* the rect area is expressed within the */
- short int win_right; /* boundaries of the screen buffer */
+ short int width; /* width of the screen buffer */
+ short int height; /* height of the screen buffer */
+ short int attr; /* default fill attributes (screen colors) */
+ short int popup_attr; /* pop-up color attributes */
+ short int win_left; /* window actually displayed by renderer */
+ short int win_top; /* the rect area is expressed within the */
+ short int win_right; /* boundaries of the screen buffer */
short int win_bottom;
- short int max_width; /* maximum size (width x height) for the window */
+ short int max_width; /* maximum size (width x height) for the window */
short int max_height;
- short int font_width; /* font size (width x height) */
+ short int font_width; /* font size (width x height) */
short int font_height;
- VARARG(colors,uints); /* color table */
+ short int font_weight; /* font weight */
+ short int font_pitch_family; /* font pitch & family */
+ VARARG(colors,uints); /* color table */
+ VARARG(face_name,unicode_str); /* font face name */
@END
#define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001
#define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x0002
--
2.24.0
3
7
[PATCH 1/4] qedit/samplegrabber: Reimplement the source pin over the strmbase source.
by Zebediah Figura 20 Nov '19
by Zebediah Figura 20 Nov '19
20 Nov '19
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
dlls/qedit/samplegrabber.c | 239 +++++++++++++------------------
dlls/qedit/tests/samplegrabber.c | 1 +
2 files changed, 104 insertions(+), 136 deletions(-)
diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c
index 9a67b31fb4..21634a145d 100644
--- a/dlls/qedit/samplegrabber.c
+++ b/dlls/qedit/samplegrabber.c
@@ -34,7 +34,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(qedit);
static const WCHAR pin_in_name[] = { 'I', 'n', 0 };
-static const WCHAR pin_out_name[] = { 'O', 'u', 't', 0 };
static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype, BOOL past);
@@ -213,14 +212,17 @@ static inline SG_Pin *impl_from_IPin(IPin *iface)
typedef struct _SG_Impl {
struct strmbase_filter filter;
ISampleGrabber ISampleGrabber_iface;
+
+ struct strmbase_source source;
/* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */
- IUnknown* seekthru_unk;
- AM_MEDIA_TYPE mtype;
+ IUnknown *seekthru_unk;
+ IMemInputPin *memOutput;
+
SG_Pin pin_in;
- SG_Pin pin_out;
+ AM_MEDIA_TYPE mtype;
IMemInputPin IMemInputPin_iface;
IMemAllocator *allocator;
- IMemInputPin *memOutput;
+
ISampleGrabberCB *grabberIface;
LONG grabberMethod;
LONG oneShot;
@@ -280,7 +282,7 @@ static IPin *sample_grabber_get_pin(struct strmbase_filter *iface, unsigned int
if (index == 0)
return &filter->pin_in.IPin_iface;
else if (index == 1)
- return &filter->pin_out.IPin_iface;
+ return &filter->source.pin.IPin_iface;
return NULL;
}
@@ -609,8 +611,8 @@ SampleGrabber_IMemInputPin_Receive(IMemInputPin *iface, IMediaSample *sample)
if (This->oneShot == OneShot_Wait) {
This->oneShot = OneShot_Past;
hr = S_FALSE;
- if (This->pin_out.pair)
- IPin_EndOfStream(This->pin_out.pair);
+ if (This->source.pin.peer)
+ IPin_EndOfStream(This->source.pin.peer);
}
return hr;
}
@@ -689,55 +691,6 @@ SampleGrabber_In_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE *
return E_UNEXPECTED;
}
-/* IPin - output pin */
-static HRESULT WINAPI
-SampleGrabber_Out_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE *type)
-{
- SG_Pin *This = impl_from_IPin(iface);
- HRESULT hr;
-
- TRACE("(%p)->(%p, %p)\n", This, receiver, type);
- if (!receiver)
- return E_POINTER;
- if (This->pair)
- return VFW_E_ALREADY_CONNECTED;
- if (This->sg->filter.state != State_Stopped)
- return VFW_E_NOT_STOPPED;
- if (type) {
- TRACE("Media type: %s/%s ssize: %u format: %s (%u bytes)\n",
- debugstr_guid(&type->majortype), debugstr_guid(&type->subtype),
- type->lSampleSize,
- debugstr_guid(&type->formattype), type->cbFormat);
- if (!IsEqualGUID(&This->sg->mtype.majortype,&GUID_NULL) &&
- !IsEqualGUID(&This->sg->mtype.majortype,&type->majortype))
- return VFW_E_TYPE_NOT_ACCEPTED;
- if (!IsEqualGUID(&This->sg->mtype.subtype,&MEDIASUBTYPE_None) &&
- !IsEqualGUID(&This->sg->mtype.subtype,&type->subtype))
- return VFW_E_TYPE_NOT_ACCEPTED;
- if (!IsEqualGUID(&This->sg->mtype.formattype,&GUID_NULL) &&
- !IsEqualGUID(&This->sg->mtype.formattype,&FORMAT_None) &&
- !IsEqualGUID(&This->sg->mtype.formattype,&type->formattype))
- return VFW_E_TYPE_NOT_ACCEPTED;
- }
- else
- type = &This->sg->mtype;
- if (!IsEqualGUID(&type->formattype, &FORMAT_None) &&
- !IsEqualGUID(&type->formattype, &GUID_NULL) &&
- !type->pbFormat)
- return VFW_E_TYPE_NOT_ACCEPTED;
- hr = IPin_ReceiveConnection(receiver, &This->IPin_iface, type);
- if (FAILED(hr))
- return hr;
- This->pair = receiver;
- if (This->sg->memOutput) {
- IMemInputPin_Release(This->sg->memOutput);
- This->sg->memOutput = NULL;
- }
- IPin_QueryInterface(receiver,&IID_IMemInputPin,(void **)&(This->sg->memOutput));
- TRACE("(%p) Accepted IPin %p, IMemInputPin %p\n", This, receiver, This->sg->memOutput);
- return S_OK;
-}
-
/* IPin - input pin */
static HRESULT WINAPI
SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_MEDIA_TYPE *type)
@@ -785,14 +738,6 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M
return S_OK;
}
-/* IPin - output pin */
-static HRESULT WINAPI
-SampleGrabber_Out_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_MEDIA_TYPE *mtype)
-{
- WARN("(%p, %p): unexpected\n", connector, mtype);
- return E_UNEXPECTED;
-}
-
/* IPin - input pin */
static HRESULT WINAPI
SampleGrabber_In_IPin_Disconnect(IPin *iface)
@@ -809,26 +754,6 @@ SampleGrabber_In_IPin_Disconnect(IPin *iface)
return S_FALSE;
}
-/* IPin - output pin */
-static HRESULT WINAPI
-SampleGrabber_Out_IPin_Disconnect(IPin *iface)
-{
- SG_Pin *This = impl_from_IPin(iface);
-
- TRACE("(%p)->() pair = %p\n", This, This->pair);
- if (This->sg->filter.state != State_Stopped)
- return VFW_E_NOT_STOPPED;
- if (This->pair) {
- This->pair = NULL;
- if (This->sg->memOutput) {
- IMemInputPin_Release(This->sg->memOutput);
- This->sg->memOutput = NULL;
- }
- return S_OK;
- }
- return S_FALSE;
-}
-
/* IPin */
static HRESULT WINAPI
SampleGrabber_IPin_ConnectedTo(IPin *iface, IPin **pin)
@@ -943,8 +868,8 @@ SampleGrabber_In_IPin_QueryInternalConnections(IPin *iface, IPin **pins, ULONG *
if (*nPins) {
if (!pins)
return E_POINTER;
- IPin_AddRef(&This->sg->pin_out.IPin_iface);
- *pins = &This->sg->pin_out.IPin_iface;
+ IPin_AddRef(&This->sg->source.pin.IPin_iface);
+ *pins = &This->sg->source.pin.IPin_iface;
*nPins = 1;
return S_OK;
}
@@ -952,16 +877,6 @@ SampleGrabber_In_IPin_QueryInternalConnections(IPin *iface, IPin **pins, ULONG *
return S_FALSE;
}
-/* IPin - output pin */
-static HRESULT WINAPI
-SampleGrabber_Out_IPin_QueryInternalConnections(IPin *iface, IPin **pins, ULONG *nPins)
-{
- WARN("(%p, %p): unexpected\n", pins, nPins);
- if (nPins)
- *nPins = 0;
- return E_NOTIMPL;
-}
-
/* IPin */
static HRESULT WINAPI
SampleGrabber_IPin_EndOfStream(IPin *iface)
@@ -1065,51 +980,105 @@ static const IPinVtbl IPin_In_VTable =
SampleGrabber_IPin_NewSegment,
};
-static HRESULT WINAPI sample_grabber_source_QueryInterface(IPin *iface, REFIID iid, void **out)
+static inline SG_Impl *impl_from_source_pin(struct strmbase_pin *iface)
{
- SG_Pin *pin = impl_from_IPin(iface);
+ return CONTAINING_RECORD(iface, SG_Impl, source.pin);
+}
- TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+static HRESULT sample_grabber_source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out)
+{
+ SG_Impl *filter = impl_from_source_pin(iface);
- if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IPin))
- {
- *out = iface;
- }
- else if (IsEqualGUID(iid, &IID_IMediaPosition) || IsEqualGUID(iid, &IID_IMediaSeeking))
+ if (IsEqualGUID(iid, &IID_IMediaPosition) || IsEqualGUID(iid, &IID_IMediaSeeking))
+ return IUnknown_QueryInterface(filter->seekthru_unk, iid, out);
+ else
+ return E_NOINTERFACE;
+}
+
+static HRESULT sample_grabber_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt)
+{
+ return S_OK;
+}
+
+static HRESULT sample_grabber_source_get_media_type(struct strmbase_pin *iface,
+ unsigned int index, AM_MEDIA_TYPE *mt)
+{
+ SG_Impl *filter = impl_from_source_pin(iface);
+
+ if (!index)
{
- return IUnknown_QueryInterface(pin->sg->seekthru_unk, iid, out);
+ CopyMediaType(mt, &filter->mtype);
+ return S_OK;
}
- else
+ return VFW_S_NO_MORE_ITEMS;
+}
+
+static HRESULT WINAPI sample_grabber_source_AttemptConnection(struct strmbase_source *iface,
+ IPin *peer, const AM_MEDIA_TYPE *mt)
+{
+ SG_Impl *filter = impl_from_source_pin(&iface->pin);
+ HRESULT hr;
+
+ if (filter->source.pin.peer)
+ return VFW_E_ALREADY_CONNECTED;
+ if (filter->filter.state != State_Stopped)
+ return VFW_E_NOT_STOPPED;
+ if (!IsEqualGUID(&mt->majortype, &filter->mtype.majortype))
+ return VFW_E_TYPE_NOT_ACCEPTED;
+ if (!IsEqualGUID(&mt->subtype, &filter->mtype.subtype))
+ return VFW_E_TYPE_NOT_ACCEPTED;
+ if (!IsEqualGUID(&mt->formattype, &FORMAT_None)
+ && !IsEqualGUID(&mt->formattype, &GUID_NULL)
+ && !IsEqualGUID(&mt->formattype, &filter->mtype.majortype))
+ return VFW_E_TYPE_NOT_ACCEPTED;
+ if (!IsEqualGUID(&mt->formattype, &FORMAT_None)
+ && !IsEqualGUID(&mt->formattype, &GUID_NULL)
+ && !mt->pbFormat)
+ return VFW_E_TYPE_NOT_ACCEPTED;
+
+ IPin_AddRef(filter->source.pin.peer = peer);
+ CopyMediaType(&filter->source.pin.mt, mt);
+ if (SUCCEEDED(hr = IPin_ReceiveConnection(peer, &filter->source.pin.IPin_iface, mt)))
+ hr = IPin_QueryInterface(peer, &IID_IMemInputPin, (void **)&filter->source.pMemInputPin);
+
+ if (FAILED(hr))
{
- WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
- *out = NULL;
- return E_NOINTERFACE;
+ IPin_Release(filter->source.pin.peer);
+ filter->source.pin.peer = NULL;
+ FreeMediaType(&filter->source.pin.mt);
}
- IUnknown_AddRef((IUnknown *)*out);
- return S_OK;
+ return hr;
}
-static const IPinVtbl IPin_Out_VTable =
+static const struct strmbase_source_ops source_ops =
{
- sample_grabber_source_QueryInterface,
- SampleGrabber_IPin_AddRef,
- SampleGrabber_IPin_Release,
- SampleGrabber_Out_IPin_Connect,
- SampleGrabber_Out_IPin_ReceiveConnection,
- SampleGrabber_Out_IPin_Disconnect,
- SampleGrabber_IPin_ConnectedTo,
- SampleGrabber_IPin_ConnectionMediaType,
- SampleGrabber_IPin_QueryPinInfo,
- SampleGrabber_IPin_QueryDirection,
- SampleGrabber_IPin_QueryId,
- SampleGrabber_IPin_QueryAccept,
- SampleGrabber_IPin_EnumMediaTypes,
- SampleGrabber_Out_IPin_QueryInternalConnections,
- SampleGrabber_IPin_EndOfStream,
- SampleGrabber_IPin_BeginFlush,
- SampleGrabber_IPin_EndFlush,
- SampleGrabber_IPin_NewSegment,
+ .base.pin_query_interface = sample_grabber_source_query_interface,
+ .base.pin_query_accept = sample_grabber_source_query_accept,
+ .base.pin_get_media_type = sample_grabber_source_get_media_type,
+ .pfnAttemptConnection = sample_grabber_source_AttemptConnection,
+};
+
+static const IPinVtbl source_vtbl =
+{
+ BasePinImpl_QueryInterface,
+ BasePinImpl_AddRef,
+ BasePinImpl_Release,
+ BaseOutputPinImpl_Connect,
+ BaseOutputPinImpl_ReceiveConnection,
+ BaseOutputPinImpl_Disconnect,
+ BasePinImpl_ConnectedTo,
+ BasePinImpl_ConnectionMediaType,
+ BasePinImpl_QueryPinInfo,
+ BasePinImpl_QueryDirection,
+ BasePinImpl_QueryId,
+ BasePinImpl_QueryAccept,
+ BasePinImpl_EnumMediaTypes,
+ BasePinImpl_QueryInternalConnections,
+ BaseOutputPinImpl_EndOfStream,
+ BaseOutputPinImpl_BeginFlush,
+ BaseOutputPinImpl_EndFlush,
+ BasePinImpl_NewSegment,
};
HRESULT SampleGrabber_create(IUnknown *outer, void **out)
@@ -1133,11 +1102,9 @@ HRESULT SampleGrabber_create(IUnknown *outer, void **out)
obj->pin_in.name = pin_in_name;
obj->pin_in.sg = obj;
obj->pin_in.pair = NULL;
- obj->pin_out.IPin_iface.lpVtbl = &IPin_Out_VTable;
- obj->pin_out.dir = PINDIR_OUTPUT;
- obj->pin_out.name = pin_out_name;
- obj->pin_out.sg = obj;
- obj->pin_out.pair = NULL;
+
+ strmbase_source_init(&obj->source, &source_vtbl, &obj->filter, L"Out", &source_ops);
+
obj->mtype.majortype = GUID_NULL;
obj->mtype.subtype = MEDIASUBTYPE_None;
obj->mtype.formattype = FORMAT_None;
diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c
index 9bb4eb4f01..22112c6143 100644
--- a/dlls/qedit/tests/samplegrabber.c
+++ b/dlls/qedit/tests/samplegrabber.c
@@ -472,6 +472,7 @@ static void test_media_types(void)
hr = IPin_EnumMediaTypes(pin, &enummt);
todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr);
+ if (hr == S_OK) IEnumMediaTypes_Release(enummt);
hr = IPin_QueryAccept(pin, &mt);
ok(hr == S_OK, "Got hr %#x.\n", hr);
--
2.24.0
1
3
19 Nov '19
From: Jeff Smith <whydoubt(a)gmail.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcrt/tests/time.c | 48 ++++++------
dlls/msvcrt/time.c | 150 ++++++++++++++++++++++++++-----------
dlls/ucrtbase/tests/misc.c | 46 ++++++------
3 files changed, 152 insertions(+), 92 deletions(-)
1
0
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/ucrtbase/tests/misc.c | 113 +++++++++++++++++++++++++++++++++++++
1 file changed, 113 insertions(+)
1
0
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcrt/tests/time.c | 107 +++++++++++++++++++++++++++++++++++++++
1 file changed, 107 insertions(+)
1
0
[PATCH 2/5 v2] msvcrt: Use correct __lc_time_data fields in strftime functions.
by Piotr Caban 19 Nov '19
by Piotr Caban 19 Nov '19
19 Nov '19
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcrt/msvcrt.h | 2 +
dlls/msvcrt/time.c | 164 +++++++++++++++++++++++++++++--------------
2 files changed, 115 insertions(+), 51 deletions(-)
1
0
19 Nov '19
From: Jeff Smith <whydoubt(a)gmail.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcrt/tests/time.c | 48 ++++++------
dlls/msvcrt/time.c | 150 ++++++++++++++++++++++++++-----------
dlls/ucrtbase/tests/misc.c | 48 ++++++------
3 files changed, 153 insertions(+), 93 deletions(-)
2
1
19 Nov '19
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcrt/mbcs.c | 8 +++++---
dlls/msvcrt/tests/string.c | 5 +++++
2 files changed, 10 insertions(+), 3 deletions(-)
1
0
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/ucrtbase/tests/misc.c | 116 +++++++++++++++++++++++++++++++++++++
1 file changed, 116 insertions(+)
2
1
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcrt/tests/time.c | 107 +++++++++++++++++++++++++++++++++++++++
1 file changed, 107 insertions(+)
2
1
[PATCH 2/5] msvcrt: Use correct __lc_time_data fields in strftime functions.
by Piotr Caban 19 Nov '19
by Piotr Caban 19 Nov '19
19 Nov '19
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcrt/msvcrt.h | 2 +
dlls/msvcrt/time.c | 164 +++++++++++++++++++++++++++++--------------
2 files changed, 115 insertions(+), 51 deletions(-)
2
1
19 Nov '19
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcrt/mbcs.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
2
1
[PATCH] dmstyle: Implement IsParamSupported() for the Audition track
by Michael Stefaniuc 19 Nov '19
by Michael Stefaniuc 19 Nov '19
19 Nov '19
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmstyle/auditiontrack.c | 28 ++++++++++++++++++++--------
dlls/dmstyle/tests/dmstyle.c | 20 +++++++++-----------
2 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c
index 7555da0c6c..ae455893b5 100644
--- a/dlls/dmstyle/auditiontrack.c
+++ b/dlls/dmstyle/auditiontrack.c
@@ -137,18 +137,30 @@ static HRESULT WINAPI audition_track_SetParam(IDirectMusicTrack8 *iface, REFGUID
return S_OK;
}
-static HRESULT WINAPI audition_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType)
+static HRESULT WINAPI audition_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type)
{
- IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
+ IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
+ static const REFGUID valid[] = {
+ &GUID_DisableTimeSig,
+ &GUID_EnableTimeSig,
+ &GUID_SeedVariations,
+ &GUID_Valid_Start_Time,
+ &GUID_Variations
+ };
+ unsigned int i;
+
- TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType));
+ TRACE("(%p, %s)\n", This, debugstr_dmguid(type));
+
+ if (!type)
+ return E_POINTER;
- if (!rguidType)
- return E_POINTER;
+ for (i = 0; i < ARRAY_SIZE(valid); i++)
+ if (IsEqualGUID(type, valid[i]))
+ return S_OK;
- /* didn't find any params */
- TRACE("param unsupported\n");
- return DMUS_E_TYPE_UNSUPPORTED;
+ TRACE("param unsupported\n");
+ return DMUS_E_TYPE_UNSUPPORTED;
}
static HRESULT WINAPI audition_track_AddNotificationType(IDirectMusicTrack8 *iface,
diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c
index 6419f6f810..a63d1dbd1c 100644
--- a/dlls/dmstyle/tests/dmstyle.c
+++ b/dlls/dmstyle/tests/dmstyle.c
@@ -286,16 +286,15 @@ static void test_track(void)
const char *name;
BOOL has_save;
BOOL has_join;
- /* bitfields with supported param types */
+ /* bitfield with supported param types */
unsigned int has_params;
- unsigned int todo_params;
} class[] = {
- { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 },
- { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 0 },
- { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 },
- { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 },
- { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 },
- { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200, 0 },
+ { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200 },
+ { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002 },
+ { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38 },
+ { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200 },
+ { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000 },
+ { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200 },
};
#undef X
unsigned int i, j;
@@ -329,9 +328,8 @@ static void test_track(void)
for (j = 0; j < ARRAY_SIZE(param_types); j++) {
hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[j].type);
if (class[i].has_params & (1 << j))
- todo_wine_if(class[i].todo_params & (1 << j))
- ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n",
- param_types[j].name, hr);
+ ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n",
+ param_types[j].name, hr);
else
ok(hr == DMUS_E_TYPE_UNSUPPORTED,
"IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",
--
2.20.1
2
2
From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de>
Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
This supersedes patch 173325.
tests/d3d12.c | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 278 insertions(+)
diff --git a/tests/d3d12.c b/tests/d3d12.c
index b18bfb2..5284138 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -4943,6 +4943,283 @@ static void test_clear_unordered_access_view_buffer(void)
#undef BUFFER_SIZE
}
+static void test_clear_unordered_access_view_image(void)
+{
+ unsigned int expected_colour, actual_colour;
+ D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+ ID3D12DescriptorHeap *cpu_heap, *gpu_heap;
+ ID3D12GraphicsCommandList *command_list;
+ unsigned int i, j, d, p, x, y, z, layer;
+ D3D12_HEAP_PROPERTIES heap_properties;
+ unsigned int image_size, image_depth;
+ D3D12_RESOURCE_DESC resource_desc;
+ struct test_context_desc desc;
+ struct test_context context;
+ struct resource_readback rb;
+ ID3D12CommandQueue *queue;
+ bool is_inside, success;
+ ID3D12Resource *texture;
+ ID3D12Device *device;
+ UINT clear_value[4];
+ HRESULT hr;
+
+#define IMAGE_SIZE 16
+ static const struct
+ {
+ DXGI_FORMAT format;
+ unsigned int image_mips;
+ unsigned int image_layers;
+ unsigned int mip_level;
+ unsigned int first_layer;
+ unsigned int layer_count;
+ unsigned int rect_count;
+ RECT clear_rects[2];
+ unsigned int values[4];
+ unsigned int expected;
+ bool is_float;
+ bool is_todo;
+ }
+ tests[] =
+ {
+ /* Test clearing a specific mip level. */
+ {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, 0, {}, {1, 0, 0, 0}, 1, false, false},
+ {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, 0, {}, {1, 0, 0, 0}, 1, false, false},
+ {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, 0, {}, {0x3f000000, 0, 0, 0}, 0x3f000000, true, true},
+ {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, 0, {}, {0x3f000000, 0, 0, 0}, 0x3f000000, true, true},
+ /* Test clearing specific array layers. */
+ {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, 0, {}, {1, 0, 0, 0}, 1, false, false},
+ {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, 0, {}, {1, 0, 0, 0}, 1, false, false},
+ {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, 0, {},
+ {0x3f000000, 0, 0, 0}, 0x3f000000, true, true},
+ {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, 0, {},
+ {0x3f000000, 0, 0, 0}, 0x3f000000, true, true},
+ /* Test a single clear rect. */
+ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 1, {{1, 2, IMAGE_SIZE - 4, IMAGE_SIZE - 2}},
+ {1, 0, 0, 0}, 1, false, true},
+ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 1, {{1, 2, IMAGE_SIZE - 4, IMAGE_SIZE - 2}},
+ {0x3f000000, 0, 0, 0}, 0x3f000000, true, true},
+ /* Test multiple clear rects. */
+ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 2, {{1, 2, 3, 4}, {5, 6, 7, 8}},
+ {1, 0, 0, 0}, 1, false, true},
+ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 2, {{1, 2, 3, 4}, {5, 6, 7, 8}},
+ {0x3f000000, 0, 0, 0}, 0x3f000000, true, true},
+ /* Test uint clears with formats. */
+ {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001, false, false},
+ {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, 0, {}, {0x12345, 0, 0, 0}, 0x00002345, false, true},
+ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001, false, true},
+ {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001, false, true},
+ {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201, false, false},
+ {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {0x123, 0, 0, 0}, 0x00000023, false, true},
+ {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201, false, true},
+ {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001, false, true},
+ /* Test float clears with formats. */
+ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true, true},
+ {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, 0, {},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, true, true},
+ {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x0000ff80, true, true},
+ {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {},
+ {0, 0, 0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */}, 0xff800000, true, true},
+ {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {},
+ {0x3f000000 /* 1.0f */, 0 /* 0.0f */, 0xbf800000 /* -1.0f */, 0x3f000000 /* 1.0f */},
+ 0x00000380, true, true},
+ };
+
+ static const struct
+ {
+ D3D12_RESOURCE_DIMENSION resource_dim;
+ D3D12_UAV_DIMENSION view_dim;
+ bool is_layered;
+ }
+ uav_dimensions[] =
+ {
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, D3D12_UAV_DIMENSION_TEXTURE2D, false},
+ {D3D12_RESOURCE_DIMENSION_TEXTURE2D, D3D12_UAV_DIMENSION_TEXTURE2DARRAY, true },
+ /* Expected behaviour with partial layer coverage is unclear. */
+ {D3D12_RESOURCE_DIMENSION_TEXTURE3D, D3D12_UAV_DIMENSION_TEXTURE3D, false},
+ };
+
+ memset(&desc, 0, sizeof(desc));
+ desc.no_render_target = true;
+ if (!init_test_context(&context, &desc))
+ return;
+ device = context.device;
+ command_list = context.list;
+ queue = context.queue;
+
+ cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2);
+ gpu_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2);
+
+ memset(&heap_properties, 0, sizeof(heap_properties));
+ heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
+
+ for (d = 0; d < ARRAY_SIZE(uav_dimensions); ++d)
+ {
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ vkd3d_test_set_context("Dim %u, Test %u", d, i);
+
+ if (tests[i].image_layers > 1 && !uav_dimensions[d].is_layered)
+ continue;
+
+ resource_desc.Dimension = uav_dimensions[d].resource_dim;
+ resource_desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+ resource_desc.Width = IMAGE_SIZE;
+ resource_desc.Height = IMAGE_SIZE;
+ if (uav_dimensions[d].resource_dim == D3D12_RESOURCE_DIMENSION_TEXTURE1D)
+ resource_desc.Height = 1;
+ resource_desc.DepthOrArraySize = tests[i].image_layers;
+ resource_desc.MipLevels = tests[i].image_mips;
+ resource_desc.Format = tests[i].format;
+ resource_desc.SampleDesc.Count = 1;
+ resource_desc.SampleDesc.Quality = 0;
+ resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
+
+ if (FAILED(hr = ID3D12Device_CreateCommittedResource(device, &heap_properties,
+ D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_UNORDERED_ACCESS,
+ NULL, &IID_ID3D12Resource, (void **)&texture)))
+ {
+ skip("Failed to create texture, hr %#x.\n", hr);
+ continue;
+ }
+
+ uav_desc.Format = tests[i].format;
+ uav_desc.ViewDimension = uav_dimensions[d].view_dim;
+
+ for (j = 0; j < 2; ++j)
+ {
+ unsigned int first_layer = j ? 0 : tests[i].first_layer;
+ unsigned int layer_count = j ? tests[i].image_layers : tests[i].layer_count;
+
+ switch (uav_desc.ViewDimension)
+ {
+ case D3D12_UAV_DIMENSION_TEXTURE1D:
+ uav_desc.Texture1D.MipSlice = tests[i].mip_level;
+ break;
+
+ case D3D12_UAV_DIMENSION_TEXTURE1DARRAY:
+ uav_desc.Texture1DArray.MipSlice = tests[i].mip_level;
+ uav_desc.Texture1DArray.FirstArraySlice = first_layer;
+ uav_desc.Texture1DArray.ArraySize = layer_count;
+ break;
+
+ case D3D12_UAV_DIMENSION_TEXTURE2D:
+ uav_desc.Texture2D.MipSlice = tests[i].mip_level;
+ uav_desc.Texture2D.PlaneSlice = 0;
+ break;
+
+ case D3D12_UAV_DIMENSION_TEXTURE2DARRAY:
+ uav_desc.Texture2DArray.MipSlice = tests[i].mip_level;
+ uav_desc.Texture2DArray.FirstArraySlice = first_layer;
+ uav_desc.Texture2DArray.ArraySize = layer_count;
+ uav_desc.Texture2DArray.PlaneSlice = 0;
+ break;
+
+ case D3D12_UAV_DIMENSION_TEXTURE3D:
+ uav_desc.Texture3D.MipSlice = tests[i].mip_level;
+ uav_desc.Texture3D.FirstWSlice = first_layer;
+ uav_desc.Texture3D.WSize = layer_count;
+ break;
+
+ default:
+ continue;
+ }
+
+ ID3D12Device_CreateUnorderedAccessView(device, texture, NULL,
+ &uav_desc, get_cpu_descriptor_handle(&context, cpu_heap, j));
+ ID3D12Device_CreateUnorderedAccessView(device, texture, NULL,
+ &uav_desc, get_cpu_descriptor_handle(&context, gpu_heap, j));
+ }
+
+ for (j = 0; j < 4; ++j)
+ {
+ clear_value[j] = tests[i].expected ? 0u : ~0u;
+ }
+
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 1),
+ get_cpu_descriptor_handle(&context, cpu_heap, 1),
+ texture, clear_value, 0, NULL);
+
+ uav_barrier(command_list, texture);
+
+ if (tests[i].is_float)
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewFloat(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_heap, 0),
+ texture, (const float *)tests[i].values, tests[i].rect_count, tests[i].clear_rects);
+ else
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_heap, 0),
+ texture, tests[i].values, tests[i].rect_count, tests[i].clear_rects);
+
+ transition_resource_state(command_list, texture,
+ D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
+
+ image_depth = uav_dimensions[d].resource_dim == D3D12_RESOURCE_DIMENSION_TEXTURE3D
+ ? max(tests[i].image_layers >> tests[i].mip_level, 1u) : 1;
+ image_size = max(IMAGE_SIZE >> tests[i].mip_level, 1u);
+
+ for (layer = 0; layer < tests[i].image_layers / image_depth; ++layer)
+ {
+ get_texture_readback_with_command_list(texture,
+ tests[i].mip_level + (layer * tests[i].image_mips),
+ &rb, queue, command_list);
+
+ for (p = 0; p < image_depth * image_size * image_size; ++p)
+ {
+ x = p % image_size;
+ y = (p / image_size) % image_size;
+ z = p / (image_size * image_size);
+
+ is_inside = tests[i].rect_count == 0;
+
+ for (j = 0; j < tests[i].rect_count; ++j)
+ {
+ if (y >= tests[i].clear_rects[j].top && y < tests[i].clear_rects[j].bottom
+ && x >= tests[i].clear_rects[j].left && x < tests[i].clear_rects[j].right)
+ {
+ is_inside = true;
+ break;
+ }
+ }
+
+ if (uav_dimensions[d].resource_dim == D3D12_RESOURCE_DIMENSION_TEXTURE3D)
+ is_inside = is_inside && z >= tests[i].first_layer
+ && z < tests[i].first_layer + tests[i].layer_count;
+ else
+ is_inside = is_inside && layer >= tests[i].first_layer
+ && layer < tests[i].first_layer + tests[i].layer_count;
+
+ expected_colour = is_inside ? tests[i].expected : clear_value[0];
+ actual_colour = get_readback_uint(&rb, x, y, z);
+ success = compare_color(actual_colour, expected_colour, tests[i].is_float ? 1 : 0);
+
+ todo_if(tests[i].is_todo && expected_colour)
+ ok(success, "At layer %u, (%u,%u,%u), expected %#x, got %#x.\n",
+ layer, x, y, z, expected_colour, actual_colour);
+
+ if (!success)
+ break;
+ }
+
+ release_resource_readback(&rb);
+ reset_command_list(command_list, context.allocator);
+ }
+
+ ID3D12Resource_Release(texture);
+ }
+ }
+
+ ID3D12DescriptorHeap_Release(cpu_heap);
+ ID3D12DescriptorHeap_Release(gpu_heap);
+ destroy_test_context(&context);
+#undef IMAGE_SIZE
+}
+
static void test_set_render_targets(void)
{
ID3D12DescriptorHeap *dsv_heap, *rtv_heap;
@@ -32447,6 +32724,7 @@ START_TEST(d3d12)
run_test(test_clear_depth_stencil_view);
run_test(test_clear_render_target_view);
run_test(test_clear_unordered_access_view_buffer);
+ run_test(test_clear_unordered_access_view_image);
run_test(test_set_render_targets);
run_test(test_draw_instanced);
run_test(test_draw_indexed_instanced);
--
2.11.0
1
0
19 Nov '19
From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de>
Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
This supersedes patch 173351.
tests/d3d12.c | 101 ++++++++++++++++++++++++++++++++++++-----------
tests/d3d12_test_utils.h | 27 ++++++++-----
2 files changed, 94 insertions(+), 34 deletions(-)
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 0f843b4..b18bfb2 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -4743,7 +4743,7 @@ static void test_clear_render_target_view(void)
destroy_test_context(&context);
}
-static void test_clear_unordered_access_view(void)
+static void test_clear_unordered_access_view_buffer(void)
{
D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc;
ID3D12DescriptorHeap *cpu_heap, *gpu_heap;
@@ -4767,42 +4767,88 @@ static void test_clear_unordered_access_view(void)
DXGI_FORMAT format;
D3D12_BUFFER_UAV buffer_uav;
unsigned int values[4];
+ unsigned int expected;
+ bool is_float;
+ bool is_todo;
}
tests[] =
{
{DXGI_FORMAT_R32_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
- {0, 0, 0, 0}},
+ {0, 0, 0, 0}, 0},
{DXGI_FORMAT_R32_UINT, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
- {0, 0, 0, 0}},
+ {0, 0, 0, 0}, 0},
{DXGI_FORMAT_R32_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
- {1, 0, 0, 0}},
+ {1, 0, 0, 0}, 1},
{DXGI_FORMAT_R32_UINT, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
- {2, 0, 0, 0}},
+ {2, 0, 0, 0}, 2},
{DXGI_FORMAT_R32_UINT, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
- {3, 0, 0, 0}},
+ {3, 0, 0, 0}, 3},
{DXGI_FORMAT_R32_UINT, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
- {4, 2, 3, 4}},
+ {4, 2, 3, 4}, 4},
{DXGI_FORMAT_R32_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t) - 10, 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
- {5, 0, 0, 0}},
+ {5, 0, 0, 0}, 5},
{DXGI_FORMAT_R32_TYPELESS, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
- {0, 0, 0, 0}},
+ {0, 0, 0, 0}, 0},
{DXGI_FORMAT_R32_TYPELESS, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
- {0, 0, 0, 0}},
+ {0, 0, 0, 0}, 0},
{DXGI_FORMAT_R32_TYPELESS, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
- {6, 0, 0, 0}},
+ {6, 0, 0, 0}, 6},
{DXGI_FORMAT_R32_TYPELESS, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
- {7, 0, 0, 0}},
+ {7, 0, 0, 0}, 7},
{DXGI_FORMAT_R32_TYPELESS, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
- {8, 0, 0, 0}},
+ {8, 0, 0, 0}, 8},
{DXGI_FORMAT_R32_TYPELESS, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
- {9, 1, 1, 1}},
+ {9, 1, 1, 1}, 9},
{DXGI_FORMAT_R32_TYPELESS, {64, BUFFER_SIZE / sizeof(uint32_t) - 64, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
- {~0u, 0, 0, 0}},
+ {~0u, 0, 0, 0}, ~0u},
{DXGI_FORMAT_R32_TYPELESS, { 0, BUFFER_SIZE / sizeof(uint32_t) - 10, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
- {10, 0, 0, 0}},
+ {10, 0, 0, 0}, 10},
{DXGI_FORMAT_R32_TYPELESS, { 0, BUFFER_SIZE / sizeof(uint32_t) - 9, 0, 0, D3D12_BUFFER_UAV_FLAG_RAW},
- {11, 0, 0, 0}},
+ {11, 0, 0, 0}, 11},
+
+ {DXGI_FORMAT_R32_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0, 0, 0, 0}, 0, false, true},
+ {DXGI_FORMAT_R32_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {1, 0, 0, 0}, 1, false, true},
+ {DXGI_FORMAT_R32_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x3f800000 /* 1.0f */, 0, 0, 0}, 0x3f800000 /* 1.0f */, true, true},
+
+ {DXGI_FORMAT_R16G16_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x1234, 0xabcd, 0, 0}, 0xabcd1234, false, true},
+ {DXGI_FORMAT_R16G16_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x10000, 0, 0, 0}, 0, false, true},
+
+ {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x1234, 0xabcd, 0, 0}, 0xabcd1234, false, true},
+ {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true, true},
+ {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x40000000 /* 2.0f */, 0 /* 0.0f */, 0, 0}, 0x0000ffff, true, true},
+ {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0xbf800000 /* -1.0f */, 0 /* 0.0f */, 0x3f000000 /* 1.0f */, 0x3f000000 /* 1.0f */}, 0, true, true},
+
+ {DXGI_FORMAT_R16G16_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x1234, 0xabcd, 0, 0}, 0xabcd1234, false, true},
+ {DXGI_FORMAT_R16G16_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, true, true},
+
+ {DXGI_FORMAT_R8G8B8A8_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x11, 0x22, 0x33, 0x44}, 0x44332211, false, true},
+ {DXGI_FORMAT_R8G8B8A8_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x100, 0, 0, 0}, 0, false, true},
+
+ {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0, 0, 0, 0}, 0, false, true},
+ {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x7ff, 0x7ff, 0x3ff, 0}, 0xffffffff, false, true},
+ {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x7ff, 0, 0x3ff, 0}, 0xffc007ff, false, true},
+ {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* 2.0f */, 0}, 0x801e0380, true, true},
+ {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
+ {0x3f000000 /* 1.0f */, 0 /* 0.0f */, 0xbf800000 /* -1.0f */, 0x3f000000 /* 1.0f */},
+ 0x00000380, true, true},
};
memset(&desc, 0, sizeof(desc));
@@ -4832,7 +4878,7 @@ static void test_clear_unordered_access_view(void)
D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
for (j = 0; j < ARRAY_SIZE(clear_value); ++j)
- clear_value[j] = tests[i].values[j] ? 0 : ~0u;
+ clear_value[j] = tests[i].expected ? 0 : ~0u;
memset(&uav_desc, 0, sizeof(uav_desc));
uav_desc.Format = DXGI_FORMAT_R32_UINT;
@@ -4858,10 +4904,16 @@ static void test_clear_unordered_access_view(void)
uav_barrier(command_list, buffer);
- ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list,
- get_gpu_descriptor_handle(&context, gpu_heap, 0),
- get_cpu_descriptor_handle(&context, cpu_heap, 0),
- buffer, tests[i].values, 0, NULL);
+ if (tests[i].is_float)
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewFloat(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_heap, 0),
+ buffer, (const float *)tests[i].values, 0, NULL);
+ else
+ ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list,
+ get_gpu_descriptor_handle(&context, gpu_heap, 0),
+ get_cpu_descriptor_handle(&context, cpu_heap, 0),
+ buffer, tests[i].values, 0, NULL);
set_box(&box, 0, 0, 0, 1, 1, 1);
transition_resource_state(command_list, buffer,
@@ -4872,7 +4924,8 @@ static void test_clear_unordered_access_view(void)
check_readback_data_uint(&rb, &box, clear_value[0], 0);
box.left = uav_desc.Buffer.FirstElement;
box.right = uav_desc.Buffer.FirstElement + uav_desc.Buffer.NumElements;
- check_readback_data_uint(&rb, &box, tests[i].values[0], 0);
+ todo_if(tests[i].is_todo)
+ check_readback_data_uint(&rb, &box, tests[i].expected, tests[i].is_float ? 1 : 0);
box.left = uav_desc.Buffer.FirstElement + uav_desc.Buffer.NumElements;
box.right = BUFFER_SIZE / format_size(uav_desc.Format);
check_readback_data_uint(&rb, &box, clear_value[0], 0);
@@ -32393,7 +32446,7 @@ START_TEST(d3d12)
run_test(test_fence_values);
run_test(test_clear_depth_stencil_view);
run_test(test_clear_render_target_view);
- run_test(test_clear_unordered_access_view);
+ run_test(test_clear_unordered_access_view_buffer);
run_test(test_set_render_targets);
run_test(test_draw_instanced);
run_test(test_draw_indexed_instanced);
diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h
index 024cf87..5092183 100644
--- a/tests/d3d12_test_utils.h
+++ b/tests/d3d12_test_utils.h
@@ -288,11 +288,6 @@ static unsigned int format_size(DXGI_FORMAT format)
{
switch (format)
{
- case DXGI_FORMAT_UNKNOWN:
- case DXGI_FORMAT_A8_UNORM:
- case DXGI_FORMAT_R8_UINT:
- case DXGI_FORMAT_R8_UNORM:
- return 1;
case DXGI_FORMAT_R32G32B32A32_FLOAT:
case DXGI_FORMAT_R32G32B32A32_UINT:
case DXGI_FORMAT_R8G8_UNORM:
@@ -304,20 +299,26 @@ static unsigned int format_size(DXGI_FORMAT format)
case DXGI_FORMAT_R32_FLOAT:
case DXGI_FORMAT_R32_UINT:
case DXGI_FORMAT_R32_SINT:
+ case DXGI_FORMAT_R16G16_FLOAT:
+ case DXGI_FORMAT_R16G16_UNORM:
+ case DXGI_FORMAT_R16G16_UINT:
+ case DXGI_FORMAT_R11G11B10_FLOAT:
case DXGI_FORMAT_R8G8B8A8_TYPELESS:
case DXGI_FORMAT_R8G8B8A8_UNORM:
case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
+ case DXGI_FORMAT_R8G8B8A8_UINT:
case DXGI_FORMAT_B8G8R8A8_UNORM:
return 4;
case DXGI_FORMAT_R16_FLOAT:
case DXGI_FORMAT_R16_UNORM:
case DXGI_FORMAT_R16_UINT:
return 2;
- case DXGI_FORMAT_BC1_UNORM:
- case DXGI_FORMAT_BC1_UNORM_SRGB:
- case DXGI_FORMAT_BC4_UNORM:
- case DXGI_FORMAT_BC4_SNORM:
- return 8;
+ case DXGI_FORMAT_UNKNOWN:
+ case DXGI_FORMAT_A8_UNORM:
+ case DXGI_FORMAT_R8_UINT:
+ case DXGI_FORMAT_R8_UNORM:
+ return 1;
+
case DXGI_FORMAT_BC2_UNORM:
case DXGI_FORMAT_BC2_UNORM_SRGB:
case DXGI_FORMAT_BC3_UNORM:
@@ -329,6 +330,12 @@ static unsigned int format_size(DXGI_FORMAT format)
case DXGI_FORMAT_BC7_UNORM:
case DXGI_FORMAT_BC7_UNORM_SRGB:
return 16;
+ case DXGI_FORMAT_BC1_UNORM:
+ case DXGI_FORMAT_BC1_UNORM_SRGB:
+ case DXGI_FORMAT_BC4_UNORM:
+ case DXGI_FORMAT_BC4_SNORM:
+ return 8;
+
default:
trace("Unhandled format %#x.\n", format);
return 1;
--
2.11.0
1
0
19 Nov '19
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmstyle/chordtrack.c | 25 +++++++++++--------------
dlls/dmstyle/tests/dmstyle.c | 9 ++++-----
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c
index cb690b04dc..09d0bf3c9f 100644
--- a/dlls/dmstyle/chordtrack.c
+++ b/dlls/dmstyle/chordtrack.c
@@ -140,23 +140,20 @@ static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rg
return S_OK;
}
-static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType)
+static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type)
{
- IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
-
- TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType));
+ IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
- if (!rguidType)
- return E_POINTER;
+ TRACE("(%p, %s)\n", This, debugstr_dmguid(type));
- if (IsEqualGUID (rguidType, &GUID_BandParam)
- || IsEqualGUID (rguidType, &GUID_ChordParam)
- || IsEqualGUID (rguidType, &GUID_RhythmParam)) {
- TRACE("param supported\n");
- return S_OK;
- }
- TRACE("param unsupported\n");
- return DMUS_E_TYPE_UNSUPPORTED;
+ if (!type)
+ return E_POINTER;
+
+ if (IsEqualGUID(type, &GUID_ChordParam) || IsEqualGUID(type, &GUID_RhythmParam))
+ return S_OK;
+
+ TRACE("param unsupported\n");
+ return DMUS_E_TYPE_UNSUPPORTED;
}
static HRESULT WINAPI chord_track_AddNotificationType(IDirectMusicTrack8 *iface,
diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c
index 0c17ef3b41..6419f6f810 100644
--- a/dlls/dmstyle/tests/dmstyle.c
+++ b/dlls/dmstyle/tests/dmstyle.c
@@ -291,7 +291,7 @@ static void test_track(void)
unsigned int todo_params;
} class[] = {
{ X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 },
- { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 1 },
+ { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 0 },
{ X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 },
{ X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 },
{ X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 },
@@ -333,10 +333,9 @@ static void test_track(void)
ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n",
param_types[j].name, hr);
else
- todo_wine_if(class[i].todo_params & (1 << j))
- ok(hr == DMUS_E_TYPE_UNSUPPORTED,
- "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",
- param_types[j].name, hr);
+ ok(hr == DMUS_E_TYPE_UNSUPPORTED,
+ "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",
+ param_types[j].name, hr);
}
if (class[i].clsid == &CLSID_DirectMusicMuteTrack) {
--
2.20.1
1
0
[PATCH] dmcompos/tests: Check all IDirectMusicTrack_IsParamSupported() types
by Michael Stefaniuc 19 Nov '19
by Michael Stefaniuc 19 Nov '19
19 Nov '19
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmcompos/tests/dmcompos.c | 46 ++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c
index d23f5d6dae..aaec921e89 100644
--- a/dlls/dmcompos/tests/dmcompos.c
+++ b/dlls/dmcompos/tests/dmcompos.c
@@ -270,6 +270,42 @@ static void test_chordmaptrack(void)
CLSID class;
ULARGE_INTEGER size;
HRESULT hr;
+ #define X(guid) &guid, #guid
+ const struct {
+ REFGUID type;
+ const char *name;
+ } unsupported[] = {
+ { X(GUID_BandParam) },
+ { X(GUID_ChordParam) },
+ { X(GUID_Clear_All_Bands) },
+ { X(GUID_CommandParam) },
+ { X(GUID_CommandParam2) },
+ { X(GUID_CommandParamNext) },
+ { X(GUID_ConnectToDLSCollection) },
+ { X(GUID_Disable_Auto_Download) },
+ { X(GUID_DisableTempo) },
+ { X(GUID_DisableTimeSig) },
+ { X(GUID_Download) },
+ { X(GUID_DownloadToAudioPath) },
+ { X(GUID_Enable_Auto_Download) },
+ { X(GUID_EnableTempo) },
+ { X(GUID_EnableTimeSig) },
+ { X(GUID_IDirectMusicBand) },
+ { X(GUID_IDirectMusicStyle) },
+ { X(GUID_MuteParam) },
+ { X(GUID_Play_Marker) },
+ { X(GUID_RhythmParam) },
+ { X(GUID_SeedVariations) },
+ { X(GUID_StandardMIDIFile) },
+ { X(GUID_TempoParam) },
+ { X(GUID_TimeSignature) },
+ { X(GUID_Unload) },
+ { X(GUID_UnloadFromAudioPath) },
+ { X(GUID_Valid_Start_Time) },
+ { X(GUID_Variations) },
+ };
+#undef X
+ unsigned int i;
hr = CoCreateInstance(&CLSID_DirectMusicChordMapTrack, NULL, CLSCTX_INPROC_SERVER,
&IID_IDirectMusicTrack8, (void**)&dmt8);
@@ -290,8 +326,18 @@ static void test_chordmaptrack(void)
hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL);
ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr);
}
+
hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL);
ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr);
+ hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicChordMap);
+ ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr);
+ for (i = 0; i < ARRAY_SIZE(unsupported); i++) {
+ hr = IDirectMusicTrack8_IsParamSupported(dmt8, unsupported[i].type);
+ ok(hr == DMUS_E_TYPE_UNSUPPORTED,
+ "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",
+ unsupported[i].name, hr);
+ }
+
hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL);
ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr);
hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL);
--
2.20.1
1
0
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
v3: Formatting fixes
dlls/dmime/segment.c | 78 ++++++++++++++++++++------------------------
1 file changed, 35 insertions(+), 43 deletions(-)
diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index d47c2f2c23..3c0d4ac567 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -366,58 +366,50 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_RemoveNotificationType(IDirectMus
}
static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface,
- REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext,
- void *pParam)
+ REFGUID type, DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next,
+ void *param)
{
- IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
- CLSID pIt_clsid;
- struct list* pEntry = NULL;
- IDirectMusicTrack* pTrack = NULL;
- IPersistStream* pCLSIDStream = NULL;
- LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL;
- HRESULT hr = S_OK;
+ IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
+ struct list *item;
+ IDirectMusicTrack *track;
+ DMUS_PRIVATE_SEGMENT_TRACK *segment;
+ HRESULT hr;
- FIXME("(%p, %s, 0x%x, %d, %d, %p, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam);
-
- if (DMUS_SEG_ANYTRACK == dwIndex) {
-
- LIST_FOR_EACH (pEntry, &This->Tracks) {
- pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry);
+ FIXME("(%p, %s, 0x%x, %d, %d, %p, %p) Semi-stub\n", This, debugstr_dmguid(type), group,
+ index, time, next, param);
- hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream);
- if (FAILED(hr)) {
- ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", This, pIt->pTrack);
- continue ;
- }
+ if (index == DMUS_SEG_ANYTRACK || group == 0xffffffff) {
+ if (group == 0xffffffff && index != DMUS_SEG_ANYTRACK)
+ WARN("Any group doesnt have DMUS_SEG_ANYTRACK index.\n");
- TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack);
+ LIST_FOR_EACH (item, &This->Tracks) {
+ segment = LIST_ENTRY(item, DMUS_PRIVATE_SEGMENT_TRACK, entry);
- if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ;
- hr = IPersistStream_GetClassID(pCLSIDStream, &pIt_clsid);
- IPersistStream_Release(pCLSIDStream); pCLSIDStream = NULL;
- if (FAILED(hr)) {
- ERR("(%p): non-implemented GetClassID for object %p\n", This, pIt->pTrack);
- continue ;
- }
- if (FALSE == IsEqualGUID(&pIt_clsid, rguidType)) continue ;
- if (FAILED(IDirectMusicTrack_IsParamSupported(pIt->pTrack, rguidType))) continue ;
- hr = IDirectMusicTrack_GetParam(pIt->pTrack, rguidType, mtTime, pmtNext, pParam);
- if (SUCCEEDED(hr)) return hr;
+ TRACE(" - %p -> 0x%x,%p\n", segment, segment->dwGroupBits, segment->pTrack);
+
+ if (group != 0xffffffff && !(segment->dwGroupBits & group))
+ continue;
+ if (FAILED(IDirectMusicTrack_IsParamSupported(segment->pTrack, type)))
+ continue;
+ hr = IDirectMusicTrack_GetParam(segment->pTrack, type, time, next, param);
+ if (SUCCEEDED(hr))
+ return hr;
+ }
+
+ WARN("(%p): not found\n", This);
+ return DMUS_E_TRACK_NOT_FOUND;
}
- ERR("(%p): not found\n", This);
- return DMUS_E_TRACK_NOT_FOUND;
- }
- hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, dwGroupBits, dwIndex, &pTrack);
- if (FAILED(hr)) {
- ERR("(%p): not found\n", This);
- return DMUS_E_TRACK_NOT_FOUND;
- }
+ hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, index, &track);
+ if (FAILED(hr)) {
+ ERR("(%p): not found\n", This);
+ return DMUS_E_TRACK_NOT_FOUND;
+ }
- hr = IDirectMusicTrack_GetParam(pTrack, rguidType, mtTime, pmtNext, pParam);
- IDirectMusicTrack_Release(pTrack); pTrack = NULL;
+ hr = IDirectMusicTrack_GetParam(track, type, time, next, param);
+ IDirectMusicTrack_Release(track);
- return hr;
+ return hr;
}
static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *iface,
--
2.20.1
1
0
[PATCH v2] dmstyle: Add GUID_IDirectMusicStyle support in Style Track GetParam.
by Alistair Leslie-Hughes 19 Nov '19
by Alistair Leslie-Hughes 19 Nov '19
19 Nov '19
v2: Droppped tests apon request.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
dlls/dmstyle/styletrack.c | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c
index cc15bd81d1..06fe1c7ca8 100644
--- a/dlls/dmstyle/styletrack.c
+++ b/dlls/dmstyle/styletrack.c
@@ -132,15 +132,31 @@ static HRESULT WINAPI style_track_Play(IDirectMusicTrack8 *iface, void *pStateDa
return S_OK;
}
-static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
- MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
+static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type,
+ MUSIC_TIME time, MUSIC_TIME *next, void *param)
{
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
- FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam);
+ struct list *item = NULL;
- if (!rguidType)
+ FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(type), time, next, param);
+
+ if (!type)
return E_POINTER;
+ if (IsEqualGUID(&GUID_IDirectMusicStyle, type)) {
+ LIST_FOR_EACH (item, &This->Items) {
+ DMUS_PRIVATE_STYLE_ITEM *style = LIST_ENTRY(item, DMUS_PRIVATE_STYLE_ITEM, entry);
+ if (style->pObject) {
+ IDirectMusicStyle8_AddRef(style->pObject);
+ *((IDirectMusicStyle8**)param) = style->pObject;
+
+ return S_OK;
+ }
+ }
+
+ return DMUS_E_NOT_FOUND;
+ }
+
return S_OK;
}
--
2.17.1
2
1
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
The TestBot does not currently use any build-only missions. I noticed
this issue when I tried to use WineTest to rebuild a patched Wine before
manually running some tests.
testbot/bin/build/WineTest.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl
index 9948e0929..88f5e3659 100755
--- a/testbot/bin/build/WineTest.pl
+++ b/testbot/bin/build/WineTest.pl
@@ -453,7 +453,7 @@ if ($Action eq "testpatch")
}
foreach my $Mission (@{$TaskMissions->{Missions}})
{
- return 1 if ($Mission->{test} eq "build");
+ next if ($Mission->{test} eq "build");
if ($Action eq "testexe")
{
--
2.20.1
1
0
19 Nov '19
Hello. Is it possible to receive any nws about this patch and the following
ones?
Thanks in advance.
David
Le ven. 1 nov. 2019 à 10:49, Marvin <testbot(a)winehq.org> a écrit :
> Thank you for your contribution to Wine!
>
> This is an automated notification to let you know that your patch has
> been reviewed and its status set to "Assigned".
>
> This means that the patch has been assigned to a reviewer. If the
> reviewer signs off on the patch, it will be committed, otherwise
> you'll receive advice on how to improve it. If you don't hear anything
> after a couple of weeks, please resend the patch.
>
1
0
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
configure.ac | 1 +
dlls/dhcpcsvc/dhcpcsvc.c | 78 +++++++++++++++--
dlls/dhcpcsvc/tests/Makefile.in | 5 ++
dlls/dhcpcsvc/tests/dhcpcsvc.c | 143 ++++++++++++++++++++++++++++++++
4 files changed, 221 insertions(+), 6 deletions(-)
create mode 100644 dlls/dhcpcsvc/tests/Makefile.in
create mode 100644 dlls/dhcpcsvc/tests/dhcpcsvc.c
diff --git a/configure.ac b/configure.ac
index 22ce5f33a3..93a74a27c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3192,6 +3192,7 @@ WINE_CONFIG_MAKEFILE(dlls/ddrawex/tests)
WINE_CONFIG_MAKEFILE(dlls/devenum)
WINE_CONFIG_MAKEFILE(dlls/devenum/tests)
WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc)
+WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests)
WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx)
WINE_CONFIG_MAKEFILE(dlls/difxapi)
WINE_CONFIG_MAKEFILE(dlls/dinput)
diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c
index 95a467151b..d5df635012 100644
--- a/dlls/dhcpcsvc/dhcpcsvc.c
+++ b/dlls/dhcpcsvc/dhcpcsvc.c
@@ -1,5 +1,6 @@
/*
* Copyright 2011 Stefan Leichter
+ * Copyright 2019 Hans Leidekker for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,7 +21,12 @@
#include "windef.h"
#include "winbase.h"
#include "dhcpcsdk.h"
+#include "winioctl.h"
+#define WINE_MOUNTMGR_EXTENSIONS
+#include "ddk/mountmgr.h"
+
#include "wine/debug.h"
+#include "wine/heap.h"
WINE_DEFAULT_DEBUG_CHANNEL(dhcpcsvc);
@@ -51,11 +57,71 @@ DWORD WINAPI DhcpCApiInitialize(LPDWORD version)
return ERROR_SUCCESS;
}
-DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, DHCPCAPI_CLASSID *classid,
- DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams,
- BYTE *buffer, DWORD *size, WCHAR *requestidstr )
+DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adapter, DHCPCAPI_CLASSID *class_id,
+ DHCPCAPI_PARAMS_ARRAY send_params, DHCPCAPI_PARAMS_ARRAY recv_params, BYTE *buf,
+ DWORD *buflen, WCHAR *request_id )
{
- FIXME("(%08x, %p, %s, %p, %u, %u, %p, %p, %s): stub\n", flags, reserved, debugstr_w(adaptername), classid,
- sendparams.nParams, recdparams.nParams, buffer, size, debugstr_w(requestidstr));
- return ERROR_SUCCESS;
+ struct mountmgr_dhcp_request_params *query;
+ DWORD i, size, err = ERROR_OUTOFMEMORY;
+ BYTE *src, *dst;
+ HANDLE mgr;
+
+ TRACE( "(%08x, %p, %s, %p, %u, %u, %p, %p, %s)\n", flags, reserved, debugstr_w(adapter), class_id,
+ send_params.nParams, recv_params.nParams, buf, buflen, debugstr_w(request_id) );
+
+ if (!adapter || lstrlenW(adapter) > IF_MAX_STRING_SIZE || !buflen) return ERROR_INVALID_PARAMETER;
+ if (flags != DHCPCAPI_REQUEST_SYNCHRONOUS) FIXME( "unsupported flags %08x\n", flags );
+
+ for (i = 0; i < send_params.nParams; i++)
+ FIXME( "send option %u not supported\n", send_params.Params->OptionId );
+
+ mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
+ OPEN_EXISTING, 0, 0 );
+ if (mgr == INVALID_HANDLE_VALUE) return GetLastError();
+
+ size = FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[recv_params.nParams]) + *buflen;
+ if (!(query = heap_alloc_zero( size ))) goto done;
+
+ for (i = 0; i < recv_params.nParams; i++) query->params[i].id = recv_params.Params[i].OptionId;
+ query->count = recv_params.nParams;
+ lstrcpyW( query->adapter, adapter );
+
+ if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS, query, size, query, size, NULL, NULL ))
+ {
+ err = GetLastError();
+ if (err == ERROR_MORE_DATA) *buflen = query->size - (size - *buflen);
+ goto done;
+ }
+
+ dst = buf;
+ for (i = 0; i < query->count; i++)
+ {
+ if (buf)
+ {
+ recv_params.Params[i].OptionId = query->params[i].id;
+ recv_params.Params[i].IsVendor = FALSE; /* FIXME */
+ if (query->params[i].size)
+ {
+ src = (BYTE *)query + query->params[i].offset;
+ memcpy( dst, src, query->params[i].size );
+
+ recv_params.Params[i].Data = dst;
+ recv_params.Params[i].nBytesData = query->params[i].size;
+ }
+ else
+ {
+ recv_params.Params[i].Data = NULL;
+ recv_params.Params[i].nBytesData = 0;
+ }
+ }
+ dst += query->params[i].size;
+ }
+
+ *buflen = dst - buf;
+ err = ERROR_SUCCESS;
+
+done:
+ heap_free( query );
+ CloseHandle( mgr );
+ return err;
}
diff --git a/dlls/dhcpcsvc/tests/Makefile.in b/dlls/dhcpcsvc/tests/Makefile.in
new file mode 100644
index 0000000000..47440eb2cd
--- /dev/null
+++ b/dlls/dhcpcsvc/tests/Makefile.in
@@ -0,0 +1,5 @@
+TESTDLL = dhcpcsvc.dll
+IMPORTS = dhcpcsvc iphlpapi
+
+C_SRCS = \
+ dhcpcsvc.c
diff --git a/dlls/dhcpcsvc/tests/dhcpcsvc.c b/dlls/dhcpcsvc/tests/dhcpcsvc.c
new file mode 100644
index 0000000000..8b47fe57d5
--- /dev/null
+++ b/dlls/dhcpcsvc/tests/dhcpcsvc.c
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2019 Hans Leidekker for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+#include "winsock2.h"
+#include "windef.h"
+#include "winbase.h"
+#include "iphlpapi.h"
+#include "dhcpcsdk.h"
+#include "wine/test.h"
+
+static IP_ADAPTER_ADDRESSES *get_adapters(void)
+{
+ ULONG err, size = 1024;
+ IP_ADAPTER_ADDRESSES *ret = HeapAlloc( GetProcessHeap(), 0, size );
+ for (;;)
+ {
+ err = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST |
+ GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME,
+ NULL, ret, &size );
+ if (err != ERROR_BUFFER_OVERFLOW) break;
+ ret = HeapReAlloc( GetProcessHeap(), 0, ret, size );
+ }
+ if (err == ERROR_SUCCESS) return ret;
+ HeapFree( GetProcessHeap(), 0, ret );
+ return NULL;
+}
+
+static void test_DhcpRequestParams(void)
+{
+ static WCHAR nosuchW[] = {'n','o','s','u','c','h','a','d','a','p','t','e','r',0};
+ DHCPCAPI_PARAMS params[6];
+ DHCPCAPI_PARAMS_ARRAY send_params, recv_params;
+ IP_ADAPTER_ADDRESSES *adapters, *ptr;
+ BYTE *buf;
+ WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1];
+ DWORD err, size, i;
+
+ if (!(adapters = get_adapters())) return;
+
+ for (ptr = adapters; ptr; ptr = ptr->Next)
+ {
+ MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) );
+ trace( "adapter '%s' type %u dhcpv4 enabled %d\n", wine_dbgstr_w(ptr->Description), ptr->IfType, ptr->Dhcpv4Enabled );
+
+ if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue;
+
+ memset( &send_params, 0, sizeof(send_params) );
+ memset( &recv_params, 0, sizeof(recv_params) );
+ err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, NULL, NULL, send_params, recv_params, NULL, NULL, NULL );
+ ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err );
+
+ err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, nosuchW, NULL, send_params, recv_params, NULL, NULL, NULL );
+ ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err );
+
+ err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, NULL, NULL, NULL );
+ ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err );
+
+ size = 0;
+ err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, NULL, &size, NULL );
+ ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err );
+
+ memset( params, 0, sizeof(params) );
+ params[0].OptionId = OPTION_SUBNET_MASK;
+ params[1].OptionId = OPTION_ROUTER_ADDRESS;
+ params[2].OptionId = OPTION_HOST_NAME;
+ params[3].OptionId = OPTION_DOMAIN_NAME;
+ params[4].OptionId = OPTION_BROADCAST_ADDRESS;
+ params[5].OptionId = OPTION_MSFT_IE_PROXY;
+ recv_params.nParams = 6;
+ recv_params.Params = params;
+
+ size = 0;
+ buf = HeapAlloc( GetProcessHeap(), 0, size );
+ err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params,
+ buf, &size, NULL );
+ while (err == ERROR_MORE_DATA)
+ {
+ buf = HeapReAlloc( GetProcessHeap(), 0, buf, size );
+ err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params,
+ buf, &size, NULL );
+ }
+ if (err == ERROR_SUCCESS)
+ {
+ for (i = 0; i < ARRAY_SIZE(params); i++)
+ {
+ switch( params[i].OptionId )
+ {
+ case OPTION_SUBNET_MASK:
+ case OPTION_ROUTER_ADDRESS:
+ case OPTION_BROADCAST_ADDRESS:
+ if (params[i].Data)
+ {
+ ok( params[i].nBytesData == sizeof(DWORD), "got %u\n", params[i].nBytesData );
+ trace( "%u: Data %p (%08x) nBytesData %u OptionId %u Flags %08x IsVendor %d\n",
+ i, params[i].Data, *(DWORD *)params[i].Data, params[i].nBytesData, params[i].OptionId,
+ params[i].Flags, params[i].IsVendor );
+ }
+ break;
+ case OPTION_HOST_NAME:
+ case OPTION_DOMAIN_NAME:
+ case OPTION_MSFT_IE_PROXY:
+ if (params[i].Data)
+ {
+ char *str = HeapAlloc( GetProcessHeap(), 0, params[i].nBytesData + 1 );
+ memcpy( str, params[i].Data, params[i].nBytesData );
+ str[params[i].nBytesData] = 0;
+ trace( "%u: Data %p (%s) nBytesData %u OptionId %u Flags %08x IsVendor %d\n",
+ i, params[i].Data, str, params[i].nBytesData, params[i].OptionId,
+ params[i].Flags, params[i].IsVendor );
+ HeapFree( GetProcessHeap(), 0, str );
+ }
+ break;
+ default:
+ ok( 0, "unexpected option %u\n", params[i].OptionId );
+ break;
+ }
+ }
+ }
+ HeapFree( GetProcessHeap(), 0, buf );
+ }
+ HeapFree( GetProcessHeap(), 0, adapters );
+}
+
+START_TEST(dhcpcsvc)
+{
+ test_DhcpRequestParams();
+}
--
2.20.1
2
1
[PATCH 3/4] mountmgr.sys: Add support for querying DHCP parameters on macOS.
by Hans Leidekker 19 Nov '19
by Hans Leidekker 19 Nov '19
19 Nov '19
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
configure.ac | 3 +
dlls/mountmgr.sys/Makefile.in | 2 +-
dlls/mountmgr.sys/diskarb.c | 167 ++++++++++++++++++++++++++++++++++
3 files changed, 171 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 64721e9644..22ce5f33a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -436,6 +436,8 @@ AC_CHECK_HEADERS(\
OpenCL/opencl.h \
QuickTime/ImageCompression.h \
Security/Security.h \
+ SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \
+ SystemConfiguration/SCNetworkConfiguration.h \
alias.h \
arpa/inet.h \
arpa/nameser.h \
@@ -759,6 +761,7 @@ case $host_os in
AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices")
AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices")
AC_SUBST(APPKIT_LIBS,"-framework AppKit")
+ AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration")
WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist"
diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in
index 738f071390..e229164280 100644
--- a/dlls/mountmgr.sys/Makefile.in
+++ b/dlls/mountmgr.sys/Makefile.in
@@ -3,7 +3,7 @@ IMPORTS = uuid advapi32 ntoskrnl
DELAYIMPORTS = user32 iphlpapi
EXTRADLLFLAGS = -Wl,--subsystem,native
EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS)
-EXTRALIBS = $(DISKARBITRATION_LIBS)
+EXTRALIBS = $(DISKARBITRATION_LIBS) $(SYSTEMCONFIGURATION_LIBS) $(CORESERVICES_LIBS)
C_SRCS = \
dbus.c \
diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c
index 9a7616ecc6..66c121e114 100644
--- a/dlls/mountmgr.sys/diskarb.c
+++ b/dlls/mountmgr.sys/diskarb.c
@@ -29,8 +29,18 @@
#ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H
#include <DiskArbitration/DiskArbitration.h>
#endif
+#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H)
+#include <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h>
+#include <SystemConfiguration/SCNetworkConfiguration.h>
+#endif
#include "mountmgr.h"
+#define USE_WS_PREFIX
+#include "winsock2.h"
+#include "ws2ipdef.h"
+#include "nldef.h"
+#include "netioapi.h"
+#include "dhcpcsdk.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);
@@ -152,3 +162,160 @@ void initialize_diskarbitration(void)
}
#endif /* HAVE_DISKARBITRATION_DISKARBITRATION_H */
+
+#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H)
+
+static UInt8 map_option( ULONG option )
+{
+ switch (option)
+ {
+ case OPTION_SUBNET_MASK: return 1;
+ case OPTION_ROUTER_ADDRESS: return 3;
+ case OPTION_HOST_NAME: return 12;
+ case OPTION_DOMAIN_NAME: return 15;
+ case OPTION_BROADCAST_ADDRESS: return 28;
+ case OPTION_MSFT_IE_PROXY: return 252;
+ default:
+ FIXME( "unhandled option %u\n", option );
+ return 0;
+ }
+}
+
+#define IF_NAMESIZE 16
+static BOOL map_adapter_name( const WCHAR *name, WCHAR *unix_name, DWORD len )
+{
+ WCHAR buf[IF_NAMESIZE];
+ UNICODE_STRING str;
+ GUID guid;
+
+ RtlInitUnicodeString( &str, name );
+ if (!RtlGUIDFromString( &str, &guid ))
+ {
+ NET_LUID luid;
+ if (ConvertInterfaceGuidToLuid( &guid, &luid ) ||
+ ConvertInterfaceLuidToNameW( &luid, buf, ARRAY_SIZE(buf) )) return FALSE;
+
+ name = buf;
+ }
+ if (lstrlenW( name ) >= len) return FALSE;
+ lstrcpyW( unix_name, name );
+ return TRUE;
+}
+
+static CFStringRef find_service_id( const WCHAR *adapter )
+{
+ SCPreferencesRef prefs;
+ SCNetworkSetRef set = NULL;
+ CFArrayRef services = NULL;
+ CFStringRef id, ret = NULL;
+ WCHAR unix_name[IF_NAMESIZE];
+ CFIndex i;
+
+ if (!map_adapter_name( adapter, unix_name, ARRAY_SIZE(unix_name) )) return NULL;
+ if (!(prefs = SCPreferencesCreate( NULL, CFSTR("mountmgr.sys"), NULL ))) return NULL;
+ if (!(set = SCNetworkSetCopyCurrent( prefs ))) goto done;
+ if (!(services = SCNetworkSetCopyServices( set ))) goto done;
+
+ for (i = 0; i < CFArrayGetCount( services ); i++)
+ {
+ SCNetworkServiceRef service;
+ UniChar buf[IF_NAMESIZE] = {0};
+ CFStringRef name;
+
+ service = CFArrayGetValueAtIndex( services, i );
+ name = SCNetworkInterfaceGetBSDName( SCNetworkServiceGetInterface(service) );
+ if (CFStringGetLength( name ) < ARRAY_SIZE( buf ))
+ {
+ CFStringGetCharacters( name, CFRangeMake(0, CFStringGetLength(name)), buf );
+ if (!lstrcmpW( buf, unix_name ) && (id = SCNetworkServiceGetServiceID( service )))
+ {
+ ret = CFStringCreateCopy( NULL, id );
+ break;
+ }
+ }
+ }
+
+done:
+ if (services) CFRelease( services );
+ if (set) CFRelease( set );
+ CFRelease( prefs );
+ return ret;
+}
+
+ULONG get_dhcp_request_param( const WCHAR *adapter, struct mountmgr_dhcp_request_param *param, char *buf, ULONG offset,
+ ULONG size )
+{
+ CFStringRef service_id = find_service_id( adapter );
+ CFDictionaryRef dict;
+ CFDataRef value;
+ DWORD ret = 0;
+ CFIndex len;
+
+ param->offset = 0;
+ param->size = 0;
+
+ if (!service_id) return 0;
+ if (!(dict = SCDynamicStoreCopyDHCPInfo( NULL, service_id )))
+ {
+ CFRelease( service_id );
+ return 0;
+ }
+ CFRelease( service_id );
+ if (!(value = DHCPInfoGetOptionData( dict, map_option(param->id) )))
+ {
+ CFRelease( dict );
+ return 0;
+ }
+ len = CFDataGetLength( value );
+
+ switch (param->id)
+ {
+ case OPTION_SUBNET_MASK:
+ case OPTION_ROUTER_ADDRESS:
+ case OPTION_BROADCAST_ADDRESS:
+ {
+ DWORD *ptr = (DWORD *)(buf + offset);
+ if (len == sizeof(*ptr) && size >= sizeof(*ptr))
+ {
+ CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr );
+ param->offset = offset;
+ param->size = sizeof(*ptr);
+ TRACE( "returning %08x\n", *ptr );
+ }
+ ret = sizeof(*ptr);
+ break;
+ }
+ case OPTION_HOST_NAME:
+ case OPTION_DOMAIN_NAME:
+ case OPTION_MSFT_IE_PROXY:
+ {
+ char *ptr = buf + offset;
+ if (size >= len)
+ {
+ CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr );
+ param->offset = offset;
+ param->size = len;
+ TRACE( "returning %s\n", debugstr_an(ptr, len) );
+ }
+ ret = len;
+ break;
+ }
+ default:
+ FIXME( "option %u not supported\n", param->id );
+ break;
+ }
+
+ CFRelease( dict );
+ return ret;
+}
+
+#elif !defined(SONAME_LIBDBUS_1)
+
+ULONG get_dhcp_request_param( const WCHAR *adapter, struct mountmgr_dhcp_request_param *param, char *buf, ULONG offset,
+ ULONG size )
+{
+ FIXME( "support not compiled in\n" );
+ return 0;
+}
+
+#endif
--
2.20.1
1
0
[PATCH 2/4] mountmgr.sys: Add support for querying DHCP parameters on Linux.
by Hans Leidekker 19 Nov '19
by Hans Leidekker 19 Nov '19
19 Nov '19
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/mountmgr.sys/Makefile.in | 2 +-
dlls/mountmgr.sys/dbus.c | 271 ++++++++++++++++++++++++++++++++++
dlls/mountmgr.sys/mountmgr.c | 40 +++++
dlls/mountmgr.sys/mountmgr.h | 3 +
include/ddk/mountmgr.h | 21 +++
5 files changed, 336 insertions(+), 1 deletion(-)
diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in
index 511484b10b..738f071390 100644
--- a/dlls/mountmgr.sys/Makefile.in
+++ b/dlls/mountmgr.sys/Makefile.in
@@ -1,6 +1,6 @@
MODULE = mountmgr.sys
IMPORTS = uuid advapi32 ntoskrnl
-DELAYIMPORTS = user32
+DELAYIMPORTS = user32 iphlpapi
EXTRADLLFLAGS = -Wl,--subsystem,native
EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS)
EXTRALIBS = $(DISKARBITRATION_LIBS)
diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c
index 7e373e6f91..b96cb0df4c 100644
--- a/dlls/mountmgr.sys/dbus.c
+++ b/dlls/mountmgr.sys/dbus.c
@@ -36,6 +36,13 @@
#include "mountmgr.h"
#include "winnls.h"
#include "excpt.h"
+#include "winsock2.h"
+#include "ws2ipdef.h"
+#include "nldef.h"
+#include "netioapi.h"
+#include "inaddr.h"
+#include "ip2string.h"
+#include "dhcpcsdk.h"
#include "wine/library.h"
#include "wine/exception.h"
@@ -48,6 +55,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);
#define DBUS_FUNCS \
DO_FUNC(dbus_bus_add_match); \
DO_FUNC(dbus_bus_get); \
+ DO_FUNC(dbus_bus_get_private); \
DO_FUNC(dbus_bus_remove_match); \
DO_FUNC(dbus_connection_add_filter); \
DO_FUNC(dbus_connection_read_write_dispatch); \
@@ -762,6 +770,269 @@ void initialize_dbus(void)
CloseHandle( handle );
}
+/* The udisks dispatch loop will block all threads using the same connection, so we'll
+ use a private connection. Multiple threads can make methods calls at the same time
+ on the same connection, according to the documentation.
+ */
+static DBusConnection *dhcp_connection;
+static DBusConnection *get_dhcp_connection(void)
+{
+ if (!dhcp_connection)
+ {
+ DBusError error;
+ p_dbus_error_init( &error );
+ if (!(dhcp_connection = p_dbus_bus_get_private( DBUS_BUS_SYSTEM, &error )))
+ {
+ WARN( "failed to get system dbus connection: %s\n", error.message );
+ p_dbus_error_free( &error );
+ }
+ }
+ return dhcp_connection;
+}
+
+static DBusMessage *device_by_iface_request( const char *iface )
+{
+ DBusMessage *request, *reply;
+ DBusMessageIter iter;
+ DBusError error;
+
+ request = p_dbus_message_new_method_call( "org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager",
+ "org.freedesktop.NetworkManager", "GetDeviceByIpIface" );
+ if (!request) return NULL;
+
+ p_dbus_message_iter_init_append( request, &iter );
+ p_dbus_message_iter_append_basic( &iter, DBUS_TYPE_STRING, &iface );
+
+ p_dbus_error_init( &error );
+ reply = p_dbus_connection_send_with_reply_and_block( get_dhcp_connection(), request, -1, &error );
+ p_dbus_message_unref( request );
+ if (!reply)
+ {
+ WARN( "failed: %s\n", error.message );
+ p_dbus_error_free( &error );
+ return NULL;
+ }
+
+ p_dbus_error_free( &error );
+ return reply;
+}
+
+#define IF_NAMESIZE 16
+static BOOL map_adapter_name( const WCHAR *name, char *unix_name, DWORD len )
+{
+ WCHAR unix_nameW[IF_NAMESIZE];
+ UNICODE_STRING str;
+ GUID guid;
+
+ RtlInitUnicodeString( &str, name );
+ if (!RtlGUIDFromString( &str, &guid ))
+ {
+ NET_LUID luid;
+ if (ConvertInterfaceGuidToLuid( &guid, &luid ) ||
+ ConvertInterfaceLuidToNameW( &luid, unix_nameW, ARRAY_SIZE(unix_nameW) )) return FALSE;
+
+ name = unix_nameW;
+ }
+ return WideCharToMultiByte( CP_UNIXCP, 0, name, -1, unix_name, len, NULL, NULL ) != 0;
+}
+
+static DBusMessage *dhcp4_config_request( const WCHAR *adapter )
+{
+ static const char *device = "org.freedesktop.NetworkManager.Device";
+ static const char *dhcp4_config = "Dhcp4Config";
+ char iface[IF_NAMESIZE];
+ DBusMessage *request, *reply;
+ DBusMessageIter iter;
+ DBusError error;
+ const char *path = NULL;
+
+ if (!map_adapter_name( adapter, iface, sizeof(iface) )) return NULL;
+ if (!(reply = device_by_iface_request( iface ))) return NULL;
+
+ p_dbus_message_iter_init( reply, &iter );
+ if (p_dbus_message_iter_get_arg_type( &iter ) == DBUS_TYPE_OBJECT_PATH) p_dbus_message_iter_get_basic( &iter, &path );
+ p_dbus_message_unref( reply );
+ if (!path) return NULL;
+
+ request = p_dbus_message_new_method_call( "org.freedesktop.NetworkManager", path,
+ "org.freedesktop.DBus.Properties", "Get" );
+ if (!request) return NULL;
+
+ p_dbus_message_iter_init_append( request, &iter );
+ p_dbus_message_iter_append_basic( &iter, DBUS_TYPE_STRING, &device );
+ p_dbus_message_iter_append_basic( &iter, DBUS_TYPE_STRING, &dhcp4_config );
+
+ p_dbus_error_init( &error );
+ reply = p_dbus_connection_send_with_reply_and_block( get_dhcp_connection(), request, -1, &error );
+ p_dbus_message_unref( request );
+ if (!reply)
+ {
+ WARN( "failed: %s\n", error.message );
+ p_dbus_error_free( &error );
+ return NULL;
+ }
+
+ p_dbus_error_free( &error );
+ return reply;
+}
+
+static DBusMessage *dhcp4_config_options_request( const WCHAR *adapter )
+{
+ static const char *dhcp4_config = "org.freedesktop.NetworkManager.DHCP4Config";
+ static const char *options = "Options";
+ DBusMessage *request, *reply;
+ DBusMessageIter iter, sub;
+ DBusError error;
+ const char *path = NULL;
+
+ if (!(reply = dhcp4_config_request( adapter ))) return NULL;
+
+ p_dbus_message_iter_init( reply, &iter );
+ if (p_dbus_message_iter_get_arg_type( &iter ) == DBUS_TYPE_VARIANT)
+ {
+ p_dbus_message_iter_recurse( &iter, &sub );
+ p_dbus_message_iter_get_basic( &sub, &path );
+ }
+ if (!path)
+ {
+ p_dbus_message_unref( reply );
+ return NULL;
+ }
+
+ request = p_dbus_message_new_method_call( "org.freedesktop.NetworkManager", path,
+ "org.freedesktop.DBus.Properties", "Get" );
+ p_dbus_message_unref( reply );
+ if (!request) return NULL;
+
+ p_dbus_message_iter_init_append( request, &iter );
+ p_dbus_message_iter_append_basic( &iter, DBUS_TYPE_STRING, &dhcp4_config );
+ p_dbus_message_iter_append_basic( &iter, DBUS_TYPE_STRING, &options );
+
+ p_dbus_error_init( &error );
+ reply = p_dbus_connection_send_with_reply_and_block( get_dhcp_connection(), request, -1, &error );
+ p_dbus_message_unref( request );
+ if (!reply)
+ {
+ p_dbus_error_free( &error );
+ return NULL;
+ }
+
+ p_dbus_error_free( &error );
+ return reply;
+}
+
+static const char *dhcp4_config_option_next_dict_entry( DBusMessageIter *iter, DBusMessageIter *variant )
+{
+ DBusMessageIter sub;
+ const char *name;
+
+ if (p_dbus_message_iter_get_arg_type( iter ) != DBUS_TYPE_DICT_ENTRY) return NULL;
+ p_dbus_message_iter_recurse( iter, &sub );
+ p_dbus_message_iter_next( iter );
+ p_dbus_message_iter_get_basic( &sub, &name );
+ p_dbus_message_iter_next( &sub );
+ p_dbus_message_iter_recurse( &sub, variant );
+ return name;
+}
+
+static DBusMessage *dhcp4_config_option_request( const WCHAR *adapter, const char *option, const char **value )
+{
+ DBusMessage *reply;
+ DBusMessageIter iter, variant;
+ const char *name;
+
+ if (!(reply = dhcp4_config_options_request( adapter ))) return NULL;
+
+ *value = NULL;
+ p_dbus_message_iter_init( reply, &iter );
+ if (p_dbus_message_iter_get_arg_type( &iter ) == DBUS_TYPE_VARIANT)
+ {
+ p_dbus_message_iter_recurse( &iter, &iter );
+ if (p_dbus_message_iter_get_arg_type( &iter ) == DBUS_TYPE_ARRAY)
+ {
+ p_dbus_message_iter_recurse( &iter, &iter );
+ while ((name = dhcp4_config_option_next_dict_entry( &iter, &variant )))
+ {
+ if (!strcmp( name, option ))
+ {
+ p_dbus_message_iter_get_basic( &variant, value );
+ break;
+ }
+ }
+ }
+ }
+
+ return reply;
+}
+
+static const char *map_option( ULONG option )
+{
+ switch (option)
+ {
+ case OPTION_SUBNET_MASK: return "subnet_mask";
+ case OPTION_ROUTER_ADDRESS: return "next_server";
+ case OPTION_HOST_NAME: return "host_name";
+ case OPTION_DOMAIN_NAME: return "domain_name";
+ case OPTION_BROADCAST_ADDRESS: return "broadcast_address";
+ case OPTION_MSFT_IE_PROXY: return "wpad";
+ default:
+ FIXME( "unhandled option %u\n", option );
+ return "";
+ }
+}
+
+ULONG get_dhcp_request_param( const WCHAR *adapter, struct mountmgr_dhcp_request_param *param, char *buf, ULONG offset,
+ ULONG size )
+{
+ DBusMessage *reply;
+ const char *value;
+ ULONG ret = 0;
+
+ param->offset = param->size = 0;
+
+ if (!(reply = dhcp4_config_option_request( adapter, map_option(param->id), &value ))) return 0;
+
+ switch (param->id)
+ {
+ case OPTION_SUBNET_MASK:
+ case OPTION_ROUTER_ADDRESS:
+ case OPTION_BROADCAST_ADDRESS:
+ {
+ IN_ADDR *ptr = (IN_ADDR *)(buf + offset);
+ if (value && size >= sizeof(IN_ADDR) && !RtlIpv4StringToAddressA( value, TRUE, NULL, ptr ))
+ {
+ param->offset = offset;
+ param->size = sizeof(*ptr);
+ TRACE( "returning %08x\n", *(DWORD *)ptr );
+ }
+ ret = sizeof(*ptr);
+ break;
+ }
+ case OPTION_HOST_NAME:
+ case OPTION_DOMAIN_NAME:
+ case OPTION_MSFT_IE_PROXY:
+ {
+ char *ptr = buf + offset;
+ int len = value ? strlen( value ) : 0;
+ if (len && size >= len)
+ {
+ memcpy( ptr, value, len );
+ param->offset = offset;
+ param->size = len;
+ TRACE( "returning %s\n", debugstr_an(ptr, len) );
+ }
+ ret = len;
+ break;
+ }
+ default:
+ FIXME( "option %u not supported\n", param->id );
+ break;
+ }
+
+ p_dbus_message_unref( reply );
+ return ret;
+}
+
#else /* SONAME_LIBDBUS_1 */
void initialize_dbus(void)
diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c
index 2f43a227dc..bc2b776a92 100644
--- a/dlls/mountmgr.sys/mountmgr.c
+++ b/dlls/mountmgr.sys/mountmgr.c
@@ -359,6 +359,35 @@ done:
return status;
}
+/* implementation of IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS */
+static NTSTATUS query_dhcp_request_params( void *buff, SIZE_T insize,
+ SIZE_T outsize, IO_STATUS_BLOCK *iosb )
+{
+ struct mountmgr_dhcp_request_params *query = buff;
+ ULONG i, offset;
+
+ /* sanity checks */
+ if (FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]) > insize ||
+ !memchrW( query->adapter, 0, ARRAY_SIZE(query->adapter) )) return STATUS_INVALID_PARAMETER;
+ for (i = 0; i < query->count; i++)
+ if (query->params[i].offset + query->params[i].size > insize) return STATUS_INVALID_PARAMETER;
+
+ offset = FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]);
+ for (i = 0; i < query->count; i++)
+ {
+ offset += get_dhcp_request_param( query->adapter, &query->params[i], buff, offset, outsize - offset );
+ if (offset > outsize)
+ {
+ if (offset >= sizeof(query->size)) query->size = offset;
+ iosb->Information = sizeof(query->size);
+ return STATUS_MORE_ENTRIES;
+ }
+ }
+
+ iosb->Information = offset;
+ return STATUS_SUCCESS;
+}
+
/* handler for ioctls on the mount manager device */
static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp )
{
@@ -403,6 +432,17 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp )
irpsp->Parameters.DeviceIoControl.OutputBufferLength,
&irp->IoStatus );
break;
+ case IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS:
+ if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_dhcp_request_params))
+ {
+ irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER;
+ break;
+ }
+ irp->IoStatus.u.Status = query_dhcp_request_params( irp->AssociatedIrp.SystemBuffer,
+ irpsp->Parameters.DeviceIoControl.InputBufferLength,
+ irpsp->Parameters.DeviceIoControl.OutputBufferLength,
+ &irp->IoStatus );
+ break;
default:
FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode );
irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED;
diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h
index 79f72a3c83..95386a44f8 100644
--- a/dlls/mountmgr.sys/mountmgr.h
+++ b/dlls/mountmgr.sys/mountmgr.h
@@ -70,3 +70,6 @@ extern struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICOD
const GUID *guid ) DECLSPEC_HIDDEN;
extern void delete_mount_point( struct mount_point *mount ) DECLSPEC_HIDDEN;
extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ) DECLSPEC_HIDDEN;
+
+extern ULONG get_dhcp_request_param( const WCHAR *adapter, struct mountmgr_dhcp_request_param *param, char *buf,
+ ULONG offset, ULONG size ) DECLSPEC_HIDDEN;
diff --git a/include/ddk/mountmgr.h b/include/ddk/mountmgr.h
index fc3199c5ca..cb5822bf3d 100644
--- a/include/ddk/mountmgr.h
+++ b/include/ddk/mountmgr.h
@@ -61,6 +61,27 @@ struct mountmgr_unix_drive
USHORT device_offset;
};
+#define IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS CTL_CODE(MOUNTMGRCONTROLTYPE, 64, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+
+struct mountmgr_dhcp_request_param
+{
+ ULONG id;
+ ULONG offset;
+ ULONG size;
+};
+
+#ifndef IF_MAX_STRING_SIZE
+#define IF_MAX_STRING_SIZE 256
+#endif
+
+struct mountmgr_dhcp_request_params
+{
+ ULONG size;
+ ULONG count;
+ WCHAR adapter[IF_MAX_STRING_SIZE + 1];
+ struct mountmgr_dhcp_request_param params[1];
+};
+
#endif
typedef struct _MOUNTMGR_CREATE_POINT_INPUT
--
2.20.1
1
0
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
include/dhcpcsdk.h | 81 ++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 78 insertions(+), 3 deletions(-)
diff --git a/include/dhcpcsdk.h b/include/dhcpcsdk.h
index 93c7af6e08..8f96a8212d 100644
--- a/include/dhcpcsdk.h
+++ b/include/dhcpcsdk.h
@@ -18,6 +18,75 @@
#ifndef _DHCPCSDK_
#define _DHCPCSDK_
+#define OPTION_PAD 0
+#define OPTION_SUBNET_MASK 1
+#define OPTION_TIME_OFFSET 2
+#define OPTION_ROUTER_ADDRESS 3
+#define OPTION_TIME_SERVERS 4
+#define OPTION_IEN116_NAME_SERVERS 5
+#define OPTION_DOMAIN_NAME_SERVERS 6
+#define OPTION_LOG_SERVERS 7
+#define OPTION_COOKIE_SERVERS 8
+#define OPTION_LPR_SERVERS 9
+#define OPTION_IMPRESS_SERVERS 10
+#define OPTION_RLP_SERVERS 11
+#define OPTION_HOST_NAME 12
+#define OPTION_BOOT_FILE_SIZE 13
+#define OPTION_MERIT_DUMP_FILE 14
+#define OPTION_DOMAIN_NAME 15
+#define OPTION_SWAP_SERVER 16
+#define OPTION_ROOT_DISK 17
+#define OPTION_EXTENSIONS_PATH 18
+#define OPTION_BE_A_ROUTER 19
+#define OPTION_NON_LOCAL_SOURCE_ROUTING 20
+#define OPTION_POLICY_FILTER_FOR_NLSR 21
+#define OPTION_MAX_REASSEMBLY_SIZE 22
+#define OPTION_DEFAULT_TTL 23
+#define OPTION_PMTU_AGING_TIMEOUT 24
+#define OPTION_PMTU_PLATEAU_TABLE 25
+#define OPTION_MTU 26
+#define OPTION_ALL_SUBNETS_MTU 27
+#define OPTION_BROADCAST_ADDRESS 28
+#define OPTION_PERFORM_MASK_DISCOVERY 29
+#define OPTION_BE_A_MASK_SUPPLIER 30
+#define OPTION_PERFORM_ROUTER_DISCOVERY 31
+#define OPTION_ROUTER_SOLICITATION_ADDR 32
+#define OPTION_STATIC_ROUTES 33
+#define OPTION_TRAILERS 34
+#define OPTION_ARP_CACHE_TIMEOUT 35
+#define OPTION_ETHERNET_ENCAPSULATION 36
+#define OPTION_TTL 37
+#define OPTION_KEEP_ALIVE_INTERVAL 38
+#define OPTION_KEEP_ALIVE_DATA_SIZE 39
+#define OPTION_NETWORK_INFO_SERVICE_DOM 40
+#define OPTION_NETWORK_INFO_SERVERS 41
+#define OPTION_NETWORK_TIME_SERVERS 42
+#define OPTION_VENDOR_SPEC_INFO 43
+#define OPTION_NETBIOS_NAME_SERVER 44
+#define OPTION_NETBIOS_DATAGRAM_SERVER 45
+#define OPTION_NETBIOS_NODE_TYPE 46
+#define OPTION_NETBIOS_SCOPE_OPTION 47
+#define OPTION_XWINDOW_FONT_SERVER 48
+#define OPTION_XWINDOW_DISPLAY_MANAGER 49
+#define OPTION_REQUESTED_ADDRESS 50
+#define OPTION_LEASE_TIME 51
+#define OPTION_OK_TO_OVERLAY 52
+#define OPTION_MESSAGE_TYPE 53
+#define OPTION_SERVER_IDENTIFIER 54
+#define OPTION_PARAMETER_REQUEST_LIST 55
+#define OPTION_MESSAGE 56
+#define OPTION_MESSAGE_LENGTH 57
+#define OPTION_RENEWAL_TIME 58
+#define OPTION_REBIND_TIME 59
+#define OPTION_CLIENT_CLASS_INFO 60
+#define OPTION_CLIENT_ID 61
+
+#define OPTION_TFTP_SERVER_NAME 66
+#define OPTION_BOOTFILE_NAME 67
+
+#define OPTION_MSFT_IE_PROXY 252
+#define OPTION_END 255
+
typedef struct _DHCPAPI_PARAMS
{
ULONG Flags;
@@ -42,9 +111,15 @@ typedef struct _DHCPCAPI_CLASSID
ULONG nBytesData;
} DHCPCAPI_CLASSID, *PDHCPCAPI_CLASSID, *LPDHCPCAPI_CLASSID;
+#define DHCPCAPI_REQUEST_PERSISTENT 0x1
+#define DHCPCAPI_REQUEST_SYNCHRONOUS 0x2
+#define DHCPCAPI_REQUEST_ASYNCHRONOUS 0x4
+#define DHCPCAPI_REQUEST_CANCEL 0x8
+#define DHCPCAPI_REQUEST_MASK 0xf
-DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, DHCPCAPI_CLASSID *classid,
- DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams,
- BYTE *buffer, DWORD *size, WCHAR *requestidstr );
+void WINAPI DhcpCApiCleanup(void);
+DWORD WINAPI DhcpCApiInitialize(DWORD *);
+DWORD WINAPI DhcpRequestParams(DWORD, void *, WCHAR *, DHCPCAPI_CLASSID *, DHCPCAPI_PARAMS_ARRAY,
+ DHCPCAPI_PARAMS_ARRAY, BYTE *, DWORD *, WCHAR *);
#endif
--
2.20.1
1
0
[PATCH v3] user32: WM_MOUSEACTIVATE should return MA_NOACTIVATE for WM_LBUTTONDOWN/HTCAPTION message.
by Alistair Leslie-Hughes 19 Nov '19
by Alistair Leslie-Hughes 19 Nov '19
19 Nov '19
Supercedes: 171968
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47945
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
dlls/user32/defwnd.c | 2 +-
dlls/user32/tests/msg.c | 2 +-
dlls/user32/tests/win.c | 60 +++++++++++++++++++++--------------------
3 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c
index c0d1190710..9cd1298923 100644
--- a/dlls/user32/defwnd.c
+++ b/dlls/user32/defwnd.c
@@ -409,7 +409,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
}
/* Caption clicks are handled by NC_HandleNCLButtonDown() */
- return MA_ACTIVATE;
+ return ( HIWORD(lParam) == WM_LBUTTONDOWN && LOWORD(lParam) == HTCAPTION ? MA_NOACTIVATE : MA_ACTIVATE );
case WM_ACTIVATE:
/* The default action in Windows is to set the keyboard focus to
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 477661ab62..d2342c8b14 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -5163,7 +5163,7 @@ static void test_messages(void)
ShowWindow(hwnd, SW_MINIMIZE);
flush_events();
- ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE);
+ ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE);
flush_sequence();
if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE)
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 784849b2ba..78dc55f00a 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -2717,7 +2717,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2)
ret = SetWindowPos(hwnd_child, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_SHOWWINDOW);
ok(ret, "Got %d\n", ret);
flush_events( TRUE );
- todo_wine check_active_state(hwnd2, hwnd2, hwnd2);
+ check_active_state(hwnd2, hwnd2, hwnd2);
DestroyWindow(hwnd_child);
}
@@ -3371,8 +3371,8 @@ static void test_SetForegroundWindow(HWND hwnd)
while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
if (0) check_wnd_state(hwnd2, hwnd2, hwnd2, 0);
- todo_wine ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow());
- todo_wine ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus());
+ ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow());
+ ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus());
SetForegroundWindow(hwnd);
check_wnd_state(hwnd, hwnd, hwnd, 0);
@@ -3936,34 +3936,36 @@ static void test_mouse_input(HWND hwnd)
ok(peek_message(&msg), "no message available\n");
/* Test WM_MOUSEACTIVATE */
-#define TEST_MOUSEACTIVATE(A,B) \
+#define TEST_MOUSEACTIVATE(A,B,C) \
res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \
- ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res);
+ ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \
+ res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \
+ ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res);
- TEST_MOUSEACTIVATE(HTERROR,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTTRANSPARENT,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTNOWHERE,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTCLIENT,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTCAPTION,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTSYSMENU,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTSIZE,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTMENU,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTHSCROLL,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTVSCROLL,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTMINBUTTON,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTMAXBUTTON,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTLEFT,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTRIGHT,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTTOP,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTTOPLEFT,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTTOPRIGHT,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTBOTTOM,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTBOTTOMLEFT,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTBOTTOMRIGHT,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTBORDER,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTOBJECT,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTCLOSE,MA_ACTIVATE);
- TEST_MOUSEACTIVATE(HTHELP,MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE);
+ TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE);
+ TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE);
ShowWindow(popup, SW_HIDE);
--
2.17.1
3
2
Not all XInput events contain axes information. In particular, libinput
does not seem to provide axes information on button_event.
In effect, before this patch, with some configurations, wintab32 clients
would see a point at 0, 0 before and after each stroke.
Signed-off-by: John Chadwick <john(a)jchw.io>
---
dlls/winex11.drv/wintab.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index fe3d4a8ff4..2a4af41af7 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -929,8 +929,13 @@ static BOOL button_event( HWND hwnd, XEvent *event )
gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(button->time);
gMsgPacket.pkSerialNumber = gSerial++;
gMsgPacket.pkCursor = curnum;
- gMsgPacket.pkX = button->axis_data[0];
- gMsgPacket.pkY = button->axis_data[1];
+ if (button->axes_count > 0) {
+ gMsgPacket.pkX = button->axis_data[0];
+ gMsgPacket.pkY = button->axis_data[1];
+ } else {
+ gMsgPacket.pkX = last_packet.pkX;
+ gMsgPacket.pkY = last_packet.pkY;
+ }
gMsgPacket.pkOrientation.orAzimuth = figure_deg(button->axis_data[3],button->axis_data[4]);
gMsgPacket.pkOrientation.orAltitude = ((1000 - 15 * max(abs(button->axis_data[3]),
abs(button->axis_data[4])))
--
2.23.0
2
1
19 Nov '19
Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
---
v4:
rename parameter_get_update_data() to param_get_and_flag_data().
dlls/d3dx9_36/effect.c | 242 +++++++++++++++++++++++++----------
dlls/d3dx9_36/tests/effect.c | 38 ++++--
2 files changed, 205 insertions(+), 75 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index a573d88fcf..a8819f3a6b 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -36,6 +36,7 @@ static const char parameter_block_magic_string[4] = {'@', '!', '#', '\xFE'};
#define PARAMETER_FLAG_SHARED 1
#define INITIAL_POOL_SIZE 16
+#define INITIAL_PARAM_BLOCK_SIZE 1024
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
@@ -153,6 +154,15 @@ struct d3dx_parameter_block
{
char magic_string[ARRAY_SIZE(parameter_block_magic_string)];
struct list entry;
+ size_t buffer_size;
+ size_t current_size;
+ BYTE *buffer;
+};
+
+struct d3dx_recorded_parameter
+{
+ struct d3dx_parameter *param;
+ unsigned int bytes;
};
struct d3dx_effect
@@ -706,11 +716,27 @@ static void free_technique(struct d3dx_technique *technique)
technique->name = NULL;
}
+static unsigned int get_recorded_parameter_size(const struct d3dx_recorded_parameter *record)
+{
+ return sizeof(*record) + record->bytes;
+}
+
static void free_parameter_block(struct d3dx_parameter_block *block)
{
+ struct d3dx_recorded_parameter *record;
+
if (!block)
return;
+ record = (struct d3dx_recorded_parameter *)block->buffer;
+ while ((BYTE *)record < block->buffer + block->current_size)
+ {
+ free_parameter_object_data(record->param, record + 1, record->bytes);
+ record = (struct d3dx_recorded_parameter *)((BYTE *)record + get_recorded_parameter_size(record));
+ }
+ assert((BYTE *)record == block->buffer + block->current_size);
+
+ heap_free(block->buffer);
heap_free(block);
}
@@ -778,14 +804,12 @@ static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector)
}
}
-static void set_vector(struct d3dx_parameter *param, const D3DXVECTOR4 *vector)
+static void set_vector(struct d3dx_parameter *param, const D3DXVECTOR4 *vector, void *dst_data)
{
UINT i;
for (i = 0; i < param->columns; ++i)
- {
- set_number((FLOAT *)param->data + i, param->type, (FLOAT *)vector + i, D3DXPT_FLOAT);
- }
+ set_number((FLOAT *)dst_data + i, param->type, (FLOAT *)vector + i, D3DXPT_FLOAT);
}
static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix, BOOL transpose)
@@ -806,31 +830,33 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix, BOOL tr
}
}
-static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix)
+static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix, void *dst_data)
{
UINT i, k;
if (param->type == D3DXPT_FLOAT)
{
if (param->columns == 4)
- memcpy(param->data, matrix->u.m, param->rows * 4 * sizeof(float));
+ {
+ memcpy(dst_data, matrix->u.m, param->rows * 4 * sizeof(float));
+ }
else
+ {
for (i = 0; i < param->rows; ++i)
- memcpy((float *)param->data + i * param->columns, matrix->u.m + i, param->columns * sizeof(float));
+ memcpy((float *)dst_data + i * param->columns, matrix->u.m + i, param->columns * sizeof(float));
+ }
return;
}
for (i = 0; i < param->rows; ++i)
{
for (k = 0; k < param->columns; ++k)
- {
- set_number((FLOAT *)param->data + i * param->columns + k, param->type,
+ set_number((FLOAT *)dst_data + i * param->columns + k, param->type,
&matrix->u.m[i][k], D3DXPT_FLOAT);
- }
}
}
-static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX *matrix)
+static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX *matrix, void *dst_data)
{
UINT i, k;
@@ -838,7 +864,7 @@ static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX
{
for (k = 0; k < param->columns; ++k)
{
- set_number((FLOAT *)param->data + i * param->columns + k, param->type,
+ set_number((FLOAT *)dst_data + i * param->columns + k, param->type,
&matrix->u.m[k][i], D3DXPT_FLOAT);
}
}
@@ -857,7 +883,8 @@ static HRESULT set_string(char **param_data, const char *string)
return D3D_OK;
}
-static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigned int bytes)
+static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigned int bytes,
+ void *dst_data)
{
unsigned int i, count;
@@ -873,7 +900,7 @@ static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigne
case D3DXPT_TEXTURECUBE:
for (i = 0; i < count; ++i)
{
- IUnknown *old_texture = ((IUnknown **)param->data)[i];
+ IUnknown *old_texture = ((IUnknown **)dst_data)[i];
IUnknown *new_texture = ((IUnknown **)data)[i];
if (new_texture == old_texture)
@@ -890,7 +917,7 @@ static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigne
case D3DXPT_INT:
case D3DXPT_FLOAT:
TRACE("Copy %u bytes.\n", bytes);
- memcpy(param->data, data, bytes);
+ memcpy(dst_data, data, bytes);
break;
case D3DXPT_STRING:
@@ -898,7 +925,7 @@ static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigne
HRESULT hr;
for (i = 0; i < count; ++i)
- if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i])))
+ if (FAILED(hr = set_string(&((char **)dst_data)[i], ((const char **)data)[i])))
return hr;
break;
}
@@ -1248,6 +1275,43 @@ static ULONG64 next_effect_update_version(struct d3dx_effect *effect)
return next_update_version(get_version_counter_ptr(effect));
}
+static void *record_parameter(struct d3dx_effect *effect, struct d3dx_parameter *param, unsigned int bytes)
+{
+ struct d3dx_parameter_block *block = effect->current_parameter_block;
+ struct d3dx_recorded_parameter new_record, *record;
+ unsigned int new_size, alloc_size;
+
+ new_record.param = param;
+ new_record.bytes = bytes;
+ new_size = block->current_size + get_recorded_parameter_size(&new_record);
+
+ if (new_size > block->buffer_size)
+ {
+ BYTE *new_alloc;
+
+ alloc_size = max(block->buffer_size * 2, max(new_size, INITIAL_PARAM_BLOCK_SIZE));
+ if (block->buffer_size)
+ new_alloc = heap_realloc(block->buffer, alloc_size);
+ else
+ new_alloc = heap_alloc(alloc_size);
+
+ if (!new_alloc)
+ {
+ ERR("Out of memory.\n");
+ return param->data;
+ }
+ /* Data update functions may want to free some references upon setting value. */
+ memset(new_alloc + block->buffer_size, 0, alloc_size - block->buffer_size);
+
+ block->buffer_size = alloc_size;
+ block->buffer = new_alloc;
+ }
+ record = (struct d3dx_recorded_parameter *)(block->buffer + block->current_size);
+ *record = new_record;
+ block->current_size = new_size;
+ return record + 1;
+}
+
static void set_dirty(struct d3dx_parameter *param)
{
struct d3dx_shared_data *shared_data;
@@ -1260,6 +1324,17 @@ static void set_dirty(struct d3dx_parameter *param)
top_param->update_version = new_update_version;
}
+static void *param_get_and_flag_data(struct d3dx_effect *effect, struct d3dx_parameter *param,
+ unsigned int bytes, BOOL value_changed)
+{
+ assert(bytes <= param->bytes);
+
+ if (value_changed && !effect->current_parameter_block)
+ set_dirty(param);
+
+ return effect->current_parameter_block ? record_parameter(effect, param, bytes) : param->data;
+}
+
static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value)
{
static const struct
@@ -2364,10 +2439,7 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame
}
if (data && param->bytes <= bytes)
- {
- set_dirty(param);
- return set_value(param, data, bytes);
- }
+ return set_value(param, data, bytes, param_get_and_flag_data(effect, param, param->bytes, TRUE));
WARN("Invalid argument specified.\n");
@@ -2448,8 +2520,8 @@ static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE paramet
if (param && !param->element_count && param->rows == 1 && param->columns == 1)
{
- set_number(param->data, param->type, &b, D3DXPT_BOOL);
- set_dirty(param);
+ set_number(param_get_and_flag_data(effect, param, sizeof(int), TRUE),
+ param->type, &b, D3DXPT_BOOL);
return D3D_OK;
}
@@ -2481,6 +2553,7 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
+ void *data;
TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count);
@@ -2495,12 +2568,12 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
+ data = param_get_and_flag_data(effect, param, size * sizeof(int), TRUE);
for (i = 0; i < size; ++i)
{
/* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */
- set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT);
+ set_number((DWORD *)data + i, param->type, &b[i], D3DXPT_INT);
}
- set_dirty(param);
return D3D_OK;
case D3DXPC_OBJECT:
@@ -2558,9 +2631,8 @@ static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE paramete
DWORD value;
set_number(&value, param->type, &n, D3DXPT_INT);
- if (value != *(DWORD *)param->data)
- set_dirty(param);
- *(DWORD *)param->data = value;
+ *(DWORD *)param_get_and_flag_data(effect, param, sizeof(int),
+ value != *(DWORD *)param->data) = value;
return D3D_OK;
}
@@ -2569,14 +2641,19 @@ static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE paramete
&& ((param->class == D3DXPC_VECTOR && param->columns != 2)
|| (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1)))
{
+ void *data;
+
TRACE("Vector fixup.\n");
- *(float *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE;
- ((float *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE;
- ((float *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE;
+ data = param_get_and_flag_data(effect, param,
+ min(4, param->rows * param->columns) * sizeof(float), TRUE);
+
+ *(float *)data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE;
+ ((float *)data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE;
+ ((float *)data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE;
if (param->rows * param->columns > 3)
- ((float *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE;
- set_dirty(param);
+ ((float *)data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE;
+
return D3D_OK;
}
}
@@ -2628,6 +2705,7 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
+ void *data;
TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count);
@@ -2642,9 +2720,9 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
+ data = param_get_and_flag_data(effect, param, size * sizeof(int), TRUE);
for (i = 0; i < size; ++i)
- set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT);
- set_dirty(param);
+ set_number((DWORD *)data + i, param->type, &n[i], D3DXPT_INT);
return D3D_OK;
case D3DXPC_OBJECT:
@@ -2698,9 +2776,8 @@ static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parame
DWORD value;
set_number(&value, param->type, &f, D3DXPT_FLOAT);
- if (value != *(DWORD *)param->data)
- set_dirty(param);
- *(DWORD *)param->data = value;
+ *(DWORD *)param_get_and_flag_data(effect, param, sizeof(float),
+ value != *(DWORD *)param->data) = value;
return D3D_OK;
}
@@ -2733,6 +2810,7 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
+ void *data;
TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count);
@@ -2747,9 +2825,9 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
+ data = param_get_and_flag_data(effect, param, size * sizeof(float), TRUE);
for (i = 0; i < size; ++i)
- set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT);
- set_dirty(param);
+ set_number((DWORD *)data + i, param->type, &f[i], D3DXPT_FLOAT);
return D3D_OK;
case D3DXPC_OBJECT:
@@ -2806,7 +2884,6 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
- set_dirty(param);
if (param->type == D3DXPT_INT && param->bytes == 4)
{
DWORD tmp;
@@ -2817,16 +2894,17 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param
tmp += ((DWORD)(max(min(vector->x, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16;
tmp += ((DWORD)(max(min(vector->w, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24;
- *(int *)param->data = tmp;
+ *(int *)param_get_and_flag_data(effect, param, sizeof(int), TRUE) = tmp;
return D3D_OK;
}
if (param->type == D3DXPT_FLOAT)
{
- memcpy(param->data, vector, param->columns * sizeof(float));
+ memcpy(param_get_and_flag_data(effect, param, param->columns * sizeof(float), TRUE),
+ vector, param->columns * sizeof(float));
return D3D_OK;
}
- set_vector(param, vector);
+ set_vector(param, vector, param_get_and_flag_data(effect, param, param->columns * sizeof(float), TRUE));
return D3D_OK;
case D3DXPC_MATRIX_ROWS:
@@ -2899,26 +2977,34 @@ static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE
if (param && param->element_count && param->element_count >= count)
{
unsigned int i;
+ BYTE *data;
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_VECTOR:
- set_dirty(param);
+ data = (BYTE *)param_get_and_flag_data(effect, param,
+ count * param->columns * sizeof(float), TRUE);
+
if (param->type == D3DXPT_FLOAT)
{
if (param->columns == 4)
- memcpy(param->data, vector, count * 4 * sizeof(float));
+ {
+ memcpy(data, vector, count * 4 * sizeof(float));
+ }
else
+ {
for (i = 0; i < count; ++i)
- memcpy((float *)param->data + param->columns * i, vector + i,
+ memcpy((float *)data + param->columns * i, vector + i,
param->columns * sizeof(float));
+ }
return D3D_OK;
}
for (i = 0; i < count; ++i)
- set_vector(¶m->members[i], &vector[i]);
+ set_vector(¶m->members[i], &vector[i], data + i * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -2993,8 +3079,8 @@ static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE param
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_matrix(param, matrix);
- set_dirty(param);
+ set_matrix(param, matrix, param_get_and_flag_data(effect, param,
+ param->rows * param->columns * sizeof(float), TRUE));
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3059,15 +3145,20 @@ static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE
if (param && param->element_count >= count)
{
unsigned int i;
+ BYTE *data;
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
+ data = param_get_and_flag_data(effect, param, count * param->rows
+ * param->columns * sizeof(float), TRUE);
+
for (i = 0; i < count; ++i)
- set_matrix(¶m->members[i], &matrix[i]);
+ set_matrix(¶m->members[i], &matrix[i],
+ data + i * param->rows * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3139,13 +3230,18 @@ static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DX
if (param && count <= param->element_count)
{
unsigned int i;
+ BYTE *data;
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
+ data = param_get_and_flag_data(effect, param, count * param->rows
+ * param->columns * sizeof(float), TRUE);
+
for (i = 0; i < count; ++i)
- set_matrix(¶m->members[i], matrix[i]);
+ set_matrix(¶m->members[i], matrix[i], data + i * param->rows
+ * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3219,8 +3315,8 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHAN
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
- set_matrix_transpose(param, matrix);
+ set_matrix_transpose(param, matrix, param_get_and_flag_data(effect, param,
+ param->rows * param->columns * sizeof(float), TRUE));
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3289,15 +3385,20 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3
if (param && param->element_count >= count)
{
unsigned int i;
+ BYTE *data;
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
+ data = param_get_and_flag_data(effect, param, count * param->rows
+ * param->columns * sizeof(float), TRUE);
+
for (i = 0; i < count; ++i)
- set_matrix_transpose(¶m->members[i], &matrix[i]);
+ set_matrix_transpose(¶m->members[i], &matrix[i], data
+ + i * param->rows * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3369,13 +3470,18 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposePointerArray(ID3DXEffect *if
if (param && count <= param->element_count)
{
unsigned int i;
+ BYTE *data;
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
+ data = param_get_and_flag_data(effect, param, count * param->rows
+ * param->columns * sizeof(float), TRUE);
+
for (i = 0; i < count; ++i)
- set_matrix_transpose(¶m->members[i], matrix[i]);
+ set_matrix_transpose(¶m->members[i], matrix[i], data
+ + i * param->rows * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3442,10 +3548,7 @@ static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE param
TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string));
if (param && param->type == D3DXPT_STRING)
- {
- set_dirty(param);
- return set_string(param->data, string);
- }
+ return set_string(param_get_and_flag_data(effect, param, sizeof(void *), TRUE), string);
WARN("Parameter not found.\n");
@@ -3484,7 +3587,11 @@ static HRESULT WINAPI d3dx_effect_SetTexture(ID3DXEffect *iface, D3DXHANDLE para
|| param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D
|| param->type == D3DXPT_TEXTURECUBE))
{
- IDirect3DBaseTexture9 *old_texture = *(IDirect3DBaseTexture9 **)param->data;
+ IDirect3DBaseTexture9 **data = param_get_and_flag_data(effect, param,
+ sizeof(void *), texture != *(IDirect3DBaseTexture9 **)param->data);
+ IDirect3DBaseTexture9 *old_texture = *data;
+
+ *data = texture;
if (texture == old_texture)
return D3D_OK;
@@ -3494,9 +3601,6 @@ static HRESULT WINAPI d3dx_effect_SetTexture(ID3DXEffect *iface, D3DXHANDLE para
if (old_texture)
IDirect3DBaseTexture9_Release(old_texture);
- *(IDirect3DBaseTexture9 **)param->data = texture;
- set_dirty(param);
-
return D3D_OK;
}
@@ -4137,6 +4241,10 @@ static D3DXHANDLE WINAPI d3dx_effect_EndParameterBlock(ID3DXEffect *iface)
return NULL;
}
ret = effect->current_parameter_block;
+
+ ret->buffer = heap_realloc(ret->buffer, ret->current_size);
+ ret->buffer_size = ret->current_size;
+
effect->current_parameter_block = NULL;
list_add_tail(&effect->parameter_block_list, &ret->entry);
return (D3DXHANDLE)ret;
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index f1cbe49287..706ae126b8 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -8020,12 +8020,12 @@ static void test_effect_parameter_block(void)
IDirect3DTexture9 *texture, *tex_test;
D3DXHANDLE block, block2, handle;
ID3DXEffect *effect, *effect2;
+ D3DXMATRIX mat, mat_arr[2];
IDirect3DDevice9 *device;
ID3DXEffectPool *pool;
float float_array[4];
float float_value;
IDirect3D9 *d3d;
- D3DXMATRIX mat;
ULONG refcount;
HWND window;
HRESULT hr;
@@ -8115,9 +8115,7 @@ static void test_effect_parameter_block(void)
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetTexture(effect, "tex1", (IDirect3DBaseTexture9 **)&tex_test);
- todo_wine ok(hr == D3D_OK && !tex_test, "Got unexpected hr %#x, tex_test %p.\n", hr, tex_test);
- if (tex_test)
- IDirect3DTexture9_Release(tex_test);
+ ok(hr == D3D_OK && !tex_test, "Got unexpected hr %#x, tex_test %p.\n", hr, tex_test);
/* Child parameters and array members are recorded separately (the whole
* parameter is not updated when parameter block is applied). */
@@ -8126,13 +8124,13 @@ static void test_effect_parameter_block(void)
hr = effect->lpVtbl->SetFloat(effect, "ts1[0].fv", 28.0f);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetFloat(effect, "ts1[0].fv", &float_value);
- todo_wine ok(hr == D3D_OK && float_value == 12.0, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
+ ok(hr == D3D_OK && float_value == 12.0, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
float_array[0] = -29.0f;
hr = effect->lpVtbl->SetFloatArray(effect, "ts1[0].v2", float_array, 1);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v2", float_array, 1);
- todo_wine ok(hr == D3D_OK && float_array[0] == 13.0, "Got unexpected hr %#x, float_array[0] %g.\n",
+ ok(hr == D3D_OK && float_array[0] == 13.0, "Got unexpected hr %#x, float_array[0] %g.\n",
hr, float_array[0]);
memset(&mat, 0, sizeof(mat));
@@ -8140,13 +8138,13 @@ static void test_effect_parameter_block(void)
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetMatrix(effect, "m3x2row", &mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- todo_wine ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n");
+ ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n");
hr = effect->lpVtbl->SetMatrix(effect, "m3x2column", &test_mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetMatrix(effect, "m3x2column", &mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- todo_wine ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n");
+ ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n");
/* Setting shared parameter through effect2 is not recorded to effect
* parameter block. */
@@ -8321,6 +8319,30 @@ static void test_effect_parameter_block(void)
refcount = pool->lpVtbl->Release(pool);
ok(!refcount, "Got unexpected refcount %u.\n", refcount);
+ hr = D3DXCreateEffect(device, test_effect_parameter_value_blob_float, sizeof(test_effect_parameter_value_blob_float),
+ NULL, NULL, 0, NULL, &effect, NULL);
+ hr = effect->lpVtbl->BeginParameterBlock(effect);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ mat_arr[0] = mat_arr[1] = test_mat;
+ hr = effect->lpVtbl->SetMatrixArray(effect, "f33_2", mat_arr, 2);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ block = effect->lpVtbl->EndParameterBlock(effect);
+ ok(!!block, "Got unexpected block %p.\n", block);
+
+ memset(mat_arr, 0, sizeof(mat_arr));
+ hr = effect->lpVtbl->SetMatrixArray(effect, "f33_2", mat_arr, 2);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ hr = effect->lpVtbl->ApplyParameterBlock(effect, block);
+ todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr);
+
+ hr = effect->lpVtbl->GetMatrixArray(effect, "f33_2", mat_arr, 2);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(!memcmp(&mat_arr[0], &test_mat, sizeof(test_mat))
+ && !memcmp(&mat_arr[1], &test_mat, sizeof(test_mat)), "Got unexpected matrix array.\n");
+
+ refcount = effect->lpVtbl->Release(effect);
+ ok(!refcount, "Got unexpected refcount %u.\n", refcount);
+
refcount = IDirect3DDevice9_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);
IDirect3D9_Release(d3d);
--
2.23.0
2
2
Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr>
---
dlls/ole32/stg_prop.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c
index 9e13c13..dfe6a6a 100644
--- a/dlls/ole32/stg_prop.c
+++ b/dlls/ole32/stg_prop.c
@@ -958,7 +958,7 @@ static void PropertyStorage_PropNameDestroy(void *k, void *d, void *extra)
static int PropertyStorage_PropCompare(const void *a, const void *b,
void *extra)
{
- TRACE("(%d, %d)\n", PtrToUlong(a), PtrToUlong(b));
+ TRACE("(%u, %u)\n", PtrToUlong(a), PtrToUlong(b));
return PtrToUlong(a) - PtrToUlong(b);
}
--
2.10.0.windows.1
1
0
19 Nov '19
Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
---
v4:
- do not update parameter values if parameter block is being recorded.
v5:
- remove conditional compilation for get_valid_parameter_block()
(fixes compilation of d3dx9_[24,25].dll).
dlls/d3dx9_36/effect.c | 22 +++++++++++++++-----
dlls/d3dx9_36/tests/effect.c | 40 ++++++++++++++++++------------------
2 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index a8819f3a6b..39cb10234c 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -153,6 +153,7 @@ struct d3dx_technique
struct d3dx_parameter_block
{
char magic_string[ARRAY_SIZE(parameter_block_magic_string)];
+ struct d3dx_effect *effect;
struct list entry;
size_t buffer_size;
size_t current_size;
@@ -519,7 +520,6 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx_effect *effect, D3
return effect->flags & D3DXFX_LARGEADDRESSAWARE ? NULL : get_parameter_by_name(effect, NULL, parameter);
}
-#if D3DX_SDK_VERSION >= 26
static struct d3dx_parameter_block *get_valid_parameter_block(D3DXHANDLE handle)
{
struct d3dx_parameter_block *block = (struct d3dx_parameter_block *)handle;
@@ -527,7 +527,6 @@ static struct d3dx_parameter_block *get_valid_parameter_block(D3DXHANDLE handle)
return block && !strncmp(block->magic_string, parameter_block_magic_string,
sizeof(parameter_block_magic_string)) ? block : NULL;
}
-#endif
static void free_state(struct d3dx_state *state)
{
@@ -4224,6 +4223,7 @@ static HRESULT WINAPI d3dx_effect_BeginParameterBlock(ID3DXEffect *iface)
effect->current_parameter_block = heap_alloc_zero(sizeof(*effect->current_parameter_block));
memcpy(effect->current_parameter_block->magic_string, parameter_block_magic_string,
sizeof(parameter_block_magic_string));
+ effect->current_parameter_block->effect = effect;
return D3D_OK;
}
@@ -4252,11 +4252,23 @@ static D3DXHANDLE WINAPI d3dx_effect_EndParameterBlock(ID3DXEffect *iface)
static HRESULT WINAPI d3dx_effect_ApplyParameterBlock(ID3DXEffect *iface, D3DXHANDLE parameter_block)
{
- struct d3dx_effect *This = impl_from_ID3DXEffect(iface);
+ struct d3dx_parameter_block *block = get_valid_parameter_block(parameter_block);
+ struct d3dx_recorded_parameter *record;
- FIXME("(%p)->(%p): stub\n", This, parameter_block);
+ TRACE("iface %p, paramater_block %p.\n", iface, parameter_block);
- return E_NOTIMPL;
+ if (!block || !block->current_size)
+ return D3DERR_INVALIDCALL;
+
+ record = (struct d3dx_recorded_parameter *)block->buffer;
+ while ((BYTE *)record < block->buffer + block->current_size)
+ {
+ set_value(record->param, record + 1, record->bytes,
+ param_get_and_flag_data(block->effect, record->param, record->bytes, TRUE));
+ record = (struct d3dx_recorded_parameter *)((BYTE *)record + get_recorded_parameter_size(record));
+ }
+ assert((BYTE *)record == block->buffer + block->current_size);
+ return D3D_OK;
}
#if D3DX_SDK_VERSION >= 26
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index 706ae126b8..c72049d553 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -8079,7 +8079,7 @@ static void test_effect_parameter_block(void)
ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
hr = effect->lpVtbl->ApplyParameterBlock(effect, block);
- todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->DeleteParameterBlock(effect, block);
ok(hr == D3D_OK, "Got result %#x.\n", hr);
@@ -8092,7 +8092,7 @@ static void test_effect_parameter_block(void)
block = effect->lpVtbl->EndParameterBlock(effect);
ok(!!block, "Got unexpected block %p.\n", block);
hr = effect->lpVtbl->ApplyParameterBlock(effect, block);
- todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->DeleteParameterBlock(effect2, block);
ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr);
@@ -8100,9 +8100,9 @@ static void test_effect_parameter_block(void)
ok(hr == D3D_OK, "Got result %#x.\n", hr);
hr = effect->lpVtbl->ApplyParameterBlock(effect, NULL);
- todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->ApplyParameterBlock(effect, "parameter_block");
- todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
hr = D3DXCreateTexture(device, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, 0, D3DPOOL_DEFAULT, &texture);
ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr);
@@ -8188,14 +8188,14 @@ static void test_effect_parameter_block(void)
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->ApplyParameterBlock(effect, block);
- todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr);
+ ok(hr == D3D_OK, "Got result %#x.\n", hr);
IDirect3DTexture9_AddRef(texture);
refcount = IDirect3DTexture9_Release(texture);
- todo_wine ok(refcount == 3, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 3, "Got unexpected refcount %u.\n", refcount);
hr = effect->lpVtbl->GetFloat(effect, "arr2[0]", &float_value);
- todo_wine ok(hr == D3D_OK && float_value == 92.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
+ ok(hr == D3D_OK && float_value == 92.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
hr = effect->lpVtbl->GetFloat(effect, "arr2[1]", &float_value);
ok(hr == D3D_OK && float_value == 0.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
@@ -8206,16 +8206,16 @@ static void test_effect_parameter_block(void)
hr = effect->lpVtbl->GetMatrix(effect, "m3x2row", &mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- todo_wine ok(!memcmp(&mat, &test_mat, sizeof(mat)), "Got unexpected matrix.\n");
+ ok(!memcmp(&mat, &test_mat, sizeof(mat)), "Got unexpected matrix.\n");
hr = effect->lpVtbl->GetMatrix(effect, "m3x2column", &mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- todo_wine ok(!memcmp(&mat, &test_mat, sizeof(mat)), "Got unexpected matrix.\n");
+ ok(!memcmp(&mat, &test_mat, sizeof(mat)), "Got unexpected matrix.\n");
hr = effect->lpVtbl->GetFloat(effect, "ts1[0].fv", &float_value);
- todo_wine ok(hr == D3D_OK && float_value == 28.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
+ ok(hr == D3D_OK && float_value == 28.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v2", float_array, 4);
- todo_wine ok(hr == D3D_OK && float_array[0] == -29.0f
+ ok(hr == D3D_OK && float_array[0] == -29.0f
&& !memcmp(float_array + 1, float_array_zero, 3 * sizeof(*float_array)),
"Got unexpected hr %#x, ts1[0].v2 (%g, %g, %g, %g).\n", hr,
float_array[0], float_array[1], float_array[2], float_array[3]);
@@ -8240,7 +8240,7 @@ static void test_effect_parameter_block(void)
hr = effect->lpVtbl->BeginParameterBlock(effect);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->ApplyParameterBlock(effect, block);
- todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetFloat(effect, "arr2[0]", &float_value);
ok(hr == D3D_OK && float_value == 0.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
@@ -8272,10 +8272,10 @@ static void test_effect_parameter_block(void)
ok(!!block2, "Got unexpected block %p.\n", block2);
hr = effect->lpVtbl->ApplyParameterBlock(effect, block2);
- todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetFloat(effect, "arr2[0]", &float_value);
- todo_wine ok(hr == D3D_OK && float_value == 92.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
+ ok(hr == D3D_OK && float_value == 92.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
hr = effect->lpVtbl->GetFloat(effect, "arr2[1]", &float_value);
ok(hr == D3D_OK && float_value == 0.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
@@ -8286,16 +8286,16 @@ static void test_effect_parameter_block(void)
hr = effect->lpVtbl->GetMatrix(effect, "m3x2row", &mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- todo_wine ok(!memcmp(&mat, &test_mat, sizeof(mat)), "Got unexpected matrix.\n");
+ ok(!memcmp(&mat, &test_mat, sizeof(mat)), "Got unexpected matrix.\n");
hr = effect->lpVtbl->GetMatrix(effect, "m3x2column", &mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- todo_wine ok(!memcmp(&mat, &test_mat, sizeof(mat)), "Got unexpected matrix.\n");
+ ok(!memcmp(&mat, &test_mat, sizeof(mat)), "Got unexpected matrix.\n");
hr = effect->lpVtbl->GetFloat(effect, "ts1[0].fv", &float_value);
- todo_wine ok(hr == D3D_OK && float_value == 28.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
+ ok(hr == D3D_OK && float_value == 28.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v2", float_array, 4);
- todo_wine ok(hr == D3D_OK && float_array[0] == -29.0f
+ ok(hr == D3D_OK && float_array[0] == -29.0f
&& !memcmp(float_array + 1, float_array_zero, 3 * sizeof(*float_array)),
"Got unexpected hr %#x, ts1[0].v2 (%g, %g, %g, %g).\n", hr,
float_array[0], float_array[1], float_array[2], float_array[3]);
@@ -8333,11 +8333,11 @@ static void test_effect_parameter_block(void)
hr = effect->lpVtbl->SetMatrixArray(effect, "f33_2", mat_arr, 2);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->ApplyParameterBlock(effect, block);
- todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr);
+ ok(hr == D3D_OK, "Got result %#x.\n", hr);
hr = effect->lpVtbl->GetMatrixArray(effect, "f33_2", mat_arr, 2);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- todo_wine ok(!memcmp(&mat_arr[0], &test_mat, sizeof(test_mat))
+ ok(!memcmp(&mat_arr[0], &test_mat, sizeof(test_mat))
&& !memcmp(&mat_arr[1], &test_mat, sizeof(test_mat)), "Got unexpected matrix array.\n");
refcount = effect->lpVtbl->Release(effect);
--
2.23.0
1
0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/strmbase/transform.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c
index f4c2c4be72..608ccc55d2 100644
--- a/dlls/strmbase/transform.c
+++ b/dlls/strmbase/transform.c
@@ -29,11 +29,6 @@ static const WCHAR wcsOutputPinName[] = {'O','u','t',0};
static const IPinVtbl TransformFilter_InputPin_Vtbl;
static const IPinVtbl TransformFilter_OutputPin_Vtbl;
-static inline TransformFilter *impl_from_IBaseFilter( IBaseFilter *iface )
-{
- return CONTAINING_RECORD(iface, TransformFilter, filter.IBaseFilter_iface);
-}
-
static inline TransformFilter *impl_from_strmbase_filter(struct strmbase_filter *iface)
{
return CONTAINING_RECORD(iface, TransformFilter, filter);
--
2.24.0
1
0
[PATCH 1/5] strmbase: Rename the "mtCurrent" field of struct strmbase_pin to "mt".
by Zebediah Figura 19 Nov '19
by Zebediah Figura 19 Nov '19
19 Nov '19
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
dlls/qcap/avico.c | 4 ++--
dlls/qcap/avimux.c | 2 +-
dlls/qcap/smartteefilter.c | 4 ++--
dlls/quartz/dsoundrender.c | 14 +++++++-------
dlls/quartz/filesource.c | 4 ++--
dlls/quartz/tests/videorenderer.c | 4 ++--
dlls/quartz/tests/vmr7.c | 4 ++--
dlls/quartz/tests/vmr9.c | 4 ++--
dlls/quartz/videorenderer.c | 4 ++--
dlls/quartz/vmr9.c | 6 +++---
dlls/strmbase/pin.c | 20 ++++++++++----------
dlls/winegstreamer/gstdemux.c | 4 ++--
dlls/wineqtdecoder/qtsplitter.c | 4 ++--
include/wine/strmbase.h | 2 +-
14 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c
index 95e51f6e63..8eae692dca 100644
--- a/dlls/qcap/avico.c
+++ b/dlls/qcap/avico.c
@@ -470,7 +470,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample *
if((This->driver_flags & VIDCF_TEMPORAL) && !(This->driver_flags & VIDCF_FASTTEMPORALC))
FIXME("Unsupported temporal compression\n");
- src_videoinfo = (VIDEOINFOHEADER *)This->sink.pin.mtCurrent.pbFormat;
+ src_videoinfo = (VIDEOINFOHEADER *)This->sink.pin.mt.pbFormat;
This->videoinfo->bmiHeader.biSizeImage = This->max_frame_size;
res = ICCompress(This->hic, sync_point ? ICCOMPRESS_KEYFRAME : 0, &This->videoinfo->bmiHeader, buf,
&src_videoinfo->bmiHeader, ptr, 0, &comp_flags, This->frame_cnt, 0, 0, NULL, NULL);
@@ -539,7 +539,7 @@ static HRESULT source_get_media_type(struct strmbase_pin *base, unsigned int iPo
amt->subtype = MEDIASUBTYPE_PCM;
amt->bFixedSizeSamples = FALSE;
amt->bTemporalCompression = (This->driver_flags & VIDCF_TEMPORAL) != 0;
- amt->lSampleSize = This->sink.pin.mtCurrent.lSampleSize;
+ amt->lSampleSize = This->sink.pin.mt.lSampleSize;
amt->formattype = FORMAT_VideoInfo;
amt->pUnk = NULL;
amt->cbFormat = This->videoinfo_size;
diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c
index 8f7fe13285..e8067dd61d 100644
--- a/dlls/qcap/avimux.c
+++ b/dlls/qcap/avimux.c
@@ -1416,7 +1416,7 @@ static HRESULT WINAPI AviMuxIn_Receive(BaseInputPin *base, IMediaSample *pSample
size = IMediaSample_GetActualDataLength(pSample);
}
- if(!avimuxin->pin.pin.mtCurrent.bTemporalCompression)
+ if(!avimuxin->pin.pin.mt.bTemporalCompression)
flags |= AM_SAMPLE_SPLICEPOINT;
hr = IMediaSample_GetTime(pSample, &start, &stop);
diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c
index a4d0a435ef..d3acf47e7e 100644
--- a/dlls/qcap/smartteefilter.c
+++ b/dlls/qcap/smartteefilter.c
@@ -142,7 +142,7 @@ static HRESULT sink_get_media_type(struct strmbase_pin *base,
EnterCriticalSection(&This->filter.csFilter);
if (This->sink.pin.peer)
{
- CopyMediaType(amt, &This->sink.pin.mtCurrent);
+ CopyMediaType(amt, &This->sink.pin.mt);
hr = S_OK;
}
else
@@ -331,7 +331,7 @@ static HRESULT source_get_media_type(struct strmbase_pin *iface,
if (!filter->sink.pin.peer)
hr = VFW_E_NOT_CONNECTED;
else if (!index)
- CopyMediaType(mt, &filter->sink.pin.mtCurrent);
+ CopyMediaType(mt, &filter->sink.pin.mt);
else
hr = VFW_S_NO_MORE_ITEMS;
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index ed257c373f..fca1a710de 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -92,14 +92,14 @@ static inline DSoundRenderImpl *impl_from_IAMDirectSound(IAMDirectSound *iface)
}
static REFERENCE_TIME time_from_pos(DSoundRenderImpl *This, DWORD pos) {
- WAVEFORMATEX *wfx = (WAVEFORMATEX *)This->renderer.sink.pin.mtCurrent.pbFormat;
+ WAVEFORMATEX *wfx = (WAVEFORMATEX *)This->renderer.sink.pin.mt.pbFormat;
REFERENCE_TIME ret = 10000000;
ret = ret * pos / wfx->nAvgBytesPerSec;
return ret;
}
static DWORD pos_from_time(DSoundRenderImpl *This, REFERENCE_TIME time) {
- WAVEFORMATEX *wfx = (WAVEFORMATEX *)This->renderer.sink.pin.mtCurrent.pbFormat;
+ WAVEFORMATEX *wfx = (WAVEFORMATEX *)This->renderer.sink.pin.mt.pbFormat;
REFERENCE_TIME ret = time;
ret *= wfx->nAvgBytesPerSec;
ret /= 10000000;
@@ -108,7 +108,7 @@ static DWORD pos_from_time(DSoundRenderImpl *This, REFERENCE_TIME time) {
}
static void DSoundRender_UpdatePositions(DSoundRenderImpl *This, DWORD *seqwritepos, DWORD *minwritepos) {
- WAVEFORMATEX *wfx = (WAVEFORMATEX *)This->renderer.sink.pin.mtCurrent.pbFormat;
+ WAVEFORMATEX *wfx = (WAVEFORMATEX *)This->renderer.sink.pin.mt.pbFormat;
BYTE *buf1, *buf2;
DWORD size1, size2, playpos, writepos, old_writepos, old_playpos, adv;
BOOL writepos_set = This->writepos < This->buf_size;
@@ -146,7 +146,7 @@ static void DSoundRender_UpdatePositions(DSoundRenderImpl *This, DWORD *seqwrite
static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_writepos, REFERENCE_TIME write_at, DWORD *pfree, DWORD *skip)
{
- WAVEFORMATEX *wfx = (WAVEFORMATEX *)This->renderer.sink.pin.mtCurrent.pbFormat;
+ WAVEFORMATEX *wfx = (WAVEFORMATEX *)This->renderer.sink.pin.mt.pbFormat;
DWORD writepos, min_writepos, playpos;
REFERENCE_TIME max_lag = 50 * 10000;
REFERENCE_TIME min_lag = 25 * 10000;
@@ -314,7 +314,7 @@ static HRESULT WINAPI DSoundRender_PrepareReceive(struct strmbase_renderer *ifac
if (IMediaSample_GetMediaType(pSample, &amt) == S_OK)
{
- AM_MEDIA_TYPE *orig = &This->renderer.sink.pin.mtCurrent;
+ AM_MEDIA_TYPE *orig = &This->renderer.sink.pin.mt;
WAVEFORMATEX *origfmt = (WAVEFORMATEX *)orig->pbFormat;
WAVEFORMATEX *newfmt = (WAVEFORMATEX *)amt->pbFormat;
@@ -434,7 +434,7 @@ static void dsound_render_start_stream(struct strmbase_renderer *iface)
static HRESULT WINAPI DSoundRender_CompleteConnect(struct strmbase_renderer *iface, IPin *pReceivePin)
{
DSoundRenderImpl *This = impl_from_strmbase_renderer(iface);
- const AM_MEDIA_TYPE *pmt = &This->renderer.sink.pin.mtCurrent;
+ const AM_MEDIA_TYPE *pmt = &This->renderer.sink.pin.mt;
HRESULT hr = S_OK;
WAVEFORMATEX *format;
DSBUFFERDESC buf_desc;
@@ -937,7 +937,7 @@ static HRESULT WINAPI ReferenceClock_GetTime(IReferenceClock *iface,
DWORD writepos1, writepos2;
EnterCriticalSection(&This->renderer.filter.csFilter);
DSoundRender_UpdatePositions(This, &writepos1, &writepos2);
- if (This->renderer.sink.pin.mtCurrent.pbFormat)
+ if (This->renderer.sink.pin.mt.pbFormat)
{
*pTime = This->play_time + time_from_pos(This, This->last_playpos);
hr = S_OK;
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index 8a921954dd..59f1cc5a18 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -651,7 +651,7 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(struct strmbase_sourc
This->pin.peer = pReceivePin;
IPin_AddRef(pReceivePin);
- CopyMediaType(&This->pin.mtCurrent, pmt);
+ CopyMediaType(&This->pin.mt, pmt);
hr = IPin_ReceiveConnection(pReceivePin, &This->pin.IPin_iface, pmt);
@@ -659,7 +659,7 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(struct strmbase_sourc
{
IPin_Release(This->pin.peer);
This->pin.peer = NULL;
- FreeMediaType(&This->pin.mtCurrent);
+ FreeMediaType(&This->pin.mt);
}
TRACE(" -- %x\n", hr);
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index b7b1cb405e..e7c0e15edd 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -574,14 +574,14 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface
iface->pin.peer = peer;
IPin_AddRef(peer);
- CopyMediaType(&iface->pin.mtCurrent, mt);
+ CopyMediaType(&iface->pin.mt, mt);
if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt)))
{
ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
IPin_Release(peer);
iface->pin.peer = NULL;
- FreeMediaType(&iface->pin.mtCurrent);
+ FreeMediaType(&iface->pin.mt);
}
return hr;
diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c
index 0d72689078..73017290fb 100644
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -933,14 +933,14 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface
iface->pin.peer = peer;
IPin_AddRef(peer);
- CopyMediaType(&iface->pin.mtCurrent, mt);
+ CopyMediaType(&iface->pin.mt, mt);
if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt)))
{
ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
IPin_Release(peer);
iface->pin.peer = NULL;
- FreeMediaType(&iface->pin.mtCurrent);
+ FreeMediaType(&iface->pin.mt);
}
return hr;
diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c
index fa63b5b85c..e30da6b782 100644
--- a/dlls/quartz/tests/vmr9.c
+++ b/dlls/quartz/tests/vmr9.c
@@ -937,14 +937,14 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface
iface->pin.peer = peer;
IPin_AddRef(peer);
- CopyMediaType(&iface->pin.mtCurrent, mt);
+ CopyMediaType(&iface->pin.mt, mt);
if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt)))
{
ok(hr == VFW_E_TYPE_NOT_ACCEPTED || hr == E_FAIL, "Got hr %#x.\n", hr);
IPin_Release(peer);
iface->pin.peer = NULL;
- FreeMediaType(&iface->pin.mtCurrent);
+ FreeMediaType(&iface->pin.mt);
}
return hr;
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index 449bd31f68..18e5f618b0 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -394,7 +394,7 @@ static HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT
static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo* iface, LONG *pBufferSize, LONG *pDIBImage)
{
VideoRendererImpl *This = impl_from_BaseControlVideo(iface);
- AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mtCurrent;
+ AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt;
BITMAPINFOHEADER *bmiHeader;
LONG needed_size;
char *ptr;
@@ -464,7 +464,7 @@ static VIDEOINFOHEADER* WINAPI VideoRenderer_GetVideoFormat(BaseControlVideo* if
TRACE("(%p/%p)\n", This, iface);
- pmt = &This->renderer.sink.pin.mtCurrent;
+ pmt = &This->renderer.sink.pin.mt;
if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) {
return (VIDEOINFOHEADER*)pmt->pbFormat;
} else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) {
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index a2ed46d05d..36c91c2ef7 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -198,7 +198,7 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo *
TRACE("%p %p %d\n", This, data, size);
- amt = &This->renderer.sink.pin.mtCurrent;
+ amt = &This->renderer.sink.pin.mt;
if (IsEqualIID(&amt->formattype, &FORMAT_VideoInfo))
{
@@ -609,7 +609,7 @@ static HRESULT WINAPI VMR9_GetSourceRect(BaseControlVideo* This, RECT *pSourceRe
static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage)
{
struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This);
- AM_MEDIA_TYPE *amt = &pVMR9->renderer.sink.pin.mtCurrent;
+ AM_MEDIA_TYPE *amt = &pVMR9->renderer.sink.pin.mt;
BITMAPINFOHEADER *bmiHeader;
LONG needed_size;
char *ptr;
@@ -679,7 +679,7 @@ static VIDEOINFOHEADER* WINAPI VMR9_GetVideoFormat(BaseControlVideo* This)
TRACE("(%p/%p)\n", pVMR9, This);
- pmt = &pVMR9->renderer.sink.pin.mtCurrent;
+ pmt = &pVMR9->renderer.sink.pin.mt;
if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) {
return (VIDEOINFOHEADER*)pmt->pbFormat;
} else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) {
diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c
index 9a88246a7f..c7f1ed2af4 100644
--- a/dlls/strmbase/pin.c
+++ b/dlls/strmbase/pin.c
@@ -196,8 +196,8 @@ HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface)
{
IPin_Release(This->peer);
This->peer = NULL;
- FreeMediaType(&This->mtCurrent);
- ZeroMemory(&This->mtCurrent, sizeof(This->mtCurrent));
+ FreeMediaType(&This->mt);
+ ZeroMemory(&This->mt, sizeof(This->mt));
hr = S_OK;
}
else
@@ -245,7 +245,7 @@ HRESULT WINAPI BasePinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt
{
if (This->peer)
{
- CopyMediaType(pmt, &This->mtCurrent);
+ CopyMediaType(pmt, &This->mt);
strmbase_dump_media_type(pmt);
hr = S_OK;
}
@@ -456,8 +456,8 @@ HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface)
{
IPin_Release(This->pin.peer);
This->pin.peer = NULL;
- FreeMediaType(&This->pin.mtCurrent);
- ZeroMemory(&This->pin.mtCurrent, sizeof(This->pin.mtCurrent));
+ FreeMediaType(&This->pin.mt);
+ ZeroMemory(&This->pin.mt, sizeof(This->pin.mt));
hr = S_OK;
}
else
@@ -643,7 +643,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *This,
This->pin.peer = pReceivePin;
IPin_AddRef(pReceivePin);
- CopyMediaType(&This->pin.mtCurrent, pmt);
+ CopyMediaType(&This->pin.mt, pmt);
hr = IPin_ReceiveConnection(pReceivePin, &This->pin.IPin_iface, pmt);
@@ -678,7 +678,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *This,
{
IPin_Release(This->pin.peer);
This->pin.peer = NULL;
- FreeMediaType(&This->pin.mtCurrent);
+ FreeMediaType(&This->pin.mt);
}
TRACE(" -- %x\n", hr);
@@ -699,7 +699,7 @@ void strmbase_source_init(struct strmbase_source *pin, const IPinVtbl *vtbl, str
void strmbase_source_cleanup(struct strmbase_source *pin)
{
- FreeMediaType(&pin->pin.mtCurrent);
+ FreeMediaType(&pin->pin.mt);
if (pin->pAllocator)
IMemAllocator_Release(pin->pAllocator);
pin->pAllocator = NULL;
@@ -750,7 +750,7 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP
if (SUCCEEDED(hr))
{
- CopyMediaType(&This->pin.mtCurrent, pmt);
+ CopyMediaType(&This->pin.mt, pmt);
This->pin.peer = pReceivePin;
IPin_AddRef(pReceivePin);
}
@@ -999,7 +999,7 @@ void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, struct strmbase
void strmbase_sink_cleanup(BaseInputPin *pin)
{
- FreeMediaType(&pin->pin.mtCurrent);
+ FreeMediaType(&pin->pin.mt);
if (pin->pAllocator)
IMemAllocator_Release(pin->pAllocator);
pin->pAllocator = NULL;
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 79328a025a..394b919df9 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -1231,7 +1231,7 @@ static void gstdemux_destroy(struct strmbase_filter *iface)
assert(hr == S_OK);
}
- FreeMediaType(&filter->sink.mtCurrent);
+ FreeMediaType(&filter->sink.mt);
if (filter->alloc)
IMemAllocator_Release(filter->alloc);
filter->alloc = NULL;
@@ -2037,7 +2037,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin,
if (pAlloc)
IMemAllocator_Release(pAlloc);
if (SUCCEEDED(hr)) {
- CopyMediaType(&filter->sink.mtCurrent, pmt);
+ CopyMediaType(&filter->sink.mt, pmt);
filter->sink.peer = pReceivePin;
IPin_AddRef(pReceivePin);
hr = IMemAllocator_Commit(filter->alloc);
diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c
index 99539e5c89..a7da3b37d6 100644
--- a/dlls/wineqtdecoder/qtsplitter.c
+++ b/dlls/wineqtdecoder/qtsplitter.c
@@ -241,7 +241,7 @@ static void qt_splitter_destroy(struct strmbase_filter *iface)
IPin_Release(peer);
}
- FreeMediaType(&filter->pInputPin.pin.mtCurrent);
+ FreeMediaType(&filter->pInputPin.pin.mt);
if (filter->pInputPin.pAlloc)
IMemAllocator_Release(filter->pInputPin.pAlloc);
filter->pInputPin.pAlloc = NULL;
@@ -1120,7 +1120,7 @@ static HRESULT WINAPI QTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin,
if (SUCCEEDED(hr))
{
- CopyMediaType(&This->pin.mtCurrent, pmt);
+ CopyMediaType(&This->pin.mt, pmt);
This->pin.peer = pReceivePin;
IPin_AddRef(pReceivePin);
hr = IMemAllocator_Commit(This->pAlloc);
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index f87b726d0a..01a2bc79c3 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -37,7 +37,7 @@ struct strmbase_pin
PIN_DIRECTION dir;
WCHAR name[128];
IPin *peer;
- AM_MEDIA_TYPE mtCurrent;
+ AM_MEDIA_TYPE mt;
const struct BasePinFuncTable* pFuncsTable;
};
--
2.24.0
2
5
Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com>
---
Required for Star Wars Jedi: Fallen Order bought from Steam to run.
---
dlls/setupapi/query.c | 14 ++++++++++++++
dlls/setupapi/setupapi.spec | 1 +
2 files changed, 15 insertions(+)
diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c
index ea1b969618..c960a6a2ba 100644
--- a/dlls/setupapi/query.c
+++ b/dlls/setupapi/query.c
@@ -717,3 +717,17 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW(
return TRUE;
}
+
+/***********************************************************************
+ * SetupGetInfDriverStoreLocationW (SETUPAPI.@)
+ */
+BOOL WINAPI SetupGetInfDriverStoreLocationW(
+ PCWSTR FileName, PSP_ALTPLATFORM_INFO AlternativePlatformInfo,
+ PCWSTR LocaleName, PWSTR ReturnBuffer, DWORD ReturnBufferSize,
+ PDWORD RequiredSize)
+{
+ FIXME("stub!: %s %p %s %p %u %p\n", debugstr_w(FileName), AlternativePlatformInfo, debugstr_w(LocaleName), ReturnBuffer, ReturnBufferSize, RequiredSize);
+
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return FALSE;
+}
\ No newline at end of file
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 1d09b0e7e5..8b6928f647 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -421,6 +421,7 @@
@ stdcall SetupGetFileCompressionInfoW(wstr ptr ptr ptr ptr)
@ stdcall SetupGetFileQueueCount(long long ptr)
@ stdcall SetupGetFileQueueFlags(long ptr)
+@ stdcall SetupGetInfDriverStoreLocationW(wstr ptr wstr ptr long ptr)
@ stdcall SetupGetInfFileListA(str long ptr long ptr)
@ stdcall SetupGetInfFileListW(wstr long ptr long ptr)
@ stdcall SetupGetInfInformationA(ptr long ptr long ptr)
--
2.23.0
1
0
18 Nov '19
Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no>
---
libs/vkd3d/device.c | 2 +-
libs/vkd3d/utils.c | 8 ++++----
libs/vkd3d/vkd3d_private.h | 8 +++++++-
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 0624318..cc8e282 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -453,7 +453,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
bool *user_extension_supported = NULL;
VkApplicationInfo application_info;
VkInstanceCreateInfo instance_info;
- char application_name[PATH_MAX];
+ char application_name[VKD3D_PATH_MAX];
uint32_t extension_count;
const char **extensions;
VkInstance vk_instance;
diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c
index cf0448d..64eb845 100644
--- a/libs/vkd3d/utils.c
+++ b/libs/vkd3d/utils.c
@@ -830,7 +830,7 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs,
#if HAVE_DECL_PROGRAM_INVOCATION_NAME
-bool vkd3d_get_program_name(char program_name[PATH_MAX])
+bool vkd3d_get_program_name(char program_name[VKD3D_PATH_MAX])
{
char *name, *p, *real_path = NULL;
@@ -856,15 +856,15 @@ bool vkd3d_get_program_name(char program_name[PATH_MAX])
name = program_invocation_name;
}
- strncpy(program_name, name, PATH_MAX);
- program_name[PATH_MAX - 1] = '\0';
+ strncpy(program_name, name, VKD3D_PATH_MAX);
+ program_name[VKD3D_PATH_MAX - 1] = '\0';
free(real_path);
return true;
}
#else
-bool vkd3d_get_program_name(char program_name[PATH_MAX])
+bool vkd3d_get_program_name(char program_name[VKD3D_PATH_MAX])
{
*program_name = '\0';
return false;
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 84b5ff2..a90f7e5 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -54,6 +54,12 @@
#define VKD3D_MAX_SHADER_STAGES 5u
#define VKD3D_MAX_VK_SYNC_OBJECTS 4u
+#ifdef _WIN32
+#define VKD3D_PATH_MAX _MAX_PATH
+#else
+#define VKD3D_PATH_MAX PATH_MAX
+#endif
+
struct d3d12_command_list;
struct d3d12_device;
struct d3d12_resource;
@@ -1271,7 +1277,7 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs,
extern const char vkd3d_build[];
-bool vkd3d_get_program_name(char program_name[PATH_MAX]) DECLSPEC_HIDDEN;
+bool vkd3d_get_program_name(char program_name[VKD3D_PATH_MAX]) DECLSPEC_HIDDEN;
static inline void vkd3d_set_thread_name(const char *name)
{
--
2.24.0
1
1
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48104
Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
---
dlls/ddraw/tests/ddraw7.c | 191 +++++++++++++++++++++++----------
dlls/wined3d/device.c | 7 +-
dlls/wined3d/state.c | 15 ++-
dlls/wined3d/wined3d_private.h | 8 ++
4 files changed, 159 insertions(+), 62 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 143f6d4b6b..20b0e09a95 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -277,7 +277,8 @@ static D3DCOLOR get_surface_color(IDirectDrawSurface7 *surface, UINT x, UINT y)
return color;
}
-static void check_rect(IDirectDrawSurface7 *surface, RECT r, const char *message)
+#define check_rect(a, b, c) check_rect_(__LINE__, a, b, c)
+static void check_rect_(unsigned int line, IDirectDrawSurface7 *surface, RECT r, const char *message)
{
LONG x_coords[2][2] =
{
@@ -308,7 +309,7 @@ static void check_rect(IDirectDrawSurface7 *surface, RECT r, const char *message
if (x < 0 || x >= 640 || y < 0 || y >= 480)
continue;
color = get_surface_color(surface, x, y);
- ok(color == expected, "%s: Pixel (%d, %d) has color %08x, expected %08x.\n",
+ ok_(__FILE__, line)(color == expected, "%s: Pixel (%d, %d) has color %08x, expected %08x.\n",
message, x, y, color, expected);
}
}
@@ -543,17 +544,17 @@ static void test_process_vertices(void)
}
hr = IDirect3DDevice7_GetDirect3D(device, &d3d7);
- ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
memset(&vb_desc, 0, sizeof(vb_desc));
vb_desc.dwSize = sizeof(vb_desc);
vb_desc.dwFVF = D3DFVF_XYZ;
vb_desc.dwNumVertices = 4;
hr = IDirect3D7_CreateVertexBuffer(d3d7, &vb_desc, &src_vb, 0);
- ok(SUCCEEDED(hr), "Failed to create source vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_Lock(src_vb, 0, (void **)&src_data, NULL);
- ok(SUCCEEDED(hr), "Failed to lock source vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
src_data[0].x = 0.0f;
src_data[0].y = 0.0f;
src_data[0].z = 0.0f;
@@ -567,7 +568,7 @@ static void test_process_vertices(void)
src_data[3].y = -0.5f;
src_data[3].z = 0.25f;
hr = IDirect3DVertexBuffer7_Unlock(src_vb);
- ok(SUCCEEDED(hr), "Failed to unlock source vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
memset(&vb_desc, 0, sizeof(vb_desc));
vb_desc.dwSize = sizeof(vb_desc);
@@ -575,7 +576,7 @@ static void test_process_vertices(void)
vb_desc.dwNumVertices = 4;
/* MSDN says that the last parameter must be 0 - check that. */
hr = IDirect3D7_CreateVertexBuffer(d3d7, &vb_desc, &dst_vb1, 4);
- ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
memset(&vb_desc, 0, sizeof(vb_desc));
vb_desc.dwSize = sizeof(vb_desc);
@@ -583,7 +584,7 @@ static void test_process_vertices(void)
vb_desc.dwNumVertices = 5;
/* MSDN says that the last parameter must be 0 - check that. */
hr = IDirect3D7_CreateVertexBuffer(d3d7, &vb_desc, &dst_vb2, 12345678);
- ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
memset(&vp, 0, sizeof(vp));
vp.dwX = 64;
@@ -593,15 +594,15 @@ static void test_process_vertices(void)
vp.dvMinZ = 0.0f;
vp.dvMaxZ = 1.0f;
hr = IDirect3DDevice7_SetViewport(device, &vp);
- ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb1, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
- ok(SUCCEEDED(hr), "Failed to process vertices, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb2, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
- ok(SUCCEEDED(hr), "Failed to process vertices, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_Lock(dst_vb1, 0, (void **)&dst_data, NULL);
- ok(SUCCEEDED(hr), "Failed to lock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
ok(compare_vec4(&dst_data[0], +1.280e+2f, +1.280e+2f, +0.000e+0f, +1.000e+0f, 4096),
"Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n",
dst_data[0].x, dst_data[0].y, dst_data[0].z, dst_data[0].w);
@@ -615,10 +616,10 @@ static void test_process_vertices(void)
"Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n",
dst_data[3].x, dst_data[3].y, dst_data[3].z, dst_data[3].w);
hr = IDirect3DVertexBuffer7_Unlock(dst_vb1);
- ok(SUCCEEDED(hr), "Failed to unlock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_Lock(dst_vb2, 0, (void **)&dst_data2, NULL);
- ok(SUCCEEDED(hr), "Failed to lock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
/* Small thing without much practical meaning, but I stumbled upon it,
* so let's check for it: If the output vertex buffer has no RHW value,
* the RHW value of the last vertex is written into the next vertex. */
@@ -626,7 +627,62 @@ static void test_process_vertices(void)
"Got unexpected vertex 4 {%.8e, %.8e, %.8e}.\n",
dst_data2[4].x, dst_data2[4].y, dst_data2[4].z);
hr = IDirect3DVertexBuffer7_Unlock(dst_vb2);
- ok(SUCCEEDED(hr), "Failed to unlock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ /* Test degenerate viewport z ranges. */
+ vp.dvMinZ = 0.0f;
+ vp.dvMaxZ = 0.0f;
+ hr = IDirect3DDevice7_SetViewport(device, &vp);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb1, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb2, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = IDirect3DVertexBuffer7_Lock(dst_vb1, 0, (void **)&dst_data, NULL);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ ok(compare_vec4(&dst_data[0], +1.280e+2f, +1.280e+2f, +0.000e+0f, +1.000e+0f, 4096),
+ "Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[0].x, dst_data[0].y, dst_data[0].z, dst_data[0].w);
+ ok(compare_vec4(&dst_data[1], +1.920e+2f, +6.400e+1f, +1.000e-3f, +1.000e+0f, 4096),
+ "Got unexpected vertex 1 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[1].x, dst_data[1].y, dst_data[1].z, dst_data[1].w);
+ ok(compare_vec4(&dst_data[2], +6.400e+1f, +1.920e+2f, +5.000e-4f, +1.000e+0f, 4096),
+ "Got unexpected vertex 2 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[2].x, dst_data[2].y, dst_data[2].z, dst_data[2].w);
+ ok(compare_vec4(&dst_data[3], +1.600e+2f, +1.600e+2f, +2.500e-4f, +1.000e+0f, 4096),
+ "Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[3].x, dst_data[3].y, dst_data[3].z, dst_data[3].w);
+ hr = IDirect3DVertexBuffer7_Unlock(dst_vb1);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ vp.dvMinZ = 1.0f;
+ vp.dvMaxZ = 0.0f;
+ hr = IDirect3DDevice7_SetViewport(device, &vp);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb1, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb2, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = IDirect3DVertexBuffer7_Lock(dst_vb1, 0, (void **)&dst_data, NULL);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ ok(compare_vec4(&dst_data[0], +1.280e+2f, +1.280e+2f, +1.000e+0f, +1.000e+0f, 4096),
+ "Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[0].x, dst_data[0].y, dst_data[0].z, dst_data[0].w);
+ ok(compare_vec4(&dst_data[1], +1.920e+2f, +6.400e+1f, +1.001e+0f, +1.000e+0f, 4096),
+ "Got unexpected vertex 1 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[1].x, dst_data[1].y, dst_data[1].z, dst_data[1].w);
+ ok(compare_vec4(&dst_data[2], +6.400e+1f, +1.920e+2f, +1.0005e+0f, +1.000e+0f, 4096),
+ "Got unexpected vertex 2 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[2].x, dst_data[2].y, dst_data[2].z, dst_data[2].w);
+ ok(compare_vec4(&dst_data[3], +1.600e+2f, +1.600e+2f, +1.00025e+0f, +1.000e+0f, 4096),
+ "Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n",
+ dst_data[3].x, dst_data[3].y, dst_data[3].z, dst_data[3].w);
+ hr = IDirect3DVertexBuffer7_Unlock(dst_vb1);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
/* Try a more complicated viewport, same vertices. */
memset(&vp, 0, sizeof(vp));
@@ -637,13 +693,13 @@ static void test_process_vertices(void)
vp.dvMinZ = -2.0f;
vp.dvMaxZ = 4.0f;
hr = IDirect3DDevice7_SetViewport(device, &vp);
- ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb1, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
- ok(SUCCEEDED(hr), "Failed to process vertices, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_Lock(dst_vb1, 0, (void **)&dst_data, NULL);
- ok(SUCCEEDED(hr), "Failed to lock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
ok(compare_vec4(&dst_data[0], +1.330e+2f, +7.000e+1f, -2.000e+0f, +1.000e+0f, 4096),
"Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n",
dst_data[0].x, dst_data[0].y, dst_data[0].z, dst_data[0].w);
@@ -657,20 +713,20 @@ static void test_process_vertices(void)
"Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n",
dst_data[3].x, dst_data[3].y, dst_data[3].z, dst_data[3].w);
hr = IDirect3DVertexBuffer7_Unlock(dst_vb1);
- ok(SUCCEEDED(hr), "Failed to unlock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &world);
- ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &view);
- ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &proj);
- ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb1, D3DVOP_TRANSFORM, 0, 4, src_vb, 0, device, 0);
- ok(SUCCEEDED(hr), "Failed to process vertices, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_Lock(dst_vb1, 0, (void **)&dst_data, NULL);
- ok(SUCCEEDED(hr), "Failed to lock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
ok(compare_vec4(&dst_data[0], +2.560e+2f, +7.000e+1f, -2.000e+0f, +3.333e-1f, 4096),
"Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n",
dst_data[0].x, dst_data[0].y, dst_data[0].z, dst_data[0].w);
@@ -684,7 +740,7 @@ static void test_process_vertices(void)
"Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n",
dst_data[3].x, dst_data[3].y, dst_data[3].z, dst_data[3].w);
hr = IDirect3DVertexBuffer7_Unlock(dst_vb1);
- ok(SUCCEEDED(hr), "Failed to unlock destination vertex buffer, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
IDirect3DVertexBuffer7_Release(dst_vb2);
IDirect3DVertexBuffer7_Release(dst_vb1);
@@ -14877,24 +14933,27 @@ static void test_viewport(void)
static struct
{
D3DVIEWPORT7 vp;
+ float expected_z;
RECT expected_rect;
const char *message;
}
tests[] =
{
- {{ 0, 0, 640, 480}, { 0, 120, 479, 359}, "Viewport (0, 0) - (640, 480)"},
- {{ 0, 0, 320, 240}, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"},
- {{ 0, 0, 1280, 960}, { 0, 240, 639, 479}, "Viewport (0, 0) - (1280, 960)"},
- {{ 0, 0, 2000, 1600}, {-10, -10, -10, -10}, "Viewport (0, 0) - (2000, 1600)"},
- {{100, 100, 640, 480}, {100, 220, 579, 459}, "Viewport (100, 100) - (640, 480)"},
- {{ 0, 0, 8192, 8192}, {-10, -10, -10, -10}, "Viewport (0, 0) - (8192, 8192)"},
+ {{ 0, 0, 640, 480}, 0.001f, { 0, 120, 479, 359}, "Viewport (0, 0) - (640, 480)"},
+ {{ 0, 0, 640, 480, 0.5f, 0.0f}, 0.501f,
+ {0, 120, 479, 359}, "Viewport (0, 0, 0.5) - (640, 480, 0.0)"},
+ {{ 0, 0, 320, 240}, 0.001f, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"},
+ {{ 0, 0, 1280, 960}, 0.001f, { 0, 240, 639, 479}, "Viewport (0, 0) - (1280, 960)"},
+ {{ 0, 0, 2000, 1600}, 0.001f, {-10, -10, -10, -10}, "Viewport (0, 0) - (2000, 1600)"},
+ {{100, 100, 640, 480}, 0.001f, {100, 220, 579, 459}, "Viewport (100, 100) - (640, 480)"},
+ {{ 0, 0, 8192, 8192}, 0.001f, {-10, -10, -10, -10}, "Viewport (0, 0) - (8192, 8192)"},
};
static struct vec3 quad[] =
{
- {-1.5f, -0.5f, 0.1f},
- {-1.5f, 0.5f, 0.1f},
- { 0.5f, -0.5f, 0.1f},
- { 0.5f, 0.5f, 0.1f},
+ {-1.5f, -0.5f, 1.0f},
+ {-1.5f, 0.5f, 1.0f},
+ { 0.5f, -0.5f, 1.0f},
+ { 0.5f, 0.5f, 1.0f},
};
static const struct vec2 rt_sizes[] =
{
@@ -14902,6 +14961,7 @@ static void test_viewport(void)
};
IDirectDrawSurface7 *rt, *ds;
DDSURFACEDESC2 surface_desc;
+ const float z_eps = 0.0001;
IDirect3DDevice7 *device;
IDirectDraw7 *ddraw;
DDPIXELFORMAT z_fmt;
@@ -14921,18 +14981,16 @@ static void test_viewport(void)
}
hr = IDirect3DDevice7_GetDirect3D(device, &d3d);
- ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw);
- ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
IDirect3D7_Release(d3d);
- hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE);
- ok(SUCCEEDED(hr), "Failed to disable depth test, hr %#x.\n", hr);
hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE);
- ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice7_SetViewport(device, NULL);
- ok(hr == E_INVALIDARG, "Setting NULL viewport data returned unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
ds = get_depth_stencil(device);
memset(&surface_desc, 0, sizeof(surface_desc));
@@ -14951,56 +15009,79 @@ static void test_viewport(void)
surface_desc.dwHeight = rt_sizes[i].y;
surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE;
hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &rt, NULL);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x (i %u).\n", hr, i);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u).\n", hr, i);
surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT;
surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER;
U4(surface_desc).ddpfPixelFormat = z_fmt;
hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &ds, NULL);
- ok(SUCCEEDED(hr), "Failed to create depth buffer, hr %#x (i %u).\n", hr, i);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u).\n", hr, i);
hr = IDirectDrawSurface7_AddAttachedSurface(rt, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x (i %u).\n", hr, i);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u).\n", hr, i);
hr = IDirect3DDevice7_SetRenderTarget(device, rt, 0);
- ok(SUCCEEDED(hr), "Failed to set render target, hr %#x (i %u).\n", hr, i);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u).\n", hr, i);
}
else
{
hr = IDirect3DDevice7_GetRenderTarget(device, &rt);
- ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u).\n", hr, i);
}
for (j = 0; j < ARRAY_SIZE(tests); ++j)
{
- hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0);
- ok(SUCCEEDED(hr), "Failed to clear, hr %#x (i %u, j %u).\n", hr, i, j);
+ hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000,
+ tests[j].expected_z - z_eps, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_GREATER);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+
+ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, !i);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
hr = IDirect3DDevice7_SetViewport(device, &tests[j].vp);
if (tests[j].vp.dwX + tests[j].vp.dwWidth > rt_sizes[i].x
|| tests[j].vp.dwY + tests[j].vp.dwHeight > rt_sizes[i].y)
{
- ok(hr == E_INVALIDARG, "Setting the viewport returned unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
continue;
}
else
{
- ok(SUCCEEDED(hr), "Failed to set the viewport, hr %#x (i %u, j %u).\n", hr, i, j);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
}
hr = IDirect3DDevice7_BeginScene(device);
- ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x (i %u, j %u).\n", hr, i, j);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, quad, 4, 0);
- ok(SUCCEEDED(hr), "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
hr = IDirect3DDevice7_EndScene(device);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x (i %u, j %u).\n", hr, i, j);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
check_rect(rt, tests[j].expected_rect, tests[j].message);
+
+ if (!i)
+ {
+ hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000,
+ tests[j].expected_z + z_eps, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESS);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+
+ hr = IDirect3DDevice7_BeginScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+ hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, quad, 4, 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+ hr = IDirect3DDevice7_EndScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j);
+
+ check_rect(rt, tests[j].expected_rect, tests[j].message);
+ }
}
hr = IDirectDrawSurface7_DeleteAttachedSurface(rt, 0, ds);
- ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x (i %u).\n", hr, i);
+ ok(hr == DD_OK, "Got unexpected hr %#x (i %u).\n", hr, i);
IDirectDrawSurface7_Release(ds);
-
IDirectDrawSurface7_Release(rt);
}
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 3049be69ef..c3628362df 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3573,6 +3573,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO
struct lights_settings ls;
unsigned int vertex_size;
BOOL do_clip, lighting;
+ float min_z, max_z;
unsigned int i;
BYTE *dest_ptr;
HRESULT hr;
@@ -3656,6 +3657,8 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO
init_transformed_lights(&ls, state, device->adapter->d3d_info.wined3d_creation_flags
& WINED3D_LEGACY_FFP_LIGHTING, lighting);
+ wined3d_z_range_from_viewport(&min_z, &max_z, &vp);
+
for (i = 0; i < dwCount; ++i)
{
const struct wined3d_stream_info_element *position_element = &stream_info->elements[WINED3D_FFP_POSITION];
@@ -3728,11 +3731,11 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO
x *= vp.width / 2;
y *= vp.height / 2;
- z *= vp.max_z - vp.min_z;
+ z *= max_z - min_z;
x += vp.width / 2 + vp.x;
y += vp.height / 2 + vp.y;
- z += vp.min_z;
+ z += min_z;
rhw = 1 / rhw;
} else {
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 0f84cc22f7..e99dba208e 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4037,6 +4037,7 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine
{
const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info;
struct wined3d_viewport vp[WINED3D_MAX_VIEWPORTS];
+ float min_z, max_z;
if (gl_info->supported[ARB_VIEWPORT_ARRAY])
{
@@ -4048,8 +4049,9 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine
get_viewports(context, state, state->viewport_count, vp);
for (i = 0; i < state->viewport_count; ++i)
{
- depth_ranges[i * 2] = vp[i].min_z;
- depth_ranges[i * 2 + 1] = vp[i].max_z;
+ wined3d_z_range_from_viewport(&min_z, &max_z, &vp[i]);
+ depth_ranges[i * 2] = min_z;
+ depth_ranges[i * 2 + 1] = max_z;
viewports[i * 4] = vp[i].x;
viewports[i * 4 + 1] = vp[i].y;
@@ -4073,7 +4075,8 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine
else
{
get_viewports(context, state, 1, vp);
- gl_info->gl_ops.gl.p_glDepthRange(vp[0].min_z, vp[0].max_z);
+ wined3d_z_range_from_viewport(&min_z, &max_z, &vp[0]);
+ gl_info->gl_ops.gl.p_glDepthRange(min_z, max_z);
gl_info->gl_ops.gl.p_glViewport(vp[0].x, vp[0].y, vp[0].width, vp[0].height);
}
checkGLcall("setting clip space and viewport");
@@ -4090,6 +4093,7 @@ static void viewport_miscpart_cc(struct wined3d_context *context,
GLdouble depth_ranges[2 * WINED3D_MAX_VIEWPORTS];
GLfloat viewports[4 * WINED3D_MAX_VIEWPORTS];
unsigned int i, reset_count = 0;
+ float min_z, max_z;
get_viewports(context, state, state->viewport_count, vp);
@@ -4097,8 +4101,9 @@ static void viewport_miscpart_cc(struct wined3d_context *context,
for (i = 0; i < state->viewport_count; ++i)
{
- depth_ranges[i * 2] = vp[i].min_z;
- depth_ranges[i * 2 + 1] = vp[i].max_z;
+ wined3d_z_range_from_viewport(&min_z, &max_z, &vp[i]);
+ depth_ranges[i * 2] = min_z;
+ depth_ranges[i * 2 + 1] = max_z;
viewports[i * 4] = vp[i].x + pixel_center_offset;
viewports[i * 4 + 1] = vp[i].y + pixel_center_offset;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8ca2e73703..f52509488a 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -5345,6 +5345,14 @@ static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_stat
return FALSE;
}
+static inline void wined3d_z_range_from_viewport(float *min_z, float *max_z, const struct wined3d_viewport *vp)
+{
+ *min_z = vp->min_z;
+
+ /* The magic constant is derived from tests */
+ *max_z = vp->min_z + max(vp->max_z - vp->min_z, 0.001f);
+}
+
/* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */
#define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"
--
2.23.0
3
3
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
dlls/ddraw/tests/ddraw7.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 7c46f33cb7a..8875fde7f89 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -16593,7 +16593,7 @@ static void test_surface_format_conversion_alpha(void)
{16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}
},
"R5G6B5", 2, 4, 4, 0, TRUE,
- /* Looks broken for sysmem texture convertions on Windows (at
+ /* Looks broken for sysmem texture conversions on Windows (at
* least with hardware device), the result is either error from
* _Blt() or a copy of the source data without any conversion. */
},
--
2.21.0
5
13
18 Nov '19
Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
---
v2 (basically redid the whole thing):
- get rid of separate set_dirty() calls;
- do not update parameter data while recording blocks;
- record string parameters update as well.
v3:
- fix refcounting logic in _SetTexture(): current texture in param->data
is irrelevant when settign texture to parameter block.
dlls/d3dx9_36/effect.c | 242 +++++++++++++++++++++++++----------
dlls/d3dx9_36/tests/effect.c | 38 ++++--
2 files changed, 205 insertions(+), 75 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index d5b2c35937..7aba622e58 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -36,6 +36,7 @@ static const char parameter_block_magic_string[4] = {'@', '!', '#', '\xFE'};
#define PARAMETER_FLAG_SHARED 1
#define INITIAL_POOL_SIZE 16
+#define INITIAL_PARAM_BLOCK_SIZE 1024
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
@@ -153,6 +154,15 @@ struct d3dx_parameter_block
{
char magic_string[ARRAY_SIZE(parameter_block_magic_string)];
struct list entry;
+ size_t buffer_size;
+ size_t current_size;
+ BYTE *buffer;
+};
+
+struct d3dx_recorded_parameter
+{
+ struct d3dx_parameter *param;
+ unsigned int bytes;
};
struct d3dx_effect
@@ -704,11 +714,27 @@ static void free_technique(struct d3dx_technique *technique)
technique->name = NULL;
}
+static unsigned int get_recorded_parameter_size(const struct d3dx_recorded_parameter *record)
+{
+ return sizeof(*record) + record->bytes;
+}
+
static void free_parameter_block(struct d3dx_parameter_block *block)
{
+ struct d3dx_recorded_parameter *record;
+
if (!block)
return;
+ record = (struct d3dx_recorded_parameter *)block->buffer;
+ while ((BYTE *)record < block->buffer + block->current_size)
+ {
+ free_parameter_object_data(record->param, record + 1, record->bytes);
+ record = (struct d3dx_recorded_parameter *)((BYTE *)record + get_recorded_parameter_size(record));
+ }
+ assert((BYTE *)record == block->buffer + block->current_size);
+
+ heap_free(block->buffer);
heap_free(block);
}
@@ -776,14 +802,12 @@ static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector)
}
}
-static void set_vector(struct d3dx_parameter *param, const D3DXVECTOR4 *vector)
+static void set_vector(struct d3dx_parameter *param, const D3DXVECTOR4 *vector, void *dst_data)
{
UINT i;
for (i = 0; i < param->columns; ++i)
- {
- set_number((FLOAT *)param->data + i, param->type, (FLOAT *)vector + i, D3DXPT_FLOAT);
- }
+ set_number((FLOAT *)dst_data + i, param->type, (FLOAT *)vector + i, D3DXPT_FLOAT);
}
static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix, BOOL transpose)
@@ -804,31 +828,33 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix, BOOL tr
}
}
-static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix)
+static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix, void *dst_data)
{
UINT i, k;
if (param->type == D3DXPT_FLOAT)
{
if (param->columns == 4)
- memcpy(param->data, matrix->u.m, param->rows * 4 * sizeof(float));
+ {
+ memcpy(dst_data, matrix->u.m, param->rows * 4 * sizeof(float));
+ }
else
+ {
for (i = 0; i < param->rows; ++i)
- memcpy((float *)param->data + i * param->columns, matrix->u.m + i, param->columns * sizeof(float));
+ memcpy((float *)dst_data + i * param->columns, matrix->u.m + i, param->columns * sizeof(float));
+ }
return;
}
for (i = 0; i < param->rows; ++i)
{
for (k = 0; k < param->columns; ++k)
- {
- set_number((FLOAT *)param->data + i * param->columns + k, param->type,
+ set_number((FLOAT *)dst_data + i * param->columns + k, param->type,
&matrix->u.m[i][k], D3DXPT_FLOAT);
- }
}
}
-static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX *matrix)
+static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX *matrix, void *dst_data)
{
UINT i, k;
@@ -836,7 +862,7 @@ static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX
{
for (k = 0; k < param->columns; ++k)
{
- set_number((FLOAT *)param->data + i * param->columns + k, param->type,
+ set_number((FLOAT *)dst_data + i * param->columns + k, param->type,
&matrix->u.m[k][i], D3DXPT_FLOAT);
}
}
@@ -855,7 +881,8 @@ static HRESULT set_string(char **param_data, const char *string)
return D3D_OK;
}
-static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigned int bytes)
+static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigned int bytes,
+ void *dst_data)
{
unsigned int i, count;
@@ -871,7 +898,7 @@ static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigne
case D3DXPT_TEXTURECUBE:
for (i = 0; i < count; ++i)
{
- IUnknown *old_texture = ((IUnknown **)param->data)[i];
+ IUnknown *old_texture = ((IUnknown **)dst_data)[i];
IUnknown *new_texture = ((IUnknown **)data)[i];
if (new_texture == old_texture)
@@ -888,7 +915,7 @@ static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigne
case D3DXPT_INT:
case D3DXPT_FLOAT:
TRACE("Copy %u bytes.\n", bytes);
- memcpy(param->data, data, bytes);
+ memcpy(dst_data, data, bytes);
break;
case D3DXPT_STRING:
@@ -896,7 +923,7 @@ static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigne
HRESULT hr;
for (i = 0; i < count; ++i)
- if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i])))
+ if (FAILED(hr = set_string(&((char **)dst_data)[i], ((const char **)data)[i])))
return hr;
break;
}
@@ -1246,6 +1273,43 @@ static ULONG64 next_effect_update_version(struct d3dx_effect *effect)
return next_update_version(get_version_counter_ptr(effect));
}
+static void *record_parameter(struct d3dx_effect *effect, struct d3dx_parameter *param, unsigned int bytes)
+{
+ struct d3dx_parameter_block *block = effect->current_parameter_block;
+ struct d3dx_recorded_parameter new_record, *record;
+ unsigned int new_size, alloc_size;
+
+ new_record.param = param;
+ new_record.bytes = bytes;
+ new_size = block->current_size + get_recorded_parameter_size(&new_record);
+
+ if (new_size > block->buffer_size)
+ {
+ BYTE *new_alloc;
+
+ alloc_size = max(block->buffer_size * 2, max(new_size, INITIAL_PARAM_BLOCK_SIZE));
+ if (block->buffer_size)
+ new_alloc = heap_realloc(block->buffer, alloc_size);
+ else
+ new_alloc = heap_alloc(alloc_size);
+
+ if (!new_alloc)
+ {
+ ERR("Out of memory.\n");
+ return param->data;
+ }
+ /* Data update functions may want to free some references upon setting value. */
+ memset(new_alloc + block->buffer_size, 0, alloc_size - block->buffer_size);
+
+ block->buffer_size = alloc_size;
+ block->buffer = new_alloc;
+ }
+ record = (struct d3dx_recorded_parameter *)(block->buffer + block->current_size);
+ *record = new_record;
+ block->current_size = new_size;
+ return record + 1;
+}
+
static void set_dirty(struct d3dx_parameter *param)
{
struct d3dx_shared_data *shared_data;
@@ -1258,6 +1322,17 @@ static void set_dirty(struct d3dx_parameter *param)
top_param->update_version = new_update_version;
}
+static void *parameter_get_update_data(struct d3dx_effect *effect, struct d3dx_parameter *param,
+ unsigned int bytes, BOOL value_changed)
+{
+ assert(bytes <= param->bytes);
+
+ if (value_changed && !effect->current_parameter_block)
+ set_dirty(param);
+
+ return effect->current_parameter_block ? record_parameter(effect, param, bytes) : param->data;
+}
+
static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value)
{
static const struct
@@ -2362,10 +2437,7 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame
}
if (data && param->bytes <= bytes)
- {
- set_dirty(param);
- return set_value(param, data, bytes);
- }
+ return set_value(param, data, bytes, parameter_get_update_data(effect, param, param->bytes, TRUE));
WARN("Invalid argument specified.\n");
@@ -2446,8 +2518,8 @@ static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE paramet
if (param && !param->element_count && param->rows == 1 && param->columns == 1)
{
- set_number(param->data, param->type, &b, D3DXPT_BOOL);
- set_dirty(param);
+ set_number(parameter_get_update_data(effect, param, sizeof(int), TRUE),
+ param->type, &b, D3DXPT_BOOL);
return D3D_OK;
}
@@ -2479,6 +2551,7 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
+ void *data;
TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count);
@@ -2493,12 +2566,12 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
+ data = parameter_get_update_data(effect, param, size * sizeof(int), TRUE);
for (i = 0; i < size; ++i)
{
/* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */
- set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT);
+ set_number((DWORD *)data + i, param->type, &b[i], D3DXPT_INT);
}
- set_dirty(param);
return D3D_OK;
case D3DXPC_OBJECT:
@@ -2556,9 +2629,8 @@ static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE paramete
DWORD value;
set_number(&value, param->type, &n, D3DXPT_INT);
- if (value != *(DWORD *)param->data)
- set_dirty(param);
- *(DWORD *)param->data = value;
+ *(DWORD *)parameter_get_update_data(effect, param, sizeof(int),
+ value != *(DWORD *)param->data) = value;
return D3D_OK;
}
@@ -2567,14 +2639,19 @@ static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE paramete
&& ((param->class == D3DXPC_VECTOR && param->columns != 2)
|| (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1)))
{
+ void *data;
+
TRACE("Vector fixup.\n");
- *(float *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE;
- ((float *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE;
- ((float *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE;
+ data = parameter_get_update_data(effect, param,
+ min(4, param->rows * param->columns) * sizeof(float), TRUE);
+
+ *(float *)data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE;
+ ((float *)data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE;
+ ((float *)data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE;
if (param->rows * param->columns > 3)
- ((float *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE;
- set_dirty(param);
+ ((float *)data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE;
+
return D3D_OK;
}
}
@@ -2626,6 +2703,7 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
+ void *data;
TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count);
@@ -2640,9 +2718,9 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
+ data = parameter_get_update_data(effect, param, size * sizeof(int), TRUE);
for (i = 0; i < size; ++i)
- set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT);
- set_dirty(param);
+ set_number((DWORD *)data + i, param->type, &n[i], D3DXPT_INT);
return D3D_OK;
case D3DXPC_OBJECT:
@@ -2696,9 +2774,8 @@ static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parame
DWORD value;
set_number(&value, param->type, &f, D3DXPT_FLOAT);
- if (value != *(DWORD *)param->data)
- set_dirty(param);
- *(DWORD *)param->data = value;
+ *(DWORD *)parameter_get_update_data(effect, param, sizeof(float),
+ value != *(DWORD *)param->data) = value;
return D3D_OK;
}
@@ -2731,6 +2808,7 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
+ void *data;
TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count);
@@ -2745,9 +2823,9 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
+ data = parameter_get_update_data(effect, param, size * sizeof(float), TRUE);
for (i = 0; i < size; ++i)
- set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT);
- set_dirty(param);
+ set_number((DWORD *)data + i, param->type, &f[i], D3DXPT_FLOAT);
return D3D_OK;
case D3DXPC_OBJECT:
@@ -2804,7 +2882,6 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
- set_dirty(param);
if (param->type == D3DXPT_INT && param->bytes == 4)
{
DWORD tmp;
@@ -2815,16 +2892,17 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param
tmp += ((DWORD)(max(min(vector->x, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16;
tmp += ((DWORD)(max(min(vector->w, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24;
- *(int *)param->data = tmp;
+ *(int *)parameter_get_update_data(effect, param, sizeof(int), TRUE) = tmp;
return D3D_OK;
}
if (param->type == D3DXPT_FLOAT)
{
- memcpy(param->data, vector, param->columns * sizeof(float));
+ memcpy(parameter_get_update_data(effect, param, param->columns * sizeof(float), TRUE),
+ vector, param->columns * sizeof(float));
return D3D_OK;
}
- set_vector(param, vector);
+ set_vector(param, vector, parameter_get_update_data(effect, param, param->columns * sizeof(float), TRUE));
return D3D_OK;
case D3DXPC_MATRIX_ROWS:
@@ -2897,26 +2975,34 @@ static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE
if (param && param->element_count && param->element_count >= count)
{
unsigned int i;
+ BYTE *data;
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_VECTOR:
- set_dirty(param);
+ data = (BYTE *)parameter_get_update_data(effect, param,
+ count * param->columns * sizeof(float), TRUE);
+
if (param->type == D3DXPT_FLOAT)
{
if (param->columns == 4)
- memcpy(param->data, vector, count * 4 * sizeof(float));
+ {
+ memcpy(data, vector, count * 4 * sizeof(float));
+ }
else
+ {
for (i = 0; i < count; ++i)
- memcpy((float *)param->data + param->columns * i, vector + i,
+ memcpy((float *)data + param->columns * i, vector + i,
param->columns * sizeof(float));
+ }
return D3D_OK;
}
for (i = 0; i < count; ++i)
- set_vector(¶m->members[i], &vector[i]);
+ set_vector(¶m->members[i], &vector[i], data + i * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -2991,8 +3077,8 @@ static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE param
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_matrix(param, matrix);
- set_dirty(param);
+ set_matrix(param, matrix, parameter_get_update_data(effect, param,
+ param->rows * param->columns * sizeof(float), TRUE));
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3057,15 +3143,20 @@ static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE
if (param && param->element_count >= count)
{
unsigned int i;
+ BYTE *data;
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
+ data = parameter_get_update_data(effect, param, count * param->rows
+ * param->columns * sizeof(float), TRUE);
+
for (i = 0; i < count; ++i)
- set_matrix(¶m->members[i], &matrix[i]);
+ set_matrix(¶m->members[i], &matrix[i],
+ data + i * param->rows * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3137,13 +3228,18 @@ static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DX
if (param && count <= param->element_count)
{
unsigned int i;
+ BYTE *data;
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
+ data = parameter_get_update_data(effect, param, count * param->rows
+ * param->columns * sizeof(float), TRUE);
+
for (i = 0; i < count; ++i)
- set_matrix(¶m->members[i], matrix[i]);
+ set_matrix(¶m->members[i], matrix[i], data + i * param->rows
+ * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3217,8 +3313,8 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHAN
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
- set_matrix_transpose(param, matrix);
+ set_matrix_transpose(param, matrix, parameter_get_update_data(effect, param,
+ param->rows * param->columns * sizeof(float), TRUE));
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3287,15 +3383,20 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3
if (param && param->element_count >= count)
{
unsigned int i;
+ BYTE *data;
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
+ data = parameter_get_update_data(effect, param, count * param->rows
+ * param->columns * sizeof(float), TRUE);
+
for (i = 0; i < count; ++i)
- set_matrix_transpose(¶m->members[i], &matrix[i]);
+ set_matrix_transpose(¶m->members[i], &matrix[i], data
+ + i * param->rows * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3367,13 +3468,18 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposePointerArray(ID3DXEffect *if
if (param && count <= param->element_count)
{
unsigned int i;
+ BYTE *data;
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
+ data = parameter_get_update_data(effect, param, count * param->rows
+ * param->columns * sizeof(float), TRUE);
+
for (i = 0; i < count; ++i)
- set_matrix_transpose(¶m->members[i], matrix[i]);
+ set_matrix_transpose(¶m->members[i], matrix[i], data
+ + i * param->rows * param->columns * sizeof(float));
+
return D3D_OK;
case D3DXPC_SCALAR:
@@ -3440,10 +3546,7 @@ static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE param
TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string));
if (param && param->type == D3DXPT_STRING)
- {
- set_dirty(param);
- return set_string(param->data, string);
- }
+ return set_string(parameter_get_update_data(effect, param, sizeof(void *), TRUE), string);
WARN("Parameter not found.\n");
@@ -3482,7 +3585,11 @@ static HRESULT WINAPI d3dx_effect_SetTexture(ID3DXEffect *iface, D3DXHANDLE para
|| param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D
|| param->type == D3DXPT_TEXTURECUBE))
{
- IDirect3DBaseTexture9 *old_texture = *(IDirect3DBaseTexture9 **)param->data;
+ IDirect3DBaseTexture9 **data = parameter_get_update_data(effect, param,
+ sizeof(void *), texture != *(IDirect3DBaseTexture9 **)param->data);
+ IDirect3DBaseTexture9 *old_texture = *data;
+
+ *data = texture;
if (texture == old_texture)
return D3D_OK;
@@ -3492,9 +3599,6 @@ static HRESULT WINAPI d3dx_effect_SetTexture(ID3DXEffect *iface, D3DXHANDLE para
if (old_texture)
IDirect3DBaseTexture9_Release(old_texture);
- *(IDirect3DBaseTexture9 **)param->data = texture;
- set_dirty(param);
-
return D3D_OK;
}
@@ -4135,6 +4239,10 @@ static D3DXHANDLE WINAPI d3dx_effect_EndParameterBlock(ID3DXEffect *iface)
return NULL;
}
ret = effect->current_parameter_block;
+
+ ret->buffer = heap_realloc(ret->buffer, ret->current_size);
+ ret->buffer_size = ret->current_size;
+
effect->current_parameter_block = NULL;
list_add_tail(&effect->parameter_block_list, &ret->entry);
return (D3DXHANDLE)ret;
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index 86cad3e0cf..d86ae2acb5 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -8019,13 +8019,13 @@ static void test_effect_parameter_block(void)
static const float float_array_zero[4];
IDirect3DTexture9 *texture, *tex_test;
ID3DXEffect *effect, *effect2;
+ D3DXMATRIX mat, mat_arr[2];
D3DXHANDLE block, handle;
IDirect3DDevice9 *device;
ID3DXEffectPool *pool;
float float_array[4];
float float_value;
IDirect3D9 *d3d;
- D3DXMATRIX mat;
ULONG refcount;
HWND window;
HRESULT hr;
@@ -8112,9 +8112,7 @@ static void test_effect_parameter_block(void)
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetTexture(effect, "tex1", (IDirect3DBaseTexture9 **)&tex_test);
- todo_wine ok(hr == D3D_OK && !tex_test, "Got unexpected hr %#x, tex_test %p.\n", hr, tex_test);
- if (tex_test)
- IDirect3DTexture9_Release(tex_test);
+ ok(hr == D3D_OK && !tex_test, "Got unexpected hr %#x, tex_test %p.\n", hr, tex_test);
/* Child parameters and array members are recorded separately (the whole parameter is not
* updated when parameter block is applied).
@@ -8126,13 +8124,13 @@ static void test_effect_parameter_block(void)
hr = effect->lpVtbl->SetFloat(effect, "ts1[0].fv", 28.0f);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetFloat(effect, "ts1[0].fv", &float_value);
- todo_wine ok(hr == D3D_OK && float_value == 12.0, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
+ ok(hr == D3D_OK && float_value == 12.0, "Got unexpected hr %#x, float_value %g.\n", hr, float_value);
float_array[0] = -29.0f;
hr = effect->lpVtbl->SetFloatArray(effect, "ts1[0].v2", float_array, 1);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v2", float_array, 1);
- todo_wine ok(hr == D3D_OK && float_array[0] == 13.0, "Got unexpected hr %#x, float_array[0] %g.\n",
+ ok(hr == D3D_OK && float_array[0] == 13.0, "Got unexpected hr %#x, float_array[0] %g.\n",
hr, float_array[0]);
memset(&mat, 0, sizeof(mat));
@@ -8140,13 +8138,13 @@ static void test_effect_parameter_block(void)
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetMatrix(effect, "m3x2row", &mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- todo_wine ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n");
+ ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n");
hr = effect->lpVtbl->SetMatrix(effect, "m3x2column", &test_mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = effect->lpVtbl->GetMatrix(effect, "m3x2column", &mat);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- todo_wine ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n");
+ ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n");
hr = effect2->lpVtbl->SetFloat(effect2, "arr2[1]", -1.0f);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
@@ -8238,6 +8236,30 @@ static void test_effect_parameter_block(void)
refcount = pool->lpVtbl->Release(pool);
ok(!refcount, "Got unexpected refcount %u.\n", refcount);
+ hr = D3DXCreateEffect(device, test_effect_parameter_value_blob_float, sizeof(test_effect_parameter_value_blob_float),
+ NULL, NULL, 0, NULL, &effect, NULL);
+ hr = effect->lpVtbl->BeginParameterBlock(effect);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ mat_arr[0] = mat_arr[1] = test_mat;
+ hr = effect->lpVtbl->SetMatrixArray(effect, "f33_2", mat_arr, 2);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ block = effect->lpVtbl->EndParameterBlock(effect);
+ ok(!!block, "Got unexpected block %p.\n", block);
+
+ memset(mat_arr, 0, sizeof(mat_arr));
+ hr = effect->lpVtbl->SetMatrixArray(effect, "f33_2", mat_arr, 2);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ hr = effect->lpVtbl->ApplyParameterBlock(effect, block);
+ todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr);
+
+ hr = effect->lpVtbl->GetMatrixArray(effect, "f33_2", mat_arr, 2);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(!memcmp(&mat_arr[0], &test_mat, sizeof(test_mat))
+ && !memcmp(&mat_arr[1], &test_mat, sizeof(test_mat)), "Got unexpected matrix array.\n");
+
+ refcount = effect->lpVtbl->Release(effect);
+ ok(!refcount, "Got unexpected refcount %u.\n", refcount);
+
refcount = IDirect3DDevice9_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);
IDirect3D9_Release(d3d);
--
2.23.0
2
2
[PATCH] msvcp140/tests: Test _Stat() against the actual permissions of the system directory.
by Sven Baars 18 Nov '19
by Sven Baars 18 Nov '19
18 Nov '19
Signed-off-by: Sven Baars <sven.wine(a)gmail.com>
---
Supercedes 173786
dlls/msvcp140/tests/msvcp140.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c
index 8ad172495d..751b1beed8 100644
--- a/dlls/msvcp140/tests/msvcp140.c
+++ b/dlls/msvcp140/tests/msvcp140.c
@@ -786,8 +786,9 @@ static void test_Current_set(void)
static void test_Stat(void)
{
- int i, perms, ret;
+ int i, perms, expected_perms, ret;
HANDLE file;
+ DWORD attr;
enum file_type val;
WCHAR test_dirW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r',0};
WCHAR test_f1W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0};
@@ -889,10 +890,12 @@ static void test_Stat(void)
}
GetSystemDirectoryW(sys_path, MAX_PATH);
+ attr = GetFileAttributesW(sys_path);
+ expected_perms = (attr & FILE_ATTRIBUTE_READONLY) ? 0555 : 0777;
perms = 0xdeadbeef;
val = p_Stat(sys_path, &perms);
ok(directory_file == val, "_Stat(): expect: regular, got %d\n", val);
- ok(0777 == perms, "_Stat(): perms expect: 0777, got 0%o\n", perms);
+ ok(perms == expected_perms, "_Stat(): perms expect: 0%o, got 0%o\n", expected_perms, perms);
if(ret) {
todo_wine ok(DeleteFileW(test_f1_linkW), "expect wine_test_dir/f1_link to exist\n");
--
2.17.1
2
1
[PATCH 2/2] kernel32: Autoinitialize geographic values when launching any program.
by João Diogo Ferreira 18 Nov '19
by João Diogo Ferreira 18 Nov '19
18 Nov '19
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46196
Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt>
---
V8: Use a fallback in case we don't get the right nation ID.
Supersedes: 173826
---
dlls/kernel32/kernel_main.c | 3 +++
dlls/kernel32/kernel_private.h | 1 +
dlls/kernel32/locale.c | 12 ++++++++++++
3 files changed, 16 insertions(+)
diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c
index dfa66f0295..206972c210 100644
--- a/dlls/kernel32/kernel_main.c
+++ b/dlls/kernel32/kernel_main.c
@@ -88,6 +88,9 @@ static BOOL process_attach( HMODULE module )
/* Setup registry locale information */
LOCALE_InitRegistry();
+ /* Setup registry geographic information */
+ LOCALE_InitGeo();
+
/* Setup registry timezone information */
TIMEZONE_InitRegistry();
diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h
index cd6c63efa3..e9f5f51029 100644
--- a/dlls/kernel32/kernel_private.h
+++ b/dlls/kernel32/kernel_private.h
@@ -75,6 +75,7 @@ extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN;
/* locale.c */
extern void LOCALE_Init(void) DECLSPEC_HIDDEN;
extern void LOCALE_InitRegistry(void) DECLSPEC_HIDDEN;
+extern void LOCALE_InitGeo(void) DECLSPEC_HIDDEN;
/* time.c */
extern void TIMEZONE_InitRegistry(void) DECLSPEC_HIDDEN;
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index 0f91728e84..208c792e39 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -845,6 +845,18 @@ void LOCALE_InitRegistry(void)
NtClose( hkey );
}
+/* Initialize the geographic information in the registry. */
+void LOCALE_InitGeo(void)
+{
+ GEOID id = GEOID_NOT_AVAILABLE;
+ static const GEOID fallback = 244; /* United States */
+
+ GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_IGEOID|LOCALE_RETURN_NUMBER,
+ (WCHAR *)&id, sizeof(id) / sizeof(WCHAR));
+
+ if (!SetUserGeoID(id) || GetUserGeoID(GEOCLASS_NATION) == GEOID_NOT_AVAILABLE)
+ SetUserGeoID(fallback);
+}
#ifdef __APPLE__
/***********************************************************************
--
2.24.0
2
1
Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr>
--
See
https://jira.reactos.org/browse/CORE-11713
---
dlls/shell32/classes.c | 7 ++++++-
dlls/shell32/folders.c | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c
index 653b551..4e57125 100644
--- a/dlls/shell32/classes.c
+++ b/dlls/shell32/classes.c
@@ -309,7 +309,12 @@ BOOL HCR_GetDefaultIconA(LPCSTR szClass, LPSTR szDest, DWORD len, int* picon_idx
ret = HCR_RegGetDefaultIconA(hkey, szDest, len, picon_idx);
RegCloseKey(hkey);
}
- TRACE("-- %s %i\n", szDest, *picon_idx);
+
+ if (ret)
+ TRACE("-- %s %i\n", szDest, *picon_idx);
+ else
+ TRACE("-- not found\n");
+
return ret;
}
diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c
index 5bb1a33..d429075 100644
--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -248,7 +248,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN
{
static const WCHAR drive[] = { 'D','r','i','v','e',0 };
- int icon_idx = -1;
+ icon_idx = -1;
if (_ILGetDrive(pSimplePidl, sTemp, MAX_PATH))
{
--
2.10.0.windows.1
1
0
18 Nov '19
Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt>
---
These GeoIDs were taken from Wine's own geoinfodata array via a script,
so they should match with Windows (and do for the handful I tested.)
V8: Fix enb.nls. The remaining should be good though.
Supersedes: 173825
---
dlls/kernel32/nls/afk.nls | 1 +
dlls/kernel32/nls/ara.nls | 1 +
dlls/kernel32/nls/arb.nls | 1 +
dlls/kernel32/nls/are.nls | 1 +
dlls/kernel32/nls/arg.nls | 1 +
dlls/kernel32/nls/arh.nls | 1 +
dlls/kernel32/nls/ari.nls | 1 +
dlls/kernel32/nls/arj.nls | 1 +
dlls/kernel32/nls/ark.nls | 1 +
dlls/kernel32/nls/arl.nls | 1 +
dlls/kernel32/nls/arm.nls | 1 +
dlls/kernel32/nls/aro.nls | 1 +
dlls/kernel32/nls/arq.nls | 1 +
dlls/kernel32/nls/ars.nls | 1 +
dlls/kernel32/nls/art.nls | 1 +
dlls/kernel32/nls/aru.nls | 1 +
dlls/kernel32/nls/ary.nls | 1 +
dlls/kernel32/nls/ast.nls | 1 +
dlls/kernel32/nls/aze.nls | 1 +
dlls/kernel32/nls/azl.nls | 1 +
dlls/kernel32/nls/bel.nls | 1 +
dlls/kernel32/nls/ben.nls | 1 +
dlls/kernel32/nls/bgr.nls | 1 +
dlls/kernel32/nls/brf.nls | 1 +
dlls/kernel32/nls/cat.nls | 1 +
dlls/kernel32/nls/chs.nls | 1 +
dlls/kernel32/nls/cht.nls | 1 +
dlls/kernel32/nls/cor.nls | 1 +
dlls/kernel32/nls/csy.nls | 1 +
dlls/kernel32/nls/cym.nls | 1 +
dlls/kernel32/nls/dan.nls | 1 +
dlls/kernel32/nls/dea.nls | 1 +
dlls/kernel32/nls/dec.nls | 1 +
dlls/kernel32/nls/del.nls | 1 +
dlls/kernel32/nls/des.nls | 1 +
dlls/kernel32/nls/deu.nls | 1 +
dlls/kernel32/nls/div.nls | 1 +
dlls/kernel32/nls/ell.nls | 1 +
dlls/kernel32/nls/ena.nls | 1 +
dlls/kernel32/nls/enb.nls | 1 +
dlls/kernel32/nls/enc.nls | 1 +
dlls/kernel32/nls/eng.nls | 1 +
dlls/kernel32/nls/eni.nls | 1 +
dlls/kernel32/nls/enj.nls | 1 +
dlls/kernel32/nls/enl.nls | 1 +
dlls/kernel32/nls/enp.nls | 1 +
dlls/kernel32/nls/ens.nls | 1 +
dlls/kernel32/nls/ent.nls | 1 +
dlls/kernel32/nls/enu.nls | 1 +
dlls/kernel32/nls/enw.nls | 1 +
dlls/kernel32/nls/enz.nls | 1 +
dlls/kernel32/nls/eox.nls | 1 +
dlls/kernel32/nls/esa.nls | 1 +
dlls/kernel32/nls/esb.nls | 1 +
dlls/kernel32/nls/esc.nls | 1 +
dlls/kernel32/nls/esd.nls | 1 +
dlls/kernel32/nls/ese.nls | 1 +
dlls/kernel32/nls/esf.nls | 1 +
dlls/kernel32/nls/esg.nls | 1 +
dlls/kernel32/nls/esh.nls | 1 +
dlls/kernel32/nls/esi.nls | 1 +
dlls/kernel32/nls/esl.nls | 1 +
dlls/kernel32/nls/esm.nls | 1 +
dlls/kernel32/nls/esn.nls | 1 +
dlls/kernel32/nls/eso.nls | 1 +
dlls/kernel32/nls/esp.nls | 1 +
dlls/kernel32/nls/esr.nls | 1 +
dlls/kernel32/nls/ess.nls | 1 +
dlls/kernel32/nls/esu.nls | 1 +
dlls/kernel32/nls/esv.nls | 1 +
dlls/kernel32/nls/esy.nls | 1 +
dlls/kernel32/nls/esz.nls | 1 +
dlls/kernel32/nls/eti.nls | 1 +
dlls/kernel32/nls/euq.nls | 1 +
dlls/kernel32/nls/far.nls | 1 +
dlls/kernel32/nls/fin.nls | 1 +
dlls/kernel32/nls/fos.nls | 1 +
dlls/kernel32/nls/fra.nls | 1 +
dlls/kernel32/nls/frb.nls | 1 +
dlls/kernel32/nls/frc.nls | 1 +
dlls/kernel32/nls/frl.nls | 1 +
dlls/kernel32/nls/frm.nls | 1 +
dlls/kernel32/nls/frs.nls | 1 +
dlls/kernel32/nls/gae.nls | 1 +
dlls/kernel32/nls/gdh.nls | 1 +
dlls/kernel32/nls/gdv.nls | 1 +
dlls/kernel32/nls/glc.nls | 1 +
dlls/kernel32/nls/guj.nls | 1 +
dlls/kernel32/nls/heb.nls | 1 +
dlls/kernel32/nls/hin.nls | 1 +
dlls/kernel32/nls/hrv.nls | 1 +
dlls/kernel32/nls/hun.nls | 1 +
dlls/kernel32/nls/hye.nls | 1 +
dlls/kernel32/nls/ind.nls | 1 +
dlls/kernel32/nls/isl.nls | 1 +
dlls/kernel32/nls/ita.nls | 1 +
dlls/kernel32/nls/its.nls | 1 +
dlls/kernel32/nls/ivl.nls | 1 +
dlls/kernel32/nls/jpn.nls | 1 +
dlls/kernel32/nls/kan.nls | 1 +
dlls/kernel32/nls/kat.nls | 1 +
dlls/kernel32/nls/kkz.nls | 1 +
dlls/kernel32/nls/knk.nls | 1 +
dlls/kernel32/nls/kor.nls | 1 +
dlls/kernel32/nls/kyr.nls | 1 +
dlls/kernel32/nls/lth.nls | 1 +
dlls/kernel32/nls/lvi.nls | 1 +
dlls/kernel32/nls/mar.nls | 1 +
dlls/kernel32/nls/mki.nls | 1 +
dlls/kernel32/nls/mon.nls | 1 +
dlls/kernel32/nls/msb.nls | 1 +
dlls/kernel32/nls/msl.nls | 1 +
dlls/kernel32/nls/nep.nls | 1 +
dlls/kernel32/nls/nlb.nls | 1 +
dlls/kernel32/nls/nld.nls | 1 +
dlls/kernel32/nls/nls.nls | 1 +
dlls/kernel32/nls/non.nls | 1 +
dlls/kernel32/nls/nor.nls | 1 +
dlls/kernel32/nls/pan.nls | 1 +
dlls/kernel32/nls/plk.nls | 1 +
dlls/kernel32/nls/ptb.nls | 1 +
dlls/kernel32/nls/ptg.nls | 1 +
dlls/kernel32/nls/rmc.nls | 1 +
dlls/kernel32/nls/rom.nls | 1 +
dlls/kernel32/nls/rus.nls | 1 +
dlls/kernel32/nls/san.nls | 1 +
dlls/kernel32/nls/sin.nls | 1 +
dlls/kernel32/nls/sky.nls | 1 +
dlls/kernel32/nls/slv.nls | 1 +
dlls/kernel32/nls/sqi.nls | 1 +
dlls/kernel32/nls/srb.nls | 1 +
dlls/kernel32/nls/srl.nls | 1 +
dlls/kernel32/nls/sve.nls | 1 +
dlls/kernel32/nls/svf.nls | 1 +
dlls/kernel32/nls/swk.nls | 1 +
dlls/kernel32/nls/syr.nls | 1 +
dlls/kernel32/nls/tam.nls | 1 +
dlls/kernel32/nls/tel.nls | 1 +
dlls/kernel32/nls/tha.nls | 1 +
dlls/kernel32/nls/trk.nls | 1 +
dlls/kernel32/nls/ttt.nls | 1 +
dlls/kernel32/nls/ukr.nls | 1 +
dlls/kernel32/nls/urd.nls | 1 +
dlls/kernel32/nls/uzb.nls | 1 +
dlls/kernel32/nls/uzl.nls | 1 +
dlls/kernel32/nls/vit.nls | 1 +
dlls/kernel32/nls/wal.nls | 1 +
dlls/kernel32/nls/zhh.nls | 1 +
dlls/kernel32/nls/zhi.nls | 1 +
dlls/kernel32/nls/zhm.nls | 1 +
150 files changed, 150 insertions(+)
diff --git a/dlls/kernel32/nls/afk.nls b/dlls/kernel32/nls/afk.nls
index 359368d1b8..aa33aa06d5 100644
--- a/dlls/kernel32/nls/afk.nls
+++ b/dlls/kernel32/nls/afk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "209"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0436"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ara.nls b/dlls/kernel32/nls/ara.nls
index db475ec95f..ff63164d47 100644
--- a/dlls/kernel32/nls/ara.nls
+++ b/dlls/kernel32/nls/ara.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "205"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0401"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arb.nls b/dlls/kernel32/nls/arb.nls
index e2ee977275..fb854ac44c 100644
--- a/dlls/kernel32/nls/arb.nls
+++ b/dlls/kernel32/nls/arb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LEBANON
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "139"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3001"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/are.nls b/dlls/kernel32/nls/are.nls
index 861ddc7f39..b044d3299b 100644
--- a/dlls/kernel32/nls/are.nls
+++ b/dlls/kernel32/nls/are.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "67"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "0c01"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arg.nls b/dlls/kernel32/nls/arg.nls
index 0d8f64cd12..6c10551f01 100644
--- a/dlls/kernel32/nls/arg.nls
+++ b/dlls/kernel32/nls/arg.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_ALGERIA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "4"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1401"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arh.nls b/dlls/kernel32/nls/arh.nls
index 08a4c40fcf..ce2fe000d4 100644
--- a/dlls/kernel32/nls/arh.nls
+++ b/dlls/kernel32/nls/arh.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "17"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "3c01"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ari.nls b/dlls/kernel32/nls/ari.nls
index 56d6b0a66a..466fa2540b 100644
--- a/dlls/kernel32/nls/ari.nls
+++ b/dlls/kernel32/nls/ari.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_IRAQ
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "121"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0801"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arj.nls b/dlls/kernel32/nls/arj.nls
index 6de87ba1d7..fc4f15c509 100644
--- a/dlls/kernel32/nls/arj.nls
+++ b/dlls/kernel32/nls/arj.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "126"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "2c01"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ark.nls b/dlls/kernel32/nls/ark.nls
index 5714cb2016..9086b62226 100644
--- a/dlls/kernel32/nls/ark.nls
+++ b/dlls/kernel32/nls/ark.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_KUWAIT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "136"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "3401"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arl.nls b/dlls/kernel32/nls/arl.nls
index b355537860..22bde6893f 100644
--- a/dlls/kernel32/nls/arl.nls
+++ b/dlls/kernel32/nls/arl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LIBYA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "148"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1001"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arm.nls b/dlls/kernel32/nls/arm.nls
index 4655544a94..8ac926550a 100644
--- a/dlls/kernel32/nls/arm.nls
+++ b/dlls/kernel32/nls/arm.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_MOROCCO
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "159"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1801"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/aro.nls b/dlls/kernel32/nls/aro.nls
index f05719620e..953b761de7 100644
--- a/dlls/kernel32/nls/aro.nls
+++ b/dlls/kernel32/nls/aro.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_OMAN
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "164"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2001"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arq.nls b/dlls/kernel32/nls/arq.nls
index 328455231c..25ac8b9132 100644
--- a/dlls/kernel32/nls/arq.nls
+++ b/dlls/kernel32/nls/arq.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_QATAR
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "197"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "4001"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ars.nls b/dlls/kernel32/nls/ars.nls
index f0c22ed5dc..803ca07118 100644
--- a/dlls/kernel32/nls/ars.nls
+++ b/dlls/kernel32/nls/ars.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "222"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2801"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/art.nls b/dlls/kernel32/nls/art.nls
index 6c8335d265..55e34ac77f 100644
--- a/dlls/kernel32/nls/art.nls
+++ b/dlls/kernel32/nls/art.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "234"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "1c01"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/aru.nls b/dlls/kernel32/nls/aru.nls
index 7e431370f5..d519b38bdd 100644
--- a/dlls/kernel32/nls/aru.nls
+++ b/dlls/kernel32/nls/aru.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_UAE
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "224"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3801"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ary.nls b/dlls/kernel32/nls/ary.nls
index c51b59f5d5..0cb1bb88b6 100644
--- a/dlls/kernel32/nls/ary.nls
+++ b/dlls/kernel32/nls/ary.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_YEMEN
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "261"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2401"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ast.nls b/dlls/kernel32/nls/ast.nls
index f4a0489abe..4a6a77aa72 100644
--- a/dlls/kernel32/nls/ast.nls
+++ b/dlls/kernel32/nls/ast.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "04a5"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/aze.nls b/dlls/kernel32/nls/aze.nls
index a9b093e787..e2860d088f 100644
--- a/dlls/kernel32/nls/aze.nls
+++ b/dlls/kernel32/nls/aze.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "5"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "082c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/azl.nls b/dlls/kernel32/nls/azl.nls
index f6a237b6ee..86d49a6b5f 100644
--- a/dlls/kernel32/nls/azl.nls
+++ b/dlls/kernel32/nls/azl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "5"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/bel.nls b/dlls/kernel32/nls/bel.nls
index d390871163..e6cc7a58df 100644
--- a/dlls/kernel32/nls/bel.nls
+++ b/dlls/kernel32/nls/bel.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "29"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0423"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ben.nls b/dlls/kernel32/nls/ben.nls
index f1031b09a7..bead15abaf 100644
--- a/dlls/kernel32/nls/ben.nls
+++ b/dlls/kernel32/nls/ben.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_BANGLA, SUBLANG_BANGLA_INDIA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0445"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/bgr.nls b/dlls/kernel32/nls/bgr.nls
index 4951098a1d..5f1f0e6697 100644
--- a/dlls/kernel32/nls/bgr.nls
+++ b/dlls/kernel32/nls/bgr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "35"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0402"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/brf.nls b/dlls/kernel32/nls/brf.nls
index e0dcf12e89..06862e665c 100644
--- a/dlls/kernel32/nls/brf.nls
+++ b/dlls/kernel32/nls/brf.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "84"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0493"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/cat.nls b/dlls/kernel32/nls/cat.nls
index b58cd75c27..5f1fa43e02 100644
--- a/dlls/kernel32/nls/cat.nls
+++ b/dlls/kernel32/nls/cat.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0403"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/chs.nls b/dlls/kernel32/nls/chs.nls
index 2829e52d66..c7f6114768 100644
--- a/dlls/kernel32/nls/chs.nls
+++ b/dlls/kernel32/nls/chs.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "45"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0804"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/cht.nls b/dlls/kernel32/nls/cht.nls
index b8bac7be3e..1cfeb840f0 100644
--- a/dlls/kernel32/nls/cht.nls
+++ b/dlls/kernel32/nls/cht.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "237"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0404"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/cor.nls b/dlls/kernel32/nls/cor.nls
index 535239aaf6..36c7e7f234 100644
--- a/dlls/kernel32/nls/cor.nls
+++ b/dlls/kernel32/nls/cor.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_CORNISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "242"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0492"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/csy.nls b/dlls/kernel32/nls/csy.nls
index 4cfb2afd4d..d03494e4cd 100644
--- a/dlls/kernel32/nls/csy.nls
+++ b/dlls/kernel32/nls/csy.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "75"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0405"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/cym.nls b/dlls/kernel32/nls/cym.nls
index 9d0f272ef2..41a25c415b 100644
--- a/dlls/kernel32/nls/cym.nls
+++ b/dlls/kernel32/nls/cym.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "242"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0492"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/dan.nls b/dlls/kernel32/nls/dan.nls
index 444e5a78d2..3e567cd333 100644
--- a/dlls/kernel32/nls/dan.nls
+++ b/dlls/kernel32/nls/dan.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "61"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0406"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/dea.nls b/dlls/kernel32/nls/dea.nls
index 0caf414af0..f97ae8ebe3 100644
--- a/dlls/kernel32/nls/dea.nls
+++ b/dlls/kernel32/nls/dea.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "14"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c07"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/dec.nls b/dlls/kernel32/nls/dec.nls
index ee3a95cdf2..b6b492b84d 100644
--- a/dlls/kernel32/nls/dec.nls
+++ b/dlls/kernel32/nls/dec.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "145"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1407"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/del.nls b/dlls/kernel32/nls/del.nls
index b92df675fa..6a7258d9fe 100644
--- a/dlls/kernel32/nls/del.nls
+++ b/dlls/kernel32/nls/del.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "147"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1007"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/des.nls b/dlls/kernel32/nls/des.nls
index f67f1d7bd8..bb6fed059c 100644
--- a/dlls/kernel32/nls/des.nls
+++ b/dlls/kernel32/nls/des.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "223"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0807"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/deu.nls b/dlls/kernel32/nls/deu.nls
index 66c0554032..b02639801b 100644
--- a/dlls/kernel32/nls/deu.nls
+++ b/dlls/kernel32/nls/deu.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "94"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0407"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/div.nls b/dlls/kernel32/nls/div.nls
index e8b1c72830..1c7989e006 100644
--- a/dlls/kernel32/nls/div.nls
+++ b/dlls/kernel32/nls/div.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_DIVEHI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "165"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0465"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ell.nls b/dlls/kernel32/nls/ell.nls
index cb129e75ad..d86fe9e473 100644
--- a/dlls/kernel32/nls/ell.nls
+++ b/dlls/kernel32/nls/ell.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "98"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0408"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ena.nls b/dlls/kernel32/nls/ena.nls
index e57be4732d..f34a20b96d 100644
--- a/dlls/kernel32/nls/ena.nls
+++ b/dlls/kernel32/nls/ena.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "12"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c09"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/enb.nls b/dlls/kernel32/nls/enb.nls
index 164c94ebf2..8b09c536c2 100644
--- a/dlls/kernel32/nls/enb.nls
+++ b/dlls/kernel32/nls/enb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "10039880"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2409"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/enc.nls b/dlls/kernel32/nls/enc.nls
index 01b4b8af7a..0f3a394263 100644
--- a/dlls/kernel32/nls/enc.nls
+++ b/dlls/kernel32/nls/enc.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "39"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1009"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/eng.nls b/dlls/kernel32/nls/eng.nls
index 72cac4180c..779bd0ae6d 100644
--- a/dlls/kernel32/nls/eng.nls
+++ b/dlls/kernel32/nls/eng.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "242"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0809"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/eni.nls b/dlls/kernel32/nls/eni.nls
index 31c137512c..9796b0f6cd 100644
--- a/dlls/kernel32/nls/eni.nls
+++ b/dlls/kernel32/nls/eni.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_EIRE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "68"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1809"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/enj.nls b/dlls/kernel32/nls/enj.nls
index 9b1afeec61..36134691ef 100644
--- a/dlls/kernel32/nls/enj.nls
+++ b/dlls/kernel32/nls/enj.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_JAMAICA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "124"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2009"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/enl.nls b/dlls/kernel32/nls/enl.nls
index 6bbe6d9952..ee78870cc8 100644
--- a/dlls/kernel32/nls/enl.nls
+++ b/dlls/kernel32/nls/enl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_BELIZE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "24"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2809"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/enp.nls b/dlls/kernel32/nls/enp.nls
index 8f4cd835ea..5af8b97efc 100644
--- a/dlls/kernel32/nls/enp.nls
+++ b/dlls/kernel32/nls/enp.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_PHILIPPINES
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "201"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3409"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/ens.nls b/dlls/kernel32/nls/ens.nls
index e94af6370e..ee2403196f 100644
--- a/dlls/kernel32/nls/ens.nls
+++ b/dlls/kernel32/nls/ens.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "209"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1c09"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ent.nls b/dlls/kernel32/nls/ent.nls
index b0e849101c..48bfb26b15 100644
--- a/dlls/kernel32/nls/ent.nls
+++ b/dlls/kernel32/nls/ent.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "225"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2c09"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/enu.nls b/dlls/kernel32/nls/enu.nls
index 6a5a63b155..527d6430f0 100644
--- a/dlls/kernel32/nls/enu.nls
+++ b/dlls/kernel32/nls/enu.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "244"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0409"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/enw.nls b/dlls/kernel32/nls/enw.nls
index de51ae2f8b..1ba782fc32 100644
--- a/dlls/kernel32/nls/enw.nls
+++ b/dlls/kernel32/nls/enw.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_ZIMBABWE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "264"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3009"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/enz.nls b/dlls/kernel32/nls/enz.nls
index cc2532454a..e4571a765b 100644
--- a/dlls/kernel32/nls/enz.nls
+++ b/dlls/kernel32/nls/enz.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_NZ
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "183"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1409"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls
index f67c955fde..bbd617eac4 100644
--- a/dlls/kernel32/nls/eox.nls
+++ b/dlls/kernel32/nls/eox.nls
@@ -56,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "39070" /* World */
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "048f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esa.nls b/dlls/kernel32/nls/esa.nls
index f89e234f83..a311d796eb 100644
--- a/dlls/kernel32/nls/esa.nls
+++ b/dlls/kernel32/nls/esa.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PANAMA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "192"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "180a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esb.nls b/dlls/kernel32/nls/esb.nls
index ef5c4300b2..ce95402300 100644
--- a/dlls/kernel32/nls/esb.nls
+++ b/dlls/kernel32/nls/esb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "26"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "400a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esc.nls b/dlls/kernel32/nls/esc.nls
index 8eccd4c137..60ed24e706 100644
--- a/dlls/kernel32/nls/esc.nls
+++ b/dlls/kernel32/nls/esc.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "54"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "140a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esd.nls b/dlls/kernel32/nls/esd.nls
index d956d0cd65..93b6bb0005 100644
--- a/dlls/kernel32/nls/esd.nls
+++ b/dlls/kernel32/nls/esd.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "65"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ese.nls b/dlls/kernel32/nls/ese.nls
index e2f9f5ab91..a68c027440 100644
--- a/dlls/kernel32/nls/ese.nls
+++ b/dlls/kernel32/nls/ese.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "72"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "440a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esf.nls b/dlls/kernel32/nls/esf.nls
index a70f5e249d..65f47d73a2 100644
--- a/dlls/kernel32/nls/esf.nls
+++ b/dlls/kernel32/nls/esf.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ECUADOR
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "66"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "300a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esg.nls b/dlls/kernel32/nls/esg.nls
index 2b6138960c..a9c9a8a860 100644
--- a/dlls/kernel32/nls/esg.nls
+++ b/dlls/kernel32/nls/esg.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "99"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "100a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esh.nls b/dlls/kernel32/nls/esh.nls
index 8d329cebc8..5593836b44 100644
--- a/dlls/kernel32/nls/esh.nls
+++ b/dlls/kernel32/nls/esh.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_HONDURAS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "106"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "480a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esi.nls b/dlls/kernel32/nls/esi.nls
index 6ba9a78786..ac4bdb79d0 100644
--- a/dlls/kernel32/nls/esi.nls
+++ b/dlls/kernel32/nls/esi.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "182"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "4c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esl.nls b/dlls/kernel32/nls/esl.nls
index 9b5c16d72b..57f35643b6 100644
--- a/dlls/kernel32/nls/esl.nls
+++ b/dlls/kernel32/nls/esl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_CHILE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "46"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "340a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esm.nls b/dlls/kernel32/nls/esm.nls
index 09f246504b..8c404f1733 100644
--- a/dlls/kernel32/nls/esm.nls
+++ b/dlls/kernel32/nls/esm.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "166"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "080a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esn.nls b/dlls/kernel32/nls/esn.nls
index 373445cabf..0cb88fa366 100644
--- a/dlls/kernel32/nls/esn.nls
+++ b/dlls/kernel32/nls/esn.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/eso.nls b/dlls/kernel32/nls/eso.nls
index d1831c4bc9..9f7131066a 100644
--- a/dlls/kernel32/nls/eso.nls
+++ b/dlls/kernel32/nls/eso.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "51"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "240a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esp.nls b/dlls/kernel32/nls/esp.nls
index c80b650ea3..a557a52b7d 100644
--- a/dlls/kernel32/nls/esp.nls
+++ b/dlls/kernel32/nls/esp.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esr.nls b/dlls/kernel32/nls/esr.nls
index 050e5e9f7b..752120dadf 100644
--- a/dlls/kernel32/nls/esr.nls
+++ b/dlls/kernel32/nls/esr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PERU
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "187"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "280a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ess.nls b/dlls/kernel32/nls/ess.nls
index c10084416b..30c96a0bf7 100644
--- a/dlls/kernel32/nls/ess.nls
+++ b/dlls/kernel32/nls/ess.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "11"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esu.nls b/dlls/kernel32/nls/esu.nls
index 25e5792edc..eb2ec3b04a 100644
--- a/dlls/kernel32/nls/esu.nls
+++ b/dlls/kernel32/nls/esu.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "202"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "500a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esv.nls b/dlls/kernel32/nls/esv.nls
index baa4396841..155ebef33c 100644
--- a/dlls/kernel32/nls/esv.nls
+++ b/dlls/kernel32/nls/esv.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "249"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "200a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esy.nls b/dlls/kernel32/nls/esy.nls
index 41d5f48480..9444f436a1 100644
--- a/dlls/kernel32/nls/esy.nls
+++ b/dlls/kernel32/nls/esy.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_URUGUAY
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "246"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "380a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esz.nls b/dlls/kernel32/nls/esz.nls
index 34c321bc66..82eb4241b2 100644
--- a/dlls/kernel32/nls/esz.nls
+++ b/dlls/kernel32/nls/esz.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "185"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/eti.nls b/dlls/kernel32/nls/eti.nls
index 31b8aa0349..8d7f0fe39c 100644
--- a/dlls/kernel32/nls/eti.nls
+++ b/dlls/kernel32/nls/eti.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "70"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0425"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/euq.nls b/dlls/kernel32/nls/euq.nls
index f5570f02cc..38d34312ea 100644
--- a/dlls/kernel32/nls/euq.nls
+++ b/dlls/kernel32/nls/euq.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042d"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls
index c67b78ae3c..ddc4495f77 100644
--- a/dlls/kernel32/nls/far.nls
+++ b/dlls/kernel32/nls/far.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "116"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0429"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/fin.nls b/dlls/kernel32/nls/fin.nls
index bc1221dcb3..29b7d2e897 100644
--- a/dlls/kernel32/nls/fin.nls
+++ b/dlls/kernel32/nls/fin.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "77"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040b"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/fos.nls b/dlls/kernel32/nls/fos.nls
index ad74d06ae6..5d53bcc81f 100644
--- a/dlls/kernel32/nls/fos.nls
+++ b/dlls/kernel32/nls/fos.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FAEROESE, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "81"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0438"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/fra.nls b/dlls/kernel32/nls/fra.nls
index 7a2da391dd..9a588a932e 100644
--- a/dlls/kernel32/nls/fra.nls
+++ b/dlls/kernel32/nls/fra.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "84"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frb.nls b/dlls/kernel32/nls/frb.nls
index 904e8e7f2e..7ee0b29751 100644
--- a/dlls/kernel32/nls/frb.nls
+++ b/dlls/kernel32/nls/frb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "21"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "080c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frc.nls b/dlls/kernel32/nls/frc.nls
index 8626473fc6..79eac11d96 100644
--- a/dlls/kernel32/nls/frc.nls
+++ b/dlls/kernel32/nls/frc.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "39"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c0c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frl.nls b/dlls/kernel32/nls/frl.nls
index cb7d36d2c9..29d2ad0c9c 100644
--- a/dlls/kernel32/nls/frl.nls
+++ b/dlls/kernel32/nls/frl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "147"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "140c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frm.nls b/dlls/kernel32/nls/frm.nls
index 5c3e6b192e..fa38552812 100644
--- a/dlls/kernel32/nls/frm.nls
+++ b/dlls/kernel32/nls/frm.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_MONACO
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "158"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "180c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frs.nls b/dlls/kernel32/nls/frs.nls
index 303be0a31b..cefb9d36db 100644
--- a/dlls/kernel32/nls/frs.nls
+++ b/dlls/kernel32/nls/frs.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "223"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "100c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/gae.nls b/dlls/kernel32/nls/gae.nls
index 8167cbcd60..e817403c43 100644
--- a/dlls/kernel32/nls/gae.nls
+++ b/dlls/kernel32/nls/gae.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_IRISH, SUBLANG_IRISH_IRELAND
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "68"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "083c"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/gdh.nls b/dlls/kernel32/nls/gdh.nls
index f8bdaa0b64..0cd5699120 100644
--- a/dlls/kernel32/nls/gdh.nls
+++ b/dlls/kernel32/nls/gdh.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_SCOTTISH_GAELIC, SUBLANG_SCOTTISH_GAELIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "242"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0491"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/gdv.nls b/dlls/kernel32/nls/gdv.nls
index c836eee807..0723813c14 100644
--- a/dlls/kernel32/nls/gdv.nls
+++ b/dlls/kernel32/nls/gdv.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "15126"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0494"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/glc.nls b/dlls/kernel32/nls/glc.nls
index 71b49390d8..f60a0aac69 100644
--- a/dlls/kernel32/nls/glc.nls
+++ b/dlls/kernel32/nls/glc.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0456"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/guj.nls b/dlls/kernel32/nls/guj.nls
index 4731cc5004..e24ba5e43f 100644
--- a/dlls/kernel32/nls/guj.nls
+++ b/dlls/kernel32/nls/guj.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GUJARATI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0447"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/heb.nls b/dlls/kernel32/nls/heb.nls
index 2ba57a50ab..2d69ffd467 100644
--- a/dlls/kernel32/nls/heb.nls
+++ b/dlls/kernel32/nls/heb.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "117"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040d"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/hin.nls b/dlls/kernel32/nls/hin.nls
index 3a70dc0db6..b32a057265 100644
--- a/dlls/kernel32/nls/hin.nls
+++ b/dlls/kernel32/nls/hin.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_HINDI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0439"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/hrv.nls b/dlls/kernel32/nls/hrv.nls
index faa39455d0..958e15e59e 100644
--- a/dlls/kernel32/nls/hrv.nls
+++ b/dlls/kernel32/nls/hrv.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "108"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/hun.nls b/dlls/kernel32/nls/hun.nls
index 3c95372f4f..c3dbb9773f 100644
--- a/dlls/kernel32/nls/hun.nls
+++ b/dlls/kernel32/nls/hun.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "109"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040e"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/hye.nls b/dlls/kernel32/nls/hye.nls
index fbd4b2b63a..2000280fe1 100644
--- a/dlls/kernel32/nls/hye.nls
+++ b/dlls/kernel32/nls/hye.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "7"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042b"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ind.nls b/dlls/kernel32/nls/ind.nls
index f160c6829e..c33acb8a3e 100644
--- a/dlls/kernel32/nls/ind.nls
+++ b/dlls/kernel32/nls/ind.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "111"
LOCALE_IINTLCURRDIGITS "0"
LOCALE_ILANGUAGE "0421"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/isl.nls b/dlls/kernel32/nls/isl.nls
index 0f13d17562..5a6c3d67e3 100644
--- a/dlls/kernel32/nls/isl.nls
+++ b/dlls/kernel32/nls/isl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ICELANDIC, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "110"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ita.nls b/dlls/kernel32/nls/ita.nls
index 205384f42e..256d546819 100644
--- a/dlls/kernel32/nls/ita.nls
+++ b/dlls/kernel32/nls/ita.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "118"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0410"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/its.nls b/dlls/kernel32/nls/its.nls
index f8a67e7b19..c9a6c1744c 100644
--- a/dlls/kernel32/nls/its.nls
+++ b/dlls/kernel32/nls/its.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN_SWISS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "223"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0810"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ivl.nls b/dlls/kernel32/nls/ivl.nls
index c55bea948f..6bfaf0f950 100644
--- a/dlls/kernel32/nls/ivl.nls
+++ b/dlls/kernel32/nls/ivl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_INVARIANT, SUBLANG_NEUTRAL
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "39070" /* World*/
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "007f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/jpn.nls b/dlls/kernel32/nls/jpn.nls
index 06ddccf859..39507dee84 100644
--- a/dlls/kernel32/nls/jpn.nls
+++ b/dlls/kernel32/nls/jpn.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "122"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0411"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/kan.nls b/dlls/kernel32/nls/kan.nls
index 9c82d16dc9..e6934d1a42 100644
--- a/dlls/kernel32/nls/kan.nls
+++ b/dlls/kernel32/nls/kan.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KANNADA, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "044b"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/kat.nls b/dlls/kernel32/nls/kat.nls
index e2596483c3..26e165001e 100644
--- a/dlls/kernel32/nls/kat.nls
+++ b/dlls/kernel32/nls/kat.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GEORGIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "88"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0437"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/kkz.nls b/dlls/kernel32/nls/kkz.nls
index c23ded5a00..5a8451563b 100644
--- a/dlls/kernel32/nls/kkz.nls
+++ b/dlls/kernel32/nls/kkz.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KAZAK, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "137"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "043f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/knk.nls b/dlls/kernel32/nls/knk.nls
index 44e19e8a7b..c2526d2c81 100644
--- a/dlls/kernel32/nls/knk.nls
+++ b/dlls/kernel32/nls/knk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KONKANI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0457"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/kor.nls b/dlls/kernel32/nls/kor.nls
index 26ebe7f520..9d44870b39 100644
--- a/dlls/kernel32/nls/kor.nls
+++ b/dlls/kernel32/nls/kor.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KOREAN, SUBLANG_KOREAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "134"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0412"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/kyr.nls b/dlls/kernel32/nls/kyr.nls
index e0ade28a16..7ab2a4d0b6 100644
--- a/dlls/kernel32/nls/kyr.nls
+++ b/dlls/kernel32/nls/kyr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KYRGYZ, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "130"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0440"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/lth.nls b/dlls/kernel32/nls/lth.nls
index 9f3fc4f195..fa1417357a 100644
--- a/dlls/kernel32/nls/lth.nls
+++ b/dlls/kernel32/nls/lth.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "141"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0427"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/lvi.nls b/dlls/kernel32/nls/lvi.nls
index bdff4bf2b8..3faa56bf54 100644
--- a/dlls/kernel32/nls/lvi.nls
+++ b/dlls/kernel32/nls/lvi.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "140"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0426"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/mar.nls b/dlls/kernel32/nls/mar.nls
index d7b31a757b..3069a59070 100644
--- a/dlls/kernel32/nls/mar.nls
+++ b/dlls/kernel32/nls/mar.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MARATHI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "044e"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/mki.nls b/dlls/kernel32/nls/mki.nls
index 6103b42265..30efc19b37 100644
--- a/dlls/kernel32/nls/mki.nls
+++ b/dlls/kernel32/nls/mki.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MACEDONIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "19618"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/mon.nls b/dlls/kernel32/nls/mon.nls
index 41516fb4bc..c60ec86c91 100644
--- a/dlls/kernel32/nls/mon.nls
+++ b/dlls/kernel32/nls/mon.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MONGOLIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "154"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0450"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/msb.nls b/dlls/kernel32/nls/msb.nls
index bbba93f642..0e232cfcb0 100644
--- a/dlls/kernel32/nls/msb.nls
+++ b/dlls/kernel32/nls/msb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "37"
LOCALE_IINTLCURRDIGITS "0"
LOCALE_ILANGUAGE "083e"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/msl.nls b/dlls/kernel32/nls/msl.nls
index 3bffbb6d1d..1df52003c2 100644
--- a/dlls/kernel32/nls/msl.nls
+++ b/dlls/kernel32/nls/msl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_MALAYSIA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "167"
LOCALE_IINTLCURRDIGITS "0"
LOCALE_ILANGUAGE "043e"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/nep.nls b/dlls/kernel32/nls/nep.nls
index c8b5d74def..63946744cb 100644
--- a/dlls/kernel32/nls/nep.nls
+++ b/dlls/kernel32/nls/nep.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_NEPALI, SUBLANG_NEPALI_NEPAL
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "178"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0461"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/nlb.nls b/dlls/kernel32/nls/nlb.nls
index 8af8f48ee1..17fd3790de 100644
--- a/dlls/kernel32/nls/nlb.nls
+++ b/dlls/kernel32/nls/nlb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_BELGIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "21"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0813"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/nld.nls b/dlls/kernel32/nls/nld.nls
index 6abf0dd3fd..47de663dec 100644
--- a/dlls/kernel32/nls/nld.nls
+++ b/dlls/kernel32/nls/nld.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "176"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0413"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/nls.nls b/dlls/kernel32/nls/nls.nls
index 8ebbfdf071..b29f0bc3a1 100644
--- a/dlls/kernel32/nls/nls.nls
+++ b/dlls/kernel32/nls/nls.nls
@@ -46,6 +46,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_SURINAM
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "181"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c13"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/non.nls b/dlls/kernel32/nls/non.nls
index 9a2eefa42f..ac6827536f 100644
--- a/dlls/kernel32/nls/non.nls
+++ b/dlls/kernel32/nls/non.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "177"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0814"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/nor.nls b/dlls/kernel32/nls/nor.nls
index eb65152380..bd78390541 100644
--- a/dlls/kernel32/nls/nor.nls
+++ b/dlls/kernel32/nls/nor.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "177"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0414"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/pan.nls b/dlls/kernel32/nls/pan.nls
index 358a9eb97a..bd8aeb883f 100644
--- a/dlls/kernel32/nls/pan.nls
+++ b/dlls/kernel32/nls/pan.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_PUNJABI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0446"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/plk.nls b/dlls/kernel32/nls/plk.nls
index 6e1447dc15..b79020ecb0 100644
--- a/dlls/kernel32/nls/plk.nls
+++ b/dlls/kernel32/nls/plk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "191"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0415"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ptb.nls b/dlls/kernel32/nls/ptb.nls
index e66c09a3cc..66cc65be83 100644
--- a/dlls/kernel32/nls/ptb.nls
+++ b/dlls/kernel32/nls/ptb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "32"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0416"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ptg.nls b/dlls/kernel32/nls/ptg.nls
index a7c6496b25..c75d5a1caf 100644
--- a/dlls/kernel32/nls/ptg.nls
+++ b/dlls/kernel32/nls/ptg.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "193"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0816"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/rmc.nls b/dlls/kernel32/nls/rmc.nls
index c41a31dedd..f54db3585a 100644
--- a/dlls/kernel32/nls/rmc.nls
+++ b/dlls/kernel32/nls/rmc.nls
@@ -51,6 +51,7 @@ STRINGTABLE LANGUAGE LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "223"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0417"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/rom.nls b/dlls/kernel32/nls/rom.nls
index 420154c5d1..fd519238dd 100644
--- a/dlls/kernel32/nls/rom.nls
+++ b/dlls/kernel32/nls/rom.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "200"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0418"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/rus.nls b/dlls/kernel32/nls/rus.nls
index a066c81c4a..5c78460f66 100644
--- a/dlls/kernel32/nls/rus.nls
+++ b/dlls/kernel32/nls/rus.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "203"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0419"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/san.nls b/dlls/kernel32/nls/san.nls
index 57ee6a54b2..4f44f3e3d9 100644
--- a/dlls/kernel32/nls/san.nls
+++ b/dlls/kernel32/nls/san.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SANSKRIT, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "044f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls
index cc5465f4dc..31d258b673 100644
--- a/dlls/kernel32/nls/sin.nls
+++ b/dlls/kernel32/nls/sin.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "42"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "045B"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/sky.nls b/dlls/kernel32/nls/sky.nls
index 0e140e02de..29647b2b1b 100644
--- a/dlls/kernel32/nls/sky.nls
+++ b/dlls/kernel32/nls/sky.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "143"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041b"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/slv.nls b/dlls/kernel32/nls/slv.nls
index f5c0ffc94f..8f7fc66ac7 100644
--- a/dlls/kernel32/nls/slv.nls
+++ b/dlls/kernel32/nls/slv.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "212"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0424"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/sqi.nls b/dlls/kernel32/nls/sqi.nls
index 41b4085e10..6f4048230e 100644
--- a/dlls/kernel32/nls/sqi.nls
+++ b/dlls/kernel32/nls/sqi.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ALBANIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "6"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041c"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls
index 500e36bb63..eb500cf0fd 100644
--- a/dlls/kernel32/nls/srb.nls
+++ b/dlls/kernel32/nls/srb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "271"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c1a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls
index 85f156d656..948b5e11a2 100644
--- a/dlls/kernel32/nls/srl.nls
+++ b/dlls/kernel32/nls/srl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "271"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "081a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/sve.nls b/dlls/kernel32/nls/sve.nls
index cff29a267a..6c8db124a6 100644
--- a/dlls/kernel32/nls/sve.nls
+++ b/dlls/kernel32/nls/sve.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "221"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041d"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/svf.nls b/dlls/kernel32/nls/svf.nls
index 2b97b4fe03..59982e8a39 100644
--- a/dlls/kernel32/nls/svf.nls
+++ b/dlls/kernel32/nls/svf.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "77"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "081d"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/swk.nls b/dlls/kernel32/nls/swk.nls
index 28e9dfc1aa..6308562991 100644
--- a/dlls/kernel32/nls/swk.nls
+++ b/dlls/kernel32/nls/swk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SWAHILI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "129"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0441"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/syr.nls b/dlls/kernel32/nls/syr.nls
index 9e6453d77f..6f8aa76602 100644
--- a/dlls/kernel32/nls/syr.nls
+++ b/dlls/kernel32/nls/syr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SYRIAC, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "222"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "045a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/tam.nls b/dlls/kernel32/nls/tam.nls
index ba32416f42..8db932bf65 100644
--- a/dlls/kernel32/nls/tam.nls
+++ b/dlls/kernel32/nls/tam.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_TAMIL, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0449"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/tel.nls b/dlls/kernel32/nls/tel.nls
index 59078d15ee..37586776ea 100644
--- a/dlls/kernel32/nls/tel.nls
+++ b/dlls/kernel32/nls/tel.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_TELUGU, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "044a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls
index 3995c74368..2097b3728d 100644
--- a/dlls/kernel32/nls/tha.nls
+++ b/dlls/kernel32/nls/tha.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "227"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041e"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/trk.nls b/dlls/kernel32/nls/trk.nls
index 0b68b5bbce..3954b4b63e 100644
--- a/dlls/kernel32/nls/trk.nls
+++ b/dlls/kernel32/nls/trk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "235"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ttt.nls b/dlls/kernel32/nls/ttt.nls
index cae2f9418c..64cdb3d102 100644
--- a/dlls/kernel32/nls/ttt.nls
+++ b/dlls/kernel32/nls/ttt.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "203"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0444"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ukr.nls b/dlls/kernel32/nls/ukr.nls
index 142133ea9c..e13ac684fc 100644
--- a/dlls/kernel32/nls/ukr.nls
+++ b/dlls/kernel32/nls/ukr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "241"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0422"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/urd.nls b/dlls/kernel32/nls/urd.nls
index d8b6c30135..1bebe46e74 100644
--- a/dlls/kernel32/nls/urd.nls
+++ b/dlls/kernel32/nls/urd.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_URDU, SUBLANG_URDU_PAKISTAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "1"
+ LOCALE_IGEOID "190"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0420"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/uzb.nls b/dlls/kernel32/nls/uzb.nls
index 022f7f59af..1257f39f2f 100644
--- a/dlls/kernel32/nls/uzb.nls
+++ b/dlls/kernel32/nls/uzb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "247"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0843"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/uzl.nls b/dlls/kernel32/nls/uzl.nls
index 88206a9038..b03cfb6fb1 100644
--- a/dlls/kernel32/nls/uzl.nls
+++ b/dlls/kernel32/nls/uzl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_LATIN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "247"
LOCALE_IINTLCURRDIGITS "0"
LOCALE_ILANGUAGE "0443"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls
index 3813cafb6b..17389243dc 100644
--- a/dlls/kernel32/nls/vit.nls
+++ b/dlls/kernel32/nls/vit.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "251"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/wal.nls b/dlls/kernel32/nls/wal.nls
index d86f9d6803..3e5f9585d7 100644
--- a/dlls/kernel32/nls/wal.nls
+++ b/dlls/kernel32/nls/wal.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "21"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0490"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/zhh.nls b/dlls/kernel32/nls/zhh.nls
index 19e1961393..f6aca66bd1 100644
--- a/dlls/kernel32/nls/zhh.nls
+++ b/dlls/kernel32/nls/zhh.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "104"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c04"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/zhi.nls b/dlls/kernel32/nls/zhi.nls
index 941ec6e664..8b304d7514 100644
--- a/dlls/kernel32/nls/zhi.nls
+++ b/dlls/kernel32/nls/zhi.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "215"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1004"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/zhm.nls b/dlls/kernel32/nls/zhm.nls
index 8cef84265b..1a915bda16 100644
--- a/dlls/kernel32/nls/zhm.nls
+++ b/dlls/kernel32/nls/zhm.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "151"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1404"
LOCALE_ILDATE "1"
--
2.24.0
1
0
[PATCH 2/2] wined3d: Create a backup context if setting the pixel format failed in wined3d_context_gl_create_wgl_ctx().
by Henri Verbeet 18 Nov '19
by Henri Verbeet 18 Nov '19
18 Nov '19
From: Paul Gofman <gofmanp(a)gmail.com>
Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
This supersedes patch 173738.
dlls/wined3d/context.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 5b8402bfe4f..c5d2eeaa477 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -2033,9 +2033,27 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context
if (!wined3d_context_gl_set_pixel_format(context_gl))
{
- ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc);
context_release(context);
- return FALSE;
+
+ if (context_gl->dc_is_private)
+ {
+ ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc);
+
+ return FALSE;
+ }
+
+ WARN("Failed to set pixel format %d on device context %p, trying backup DC.\n",
+ context_gl->pixel_format, context_gl->dc);
+
+ wined3d_release_dc(context_gl->window, context_gl->dc);
+ if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl)))
+ {
+ ERR("Failed to retrieve the backup device context.\n");
+ return E_FAIL;
+ }
+ context_gl->dc_is_private = TRUE;
+
+ return wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl);
}
share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL;
--
2.11.0
1
0
[PATCH 1/2] wined3d: Factor out wined3d_context_gl_create_wgl() function.
by Henri Verbeet 18 Nov '19
by Henri Verbeet 18 Nov '19
18 Nov '19
From: Paul Gofman <gofmanp(a)gmail.com>
Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
This supersedes patch 173737.
dlls/wined3d/context.c | 232 +++++++++++++++++++++++++++----------------------
1 file changed, 128 insertions(+), 104 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index f4c0d46f8e6..5b8402bfe4f 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -1935,93 +1935,22 @@ HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct w
return WINED3D_OK;
}
-HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain_gl *swapchain_gl)
+static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context_gl,
+ struct wined3d_swapchain_gl *swapchain_gl)
{
- const struct wined3d_format *color_format, *ds_format;
+ const struct wined3d_format *colour_format, *ds_format;
struct wined3d_context *context = &context_gl->c;
- const struct wined3d_d3d_info *d3d_info;
const struct wined3d_gl_info *gl_info;
struct wined3d_resource *target;
+ struct wined3d_adapter *adapter;
unsigned int target_bind_flags;
struct wined3d_device *device;
HGLRC ctx, share_ctx;
unsigned int i;
- TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain_gl);
-
- wined3d_context_init(&context_gl->c, &swapchain_gl->s);
-
device = context->device;
- gl_info = &device->adapter->gl_info;
- context_gl->gl_info = gl_info;
- d3d_info = context->d3d_info;
-
- context_gl->tid = GetCurrentThreadId();
- context_gl->window = context->swapchain->win_handle;
- if (context_gl->window == GetDesktopWindow())
- {
- TRACE("Swapchain is created on the desktop window, trying backup device context.\n");
- context_gl->dc = NULL;
- }
- else if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE)))
- WARN("Failed to retrieve device context, trying swapchain backup.\n");
-
- if (!context_gl->dc)
- {
- if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl)))
- {
- ERR("Failed to retrieve a device context.\n");
- return E_FAIL;
- }
- context_gl->dc_is_private = TRUE;
- }
-
- list_init(&context_gl->fbo_list);
- list_init(&context_gl->fbo_destroy_list);
-
- list_init(&context_gl->occlusion_queries);
- list_init(&context_gl->fences);
- list_init(&context_gl->timestamp_queries);
- list_init(&context_gl->so_statistics_queries);
- list_init(&context_gl->pipeline_statistics_queries);
-
- for (i = 0; i < ARRAY_SIZE(context_gl->tex_unit_map); ++i)
- context_gl->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE;
- for (i = 0; i < ARRAY_SIZE(context_gl->rev_tex_unit_map); ++i)
- context_gl->rev_tex_unit_map[i] = WINED3D_UNMAPPED_STAGE;
- if (gl_info->limits.graphics_samplers >= WINED3D_MAX_COMBINED_SAMPLERS)
- {
- /* Initialize the texture unit mapping to a 1:1 mapping. */
- unsigned int base, count;
-
- wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count);
- if (base + WINED3D_MAX_FRAGMENT_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map))
- {
- ERR("Unexpected texture unit base index %u.\n", base);
- goto fail;
- }
- for (i = 0; i < min(count, WINED3D_MAX_FRAGMENT_SAMPLERS); ++i)
- {
- context_gl->tex_unit_map[i] = base + i;
- context_gl->rev_tex_unit_map[base + i] = i;
- }
-
- wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count);
- if (base + WINED3D_MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map))
- {
- ERR("Unexpected texture unit base index %u.\n", base);
- goto fail;
- }
- for (i = 0; i < min(count, WINED3D_MAX_VERTEX_SAMPLERS); ++i)
- {
- context_gl->tex_unit_map[WINED3D_MAX_FRAGMENT_SAMPLERS + i] = base + i;
- context_gl->rev_tex_unit_map[base + i] = WINED3D_MAX_FRAGMENT_SAMPLERS + i;
- }
- }
-
- if (!(context_gl->texture_type = heap_calloc(gl_info->limits.combined_samplers,
- sizeof(*context_gl->texture_type))))
- goto fail;
+ adapter = device->adapter;
+ gl_info = &adapter->gl_info;
target = &context->current_rt.texture->resource;
target_bind_flags = target->bind_flags;
@@ -2037,14 +1966,14 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
WINED3DFMT_S1_UINT_D15_UNORM,
};
- color_format = target->format;
+ colour_format = target->format;
/* In case of ORM_BACKBUFFER, make sure to request an alpha component for
* X4R4G4B4/X8R8G8B8 as we might need it for the backbuffer. */
- if (color_format->id == WINED3DFMT_B4G4R4X4_UNORM)
- color_format = wined3d_get_format(device->adapter, WINED3DFMT_B4G4R4A4_UNORM, target_bind_flags);
- else if (color_format->id == WINED3DFMT_B8G8R8X8_UNORM)
- color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags);
+ if (colour_format->id == WINED3DFMT_B4G4R4X4_UNORM)
+ colour_format = wined3d_get_format(adapter, WINED3DFMT_B4G4R4A4_UNORM, target_bind_flags);
+ else if (colour_format->id == WINED3DFMT_B8G8R8X8_UNORM)
+ colour_format = wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags);
/* DirectDraw supports 8bit paletted render targets and these are used by
* old games like StarCraft and C&C. Most modern hardware doesn't support
@@ -2052,17 +1981,17 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
* conversion (ab)uses the alpha component for storing the palette index.
* For this reason we require a format with 8bit alpha, so request
* A8R8G8B8. */
- if (color_format->id == WINED3DFMT_P8_UINT)
- color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags);
+ if (colour_format->id == WINED3DFMT_P8_UINT)
+ colour_format = wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags);
/* Try to find a pixel format which matches our requirements. */
if (!swapchain_gl->s.ds_format)
{
for (i = 0; i < ARRAY_SIZE(ds_formats); ++i)
{
- ds_format = wined3d_get_format(device->adapter, ds_formats[i], WINED3D_BIND_DEPTH_STENCIL);
+ ds_format = wined3d_get_format(adapter, ds_formats[i], WINED3D_BIND_DEPTH_STENCIL);
if ((context_gl->pixel_format = context_choose_pixel_format(device,
- context_gl->dc, color_format, ds_format, TRUE)))
+ context_gl->dc, colour_format, ds_format, TRUE)))
{
swapchain_gl->s.ds_format = ds_format;
break;
@@ -2075,7 +2004,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
else
{
context_gl->pixel_format = context_choose_pixel_format(device,
- context_gl->dc, color_format, swapchain_gl->s.ds_format, TRUE);
+ context_gl->dc, colour_format, swapchain_gl->s.ds_format, TRUE);
}
}
else
@@ -2085,17 +2014,20 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
* don't need depth or stencil buffers, and can mostly ignore the render
* target format. This wouldn't necessarily be quite correct for 10bpc
* display modes, but we don't currently support those.
- * Using the same format regardless of the color/depth/stencil targets
+ * Using the same format regardless of the colour/depth/stencil targets
* makes it much less likely that different wined3d instances will set
* conflicting pixel formats. */
- color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags);
- ds_format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, WINED3D_BIND_DEPTH_STENCIL);
+ colour_format = wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags);
+ ds_format = wined3d_get_format(adapter, WINED3DFMT_UNKNOWN, WINED3D_BIND_DEPTH_STENCIL);
context_gl->pixel_format = context_choose_pixel_format(device,
- context_gl->dc, color_format, ds_format, FALSE);
+ context_gl->dc, colour_format, ds_format, FALSE);
}
if (!context_gl->pixel_format)
- goto fail;
+ {
+ ERR("Failed to choose pixel format.\n");
+ return FALSE;
+ }
wined3d_context_gl_enter(context_gl);
@@ -2103,7 +2035,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
{
ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc);
context_release(context);
- goto fail;
+ return FALSE;
}
share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL;
@@ -2111,8 +2043,9 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
{
if (!(ctx = context_create_wgl_attribs(gl_info, context_gl->dc, share_ctx)))
{
+ ERR("Failed to create a WGL context.\n");
context_release(context);
- goto fail;
+ return FALSE;
}
}
else
@@ -2121,7 +2054,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
{
ERR("Failed to create a WGL context.\n");
context_release(context);
- goto fail;
+ return FALSE;
}
if (share_ctx && !wglShareLists(share_ctx, ctx))
@@ -2130,25 +2063,116 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
context_release(context);
if (!wglDeleteContext(ctx))
ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError());
- goto fail;
+ return FALSE;
}
}
- context->render_offscreen = wined3d_resource_is_offscreen(target);
- context_gl->draw_buffers_mask = context_generate_rt_mask(GL_BACK);
- context_gl->valid = 1;
-
- context_gl->gl_ctx = ctx;
context_gl->dc_has_format = TRUE;
context_gl->needs_set = 1;
+ context_gl->valid = 1;
+ context_gl->gl_ctx = ctx;
+
+ return TRUE;
+}
+
+HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain_gl *swapchain_gl)
+{
+ struct wined3d_context *context = &context_gl->c;
+ const struct wined3d_d3d_info *d3d_info;
+ const struct wined3d_gl_info *gl_info;
+ struct wined3d_device *device;
+ unsigned int i;
+
+ TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain_gl);
+
+ wined3d_context_init(&context_gl->c, &swapchain_gl->s);
+
+ device = context->device;
+ gl_info = &device->adapter->gl_info;
+ context_gl->gl_info = gl_info;
+ d3d_info = context->d3d_info;
+
+ context_gl->tid = GetCurrentThreadId();
+ context_gl->window = context->swapchain->win_handle;
+ if (context_gl->window == GetDesktopWindow())
+ {
+ TRACE("Swapchain is created on the desktop window, trying backup device context.\n");
+ context_gl->dc = NULL;
+ }
+ else if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE)))
+ WARN("Failed to retrieve device context, trying swapchain backup.\n");
+
+ if (!context_gl->dc)
+ {
+ if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl)))
+ {
+ ERR("Failed to retrieve a device context.\n");
+ return E_FAIL;
+ }
+ context_gl->dc_is_private = TRUE;
+ }
+
+ list_init(&context_gl->fbo_list);
+ list_init(&context_gl->fbo_destroy_list);
+
+ list_init(&context_gl->occlusion_queries);
+ list_init(&context_gl->fences);
+ list_init(&context_gl->timestamp_queries);
+ list_init(&context_gl->so_statistics_queries);
+ list_init(&context_gl->pipeline_statistics_queries);
+
+ for (i = 0; i < ARRAY_SIZE(context_gl->tex_unit_map); ++i)
+ context_gl->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE;
+ for (i = 0; i < ARRAY_SIZE(context_gl->rev_tex_unit_map); ++i)
+ context_gl->rev_tex_unit_map[i] = WINED3D_UNMAPPED_STAGE;
+ if (gl_info->limits.graphics_samplers >= WINED3D_MAX_COMBINED_SAMPLERS)
+ {
+ /* Initialize the texture unit mapping to a 1:1 mapping. */
+ unsigned int base, count;
+
+ wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count);
+ if (base + WINED3D_MAX_FRAGMENT_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map))
+ {
+ ERR("Unexpected texture unit base index %u.\n", base);
+ goto fail;
+ }
+ for (i = 0; i < min(count, WINED3D_MAX_FRAGMENT_SAMPLERS); ++i)
+ {
+ context_gl->tex_unit_map[i] = base + i;
+ context_gl->rev_tex_unit_map[base + i] = i;
+ }
+
+ wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count);
+ if (base + WINED3D_MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map))
+ {
+ ERR("Unexpected texture unit base index %u.\n", base);
+ goto fail;
+ }
+ for (i = 0; i < min(count, WINED3D_MAX_VERTEX_SAMPLERS); ++i)
+ {
+ context_gl->tex_unit_map[WINED3D_MAX_FRAGMENT_SAMPLERS + i] = base + i;
+ context_gl->rev_tex_unit_map[base + i] = WINED3D_MAX_FRAGMENT_SAMPLERS + i;
+ }
+ }
+
+ if (!(context_gl->texture_type = heap_calloc(gl_info->limits.combined_samplers,
+ sizeof(*context_gl->texture_type))))
+ goto fail;
+
+ if (!wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl))
+ goto fail;
+
+ /* Set up the context defaults. */
+
+ context->render_offscreen = wined3d_resource_is_offscreen(&context->current_rt.texture->resource);
+ context_gl->draw_buffers_mask = context_generate_rt_mask(GL_BACK);
- /* Set up the context defaults */
if (!wined3d_context_gl_set_current(context_gl))
{
ERR("Cannot activate context to set up defaults.\n");
context_release(context);
- if (!wglDeleteContext(ctx))
- ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError());
+ if (!wglDeleteContext(context_gl->gl_ctx))
+ ERR("wglDeleteContext(%p) failed, last error %#x.\n", context_gl->gl_ctx, GetLastError());
goto fail;
}
--
2.11.0
1
0
18 Nov '19
Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt>
---
These GeoIDs were taken from Wine's own geoinfodata array via a script,
so they should match with Windows (and do for the handful I tested.)
Supersedes: 173819
---
dlls/kernel32/nls/afk.nls | 1 +
dlls/kernel32/nls/ara.nls | 1 +
dlls/kernel32/nls/arb.nls | 1 +
dlls/kernel32/nls/are.nls | 1 +
dlls/kernel32/nls/arg.nls | 1 +
dlls/kernel32/nls/arh.nls | 1 +
dlls/kernel32/nls/ari.nls | 1 +
dlls/kernel32/nls/arj.nls | 1 +
dlls/kernel32/nls/ark.nls | 1 +
dlls/kernel32/nls/arl.nls | 1 +
dlls/kernel32/nls/arm.nls | 1 +
dlls/kernel32/nls/aro.nls | 1 +
dlls/kernel32/nls/arq.nls | 1 +
dlls/kernel32/nls/ars.nls | 1 +
dlls/kernel32/nls/art.nls | 1 +
dlls/kernel32/nls/aru.nls | 1 +
dlls/kernel32/nls/ary.nls | 1 +
dlls/kernel32/nls/ast.nls | 1 +
dlls/kernel32/nls/aze.nls | 1 +
dlls/kernel32/nls/azl.nls | 1 +
dlls/kernel32/nls/bel.nls | 1 +
dlls/kernel32/nls/ben.nls | 1 +
dlls/kernel32/nls/bgr.nls | 1 +
dlls/kernel32/nls/brf.nls | 1 +
dlls/kernel32/nls/cat.nls | 1 +
dlls/kernel32/nls/chs.nls | 1 +
dlls/kernel32/nls/cht.nls | 1 +
dlls/kernel32/nls/cor.nls | 1 +
dlls/kernel32/nls/csy.nls | 1 +
dlls/kernel32/nls/cym.nls | 1 +
dlls/kernel32/nls/dan.nls | 1 +
dlls/kernel32/nls/dea.nls | 1 +
dlls/kernel32/nls/dec.nls | 1 +
dlls/kernel32/nls/del.nls | 1 +
dlls/kernel32/nls/des.nls | 1 +
dlls/kernel32/nls/deu.nls | 1 +
dlls/kernel32/nls/div.nls | 1 +
dlls/kernel32/nls/ell.nls | 1 +
dlls/kernel32/nls/ena.nls | 1 +
dlls/kernel32/nls/enb.nls | 1 +
dlls/kernel32/nls/enc.nls | 1 +
dlls/kernel32/nls/eng.nls | 1 +
dlls/kernel32/nls/eni.nls | 1 +
dlls/kernel32/nls/enj.nls | 1 +
dlls/kernel32/nls/enl.nls | 1 +
dlls/kernel32/nls/enp.nls | 1 +
dlls/kernel32/nls/ens.nls | 1 +
dlls/kernel32/nls/ent.nls | 1 +
dlls/kernel32/nls/enu.nls | 1 +
dlls/kernel32/nls/enw.nls | 1 +
dlls/kernel32/nls/enz.nls | 1 +
dlls/kernel32/nls/eox.nls | 1 +
dlls/kernel32/nls/esa.nls | 1 +
dlls/kernel32/nls/esb.nls | 1 +
dlls/kernel32/nls/esc.nls | 1 +
dlls/kernel32/nls/esd.nls | 1 +
dlls/kernel32/nls/ese.nls | 1 +
dlls/kernel32/nls/esf.nls | 1 +
dlls/kernel32/nls/esg.nls | 1 +
dlls/kernel32/nls/esh.nls | 1 +
dlls/kernel32/nls/esi.nls | 1 +
dlls/kernel32/nls/esl.nls | 1 +
dlls/kernel32/nls/esm.nls | 1 +
dlls/kernel32/nls/esn.nls | 1 +
dlls/kernel32/nls/eso.nls | 1 +
dlls/kernel32/nls/esp.nls | 1 +
dlls/kernel32/nls/esr.nls | 1 +
dlls/kernel32/nls/ess.nls | 1 +
dlls/kernel32/nls/esu.nls | 1 +
dlls/kernel32/nls/esv.nls | 1 +
dlls/kernel32/nls/esy.nls | 1 +
dlls/kernel32/nls/esz.nls | 1 +
dlls/kernel32/nls/eti.nls | 1 +
dlls/kernel32/nls/euq.nls | 1 +
dlls/kernel32/nls/far.nls | 1 +
dlls/kernel32/nls/fin.nls | 1 +
dlls/kernel32/nls/fos.nls | 1 +
dlls/kernel32/nls/fra.nls | 1 +
dlls/kernel32/nls/frb.nls | 1 +
dlls/kernel32/nls/frc.nls | 1 +
dlls/kernel32/nls/frl.nls | 1 +
dlls/kernel32/nls/frm.nls | 1 +
dlls/kernel32/nls/frs.nls | 1 +
dlls/kernel32/nls/gae.nls | 1 +
dlls/kernel32/nls/gdh.nls | 1 +
dlls/kernel32/nls/gdv.nls | 1 +
dlls/kernel32/nls/glc.nls | 1 +
dlls/kernel32/nls/guj.nls | 1 +
dlls/kernel32/nls/heb.nls | 1 +
dlls/kernel32/nls/hin.nls | 1 +
dlls/kernel32/nls/hrv.nls | 1 +
dlls/kernel32/nls/hun.nls | 1 +
dlls/kernel32/nls/hye.nls | 1 +
dlls/kernel32/nls/ind.nls | 1 +
dlls/kernel32/nls/isl.nls | 1 +
dlls/kernel32/nls/ita.nls | 1 +
dlls/kernel32/nls/its.nls | 1 +
dlls/kernel32/nls/ivl.nls | 1 +
dlls/kernel32/nls/jpn.nls | 1 +
dlls/kernel32/nls/kan.nls | 1 +
dlls/kernel32/nls/kat.nls | 1 +
dlls/kernel32/nls/kkz.nls | 1 +
dlls/kernel32/nls/knk.nls | 1 +
dlls/kernel32/nls/kor.nls | 1 +
dlls/kernel32/nls/kyr.nls | 1 +
dlls/kernel32/nls/lth.nls | 1 +
dlls/kernel32/nls/lvi.nls | 1 +
dlls/kernel32/nls/mar.nls | 1 +
dlls/kernel32/nls/mki.nls | 1 +
dlls/kernel32/nls/mon.nls | 1 +
dlls/kernel32/nls/msb.nls | 1 +
dlls/kernel32/nls/msl.nls | 1 +
dlls/kernel32/nls/nep.nls | 1 +
dlls/kernel32/nls/nlb.nls | 1 +
dlls/kernel32/nls/nld.nls | 1 +
dlls/kernel32/nls/nls.nls | 1 +
dlls/kernel32/nls/non.nls | 1 +
dlls/kernel32/nls/nor.nls | 1 +
dlls/kernel32/nls/pan.nls | 1 +
dlls/kernel32/nls/plk.nls | 1 +
dlls/kernel32/nls/ptb.nls | 1 +
dlls/kernel32/nls/ptg.nls | 1 +
dlls/kernel32/nls/rmc.nls | 1 +
dlls/kernel32/nls/rom.nls | 1 +
dlls/kernel32/nls/rus.nls | 1 +
dlls/kernel32/nls/san.nls | 1 +
dlls/kernel32/nls/sin.nls | 1 +
dlls/kernel32/nls/sky.nls | 1 +
dlls/kernel32/nls/slv.nls | 1 +
dlls/kernel32/nls/sqi.nls | 1 +
dlls/kernel32/nls/srb.nls | 1 +
dlls/kernel32/nls/srl.nls | 1 +
dlls/kernel32/nls/sve.nls | 1 +
dlls/kernel32/nls/svf.nls | 1 +
dlls/kernel32/nls/swk.nls | 1 +
dlls/kernel32/nls/syr.nls | 1 +
dlls/kernel32/nls/tam.nls | 1 +
dlls/kernel32/nls/tel.nls | 1 +
dlls/kernel32/nls/tha.nls | 1 +
dlls/kernel32/nls/trk.nls | 1 +
dlls/kernel32/nls/ttt.nls | 1 +
dlls/kernel32/nls/ukr.nls | 1 +
dlls/kernel32/nls/urd.nls | 1 +
dlls/kernel32/nls/uzb.nls | 1 +
dlls/kernel32/nls/uzl.nls | 1 +
dlls/kernel32/nls/vit.nls | 1 +
dlls/kernel32/nls/wal.nls | 1 +
dlls/kernel32/nls/zhh.nls | 1 +
dlls/kernel32/nls/zhi.nls | 1 +
dlls/kernel32/nls/zhm.nls | 1 +
150 files changed, 150 insertions(+)
diff --git a/dlls/kernel32/nls/afk.nls b/dlls/kernel32/nls/afk.nls
index 359368d1b8..aa33aa06d5 100644
--- a/dlls/kernel32/nls/afk.nls
+++ b/dlls/kernel32/nls/afk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "209"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0436"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ara.nls b/dlls/kernel32/nls/ara.nls
index db475ec95f..ff63164d47 100644
--- a/dlls/kernel32/nls/ara.nls
+++ b/dlls/kernel32/nls/ara.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "205"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0401"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arb.nls b/dlls/kernel32/nls/arb.nls
index e2ee977275..fb854ac44c 100644
--- a/dlls/kernel32/nls/arb.nls
+++ b/dlls/kernel32/nls/arb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LEBANON
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "139"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3001"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/are.nls b/dlls/kernel32/nls/are.nls
index 861ddc7f39..b044d3299b 100644
--- a/dlls/kernel32/nls/are.nls
+++ b/dlls/kernel32/nls/are.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "67"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "0c01"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arg.nls b/dlls/kernel32/nls/arg.nls
index 0d8f64cd12..6c10551f01 100644
--- a/dlls/kernel32/nls/arg.nls
+++ b/dlls/kernel32/nls/arg.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_ALGERIA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "4"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1401"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arh.nls b/dlls/kernel32/nls/arh.nls
index 08a4c40fcf..ce2fe000d4 100644
--- a/dlls/kernel32/nls/arh.nls
+++ b/dlls/kernel32/nls/arh.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "17"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "3c01"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ari.nls b/dlls/kernel32/nls/ari.nls
index 56d6b0a66a..466fa2540b 100644
--- a/dlls/kernel32/nls/ari.nls
+++ b/dlls/kernel32/nls/ari.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_IRAQ
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "121"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0801"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arj.nls b/dlls/kernel32/nls/arj.nls
index 6de87ba1d7..fc4f15c509 100644
--- a/dlls/kernel32/nls/arj.nls
+++ b/dlls/kernel32/nls/arj.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "126"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "2c01"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ark.nls b/dlls/kernel32/nls/ark.nls
index 5714cb2016..9086b62226 100644
--- a/dlls/kernel32/nls/ark.nls
+++ b/dlls/kernel32/nls/ark.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_KUWAIT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "136"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "3401"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arl.nls b/dlls/kernel32/nls/arl.nls
index b355537860..22bde6893f 100644
--- a/dlls/kernel32/nls/arl.nls
+++ b/dlls/kernel32/nls/arl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LIBYA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "148"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1001"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arm.nls b/dlls/kernel32/nls/arm.nls
index 4655544a94..8ac926550a 100644
--- a/dlls/kernel32/nls/arm.nls
+++ b/dlls/kernel32/nls/arm.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_MOROCCO
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "159"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1801"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/aro.nls b/dlls/kernel32/nls/aro.nls
index f05719620e..953b761de7 100644
--- a/dlls/kernel32/nls/aro.nls
+++ b/dlls/kernel32/nls/aro.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_OMAN
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "164"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2001"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arq.nls b/dlls/kernel32/nls/arq.nls
index 328455231c..25ac8b9132 100644
--- a/dlls/kernel32/nls/arq.nls
+++ b/dlls/kernel32/nls/arq.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_QATAR
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "197"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "4001"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ars.nls b/dlls/kernel32/nls/ars.nls
index f0c22ed5dc..803ca07118 100644
--- a/dlls/kernel32/nls/ars.nls
+++ b/dlls/kernel32/nls/ars.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "222"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2801"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/art.nls b/dlls/kernel32/nls/art.nls
index 6c8335d265..55e34ac77f 100644
--- a/dlls/kernel32/nls/art.nls
+++ b/dlls/kernel32/nls/art.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "234"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "1c01"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/aru.nls b/dlls/kernel32/nls/aru.nls
index 7e431370f5..d519b38bdd 100644
--- a/dlls/kernel32/nls/aru.nls
+++ b/dlls/kernel32/nls/aru.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_UAE
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "224"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3801"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ary.nls b/dlls/kernel32/nls/ary.nls
index c51b59f5d5..0cb1bb88b6 100644
--- a/dlls/kernel32/nls/ary.nls
+++ b/dlls/kernel32/nls/ary.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_YEMEN
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "261"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2401"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ast.nls b/dlls/kernel32/nls/ast.nls
index f4a0489abe..4a6a77aa72 100644
--- a/dlls/kernel32/nls/ast.nls
+++ b/dlls/kernel32/nls/ast.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "04a5"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/aze.nls b/dlls/kernel32/nls/aze.nls
index a9b093e787..e2860d088f 100644
--- a/dlls/kernel32/nls/aze.nls
+++ b/dlls/kernel32/nls/aze.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "5"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "082c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/azl.nls b/dlls/kernel32/nls/azl.nls
index f6a237b6ee..86d49a6b5f 100644
--- a/dlls/kernel32/nls/azl.nls
+++ b/dlls/kernel32/nls/azl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "5"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/bel.nls b/dlls/kernel32/nls/bel.nls
index d390871163..e6cc7a58df 100644
--- a/dlls/kernel32/nls/bel.nls
+++ b/dlls/kernel32/nls/bel.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "29"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0423"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ben.nls b/dlls/kernel32/nls/ben.nls
index f1031b09a7..bead15abaf 100644
--- a/dlls/kernel32/nls/ben.nls
+++ b/dlls/kernel32/nls/ben.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_BANGLA, SUBLANG_BANGLA_INDIA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0445"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/bgr.nls b/dlls/kernel32/nls/bgr.nls
index 4951098a1d..5f1f0e6697 100644
--- a/dlls/kernel32/nls/bgr.nls
+++ b/dlls/kernel32/nls/bgr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "35"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0402"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/brf.nls b/dlls/kernel32/nls/brf.nls
index e0dcf12e89..06862e665c 100644
--- a/dlls/kernel32/nls/brf.nls
+++ b/dlls/kernel32/nls/brf.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "84"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0493"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/cat.nls b/dlls/kernel32/nls/cat.nls
index b58cd75c27..5f1fa43e02 100644
--- a/dlls/kernel32/nls/cat.nls
+++ b/dlls/kernel32/nls/cat.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0403"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/chs.nls b/dlls/kernel32/nls/chs.nls
index 2829e52d66..c7f6114768 100644
--- a/dlls/kernel32/nls/chs.nls
+++ b/dlls/kernel32/nls/chs.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "45"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0804"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/cht.nls b/dlls/kernel32/nls/cht.nls
index b8bac7be3e..1cfeb840f0 100644
--- a/dlls/kernel32/nls/cht.nls
+++ b/dlls/kernel32/nls/cht.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "237"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0404"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/cor.nls b/dlls/kernel32/nls/cor.nls
index 535239aaf6..36c7e7f234 100644
--- a/dlls/kernel32/nls/cor.nls
+++ b/dlls/kernel32/nls/cor.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_CORNISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "242"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0492"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/csy.nls b/dlls/kernel32/nls/csy.nls
index 4cfb2afd4d..d03494e4cd 100644
--- a/dlls/kernel32/nls/csy.nls
+++ b/dlls/kernel32/nls/csy.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "75"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0405"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/cym.nls b/dlls/kernel32/nls/cym.nls
index 9d0f272ef2..41a25c415b 100644
--- a/dlls/kernel32/nls/cym.nls
+++ b/dlls/kernel32/nls/cym.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "242"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0492"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/dan.nls b/dlls/kernel32/nls/dan.nls
index 444e5a78d2..3e567cd333 100644
--- a/dlls/kernel32/nls/dan.nls
+++ b/dlls/kernel32/nls/dan.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "61"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0406"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/dea.nls b/dlls/kernel32/nls/dea.nls
index 0caf414af0..f97ae8ebe3 100644
--- a/dlls/kernel32/nls/dea.nls
+++ b/dlls/kernel32/nls/dea.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "14"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c07"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/dec.nls b/dlls/kernel32/nls/dec.nls
index ee3a95cdf2..b6b492b84d 100644
--- a/dlls/kernel32/nls/dec.nls
+++ b/dlls/kernel32/nls/dec.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "145"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1407"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/del.nls b/dlls/kernel32/nls/del.nls
index b92df675fa..6a7258d9fe 100644
--- a/dlls/kernel32/nls/del.nls
+++ b/dlls/kernel32/nls/del.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "147"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1007"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/des.nls b/dlls/kernel32/nls/des.nls
index f67f1d7bd8..bb6fed059c 100644
--- a/dlls/kernel32/nls/des.nls
+++ b/dlls/kernel32/nls/des.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "223"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0807"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/deu.nls b/dlls/kernel32/nls/deu.nls
index 66c0554032..b02639801b 100644
--- a/dlls/kernel32/nls/deu.nls
+++ b/dlls/kernel32/nls/deu.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "94"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0407"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/div.nls b/dlls/kernel32/nls/div.nls
index e8b1c72830..1c7989e006 100644
--- a/dlls/kernel32/nls/div.nls
+++ b/dlls/kernel32/nls/div.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_DIVEHI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "165"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0465"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ell.nls b/dlls/kernel32/nls/ell.nls
index cb129e75ad..d86fe9e473 100644
--- a/dlls/kernel32/nls/ell.nls
+++ b/dlls/kernel32/nls/ell.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "98"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0408"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ena.nls b/dlls/kernel32/nls/ena.nls
index e57be4732d..f34a20b96d 100644
--- a/dlls/kernel32/nls/ena.nls
+++ b/dlls/kernel32/nls/ena.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "12"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c09"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/enb.nls b/dlls/kernel32/nls/enb.nls
index 164c94ebf2..ca6af6766e 100644
--- a/dlls/kernel32/nls/enb.nls
+++ b/dlls/kernel32/nls/enb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "161832257"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2409"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/enc.nls b/dlls/kernel32/nls/enc.nls
index 01b4b8af7a..0f3a394263 100644
--- a/dlls/kernel32/nls/enc.nls
+++ b/dlls/kernel32/nls/enc.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "39"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1009"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/eng.nls b/dlls/kernel32/nls/eng.nls
index 72cac4180c..779bd0ae6d 100644
--- a/dlls/kernel32/nls/eng.nls
+++ b/dlls/kernel32/nls/eng.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "242"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0809"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/eni.nls b/dlls/kernel32/nls/eni.nls
index 31c137512c..9796b0f6cd 100644
--- a/dlls/kernel32/nls/eni.nls
+++ b/dlls/kernel32/nls/eni.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_EIRE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "68"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1809"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/enj.nls b/dlls/kernel32/nls/enj.nls
index 9b1afeec61..36134691ef 100644
--- a/dlls/kernel32/nls/enj.nls
+++ b/dlls/kernel32/nls/enj.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_JAMAICA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "124"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2009"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/enl.nls b/dlls/kernel32/nls/enl.nls
index 6bbe6d9952..ee78870cc8 100644
--- a/dlls/kernel32/nls/enl.nls
+++ b/dlls/kernel32/nls/enl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_BELIZE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "24"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2809"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/enp.nls b/dlls/kernel32/nls/enp.nls
index 8f4cd835ea..5af8b97efc 100644
--- a/dlls/kernel32/nls/enp.nls
+++ b/dlls/kernel32/nls/enp.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_PHILIPPINES
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "201"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3409"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/ens.nls b/dlls/kernel32/nls/ens.nls
index e94af6370e..ee2403196f 100644
--- a/dlls/kernel32/nls/ens.nls
+++ b/dlls/kernel32/nls/ens.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "209"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1c09"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ent.nls b/dlls/kernel32/nls/ent.nls
index b0e849101c..48bfb26b15 100644
--- a/dlls/kernel32/nls/ent.nls
+++ b/dlls/kernel32/nls/ent.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "225"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2c09"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/enu.nls b/dlls/kernel32/nls/enu.nls
index 6a5a63b155..527d6430f0 100644
--- a/dlls/kernel32/nls/enu.nls
+++ b/dlls/kernel32/nls/enu.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "244"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0409"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/enw.nls b/dlls/kernel32/nls/enw.nls
index de51ae2f8b..1ba782fc32 100644
--- a/dlls/kernel32/nls/enw.nls
+++ b/dlls/kernel32/nls/enw.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_ZIMBABWE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "264"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3009"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/enz.nls b/dlls/kernel32/nls/enz.nls
index cc2532454a..e4571a765b 100644
--- a/dlls/kernel32/nls/enz.nls
+++ b/dlls/kernel32/nls/enz.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_NZ
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "183"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1409"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls
index f67c955fde..bbd617eac4 100644
--- a/dlls/kernel32/nls/eox.nls
+++ b/dlls/kernel32/nls/eox.nls
@@ -56,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "39070" /* World */
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "048f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esa.nls b/dlls/kernel32/nls/esa.nls
index f89e234f83..a311d796eb 100644
--- a/dlls/kernel32/nls/esa.nls
+++ b/dlls/kernel32/nls/esa.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PANAMA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "192"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "180a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esb.nls b/dlls/kernel32/nls/esb.nls
index ef5c4300b2..ce95402300 100644
--- a/dlls/kernel32/nls/esb.nls
+++ b/dlls/kernel32/nls/esb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "26"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "400a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esc.nls b/dlls/kernel32/nls/esc.nls
index 8eccd4c137..60ed24e706 100644
--- a/dlls/kernel32/nls/esc.nls
+++ b/dlls/kernel32/nls/esc.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "54"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "140a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esd.nls b/dlls/kernel32/nls/esd.nls
index d956d0cd65..93b6bb0005 100644
--- a/dlls/kernel32/nls/esd.nls
+++ b/dlls/kernel32/nls/esd.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "65"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ese.nls b/dlls/kernel32/nls/ese.nls
index e2f9f5ab91..a68c027440 100644
--- a/dlls/kernel32/nls/ese.nls
+++ b/dlls/kernel32/nls/ese.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "72"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "440a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esf.nls b/dlls/kernel32/nls/esf.nls
index a70f5e249d..65f47d73a2 100644
--- a/dlls/kernel32/nls/esf.nls
+++ b/dlls/kernel32/nls/esf.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ECUADOR
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "66"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "300a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esg.nls b/dlls/kernel32/nls/esg.nls
index 2b6138960c..a9c9a8a860 100644
--- a/dlls/kernel32/nls/esg.nls
+++ b/dlls/kernel32/nls/esg.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "99"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "100a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esh.nls b/dlls/kernel32/nls/esh.nls
index 8d329cebc8..5593836b44 100644
--- a/dlls/kernel32/nls/esh.nls
+++ b/dlls/kernel32/nls/esh.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_HONDURAS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "106"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "480a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esi.nls b/dlls/kernel32/nls/esi.nls
index 6ba9a78786..ac4bdb79d0 100644
--- a/dlls/kernel32/nls/esi.nls
+++ b/dlls/kernel32/nls/esi.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "182"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "4c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esl.nls b/dlls/kernel32/nls/esl.nls
index 9b5c16d72b..57f35643b6 100644
--- a/dlls/kernel32/nls/esl.nls
+++ b/dlls/kernel32/nls/esl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_CHILE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "46"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "340a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esm.nls b/dlls/kernel32/nls/esm.nls
index 09f246504b..8c404f1733 100644
--- a/dlls/kernel32/nls/esm.nls
+++ b/dlls/kernel32/nls/esm.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "166"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "080a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esn.nls b/dlls/kernel32/nls/esn.nls
index 373445cabf..0cb88fa366 100644
--- a/dlls/kernel32/nls/esn.nls
+++ b/dlls/kernel32/nls/esn.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/eso.nls b/dlls/kernel32/nls/eso.nls
index d1831c4bc9..9f7131066a 100644
--- a/dlls/kernel32/nls/eso.nls
+++ b/dlls/kernel32/nls/eso.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "51"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "240a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esp.nls b/dlls/kernel32/nls/esp.nls
index c80b650ea3..a557a52b7d 100644
--- a/dlls/kernel32/nls/esp.nls
+++ b/dlls/kernel32/nls/esp.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esr.nls b/dlls/kernel32/nls/esr.nls
index 050e5e9f7b..752120dadf 100644
--- a/dlls/kernel32/nls/esr.nls
+++ b/dlls/kernel32/nls/esr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PERU
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "187"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "280a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ess.nls b/dlls/kernel32/nls/ess.nls
index c10084416b..30c96a0bf7 100644
--- a/dlls/kernel32/nls/ess.nls
+++ b/dlls/kernel32/nls/ess.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "11"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esu.nls b/dlls/kernel32/nls/esu.nls
index 25e5792edc..eb2ec3b04a 100644
--- a/dlls/kernel32/nls/esu.nls
+++ b/dlls/kernel32/nls/esu.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "202"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "500a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esv.nls b/dlls/kernel32/nls/esv.nls
index baa4396841..155ebef33c 100644
--- a/dlls/kernel32/nls/esv.nls
+++ b/dlls/kernel32/nls/esv.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "249"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "200a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esy.nls b/dlls/kernel32/nls/esy.nls
index 41d5f48480..9444f436a1 100644
--- a/dlls/kernel32/nls/esy.nls
+++ b/dlls/kernel32/nls/esy.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_URUGUAY
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "246"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "380a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esz.nls b/dlls/kernel32/nls/esz.nls
index 34c321bc66..82eb4241b2 100644
--- a/dlls/kernel32/nls/esz.nls
+++ b/dlls/kernel32/nls/esz.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "185"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/eti.nls b/dlls/kernel32/nls/eti.nls
index 31b8aa0349..8d7f0fe39c 100644
--- a/dlls/kernel32/nls/eti.nls
+++ b/dlls/kernel32/nls/eti.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "70"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0425"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/euq.nls b/dlls/kernel32/nls/euq.nls
index f5570f02cc..38d34312ea 100644
--- a/dlls/kernel32/nls/euq.nls
+++ b/dlls/kernel32/nls/euq.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042d"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls
index c67b78ae3c..ddc4495f77 100644
--- a/dlls/kernel32/nls/far.nls
+++ b/dlls/kernel32/nls/far.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "116"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0429"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/fin.nls b/dlls/kernel32/nls/fin.nls
index bc1221dcb3..29b7d2e897 100644
--- a/dlls/kernel32/nls/fin.nls
+++ b/dlls/kernel32/nls/fin.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "77"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040b"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/fos.nls b/dlls/kernel32/nls/fos.nls
index ad74d06ae6..5d53bcc81f 100644
--- a/dlls/kernel32/nls/fos.nls
+++ b/dlls/kernel32/nls/fos.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FAEROESE, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "81"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0438"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/fra.nls b/dlls/kernel32/nls/fra.nls
index 7a2da391dd..9a588a932e 100644
--- a/dlls/kernel32/nls/fra.nls
+++ b/dlls/kernel32/nls/fra.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "84"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frb.nls b/dlls/kernel32/nls/frb.nls
index 904e8e7f2e..7ee0b29751 100644
--- a/dlls/kernel32/nls/frb.nls
+++ b/dlls/kernel32/nls/frb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "21"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "080c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frc.nls b/dlls/kernel32/nls/frc.nls
index 8626473fc6..79eac11d96 100644
--- a/dlls/kernel32/nls/frc.nls
+++ b/dlls/kernel32/nls/frc.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "39"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c0c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frl.nls b/dlls/kernel32/nls/frl.nls
index cb7d36d2c9..29d2ad0c9c 100644
--- a/dlls/kernel32/nls/frl.nls
+++ b/dlls/kernel32/nls/frl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "147"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "140c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frm.nls b/dlls/kernel32/nls/frm.nls
index 5c3e6b192e..fa38552812 100644
--- a/dlls/kernel32/nls/frm.nls
+++ b/dlls/kernel32/nls/frm.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_MONACO
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "158"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "180c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frs.nls b/dlls/kernel32/nls/frs.nls
index 303be0a31b..cefb9d36db 100644
--- a/dlls/kernel32/nls/frs.nls
+++ b/dlls/kernel32/nls/frs.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "223"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "100c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/gae.nls b/dlls/kernel32/nls/gae.nls
index 8167cbcd60..e817403c43 100644
--- a/dlls/kernel32/nls/gae.nls
+++ b/dlls/kernel32/nls/gae.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_IRISH, SUBLANG_IRISH_IRELAND
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "68"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "083c"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/gdh.nls b/dlls/kernel32/nls/gdh.nls
index f8bdaa0b64..0cd5699120 100644
--- a/dlls/kernel32/nls/gdh.nls
+++ b/dlls/kernel32/nls/gdh.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_SCOTTISH_GAELIC, SUBLANG_SCOTTISH_GAELIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "242"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0491"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/gdv.nls b/dlls/kernel32/nls/gdv.nls
index c836eee807..0723813c14 100644
--- a/dlls/kernel32/nls/gdv.nls
+++ b/dlls/kernel32/nls/gdv.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "15126"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0494"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/glc.nls b/dlls/kernel32/nls/glc.nls
index 71b49390d8..f60a0aac69 100644
--- a/dlls/kernel32/nls/glc.nls
+++ b/dlls/kernel32/nls/glc.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0456"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/guj.nls b/dlls/kernel32/nls/guj.nls
index 4731cc5004..e24ba5e43f 100644
--- a/dlls/kernel32/nls/guj.nls
+++ b/dlls/kernel32/nls/guj.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GUJARATI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0447"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/heb.nls b/dlls/kernel32/nls/heb.nls
index 2ba57a50ab..2d69ffd467 100644
--- a/dlls/kernel32/nls/heb.nls
+++ b/dlls/kernel32/nls/heb.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "117"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040d"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/hin.nls b/dlls/kernel32/nls/hin.nls
index 3a70dc0db6..b32a057265 100644
--- a/dlls/kernel32/nls/hin.nls
+++ b/dlls/kernel32/nls/hin.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_HINDI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0439"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/hrv.nls b/dlls/kernel32/nls/hrv.nls
index faa39455d0..958e15e59e 100644
--- a/dlls/kernel32/nls/hrv.nls
+++ b/dlls/kernel32/nls/hrv.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "108"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/hun.nls b/dlls/kernel32/nls/hun.nls
index 3c95372f4f..c3dbb9773f 100644
--- a/dlls/kernel32/nls/hun.nls
+++ b/dlls/kernel32/nls/hun.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "109"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040e"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/hye.nls b/dlls/kernel32/nls/hye.nls
index fbd4b2b63a..2000280fe1 100644
--- a/dlls/kernel32/nls/hye.nls
+++ b/dlls/kernel32/nls/hye.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "7"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042b"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ind.nls b/dlls/kernel32/nls/ind.nls
index f160c6829e..c33acb8a3e 100644
--- a/dlls/kernel32/nls/ind.nls
+++ b/dlls/kernel32/nls/ind.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "111"
LOCALE_IINTLCURRDIGITS "0"
LOCALE_ILANGUAGE "0421"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/isl.nls b/dlls/kernel32/nls/isl.nls
index 0f13d17562..5a6c3d67e3 100644
--- a/dlls/kernel32/nls/isl.nls
+++ b/dlls/kernel32/nls/isl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ICELANDIC, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "110"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ita.nls b/dlls/kernel32/nls/ita.nls
index 205384f42e..256d546819 100644
--- a/dlls/kernel32/nls/ita.nls
+++ b/dlls/kernel32/nls/ita.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "118"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0410"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/its.nls b/dlls/kernel32/nls/its.nls
index f8a67e7b19..c9a6c1744c 100644
--- a/dlls/kernel32/nls/its.nls
+++ b/dlls/kernel32/nls/its.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN_SWISS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "223"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0810"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ivl.nls b/dlls/kernel32/nls/ivl.nls
index c55bea948f..6bfaf0f950 100644
--- a/dlls/kernel32/nls/ivl.nls
+++ b/dlls/kernel32/nls/ivl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_INVARIANT, SUBLANG_NEUTRAL
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "39070" /* World*/
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "007f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/jpn.nls b/dlls/kernel32/nls/jpn.nls
index 06ddccf859..39507dee84 100644
--- a/dlls/kernel32/nls/jpn.nls
+++ b/dlls/kernel32/nls/jpn.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "122"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0411"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/kan.nls b/dlls/kernel32/nls/kan.nls
index 9c82d16dc9..e6934d1a42 100644
--- a/dlls/kernel32/nls/kan.nls
+++ b/dlls/kernel32/nls/kan.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KANNADA, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "044b"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/kat.nls b/dlls/kernel32/nls/kat.nls
index e2596483c3..26e165001e 100644
--- a/dlls/kernel32/nls/kat.nls
+++ b/dlls/kernel32/nls/kat.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GEORGIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "88"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0437"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/kkz.nls b/dlls/kernel32/nls/kkz.nls
index c23ded5a00..5a8451563b 100644
--- a/dlls/kernel32/nls/kkz.nls
+++ b/dlls/kernel32/nls/kkz.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KAZAK, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "137"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "043f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/knk.nls b/dlls/kernel32/nls/knk.nls
index 44e19e8a7b..c2526d2c81 100644
--- a/dlls/kernel32/nls/knk.nls
+++ b/dlls/kernel32/nls/knk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KONKANI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0457"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/kor.nls b/dlls/kernel32/nls/kor.nls
index 26ebe7f520..9d44870b39 100644
--- a/dlls/kernel32/nls/kor.nls
+++ b/dlls/kernel32/nls/kor.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KOREAN, SUBLANG_KOREAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "134"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0412"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/kyr.nls b/dlls/kernel32/nls/kyr.nls
index e0ade28a16..7ab2a4d0b6 100644
--- a/dlls/kernel32/nls/kyr.nls
+++ b/dlls/kernel32/nls/kyr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KYRGYZ, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "130"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0440"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/lth.nls b/dlls/kernel32/nls/lth.nls
index 9f3fc4f195..fa1417357a 100644
--- a/dlls/kernel32/nls/lth.nls
+++ b/dlls/kernel32/nls/lth.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "141"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0427"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/lvi.nls b/dlls/kernel32/nls/lvi.nls
index bdff4bf2b8..3faa56bf54 100644
--- a/dlls/kernel32/nls/lvi.nls
+++ b/dlls/kernel32/nls/lvi.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "140"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0426"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/mar.nls b/dlls/kernel32/nls/mar.nls
index d7b31a757b..3069a59070 100644
--- a/dlls/kernel32/nls/mar.nls
+++ b/dlls/kernel32/nls/mar.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MARATHI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "044e"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/mki.nls b/dlls/kernel32/nls/mki.nls
index 6103b42265..30efc19b37 100644
--- a/dlls/kernel32/nls/mki.nls
+++ b/dlls/kernel32/nls/mki.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MACEDONIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "19618"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/mon.nls b/dlls/kernel32/nls/mon.nls
index 41516fb4bc..c60ec86c91 100644
--- a/dlls/kernel32/nls/mon.nls
+++ b/dlls/kernel32/nls/mon.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MONGOLIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "154"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0450"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/msb.nls b/dlls/kernel32/nls/msb.nls
index bbba93f642..0e232cfcb0 100644
--- a/dlls/kernel32/nls/msb.nls
+++ b/dlls/kernel32/nls/msb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "37"
LOCALE_IINTLCURRDIGITS "0"
LOCALE_ILANGUAGE "083e"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/msl.nls b/dlls/kernel32/nls/msl.nls
index 3bffbb6d1d..1df52003c2 100644
--- a/dlls/kernel32/nls/msl.nls
+++ b/dlls/kernel32/nls/msl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_MALAYSIA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "167"
LOCALE_IINTLCURRDIGITS "0"
LOCALE_ILANGUAGE "043e"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/nep.nls b/dlls/kernel32/nls/nep.nls
index c8b5d74def..63946744cb 100644
--- a/dlls/kernel32/nls/nep.nls
+++ b/dlls/kernel32/nls/nep.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_NEPALI, SUBLANG_NEPALI_NEPAL
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "178"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0461"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/nlb.nls b/dlls/kernel32/nls/nlb.nls
index 8af8f48ee1..17fd3790de 100644
--- a/dlls/kernel32/nls/nlb.nls
+++ b/dlls/kernel32/nls/nlb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_BELGIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "21"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0813"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/nld.nls b/dlls/kernel32/nls/nld.nls
index 6abf0dd3fd..47de663dec 100644
--- a/dlls/kernel32/nls/nld.nls
+++ b/dlls/kernel32/nls/nld.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "176"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0413"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/nls.nls b/dlls/kernel32/nls/nls.nls
index 8ebbfdf071..b29f0bc3a1 100644
--- a/dlls/kernel32/nls/nls.nls
+++ b/dlls/kernel32/nls/nls.nls
@@ -46,6 +46,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_SURINAM
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "181"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c13"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/non.nls b/dlls/kernel32/nls/non.nls
index 9a2eefa42f..ac6827536f 100644
--- a/dlls/kernel32/nls/non.nls
+++ b/dlls/kernel32/nls/non.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "177"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0814"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/nor.nls b/dlls/kernel32/nls/nor.nls
index eb65152380..bd78390541 100644
--- a/dlls/kernel32/nls/nor.nls
+++ b/dlls/kernel32/nls/nor.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "177"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0414"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/pan.nls b/dlls/kernel32/nls/pan.nls
index 358a9eb97a..bd8aeb883f 100644
--- a/dlls/kernel32/nls/pan.nls
+++ b/dlls/kernel32/nls/pan.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_PUNJABI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0446"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/plk.nls b/dlls/kernel32/nls/plk.nls
index 6e1447dc15..b79020ecb0 100644
--- a/dlls/kernel32/nls/plk.nls
+++ b/dlls/kernel32/nls/plk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "191"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0415"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ptb.nls b/dlls/kernel32/nls/ptb.nls
index e66c09a3cc..66cc65be83 100644
--- a/dlls/kernel32/nls/ptb.nls
+++ b/dlls/kernel32/nls/ptb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "32"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0416"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ptg.nls b/dlls/kernel32/nls/ptg.nls
index a7c6496b25..c75d5a1caf 100644
--- a/dlls/kernel32/nls/ptg.nls
+++ b/dlls/kernel32/nls/ptg.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "193"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0816"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/rmc.nls b/dlls/kernel32/nls/rmc.nls
index c41a31dedd..f54db3585a 100644
--- a/dlls/kernel32/nls/rmc.nls
+++ b/dlls/kernel32/nls/rmc.nls
@@ -51,6 +51,7 @@ STRINGTABLE LANGUAGE LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "223"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0417"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/rom.nls b/dlls/kernel32/nls/rom.nls
index 420154c5d1..fd519238dd 100644
--- a/dlls/kernel32/nls/rom.nls
+++ b/dlls/kernel32/nls/rom.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "200"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0418"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/rus.nls b/dlls/kernel32/nls/rus.nls
index a066c81c4a..5c78460f66 100644
--- a/dlls/kernel32/nls/rus.nls
+++ b/dlls/kernel32/nls/rus.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "203"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0419"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/san.nls b/dlls/kernel32/nls/san.nls
index 57ee6a54b2..4f44f3e3d9 100644
--- a/dlls/kernel32/nls/san.nls
+++ b/dlls/kernel32/nls/san.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SANSKRIT, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "044f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls
index cc5465f4dc..31d258b673 100644
--- a/dlls/kernel32/nls/sin.nls
+++ b/dlls/kernel32/nls/sin.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "42"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "045B"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/sky.nls b/dlls/kernel32/nls/sky.nls
index 0e140e02de..29647b2b1b 100644
--- a/dlls/kernel32/nls/sky.nls
+++ b/dlls/kernel32/nls/sky.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "143"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041b"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/slv.nls b/dlls/kernel32/nls/slv.nls
index f5c0ffc94f..8f7fc66ac7 100644
--- a/dlls/kernel32/nls/slv.nls
+++ b/dlls/kernel32/nls/slv.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "212"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0424"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/sqi.nls b/dlls/kernel32/nls/sqi.nls
index 41b4085e10..6f4048230e 100644
--- a/dlls/kernel32/nls/sqi.nls
+++ b/dlls/kernel32/nls/sqi.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ALBANIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "6"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041c"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls
index 500e36bb63..eb500cf0fd 100644
--- a/dlls/kernel32/nls/srb.nls
+++ b/dlls/kernel32/nls/srb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "271"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c1a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls
index 85f156d656..948b5e11a2 100644
--- a/dlls/kernel32/nls/srl.nls
+++ b/dlls/kernel32/nls/srl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "271"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "081a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/sve.nls b/dlls/kernel32/nls/sve.nls
index cff29a267a..6c8db124a6 100644
--- a/dlls/kernel32/nls/sve.nls
+++ b/dlls/kernel32/nls/sve.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "221"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041d"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/svf.nls b/dlls/kernel32/nls/svf.nls
index 2b97b4fe03..59982e8a39 100644
--- a/dlls/kernel32/nls/svf.nls
+++ b/dlls/kernel32/nls/svf.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "77"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "081d"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/swk.nls b/dlls/kernel32/nls/swk.nls
index 28e9dfc1aa..6308562991 100644
--- a/dlls/kernel32/nls/swk.nls
+++ b/dlls/kernel32/nls/swk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SWAHILI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "129"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0441"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/syr.nls b/dlls/kernel32/nls/syr.nls
index 9e6453d77f..6f8aa76602 100644
--- a/dlls/kernel32/nls/syr.nls
+++ b/dlls/kernel32/nls/syr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SYRIAC, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "222"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "045a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/tam.nls b/dlls/kernel32/nls/tam.nls
index ba32416f42..8db932bf65 100644
--- a/dlls/kernel32/nls/tam.nls
+++ b/dlls/kernel32/nls/tam.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_TAMIL, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0449"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/tel.nls b/dlls/kernel32/nls/tel.nls
index 59078d15ee..37586776ea 100644
--- a/dlls/kernel32/nls/tel.nls
+++ b/dlls/kernel32/nls/tel.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_TELUGU, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "044a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls
index 3995c74368..2097b3728d 100644
--- a/dlls/kernel32/nls/tha.nls
+++ b/dlls/kernel32/nls/tha.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "227"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041e"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/trk.nls b/dlls/kernel32/nls/trk.nls
index 0b68b5bbce..3954b4b63e 100644
--- a/dlls/kernel32/nls/trk.nls
+++ b/dlls/kernel32/nls/trk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "235"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ttt.nls b/dlls/kernel32/nls/ttt.nls
index cae2f9418c..64cdb3d102 100644
--- a/dlls/kernel32/nls/ttt.nls
+++ b/dlls/kernel32/nls/ttt.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "203"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0444"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ukr.nls b/dlls/kernel32/nls/ukr.nls
index 142133ea9c..e13ac684fc 100644
--- a/dlls/kernel32/nls/ukr.nls
+++ b/dlls/kernel32/nls/ukr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "241"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0422"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/urd.nls b/dlls/kernel32/nls/urd.nls
index d8b6c30135..1bebe46e74 100644
--- a/dlls/kernel32/nls/urd.nls
+++ b/dlls/kernel32/nls/urd.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_URDU, SUBLANG_URDU_PAKISTAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "1"
+ LOCALE_IGEOID "190"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0420"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/uzb.nls b/dlls/kernel32/nls/uzb.nls
index 022f7f59af..1257f39f2f 100644
--- a/dlls/kernel32/nls/uzb.nls
+++ b/dlls/kernel32/nls/uzb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "247"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0843"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/uzl.nls b/dlls/kernel32/nls/uzl.nls
index 88206a9038..b03cfb6fb1 100644
--- a/dlls/kernel32/nls/uzl.nls
+++ b/dlls/kernel32/nls/uzl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_LATIN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "247"
LOCALE_IINTLCURRDIGITS "0"
LOCALE_ILANGUAGE "0443"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls
index 3813cafb6b..17389243dc 100644
--- a/dlls/kernel32/nls/vit.nls
+++ b/dlls/kernel32/nls/vit.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "251"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/wal.nls b/dlls/kernel32/nls/wal.nls
index d86f9d6803..3e5f9585d7 100644
--- a/dlls/kernel32/nls/wal.nls
+++ b/dlls/kernel32/nls/wal.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "21"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0490"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/zhh.nls b/dlls/kernel32/nls/zhh.nls
index 19e1961393..f6aca66bd1 100644
--- a/dlls/kernel32/nls/zhh.nls
+++ b/dlls/kernel32/nls/zhh.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "104"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c04"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/zhi.nls b/dlls/kernel32/nls/zhi.nls
index 941ec6e664..8b304d7514 100644
--- a/dlls/kernel32/nls/zhi.nls
+++ b/dlls/kernel32/nls/zhi.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "215"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1004"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/zhm.nls b/dlls/kernel32/nls/zhm.nls
index 8cef84265b..1a915bda16 100644
--- a/dlls/kernel32/nls/zhm.nls
+++ b/dlls/kernel32/nls/zhm.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "151"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1404"
LOCALE_ILDATE "1"
--
2.24.0
3
9
2
1
18 Nov '19
Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com>
---
They are a gcc thing, Visual Studio rejects them.
---
dlls/d3d11/tests/d3d11.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 1dbd4050011..f378ae52ecc 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -19422,9 +19422,9 @@ static void test_uav_load(void)
#define R32_FLOAT DXGI_FORMAT_R32_FLOAT
#define R32_UINT DXGI_FORMAT_R32_UINT
#define R32_SINT DXGI_FORMAT_R32_SINT
- {&ps_ld_2d_float, &float_2d, {R32_FLOAT, TEX_2D, 0}, {}, (const DWORD *)float_data},
- {&ps_ld_2d_uint, &uint_2d, {R32_UINT, TEX_2D, 0}, {}, (const DWORD *)uint_data},
- {&ps_ld_2d_int, &int_2d, {R32_SINT, TEX_2D, 0}, {}, (const DWORD *)int_data},
+ {&ps_ld_2d_float, &float_2d, {R32_FLOAT, TEX_2D, 0}, {0}, (const DWORD *)float_data},
+ {&ps_ld_2d_uint, &uint_2d, {R32_UINT, TEX_2D, 0}, {0}, (const DWORD *)uint_data},
+ {&ps_ld_2d_int, &int_2d, {R32_SINT, TEX_2D, 0}, {0}, (const DWORD *)int_data},
{&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 0, ~0u}, {0}, (const DWORD *)uint_data},
{&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 0, ~0u}, {1}, (const DWORD *)uint_data2},
{&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 0, ~0u}, {2}, (const DWORD *)uint_data3},
--
2.23.0
3
5
18 Nov '19
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
dlls/d3d9/device.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index ec1800a6492..5ef0c9cdf66 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1007,6 +1007,8 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device,
if (!extended)
{
device->auto_mipmaps = 0;
+ wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE,
+ !!swapchain_desc.enable_auto_depth_stencil);
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE,
!!swapchain_desc.enable_auto_depth_stencil);
}
@@ -4630,6 +4632,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine
wined3d_swapchain_incref(d3d_swapchain->wined3d_swapchain);
IDirect3DSwapChain9Ex_Release(&d3d_swapchain->IDirect3DSwapChain9Ex_iface);
+ wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE,
+ !!swapchain_desc->enable_auto_depth_stencil);
wined3d_device_set_render_state(device->wined3d_device,
WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil);
--
2.23.0
3
6
[PATCH vkd3d 1/2] vkd3d: Always return a valid allocation size for D3D12 default alignments.
by Conor McCarthy 18 Nov '19
by Conor McCarthy 18 Nov '19
18 Nov '19
Some hardware and driver combinations, e.g. AMD RX 580 / RADV, do not support
alignments of 0x1000 and 0x10000. This causes GetResourceAllocationInfo() to
return a size of ~0 for valid D3D12 alignments. Some games do not check for
this. For example Hitman 2 will allocate heaps of size 0xffffffff and run out
of vram. This patch also fixes RX 580 alignment test failures.
Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com>
---
libs/vkd3d/device.c | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 0624318..7421978 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -2893,6 +2893,19 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptorsSimple(ID3D12Device *i
1, &src_descriptor_range_offset, &descriptor_count, descriptor_heap_type);
}
+static bool d3d12_validate_resource_alignment(const D3D12_RESOURCE_DESC *desc,
+ uint64_t requested_alignment, uint64_t vk_alignment, uint64_t estimated_size)
+{
+ /* We must return true if the requested alignment is one of D3D12's default alignments. Some games,
+ * e.g. Hitman 2, assume that these will work and don't check the returned allocation size for ~0. */
+ if (requested_alignment == D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT)
+ return estimated_size <= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
+
+ return !(desc->Alignment % vk_alignment)
+ || requested_alignment == D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT
+ || (desc->SampleDesc.Count > 1 && requested_alignment == D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT);
+}
+
static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResourceAllocationInfo(
ID3D12Device *iface, D3D12_RESOURCE_ALLOCATION_INFO *info, UINT visible_mask,
UINT count, const D3D12_RESOURCE_DESC *resource_descs)
@@ -2930,6 +2943,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour
if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
{
+ estimated_size = desc->Width;
info->SizeInBytes = desc->Width;
info->Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
}
@@ -2943,21 +2957,20 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour
info->Alignment = max(info->Alignment, requested_alignment);
- if (info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)
+ if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0)))
{
- if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0)))
- {
- WARN("Invalid format %#x.\n", desc->Format);
- goto invalid;
- }
-
- estimated_size = desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count;
- if (estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)
- info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT);
+ WARN("Invalid format %#x.\n", desc->Format);
+ goto invalid;
}
+
+ estimated_size = desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count;
+
+ if (info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT
+ && estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)
+ info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT);
}
- if (desc->Alignment % info->Alignment)
+ if (!d3d12_validate_resource_alignment(desc, requested_alignment, info->Alignment, estimated_size))
{
WARN("Invalid resource alignment %#"PRIx64" (required %#"PRIx64").\n",
desc->Alignment, info->Alignment);
--
2.23.0
2
8
From: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr>
Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr>
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/wbemprox/builtin.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 96d1e0b850..53d4b169cd 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -2341,7 +2341,13 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c
goto done;
}
if (!wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW )) continue;
- new_path = append_path( path, data.cFileName, &len );
+
+ if (!(new_path = append_path( path, data.cFileName, &len )))
+ {
+ status = FILL_STATUS_FAILED;
+ FindClose( handle );
+ goto done;
+ }
if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
{
@@ -2354,6 +2360,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c
rec = (struct record_datafile *)(table->data + offset);
rec->name = build_name( root[0], new_path );
rec->version = get_file_version( rec->name );
+ heap_free( new_path );
if (!match_row( table, row, cond, &status ))
{
free_row_values( table, row );
@@ -2465,7 +2472,13 @@ static enum fill_status fill_directory( struct table *table, const struct expr *
!wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW ))
continue;
- new_path = append_path( path, data.cFileName, &len );
+ if (!(new_path = append_path( path, data.cFileName, &len )))
+ {
+ FindClose( handle );
+ status = FILL_STATUS_FAILED;
+ goto done;
+ }
+
if (!(push_dir( dirstack, new_path, len )))
{
heap_free( new_path );
@@ -2476,6 +2489,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr *
rec = (struct record_directory *)(table->data + offset);
rec->accessmask = FILE_ALL_ACCESS;
rec->name = build_name( root[0], new_path );
+ heap_free( new_path );
if (!match_row( table, row, cond, &status ))
{
free_row_values( table, row );
--
2.20.1
1
0
[PATCH vkd3d v2] vkd3d: Add an optional memory info callback extension.
by Conor McCarthy 18 Nov '19
by Conor McCarthy 18 Nov '19
18 Nov '19
Allows memory info to be sent to Wine DXGI.
Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com>
---
include/vkd3d.h | 12 ++++++++++++
libs/vkd3d/command.c | 5 +++--
libs/vkd3d/device.c | 32 +++++++++++++++++++++++++++++++-
libs/vkd3d/resource.c | 20 ++++++++++++++++++--
libs/vkd3d/vkd3d_private.h | 18 ++++++++++++++++++
5 files changed, 82 insertions(+), 5 deletions(-)
diff --git a/include/vkd3d.h b/include/vkd3d.h
index e2d9ec8..2b98a22 100644
--- a/include/vkd3d.h
+++ b/include/vkd3d.h
@@ -47,6 +47,7 @@ enum vkd3d_structure_type
/* 1.2 */
VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO,
VKD3D_STRUCTURE_TYPE_APPLICATION_INFO,
+ VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_CALLBACK_INFO,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE),
};
@@ -129,6 +130,17 @@ struct vkd3d_optional_device_extensions_info
uint32_t extension_count;
};
+typedef void (STDMETHODCALLTYPE *PFN_vkd3d_memory_usage_callback)(IUnknown *adapter,
+ unsigned int non_local, UINT64 total, UINT64 usage);
+
+struct vkd3d_optional_device_callback_info
+{
+ enum vkd3d_structure_type type;
+ const void *next;
+
+ PFN_vkd3d_memory_usage_callback pfn_memory_usage_callback;
+};
+
/* vkd3d_image_resource_create_info flags */
#define VKD3D_RESOURCE_INITIAL_STATE_TRANSITION 0x00000001
#define VKD3D_RESOURCE_PRESENT_STATE_TRANSITION 0x00000002
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 0532ec0..92aaf8d 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -1418,6 +1418,7 @@ static void vkd3d_buffer_destroy(struct vkd3d_buffer *buffer, struct d3d12_devic
VK_CALL(vkFreeMemory(device->vk_device, buffer->vk_memory, NULL));
VK_CALL(vkDestroyBuffer(device->vk_device, buffer->vk_buffer, NULL));
+ d3d12_device_update_memory_usage(device, buffer->vk_memory_type, -(int64_t)buffer->vk_memory_size);
}
static void d3d12_command_allocator_free_resources(struct d3d12_command_allocator *allocator,
@@ -3198,8 +3199,8 @@ static HRESULT d3d12_command_list_allocate_transfer_buffer(struct d3d12_command_
if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
&buffer_desc, &buffer->vk_buffer)))
return hr;
- if (FAILED(hr = vkd3d_allocate_buffer_memory(device, buffer->vk_buffer,
- &heap_properties, D3D12_HEAP_FLAG_NONE, &buffer->vk_memory, NULL, NULL)))
+ if (FAILED(hr = vkd3d_allocate_buffer_memory(device, buffer->vk_buffer, &heap_properties,
+ D3D12_HEAP_FLAG_NONE, &buffer->vk_memory, &buffer->vk_memory_type, &buffer->vk_memory_size)))
{
VK_CALL(vkDestroyBuffer(device->vk_device, buffer->vk_buffer, NULL));
return hr;
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 7421978..23f165e 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -1682,6 +1682,20 @@ static HRESULT vkd3d_select_queues(const struct vkd3d_instance *vkd3d_instance,
return S_OK;
}
+static uint64_t vkd3d_compute_total_device_memory(struct d3d12_device *device, VkMemoryHeapFlags local_flag)
+{
+ uint64_t total = 0;
+ uint32_t i;
+
+ for (i = 0; i < device->memory_properties.memoryHeapCount; ++i)
+ {
+ const VkMemoryHeap *heap = &device->memory_properties.memoryHeaps[i];
+ if ((heap->flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) == local_flag)
+ total += heap->size;
+ }
+ return total;
+}
+
static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
const struct vkd3d_device_create_info *create_info)
{
@@ -1720,6 +1734,10 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
device_queue_info.family_index[VKD3D_QUEUE_FAMILY_TRANSFER]);
VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties));
+ device->memory_total[0] = vkd3d_compute_total_device_memory(device, VK_MEMORY_HEAP_DEVICE_LOCAL_BIT);
+ device->memory_total[1] = vkd3d_compute_total_device_memory(device, 0);
+ device->memory_usage[0] = 0;
+ device->memory_usage[1] = 0;
vkd3d_physical_device_info_init(&physical_device_info, device);
@@ -3425,6 +3443,7 @@ struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface)
static HRESULT d3d12_device_init(struct d3d12_device *device,
struct vkd3d_instance *instance, const struct vkd3d_device_create_info *create_info)
{
+ const struct vkd3d_optional_device_callback_info *optional_callback;
const struct vkd3d_vk_device_procs *vk_procs;
HRESULT hr;
size_t i;
@@ -3442,6 +3461,17 @@ static HRESULT d3d12_device_init(struct d3d12_device *device,
device->vk_device = VK_NULL_HANDLE;
+ device->parent = create_info->parent;
+
+ device->pfn_memory_usage_callback = NULL;
+ optional_callback = vkd3d_find_struct(create_info->next, OPTIONAL_DEVICE_CALLBACK_INFO);
+ if (optional_callback)
+ {
+ device->pfn_memory_usage_callback = optional_callback->pfn_memory_usage_callback;
+ if (device->pfn_memory_usage_callback)
+ TRACE("Found memory callback function %p.\n", device->pfn_memory_usage_callback);
+ }
+
if (FAILED(hr = vkd3d_create_vk_device(device, create_info)))
goto out_free_instance;
@@ -3466,7 +3496,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device,
for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i)
pthread_mutex_init(&device->desc_mutex[i], NULL);
- if ((device->parent = create_info->parent))
+ if (device->parent)
IUnknown_AddRef(device->parent);
return S_OK;
diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 45a80af..27ed574 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -161,6 +161,7 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu
VkMemoryRequirements2 memory_requirements2;
VkMemoryRequirements *memory_requirements;
VkBufferMemoryRequirementsInfo2 info;
+ uint32_t type;
VkResult vr;
HRESULT hr;
@@ -196,7 +197,7 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu
}
if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags,
- memory_requirements, dedicated_allocation, vk_memory, vk_memory_type)))
+ memory_requirements, dedicated_allocation, vk_memory, &type)))
return hr;
if ((vr = VK_CALL(vkBindBufferMemory(device->vk_device, vk_buffer, *vk_memory, 0))) < 0)
@@ -206,6 +207,10 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu
*vk_memory = VK_NULL_HANDLE;
}
+ d3d12_device_update_memory_usage(device, type, memory_requirements->size);
+
+ if (vk_memory_type)
+ *vk_memory_type = type;
if (vk_memory_size)
*vk_memory_size = memory_requirements->size;
@@ -223,6 +228,7 @@ static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage
VkMemoryRequirements2 memory_requirements2;
VkMemoryRequirements *memory_requirements;
VkImageMemoryRequirementsInfo2 info;
+ uint32_t type;
VkResult vr;
HRESULT hr;
@@ -258,7 +264,7 @@ static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage
}
if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags,
- memory_requirements, dedicated_allocation, vk_memory, vk_memory_type)))
+ memory_requirements, dedicated_allocation, vk_memory, &type)))
return hr;
if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, vk_image, *vk_memory, 0))) < 0)
@@ -269,6 +275,10 @@ static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage
return hresult_from_vk_result(vr);
}
+ d3d12_device_update_memory_usage(device, type, memory_requirements->size);
+
+ if (vk_memory_type)
+ *vk_memory_type = type;
if (vk_memory_size)
*vk_memory_size = memory_requirements->size;
@@ -334,7 +344,10 @@ static void d3d12_heap_destroy(struct d3d12_heap *heap)
vkd3d_free(heap);
if (device)
+ {
+ d3d12_device_update_memory_usage(device, heap->vk_memory_type, -(INT64)heap->desc.SizeInBytes);
d3d12_device_release(device);
+ }
}
static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface)
@@ -632,6 +645,9 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap,
hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties,
heap->desc.Flags, &memory_requirements, NULL,
&heap->vk_memory, &heap->vk_memory_type);
+
+ if (SUCCEEDED(hr))
+ d3d12_device_update_memory_usage(device, heap->vk_memory_type, memory_requirements.size);
}
if (FAILED(hr))
{
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index daa521d..d4394fc 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -814,6 +814,8 @@ struct vkd3d_buffer
{
VkBuffer vk_buffer;
VkDeviceMemory vk_memory;
+ VkDeviceSize vk_memory_size;
+ uint32_t vk_memory_type;
};
/* ID3D12CommandAllocator */
@@ -1072,6 +1074,9 @@ struct d3d12_device
VkPipelineCache vk_pipeline_cache;
VkPhysicalDeviceMemoryProperties memory_properties;
+ uint64_t memory_total[2];
+ uint64_t memory_usage[2];
+ PFN_vkd3d_memory_usage_callback pfn_memory_usage_callback;
D3D12_FEATURE_DATA_D3D12_OPTIONS feature_options;
@@ -1141,6 +1146,19 @@ static inline pthread_mutex_t *d3d12_device_get_descriptor_mutex(struct d3d12_de
return &device->desc_mutex[idx & (ARRAY_SIZE(device->desc_mutex) - 1)];
}
+static inline void d3d12_device_update_memory_usage(struct d3d12_device *device, uint32_t vk_memory_type, int64_t change)
+{
+ unsigned int non_local = !(device->memory_properties.memoryTypes[vk_memory_type].propertyFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+ device->memory_usage[non_local] += change;
+ if (device->memory_usage[non_local] > device->memory_total[non_local])
+ WARN("Current type %u usage estimate 0x%"PRIx64" exceeds 0x%"PRIx64" available.\n",
+ vk_memory_type, device->memory_usage[non_local], device->memory_total[non_local]);
+
+ if (device->pfn_memory_usage_callback)
+ device->pfn_memory_usage_callback(device->parent, non_local,
+ device->memory_total[non_local], device->memory_usage[non_local]);
+}
+
/* utils */
enum vkd3d_format_type
{
--
2.23.0
2
3
[PATCH 4/4] setupapi: Set device SPDRP_CLASS registry property in create_device().
by Zhiyi Zhang 18 Nov '19
by Zhiyi Zhang 18 Nov '19
18 Nov '19
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
dlls/setupapi/devinst.c | 10 +++++++++-
dlls/setupapi/tests/devinst.c | 8 ++++----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 61ddade405..25d4040da0 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -751,7 +751,9 @@ static struct device *create_device(struct DeviceInfoSet *set,
{
const DWORD one = 1;
struct device *device;
- WCHAR guidstr[39];
+ WCHAR guidstr[MAX_GUID_STRING_LEN];
+ WCHAR class_name[MAX_CLASS_NAME_LEN];
+ DWORD size;
TRACE("%p, %s, %s, %d\n", set, debugstr_guid(class),
debugstr_w(instanceid), phantom);
@@ -796,6 +798,12 @@ static struct device *create_device(struct DeviceInfoSet *set,
SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASSGUID,
(const BYTE *)guidstr, sizeof(guidstr));
+ if (SetupDiClassNameFromGuidW(class, class_name, ARRAY_SIZE(class_name), NULL))
+ {
+ size = (lstrlenW(class_name) + 1) * sizeof(WCHAR);
+ SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASS, (const BYTE *)class_name, size);
+ }
+
TRACE("Created new device %p.\n", device);
return device;
}
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 2f81a3abf5..68478b5d80 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -1643,8 +1643,8 @@ todo_wine {
/* Have SPDRP_CLASS property */
memset(buf, 0, sizeof(buf));
ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL);
- todo_wine ok(ret, "Failed to get property, error %#x.\n", GetLastError());
- todo_wine ok(!lstrcmpA(buf, "Display"), "Got unexpected value %s.\n", buf);
+ ok(ret, "Failed to get property, error %#x.\n", GetLastError());
+ ok(!lstrcmpA(buf, "Display"), "Got unexpected value %s.\n", buf);
SetupDiDestroyDeviceInfoList(set);
}
@@ -1803,8 +1803,8 @@ todo_wine {
/* Have SPDRP_CLASS property */
memset(buf, 0, sizeof(buf));
ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL);
- todo_wine ok(ret, "Failed to get property, error %#x.\n", GetLastError());
- todo_wine ok(!lstrcmpW(buf, L"Display"), "Got unexpected value %s.\n", wine_dbgstr_w(buf));
+ ok(ret, "Failed to get property, error %#x.\n", GetLastError());
+ ok(!lstrcmpW(buf, L"Display"), "Got unexpected value %s.\n", wine_dbgstr_w(buf));
SetupDiDestroyDeviceInfoList(set);
}
--
2.24.0
1
0
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
loader/wine.inf.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index c0f6e0a391..19c034d7fd 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -510,6 +510,10 @@ HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"Locale",0x1
[ControlClass]
HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},,,"Disk drives"
HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},"Class",,"DiskDrive"
+HKLM,System\CurrentControlSet\Control\Class\{4d36e968-e325-11ce-bfc1-08002be10318},,,"Display adapters"
+HKLM,System\CurrentControlSet\Control\Class\{4d36e968-e325-11ce-bfc1-08002be10318},"Class",,"Display"
+HKLM,System\CurrentControlSet\Control\Class\{4d36e96e-e325-11ce-bfc1-08002be10318},,,"Monitors"
+HKLM,System\CurrentControlSet\Control\Class\{4d36e96e-e325-11ce-bfc1-08002be10318},"Class",,"Monitor"
HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)"
HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports"
HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},,,"System devices"
--
2.24.0
1
0
18 Nov '19
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
dlls/setupapi/tests/devinst.c | 117 +++++++++++++++++++++++++++++++++-
1 file changed, 115 insertions(+), 2 deletions(-)
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 452a570c4f..2f81a3abf5 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -27,6 +27,7 @@
#include "winuser.h"
#include "winreg.h"
#include "initguid.h"
+#include "devguid.h"
#include "devpkey.h"
#include "setupapi.h"
#include "cfgmgr32.h"
@@ -1496,7 +1497,7 @@ static void test_registry_property_a(void)
{
static const CHAR bogus[] = "System\\CurrentControlSet\\Enum\\Root\\LEGACY_BOGUS";
SP_DEVINFO_DATA device = {sizeof(device)};
- CHAR buf[6] = "";
+ CHAR buf[64] = "";
DWORD size, type;
HDEVINFO set;
BOOL ret;
@@ -1590,13 +1591,69 @@ todo_wine {
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, bogus, &key);
ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n");
+
+ /* Test existing registry properties right after device creation */
+ set = SetupDiCreateDeviceInfoList(&guid, NULL);
+ ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError());
+
+ /* Create device from a not registered class without device name */
+ ret = SetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, DICD_GENERATE_ID, &device);
+ ok(ret, "Failed to create device, error %#x.\n", GetLastError());
+
+ /* No SPDRP_DEVICEDESC property */
+ SetLastError(0xdeadbeef);
+ ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVICEDESC, NULL, (BYTE *)buf, sizeof(buf), NULL);
+ ok(!ret, "Expected failure.\n");
+ ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError());
+
+ /* No SPDRP_CLASS property */
+ SetLastError(0xdeadbeef);
+ ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL);
+ ok(!ret, "Expected failure.\n");
+ ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError());
+
+ /* Have SPDRP_CLASSGUID property */
+ memset(buf, 0, sizeof(buf));
+ ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CLASSGUID, NULL, (BYTE *)buf, sizeof(buf), NULL);
+ ok(ret, "Failed to get property, error %#x.\n", GetLastError());
+ ok(!lstrcmpiA(buf, "{6a55b5a4-3f65-11db-b704-0011955c2bdb}"), "Got unexpected value %s.\n", buf);
+
+ ret = SetupDiDeleteDeviceInfo(set, &device);
+ ok(ret, "Failed to delete device, error %#x.\n", GetLastError());
+
+ /* Create device from a not registered class with a device name */
+ ret = SetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, "device_name", NULL, DICD_GENERATE_ID, &device);
+ ok(ret, "Failed to create device, error %#x.\n", GetLastError());
+
+ /* Have SPDRP_DEVICEDESC property */
+ memset(buf, 0, sizeof(buf));
+ ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVICEDESC, NULL, (BYTE *)buf, sizeof(buf), NULL);
+ ok(ret, "Failed to get property, error %#x.\n", GetLastError());
+ ok(!lstrcmpA(buf, "device_name"), "Got unexpected value %s.\n", buf);
+
+ SetupDiDestroyDeviceInfoList(set);
+
+ /* Create device from a registered class */
+ set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL);
+ ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError());
+
+ ret = SetupDiCreateDeviceInfoA(set, "display", &GUID_DEVCLASS_DISPLAY, NULL, NULL, DICD_GENERATE_ID, &device);
+ ok(ret, "Failed to create device, error %#x.\n", GetLastError());
+
+ /* Have SPDRP_CLASS property */
+ memset(buf, 0, sizeof(buf));
+ ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL);
+ todo_wine ok(ret, "Failed to get property, error %#x.\n", GetLastError());
+ todo_wine ok(!lstrcmpA(buf, "Display"), "Got unexpected value %s.\n", buf);
+
+ SetupDiDestroyDeviceInfoList(set);
}
static void test_registry_property_w(void)
{
WCHAR friendly_name[] = {'B','o','g','u','s',0};
SP_DEVINFO_DATA device = {sizeof(device)};
- WCHAR buf[6] = {0};
+ WCHAR buf[64] = {0};
DWORD size, type;
HDEVINFO set;
BOOL ret;
@@ -1694,6 +1751,62 @@ todo_wine {
res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key);
ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n");
+
+ /* Test existing registry properties right after device creation */
+ set = SetupDiCreateDeviceInfoList(&guid, NULL);
+ ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError());
+
+ /* Create device from a not registered class without device name */
+ ret = SetupDiCreateDeviceInfoW(set, L"LEGACY_BOGUS", &guid, NULL, NULL, DICD_GENERATE_ID, &device);
+ ok(ret, "Failed to create device, error %#x.\n", GetLastError());
+
+ /* No SPDRP_DEVICEDESC property */
+ SetLastError(0xdeadbeef);
+ ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_DEVICEDESC, NULL, (BYTE *)buf, sizeof(buf), NULL);
+ ok(!ret, "Expected failure.\n");
+ ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError());
+
+ /* No SPDRP_CLASS property */
+ SetLastError(0xdeadbeef);
+ ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL);
+ ok(!ret, "Expected failure.\n");
+ ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError());
+
+ /* Have SPDRP_CLASSGUID property */
+ memset(buf, 0, sizeof(buf));
+ ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_CLASSGUID, NULL, (BYTE *)buf, sizeof(buf), NULL);
+ ok(ret, "Failed to get property, error %#x.\n", GetLastError());
+ ok(!lstrcmpiW(buf, L"{6a55b5a4-3f65-11db-b704-0011955c2bdb}"), "Got unexpected value %s.\n", wine_dbgstr_w(buf));
+
+ ret = SetupDiDeleteDeviceInfo(set, &device);
+ ok(ret, "Failed to delete device, error %#x.\n", GetLastError());
+
+ /* Create device from a not registered class with a device name */
+ ret = SetupDiCreateDeviceInfoW(set, L"LEGACY_BOGUS", &guid, L"device_name", NULL, DICD_GENERATE_ID, &device);
+ ok(ret, "Failed to create device, error %#x.\n", GetLastError());
+
+ /* Have SPDRP_DEVICEDESC property */
+ memset(buf, 0, sizeof(buf));
+ ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_DEVICEDESC, NULL, (BYTE *)buf, sizeof(buf), NULL);
+ ok(ret, "Failed to get property, error %#x.\n", GetLastError());
+ ok(!lstrcmpW(buf, L"device_name"), "Got unexpected value %s.\n", wine_dbgstr_w(buf));
+
+ SetupDiDestroyDeviceInfoList(set);
+
+ /* Create device from a registered class */
+ set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL);
+ ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError());
+
+ ret = SetupDiCreateDeviceInfoW(set, L"display", &GUID_DEVCLASS_DISPLAY, NULL, NULL, DICD_GENERATE_ID, &device);
+ ok(ret, "Failed to create device, error %#x.\n", GetLastError());
+
+ /* Have SPDRP_CLASS property */
+ memset(buf, 0, sizeof(buf));
+ ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL);
+ todo_wine ok(ret, "Failed to get property, error %#x.\n", GetLastError());
+ todo_wine ok(!lstrcmpW(buf, L"Display"), "Got unexpected value %s.\n", wine_dbgstr_w(buf));
+
+ SetupDiDestroyDeviceInfoList(set);
}
static void test_get_inf_class(void)
--
2.24.0
1
0
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
dlls/setupapi/tests/devinst.c | 50 +++++++++++++++++------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 57adeeb27b..452a570c4f 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -2065,12 +2065,6 @@ static void test_get_actual_section(void)
ok(!strcasecmp(section, "section1"), "Got unexpected section %s.\n", section);
ok(size == 9, "Got size %u.\n", size);
- extptr = section;
- ret = SetupDiGetActualSectionToInstallA(hinf, "section1", section, ARRAY_SIZE(section), NULL, &extptr);
- ok(ret, "Failed to get section, error %#x.\n", GetLastError());
- ok(!strcasecmp(section, "section1"), "Got unexpected section %s.\n", section);
- ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr);
-
extptr = section;
ret = SetupDiGetActualSectionToInstallA(hinf, "section2", section, ARRAY_SIZE(section), NULL, &extptr);
ok(ret, "Failed to get section, error %#x.\n", GetLastError());
@@ -2101,24 +2095,6 @@ static void test_get_actual_section(void)
ok(!strcasecmp(section, "section6.NT" MYEXT), "Got unexpected section %s.\n", section);
ok(extptr == section + 8, "Got extension %s.\n", extptr);
- extptr = section;
- ret = SetupDiGetActualSectionToInstallA(hinf, "section7", section, ARRAY_SIZE(section), NULL, &extptr);
- ok(ret, "Failed to get section, error %#x.\n", GetLastError());
- ok(!strcasecmp(section, "section7"), "Got unexpected section %s.\n", section);
- ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr);
-
- extptr = section;
- ret = SetupDiGetActualSectionToInstallA(hinf, "section8", section, ARRAY_SIZE(section), NULL, &extptr);
- ok(ret, "Failed to get section, error %#x.\n", GetLastError());
- ok(!strcasecmp(section, "section8"), "Got unexpected section %s.\n", section);
- ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr);
-
- extptr = section;
- ret = SetupDiGetActualSectionToInstallA(hinf, "nonexistent", section, ARRAY_SIZE(section), NULL, &extptr);
- ok(ret, "Failed to get section, error %#x.\n", GetLastError());
- ok(!strcasecmp(section, "nonexistent"), "Got unexpected section %s.\n", section);
- ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr);
-
extptr = section;
ret = SetupDiGetActualSectionToInstallA(hinf, "section9", section, ARRAY_SIZE(section), NULL, &extptr);
ok(ret, "Failed to get section, error %#x.\n", GetLastError());
@@ -2127,7 +2103,31 @@ static void test_get_actual_section(void)
if (0)
{
- /* For some reason, this call hangs on Windows 10 1809. */
+ /* For some reason, these calls hang on Windows 10 1809+. */
+ extptr = section;
+ ret = SetupDiGetActualSectionToInstallA(hinf, "section1", section, ARRAY_SIZE(section), NULL, &extptr);
+ ok(ret, "Failed to get section, error %#x.\n", GetLastError());
+ ok(!strcasecmp(section, "section1"), "Got unexpected section %s.\n", section);
+ ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr);
+
+ extptr = section;
+ ret = SetupDiGetActualSectionToInstallA(hinf, "section7", section, ARRAY_SIZE(section), NULL, &extptr);
+ ok(ret, "Failed to get section, error %#x.\n", GetLastError());
+ ok(!strcasecmp(section, "section7"), "Got unexpected section %s.\n", section);
+ ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr);
+
+ extptr = section;
+ ret = SetupDiGetActualSectionToInstallA(hinf, "section8", section, ARRAY_SIZE(section), NULL, &extptr);
+ ok(ret, "Failed to get section, error %#x.\n", GetLastError());
+ ok(!strcasecmp(section, "section8"), "Got unexpected section %s.\n", section);
+ ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr);
+
+ extptr = section;
+ ret = SetupDiGetActualSectionToInstallA(hinf, "nonexistent", section, ARRAY_SIZE(section), NULL, &extptr);
+ ok(ret, "Failed to get section, error %#x.\n", GetLastError());
+ ok(!strcasecmp(section, "nonexistent"), "Got unexpected section %s.\n", section);
+ ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr);
+
extptr = section;
ret = SetupDiGetActualSectionToInstallA(hinf, "section10", section, ARRAY_SIZE(section), NULL, &extptr);
ok(ret, "Failed to get section, error %#x.\n", GetLastError());
--
2.24.0
1
0
Signed-off-by: Jeff Smith <whydoubt(a)gmail.com>
---
dlls/msvcrt/tests/time.c | 209 ++++++++++++---------------------------
1 file changed, 63 insertions(+), 146 deletions(-)
diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c
index cf79e5971e..c8acd848bf 100644
--- a/dlls/msvcrt/tests/time.c
+++ b/dlls/msvcrt/tests/time.c
@@ -588,13 +588,59 @@ static void test_daylight(void)
static void test_strftime(void)
{
+ const struct {
+ const char *format;
+ } tests_einval[] = {
+ {"%C"},
+ {"%D"},
+ {"%e"},
+ {"%F"},
+ {"%h"},
+ {"%n"},
+ {"%R"},
+ {"%t"},
+ {"%T"},
+ {"%u"},
+ };
+
+ const struct {
+ const char *format;
+ const char *ret;
+ struct tm tm;
+ BOOL todo;
+ } tests[] = {
+ {"e%#%e", "e%e", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%c", "01/01/70 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%c", "02/30/70 00:00:00", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE},
+ {"%x", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%X", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%a", "Thu", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%A", "Thursday", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%b", "Jan", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%B", "January", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%#d", "1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%H", "00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%I", "12", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%j", "001", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%m", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%#M", "0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%p", "AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%U", "00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%W", "00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+ {"%U", "01", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }},
+ {"%W", "00", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }},
+ {"%U", "53", { 0, 0, 0, 1, 0, 70, 0, 365, 0 }},
+ {"%W", "52", { 0, 0, 0, 1, 0, 70, 0, 365, 0 }},
+ };
+
static const wchar_t cW[] = { '%','c',0 };
- static const char expected[] = "01/01/70 00:00:00";
time_t gmt;
struct tm* gmt_tm;
char buf[256], bufA[256];
WCHAR bufW[256];
long retA, retW;
+ int i;
if (!p_strftime || !p_wcsftime || !p_gmtime)
{
@@ -608,55 +654,13 @@ static void test_strftime(void)
gmt_tm = p_gmtime(&gmt);
ok(gmt_tm != NULL, "gmtime failed\n");
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%C", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%D", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%e", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%F", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%h", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%n", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%R", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%t", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%T", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
-
- errno = 0xdeadbeef;
- retA = p_strftime(bufA, 256, "%u", gmt_tm);
- ok(retA == 0, "expected 0, got %ld\n", retA);
- ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
+ for (i=0; i<ARRAY_SIZE(tests_einval); i++)
+ {
+ errno = 0xdeadbeef;
+ retA = p_strftime(bufA, 256, tests_einval[i].format, gmt_tm);
+ ok(retA == 0, "%d) ret = %ld\n", i, retA);
+ ok(errno==EINVAL || broken(errno==0xdeadbeef), "%d) errno = %d\n", i, errno);
+ }
errno = 0xdeadbeef;
retA = p_strftime(NULL, 0, "copy", gmt_tm);
@@ -691,14 +695,17 @@ static void test_strftime(void)
ok(errno == EINVAL, "errno = %d\n", errno);
}
- retA = p_strftime(bufA, 256, "e%#%e", gmt_tm);
- ok(retA == 3, "expected 3, got %ld\n", retA);
- ok(!strcmp(bufA, "e%e"), "got %s\n", bufA);
+ for (i=0; i<ARRAY_SIZE(tests); i++)
+ {
+ retA = p_strftime(bufA, 256, tests[i].format, &tests[i].tm);
+ todo_wine_if(tests[i].todo) {
+ ok(retA == strlen(tests[i].ret), "%d) ret = %ld\n", i, retA);
+ ok(!strcmp(bufA, tests[i].ret), "%d) buf = \"%s\", expected \"%s\"\n",
+ i, bufA, tests[i].ret);
+ }
+ }
retA = p_strftime(bufA, 256, "%c", gmt_tm);
- ok(retA == 17, "expected 17, got %ld\n", retA);
- ok(strcmp(bufA, expected) == 0, "expected %s, got %s\n", expected, bufA);
-
retW = p_wcsftime(bufW, 256, cW, gmt_tm);
ok(retW == 17, "expected 17, got %ld\n", retW);
ok(retA == retW, "expected %ld, got %ld\n", retA, retW);
@@ -707,96 +714,6 @@ static void test_strftime(void)
buf[retA] = 0;
ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf);
- retA = p_strftime(bufA, 256, "%x", gmt_tm);
- ok(retA == 8, "expected 8, got %ld\n", retA);
- ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%X", gmt_tm);
- ok(retA == 8, "expected 8, got %ld\n", retA);
- ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%a", gmt_tm);
- ok(retA == 3, "expected 3, got %ld\n", retA);
- ok(!strcmp(bufA, "Thu"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%A", gmt_tm);
- ok(retA == 8, "expected 8, got %ld\n", retA);
- ok(!strcmp(bufA, "Thursday"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%b", gmt_tm);
- ok(retA == 3, "expected 3, got %ld\n", retA);
- ok(!strcmp(bufA, "Jan"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%B", gmt_tm);
- ok(retA == 7, "expected 7, got %ld\n", retA);
- ok(!strcmp(bufA, "January"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%d", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "01"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%#d", gmt_tm);
- ok(retA == 1, "expected 1, got %ld\n", retA);
- ok(!strcmp(bufA, "1"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%H", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "00"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%I", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "12"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%j", gmt_tm);
- ok(retA == 3, "expected 3, got %ld\n", retA);
- ok(!strcmp(bufA, "001"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%m", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "01"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%#M", gmt_tm);
- ok(retA == 1, "expected 1, got %ld\n", retA);
- ok(!strcmp(bufA, "0"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%p", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "AM"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%U", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "00"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%W", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "00"), "got %s\n", bufA);
-
- gmt_tm->tm_wday = 0;
- retA = p_strftime(bufA, 256, "%U", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "01"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%W", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "00"), "got %s\n", bufA);
-
- gmt_tm->tm_yday = 365;
- retA = p_strftime(bufA, 256, "%U", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "53"), "got %s\n", bufA);
-
- retA = p_strftime(bufA, 256, "%W", gmt_tm);
- ok(retA == 2, "expected 2, got %ld\n", retA);
- ok(!strcmp(bufA, "52"), "got %s\n", bufA);
-
- gmt_tm->tm_mon = 1;
- gmt_tm->tm_mday = 30;
- retA = p_strftime(bufA, 256, "%c", gmt_tm);
- todo_wine {
- ok(retA == 17, "expected 17, got %ld\n", retA);
- ok(!strcmp(bufA, "02/30/70 00:00:00"), "got %s\n", bufA);
- }
-
if(!setlocale(LC_ALL, "Japanese_Japan.932")) {
win_skip("Japanese_Japan.932 locale not available\n");
return;
--
2.23.0
1
4
Superseded patch 173708.
ChangeLog:
- Fixing a typo in tests.
Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com>
---
dlls/sapi/Makefile.in | 3 +-
dlls/sapi/main.c | 3 +
dlls/sapi/sapi_classes.idl | 13 ++
dlls/sapi/sapi_private.h | 1 +
dlls/sapi/tests/Makefile.in | 3 +-
dlls/sapi/tests/tts.c | 71 +++++++
dlls/sapi/tts.c | 414 ++++++++++++++++++++++++++++++++++++
include/sapi.idl | 11 +-
8 files changed, 516 insertions(+), 3 deletions(-)
create mode 100644 dlls/sapi/tests/tts.c
create mode 100644 dlls/sapi/tts.c
diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in
index 94e21bdd52..640c56223d 100644
--- a/dlls/sapi/Makefile.in
+++ b/dlls/sapi/Makefile.in
@@ -5,7 +5,8 @@ EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
main.c \
- token.c
+ token.c \
+ tts.c
IDL_SRCS = \
sapi_classes.idl \
diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c
index f86fee25ca..ce51c37483 100644
--- a/dlls/sapi/main.c
+++ b/dlls/sapi/main.c
@@ -106,6 +106,7 @@ static const struct IClassFactoryVtbl class_factory_vtbl =
};
static struct class_factory data_key_cf = { { &class_factory_vtbl }, data_key_create };
+static struct class_factory speech_voice_cf = { { &class_factory_vtbl }, speech_voice_create };
static struct class_factory token_category_cf = { { &class_factory_vtbl }, token_category_create };
static struct class_factory token_enum_cf = { { &class_factory_vtbl }, token_enum_create };
@@ -124,6 +125,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj )
cf = &token_category_cf.IClassFactory_iface;
else if (IsEqualCLSID( clsid, &CLSID_SpObjectTokenEnum ))
cf = &token_enum_cf.IClassFactory_iface;
+ else if (IsEqualCLSID( clsid, &CLSID_SpVoice ))
+ cf = &speech_voice_cf.IClassFactory_iface;
if (!cf) return CLASS_E_CLASSNOTAVAILABLE;
diff --git a/dlls/sapi/sapi_classes.idl b/dlls/sapi/sapi_classes.idl
index 40886f5974..dbb08c9ae2 100644
--- a/dlls/sapi/sapi_classes.idl
+++ b/dlls/sapi/sapi_classes.idl
@@ -50,3 +50,16 @@ coclass SpObjectTokenEnum
interface ISpObjectTokenEnumBuilder;
[default] interface IEnumSpObjectTokens;
}
+
+[
+ uuid(96749377-3391-11d2-9ee3-00c04f797396),
+ helpstring("Speech Voice"),
+ progid("SAPI.SpVoice.1"),
+ vi_progid("SAPI.SpVoice"),
+ threading(both)
+]
+coclass SpVoice
+{
+ interface ISpVoice;
+ [default] interface ISpeechVoice;
+}
diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h
index 1f89672242..8db4b47bbd 100644
--- a/dlls/sapi/sapi_private.h
+++ b/dlls/sapi/sapi_private.h
@@ -21,6 +21,7 @@
#include "wine/heap.h"
HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
+HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
diff --git a/dlls/sapi/tests/Makefile.in b/dlls/sapi/tests/Makefile.in
index bf924d7ed9..bb89e0d8e0 100644
--- a/dlls/sapi/tests/Makefile.in
+++ b/dlls/sapi/tests/Makefile.in
@@ -2,4 +2,5 @@ TESTDLL = sapi.dll
IMPORTS = ole32 user32 advapi32
C_SRCS = \
- token.c
+ token.c \
+ tts.c
diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
new file mode 100644
index 0000000000..3b71e933a2
--- /dev/null
+++ b/dlls/sapi/tests/tts.c
@@ -0,0 +1,71 @@
+/*
+ * Speech API (SAPI) text-to-speech tests.
+ *
+ * Copyright 2019 Jactry Zeng for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define COBJMACROS
+
+#include "sapiddk.h"
+#include "sperror.h"
+
+#include "wine/test.h"
+
+#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__)
+static void _expect_ref(IUnknown *obj, ULONG ref, int line)
+{
+ ULONG rc;
+ IUnknown_AddRef(obj);
+ rc = IUnknown_Release(obj);
+ ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref);
+}
+
+static void test_interfaces(void)
+{
+ ISpeechVoice *speech_voice;
+ IDispatch *dispatch;
+ IUnknown *unk;
+ HRESULT hr;
+
+ hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER,
+ &IID_ISpeechVoice, (void **)&speech_voice);
+ ok(hr == S_OK, "Failed to create ISpeechVoice interface: %#x.\n", hr);
+ EXPECT_REF(speech_voice, 1);
+
+ hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IDispatch, (void **)&dispatch);
+ ok(hr == S_OK, "Failed to create IDispatch interface: %#x.\n", hr);
+ EXPECT_REF(dispatch, 1);
+ EXPECT_REF(speech_voice, 1);
+ IDispatch_Release(dispatch);
+
+ hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IUnknown, (void **)&unk);
+ ok(hr == S_OK, "Failed to create IUnknown interface: %#x.\n", hr);
+ EXPECT_REF(unk, 1);
+ EXPECT_REF(speech_voice, 1);
+ IUnknown_Release(unk);
+
+ ISpeechVoice_Release(speech_voice);
+}
+
+START_TEST(tts)
+{
+ CoInitialize(NULL);
+ test_interfaces();
+ CoUninitialize();
+}
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
new file mode 100644
index 0000000000..4000db11f5
--- /dev/null
+++ b/dlls/sapi/tts.c
@@ -0,0 +1,414 @@
+/*
+ * Speech API (SAPI) text-to-speech implementation.
+ *
+ * Copyright 2019 Jactry Zeng for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "objbase.h"
+
+#include "sapiddk.h"
+
+#include "wine/debug.h"
+
+#include "sapi_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(sapi);
+
+struct speech_voice
+{
+ ISpeechVoice ISpeechVoice_iface;
+ LONG ref;
+};
+
+static inline struct speech_voice *impl_from_ISpeechVoice(ISpeechVoice *iface)
+{
+ return CONTAINING_RECORD(iface, struct speech_voice, ISpeechVoice_iface);
+}
+
+/* ISpeechVoice interface */
+static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj)
+{
+ struct speech_voice *This = impl_from_ISpeechVoice(iface);
+
+ TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj);
+
+ if (IsEqualIID(iid, &IID_IUnknown) ||
+ IsEqualIID(iid, &IID_IDispatch) ||
+ IsEqualIID(iid, &IID_ISpeechVoice))
+ *obj = &This->ISpeechVoice_iface;
+ else
+ {
+ *obj = NULL;
+ FIXME("interface %s not implemented.\n", debugstr_guid(iid));
+ return E_NOINTERFACE;
+ }
+
+ IUnknown_AddRef((IUnknown *)*obj);
+ return S_OK;
+}
+
+static ULONG WINAPI speech_voice_AddRef(ISpeechVoice *iface)
+{
+ struct speech_voice *This = impl_from_ISpeechVoice(iface);
+ ULONG ref = InterlockedIncrement(&This->ref);
+
+ TRACE("(%p): ref=%u.\n", iface, ref);
+
+ return ref;
+}
+
+static ULONG WINAPI speech_voice_Release(ISpeechVoice *iface)
+{
+ struct speech_voice *This = impl_from_ISpeechVoice(iface);
+ ULONG ref = InterlockedDecrement(&This->ref);
+
+ TRACE("(%p): ref=%u.\n", iface, ref);
+
+ if (!ref)
+ {
+ heap_free(This);
+ }
+
+ return ref;
+}
+
+static HRESULT WINAPI speech_voice_GetTypeInfoCount(ISpeechVoice *iface, UINT *info)
+{
+ FIXME("(%p, %p): stub.\n", iface, info);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT info, LCID lcid,
+ ITypeInfo **type_info)
+{
+ FIXME("(%p, %u, %u, %p): stub.\n", iface, info, lcid, type_info);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_GetIDsOfNames(ISpeechVoice *iface, REFIID riid, LPOLESTR *names,
+ UINT count, LCID lcid, DISPID *dispid)
+{
+ FIXME("(%p, %s, %p, %u, %u, %p): stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_Invoke(ISpeechVoice *iface, DISPID dispid, REFIID riid, LCID lcid,
+ WORD flags, DISPPARAMS *params, VARIANT *result,
+ EXCEPINFO *excepinfo, UINT *argerr)
+{
+ FIXME("(%p, %d, %s, %#x, %#x, %p, %p, %p, %p): stub.\n", iface, dispid, debugstr_guid(riid),
+ lcid, flags, params, result, excepinfo, argerr);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_Status(ISpeechVoice *iface, ISpeechVoiceStatus **status)
+{
+ FIXME("(%p, %p): stub.\n", iface, status);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_Voice(ISpeechVoice *iface, ISpeechObjectToken **voice)
+{
+ FIXME("(%p, %p): stub.\n", iface, voice);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_putref_Voice(ISpeechVoice *iface, ISpeechObjectToken *voice)
+{
+ FIXME("(%p, %p): stub.\n", iface, voice);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_AudioOutput(ISpeechVoice *iface, ISpeechObjectToken **output)
+{
+ FIXME("(%p, %p): stub.\n", iface, output);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_putref_AudioOutput(ISpeechVoice *iface, ISpeechObjectToken *output)
+{
+ FIXME("(%p, %p): stub.\n", iface, output);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_AudioOutputStream(ISpeechVoice *iface, ISpeechBaseStream **output)
+{
+ FIXME("(%p, %p): stub.\n", iface, output);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_putref_AudioOutputStream(ISpeechVoice *iface, ISpeechBaseStream *output)
+{
+ FIXME("(%p, %p): stub.\n", iface, output);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_Rate(ISpeechVoice *iface, LONG *rate)
+{
+ FIXME("(%p, %p): stub.\n", iface, rate);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_Rate(ISpeechVoice *iface, LONG rate)
+{
+ FIXME("(%p, %d): stub.\n", iface, rate);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_Volume(ISpeechVoice *iface, LONG *volume)
+{
+ FIXME("(%p, %p): stub.\n", iface, volume);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_Volume(ISpeechVoice *iface, LONG volume)
+{
+ FIXME("(%p, %d): stub.\n", iface, volume);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_AllowAudioOutputFormatChangesOnNextSet(ISpeechVoice *iface,
+ VARIANT_BOOL allow)
+{
+ FIXME("(%p, %d): stub.\n", iface, allow);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_AllowAudioOutputFormatChangesOnNextSet(ISpeechVoice *iface, VARIANT_BOOL *allow)
+{
+ FIXME("(%p, %p): stub.\n", iface, allow);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_EventInterests(ISpeechVoice *iface, SpeechVoiceEvents *flags)
+{
+ FIXME("(%p, %p): stub.\n", iface, flags);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_EventInterests(ISpeechVoice *iface, SpeechVoiceEvents flags)
+{
+ FIXME("(%p, %#x): stub.\n", iface, flags);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_Priority(ISpeechVoice *iface, SpeechVoicePriority priority)
+{
+ FIXME("(%p, %d): stub.\n", iface, priority);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_Priority(ISpeechVoice *iface, SpeechVoicePriority *priority)
+{
+ FIXME("(%p, %p): stub.\n", iface, priority);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_AlertBoundary(ISpeechVoice *iface, SpeechVoiceEvents boundary)
+{
+ FIXME("(%p, %#x): stub.\n", iface, boundary);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_AlertBoundary(ISpeechVoice *iface, SpeechVoiceEvents *boundary)
+{
+ FIXME("(%p, %p): stub.\n", iface, boundary);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_SynchronousSpeakTimeout(ISpeechVoice *iface, LONG timeout)
+{
+ FIXME("(%p, %d): stub.\n", iface, timeout);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_SynchronousSpeakTimeout(ISpeechVoice *iface, LONG *timeout)
+{
+ FIXME("(%p, %p): stub.\n", iface, timeout);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_Speak(ISpeechVoice *iface, BSTR text, SpeechVoiceSpeakFlags flags, LONG *number)
+{
+ FIXME("(%p, %s, %#x, %p): stub.\n", iface, debugstr_w(text), flags, number);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_SpeakStream(ISpeechVoice *iface, ISpeechBaseStream *stream,
+ SpeechVoiceSpeakFlags flags, LONG *number)
+{
+ FIXME("(%p, %p, %#x, %p): stub.\n", iface, stream, flags, number);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_Pause(ISpeechVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_Resume(ISpeechVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_Skip(ISpeechVoice *iface, const BSTR type, LONG items, LONG *skipped)
+{
+ FIXME("(%p, %s, %d, %p): stub.\n", iface, debugstr_w(type), items, skipped);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_GetVoices(ISpeechVoice *iface, BSTR required, BSTR optional,
+ ISpeechObjectTokens **tokens)
+{
+ FIXME("(%p, %s, %s, %p): stub.\n", iface, debugstr_w(required), debugstr_w(optional), tokens);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_GetAudioOutputs(ISpeechVoice *iface, BSTR required, BSTR optional,
+ ISpeechObjectTokens **tokens)
+{
+ FIXME("(%p, %s, %s, %p): stub.\n", iface, debugstr_w(required), debugstr_w(optional), tokens);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_WaitUntilDone(ISpeechVoice *iface, LONG timeout, VARIANT_BOOL *done)
+{
+ FIXME("(%p, %d, %p): stub.\n", iface, timeout, done);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_SpeakCompleteEvent(ISpeechVoice *iface, LONG *handle)
+{
+ FIXME("(%p, %p): stub.\n", iface, handle);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_IsUISupported(ISpeechVoice *iface, const BSTR typeui, const VARIANT *data,
+ VARIANT_BOOL *supported)
+{
+ FIXME("(%p, %s, %p, %p): stub.\n", iface, debugstr_w(typeui), data, supported);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_DisplayUI(ISpeechVoice *iface, LONG hwnd, BSTR title,
+ const BSTR typeui, const VARIANT *data)
+{
+ FIXME("(%p, %d, %s, %s, %p): stub.\n", iface, hwnd, debugstr_w(title), debugstr_w(typeui), data);
+
+ return E_NOTIMPL;
+}
+
+static const ISpeechVoiceVtbl speech_voice_vtbl =
+{
+ speech_voice_QueryInterface,
+ speech_voice_AddRef,
+ speech_voice_Release,
+ speech_voice_GetTypeInfoCount,
+ speech_voice_GetTypeInfo,
+ speech_voice_GetIDsOfNames,
+ speech_voice_Invoke,
+ speech_voice_get_Status,
+ speech_voice_get_Voice,
+ speech_voice_putref_Voice,
+ speech_voice_get_AudioOutput,
+ speech_voice_putref_AudioOutput,
+ speech_voice_get_AudioOutputStream,
+ speech_voice_putref_AudioOutputStream,
+ speech_voice_get_Rate,
+ speech_voice_put_Rate,
+ speech_voice_get_Volume,
+ speech_voice_put_Volume,
+ speech_voice_put_AllowAudioOutputFormatChangesOnNextSet,
+ speech_voice_get_AllowAudioOutputFormatChangesOnNextSet,
+ speech_voice_get_EventInterests,
+ speech_voice_put_EventInterests,
+ speech_voice_put_Priority,
+ speech_voice_get_Priority,
+ speech_voice_put_AlertBoundary,
+ speech_voice_get_AlertBoundary,
+ speech_voice_put_SynchronousSpeakTimeout,
+ speech_voice_get_SynchronousSpeakTimeout,
+ speech_voice_Speak,
+ speech_voice_SpeakStream,
+ speech_voice_Pause,
+ speech_voice_Resume,
+ speech_voice_Skip,
+ speech_voice_GetVoices,
+ speech_voice_GetAudioOutputs,
+ speech_voice_WaitUntilDone,
+ speech_voice_SpeakCompleteEvent,
+ speech_voice_IsUISupported,
+ speech_voice_DisplayUI,
+};
+
+HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)
+{
+ struct speech_voice *This = heap_alloc(sizeof(*This));
+ HRESULT hr;
+
+ if (!This) return E_OUTOFMEMORY;
+ This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl;
+ This->ref = 1;
+
+ hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj);
+
+ ISpeechVoice_Release(&This->ISpeechVoice_iface);
+ return hr;
+}
diff --git a/include/sapi.idl b/include/sapi.idl
index 365d594a20..e87478cac6 100644
--- a/include/sapi.idl
+++ b/include/sapi.idl
@@ -839,7 +839,7 @@ interface ISpVoice : ISpEventSource
[out] SPVOICESTATUS *status,
[out, string] WCHAR **bookmark);
- HRESULT Skip([in,string] WCHAR* type, [in] long items, [out] ULONG *skipped);
+ HRESULT Skip([in,string] const WCHAR *type, [in] long items, [out] ULONG *skipped);
HRESULT SetPriority([in] SPVPRIORITY priority);
HRESULT GetPriority([out] SPVPRIORITY* priority);
@@ -1047,4 +1047,13 @@ library SpeechLib
/*[default] interface ISpeechRecognizer;*/
interface ISpRecognizer;
};
+
+ [
+ uuid(96749377-3391-11d2-9ee3-00c04f797396)
+ ]
+ coclass SpVoice
+ {
+ interface ISpVoice;
+ [default] interface ISpeechVoice;
+ };
}
--
2.24.0
2
2
18 Nov '19
Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt>
---
dlls/kernel32/locale.c | 25 +++++++++++++++++++------
dlls/kernel32/tests/locale.c | 13 +++++++++++++
2 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index 0f91728e84..db8bd8c883 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -4206,16 +4206,28 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L
/******************************************************************************
* EnumSystemGeoID (KERNEL32.@)
*
- * Call a users function for every location available on the system.
+ * Calls a user's function for every location available on the system.
*
* PARAMS
- * geoclass [I] Type of information desired (SYSGEOTYPE enum from "winnls.h")
- * parent [I] GEOID for the parent
- * enumproc [I] Callback function to call for each location
+ * geoclass [I] Type of location desired (SYSGEOTYPE enum from "winnls.h")
+ * parent [I] GeoID for the parent
+ * enumproc [I] Callback function to call for each location (prototype in "winnls.h")
*
* RETURNS
* Success: TRUE.
* Failure: FALSE. Use GetLastError() to determine the cause.
+ *
+ * NOTES
+ * The enumproc function returns TRUE to continue enumerating
+ * or FALSE to interrupt the enumeration.
+ *
+ * On failure, GetLastError() returns one of the following values:
+ * - ERROR_INVALID_PARAMETER: no callback function was provided.
+ * - ERROR_INVALID_FLAGS: the location type was invalid.
+ *
+ * TODO
+ * On Windows 10, this function filters out those locations which
+ * simultaneously lack ISO and UN codes (e.g. Johnson Atoll).
*/
BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumproc)
{
@@ -4228,7 +4240,7 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr
return FALSE;
}
- if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION) {
+ if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION && geoclass != GEOCLASS_ALL) {
SetLastError(ERROR_INVALID_FLAGS);
return FALSE;
}
@@ -4236,9 +4248,10 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr
for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) {
const struct geoinfo_t *ptr = &geoinfodata[i];
- if (geoclass == GEOCLASS_NATION && (ptr->kind == LOCATION_REGION))
+ if (geoclass == GEOCLASS_NATION && (ptr->kind != LOCATION_NATION))
continue;
+ /* LOCATION_BOTH counts as region. */
if (geoclass == GEOCLASS_REGION && (ptr->kind == LOCATION_NATION))
continue;
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 81e74531ea..458cd0b5ef 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -4891,6 +4891,19 @@ static void test_EnumSystemGeoID(void)
ret = pEnumSystemGeoID(GEOCLASS_REGION, 0, test_geoid_enumproc2);
ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count);
}
+
+ geoidenum_count = 0;
+ ret = pEnumSystemGeoID(GEOCLASS_ALL, 39070, test_geoid_enumproc2);
+ if (ret == 0)
+ win_skip("GEOCLASS_ALL is not supported in EnumSystemGeoID.\n");
+ else
+ {
+ ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count);
+
+ geoidenum_count = 0;
+ ret = pEnumSystemGeoID(GEOCLASS_ALL, 0, test_geoid_enumproc2);
+ ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count);
+ }
}
struct invariant_entry {
--
2.24.0
2
1
Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com>
---
dlls/sapi/automation.c | 180 +++++++++++++++++++++++++++++++++++
dlls/sapi/tests/automation.c | 6 ++
2 files changed, 186 insertions(+)
diff --git a/dlls/sapi/automation.c b/dlls/sapi/automation.c
index 429f2ed3a6..7a9fa17f8f 100644
--- a/dlls/sapi/automation.c
+++ b/dlls/sapi/automation.c
@@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(sapi);
struct file_stream
{
ISpeechFileStream ISpeechFileStream_iface;
+ ISpStream ISpStream_iface;
LONG ref;
};
@@ -45,6 +46,11 @@ static inline struct file_stream *impl_from_ISpeechFileStream(ISpeechFileStream
return CONTAINING_RECORD(iface, struct file_stream, ISpeechFileStream_iface);
}
+static inline struct file_stream *impl_from_ISpStream(ISpStream *iface)
+{
+ return CONTAINING_RECORD(iface, struct file_stream, ISpStream_iface);
+}
+
/* ISpeechFileStream interface */
static HRESULT WINAPI file_stream_QueryInterface(ISpeechFileStream *iface, REFIID iid, void **obj)
{
@@ -57,6 +63,8 @@ static HRESULT WINAPI file_stream_QueryInterface(ISpeechFileStream *iface, REFII
IsEqualIID(iid, &IID_ISpeechBaseStream) ||
IsEqualIID(iid, &IID_ISpeechFileStream))
*obj = &This->ISpeechFileStream_iface;
+ else if (IsEqualIID(iid, &IID_ISpStream))
+ *obj = &This->ISpStream_iface;
else
{
*obj = NULL;
@@ -194,6 +202,177 @@ const static ISpeechFileStreamVtbl file_stream_vtbl =
file_stream_Close
};
+/* ISpStream interface */
+static HRESULT WINAPI spstream_QueryInterface(ISpStream *iface, REFIID iid, void **obj)
+{
+ struct file_stream *This = impl_from_ISpStream(iface);
+
+ TRACE("(%p, %s, %p).\n", iface, debugstr_guid(iid), obj);
+
+ return ISpeechFileStream_QueryInterface(&This->ISpeechFileStream_iface, iid, obj);
+}
+
+static ULONG WINAPI spstream_AddRef(ISpStream *iface)
+{
+ struct file_stream *This = impl_from_ISpStream(iface);
+
+ TRACE("(%p).\n", iface);
+
+ return ISpeechFileStream_AddRef(&This->ISpeechFileStream_iface);
+}
+
+static ULONG WINAPI spstream_Release(ISpStream *iface)
+{
+ struct file_stream *This = impl_from_ISpStream(iface);
+
+ TRACE("(%p).\n", iface);
+
+ return ISpeechFileStream_Release(&This->ISpeechFileStream_iface);
+}
+
+static HRESULT WINAPI spstream_Read(ISpStream *iface, void *pv, ULONG cb, ULONG *read)
+{
+ FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, read);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_Write(ISpStream *iface, const void *pv, ULONG cb, ULONG *written)
+{
+ FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, written);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_Seek(ISpStream *iface, LARGE_INTEGER mode, DWORD origin, ULARGE_INTEGER *position)
+{
+ FIXME("(%p, %s, %d, %p): stub.\n", iface, wine_dbgstr_longlong(mode.QuadPart), origin, position);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_SetSize(ISpStream *iface, ULARGE_INTEGER size)
+{
+ FIXME("(%p, %s): stub.\n", iface, wine_dbgstr_longlong(size.QuadPart));
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_CopyTo(ISpStream *iface, IStream *stream, ULARGE_INTEGER cb,
+ ULARGE_INTEGER *read, ULARGE_INTEGER *written)
+{
+ FIXME("(%p, %p, %s, %p, %p): stub.\n", iface, stream, wine_dbgstr_longlong(cb.QuadPart),
+ read, written);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_Commit(ISpStream *iface, DWORD flag)
+{
+ FIXME("(%p, %d): stub.\n", iface, flag);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_Revert(ISpStream *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_LockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type)
+{
+ FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart),
+ wine_dbgstr_longlong(cb.QuadPart), type);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_UnlockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type)
+{
+ FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart),
+ wine_dbgstr_longlong(cb.QuadPart), type);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_Stat(ISpStream *iface, STATSTG *statstg, DWORD flag)
+{
+ FIXME("(%p, %p, %d): stub.\n", iface, statstg, flag);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_Clone(ISpStream *iface, IStream **stream)
+{
+ FIXME("(%p, %p): stub.\n", iface, stream);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_GetFormat(ISpStream *iface, GUID *format, WAVEFORMATEX **wave)
+{
+ FIXME("(%p, %p, %p): stub.\n", iface, format, wave);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_SetBaseStream(ISpStream *iface, IStream *stream, REFGUID format,
+ const WAVEFORMATEX *wave)
+{
+ FIXME("(%p, %p, %s, %p): stub.\n", iface, stream, debugstr_guid(format), wave);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_GetBaseStream(ISpStream *iface, IStream **stream)
+{
+ FIXME("(%p, %p): stub.\n", iface, stream);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_BindToFile(ISpStream *iface, LPCWSTR filename, SPFILEMODE mode,
+ const GUID *format, const WAVEFORMATEX* wave,
+ ULONGLONG interest)
+{
+ FIXME("(%p, %s, %d, %s, %p, %s): stub.\n", iface, debugstr_w(filename), mode, debugstr_guid(format),
+ wave, wine_dbgstr_longlong(interest));
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spstream_Close(ISpStream *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+const static ISpStreamVtbl spstream_vtbl =
+{
+ spstream_QueryInterface,
+ spstream_AddRef,
+ spstream_Release,
+ spstream_Read,
+ spstream_Write,
+ spstream_Seek,
+ spstream_SetSize,
+ spstream_CopyTo,
+ spstream_Commit,
+ spstream_Revert,
+ spstream_LockRegion,
+ spstream_UnlockRegion,
+ spstream_Stat,
+ spstream_Clone,
+ spstream_GetFormat,
+ spstream_SetBaseStream,
+ spstream_GetBaseStream,
+ spstream_BindToFile,
+ spstream_Close
+};
+
HRESULT file_stream_create(IUnknown *outer, REFIID iid, void **obj)
{
struct file_stream *This = heap_alloc(sizeof(*This));
@@ -201,6 +380,7 @@ HRESULT file_stream_create(IUnknown *outer, REFIID iid, void **obj)
if (!This) return E_OUTOFMEMORY;
This->ISpeechFileStream_iface.lpVtbl = &file_stream_vtbl;
+ This->ISpStream_iface.lpVtbl = &spstream_vtbl;
This->ref = 1;
hr = ISpeechFileStream_QueryInterface(&This->ISpeechFileStream_iface, iid, obj);
diff --git a/dlls/sapi/tests/automation.c b/dlls/sapi/tests/automation.c
index 57b6c7a375..c584b4ac2c 100644
--- a/dlls/sapi/tests/automation.c
+++ b/dlls/sapi/tests/automation.c
@@ -30,6 +30,7 @@ static void test_interfaces(void)
ISpeechFileStream *filestream;
ISpeechBaseStream *basestream;
IDispatch *dispatch;
+ ISpStream *spstrem;
IUnknown *unk;
HRESULT hr;
@@ -52,6 +53,11 @@ static void test_interfaces(void)
ok(hr == S_OK, "Failed to create ISpeechBaseStream interface: %#x.\n", hr);
ISpeechBaseStream_Release(basestream);
+ hr = CoCreateInstance(&CLSID_SpFileStream, NULL, CLSCTX_INPROC_SERVER,
+ &IID_ISpStream, (void **)&spstrem);
+ ok(hr == S_OK, "Failed to create ISpStream interface: %#x.\n", hr);
+
+ ISpStream_Release(spstrem);
ISpeechFileStream_Release(filestream);
}
--
2.24.0
2
1
Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com>
---
dlls/sapi/Makefile.in | 1 +
dlls/sapi/automation.c | 210 +++++++++++++++++++++++++++++++++++
dlls/sapi/main.c | 3 +
dlls/sapi/sapi_classes.idl | 13 +++
dlls/sapi/sapi_private.h | 1 +
dlls/sapi/tests/Makefile.in | 1 +
dlls/sapi/tests/automation.c | 63 +++++++++++
include/sapi.idl | 34 ++++++
include/sapiaut.idl | 29 +++++
9 files changed, 355 insertions(+)
create mode 100644 dlls/sapi/automation.c
create mode 100644 dlls/sapi/tests/automation.c
diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in
index 640c56223d..464a174caa 100644
--- a/dlls/sapi/Makefile.in
+++ b/dlls/sapi/Makefile.in
@@ -4,6 +4,7 @@ IMPORTS = uuid ole32 user32 advapi32
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
+ automation.c \
main.c \
token.c \
tts.c
diff --git a/dlls/sapi/automation.c b/dlls/sapi/automation.c
new file mode 100644
index 0000000000..429f2ed3a6
--- /dev/null
+++ b/dlls/sapi/automation.c
@@ -0,0 +1,210 @@
+/*
+ * Speech API (SAPI) automation implementation.
+ *
+ * Copyright 2019 Jactry Zeng for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "objbase.h"
+
+#include "sapiddk.h"
+
+#include "wine/debug.h"
+
+#include "sapi_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(sapi);
+
+struct file_stream
+{
+ ISpeechFileStream ISpeechFileStream_iface;
+ LONG ref;
+};
+
+static inline struct file_stream *impl_from_ISpeechFileStream(ISpeechFileStream *iface)
+{
+ return CONTAINING_RECORD(iface, struct file_stream, ISpeechFileStream_iface);
+}
+
+/* ISpeechFileStream interface */
+static HRESULT WINAPI file_stream_QueryInterface(ISpeechFileStream *iface, REFIID iid, void **obj)
+{
+ struct file_stream *This = impl_from_ISpeechFileStream(iface);
+
+ TRACE("(%p, %s, %p).\n", iface, debugstr_guid(iid), obj);
+
+ if (IsEqualIID(iid, &IID_IUnknown) ||
+ IsEqualIID(iid, &IID_IDispatch) ||
+ IsEqualIID(iid, &IID_ISpeechBaseStream) ||
+ IsEqualIID(iid, &IID_ISpeechFileStream))
+ *obj = &This->ISpeechFileStream_iface;
+ else
+ {
+ *obj = NULL;
+ FIXME("interface %s not implemented.\n", debugstr_guid(iid));
+ return E_NOINTERFACE;
+ }
+
+ IUnknown_AddRef((IUnknown *)*obj);
+ return S_OK;
+}
+
+static ULONG WINAPI file_stream_AddRef(ISpeechFileStream *iface)
+{
+ struct file_stream *This = impl_from_ISpeechFileStream(iface);
+ ULONG ref = InterlockedIncrement(&This->ref);
+
+ TRACE("(%p): ref=%u.\n", iface, ref);
+
+ return ref;
+}
+
+static ULONG WINAPI file_stream_Release(ISpeechFileStream *iface)
+{
+ struct file_stream *This = impl_from_ISpeechFileStream(iface);
+ ULONG ref = InterlockedDecrement(&This->ref);
+
+ TRACE("(%p): ref=%u.\n", iface, ref);
+
+ if (!ref)
+ {
+ heap_free(This);
+ }
+
+ return ref;
+}
+
+static HRESULT WINAPI file_stream_GetTypeInfoCount(ISpeechFileStream *iface, UINT *info)
+{
+ FIXME("(%p, %p): stub.\n", iface, info);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI file_stream_GetTypeInfo(ISpeechFileStream *iface, UINT info, LCID lcid,
+ ITypeInfo **type_info)
+{
+ FIXME("(%p, %u, %u, %p): stub.\n", iface, info, lcid, type_info);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI file_stream_GetIDsOfNames(ISpeechFileStream *iface, REFIID riid, LPOLESTR *names,
+ UINT count, LCID lcid, DISPID *dispid)
+{
+ FIXME("(%p, %s, %p, %u, %u, %p): stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI file_stream_Invoke(ISpeechFileStream *iface, DISPID dispid, REFIID riid, LCID lcid,
+ WORD flags, DISPPARAMS *params, VARIANT *result,
+ EXCEPINFO *excepinfo, UINT *argerr)
+{
+ FIXME("(%p, %d, %s, %#x, %#x, %p, %p, %p, %p): stub.\n", iface, dispid, debugstr_guid(riid),
+ lcid, flags, params, result, excepinfo, argerr);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI file_stream_get_Format(ISpeechFileStream *iface, ISpeechAudioFormat **format)
+{
+ FIXME("(%p, %p): stub.\n", iface, format);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI file_stream_putref_Format(ISpeechFileStream *iface, ISpeechAudioFormat *format)
+{
+ FIXME("(%p, %p): stub.\n", iface, format);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI file_stream_Read(ISpeechFileStream *iface, VARIANT *buffer, LONG written, LONG *read)
+{
+ FIXME("(%p, %p, %d, %p): stub.\n", iface, buffer, written, read);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI file_stream_Write(ISpeechFileStream *iface, VARIANT buffer, LONG *written)
+{
+ FIXME("(%p, %s, %p): stub.\n", iface, debugstr_variant(&buffer), written);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI file_stream_Seek(ISpeechFileStream *iface, VARIANT position, SpeechStreamSeekPositionType origin,
+ VARIANT *pos)
+{
+ FIXME("(%p, %s, %d, %p): stub.\n", iface, debugstr_variant(&position), origin, pos);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI file_stream_Open(ISpeechFileStream *iface, BSTR filename, SpeechStreamFileMode mode, VARIANT_BOOL events)
+{
+ FIXME("(%p, %s, %d, %d): stub.\n", iface, debugstr_w(filename), mode, events);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI file_stream_Close(ISpeechFileStream *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+const static ISpeechFileStreamVtbl file_stream_vtbl =
+{
+ file_stream_QueryInterface,
+ file_stream_AddRef,
+ file_stream_Release,
+ file_stream_GetTypeInfoCount,
+ file_stream_GetTypeInfo,
+ file_stream_GetIDsOfNames,
+ file_stream_Invoke,
+ file_stream_get_Format,
+ file_stream_putref_Format,
+ file_stream_Read,
+ file_stream_Write,
+ file_stream_Seek,
+ file_stream_Open,
+ file_stream_Close
+};
+
+HRESULT file_stream_create(IUnknown *outer, REFIID iid, void **obj)
+{
+ struct file_stream *This = heap_alloc(sizeof(*This));
+ HRESULT hr;
+
+ if (!This) return E_OUTOFMEMORY;
+ This->ISpeechFileStream_iface.lpVtbl = &file_stream_vtbl;
+ This->ref = 1;
+
+ hr = ISpeechFileStream_QueryInterface(&This->ISpeechFileStream_iface, iid, obj);
+
+ ISpeechFileStream_Release(&This->ISpeechFileStream_iface);
+ return hr;
+}
diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c
index ce51c37483..e8d4ae0158 100644
--- a/dlls/sapi/main.c
+++ b/dlls/sapi/main.c
@@ -106,6 +106,7 @@ static const struct IClassFactoryVtbl class_factory_vtbl =
};
static struct class_factory data_key_cf = { { &class_factory_vtbl }, data_key_create };
+static struct class_factory file_stream_cf = { { &class_factory_vtbl }, file_stream_create };
static struct class_factory speech_voice_cf = { { &class_factory_vtbl }, speech_voice_create };
static struct class_factory token_category_cf = { { &class_factory_vtbl }, token_category_create };
static struct class_factory token_enum_cf = { { &class_factory_vtbl }, token_enum_create };
@@ -121,6 +122,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj )
if (IsEqualCLSID( clsid, &CLSID_SpDataKey ))
cf = &data_key_cf.IClassFactory_iface;
+ else if (IsEqualCLSID( clsid, &CLSID_SpFileStream ))
+ cf = &file_stream_cf.IClassFactory_iface;
else if (IsEqualCLSID( clsid, &CLSID_SpObjectTokenCategory ))
cf = &token_category_cf.IClassFactory_iface;
else if (IsEqualCLSID( clsid, &CLSID_SpObjectTokenEnum ))
diff --git a/dlls/sapi/sapi_classes.idl b/dlls/sapi/sapi_classes.idl
index dbb08c9ae2..ed86d166fc 100644
--- a/dlls/sapi/sapi_classes.idl
+++ b/dlls/sapi/sapi_classes.idl
@@ -63,3 +63,16 @@ coclass SpVoice
interface ISpVoice;
[default] interface ISpeechVoice;
}
+
+[
+ uuid(947812b3-2ae1-4644-ba86-9e90ded7ec91),
+ helpstring("SpFileStream"),
+ progid("SAPI.SpFileStream.1"),
+ vi_progid("SAPI.SpFileStream"),
+ threading(both)
+]
+coclass SpFileStream
+{
+ interface ISpStream;
+ [default] interface ISpeechFileStream;
+}
diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h
index 8db4b47bbd..e9fed0ea44 100644
--- a/dlls/sapi/sapi_private.h
+++ b/dlls/sapi/sapi_private.h
@@ -21,6 +21,7 @@
#include "wine/heap.h"
HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
+HRESULT file_stream_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
diff --git a/dlls/sapi/tests/Makefile.in b/dlls/sapi/tests/Makefile.in
index bb89e0d8e0..d5d9755097 100644
--- a/dlls/sapi/tests/Makefile.in
+++ b/dlls/sapi/tests/Makefile.in
@@ -2,5 +2,6 @@ TESTDLL = sapi.dll
IMPORTS = ole32 user32 advapi32
C_SRCS = \
+ automation.c \
token.c \
tts.c
diff --git a/dlls/sapi/tests/automation.c b/dlls/sapi/tests/automation.c
new file mode 100644
index 0000000000..57b6c7a375
--- /dev/null
+++ b/dlls/sapi/tests/automation.c
@@ -0,0 +1,63 @@
+/*
+ * Speech API (SAPI) automation tests.
+ *
+ * Copyright 2019 Jactry Zeng for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define COBJMACROS
+
+#include "sapiddk.h"
+#include "sperror.h"
+
+#include "wine/test.h"
+
+static void test_interfaces(void)
+{
+ ISpeechFileStream *filestream;
+ ISpeechBaseStream *basestream;
+ IDispatch *dispatch;
+ IUnknown *unk;
+ HRESULT hr;
+
+ hr = CoCreateInstance(&CLSID_SpFileStream, NULL, CLSCTX_INPROC_SERVER,
+ &IID_ISpeechFileStream, (void **)&filestream);
+ ok(hr == S_OK, "Failed to create ISpeechFileStream interface: %#x.\n", hr);
+
+ hr = CoCreateInstance(&CLSID_SpFileStream, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IUnknown, (void **)&unk);
+ ok(hr == S_OK, "Failed to create IUnknown interface: %#x.\n", hr);
+ IUnknown_Release(unk);
+
+ hr = CoCreateInstance(&CLSID_SpFileStream, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IDispatch, (void **)&dispatch);
+ ok(hr == S_OK, "Failed to create IDispatch interface: %#x.\n", hr);
+ IDispatch_Release(dispatch);
+
+ hr = CoCreateInstance(&CLSID_SpFileStream, NULL, CLSCTX_INPROC_SERVER,
+ &IID_ISpeechBaseStream, (void **)&basestream);
+ ok(hr == S_OK, "Failed to create ISpeechBaseStream interface: %#x.\n", hr);
+ ISpeechBaseStream_Release(basestream);
+
+ ISpeechFileStream_Release(filestream);
+}
+
+START_TEST(automation)
+{
+ CoInitialize(NULL);
+ test_interfaces();
+ CoUninitialize();
+}
diff --git a/include/sapi.idl b/include/sapi.idl
index e87478cac6..9e6ba5be5e 100644
--- a/include/sapi.idl
+++ b/include/sapi.idl
@@ -483,6 +483,15 @@ typedef [restricted, hidden] struct SPRECORESULTTIMES
ULONGLONG ullStart;
} SPRECORESULTTIMES;
+typedef [hidden] enum SPFILEMODE
+{
+ SPFM_OPEN_READONLY,
+ SPFM_OPEN_READWRITE,
+ SPFM_CREATE,
+ SPFM_CREATE_ALWAYS,
+ SPFM_NUM_MODES
+} SPFILEMODE;
+
cpp_quote("#if defined(__GNUC__)")
cpp_quote("#define SPCAT_AUDIOOUT (const WCHAR []){ 'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\\\','S','O','F','T','W','A','R','E','\\\\','M','i','c','r','o','s','o','f','t','\\\\','S','p','e','e','c','h','\\\\','A','u','d','i','o','O','u','t','p','u','t',0 }")
@@ -1016,6 +1025,22 @@ interface ISpRecognizer : ISpProperties
HRESULT EmulateRecognition([in] ISpPhrase *phrase);
};
+[
+ object,
+ uuid(12e3cca9-7518-44c5-a5e7-ba5a79cb929e),
+ pointer_default(unique),
+ local,
+ restricted
+]
+interface ISpStream : ISpStreamFormat
+{
+ HRESULT SetBaseStream([in] IStream *stream, [in] REFGUID format, [in] const WAVEFORMATEX *wave);
+ HRESULT GetBaseStream([out] IStream **stream);
+ HRESULT BindToFile([in] LPCWSTR filename, [in] SPFILEMODE mode, [in] const GUID *format,
+ const WAVEFORMATEX *wave, [in] ULONGLONG interest);
+ HRESULT Close();
+}
+
[
helpstring("Speech Object Library"),
uuid(c866ca3a-32f7-11d2-9602-00c04f8ee628),
@@ -1056,4 +1081,13 @@ library SpeechLib
interface ISpVoice;
[default] interface ISpeechVoice;
};
+
+ [
+ uuid(947812b3-2ae1-4644-ba86-9e90ded7ec91),
+ ]
+ coclass SpFileStream
+ {
+ interface ISpStream;
+ [default] interface ISpeechFileStream;
+ };
}
diff --git a/include/sapiaut.idl b/include/sapiaut.idl
index 8f2b1f9a10..601ce56068 100644
--- a/include/sapiaut.idl
+++ b/include/sapiaut.idl
@@ -2005,3 +2005,32 @@ interface ISpeechRecognizer : IDispatch
[out,retval] ISpeechObjectTokens **tokens);
}
+
+typedef enum SpeechStreamFileMode
+{
+ SSFMOpenForRead = SPFM_OPEN_READONLY,
+ SSFMOpenReadWrite = SPFM_OPEN_READWRITE,
+ SSFMCreate = SPFM_CREATE,
+ SSFMCreateForWrite = SPFM_CREATE_ALWAYS,
+} SpeechStreamFileMode;
+
+typedef [hidden] enum DISPID_SpeechFileStream
+{
+ DISPID_SFSOpen = 100,
+ DISPID_SFSClose
+} DISPID_SpeechFileStream;
+
+[
+ object,
+ uuid(af67f125-ab39-4e93-b4a2-cc2e66e182a7),
+ dual,
+ pointer_default(unique)
+]
+interface ISpeechFileStream : ISpeechBaseStream
+{
+ [id(DISPID_SFSOpen)]
+ HRESULT Open([in] BSTR filename, [in, defaultvalue(SSFMOpenForRead)] SpeechStreamFileMode mode,
+ [in, defaultvalue(0)] VARIANT_BOOL events);
+ [id(DISPID_SFSClose)]
+ HRESULT Close(void);
+};
--
2.24.0
2
1
18 Nov '19
Superseded patch 173710.
Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com>
---
dlls/sapi/tests/tts.c | 8 ++++++
dlls/sapi/tts.c | 62 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+)
diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index e4b4e79943..26d13ec96a 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -37,6 +37,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line)
static void test_interfaces(void)
{
ISpeechVoice *speech_voice, *speech_voice2;
+ IConnectionPointContainer *container;
ISpVoice *spvoice, *spvoice2;
IDispatch *dispatch;
IUnknown *unk;
@@ -82,6 +83,13 @@ static void test_interfaces(void)
ISpVoice_Release(spvoice2);
ISpVoice_Release(spvoice);
+ hr = ISpeechVoice_QueryInterface(speech_voice, &IID_IConnectionPointContainer,
+ (void **)&container);
+ ok(hr == S_OK, "ISpeechVoice_QueryInterface failed: %#x.\n", hr);
+ EXPECT_REF(speech_voice, 2);
+ EXPECT_REF(container, 2);
+ IConnectionPointContainer_Release(container);
+
ISpeechVoice_Release(speech_voice);
}
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 8f1ecd1894..584c3d56b7 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -38,6 +38,7 @@ struct speech_voice
{
ISpeechVoice ISpeechVoice_iface;
ISpVoice ISpVoice_iface;
+ IConnectionPointContainer IConnectionPointContainer_iface;
LONG ref;
};
@@ -51,6 +52,11 @@ static inline struct speech_voice *impl_from_ISpVoice(ISpVoice *iface)
return CONTAINING_RECORD(iface, struct speech_voice, ISpVoice_iface);
}
+static inline struct speech_voice *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface)
+{
+ return CONTAINING_RECORD(iface, struct speech_voice, IConnectionPointContainer_iface);
+}
+
/* ISpeechVoice interface */
static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj)
{
@@ -64,6 +70,8 @@ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID ii
*obj = &This->ISpeechVoice_iface;
else if (IsEqualIID(iid, &IID_ISpVoice))
*obj = &This->ISpVoice_iface;
+ else if (IsEqualIID(iid, &IID_IConnectionPointContainer))
+ *obj = &This->IConnectionPointContainer_iface;
else
{
*obj = NULL;
@@ -726,6 +734,59 @@ static const ISpVoiceVtbl spvoice_vtbl =
spvoice_DisplayUI
};
+/* IConnectionPointContainer interface */
+static HRESULT WINAPI container_QueryInterface(IConnectionPointContainer *iface, REFIID iid, void **obj)
+{
+ struct speech_voice *This = impl_from_IConnectionPointContainer(iface);
+
+ TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj);
+
+ return ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj);
+}
+
+static ULONG WINAPI container_AddRef(IConnectionPointContainer *iface)
+{
+ struct speech_voice *This = impl_from_IConnectionPointContainer(iface);
+
+ TRACE("(%p).\n", iface);
+
+ return ISpeechVoice_AddRef(&This->ISpeechVoice_iface);
+}
+
+static ULONG WINAPI container_Release(IConnectionPointContainer *iface)
+{
+ struct speech_voice *This = impl_from_IConnectionPointContainer(iface);
+
+ TRACE("(%p).\n", iface);
+
+ return ISpeechVoice_Release(&This->ISpeechVoice_iface);
+}
+
+static HRESULT WINAPI container_EnumConnectionPoints(IConnectionPointContainer *iface,
+ IEnumConnectionPoints **enum_cp)
+{
+ FIXME("(%p, %p): stub.\n", iface, enum_cp);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI container_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid,
+ IConnectionPoint **cp)
+{
+ FIXME("(%p, %s, %p): stub.\n", iface, debugstr_guid(riid), cp);
+
+ return E_NOTIMPL;
+}
+
+const static IConnectionPointContainerVtbl container_vtbl =
+{
+ container_QueryInterface,
+ container_AddRef,
+ container_Release,
+ container_EnumConnectionPoints,
+ container_FindConnectionPoint
+};
+
HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)
{
struct speech_voice *This = heap_alloc(sizeof(*This));
@@ -734,6 +795,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)
if (!This) return E_OUTOFMEMORY;
This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl;
This->ISpVoice_iface.lpVtbl = &spvoice_vtbl;
+ This->IConnectionPointContainer_iface.lpVtbl = &container_vtbl;
This->ref = 1;
hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj);
--
2.24.0
2
1
Superseded patch 173709.
Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com>
---
dlls/sapi/tests/tts.c | 24 ++-
dlls/sapi/tts.c | 329 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 352 insertions(+), 1 deletion(-)
diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index 3b71e933a2..e4b4e79943 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -36,7 +36,8 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line)
static void test_interfaces(void)
{
- ISpeechVoice *speech_voice;
+ ISpeechVoice *speech_voice, *speech_voice2;
+ ISpVoice *spvoice, *spvoice2;
IDispatch *dispatch;
IUnknown *unk;
HRESULT hr;
@@ -60,6 +61,27 @@ static void test_interfaces(void)
EXPECT_REF(speech_voice, 1);
IUnknown_Release(unk);
+ hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER,
+ &IID_ISpVoice, (void **)&spvoice);
+ ok(hr == S_OK, "Failed to create ISpVoice interface: %#x.\n", hr);
+ EXPECT_REF(spvoice, 1);
+ EXPECT_REF(speech_voice, 1);
+
+ hr = ISpVoice_QueryInterface(spvoice, &IID_ISpeechVoice, (void **)&speech_voice2);
+ ok(hr == S_OK, "ISpVoice_QueryInterface failed: %#x.\n", hr);
+ EXPECT_REF(speech_voice2, 2);
+ EXPECT_REF(spvoice, 2);
+ EXPECT_REF(speech_voice, 1);
+ ISpeechVoice_Release(speech_voice2);
+
+ hr = ISpeechVoice_QueryInterface(speech_voice, &IID_ISpVoice, (void **)&spvoice2);
+ ok(hr == S_OK, "ISpeechVoice_QueryInterface failed: %#x.\n", hr);
+ EXPECT_REF(speech_voice, 2);
+ EXPECT_REF(spvoice2, 2);
+ EXPECT_REF(spvoice, 1);
+ ISpVoice_Release(spvoice2);
+ ISpVoice_Release(spvoice);
+
ISpeechVoice_Release(speech_voice);
}
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 4000db11f5..8f1ecd1894 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(sapi);
struct speech_voice
{
ISpeechVoice ISpeechVoice_iface;
+ ISpVoice ISpVoice_iface;
LONG ref;
};
@@ -45,6 +46,11 @@ static inline struct speech_voice *impl_from_ISpeechVoice(ISpeechVoice *iface)
return CONTAINING_RECORD(iface, struct speech_voice, ISpeechVoice_iface);
}
+static inline struct speech_voice *impl_from_ISpVoice(ISpVoice *iface)
+{
+ return CONTAINING_RECORD(iface, struct speech_voice, ISpVoice_iface);
+}
+
/* ISpeechVoice interface */
static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj)
{
@@ -56,6 +62,8 @@ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID ii
IsEqualIID(iid, &IID_IDispatch) ||
IsEqualIID(iid, &IID_ISpeechVoice))
*obj = &This->ISpeechVoice_iface;
+ else if (IsEqualIID(iid, &IID_ISpVoice))
+ *obj = &This->ISpVoice_iface;
else
{
*obj = NULL;
@@ -398,6 +406,326 @@ static const ISpeechVoiceVtbl speech_voice_vtbl =
speech_voice_DisplayUI,
};
+/* ISpVoice interface */
+static HRESULT WINAPI spvoice_QueryInterface(ISpVoice *iface, REFIID iid, void **obj)
+{
+ struct speech_voice *This = impl_from_ISpVoice(iface);
+
+ TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj);
+
+ return ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj);
+}
+
+static ULONG WINAPI spvoice_AddRef(ISpVoice *iface)
+{
+ struct speech_voice *This = impl_from_ISpVoice(iface);
+
+ TRACE("(%p).\n", iface);
+
+ return ISpeechVoice_AddRef(&This->ISpeechVoice_iface);
+}
+
+static ULONG WINAPI spvoice_Release(ISpVoice *iface)
+{
+ struct speech_voice *This = impl_from_ISpVoice(iface);
+
+ TRACE("(%p).\n", iface);
+
+ return ISpeechVoice_Release(&This->ISpeechVoice_iface);
+}
+
+static HRESULT WINAPI spvoice_SetNotifySink(ISpVoice *iface, ISpNotifySink *sink)
+{
+ FIXME("(%p, %p): stub.\n", iface, sink);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetNotifyWindowMessage(ISpVoice *iface, HWND hwnd, UINT msg,
+ WPARAM wparam, LPARAM lparam)
+{
+ FIXME("(%p, %p, %u, %lx, %lx): stub.\n", iface, hwnd, msg, wparam, lparam);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetNotifyCallbackFunction(ISpVoice *iface, SPNOTIFYCALLBACK *callback,
+ WPARAM wparam, LPARAM lparam)
+{
+ FIXME("(%p, %p, %lx, %lx): stub.\n", iface, callback, wparam, lparam);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetNotifyCallbackInterface(ISpVoice *iface, ISpNotifyCallback *callback,
+ WPARAM wparam, LPARAM lparam)
+{
+ FIXME("(%p, %p, %lx, %lx): stub.\n", iface, callback, wparam, lparam);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetNotifyWin32Event(ISpVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_WaitForNotifyEvent(ISpVoice *iface, DWORD milliseconds)
+{
+ FIXME("(%p, %d): stub.\n", iface, milliseconds);
+
+ return E_NOTIMPL;
+}
+
+static HANDLE WINAPI spvoice_GetNotifyEventHandle(ISpVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return NULL;
+}
+
+static HRESULT WINAPI spvoice_SetInterest(ISpVoice *iface, ULONGLONG event, ULONGLONG queued)
+{
+ FIXME("(%p, %s, %s): stub.\n", iface, wine_dbgstr_longlong(event), wine_dbgstr_longlong(queued));
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetEvents(ISpVoice *iface, ULONG count, SPEVENT *array, ULONG *fetched)
+{
+ FIXME("(%p, %u, %p, %p): stub.\n", iface, count, array, fetched);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetInfo(ISpVoice *iface, SPEVENTSOURCEINFO *info)
+{
+ FIXME("(%p, %p): stub.\n", iface, info);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetOutput(ISpVoice *iface, IUnknown *unk, BOOL changes)
+{
+ FIXME("(%p, %p, %d: stub.\n)", iface, unk, changes);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetOutputObjectToken(ISpVoice *iface, ISpObjectToken **token)
+{
+ FIXME("(%p, %p): stub.\n", iface, token);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetOutputStream(ISpVoice *iface, ISpStreamFormat **stream)
+{
+ FIXME("(%p, %p): stub.\n", iface, stream);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_Pause(ISpVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_Resume(ISpVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetVoice(ISpVoice *iface, ISpObjectToken *token)
+{
+ FIXME("(%p, %p): stub.\n", iface, token);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token)
+{
+ FIXME("(%p, %p): stub.\n", iface, token);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWORD flags, ULONG *number)
+{
+ FIXME("(%p, %p, %#x, %p): stub.\n", iface, contents, flags, number);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SpeakStream(ISpVoice *iface, IStream *stream, DWORD flags, ULONG *number)
+{
+ FIXME("(%p, %p, %#x, %p): stub.\n", iface, stream, flags, number);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetStatus(ISpVoice *iface, SPVOICESTATUS *status, WCHAR **bookmark)
+{
+ FIXME("(%p, %p, %p): stub.\n", iface, status, bookmark);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_Skip(ISpVoice *iface, const WCHAR *type, LONG items, ULONG *skipped)
+{
+ FIXME("(%p, %s, %d, %p): stub.\n", iface, debugstr_w(type), items, skipped);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetPriority(ISpVoice *iface, SPVPRIORITY priority)
+{
+ FIXME("(%p, %d): stub.\n", iface, priority);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetPriority(ISpVoice *iface, SPVPRIORITY *priority)
+{
+ FIXME("(%p, %p): stub.\n", iface, priority);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetAlertBoundary(ISpVoice *iface, SPEVENTENUM boundary)
+{
+ FIXME("(%p, %d): stub.\n", iface, boundary);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetAlertBoundary(ISpVoice *iface, SPEVENTENUM *boundary)
+{
+ FIXME("(%p, %p): stub.\n", iface, boundary);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetRate(ISpVoice *iface, LONG adjust)
+{
+ FIXME("(%p, %d): stub.\n", iface, adjust);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetRate(ISpVoice *iface, LONG *adjust)
+{
+ FIXME("(%p, %p): stub.\n", iface, adjust);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetVolume(ISpVoice *iface, USHORT volume)
+{
+ FIXME("(%p, %d): stub.\n", iface, volume);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetVolume(ISpVoice *iface, USHORT *volume)
+{
+ FIXME("(%p, %p): stub.\n", iface, volume);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_WaitUntilDone(ISpVoice *iface, ULONG timeout)
+{
+ FIXME("(%p, %d): stub.\n", iface, timeout);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetSyncSpeakTimeout(ISpVoice *iface, ULONG timeout)
+{
+ FIXME("(%p, %d): stub.\n", iface, timeout);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetSyncSpeakTimeout(ISpVoice *iface, ULONG *timeout)
+{
+ FIXME("(%p, %p): stub.\n", iface, timeout);
+
+ return E_NOTIMPL;
+}
+
+static HANDLE WINAPI spvoice_SpeakCompleteEvent(ISpVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return NULL;
+}
+
+static HRESULT WINAPI spvoice_IsUISupported(ISpVoice *iface, const WCHAR *type, void *extra,
+ ULONG count, BOOL *supported)
+{
+ FIXME("(%p, %p, %p, %d, %p): stub.\n", iface, type, extra, count, supported);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_DisplayUI(ISpVoice *iface, HWND parent, const WCHAR *title,
+ const WCHAR *type, void *extra, ULONG count)
+{
+ FIXME("(%p, %p, %p, %p, %p, %d): stub.\n", iface, parent, title, type, extra, count);
+
+ return E_NOTIMPL;
+}
+
+static const ISpVoiceVtbl spvoice_vtbl =
+{
+ spvoice_QueryInterface,
+ spvoice_AddRef,
+ spvoice_Release,
+ spvoice_SetNotifySink,
+ spvoice_SetNotifyWindowMessage,
+ spvoice_SetNotifyCallbackFunction,
+ spvoice_SetNotifyCallbackInterface,
+ spvoice_SetNotifyWin32Event,
+ spvoice_WaitForNotifyEvent,
+ spvoice_GetNotifyEventHandle,
+ spvoice_SetInterest,
+ spvoice_GetEvents,
+ spvoice_GetInfo,
+ spvoice_SetOutput,
+ spvoice_GetOutputObjectToken,
+ spvoice_GetOutputStream,
+ spvoice_Pause,
+ spvoice_Resume,
+ spvoice_SetVoice,
+ spvoice_GetVoice,
+ spvoice_Speak,
+ spvoice_SpeakStream,
+ spvoice_GetStatus,
+ spvoice_Skip,
+ spvoice_SetPriority,
+ spvoice_GetPriority,
+ spvoice_SetAlertBoundary,
+ spvoice_GetAlertBoundary,
+ spvoice_SetRate,
+ spvoice_GetRate,
+ spvoice_SetVolume,
+ spvoice_GetVolume,
+ spvoice_WaitUntilDone,
+ spvoice_SetSyncSpeakTimeout,
+ spvoice_GetSyncSpeakTimeout,
+ spvoice_SpeakCompleteEvent,
+ spvoice_IsUISupported,
+ spvoice_DisplayUI
+};
+
HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)
{
struct speech_voice *This = heap_alloc(sizeof(*This));
@@ -405,6 +733,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)
if (!This) return E_OUTOFMEMORY;
This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl;
+ This->ISpVoice_iface.lpVtbl = &spvoice_vtbl;
This->ref = 1;
hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj);
--
2.24.0
2
1
[PATCH] kernel32: implement Windows NT style GMEM_MOVEABLE/LMEM_MOVEABLE memory
by Damjan Jovanovic 18 Nov '19
by Damjan Jovanovic 18 Nov '19
18 Nov '19
Tests were performed on many Windows versions. Wine's unit tests
cannot be used on Win9x any more; mingw's binaries require
symbols only found in newer versions of MSVCRT.DLL.
A GCC 2.95-based mingw had to be used, with a custom test
(available on request).
On Win9x, GlobalLock()/LocalLock() return pointers aligned
to 4 byte boundaries (never 8), as they call HeapAlloc()
which returns pointers aligned to 8 bytes, but then use the first
4 bytes to store the address of the HGLOBAL/HLOCAL.
On WinNT, GlobalLock()/LocalLock() return pointers aligned
to 8 byte boundaries. It is not known how
GlobalHandle()/LocalHandle() converts the pointer back to the
HGLOBAL/HLOCAL, but its address certainly isn't stored 4 bytes
before the pointer.
Wine initially followed the Win9x layout, but then as of Git
commit cd0219e941505ac7026c5412ea68b54722ab234a started using
8 bytes before the pointer returned from *Lock() to maintain
alignment on an 8 byte boundary, which some applications
(certainly developed and tested only on Windows NT derivatives)
wanted, and got memory corruption without. This however isn't
enough. wxWidgets expects to be able to pass the pointer returned
from GlobalLock() to HeapSize(), and applications crash if that
fails. Not only must we maintain 8 byte alignment when emulating
Windows NT, but the pointer returned from GlobalLock() must point
to the start of a valid heap block.
In this patch we support all Windows versions correctly:
* When emulating Win9x, use only 4 bytes behind the pointer
to store the address of the HGLOBAL/HLOCAL, instead of
the current 8.
* When emulating WinNT, allocate only the memory we need,
storing the mapping from the pointer to
its HGLOBAL/HLOCAL in a hash table, and implement
GlobalHandle()/LocalHandle() by searching the hash table.
Apart from improving correctness, this design also decreases
memory usage by 4 bytes per allocation when emulating WinNT.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38924
Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com>
---
dlls/kernel32/heap.c | 89 ++++++++--------
dlls/kernel32/tests/heap.c | 10 ++
dlls/kernelbase/kernelbase.spec | 1 +
dlls/kernelbase/memory.c | 175 +++++++++++++++++++++++++++-----
include/winbase.h | 16 +++
5 files changed, 219 insertions(+), 72 deletions(-)
3
2
[PATCH] dmstyle: Add GUID_IDirectMusicStyle support in Style Track GetParam.
by Alistair Leslie-Hughes 18 Nov '19
by Alistair Leslie-Hughes 18 Nov '19
18 Nov '19
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
dlls/dmstyle/styletrack.c | 24 ++++++++++++++++++++----
dlls/dmstyle/tests/dmstyle.c | 31 +++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c
index cc15bd81d1..06fe1c7ca8 100644
--- a/dlls/dmstyle/styletrack.c
+++ b/dlls/dmstyle/styletrack.c
@@ -132,15 +132,31 @@ static HRESULT WINAPI style_track_Play(IDirectMusicTrack8 *iface, void *pStateDa
return S_OK;
}
-static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
- MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
+static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type,
+ MUSIC_TIME time, MUSIC_TIME *next, void *param)
{
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
- FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam);
+ struct list *item = NULL;
- if (!rguidType)
+ FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(type), time, next, param);
+
+ if (!type)
return E_POINTER;
+ if (IsEqualGUID(&GUID_IDirectMusicStyle, type)) {
+ LIST_FOR_EACH (item, &This->Items) {
+ DMUS_PRIVATE_STYLE_ITEM *style = LIST_ENTRY(item, DMUS_PRIVATE_STYLE_ITEM, entry);
+ if (style->pObject) {
+ IDirectMusicStyle8_AddRef(style->pObject);
+ *((IDirectMusicStyle8**)param) = style->pObject;
+
+ return S_OK;
+ }
+ }
+
+ return DMUS_E_NOT_FOUND;
+ }
+
return S_OK;
}
diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c
index 6b2275866c..9cb42ec077 100644
--- a/dlls/dmstyle/tests/dmstyle.c
+++ b/dlls/dmstyle/tests/dmstyle.c
@@ -318,6 +318,12 @@ static void test_track(void)
ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr);
}
+ hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicStyle);
+ if (class[i].clsid == &CLSID_DirectMusicStyleTrack)
+ ok(hr == S_OK, "got: %08x\n", hr);
+ else
+ ok(hr == DMUS_E_TYPE_UNSUPPORTED, "got: %08x\n", hr);
+
/* IPersistStream */
hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps);
ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);
@@ -341,6 +347,30 @@ static void test_track(void)
}
}
+static void test_track_DirectMusicStyleTrack(void)
+{
+ IDirectMusicTrack8 *dmt8;
+ HRESULT hr;
+ GUID params[] = { GUID_DisableTimeSig, GUID_EnableTimeSig, GUID_IDirectMusicStyle, GUID_SeedVariations,
+ GUID_TimeSignature};
+ IDirectMusicStyle *style = NULL;
+ int i;
+
+ hr = CoCreateInstance(&CLSID_DirectMusicStyleTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8,
+ (void**)&dmt8);
+ ok(hr == S_OK, "Failed: %08x\n", hr);
+
+ for (i=0; i < ARRAY_SIZE(params); i++) {
+ hr = IDirectMusicTrack8_IsParamSupported(dmt8, ¶ms[i]);
+ ok(hr == S_OK, "Failed: %08x\n", hr);
+ }
+
+ hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_IDirectMusicStyle, 0, NULL, &style);
+ ok(hr == DMUS_E_NOT_FOUND, "Failed: %08x\n", hr);
+
+ IDirectMusicTrack8_Release(dmt8);
+}
+
struct chunk {
FOURCC id;
DWORD size;
@@ -556,6 +586,7 @@ START_TEST(dmstyle)
test_COM_track();
test_dmstyle();
test_track();
+ test_track_DirectMusicStyleTrack();
test_parsedescriptor();
CoUninitialize();
--
2.17.1
2
1
[PATCH] dmband/tests: Check all IDirectMusicTrack_IsParamSupported() types
by Michael Stefaniuc 17 Nov '19
by Michael Stefaniuc 17 Nov '19
17 Nov '19
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmband/tests/dmband.c | 50 ++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c
index 29d0668219..459d00ed1d 100644
--- a/dlls/dmband/tests/dmband.c
+++ b/dlls/dmband/tests/dmband.c
@@ -181,6 +181,44 @@ static void test_bandtrack(void)
CLSID class;
ULARGE_INTEGER size;
HRESULT hr;
+#define X(guid) &guid, #guid
+ const struct {
+ REFGUID type;
+ const char *name;
+ BOOL supported;
+ } param_types[] = {
+ { X(GUID_BandParam), TRUE },
+ { X(GUID_ChordParam), FALSE },
+ { X(GUID_Clear_All_Bands), TRUE },
+ { X(GUID_CommandParam), FALSE },
+ { X(GUID_CommandParam2), FALSE },
+ { X(GUID_CommandParamNext), FALSE },
+ { X(GUID_ConnectToDLSCollection), TRUE },
+ { X(GUID_Disable_Auto_Download), TRUE },
+ { X(GUID_DisableTempo), FALSE },
+ { X(GUID_DisableTimeSig), FALSE },
+ { X(GUID_Download), TRUE },
+ { X(GUID_DownloadToAudioPath), TRUE },
+ { X(GUID_Enable_Auto_Download), TRUE },
+ { X(GUID_EnableTempo), FALSE },
+ { X(GUID_EnableTimeSig), FALSE },
+ { X(GUID_IDirectMusicBand), TRUE },
+ { X(GUID_IDirectMusicChordMap), FALSE },
+ { X(GUID_IDirectMusicStyle), FALSE },
+ { X(GUID_MuteParam), FALSE },
+ { X(GUID_Play_Marker), FALSE },
+ { X(GUID_RhythmParam), FALSE },
+ { X(GUID_SeedVariations), FALSE },
+ { X(GUID_StandardMIDIFile), TRUE },
+ { X(GUID_TempoParam), FALSE },
+ { X(GUID_TimeSignature), FALSE },
+ { X(GUID_Unload), TRUE },
+ { X(GUID_UnloadFromAudioPath), TRUE },
+ { X(GUID_Valid_Start_Time), FALSE },
+ { X(GUID_Variations), FALSE },
+ };
+#undef X
+ unsigned int i;
hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER,
&IID_IDirectMusicTrack8, (void**)&dmt8);
@@ -203,8 +241,20 @@ static void test_bandtrack(void)
hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL);
ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr);
}
+
hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL);
ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr);
+ for (i = 0; i < ARRAY_SIZE(param_types); i++) {
+ hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[i].type);
+ if (param_types[i].supported)
+ ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n",
+ param_types[i].name, hr);
+ else
+ ok(hr == DMUS_E_TYPE_UNSUPPORTED,
+ "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",
+ param_types[i].name, hr);
+ }
+
hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL);
ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr);
hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL);
--
2.20.1
1
0
[PATCH 3/3] dmime/tests: Check all IDirectMusicTrack_IsParamSupported() types
by Michael Stefaniuc 17 Nov '19
by Michael Stefaniuc 17 Nov '19
17 Nov '19
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmime/tests/dmime.c | 82 ++++++++++++++++++++++++++++++----------
1 file changed, 62 insertions(+), 20 deletions(-)
diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c
index 944a278dbb..3fb0e8afd8 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -532,24 +532,62 @@ static void test_track(void)
CLSID classid;
ULARGE_INTEGER size;
HRESULT hr;
+#define X(guid) &guid, #guid
+ const struct {
+ REFGUID type;
+ const char *name;
+ } param_types[] = {
+ { X(GUID_BandParam) },
+ { X(GUID_ChordParam) },
+ { X(GUID_Clear_All_Bands) },
+ { X(GUID_CommandParam) },
+ { X(GUID_CommandParam2) },
+ { X(GUID_CommandParamNext) },
+ { X(GUID_ConnectToDLSCollection) },
+ { X(GUID_Disable_Auto_Download) },
+ { X(GUID_DisableTempo) },
+ { X(GUID_DisableTimeSig) },
+ { X(GUID_Download) },
+ { X(GUID_DownloadToAudioPath) },
+ { X(GUID_Enable_Auto_Download) },
+ { X(GUID_EnableTempo) },
+ { X(GUID_EnableTimeSig) },
+ { X(GUID_IDirectMusicBand) },
+ { X(GUID_IDirectMusicChordMap) },
+ { X(GUID_IDirectMusicStyle) },
+ { X(GUID_MuteParam) },
+ { X(GUID_Play_Marker) },
+ { X(GUID_RhythmParam) },
+ { X(GUID_SeedVariations) },
+ { X(GUID_StandardMIDIFile) },
+ { X(GUID_TempoParam) },
+ { X(GUID_TimeSignature) },
+ { X(GUID_Unload) },
+ { X(GUID_UnloadFromAudioPath) },
+ { X(GUID_Valid_Start_Time) },
+ { X(GUID_Variations) },
+ { X(GUID_NULL) }
+ };
+#undef X
#define X(class) &CLSID_ ## class, #class
const struct {
REFCLSID clsid;
const char *name;
- BOOL has_param;
+ /* bitfield with supported param types */
+ unsigned int has_params;
} class[] = {
- { X(DirectMusicLyricsTrack), TRUE },
- { X(DirectMusicMarkerTrack), TRUE },
- { X(DirectMusicParamControlTrack), TRUE },
- { X(DirectMusicSegmentTriggerTrack), TRUE },
- { X(DirectMusicSeqTrack), FALSE },
- { X(DirectMusicSysExTrack), FALSE },
- { X(DirectMusicTempoTrack), TRUE },
- { X(DirectMusicTimeSigTrack), TRUE },
- { X(DirectMusicWaveTrack), TRUE }
+ { X(DirectMusicLyricsTrack), 0 },
+ { X(DirectMusicMarkerTrack), 0x8080000 },
+ { X(DirectMusicParamControlTrack), 0 },
+ { X(DirectMusicSegmentTriggerTrack), 0x3fffffff },
+ { X(DirectMusicSeqTrack), ~0 }, /* param methods not implemented */
+ { X(DirectMusicSysExTrack), ~0 }, /* param methods not implemented */
+ { X(DirectMusicTempoTrack), 0x802100 },
+ { X(DirectMusicTimeSigTrack), 0x1004200 },
+ { X(DirectMusicWaveTrack), 0x6001c80 }
};
#undef X
- unsigned int i;
+ unsigned int i, j;
for (i = 0; i < ARRAY_SIZE(class); i++) {
trace("Testing %s\n", class[i].name);
@@ -558,7 +596,18 @@ static void test_track(void)
ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr);
/* IDirectMusicTrack */
- if (!class[i].has_param) {
+ if (class[i].has_params != ~0) {
+ for (j = 0; j < ARRAY_SIZE(param_types); j++) {
+ hr = IDirectMusicTrack8_IsParamSupported(dmt, param_types[j].type);
+ if (class[i].has_params & (1 << j))
+ ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n",
+ param_types[j].name, hr);
+ else
+ ok(hr == DMUS_E_TYPE_UNSUPPORTED,
+ "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",
+ param_types[j].name, hr);
+ }
+ } else {
hr = IDirectMusicTrack_GetParam(dmt, NULL, 0, NULL, NULL);
ok(hr == E_NOTIMPL, "IDirectMusicTrack_GetParam failed: %08x\n", hr);
hr = IDirectMusicTrack_SetParam(dmt, NULL, 0, NULL);
@@ -569,13 +618,6 @@ static void test_track(void)
hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle);
ok(hr == E_NOTIMPL, "got: %08x\n", hr);
}
- else {
- hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle);
- if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack)
- ok(hr == S_OK, "got: %08x\n", hr);
- else
- ok(hr == DMUS_E_TYPE_UNSUPPORTED, "got: %08x\n", hr);
- }
if (class[i].clsid != &CLSID_DirectMusicMarkerTrack &&
class[i].clsid != &CLSID_DirectMusicTimeSigTrack) {
hr = IDirectMusicTrack_AddNotificationType(dmt, NULL);
@@ -591,7 +633,7 @@ static void test_track(void)
if (hr == S_OK) {
hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0);
todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr);
- if (!class[i].has_param) {
+ if (class[i].has_params == ~0) {
hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0);
ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr);
hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0);
--
2.20.1
1
0
[PATCH 2/3] dmime: The Wave track supports two additional param types
by Michael Stefaniuc 17 Nov '19
by Michael Stefaniuc 17 Nov '19
17 Nov '19
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmime/wavetrack.c | 33 ++++++++++++++++++++-------------
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c
index a679ed60ab..5869c9e72d 100644
--- a/dlls/dmime/wavetrack.c
+++ b/dlls/dmime/wavetrack.c
@@ -136,20 +136,27 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rgu
return S_OK;
}
-static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType)
+static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type)
{
- IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
-
- TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType));
- if (IsEqualGUID (rguidType, &GUID_Disable_Auto_Download)
- || IsEqualGUID (rguidType, &GUID_Download)
- || IsEqualGUID (rguidType, &GUID_DownloadToAudioPath)
- || IsEqualGUID (rguidType, &GUID_Enable_Auto_Download)) {
- TRACE("param supported\n");
- return S_OK;
- }
- TRACE("param unsupported\n");
- return DMUS_E_TYPE_UNSUPPORTED;
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
+ static const REFGUID valid[] = {
+ &GUID_Disable_Auto_Download,
+ &GUID_Download,
+ &GUID_DownloadToAudioPath,
+ &GUID_Enable_Auto_Download,
+ &GUID_Unload,
+ &GUID_UnloadFromAudioPath
+ };
+ unsigned int i;
+
+ TRACE("(%p, %s)\n", This, debugstr_dmguid(type));
+
+ for (i = 0; i < ARRAY_SIZE(valid); i++)
+ if (IsEqualGUID(type, valid[i]))
+ return S_OK;
+
+ TRACE("param unsupported\n");
+ return DMUS_E_TYPE_UNSUPPORTED;
}
static HRESULT WINAPI wave_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype)
--
2.20.1
1
0
[PATCH 1/3] dmime: SegTrigger track supports all param types, even invalid ones
by Michael Stefaniuc 17 Nov '19
by Michael Stefaniuc 17 Nov '19
17 Nov '19
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmime/segtriggertrack.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c
index 3050a5031b..7e1d75aa05 100644
--- a/dlls/dmime/segtriggertrack.c
+++ b/dlls/dmime/segtriggertrack.c
@@ -156,11 +156,7 @@ static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface,
TRACE("(%p, %s)\n", This, debugstr_dmguid(type));
- if (IsEqualGUID(type, &GUID_IDirectMusicStyle))
- return S_OK;
-
- TRACE("param unsupported\n");
- return DMUS_E_TYPE_UNSUPPORTED;
+ return S_OK;
}
static HRESULT WINAPI segment_track_AddNotificationType(IDirectMusicTrack8 *iface,
--
2.20.1
1
0
[PATCH] dmstyle/tests: Check all IDirectMusicTrack8_IsParamSupported() types
by Michael Stefaniuc 17 Nov '19
by Michael Stefaniuc 17 Nov '19
17 Nov '19
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmstyle/tests/dmstyle.c | 66 ++++++++++++++++++++++++++++++++----
1 file changed, 59 insertions(+), 7 deletions(-)
diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c
index 6b2275866c..0c17ef3b41 100644
--- a/dlls/dmstyle/tests/dmstyle.c
+++ b/dlls/dmstyle/tests/dmstyle.c
@@ -244,22 +244,61 @@ static void test_track(void)
CLSID classid;
ULARGE_INTEGER size;
HRESULT hr;
+#define X(guid) &guid, #guid
+ const struct {
+ REFGUID type;
+ const char *name;
+ } param_types[] = {
+ { X(GUID_BandParam) },
+ { X(GUID_ChordParam) },
+ { X(GUID_Clear_All_Bands) },
+ { X(GUID_CommandParam) },
+ { X(GUID_CommandParam2) },
+ { X(GUID_CommandParamNext) },
+ { X(GUID_ConnectToDLSCollection) },
+ { X(GUID_Disable_Auto_Download) },
+ { X(GUID_DisableTempo) },
+ { X(GUID_DisableTimeSig) },
+ { X(GUID_Download) },
+ { X(GUID_DownloadToAudioPath) },
+ { X(GUID_Enable_Auto_Download) },
+ { X(GUID_EnableTempo) },
+ { X(GUID_EnableTimeSig) },
+ { X(GUID_IDirectMusicBand) },
+ { X(GUID_IDirectMusicChordMap) },
+ { X(GUID_IDirectMusicStyle) },
+ { X(GUID_MuteParam) },
+ { X(GUID_Play_Marker) },
+ { X(GUID_RhythmParam) },
+ { X(GUID_SeedVariations) },
+ { X(GUID_StandardMIDIFile) },
+ { X(GUID_TempoParam) },
+ { X(GUID_TimeSignature) },
+ { X(GUID_Unload) },
+ { X(GUID_UnloadFromAudioPath) },
+ { X(GUID_Valid_Start_Time) },
+ { X(GUID_Variations) }
+ };
+#undef X
#define X(class) &CLSID_ ## class, #class
const struct {
REFCLSID clsid;
const char *name;
BOOL has_save;
BOOL has_join;
+ /* bitfields with supported param types */
+ unsigned int has_params;
+ unsigned int todo_params;
} class[] = {
- { X(DirectMusicAuditionTrack), TRUE, FALSE },
- { X(DirectMusicChordTrack), TRUE, TRUE },
- { X(DirectMusicCommandTrack), TRUE, TRUE },
- { X(DirectMusicMotifTrack), FALSE, FALSE },
- { X(DirectMusicMuteTrack), TRUE, FALSE },
- { X(DirectMusicStyleTrack), FALSE, TRUE },
+ { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 },
+ { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 1 },
+ { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 },
+ { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 },
+ { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 },
+ { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200, 0 },
};
#undef X
- unsigned int i;
+ unsigned int i, j;
for (i = 0; i < ARRAY_SIZE(class); i++) {
trace("Testing %s\n", class[i].name);
@@ -287,6 +326,19 @@ static void test_track(void)
hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL);
ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr);
+ for (j = 0; j < ARRAY_SIZE(param_types); j++) {
+ hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[j].type);
+ if (class[i].has_params & (1 << j))
+ todo_wine_if(class[i].todo_params & (1 << j))
+ ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n",
+ param_types[j].name, hr);
+ else
+ todo_wine_if(class[i].todo_params & (1 << j))
+ ok(hr == DMUS_E_TYPE_UNSUPPORTED,
+ "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",
+ param_types[j].name, hr);
+ }
+
if (class[i].clsid == &CLSID_DirectMusicMuteTrack) {
hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL);
ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr);
--
2.20.1
1
0
With some tablet configurations, the InExt value passed to
ScaleForContext can be very large, leading to an integer overflow. Using
MulDiv prevents this problem by internally using 64-bit math.
Signed-off-by: John Chadwick <john(a)jchw.io>
---
dlls/wintab32/context.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c
index 0514dd78b4..ff9a4ca677 100644
--- a/dlls/wintab32/context.c
+++ b/dlls/wintab32/context.c
@@ -178,9 +178,9 @@ int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam,
static inline DWORD ScaleForContext(DWORD In, LONG InOrg, LONG InExt, LONG OutOrg, LONG OutExt)
{
if (((InExt > 0 )&&(OutExt > 0)) || ((InExt<0) && (OutExt < 0)))
- return ((In - InOrg) * abs(OutExt) / abs(InExt)) + OutOrg;
+ return MulDiv(In - InOrg, abs(OutExt), abs(InExt)) + OutOrg;
else
- return ((abs(InExt) - (In - InOrg))*abs(OutExt) / abs(InExt)) + OutOrg;
+ return MulDiv(abs(InExt) - (In - InOrg), abs(OutExt), abs(InExt)) + OutOrg;
}
LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd)
--
2.23.0
1
0
17 Nov '19
Removed IPersistStream CLSID checks as this was just wrong.
Added support for Any Group (group = 0xFFFFFFFF)
Rename Parameters and variables.
Remove initial values of variables as they aren't required.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
dlls/dmime/segment.c | 76 +++++++++++++++++++-------------------------
1 file changed, 33 insertions(+), 43 deletions(-)
diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index d47c2f2c23..0c64989a00 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -366,58 +366,48 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_RemoveNotificationType(IDirectMus
}
static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface,
- REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext,
- void *pParam)
+ REFGUID type, DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next,
+ void *param)
{
- IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
- CLSID pIt_clsid;
- struct list* pEntry = NULL;
- IDirectMusicTrack* pTrack = NULL;
- IPersistStream* pCLSIDStream = NULL;
- LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL;
- HRESULT hr = S_OK;
+ IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
+ struct list *item;
+ IDirectMusicTrack *track;
+ DMUS_PRIVATE_SEGMENT_TRACK *segment;
+ HRESULT hr;
- FIXME("(%p, %s, 0x%x, %d, %d, %p, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam);
-
- if (DMUS_SEG_ANYTRACK == dwIndex) {
-
- LIST_FOR_EACH (pEntry, &This->Tracks) {
- pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry);
+ FIXME("(%p, %s, 0x%x, %d, %d, %p, %p) Semi-stub\n", This, debugstr_dmguid(type), group,
+ index, time, next, param);
- hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream);
- if (FAILED(hr)) {
- ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", This, pIt->pTrack);
- continue ;
- }
+ if (index == DMUS_SEG_ANYTRACK || group == 0xFFFFFFFF) {
+ if (group == 0xFFFFFFFF && index != DMUS_SEG_ANYTRACK)
+ WARN("Any group doesnt have DMUS_SEG_ANYTRACK index.\n");
- TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack);
+ LIST_FOR_EACH (item, &This->Tracks) {
+ segment = LIST_ENTRY(item, DMUS_PRIVATE_SEGMENT_TRACK, entry);
- if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ;
- hr = IPersistStream_GetClassID(pCLSIDStream, &pIt_clsid);
- IPersistStream_Release(pCLSIDStream); pCLSIDStream = NULL;
- if (FAILED(hr)) {
- ERR("(%p): non-implemented GetClassID for object %p\n", This, pIt->pTrack);
- continue ;
- }
- if (FALSE == IsEqualGUID(&pIt_clsid, rguidType)) continue ;
- if (FAILED(IDirectMusicTrack_IsParamSupported(pIt->pTrack, rguidType))) continue ;
- hr = IDirectMusicTrack_GetParam(pIt->pTrack, rguidType, mtTime, pmtNext, pParam);
- if (SUCCEEDED(hr)) return hr;
+ TRACE(" - %p -> 0x%x,%p\n", segment, segment->dwGroupBits, segment->pTrack);
+
+ if (0xFFFFFFFF != group && 0 == (segment->dwGroupBits & group)) continue;
+
+ if (FAILED(IDirectMusicTrack_IsParamSupported(segment->pTrack, type))) continue;
+ hr = IDirectMusicTrack_GetParam(segment->pTrack, type, time, next, param);
+ if (SUCCEEDED(hr)) return hr;
+ }
+
+ WARN("(%p): not found\n", This);
+ return DMUS_E_TRACK_NOT_FOUND;
}
- ERR("(%p): not found\n", This);
- return DMUS_E_TRACK_NOT_FOUND;
- }
- hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, dwGroupBits, dwIndex, &pTrack);
- if (FAILED(hr)) {
- ERR("(%p): not found\n", This);
- return DMUS_E_TRACK_NOT_FOUND;
- }
+ hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, index, &track);
+ if (FAILED(hr)) {
+ ERR("(%p): not found\n", This);
+ return DMUS_E_TRACK_NOT_FOUND;
+ }
- hr = IDirectMusicTrack_GetParam(pTrack, rguidType, mtTime, pmtNext, pParam);
- IDirectMusicTrack_Release(pTrack); pTrack = NULL;
+ hr = IDirectMusicTrack_GetParam(track, type, time, next, param);
+ IDirectMusicTrack_Release(track); track = NULL;
- return hr;
+ return hr;
}
static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *iface,
--
2.17.1
1
0
17 Nov '19
Removed IPersistStream CLSID checks as this was just wrong.
Added support for Any Group (group = 0xFFFFFFFF)
Rename Parameters and variables.
Remove initial values of variables as they aren't required.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
dlls/dmime/segment.c | 87 ++++++++++++++++++++++----------------------
1 file changed, 44 insertions(+), 43 deletions(-)
diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index d47c2f2c230..850b710ee82 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -366,58 +366,59 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_RemoveNotificationType(IDirectMus
}
static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface,
- REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext,
- void *pParam)
+ REFGUID type, DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next,
+ void *param)
{
- IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
- CLSID pIt_clsid;
- struct list* pEntry = NULL;
- IDirectMusicTrack* pTrack = NULL;
- IPersistStream* pCLSIDStream = NULL;
- LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL;
- HRESULT hr = S_OK;
+ IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
+ struct list *item;
+ IDirectMusicTrack *track;
+ DMUS_PRIVATE_SEGMENT_TRACK *segment;
+ HRESULT hr;
- FIXME("(%p, %s, 0x%x, %d, %d, %p, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam);
-
- if (DMUS_SEG_ANYTRACK == dwIndex) {
-
- LIST_FOR_EACH (pEntry, &This->Tracks) {
- pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry);
+ FIXME("(%p, %s, 0x%x, %d, %d, %p, %p) Semi-stub\n", This, debugstr_dmguid(type), group,
+ index, time, next, param);
- hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream);
- if (FAILED(hr)) {
- ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", This, pIt->pTrack);
- continue ;
- }
+ if (index == DMUS_SEG_ANYTRACK) {
+ LIST_FOR_EACH (item, &This->Tracks) {
+ segment = LIST_ENTRY(item, DMUS_PRIVATE_SEGMENT_TRACK, entry);
- TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack);
+ TRACE(" - %p -> 0x%x,%p\n", segment, segment->dwGroupBits, segment->pTrack);
- if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ;
- hr = IPersistStream_GetClassID(pCLSIDStream, &pIt_clsid);
- IPersistStream_Release(pCLSIDStream); pCLSIDStream = NULL;
- if (FAILED(hr)) {
- ERR("(%p): non-implemented GetClassID for object %p\n", This, pIt->pTrack);
- continue ;
- }
- if (FALSE == IsEqualGUID(&pIt_clsid, rguidType)) continue ;
- if (FAILED(IDirectMusicTrack_IsParamSupported(pIt->pTrack, rguidType))) continue ;
- hr = IDirectMusicTrack_GetParam(pIt->pTrack, rguidType, mtTime, pmtNext, pParam);
- if (SUCCEEDED(hr)) return hr;
+ if (0xFFFFFFFF != group && 0 == (segment->dwGroupBits & group)) continue ;
+
+ if (FAILED(IDirectMusicTrack_IsParamSupported(segment->pTrack, type))) continue ;
+ hr = IDirectMusicTrack_GetParam(segment->pTrack, type, time, next, param);
+ if (SUCCEEDED(hr)) return hr;
+ }
+
+ WARN("(%p): not found\n", This);
+ return DMUS_E_TRACK_NOT_FOUND;
}
- ERR("(%p): not found\n", This);
- return DMUS_E_TRACK_NOT_FOUND;
- }
- hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, dwGroupBits, dwIndex, &pTrack);
- if (FAILED(hr)) {
- ERR("(%p): not found\n", This);
- return DMUS_E_TRACK_NOT_FOUND;
- }
+ if (group == 0xFFFFFFFF) {
+ if (index != 0)
+ FIXME("Currently only first index is supported.\n");
- hr = IDirectMusicTrack_GetParam(pTrack, rguidType, mtTime, pmtNext, pParam);
- IDirectMusicTrack_Release(pTrack); pTrack = NULL;
+ LIST_FOR_EACH (item, &This->Tracks) {
+ segment = LIST_ENTRY(item, DMUS_PRIVATE_SEGMENT_TRACK, entry);
+ if (SUCCEEDED(IDirectMusicTrack_IsParamSupported(segment->pTrack, type)))
+ return IDirectMusicTrack_GetParam(segment->pTrack, type, time, next, param);
+ }
- return hr;
+ WARN("(%p): not found\n", This);
+ return DMUS_E_TRACK_NOT_FOUND;
+ }
+
+ hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, index, &track);
+ if (FAILED(hr)) {
+ ERR("(%p): not found\n", This);
+ return DMUS_E_TRACK_NOT_FOUND;
+ }
+
+ hr = IDirectMusicTrack_GetParam(track, type, time, next, param);
+ IDirectMusicTrack_Release(track); track = NULL;
+
+ return hr;
}
static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *iface,
--
2.24.0
2
1
This series of patches and follow-ups will implement dssenh.
Dssenh has a lot of functionalities in common with rsaenh, so try to
extract the codes that are irrelavent to the specific module and reuse
them as much as possible.
The behaviour of dssenh is well-understood (through dssenh/tests, at
least for CPAcquireContext and CPReleaseContext). And my first goal
would be to pass all dssenh/tests.
Currently CPAcquireContext and CPReleaseContext is implemented.
I'm new here and not familiar with how to email patches, so sorry for
spamming the mail list with bad patches. Besides, is there a way to
let the robot test a series of patches without sending to the maillist?
Zhang Shuai (10):
dssenh: refactor rsaenh - create new files.
dssenh: refactor rsaenh - table driven new_key_container.
dssenh: refactor rsaenh - move create_container_key,
open_container_key, delete_container_key from rsaenh/rsaenh.c to
rsaenh/cryptoprovutils.c
dssenh: refactor rsaenh - move map_key_spec_to_permissions_name,
store_key_permissions from rsaenh/rsaenh.c to
rsaenh/cryptoprovutils.c
dssenh: refactor rsaenh - move store_key_container_keys,
store_key_container_permissions, map_key_spec_to_permissions_name
from rsaenh/rsaenh.c to rsaenh/cryptoprovutils.c
dssenh: refactor rsaenh - move release_key_container_keys,
destroy_key_container, read_key_value, read_key_container,
new_key_container, import_key from rsaenh/rsaenh.c to
rsaenh/cryptoprovutils.c
dssenh: refactor rsaenh - Change constant names.
dssenh: Makefile and registry.
refactor rsaenh - move CPAcquireContext, CPReleaseContext from
rsaenh/rsaenh.c to rsaenh/cryptoprovutils.c
dssenh: implement CPAcquireContext and CPReleaseContext for dssenh.
dlls/dssenh/Makefile.in | 9 +-
dlls/dssenh/cryptoprovconfig.h | 83 +++++
dlls/dssenh/cryptoprovutils.c | 22 ++
dlls/dssenh/dssenh.c | 184 +++++++++
dlls/dssenh/dssenh.rgs | 60 +++
dlls/dssenh/dssenh.spec | 4 +-
dlls/dssenh/handle.c | 22 ++
dlls/dssenh/main.c | 59 ---
dlls/dssenh/rsrc.rc | 31 ++
dlls/rsaenh/Makefile.in | 3 +-
dlls/rsaenh/cryptoprovconfig.h | 86 +++++
dlls/rsaenh/cryptoprovutils.c | 653 ++++++++++++++++++++++++++++++++
dlls/rsaenh/cryptoprovutils.h | 94 +++++
dlls/rsaenh/rsaenh.c | 657 +--------------------------------
14 files changed, 1254 insertions(+), 713 deletions(-)
create mode 100644 dlls/dssenh/cryptoprovconfig.h
create mode 100644 dlls/dssenh/cryptoprovutils.c
create mode 100644 dlls/dssenh/dssenh.c
create mode 100644 dlls/dssenh/dssenh.rgs
create mode 100644 dlls/dssenh/handle.c
delete mode 100644 dlls/dssenh/main.c
create mode 100644 dlls/dssenh/rsrc.rc
create mode 100644 dlls/rsaenh/cryptoprovconfig.h
create mode 100644 dlls/rsaenh/cryptoprovutils.c
create mode 100644 dlls/rsaenh/cryptoprovutils.h
--
2.21.0
1
10
This series of patches and follow-ups will implement dssenh.
Dssenh has a lot of functionalities in common with rsaenh, so try to
extract the codes that are irrelavent to the specific module and reuse
them as much as possible.
The behaviour of dssenh is well-understood (through dssenh/tests, at
least for CPAcquireContext and CPReleaseContext). And my first goal
would be to pass all dssenh/tests.
Currently CPAcquireContext and CPReleaseContext is implemented.
I'm new here and not familiar with how to email patches, so sorry for
spamming the mail list with bad patches.
Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com>
Zhang Shuai (10):
dssenh: refactor rsaenh - create new files.
dssenh: refactor rsaenh - table driven new_key_container.
dssenh: refactor rsaenh - move create_container_key,
open_container_key, delete_container_key from rsaenh/rsaenh.c to
rsaenh/cryptoprovutils.c
dssenh: refactor rsaenh - move map_key_spec_to_permissions_name,
store_key_permissions from rsaenh/rsaenh.c to
rsaenh/cryptoprovutils.c
dssenh: refactor rsaenh - move store_key_container_keys,
store_key_container_permissions, map_key_spec_to_permissions_name
from rsaenh/rsaenh.c to rsaenh/cryptoprovutils.c
dssenh: refactor rsaenh - move release_key_container_keys,
destroy_key_container, read_key_value, read_key_container,
new_key_container, import_key from rsaenh/rsaenh.c to
rsaenh/cryptoprovutils.c
dssenh: refactor rsaenh - Change constant names.
dssenh: Makefile and registry.
refactor rsaenh - move CPAcquireContext, CPReleaseContext from
rsaenh/rsaenh.c to rsaenh/cryptoprovutils.c
dssenh: implement CPAcquireContext and CPReleaseContext for dssenh.
dlls/dssenh/Makefile.in | 9 +-
dlls/dssenh/cryptoprovconfig.h | 86 +++++
dlls/dssenh/dssenh.c | 181 +++++++++
dlls/dssenh/dssenh.rgs | 60 +++
dlls/dssenh/dssenh.spec | 4 +-
dlls/dssenh/main.c | 59 ---
dlls/dssenh/rsrc.rc | 31 ++
dlls/rsaenh/Makefile.in | 3 +-
dlls/rsaenh/cryptoprovconfig.h | 90 +++++
dlls/rsaenh/cryptoprovutils.c | 653 ++++++++++++++++++++++++++++++++
dlls/rsaenh/cryptoprovutils.h | 94 +++++
dlls/rsaenh/rsaenh.c | 657 +--------------------------------
12 files changed, 1214 insertions(+), 713 deletions(-)
create mode 100644 dlls/dssenh/cryptoprovconfig.h
create mode 100644 dlls/dssenh/dssenh.c
create mode 100644 dlls/dssenh/dssenh.rgs
delete mode 100644 dlls/dssenh/main.c
create mode 100644 dlls/dssenh/rsrc.rc
create mode 100644 dlls/rsaenh/cryptoprovconfig.h
create mode 100644 dlls/rsaenh/cryptoprovutils.c
create mode 100644 dlls/rsaenh/cryptoprovutils.h
--
2.21.0
2
11
17 Nov '19
We were failing the conditional that would point «str» to «buffW»
when retrieving the GEO_ISO_UN_NUMBER of a location with UN code 0.
Some locations will keep having no UN code, such as Guantanamo Bay or
Johnston Atoll, since that's how those are defined in Windows.
Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt>
---
dlls/kernel32/locale.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index 0f91728e84..086389b45f 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -4109,10 +4109,10 @@ BOOL WINAPI SetUserGeoID(GEOID geoid)
INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, LANGID lang)
{
const struct geoinfo_t *ptr;
- const WCHAR *str = NULL;
WCHAR buffW[12];
- LONG val = 0;
- INT len;
+ const WCHAR *str = buffW;
+ int len;
+ static const WCHAR fmtW[] = {'%','d',0};
TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang);
@@ -4123,20 +4123,20 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len,
switch (geotype) {
case GEO_NATION:
- val = geoid;
+ sprintfW(buffW, fmtW, ptr->id);
break;
case GEO_ISO_UN_NUMBER:
- val = ptr->uncode;
+ sprintfW(buffW, fmtW, ptr->uncode);
break;
case GEO_PARENT:
- val = ptr->parent;
+ sprintfW(buffW, fmtW, ptr->parent);
break;
case GEO_ISO2:
+ str = ptr->iso2W;
+ break;
case GEO_ISO3:
- {
- str = geotype == GEO_ISO2 ? ptr->iso2W : ptr->iso3W;
+ str = ptr->iso3W;
break;
- }
case GEO_RFC1766:
case GEO_LCID:
case GEO_FRIENDLYNAME:
@@ -4154,12 +4154,6 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len,
return 0;
}
- if (val) {
- static const WCHAR fmtW[] = {'%','d',0};
- sprintfW(buffW, fmtW, val);
- str = buffW;
- }
-
len = strlenW(str) + 1;
if (!data || !data_len)
return len;
--
2.24.0
2
5
This series of patches and follow-ups will implement dssenh.
Dssenh has a lot of functionalities in common with rsaenh, so try to
extract the codes that are irrelavent to the specific module and reuse
them as much as possible.
The behaviour of dssenh is well-understood (through dssenh/tests, at
least for CPAcquireContext and CPReleaseContext). And my first goal
would be to pass all dssenh/tests.
Currently CPAcquireContext and CPReleaseContext is implemented.
I'm new here and not familiar with how to email patches, so sorry for
spamming the mail list with bad patches.
Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com>
---
dlls/rsaenh/Makefile.in | 3 ++-
dlls/rsaenh/cryptoprovconfig.h | 31 +++++++++++++++++++++++++++++++
dlls/rsaenh/cryptoprovutils.c | 34 ++++++++++++++++++++++++++++++++++
dlls/rsaenh/cryptoprovutils.h | 29 +++++++++++++++++++++++++++++
dlls/rsaenh/rsaenh.c | 1 +
5 files changed, 97 insertions(+), 1 deletion(-)
create mode 100644 dlls/rsaenh/cryptoprovconfig.h
create mode 100644 dlls/rsaenh/cryptoprovutils.c
create mode 100644 dlls/rsaenh/cryptoprovutils.h
diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in
index 80680d6622..dd8574fcaf 100644
--- a/dlls/rsaenh/Makefile.in
+++ b/dlls/rsaenh/Makefile.in
@@ -13,6 +13,7 @@ C_SRCS = \
rc2.c \
rc4.c \
rsa.c \
- rsaenh.c
+ rsaenh.c \
+ cryptoprovutils.c
RC_SRCS = rsrc.rc
diff --git a/dlls/rsaenh/cryptoprovconfig.h b/dlls/rsaenh/cryptoprovconfig.h
new file mode 100644
index 0000000000..79a93a85f4
--- /dev/null
+++ b/dlls/rsaenh/cryptoprovconfig.h
@@ -0,0 +1,31 @@
+/*
+ * dlls/rsaenh/cryptoprovconfig.h
+ * Definitions of some constants used by crypto provider.
+ * It is copied to build dir then included by cryptoprovutils.h,
+ * the build dir comes first in include search paths.
+ * So a new provider implementation only needs to provide its own
+ * cryptoprovconfig.h.
+ *
+ * Copyright 2002 TransGaming Technologies (David Hammerton)
+ * Copyright 2004 Mike McCormack for CodeWeavers
+ * Copyright 2004, 2005 Michael Jung
+ * Copyright 2007 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_CRYPTOPROVCONFIG_H
+#define __WINE_CRYPTOPROVCONFIG_H
+#endif /* __WINE_CRYPTOPROVCONFIG_H */
diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c
new file mode 100644
index 0000000000..76ee7bbe86
--- /dev/null
+++ b/dlls/rsaenh/cryptoprovutils.c
@@ -0,0 +1,34 @@
+/*
+ * dlls/rsaenh/cryptoprovutils.c
+ * Utility functions to implement crypto privider.
+ *
+ * Copyright 2002 TransGaming Technologies (David Hammerton)
+ * Copyright 2004 Mike McCormack for CodeWeavers
+ * Copyright 2004, 2005 Michael Jung
+ * Copyright 2007 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "wincrypt.h"
+#include "handle.h"
+#include "cryptoprovutils.h"
+#include "wine/debug.h"
diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h
new file mode 100644
index 0000000000..832b09e4ce
--- /dev/null
+++ b/dlls/rsaenh/cryptoprovutils.h
@@ -0,0 +1,29 @@
+/*
+ * dlls/rsaenh/cryptoprovutils.h
+ * Header of utility functions to implement crypto privider.
+ *
+ * Copyright 2002 TransGaming Technologies (David Hammerton)
+ * Copyright 2004 Mike McCormack for CodeWeavers
+ * Copyright 2004, 2005 Michael Jung
+ * Copyright 2007 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_CRYPTOPROVUTILS_H
+#define __WINE_CRYPTOPROVUTILS_H
+#include <cryptoprovconfig.h>
+#include "implglue.h"
+#endif /* __WINE_CRYPTOPROVUTILS_H */
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index 9119d4be2d..f8fbd8071a 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -34,6 +34,7 @@
#include "objbase.h"
#include "rpcproxy.h"
#include "aclapi.h"
+#include "cryptoprovutils.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
--
2.21.0
1
0
[PATCH 10/10] dssenh: implement CPAcquireContext and CPReleaseContext for dssenh.
by shuai zhang 17 Nov '19
by shuai zhang 17 Nov '19
17 Nov '19
Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com>
---
dlls/dssenh/Makefile.in | 4 +-
dlls/dssenh/cryptoprovconfig.h | 86 ++++++++++++++++
dlls/dssenh/dssenh.c | 181 +++++++++++++++++++++++++++++++++
dlls/dssenh/dssenh.spec | 4 +-
dlls/dssenh/main.c | 59 -----------
5 files changed, 272 insertions(+), 62 deletions(-)
create mode 100644 dlls/dssenh/cryptoprovconfig.h
create mode 100644 dlls/dssenh/dssenh.c
delete mode 100644 dlls/dssenh/main.c
diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in
index 132ad755ee..cb34ad3ae2 100644
--- a/dlls/dssenh/Makefile.in
+++ b/dlls/dssenh/Makefile.in
@@ -6,6 +6,8 @@ EXTRAINCL = -I$(top_srcdir)/dlls/
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
- main.c
+ dssenh.c \
+ ../rsaenh/cryptoprovutils.c \
+ ../rsaenh/handle.c
RC_SRCS = rsrc.rc
diff --git a/dlls/dssenh/cryptoprovconfig.h b/dlls/dssenh/cryptoprovconfig.h
new file mode 100644
index 0000000000..25c1237006
--- /dev/null
+++ b/dlls/dssenh/cryptoprovconfig.h
@@ -0,0 +1,86 @@
+/*
+ * dlls/dssenh/cryptoprovconfig.h
+ * Definitions of some constants used by crypto provider.
+ * It is copied to build dir then included by cryptoprovutils.h,
+ * the build dir comes first in include search paths.
+ * So a new provider implementation only needs to provide its own
+ * cryptoprovconfig.h.
+ *
+ * Copyright 2002 TransGaming Technologies (David Hammerton)
+ * Copyright 2004 Mike McCormack for CodeWeavers
+ * Copyright 2004, 2005 Michael Jung
+ * Copyright 2007 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_CRYPTOPROVCONFIG_H
+#define __WINE_CRYPTOPROVCONFIG_H
+#define DSSENH_MAGIC_KEY 0x73620457u
+#define DSSENH_MAX_KEY_SIZE 64
+#define DSSENH_MAX_BLOCK_SIZE 24
+#define DSSENH_MAGIC_CONTAINER 0x26384993u
+#define DSSENH_REGKEY "Software\\Wine\\Crypto\\DSS\\%s"
+
+/******************************************************************************
+ * CRYPTKEY - key objects
+ */
+#define DSSENH_KEYSTATE_IDLE 0
+#define DSSENH_KEYSTATE_ENCRYPTING 1
+#define DSSENH_KEYSTATE_MASTERKEY 2
+typedef struct _DSSENH_SCHANNEL_INFO
+{
+ SCHANNEL_ALG saEncAlg;
+ SCHANNEL_ALG saMACAlg;
+ CRYPT_DATA_BLOB blobClientRandom;
+ CRYPT_DATA_BLOB blobServerRandom;
+} DSSENH_SCHANNEL_INFO;
+#define CRYPTO_PROV_SCHANNEL_INFO DSSENH_SCHANNEL_INFO
+
+/******************************************************************************
+ * KEYCONTAINER - key containers
+ */
+#define DSSENH_PERSONALITY_BASE 0u
+#define DSSENH_PERSONALITY_BASE_DH 1u
+#define DSSENH_PERSONALITY_ENHANCED 2u
+#define DSSENH_PERSONALITY_SCHANNEL 3u
+
+/******************************************************************************
+ * Used by new_key_container to determine the personality via provider name.
+ * The first entry in aProvNamePersonalityPairs should be the default
personality.
+ */
+typedef struct tagPROVNAMEPERSONALITYPAIR
+{
+ LPCSTR pszProvName;
+ DWORD dwPersonality;
+} PROVNAMEPERSONALITYPAIR;
+
+static const DWORD dwNProvNamePersonalityPairs = 0;
+static const PROVNAMEPERSONALITYPAIR aProvNamePersonalityPairs[6] =
+{
+ {"", DSSENH_PERSONALITY_ENHANCED},
+ {MS_DEF_DSS_PROV_A, DSSENH_PERSONALITY_BASE},
+ {MS_DEF_DSS_DH_PROV_A, DSSENH_PERSONALITY_BASE_DH},
+ {MS_DEF_DH_SCHANNEL_PROV_A, DSSENH_PERSONALITY_SCHANNEL}
+};
+
+/******************************************************************************
+ * Define constants with CRYPTO_PROV prefix
+ */
+#define CRYPTO_PROV_REGKEY DSSENH_REGKEY
+#define CRYPTO_PROV_MAGIC_KEY DSSENH_MAGIC_KEY
+#define CRYPTO_PROV_MAGIC_CONTAINER DSSENH_MAGIC_CONTAINER
+
+#endif /* __WINE_CRYPTOPROVCONFIG_H */
diff --git a/dlls/dssenh/dssenh.c b/dlls/dssenh/dssenh.c
new file mode 100644
index 0000000000..a029158672
--- /dev/null
+++ b/dlls/dssenh/dssenh.c
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2019 Zhang Shuai
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "wincrypt.h"
+#include "objbase.h"
+#include "rpcproxy.h"
+#include "rsaenh/handle.h"
+#include "rsaenh/cryptoprovutils.h"
+#include "wine/debug.h"
+
+
+WINE_DEFAULT_DEBUG_CHANNEL(dssenh);
+
+static HINSTANCE instance;
+
+/******************************************************************************
+ * CSP's handle table (used by all acquired key containers)
+ */
+struct handle_table handle_table;
+
+BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID reserved)
+{
+ TRACE("(0x%p, %d, %p)\n", hInstance, fdwReason, reserved);
+
+ switch (fdwReason)
+ {
+ case DLL_PROCESS_ATTACH:
+ instance = hInstance;
+ DisableThreadLibraryCalls(hInstance);
+ init_handle_table(&handle_table);
+ break;
+
+ case DLL_PROCESS_DETACH:
+ if (reserved) break;
+ destroy_handle_table(&handle_table);
+ break;
+ }
+ return TRUE;
+}
+
+/*****************************************************
+ * DllRegisterServer (DSSENH.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+ return __wine_register_resources( instance );
+}
+
+/*****************************************************
+ * DllUnregisterServer (DSSENH.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+ return __wine_unregister_resources( instance );
+}
+
+/******************************************************************************
+ * crypt_export_key [Internal]
+ *
+ * Export a key into a binary large object (BLOB). Called by CPExportKey and
+ * by store_key_pair.
+ *
+ * PARAMS
+ * pCryptKey [I] Key to be exported.
+ * hPubKey [I] Key used to encrypt sensitive BLOB data.
+ * dwBlobType [I] SIMPLEBLOB, PUBLICKEYBLOB or PRIVATEKEYBLOB.
+ * dwFlags [I] Currently none defined.
+ * force [I] If TRUE, the key is written no matter what the key's
+ * permissions are. Otherwise the key's permissions are
+ * checked before exporting.
+ * pbData [O] Pointer to a buffer where the BLOB will be written to.
+ * pdwDataLen [I/O] I: Size of buffer at pbData, O: Size of BLOB
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ */
+BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey,
+ DWORD dwBlobType, DWORD dwFlags, BOOL force,
+ BYTE *pbData, DWORD *pdwDataLen)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * import_key [Internal]
+ *
+ * Import a BLOB'ed key into a key container, optionally storing the key's
+ * value to the registry.
+ *
+ * PARAMS
+ * hProv [I] Key container into which the key is to be imported.
+ * pbData [I] Pointer to a buffer which holds the BLOB.
+ * dwDataLen [I] Length of data in buffer at pbData.
+ * hPubKey [I] Key used to decrypt sensitive BLOB data.
+ * dwFlags [I] One of:
+ * CRYPT_EXPORTABLE: the imported key is marked exportable
+ * fStoreKey [I] If TRUE, the imported key is stored to the registry.
+ * phKey [O] Handle to the imported key.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ */
+BOOL import_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD
dwDataLen, HCRYPTKEY hPubKey,
+ DWORD dwFlags, BOOL fStoreKey, HCRYPTKEY *phKey)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPAcquireContext (DSSENH.@)
+ *
+ * Acquire a handle to the key container specified by pszContainer
+ *
+ * PARAMS
+ * phProv [O] Pointer to the location the acquired handle will
be written to.
+ * pszContainer [I] Name of the desired key container. See Notes
+ * dwFlags [I] Flags. See Notes.
+ * pVTable [I] Pointer to a VTableProvStruc containing callbacks.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ *
+ * NOTES
+ * If pszContainer is NULL or points to a zero length string the user's login
+ * name will be used as the key container name.
+ *
+ * If the CRYPT_NEW_KEYSET flag is set in dwFlags a new keyset will
be created.
+ * If a keyset with the given name already exists, the function fails and sets
+ * last error to NTE_EXISTS. If CRYPT_NEW_KEYSET is not set and the specified
+ * key container does not exist, function fails and sets last error to
+ * NTE_BAD_KEYSET.
+ */
+BOOL WINAPI DSSENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer,
+ DWORD dwFlags, PVTableProvStruc pVTable)
+{
+ return CRYPTO_PROV_CPAcquireContext(phProv, pszContainer,
dwFlags, pVTable);
+}
+
+/******************************************************************************
+ * CPReleaseContext (DSSENH.@)
+ *
+ * Release a key container.
+ *
+ * PARAMS
+ * hProv [I] Key container to be released.
+ * dwFlags [I] Currently none defined.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ */
+BOOL WINAPI DSSENH_CPReleaseContext(HCRYPTPROV hProv, DWORD dwFlags)
+{
+ return CRYPTO_PROV_CPReleaseContext(hProv, dwFlags);
+}
diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec
index c5c2545281..42768f48ae 100644
--- a/dlls/dssenh/dssenh.spec
+++ b/dlls/dssenh/dssenh.spec
@@ -1,4 +1,4 @@
-@ stub CPAcquireContext
+@ stdcall CPAcquireContext(ptr str long ptr) DSSENH_CPAcquireContext
@ stub CPCreateHash
@ stub CPDecrypt
@ stub CPDeriveKey
@@ -17,7 +17,7 @@
@ stub CPHashData
@ stub CPHashSessionKey
@ stub CPImportKey
-@ stub CPReleaseContext
+@ stdcall CPReleaseContext(long long) DSSENH_CPReleaseContext
@ stub CPSetHashParam
@ stub CPSetKeyParam
@ stub CPSetProvParam
diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c
deleted file mode 100644
index b60b3447a3..0000000000
--- a/dlls/dssenh/main.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2008 Maarten Lankhorst
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dssenh);
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
- TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
-
- switch (fdwReason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(hinstDLL);
- break;
- }
- return TRUE;
-}
-
-/*****************************************************
- * DllRegisterServer (DSSENH.@)
- */
-HRESULT WINAPI DllRegisterServer(void)
-{
- FIXME("Not implemented.\n");
- return E_UNEXPECTED;
-}
-
-/*****************************************************
- * DllUnregisterServer (DSSENH.@)
- */
-HRESULT WINAPI DllUnregisterServer(void)
-{
- FIXME("Not implemented.\n");
- return E_UNEXPECTED;
-}
--
2.21.0
2
1
[PATCH 09/10] refactor rsaenh - move CPAcquireContext, CPReleaseContext from rsaenh/rsaenh.c to rsaenh/cryptoprovutils.c
by shuai zhang 17 Nov '19
by shuai zhang 17 Nov '19
17 Nov '19
Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com>
---
dlls/rsaenh/cryptoprovutils.c | 120 ++++++++++++++++++++++++++++++++++
dlls/rsaenh/cryptoprovutils.h | 3 +
dlls/rsaenh/rsaenh.c | 75 +--------------------
3 files changed, 125 insertions(+), 73 deletions(-)
diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c
index ed3b16b13a..e4580a655d 100644
--- a/dlls/rsaenh/cryptoprovutils.c
+++ b/dlls/rsaenh/cryptoprovutils.c
@@ -531,3 +531,123 @@ HCRYPTPROV new_key_container(PCCH
pszContainerName, DWORD dwFlags, const VTableP
return hKeyContainer;
}
+/******************************************************************************
+ * CPAcquireContext [internal]
+ *
+ * Acquire a handle to the key container specified by pszContainer
+ *
+ * PARAMS
+ * phProv [O] Pointer to the location the acquired handle will
be written to.
+ * pszContainer [I] Name of the desired key container. See Notes
+ * dwFlags [I] Flags. See Notes.
+ * pVTable [I] Pointer to a PVTableProvStruct containing callbacks.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ *
+ * NOTES
+ * If pszContainer is NULL or points to a zero length string the user's login
+ * name will be used as the key container name.
+ *
+ * If the CRYPT_NEW_KEYSET flag is set in dwFlags a new keyset will
be created.
+ * If a keyset with the given name already exists, the function fails and sets
+ * last error to NTE_EXISTS. If CRYPT_NEW_KEYSET is not set and the specified
+ * key container does not exist, function fails and sets last error to
+ * NTE_BAD_KEYSET.
+ */
+BOOL WINAPI CRYPTO_PROV_CPAcquireContext(HCRYPTPROV *phProv, LPSTR
pszContainer,
+ DWORD dwFlags, PVTableProvStruc pVTable)
+{
+ CHAR szKeyContainerName[MAX_PATH];
+
+ TRACE("(phProv=%p, pszContainer=%s, dwFlags=%08x, pVTable=%p)\n", phProv,
+ debugstr_a(pszContainer), dwFlags, pVTable);
+
+ if (pszContainer && *pszContainer)
+ {
+ lstrcpynA(szKeyContainerName, pszContainer, MAX_PATH);
+ }
+ else
+ {
+ DWORD dwLen = sizeof(szKeyContainerName);
+ if (!GetUserNameA(szKeyContainerName, &dwLen)) return FALSE;
+ }
+
+ switch (dwFlags & (CRYPT_NEWKEYSET|CRYPT_VERIFYCONTEXT|CRYPT_DELETEKEYSET))
+ {
+ case 0:
+ *phProv = read_key_container(szKeyContainerName, dwFlags, pVTable);
+ break;
+
+ case CRYPT_DELETEKEYSET:
+ return delete_container_key(szKeyContainerName, dwFlags);
+
+ case CRYPT_NEWKEYSET:
+ *phProv = read_key_container(szKeyContainerName, dwFlags, pVTable);
+ if (*phProv != (HCRYPTPROV)INVALID_HANDLE_VALUE)
+ {
+ release_handle(&handle_table, *phProv,
CRYPTO_PROV_MAGIC_CONTAINER);
+ TRACE("Can't create new keyset, already exists\n");
+ SetLastError(NTE_EXISTS);
+ return FALSE;
+ }
+ *phProv = new_key_container(szKeyContainerName, dwFlags, pVTable);
+ break;
+
+ case CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET:
+ case CRYPT_VERIFYCONTEXT:
+ if (pszContainer && *pszContainer) {
+ TRACE("pszContainer should be empty\n");
+ SetLastError(NTE_BAD_FLAGS);
+ return FALSE;
+ }
+ *phProv = new_key_container("", dwFlags, pVTable);
+ break;
+
+ default:
+ *phProv = (HCRYPTPROV)INVALID_HANDLE_VALUE;
+ SetLastError(NTE_BAD_FLAGS);
+ return FALSE;
+ }
+
+ if (*phProv != (HCRYPTPROV)INVALID_HANDLE_VALUE) {
+ SetLastError(ERROR_SUCCESS);
+ return TRUE;
+ } else {
+ return FALSE;
+ }
+}
+
+/******************************************************************************
+ * CPReleaseContext [internal]
+ *
+ * Release a key container.
+ *
+ * PARAMS
+ * hProv [I] Key container to be released.
+ * dwFlags [I] Currently none defined.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ */
+BOOL WINAPI CRYPTO_PROV_CPReleaseContext(HCRYPTPROV hProv, DWORD dwFlags)
+{
+ TRACE("(hProv=%08lx, dwFlags=%08x)\n", hProv, dwFlags);
+
+ if (!release_handle(&handle_table, hProv, CRYPTO_PROV_MAGIC_CONTAINER))
+ {
+ /* MSDN: hProv not containing valid context handle */
+ SetLastError(NTE_BAD_UID);
+ return FALSE;
+ }
+
+ if (dwFlags) {
+ SetLastError(NTE_BAD_FLAGS);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h
index 3a756d3735..b5efd14491 100644
--- a/dlls/rsaenh/cryptoprovutils.h
+++ b/dlls/rsaenh/cryptoprovutils.h
@@ -88,4 +88,7 @@ HCRYPTPROV read_key_container(PCHAR
pszContainerName, DWORD dwFlags, const VTabl
HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags,
const VTableProvStruc *pVTable);
BOOL import_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD
dwDataLen, HCRYPTKEY hPubKey,
DWORD dwFlags, BOOL fStoreKey, HCRYPTKEY *phKey);
+BOOL WINAPI CRYPTO_PROV_CPAcquireContext(HCRYPTPROV *phProv, LPSTR
pszContainer,
+ DWORD dwFlags, PVTableProvStruc pVTable);
+BOOL WINAPI CRYPTO_PROV_CPReleaseContext(HCRYPTPROV hProv, DWORD dwFlags);
#endif /* __WINE_CRYPTOPROVUTILS_H */
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index 310863a514..9a2756e5a3 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -1500,64 +1500,7 @@ static BOOL unpad_data(HCRYPTPROV hProv, const
BYTE *abData, DWORD dwDataLen, BY
BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer,
DWORD dwFlags, PVTableProvStruc pVTable)
{
- CHAR szKeyContainerName[MAX_PATH];
-
- TRACE("(phProv=%p, pszContainer=%s, dwFlags=%08x, pVTable=%p)\n", phProv,
- debugstr_a(pszContainer), dwFlags, pVTable);
-
- if (pszContainer && *pszContainer)
- {
- lstrcpynA(szKeyContainerName, pszContainer, MAX_PATH);
- }
- else
- {
- DWORD dwLen = sizeof(szKeyContainerName);
- if (!GetUserNameA(szKeyContainerName, &dwLen)) return FALSE;
- }
-
- switch (dwFlags & (CRYPT_NEWKEYSET|CRYPT_VERIFYCONTEXT|CRYPT_DELETEKEYSET))
- {
- case 0:
- *phProv = read_key_container(szKeyContainerName, dwFlags, pVTable);
- break;
-
- case CRYPT_DELETEKEYSET:
- return delete_container_key(szKeyContainerName, dwFlags);
-
- case CRYPT_NEWKEYSET:
- *phProv = read_key_container(szKeyContainerName, dwFlags, pVTable);
- if (*phProv != (HCRYPTPROV)INVALID_HANDLE_VALUE)
- {
- release_handle(&handle_table, *phProv, RSAENH_MAGIC_CONTAINER);
- TRACE("Can't create new keyset, already exists\n");
- SetLastError(NTE_EXISTS);
- return FALSE;
- }
- *phProv = new_key_container(szKeyContainerName, dwFlags, pVTable);
- break;
-
- case CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET:
- case CRYPT_VERIFYCONTEXT:
- if (pszContainer && *pszContainer) {
- TRACE("pszContainer should be empty\n");
- SetLastError(NTE_BAD_FLAGS);
- return FALSE;
- }
- *phProv = new_key_container("", dwFlags, pVTable);
- break;
-
- default:
- *phProv = (HCRYPTPROV)INVALID_HANDLE_VALUE;
- SetLastError(NTE_BAD_FLAGS);
- return FALSE;
- }
-
- if (*phProv != (HCRYPTPROV)INVALID_HANDLE_VALUE) {
- SetLastError(ERROR_SUCCESS);
- return TRUE;
- } else {
- return FALSE;
- }
+ return CRYPTO_PROV_CPAcquireContext(phProv, pszContainer,
dwFlags, pVTable);
}
/******************************************************************************
@@ -3977,21 +3920,7 @@ BOOL WINAPI RSAENH_CPHashSessionKey(HCRYPTPROV
hProv, HCRYPTHASH hHash, HCRYPTKE
*/
BOOL WINAPI RSAENH_CPReleaseContext(HCRYPTPROV hProv, DWORD dwFlags)
{
- TRACE("(hProv=%08lx, dwFlags=%08x)\n", hProv, dwFlags);
-
- if (!release_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER))
- {
- /* MSDN: hProv not containing valid context handle */
- SetLastError(NTE_BAD_UID);
- return FALSE;
- }
-
- if (dwFlags) {
- SetLastError(NTE_BAD_FLAGS);
- return FALSE;
- }
-
- return TRUE;
+ return CRYPTO_PROV_CPReleaseContext(hProv, dwFlags);
}
/******************************************************************************
--
2.21.0
2
1
Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com>
---
dlls/dssenh/Makefile.in | 5 ++++
dlls/dssenh/dssenh.rgs | 60 +++++++++++++++++++++++++++++++++++++++++
dlls/dssenh/rsrc.rc | 31 +++++++++++++++++++++
3 files changed, 96 insertions(+)
create mode 100644 dlls/dssenh/dssenh.rgs
create mode 100644 dlls/dssenh/rsrc.rc
diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in
index 4f05beee51..132ad755ee 100644
--- a/dlls/dssenh/Makefile.in
+++ b/dlls/dssenh/Makefile.in
@@ -1,6 +1,11 @@
MODULE = dssenh.dll
+IMPORTLIB = dssenh
+IMPORTS = bcrypt crypt32 advapi32
+EXTRAINCL = -I$(top_srcdir)/dlls/
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
main.c
+
+RC_SRCS = rsrc.rc
diff --git a/dlls/dssenh/dssenh.rgs b/dlls/dssenh/dssenh.rgs
new file mode 100644
index 0000000000..e16d8e0bc7
--- /dev/null
+++ b/dlls/dssenh/dssenh.rgs
@@ -0,0 +1,60 @@
+HKLM
+{
+ NoRemove Software
+ {
+ NoRemove Microsoft
+ {
+ NoRemove Cryptography
+ {
+ NoRemove Defaults
+ {
+ NoRemove Provider
+ {
+ ForceRemove 'Microsoft Enhanced DSS and
Diffie-Hellman Cryptographic Provider'
+ {
+ val 'Image Path' = s '%MODULE%'
+ val 'Signature' = b deadbeef
+ val 'Type' = d 13
+ }
+ ForceRemove 'Microsoft Base DSS and
Diffie-Hellman Cryptographic Provider'
+ {
+ val 'Image Path' = s '%MODULE%'
+ val 'Signature' = b deadbeef
+ val 'Type' = d 13
+ }
+ ForceRemove 'Microsoft Base DSS Cryptographic Provider'
+ {
+ val 'Image Path' = s '%MODULE%'
+ val 'Signature' = b deadbeef
+ val 'Type' = d 3
+ }
+ ForceRemove 'Microsoft DH SChannel
Cryptographic Provider'
+ {
+ val 'Image Path' = s '%MODULE%'
+ val 'Signature' = b deadbeef
+ val 'Type' = d 18
+ }
+ }
+ NoRemove 'Provider Types'
+ {
+ ForceRemove 'Type 013'
+ {
+ val 'Name' = s 'Microsoft Enhanced DSS
and Diffie-Hellman Cryptographic Provider'
+ val 'TypeName' = s 'DSS Signature with
Diffe-zhellman Key Exchange'
+ }
+ ForceRemove 'Type 003'
+ {
+ val 'Name' = s 'Microsoft Base DSS
Cryptographic Provider'
+ val 'TypeName' = s 'DSS Signature'
+ }
+ ForceRemove 'Type 018'
+ {
+ val 'Name' = s 'Microsoft DH SChannel
Cryptographic Provider'
+ val 'TypeName' = s 'Diffie-Hellman SChannel'
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/dlls/dssenh/rsrc.rc b/dlls/dssenh/rsrc.rc
new file mode 100644
index 0000000000..3ec4fc17f1
--- /dev/null
+++ b/dlls/dssenh/rsrc.rc
@@ -0,0 +1,31 @@
+/*
+ * Resources for dssenh
+ *
+ * Copyright (c) 2007 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* @makedep: dssenh.rgs */
+1 WINE_REGISTRY dssenh.rgs
+
+#define WINE_FILEDESCRIPTION_STR "Wine dssenh"
+#define WINE_FILENAME_STR "dssenh.dll"
+#define WINE_FILEVERSION 5,1,2600,2180
+#define WINE_FILEVERSION_STR "5.1.2600.2180"
+#define WINE_PRODUCTVERSION 5,1,2600,2180
+#define WINE_PRODUCTVERSION_STR "5.1.2600.2180"
+
+#include "wine/wine_common_ver.rc"
--
2.21.0
2
1
Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com>
---
dlls/rsaenh/cryptoprovconfig.h | 8 +++++-
dlls/rsaenh/cryptoprovutils.c | 46 +++++++++++++++++-----------------
dlls/rsaenh/cryptoprovutils.h | 10 ++++----
3 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/dlls/rsaenh/cryptoprovconfig.h b/dlls/rsaenh/cryptoprovconfig.h
index 10cbc31b8b..e482d37ad4 100644
--- a/dlls/rsaenh/cryptoprovconfig.h
+++ b/dlls/rsaenh/cryptoprovconfig.h
@@ -79,6 +79,12 @@ static const PROVNAMEPERSONALITYPAIR
aProvNamePersonalityPairs[6] =
/******************************************************************************
* Definitions concerning prefix.
*/
-#define RSAENH_SCHANNEL_INFO SCHANNEL_INFO
+#define RSAENH_SCHANNEL_INFO SCHANNEL_INFO
+#define RSAENH_MAX_KEY_SIZE CRYPTO_PROV_MAX_KEY_SIZE
+#define RSAENH_MAX_BLOCK_SIZE CRYPTO_PROV_MAX_BLOCK_SIZE
+
+#define CRYPTO_PROV_REGKEY RSAENH_REGKEY
+#define CRYPTO_PROV_MAGIC_KEY RSAENH_MAGIC_KEY
+#define CRYPTO_PROV_MAGIC_CONTAINER RSAENH_MAGIC_CONTAINER
#endif /* __WINE_CRYPTOPROVCONFIG_H */
diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c
index 7262ead819..ed3b16b13a 100644
--- a/dlls/rsaenh/cryptoprovutils.c
+++ b/dlls/rsaenh/cryptoprovutils.c
@@ -52,19 +52,19 @@ extern struct handle_table handle_table;
*/
BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey)
{
- CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH];
+ CHAR szBase[sizeof(CRYPTO_PROV_REGKEY) + MAX_PATH];
HKEY hRootKey;
- sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName);
+ sprintf(szBase, CRYPTO_PROV_REGKEY, pKeyContainer->szName);
if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET)
hRootKey = HKEY_LOCAL_MACHINE;
else
hRootKey = HKEY_CURRENT_USER;
- /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */
- /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */
- return RegCreateKeyExA(hRootKey, szRSABase, 0, NULL,
+ /* @@ Wine registry key: HKLM\Software\Wine\Crypto\(CRYPTO_PROV) */
+ /* @@ Wine registry key: HKCU\Software\Wine\Crypto\(CRYPTO_PROV) */
+ return RegCreateKeyExA(hRootKey, szBase, 0, NULL,
REG_OPTION_NON_VOLATILE, sam, NULL, phKey, NULL)
== ERROR_SUCCESS;
}
@@ -83,19 +83,19 @@ BOOL create_container_key(KEYCONTAINER
*pKeyContainer, REGSAM sam, HKEY *phKey)
*/
BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags,
REGSAM access, HKEY *phKey)
{
- CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH];
+ CHAR szBase[sizeof(CRYPTO_PROV_REGKEY) + MAX_PATH];
HKEY hRootKey;
- sprintf(szRSABase, RSAENH_REGKEY, pszContainerName);
+ sprintf(szBase, CRYPTO_PROV_REGKEY, pszContainerName);
if (dwFlags & CRYPT_MACHINE_KEYSET)
hRootKey = HKEY_LOCAL_MACHINE;
else
hRootKey = HKEY_CURRENT_USER;
- /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */
- /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */
- return RegOpenKeyExA(hRootKey, szRSABase, 0, access, phKey) ==
+ /* @@ Wine registry key: HKLM\Software\Wine\Crypto\(CRYPTO_PROV) */
+ /* @@ Wine registry key: HKCU\Software\Wine\Crypto\(CRYPTO_PROV) */
+ return RegOpenKeyExA(hRootKey, szBase, 0, access, phKey) ==
ERROR_SUCCESS;
}
@@ -110,10 +110,10 @@ BOOL open_container_key(LPCSTR pszContainerName,
DWORD dwFlags, REGSAM access, H
*/
BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags)
{
- CHAR szRegKey[sizeof(RSAENH_REGKEY) + MAX_PATH];
+ CHAR szRegKey[sizeof(CRYPTO_PROV_REGKEY) + MAX_PATH];
HKEY hRootKey;
- sprintf(szRegKey, RSAENH_REGKEY, pszContainerName);
+ sprintf(szRegKey, CRYPTO_PROV_REGKEY, pszContainerName);
if (dwFlags & CRYPT_MACHINE_KEYSET)
hRootKey = HKEY_LOCAL_MACHINE;
@@ -180,7 +180,7 @@ void store_key_pair(HCRYPTKEY hCryptKey, HKEY
hKey, DWORD dwKeySpec, DWORD dwFla
if (!(szValueName = map_key_spec_to_key_pair_name(dwKeySpec)))
return;
- if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY,
+ if (lookup_handle(&handle_table, hCryptKey, CRYPTO_PROV_MAGIC_KEY,
(OBJECTHDR**)&pKey))
{
if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, 0, &dwLen))
@@ -222,7 +222,7 @@ void store_key_container_keys(KEYCONTAINER *pKeyContainer)
DWORD dwFlags;
/* On WinXP, persistent keys are stored in a file located at:
- * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string
+ * $AppData$\\Microsoft\\Crypto\\(CRYPTO_PROV)\\$SID$\\some_hex_string
*/
if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET)
@@ -289,7 +289,7 @@ void store_key_permissions(HCRYPTKEY hCryptKey,
HKEY hKey, DWORD dwKeySpec)
if (!(szValueName = map_key_spec_to_permissions_name(dwKeySpec)))
return;
- if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY,
+ if (lookup_handle(&handle_table, hCryptKey, CRYPTO_PROV_MAGIC_KEY,
(OBJECTHDR**)&pKey))
RegSetValueExA(hKey, szValueName, 0, REG_DWORD,
(BYTE *)&pKey->dwPermissions,
@@ -330,9 +330,9 @@ void store_key_container_permissions(KEYCONTAINER
*pKeyContainer)
void release_key_container_keys(KEYCONTAINER *pKeyContainer)
{
release_handle(&handle_table, pKeyContainer->hKeyExchangeKeyPair,
- RSAENH_MAGIC_KEY);
+ CRYPTO_PROV_MAGIC_KEY);
release_handle(&handle_table, pKeyContainer->hSignatureKeyPair,
- RSAENH_MAGIC_KEY);
+ CRYPTO_PROV_MAGIC_KEY);
}
/******************************************************************************
@@ -407,7 +407,7 @@ BOOL read_key_value(HCRYPTPROV hKeyContainer, HKEY
hKey, DWORD dwKeySpec, DWORD
{
CRYPTKEY *pKey;
- if (lookup_handle(&handle_table, *phCryptKey, RSAENH_MAGIC_KEY,
+ if (lookup_handle(&handle_table, *phCryptKey, CRYPTO_PROV_MAGIC_KEY,
(OBJECTHDR**)&pKey))
{
if ((szValueName = map_key_spec_to_permissions_name(dwKeySpec)))
@@ -454,7 +454,7 @@ HCRYPTPROV read_key_container(PCHAR
pszContainerName, DWORD dwFlags, const VTabl
DWORD dwProtectFlags = (dwFlags & CRYPT_MACHINE_KEYSET) ?
CRYPTPROTECT_LOCAL_MACHINE : 0;
- if (!lookup_handle(&handle_table, hKeyContainer,
RSAENH_MAGIC_CONTAINER,
+ if (!lookup_handle(&handle_table, hKeyContainer,
CRYPTO_PROV_MAGIC_CONTAINER,
(OBJECTHDR**)&pKeyContainer))
return (HCRYPTPROV)INVALID_HANDLE_VALUE;
@@ -466,10 +466,10 @@ HCRYPTPROV read_key_container(PCHAR
pszContainerName, DWORD dwFlags, const VTabl
*/
if (read_key_value(hKeyContainer, hKey, AT_KEYEXCHANGE,
dwProtectFlags, &hCryptKey))
- release_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY);
+ release_handle(&handle_table, hCryptKey, CRYPTO_PROV_MAGIC_KEY);
if (read_key_value(hKeyContainer, hKey, AT_SIGNATURE,
dwProtectFlags, &hCryptKey))
- release_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY);
+ release_handle(&handle_table, hCryptKey, CRYPTO_PROV_MAGIC_KEY);
}
return hKeyContainer;
@@ -478,7 +478,7 @@ HCRYPTPROV read_key_container(PCHAR
pszContainerName, DWORD dwFlags, const VTabl
/******************************************************************************
* new_key_container [Internal]
*
- * Create a new key container. The personality (RSA Base, Strong or
Enhanced CP)
+ * Create a new key container. The personality
* of the CSP is determined via the pVTable->pszProvName string.
*
* PARAMS
@@ -495,7 +495,7 @@ HCRYPTPROV new_key_container(PCCH
pszContainerName, DWORD dwFlags, const VTableP
HCRYPTPROV hKeyContainer;
DWORD i;
- hKeyContainer = new_object(&handle_table, sizeof(KEYCONTAINER),
RSAENH_MAGIC_CONTAINER,
+ hKeyContainer = new_object(&handle_table, sizeof(KEYCONTAINER),
CRYPTO_PROV_MAGIC_CONTAINER,
destroy_key_container,
(OBJECTHDR**)&pKeyContainer);
if (hKeyContainer != (HCRYPTPROV)INVALID_HANDLE_VALUE)
{
diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h
index f745ada8d4..3a756d3735 100644
--- a/dlls/rsaenh/cryptoprovutils.h
+++ b/dlls/rsaenh/cryptoprovutils.h
@@ -47,8 +47,8 @@ typedef struct _SCHANNEL_INFO
CRYPT_DATA_BLOB blobServerRandom;
} SCHANNEL_INFO;
-#define RSAENH_MAX_KEY_SIZE 64
-#define RSAENH_MAX_BLOCK_SIZE 24
+#define CRYPTO_PROV_MAX_KEY_SIZE 64
+#define CRYPTO_PROV_MAX_BLOCK_SIZE 24
typedef struct tagCRYPTKEY
{
OBJECTHDR header;
@@ -63,9 +63,9 @@ typedef struct tagCRYPTKEY
DWORD dwBlockLen;
DWORD dwState;
KEY_CONTEXT context;
- BYTE abKeyValue[RSAENH_MAX_KEY_SIZE];
- BYTE abInitVector[RSAENH_MAX_BLOCK_SIZE];
- BYTE abChainVector[RSAENH_MAX_BLOCK_SIZE];
+ BYTE abKeyValue[CRYPTO_PROV_MAX_KEY_SIZE];
+ BYTE abInitVector[CRYPTO_PROV_MAX_BLOCK_SIZE];
+ BYTE abChainVector[CRYPTO_PROV_MAX_BLOCK_SIZE];
SCHANNEL_INFO siSChannelInfo;
CRYPT_DATA_BLOB blobHmacKey;
} CRYPTKEY;
--
2.21.0
2
1
[PATCH 06/10] dssenh: refactor rsaenh - move release_key_container_keys, destroy_key_container, read_key_value, read_key_container, new_key_container, import_key from rsaenh/rsaenh.c to rsaenh/cryptoprovutils.c
by shuai zhang 17 Nov '19
by shuai zhang 17 Nov '19
17 Nov '19
Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com>
---
dlls/rsaenh/cryptoprovutils.c | 111 ++++++++++++++++++++++++++++++++++
dlls/rsaenh/cryptoprovutils.h | 4 ++
dlls/rsaenh/rsaenh.c | 111 ----------------------------------
3 files changed, 115 insertions(+), 111 deletions(-)
diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c
index 9f774bad1d..44bbc923b8 100644
--- a/dlls/rsaenh/cryptoprovutils.c
+++ b/dlls/rsaenh/cryptoprovutils.c
@@ -208,3 +208,114 @@ void store_key_pair(HCRYPTKEY hCryptKey, HKEY
hKey, DWORD dwKeySpec, DWORD dwFla
}
}
+/******************************************************************************
+ * store_key_container_keys [Internal]
+ *
+ * Stores key container's keys in a persistent location.
+ *
+ * PARAMS
+ * pKeyContainer [I] Pointer to the key container whose keys are to be saved
+ */
+void store_key_container_keys(KEYCONTAINER *pKeyContainer)
+{
+ HKEY hKey;
+ DWORD dwFlags;
+
+ /* On WinXP, persistent keys are stored in a file located at:
+ * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string
+ */
+
+ if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET)
+ dwFlags = CRYPTPROTECT_LOCAL_MACHINE;
+ else
+ dwFlags = 0;
+
+ if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
+ {
+ store_key_pair(pKeyContainer->hKeyExchangeKeyPair, hKey,
+ AT_KEYEXCHANGE, dwFlags);
+ store_key_pair(pKeyContainer->hSignatureKeyPair, hKey,
+ AT_SIGNATURE, dwFlags);
+ RegCloseKey(hKey);
+ }
+}
+
+/******************************************************************************
+ * map_key_spec_to_permissions_name [Internal]
+ *
+ * Returns the name of the registry value associated with the permissions for
+ * a key spec.
+ *
+ * PARAMS
+ * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
+ *
+ * RETURNS
+ * Success: Name of registry value.
+ * Failure: NULL
+ */
+LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec)
+{
+ LPCSTR szValueName;
+
+ switch (dwKeySpec)
+ {
+ case AT_KEYEXCHANGE:
+ szValueName = "KeyExchangePermissions";
+ break;
+ case AT_SIGNATURE:
+ szValueName = "SignaturePermissions";
+ break;
+ default:
+ WARN("invalid key spec %d\n", dwKeySpec);
+ szValueName = NULL;
+ }
+ return szValueName;
+}
+
+/******************************************************************************
+ * store_key_permissions [Internal]
+ *
+ * Stores a key's permissions to the registry
+ *
+ * PARAMS
+ * hCryptKey [I] Handle to the key whose permissions are to be stored
+ * hKey [I] Registry key where the key permissions are to be stored
+ * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
+ */
+void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec)
+{
+ LPCSTR szValueName;
+ CRYPTKEY *pKey;
+
+ if (!(szValueName = map_key_spec_to_permissions_name(dwKeySpec)))
+ return;
+ if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY,
+ (OBJECTHDR**)&pKey))
+ RegSetValueExA(hKey, szValueName, 0, REG_DWORD,
+ (BYTE *)&pKey->dwPermissions,
+ sizeof(pKey->dwPermissions));
+}
+
+/******************************************************************************
+ * store_key_container_permissions [Internal]
+ *
+ * Stores key container's key permissions in a persistent location.
+ *
+ * PARAMS
+ * pKeyContainer [I] Pointer to the key container whose key permissions are to
+ * be saved
+ */
+void store_key_container_permissions(KEYCONTAINER *pKeyContainer)
+{
+ HKEY hKey;
+
+ if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
+ {
+ store_key_permissions(pKeyContainer->hKeyExchangeKeyPair, hKey,
+ AT_KEYEXCHANGE);
+ store_key_permissions(pKeyContainer->hSignatureKeyPair, hKey,
+ AT_SIGNATURE);
+ RegCloseKey(hKey);
+ }
+}
+
diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h
index 499b0b8140..4b5fcf2f22 100644
--- a/dlls/rsaenh/cryptoprovutils.h
+++ b/dlls/rsaenh/cryptoprovutils.h
@@ -77,4 +77,8 @@ BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY
hPubKey, DWORD dwBlobType,
DWORD dwFlags, BOOL force, BYTE *pbData, DWORD *pdwDataLen);
LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec);
void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec,
DWORD dwFlags);
+void store_key_container_keys(KEYCONTAINER *pKeyContainer);
+LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec);
+void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec);
+void store_key_container_permissions(KEYCONTAINER *pKeyContainer);
#endif /* __WINE_CRYPTOPROVUTILS_H */
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index 8925abefab..5557068813 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -862,117 +862,6 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv,
ALG_ID aiAlgid, DWORD dwFlags, CRYPTK
return hCryptKey;
}
-/******************************************************************************
- * map_key_spec_to_permissions_name [Internal]
- *
- * Returns the name of the registry value associated with the permissions for
- * a key spec.
- *
- * PARAMS
- * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
- *
- * RETURNS
- * Success: Name of registry value.
- * Failure: NULL
- */
-static LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec)
-{
- LPCSTR szValueName;
-
- switch (dwKeySpec)
- {
- case AT_KEYEXCHANGE:
- szValueName = "KeyExchangePermissions";
- break;
- case AT_SIGNATURE:
- szValueName = "SignaturePermissions";
- break;
- default:
- WARN("invalid key spec %d\n", dwKeySpec);
- szValueName = NULL;
- }
- return szValueName;
-}
-
-/******************************************************************************
- * store_key_permissions [Internal]
- *
- * Stores a key's permissions to the registry
- *
- * PARAMS
- * hCryptKey [I] Handle to the key whose permissions are to be stored
- * hKey [I] Registry key where the key permissions are to be stored
- * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
- */
-static void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey,
DWORD dwKeySpec)
-{
- LPCSTR szValueName;
- CRYPTKEY *pKey;
-
- if (!(szValueName = map_key_spec_to_permissions_name(dwKeySpec)))
- return;
- if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY,
- (OBJECTHDR**)&pKey))
- RegSetValueExA(hKey, szValueName, 0, REG_DWORD,
- (BYTE *)&pKey->dwPermissions,
- sizeof(pKey->dwPermissions));
-}
-
-/******************************************************************************
- * store_key_container_keys [Internal]
- *
- * Stores key container's keys in a persistent location.
- *
- * PARAMS
- * pKeyContainer [I] Pointer to the key container whose keys are to be saved
- */
-static void store_key_container_keys(KEYCONTAINER *pKeyContainer)
-{
- HKEY hKey;
- DWORD dwFlags;
-
- /* On WinXP, persistent keys are stored in a file located at:
- * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string
- */
-
- if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET)
- dwFlags = CRYPTPROTECT_LOCAL_MACHINE;
- else
- dwFlags = 0;
-
- if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
- {
- store_key_pair(pKeyContainer->hKeyExchangeKeyPair, hKey,
- AT_KEYEXCHANGE, dwFlags);
- store_key_pair(pKeyContainer->hSignatureKeyPair, hKey,
- AT_SIGNATURE, dwFlags);
- RegCloseKey(hKey);
- }
-}
-
-/******************************************************************************
- * store_key_container_permissions [Internal]
- *
- * Stores key container's key permissions in a persistent location.
- *
- * PARAMS
- * pKeyContainer [I] Pointer to the key container whose key permissions are to
- * be saved
- */
-static void store_key_container_permissions(KEYCONTAINER *pKeyContainer)
-{
- HKEY hKey;
-
- if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
- {
- store_key_permissions(pKeyContainer->hKeyExchangeKeyPair, hKey,
- AT_KEYEXCHANGE);
- store_key_permissions(pKeyContainer->hSignatureKeyPair, hKey,
- AT_SIGNATURE);
- RegCloseKey(hKey);
- }
-}
-
/******************************************************************************
* release_key_container_keys [Internal]
*
--
2.21.0
2
1
[PATCH 05/10] dssenh: refactor rsaenh - move store_key_container_keys, store_key_container_permissions, map_key_spec_to_permissions_name from rsaenh/rsaenh.c to rsaenh/cryptoprovutils.c
by shuai zhang 17 Nov '19
by shuai zhang 17 Nov '19
17 Nov '19
Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com>
---
dlls/rsaenh/cryptoprovutils.c | 111 ++++++++++++++++++++++++++++++++++
dlls/rsaenh/cryptoprovutils.h | 4 ++
dlls/rsaenh/rsaenh.c | 111 ----------------------------------
3 files changed, 115 insertions(+), 111 deletions(-)
diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c
index 9f774bad1d..44bbc923b8 100644
--- a/dlls/rsaenh/cryptoprovutils.c
+++ b/dlls/rsaenh/cryptoprovutils.c
@@ -208,3 +208,114 @@ void store_key_pair(HCRYPTKEY hCryptKey, HKEY
hKey, DWORD dwKeySpec, DWORD dwFla
}
}
+/******************************************************************************
+ * store_key_container_keys [Internal]
+ *
+ * Stores key container's keys in a persistent location.
+ *
+ * PARAMS
+ * pKeyContainer [I] Pointer to the key container whose keys are to be saved
+ */
+void store_key_container_keys(KEYCONTAINER *pKeyContainer)
+{
+ HKEY hKey;
+ DWORD dwFlags;
+
+ /* On WinXP, persistent keys are stored in a file located at:
+ * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string
+ */
+
+ if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET)
+ dwFlags = CRYPTPROTECT_LOCAL_MACHINE;
+ else
+ dwFlags = 0;
+
+ if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
+ {
+ store_key_pair(pKeyContainer->hKeyExchangeKeyPair, hKey,
+ AT_KEYEXCHANGE, dwFlags);
+ store_key_pair(pKeyContainer->hSignatureKeyPair, hKey,
+ AT_SIGNATURE, dwFlags);
+ RegCloseKey(hKey);
+ }
+}
+
+/******************************************************************************
+ * map_key_spec_to_permissions_name [Internal]
+ *
+ * Returns the name of the registry value associated with the permissions for
+ * a key spec.
+ *
+ * PARAMS
+ * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
+ *
+ * RETURNS
+ * Success: Name of registry value.
+ * Failure: NULL
+ */
+LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec)
+{
+ LPCSTR szValueName;
+
+ switch (dwKeySpec)
+ {
+ case AT_KEYEXCHANGE:
+ szValueName = "KeyExchangePermissions";
+ break;
+ case AT_SIGNATURE:
+ szValueName = "SignaturePermissions";
+ break;
+ default:
+ WARN("invalid key spec %d\n", dwKeySpec);
+ szValueName = NULL;
+ }
+ return szValueName;
+}
+
+/******************************************************************************
+ * store_key_permissions [Internal]
+ *
+ * Stores a key's permissions to the registry
+ *
+ * PARAMS
+ * hCryptKey [I] Handle to the key whose permissions are to be stored
+ * hKey [I] Registry key where the key permissions are to be stored
+ * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
+ */
+void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec)
+{
+ LPCSTR szValueName;
+ CRYPTKEY *pKey;
+
+ if (!(szValueName = map_key_spec_to_permissions_name(dwKeySpec)))
+ return;
+ if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY,
+ (OBJECTHDR**)&pKey))
+ RegSetValueExA(hKey, szValueName, 0, REG_DWORD,
+ (BYTE *)&pKey->dwPermissions,
+ sizeof(pKey->dwPermissions));
+}
+
+/******************************************************************************
+ * store_key_container_permissions [Internal]
+ *
+ * Stores key container's key permissions in a persistent location.
+ *
+ * PARAMS
+ * pKeyContainer [I] Pointer to the key container whose key permissions are to
+ * be saved
+ */
+void store_key_container_permissions(KEYCONTAINER *pKeyContainer)
+{
+ HKEY hKey;
+
+ if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
+ {
+ store_key_permissions(pKeyContainer->hKeyExchangeKeyPair, hKey,
+ AT_KEYEXCHANGE);
+ store_key_permissions(pKeyContainer->hSignatureKeyPair, hKey,
+ AT_SIGNATURE);
+ RegCloseKey(hKey);
+ }
+}
+
diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h
index 499b0b8140..4b5fcf2f22 100644
--- a/dlls/rsaenh/cryptoprovutils.h
+++ b/dlls/rsaenh/cryptoprovutils.h
@@ -77,4 +77,8 @@ BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY
hPubKey, DWORD dwBlobType,
DWORD dwFlags, BOOL force, BYTE *pbData, DWORD *pdwDataLen);
LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec);
void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec,
DWORD dwFlags);
+void store_key_container_keys(KEYCONTAINER *pKeyContainer);
+LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec);
+void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec);
+void store_key_container_permissions(KEYCONTAINER *pKeyContainer);
#endif /* __WINE_CRYPTOPROVUTILS_H */
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index 8925abefab..5557068813 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -862,117 +862,6 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv,
ALG_ID aiAlgid, DWORD dwFlags, CRYPTK
return hCryptKey;
}
-/******************************************************************************
- * map_key_spec_to_permissions_name [Internal]
- *
- * Returns the name of the registry value associated with the permissions for
- * a key spec.
- *
- * PARAMS
- * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
- *
- * RETURNS
- * Success: Name of registry value.
- * Failure: NULL
- */
-static LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec)
-{
- LPCSTR szValueName;
-
- switch (dwKeySpec)
- {
- case AT_KEYEXCHANGE:
- szValueName = "KeyExchangePermissions";
- break;
- case AT_SIGNATURE:
- szValueName = "SignaturePermissions";
- break;
- default:
- WARN("invalid key spec %d\n", dwKeySpec);
- szValueName = NULL;
- }
- return szValueName;
-}
-
-/******************************************************************************
- * store_key_permissions [Internal]
- *
- * Stores a key's permissions to the registry
- *
- * PARAMS
- * hCryptKey [I] Handle to the key whose permissions are to be stored
- * hKey [I] Registry key where the key permissions are to be stored
- * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
- */
-static void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey,
DWORD dwKeySpec)
-{
- LPCSTR szValueName;
- CRYPTKEY *pKey;
-
- if (!(szValueName = map_key_spec_to_permissions_name(dwKeySpec)))
- return;
- if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY,
- (OBJECTHDR**)&pKey))
- RegSetValueExA(hKey, szValueName, 0, REG_DWORD,
- (BYTE *)&pKey->dwPermissions,
- sizeof(pKey->dwPermissions));
-}
-
-/******************************************************************************
- * store_key_container_keys [Internal]
- *
- * Stores key container's keys in a persistent location.
- *
- * PARAMS
- * pKeyContainer [I] Pointer to the key container whose keys are to be saved
- */
-static void store_key_container_keys(KEYCONTAINER *pKeyContainer)
-{
- HKEY hKey;
- DWORD dwFlags;
-
- /* On WinXP, persistent keys are stored in a file located at:
- * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string
- */
-
- if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET)
- dwFlags = CRYPTPROTECT_LOCAL_MACHINE;
- else
- dwFlags = 0;
-
- if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
- {
- store_key_pair(pKeyContainer->hKeyExchangeKeyPair, hKey,
- AT_KEYEXCHANGE, dwFlags);
- store_key_pair(pKeyContainer->hSignatureKeyPair, hKey,
- AT_SIGNATURE, dwFlags);
- RegCloseKey(hKey);
- }
-}
-
-/******************************************************************************
- * store_key_container_permissions [Internal]
- *
- * Stores key container's key permissions in a persistent location.
- *
- * PARAMS
- * pKeyContainer [I] Pointer to the key container whose key permissions are to
- * be saved
- */
-static void store_key_container_permissions(KEYCONTAINER *pKeyContainer)
-{
- HKEY hKey;
-
- if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
- {
- store_key_permissions(pKeyContainer->hKeyExchangeKeyPair, hKey,
- AT_KEYEXCHANGE);
- store_key_permissions(pKeyContainer->hSignatureKeyPair, hKey,
- AT_SIGNATURE);
- RegCloseKey(hKey);
- }
-}
-
/******************************************************************************
* release_key_container_keys [Internal]
*
--
2.21.0
2
1
[PATCH 04/10] dssenh: refactor rsaenh - move map_key_spec_to_permissions_name, store_key_permissions from rsaenh/rsaenh.c to rsaenh/cryptoprovutils.c
by shuai zhang 17 Nov '19
by shuai zhang 17 Nov '19
17 Nov '19
Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com>
---
dlls/rsaenh/cryptoprovconfig.h | 14 ++++
dlls/rsaenh/cryptoprovutils.c | 87 +++++++++++++++++++++
dlls/rsaenh/cryptoprovutils.h | 35 +++++++++
dlls/rsaenh/rsaenh.c | 133 +--------------------------------
4 files changed, 139 insertions(+), 130 deletions(-)
diff --git a/dlls/rsaenh/cryptoprovconfig.h b/dlls/rsaenh/cryptoprovconfig.h
index d282d0db1e..10cbc31b8b 100644
--- a/dlls/rsaenh/cryptoprovconfig.h
+++ b/dlls/rsaenh/cryptoprovconfig.h
@@ -29,6 +29,7 @@
#ifndef __WINE_CRYPTOPROVCONFIG_H
#define __WINE_CRYPTOPROVCONFIG_H
#include "wincrypt.h"
+#include "implglue.h"
/******************************************************************************
* KEYCONTAINER - key containers
@@ -62,9 +63,22 @@ static const PROVNAMEPERSONALITYPAIR
aProvNamePersonalityPairs[6] =
{MS_ENH_RSA_AES_PROV_XP_A, RSAENH_PERSONALITY_AES}
};
+/******************************************************************************
+ * CRYPTKEY - key objects
+ */
+#define RSAENH_MAGIC_KEY 0x73620457u
+#define RSAENH_KEYSTATE_IDLE 0
+#define RSAENH_KEYSTATE_ENCRYPTING 1
+#define RSAENH_KEYSTATE_MASTERKEY 2
+
/******************************************************************************
* Some magic constants
*/
#define RSAENH_REGKEY "Software\\Wine\\Crypto\\RSA\\%s"
+/******************************************************************************
+ * Definitions concerning prefix.
+ */
+#define RSAENH_SCHANNEL_INFO SCHANNEL_INFO
+
#endif /* __WINE_CRYPTOPROVCONFIG_H */
diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c
index 23e0e11626..9f774bad1d 100644
--- a/dlls/rsaenh/cryptoprovutils.c
+++ b/dlls/rsaenh/cryptoprovutils.c
@@ -33,6 +33,13 @@
#include "cryptoprovutils.h"
#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(crypt);
+
+/******************************************************************************
+ * CSP's handle table (used by all acquired key containers)
+ */
+extern struct handle_table handle_table;
+
/******************************************************************************
* create_container_key [Internal]
*
@@ -121,3 +128,83 @@ BOOL delete_container_key(LPCSTR
pszContainerName, DWORD dwFlags)
}
}
+/******************************************************************************
+ * map_key_spec_to_key_pair_name [Internal]
+ *
+ * Returns the name of the registry value associated with a key spec.
+ *
+ * PARAMS
+ * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
+ *
+ * RETURNS
+ * Success: Name of registry value.
+ * Failure: NULL
+ */
+LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec)
+{
+ LPCSTR szValueName;
+
+ switch (dwKeySpec)
+ {
+ case AT_KEYEXCHANGE:
+ szValueName = "KeyExchangeKeyPair";
+ break;
+ case AT_SIGNATURE:
+ szValueName = "SignatureKeyPair";
+ break;
+ default:
+ WARN("invalid key spec %d\n", dwKeySpec);
+ szValueName = NULL;
+ }
+ return szValueName;
+}
+
+/******************************************************************************
+ * store_key_pair [Internal]
+ *
+ * Stores a key pair to the registry
+ *
+ * PARAMS
+ * hCryptKey [I] Handle to the key to be stored
+ * hKey [I] Registry key where the key pair is to be stored
+ * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
+ * dwFlags [I] Flags for protecting the key
+ */
+void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec,
DWORD dwFlags)
+{
+ LPCSTR szValueName;
+ DATA_BLOB blobIn, blobOut;
+ CRYPTKEY *pKey;
+ DWORD dwLen;
+ BYTE *pbKey;
+
+ if (!(szValueName = map_key_spec_to_key_pair_name(dwKeySpec)))
+ return;
+ if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY,
+ (OBJECTHDR**)&pKey))
+ {
+ if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, 0, &dwLen))
+ {
+ pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen);
+ if (pbKey)
+ {
+ if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, pbKey,
+ &dwLen))
+ {
+ blobIn.pbData = pbKey;
+ blobIn.cbData = dwLen;
+
+ if (CryptProtectData(&blobIn, NULL, NULL, NULL, NULL,
+ dwFlags, &blobOut))
+ {
+ RegSetValueExA(hKey, szValueName, 0, REG_BINARY,
+ blobOut.pbData, blobOut.cbData);
+ LocalFree(blobOut.pbData);
+ }
+ }
+ HeapFree(GetProcessHeap(), 0, pbKey);
+ }
+ }
+ }
+}
+
diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h
index 17d665e398..499b0b8140 100644
--- a/dlls/rsaenh/cryptoprovutils.h
+++ b/dlls/rsaenh/cryptoprovutils.h
@@ -39,7 +39,42 @@ typedef struct tagKEYCONTAINER
HCRYPTKEY hSignatureKeyPair;
} KEYCONTAINER;
+typedef struct _SCHANNEL_INFO
+{
+ SCHANNEL_ALG saEncAlg;
+ SCHANNEL_ALG saMACAlg;
+ CRYPT_DATA_BLOB blobClientRandom;
+ CRYPT_DATA_BLOB blobServerRandom;
+} SCHANNEL_INFO;
+
+#define RSAENH_MAX_KEY_SIZE 64
+#define RSAENH_MAX_BLOCK_SIZE 24
+typedef struct tagCRYPTKEY
+{
+ OBJECTHDR header;
+ ALG_ID aiAlgid;
+ HCRYPTPROV hProv;
+ DWORD dwMode;
+ DWORD dwModeBits;
+ DWORD dwPermissions;
+ DWORD dwKeyLen;
+ DWORD dwEffectiveKeyLen;
+ DWORD dwSaltLen;
+ DWORD dwBlockLen;
+ DWORD dwState;
+ KEY_CONTEXT context;
+ BYTE abKeyValue[RSAENH_MAX_KEY_SIZE];
+ BYTE abInitVector[RSAENH_MAX_BLOCK_SIZE];
+ BYTE abChainVector[RSAENH_MAX_BLOCK_SIZE];
+ SCHANNEL_INFO siSChannelInfo;
+ CRYPT_DATA_BLOB blobHmacKey;
+} CRYPTKEY;
+
BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam,
HKEY *phKey);
BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags,
REGSAM access, HKEY *phKey);
BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags);
+BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey, DWORD dwBlobType,
+ DWORD dwFlags, BOOL force, BYTE *pbData, DWORD *pdwDataLen);
+LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec);
+void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec,
DWORD dwFlags);
#endif /* __WINE_CRYPTOPROVUTILS_H */
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index 069aee569f..8925abefab 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -67,44 +67,6 @@ typedef struct tagCRYPTHASH
RSAENH_TLS1PRF_PARAMS tpPRFParams;
} CRYPTHASH;
-/******************************************************************************
- * CRYPTKEY - key objects
- */
-#define RSAENH_MAGIC_KEY 0x73620457u
-#define RSAENH_MAX_KEY_SIZE 64
-#define RSAENH_MAX_BLOCK_SIZE 24
-#define RSAENH_KEYSTATE_IDLE 0
-#define RSAENH_KEYSTATE_ENCRYPTING 1
-#define RSAENH_KEYSTATE_MASTERKEY 2
-typedef struct _RSAENH_SCHANNEL_INFO
-{
- SCHANNEL_ALG saEncAlg;
- SCHANNEL_ALG saMACAlg;
- CRYPT_DATA_BLOB blobClientRandom;
- CRYPT_DATA_BLOB blobServerRandom;
-} RSAENH_SCHANNEL_INFO;
-
-typedef struct tagCRYPTKEY
-{
- OBJECTHDR header;
- ALG_ID aiAlgid;
- HCRYPTPROV hProv;
- DWORD dwMode;
- DWORD dwModeBits;
- DWORD dwPermissions;
- DWORD dwKeyLen;
- DWORD dwEffectiveKeyLen;
- DWORD dwSaltLen;
- DWORD dwBlockLen;
- DWORD dwState;
- KEY_CONTEXT context;
- BYTE abKeyValue[RSAENH_MAX_KEY_SIZE];
- BYTE abInitVector[RSAENH_MAX_BLOCK_SIZE];
- BYTE abChainVector[RSAENH_MAX_BLOCK_SIZE];
- RSAENH_SCHANNEL_INFO siSChannelInfo;
- CRYPT_DATA_BLOB blobHmacKey;
-} CRYPTKEY;
-
/******************************************************************************
* Some magic constants
*/
@@ -293,16 +255,6 @@ RSAENH_CPDestroyHash(
HCRYPTHASH hHash
);
-static BOOL crypt_export_key(
- CRYPTKEY *pCryptKey,
- HCRYPTKEY hPubKey,
- DWORD dwBlobType,
- DWORD dwFlags,
- BOOL force,
- BYTE *pbData,
- DWORD *pdwDataLen
-);
-
static BOOL import_key(
HCRYPTPROV hProv,
const BYTE *pbData,
@@ -325,7 +277,7 @@ RSAENH_CPHashData(
/******************************************************************************
* CSP's handle table (used by all acquired key containers)
*/
-static struct handle_table handle_table;
+struct handle_table handle_table;
/******************************************************************************
* DllMain (RSAENH.@)
@@ -910,86 +862,6 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID
aiAlgid, DWORD dwFlags, CRYPTK
return hCryptKey;
}
-/******************************************************************************
- * map_key_spec_to_key_pair_name [Internal]
- *
- * Returns the name of the registry value associated with a key spec.
- *
- * PARAMS
- * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
- *
- * RETURNS
- * Success: Name of registry value.
- * Failure: NULL
- */
-static LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec)
-{
- LPCSTR szValueName;
-
- switch (dwKeySpec)
- {
- case AT_KEYEXCHANGE:
- szValueName = "KeyExchangeKeyPair";
- break;
- case AT_SIGNATURE:
- szValueName = "SignatureKeyPair";
- break;
- default:
- WARN("invalid key spec %d\n", dwKeySpec);
- szValueName = NULL;
- }
- return szValueName;
-}
-
-/******************************************************************************
- * store_key_pair [Internal]
- *
- * Stores a key pair to the registry
- *
- * PARAMS
- * hCryptKey [I] Handle to the key to be stored
- * hKey [I] Registry key where the key pair is to be stored
- * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
- * dwFlags [I] Flags for protecting the key
- */
-static void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD
dwKeySpec, DWORD dwFlags)
-{
- LPCSTR szValueName;
- DATA_BLOB blobIn, blobOut;
- CRYPTKEY *pKey;
- DWORD dwLen;
- BYTE *pbKey;
-
- if (!(szValueName = map_key_spec_to_key_pair_name(dwKeySpec)))
- return;
- if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY,
- (OBJECTHDR**)&pKey))
- {
- if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, 0, &dwLen))
- {
- pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen);
- if (pbKey)
- {
- if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, pbKey,
- &dwLen))
- {
- blobIn.pbData = pbKey;
- blobIn.cbData = dwLen;
-
- if (CryptProtectData(&blobIn, NULL, NULL, NULL, NULL,
- dwFlags, &blobOut))
- {
- RegSetValueExA(hKey, szValueName, 0, REG_BINARY,
- blobOut.pbData, blobOut.cbData);
- LocalFree(blobOut.pbData);
- }
- }
- HeapFree(GetProcessHeap(), 0, pbKey);
- }
- }
- }
-}
-
/******************************************************************************
* map_key_spec_to_permissions_name [Internal]
*
@@ -2773,6 +2645,7 @@ static BOOL crypt_export_plaintext_key(CRYPTKEY
*pCryptKey, BYTE *pbData,
*pdwDataLen = dwDataLen;
return TRUE;
}
+
/******************************************************************************
* crypt_export_key [Internal]
*
@@ -2794,7 +2667,7 @@ static BOOL crypt_export_plaintext_key(CRYPTKEY
*pCryptKey, BYTE *pbData,
* Success: TRUE.
* Failure: FALSE.
*/
-static BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey,
+BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey,
DWORD dwBlobType, DWORD dwFlags, BOOL force,
BYTE *pbData, DWORD *pdwDataLen)
{
--
2.21.0
2
1
[PATCH 03/10] dssenh: refactor rsaenh - move create_container_key, open_container_key, delete_container_key from rsaenh/rsaenh.c to rsaenh/cryptoprovutils.c
by shuai zhang 17 Nov '19
by shuai zhang 17 Nov '19
17 Nov '19
Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com>
---
dlls/rsaenh/cryptoprovconfig.h | 7 +++
dlls/rsaenh/cryptoprovutils.c | 89 +++++++++++++++++++++++++++
dlls/rsaenh/cryptoprovutils.h | 16 +++++
dlls/rsaenh/rsaenh.c | 106 ---------------------------------
4 files changed, 112 insertions(+), 106 deletions(-)
diff --git a/dlls/rsaenh/cryptoprovconfig.h b/dlls/rsaenh/cryptoprovconfig.h
index da6d526be2..d282d0db1e 100644
--- a/dlls/rsaenh/cryptoprovconfig.h
+++ b/dlls/rsaenh/cryptoprovconfig.h
@@ -39,6 +39,8 @@
#define RSAENH_PERSONALITY_SCHANNEL 3u
#define RSAENH_PERSONALITY_AES 4u
+#define RSAENH_MAGIC_CONTAINER 0x26384993u
+
/******************************************************************************
* Used by new_key_container to determine the personality via provider name.
* The first entry in aProvNamePersonalityPairs should be the default
personality.
@@ -60,4 +62,9 @@ static const PROVNAMEPERSONALITYPAIR
aProvNamePersonalityPairs[6] =
{MS_ENH_RSA_AES_PROV_XP_A, RSAENH_PERSONALITY_AES}
};
+/******************************************************************************
+ * Some magic constants
+ */
+#define RSAENH_REGKEY "Software\\Wine\\Crypto\\RSA\\%s"
+
#endif /* __WINE_CRYPTOPROVCONFIG_H */
diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c
index 76ee7bbe86..23e0e11626 100644
--- a/dlls/rsaenh/cryptoprovutils.c
+++ b/dlls/rsaenh/cryptoprovutils.c
@@ -32,3 +32,92 @@
#include "handle.h"
#include "cryptoprovutils.h"
#include "wine/debug.h"
+
+/******************************************************************************
+ * create_container_key [Internal]
+ *
+ * Creates the registry key for a key container's persistent storage.
+ *
+ * PARAMS
+ * pKeyContainer [I] Pointer to the key container
+ * sam [I] Desired registry access
+ * phKey [O] Returned key
+ */
+BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey)
+{
+ CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH];
+ HKEY hRootKey;
+
+ sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName);
+
+ if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET)
+ hRootKey = HKEY_LOCAL_MACHINE;
+ else
+ hRootKey = HKEY_CURRENT_USER;
+
+ /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */
+ /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */
+ return RegCreateKeyExA(hRootKey, szRSABase, 0, NULL,
+ REG_OPTION_NON_VOLATILE, sam, NULL, phKey, NULL)
+ == ERROR_SUCCESS;
+}
+
+/******************************************************************************
+ * open_container_key [Internal]
+ *
+ * Opens a key container's persistent storage for reading.
+ *
+ * PARAMS
+ * pszContainerName [I] Name of the container to be opened. May be the empty
+ * string if the parent key of all containers is to be
+ * opened.
+ * dwFlags [I] Flags indicating which keyset to be opened.
+ * phKey [O] Returned key
+ */
+BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags,
REGSAM access, HKEY *phKey)
+{
+ CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH];
+ HKEY hRootKey;
+
+ sprintf(szRSABase, RSAENH_REGKEY, pszContainerName);
+
+ if (dwFlags & CRYPT_MACHINE_KEYSET)
+ hRootKey = HKEY_LOCAL_MACHINE;
+ else
+ hRootKey = HKEY_CURRENT_USER;
+
+ /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */
+ /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */
+ return RegOpenKeyExA(hRootKey, szRSABase, 0, access, phKey) ==
+ ERROR_SUCCESS;
+}
+
+/******************************************************************************
+ * delete_container_key [Internal]
+ *
+ * Deletes a key container's persistent storage.
+ *
+ * PARAMS
+ * pszContainerName [I] Name of the container to be opened.
+ * dwFlags [I] Flags indicating which keyset to be opened.
+ */
+BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags)
+{
+ CHAR szRegKey[sizeof(RSAENH_REGKEY) + MAX_PATH];
+ HKEY hRootKey;
+
+ sprintf(szRegKey, RSAENH_REGKEY, pszContainerName);
+
+ if (dwFlags & CRYPT_MACHINE_KEYSET)
+ hRootKey = HKEY_LOCAL_MACHINE;
+ else
+ hRootKey = HKEY_CURRENT_USER;
+ if (!RegDeleteKeyA(hRootKey, szRegKey)) {
+ SetLastError(ERROR_SUCCESS);
+ return TRUE;
+ } else {
+ SetLastError(NTE_BAD_KEYSET);
+ return FALSE;
+ }
+}
+
diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h
index 832b09e4ce..17d665e398 100644
--- a/dlls/rsaenh/cryptoprovutils.h
+++ b/dlls/rsaenh/cryptoprovutils.h
@@ -26,4 +26,20 @@
#define __WINE_CRYPTOPROVUTILS_H
#include <cryptoprovconfig.h>
#include "implglue.h"
+typedef struct tagKEYCONTAINER
+{
+ OBJECTHDR header;
+ DWORD dwFlags;
+ DWORD dwPersonality;
+ DWORD dwEnumAlgsCtr;
+ DWORD dwEnumContainersCtr;
+ CHAR szName[MAX_PATH];
+ CHAR szProvName[MAX_PATH];
+ HCRYPTKEY hKeyExchangeKeyPair;
+ HCRYPTKEY hSignatureKeyPair;
+} KEYCONTAINER;
+
+BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam,
HKEY *phKey);
+BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags,
REGSAM access, HKEY *phKey);
+BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags);
#endif /* __WINE_CRYPTOPROVUTILS_H */
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index e05785e142..069aee569f 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -105,23 +105,6 @@ typedef struct tagCRYPTKEY
CRYPT_DATA_BLOB blobHmacKey;
} CRYPTKEY;
-/******************************************************************************
- * KEYCONTAINER - key containers
- */
-#define RSAENH_MAGIC_CONTAINER 0x26384993u
-typedef struct tagKEYCONTAINER
-{
- OBJECTHDR header;
- DWORD dwFlags;
- DWORD dwPersonality;
- DWORD dwEnumAlgsCtr;
- DWORD dwEnumContainersCtr;
- CHAR szName[MAX_PATH];
- CHAR szProvName[MAX_PATH];
- HCRYPTKEY hKeyExchangeKeyPair;
- HCRYPTKEY hSignatureKeyPair;
-} KEYCONTAINER;
-
/******************************************************************************
* Some magic constants
*/
@@ -144,7 +127,6 @@ typedef struct tagKEYCONTAINER
#define RSAENH_SSL3_VERSION_MINOR 0
#define RSAENH_TLS1_VERSION_MAJOR 3
#define RSAENH_TLS1_VERSION_MINOR 1
-#define RSAENH_REGKEY "Software\\Wine\\Crypto\\RSA\\%s"
#define RSAENH_MIN(a,b) ((a)<(b)?(a):(b))
/******************************************************************************
@@ -1064,94 +1046,6 @@ static void store_key_permissions(HCRYPTKEY
hCryptKey, HKEY hKey, DWORD dwKeySpe
sizeof(pKey->dwPermissions));
}
-/******************************************************************************
- * create_container_key [Internal]
- *
- * Creates the registry key for a key container's persistent storage.
- *
- * PARAMS
- * pKeyContainer [I] Pointer to the key container
- * sam [I] Desired registry access
- * phKey [O] Returned key
- */
-static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM
sam, HKEY *phKey)
-{
- CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH];
- HKEY hRootKey;
-
- sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName);
-
- if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET)
- hRootKey = HKEY_LOCAL_MACHINE;
- else
- hRootKey = HKEY_CURRENT_USER;
-
- /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */
- /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */
- return RegCreateKeyExA(hRootKey, szRSABase, 0, NULL,
- REG_OPTION_NON_VOLATILE, sam, NULL, phKey, NULL)
- == ERROR_SUCCESS;
-}
-
-/******************************************************************************
- * open_container_key [Internal]
- *
- * Opens a key container's persistent storage for reading.
- *
- * PARAMS
- * pszContainerName [I] Name of the container to be opened. May be the empty
- * string if the parent key of all containers is to be
- * opened.
- * dwFlags [I] Flags indicating which keyset to be opened.
- * phKey [O] Returned key
- */
-static BOOL open_container_key(LPCSTR pszContainerName, DWORD
dwFlags, REGSAM access, HKEY *phKey)
-{
- CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH];
- HKEY hRootKey;
-
- sprintf(szRSABase, RSAENH_REGKEY, pszContainerName);
-
- if (dwFlags & CRYPT_MACHINE_KEYSET)
- hRootKey = HKEY_LOCAL_MACHINE;
- else
- hRootKey = HKEY_CURRENT_USER;
-
- /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */
- /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */
- return RegOpenKeyExA(hRootKey, szRSABase, 0, access, phKey) ==
- ERROR_SUCCESS;
-}
-
-/******************************************************************************
- * delete_container_key [Internal]
- *
- * Deletes a key container's persistent storage.
- *
- * PARAMS
- * pszContainerName [I] Name of the container to be opened.
- * dwFlags [I] Flags indicating which keyset to be opened.
- */
-static BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags)
-{
- CHAR szRegKey[sizeof(RSAENH_REGKEY) + MAX_PATH];
- HKEY hRootKey;
-
- sprintf(szRegKey, RSAENH_REGKEY, pszContainerName);
-
- if (dwFlags & CRYPT_MACHINE_KEYSET)
- hRootKey = HKEY_LOCAL_MACHINE;
- else
- hRootKey = HKEY_CURRENT_USER;
- if (!RegDeleteKeyA(hRootKey, szRegKey)) {
- SetLastError(ERROR_SUCCESS);
- return TRUE;
- } else {
- SetLastError(NTE_BAD_KEYSET);
- return FALSE;
- }
-}
-
/******************************************************************************
* store_key_container_keys [Internal]
*
--
2.21.0
2
1
17 Nov '19
Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com>
---
dlls/rsaenh/cryptoprovconfig.h | 32 ++++++++++++++++++++++++++++++++
dlls/rsaenh/rsaenh.c | 27 ++++++++++-----------------
2 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/dlls/rsaenh/cryptoprovconfig.h b/dlls/rsaenh/cryptoprovconfig.h
index 79a93a85f4..da6d526be2 100644
--- a/dlls/rsaenh/cryptoprovconfig.h
+++ b/dlls/rsaenh/cryptoprovconfig.h
@@ -28,4 +28,36 @@
#ifndef __WINE_CRYPTOPROVCONFIG_H
#define __WINE_CRYPTOPROVCONFIG_H
+#include "wincrypt.h"
+
+/******************************************************************************
+ * KEYCONTAINER - key containers
+ */
+#define RSAENH_PERSONALITY_BASE 0u
+#define RSAENH_PERSONALITY_STRONG 1u
+#define RSAENH_PERSONALITY_ENHANCED 2u
+#define RSAENH_PERSONALITY_SCHANNEL 3u
+#define RSAENH_PERSONALITY_AES 4u
+
+/******************************************************************************
+ * Used by new_key_container to determine the personality via provider name.
+ * The first entry in aProvNamePersonalityPairs should be the default
personality.
+ */
+typedef struct tagPROVNAMEPERSONALITYPAIR
+{
+ LPCSTR pszProvName;
+ DWORD dwPersonality;
+} PROVNAMEPERSONALITYPAIR;
+
+static const DWORD dwNProvNamePersonalityPairs = 6;
+static const PROVNAMEPERSONALITYPAIR aProvNamePersonalityPairs[6] =
+{
+ {"", RSAENH_PERSONALITY_STRONG},
+ {MS_DEF_PROV_A, RSAENH_PERSONALITY_BASE},
+ {MS_ENHANCED_PROV_A, RSAENH_PERSONALITY_ENHANCED},
+ {MS_DEF_RSA_SCHANNEL_PROV_A, RSAENH_PERSONALITY_SCHANNEL},
+ {MS_ENH_RSA_AES_PROV_A, RSAENH_PERSONALITY_AES},
+ {MS_ENH_RSA_AES_PROV_XP_A, RSAENH_PERSONALITY_AES}
+};
+
#endif /* __WINE_CRYPTOPROVCONFIG_H */
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index f8fbd8071a..e05785e142 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -108,12 +108,6 @@ typedef struct tagCRYPTKEY
/******************************************************************************
* KEYCONTAINER - key containers
*/
-#define RSAENH_PERSONALITY_BASE 0u
-#define RSAENH_PERSONALITY_STRONG 1u
-#define RSAENH_PERSONALITY_ENHANCED 2u
-#define RSAENH_PERSONALITY_SCHANNEL 3u
-#define RSAENH_PERSONALITY_AES 4u
-
#define RSAENH_MAGIC_CONTAINER 0x26384993u
typedef struct tagKEYCONTAINER
{
@@ -1270,6 +1264,7 @@ static HCRYPTPROV new_key_container(PCCH
pszContainerName, DWORD dwFlags, const
{
KEYCONTAINER *pKeyContainer;
HCRYPTPROV hKeyContainer;
+ DWORD i;
hKeyContainer = new_object(&handle_table, sizeof(KEYCONTAINER),
RSAENH_MAGIC_CONTAINER,
destroy_key_container,
(OBJECTHDR**)&pKeyContainer);
@@ -1282,17 +1277,15 @@ static HCRYPTPROV new_key_container(PCCH
pszContainerName, DWORD dwFlags, const
pKeyContainer->hSignatureKeyPair = (HCRYPTKEY)INVALID_HANDLE_VALUE;
if (pVTable && pVTable->pszProvName) {
lstrcpynA(pKeyContainer->szProvName,
pVTable->pszProvName, MAX_PATH);
- if (!strcmp(pVTable->pszProvName, MS_DEF_PROV_A)) {
- pKeyContainer->dwPersonality = RSAENH_PERSONALITY_BASE;
- } else if (!strcmp(pVTable->pszProvName, MS_ENHANCED_PROV_A)) {
- pKeyContainer->dwPersonality = RSAENH_PERSONALITY_ENHANCED;
- } else if (!strcmp(pVTable->pszProvName,
MS_DEF_RSA_SCHANNEL_PROV_A)) {
- pKeyContainer->dwPersonality = RSAENH_PERSONALITY_SCHANNEL;
- } else if (!strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_A) ||
- !strcmp(pVTable->pszProvName,
MS_ENH_RSA_AES_PROV_XP_A)) {
- pKeyContainer->dwPersonality = RSAENH_PERSONALITY_AES;
- } else {
- pKeyContainer->dwPersonality = RSAENH_PERSONALITY_STRONG;
+ pKeyContainer->dwPersonality
+ = aProvNamePersonalityPairs[0].dwPersonality;
+ for (i = 1; i < dwNProvNamePersonalityPairs; i++) {
+ if (!strcmp(pVTable->pszProvName,
+ aProvNamePersonalityPairs[i].pszProvName)) {
+ pKeyContainer->dwPersonality
+ = aProvNamePersonalityPairs[i].dwPersonality;
+ break;
+ }
}
}
--
2.21.0
2
1
Hello everyone,
I'm implementing dssenh. I think the behaviour of dssenh is already
well-understood (at least for CPAcquireContext and CPReleaseContext)
through dssenh/tests. And I guess more than 65% of rsaenh's code can
be reused so I am trying to refactor rsaenh so that those codes can be
used by dssenh. Details are in the patch series (they are mostly
trivial copy/pastes).
Currently implemented CPAcquireContext and CPReleaseContext for dssenh.
Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com>
---
dlls/rsaenh/Makefile.in | 3 ++-
dlls/rsaenh/cryptoprovconfig.h | 31 +++++++++++++++++++++++++++++++
dlls/rsaenh/cryptoprovutils.c | 34 ++++++++++++++++++++++++++++++++++
dlls/rsaenh/cryptoprovutils.h | 29 +++++++++++++++++++++++++++++
dlls/rsaenh/rsaenh.c | 1 +
5 files changed, 97 insertions(+), 1 deletion(-)
create mode 100644 dlls/rsaenh/cryptoprovconfig.h
create mode 100644 dlls/rsaenh/cryptoprovutils.c
create mode 100644 dlls/rsaenh/cryptoprovutils.h
diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in
index 80680d6622..dd8574fcaf 100644
--- a/dlls/rsaenh/Makefile.in
+++ b/dlls/rsaenh/Makefile.in
@@ -13,6 +13,7 @@ C_SRCS = \
rc2.c \
rc4.c \
rsa.c \
- rsaenh.c
+ rsaenh.c \
+ cryptoprovutils.c
RC_SRCS = rsrc.rc
diff --git a/dlls/rsaenh/cryptoprovconfig.h b/dlls/rsaenh/cryptoprovconfig.h
new file mode 100644
index 0000000000..79a93a85f4
--- /dev/null
+++ b/dlls/rsaenh/cryptoprovconfig.h
@@ -0,0 +1,31 @@
+/*
+ * dlls/rsaenh/cryptoprovconfig.h
+ * Definitions of some constants used by crypto provider.
+ * It is copied to build dir then included by cryptoprovutils.h,
+ * the build dir comes first in include search paths.
+ * So a new provider implementation only needs to provide its own
+ * cryptoprovconfig.h.
+ *
+ * Copyright 2002 TransGaming Technologies (David Hammerton)
+ * Copyright 2004 Mike McCormack for CodeWeavers
+ * Copyright 2004, 2005 Michael Jung
+ * Copyright 2007 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_CRYPTOPROVCONFIG_H
+#define __WINE_CRYPTOPROVCONFIG_H
+#endif /* __WINE_CRYPTOPROVCONFIG_H */
diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c
new file mode 100644
index 0000000000..76ee7bbe86
--- /dev/null
+++ b/dlls/rsaenh/cryptoprovutils.c
@@ -0,0 +1,34 @@
+/*
+ * dlls/rsaenh/cryptoprovutils.c
+ * Utility functions to implement crypto privider.
+ *
+ * Copyright 2002 TransGaming Technologies (David Hammerton)
+ * Copyright 2004 Mike McCormack for CodeWeavers
+ * Copyright 2004, 2005 Michael Jung
+ * Copyright 2007 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "wincrypt.h"
+#include "handle.h"
+#include "cryptoprovutils.h"
+#include "wine/debug.h"
diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h
new file mode 100644
index 0000000000..832b09e4ce
--- /dev/null
+++ b/dlls/rsaenh/cryptoprovutils.h
@@ -0,0 +1,29 @@
+/*
+ * dlls/rsaenh/cryptoprovutils.h
+ * Header of utility functions to implement crypto privider.
+ *
+ * Copyright 2002 TransGaming Technologies (David Hammerton)
+ * Copyright 2004 Mike McCormack for CodeWeavers
+ * Copyright 2004, 2005 Michael Jung
+ * Copyright 2007 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_CRYPTOPROVUTILS_H
+#define __WINE_CRYPTOPROVUTILS_H
+#include <cryptoprovconfig.h>
+#include "implglue.h"
+#endif /* __WINE_CRYPTOPROVUTILS_H */
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index 9119d4be2d..f8fbd8071a 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -34,6 +34,7 @@
#include "objbase.h"
#include "rpcproxy.h"
#include "aclapi.h"
+#include "cryptoprovutils.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
--
2.21.0
2
1
With some tablet configurations, the InExt value passed to
ScaleForContext can be very large, leading to an integer overflow. Using
MulDiv prevents this problem by internally using 64-bit math.
---
dlls/wintab32/context.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c
index 0514dd78b4..ff9a4ca677 100644
--- a/dlls/wintab32/context.c
+++ b/dlls/wintab32/context.c
@@ -178,9 +178,9 @@ int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam,
static inline DWORD ScaleForContext(DWORD In, LONG InOrg, LONG InExt, LONG OutOrg, LONG OutExt)
{
if (((InExt > 0 )&&(OutExt > 0)) || ((InExt<0) && (OutExt < 0)))
- return ((In - InOrg) * abs(OutExt) / abs(InExt)) + OutOrg;
+ return MulDiv(In - InOrg, abs(OutExt), abs(InExt)) + OutOrg;
else
- return ((abs(InExt) - (In - InOrg))*abs(OutExt) / abs(InExt)) + OutOrg;
+ return MulDiv(abs(InExt) - (In - InOrg), abs(OutExt), abs(InExt)) + OutOrg;
}
LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd)
--
2.23.0
1
0
Hello,
I've been stuck on this issue, where code compiled in Visual Studio (C++) and code compiled via the cross-compiler, MinGW, in a Wine test are behaving differently (I'm using Ubuntu 16.04). It is surprising me, because these are a few virtually identical API level calls and I assumed that would result in the same behavior.
This is code from dlls/comctl32/tests/combo.c, compiled in the mirrored 64-bit build folder .  I wrote a small test function in Wine, compiled and ran it. Â
I wrote the same test in Visual Studio.  These are all API level calls. Â
It is with Visual Studio that I boiled the bug I'm working on to a few sequential API calls, but, strangely, the cross-compiled code doesn't give the same results.
I ran them both on Windows 10 and Windows 7.
I can provide details, but I wonder if anyone has any insights concern these differences? Â
Thanks!...John Alway
2
7
16 Nov '19
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
configure | 1 +
configure.ac | 1 +
dlls/tapi32/tests/Makefile.in | 5 +++
dlls/tapi32/tests/tapi.c | 62 +++++++++++++++++++++++++++++++++++
include/tapi.h | 2 +-
5 files changed, 70 insertions(+), 1 deletion(-)
create mode 100644 dlls/tapi32/tests/Makefile.in
create mode 100644 dlls/tapi32/tests/tapi.c
diff --git a/configure b/configure
index 483efc02d3a9..bcc08e4412de 100755
--- a/configure
+++ b/configure
@@ -20844,6 +20844,7 @@ wine_fn_config_makefile dlls/system.drv16 enable_win16
wine_fn_config_makefile dlls/t2embed enable_t2embed
wine_fn_config_makefile dlls/t2embed/tests enable_tests
wine_fn_config_makefile dlls/tapi32 enable_tapi32
+wine_fn_config_makefile dlls/tapi32/tests enable_tests
wine_fn_config_makefile dlls/taskschd enable_taskschd
wine_fn_config_makefile dlls/taskschd/tests enable_tests
wine_fn_config_makefile dlls/tdh enable_tdh
diff --git a/configure.ac b/configure.ac
index 64721e96449f..52e211c97983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3694,6 +3694,7 @@ WINE_CONFIG_MAKEFILE(dlls/system.drv16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/t2embed)
WINE_CONFIG_MAKEFILE(dlls/t2embed/tests)
WINE_CONFIG_MAKEFILE(dlls/tapi32)
+WINE_CONFIG_MAKEFILE(dlls/tapi32/tests)
WINE_CONFIG_MAKEFILE(dlls/taskschd)
WINE_CONFIG_MAKEFILE(dlls/taskschd/tests)
WINE_CONFIG_MAKEFILE(dlls/tdh)
diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in
new file mode 100644
index 000000000000..126eed1c85ce
--- /dev/null
+++ b/dlls/tapi32/tests/Makefile.in
@@ -0,0 +1,5 @@
+TESTDLL = tapi32.dll
+IMPORTS = tapi32
+
+C_SRCS = \
+ tapi.c
diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c
new file mode 100644
index 000000000000..13772c8c7d49
--- /dev/null
+++ b/dlls/tapi32/tests/tapi.c
@@ -0,0 +1,62 @@
+/*
+ * TAPI32 API tests
+ *
+ * Copyright 2019 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "tapi.h"
+
+#include "wine/test.h"
+
+static void CALLBACK line_callback(DWORD hDev, DWORD dwMsg, DWORD_PTR dwInst, DWORD_PTR param1, DWORD_PTR param2, DWORD_PTR param3)
+{
+}
+
+static void test_lineInitialize(void)
+{
+ ULONG ret;
+ DWORD dev;
+ HLINEAPP lnApp;
+
+ ret = lineInitialize(NULL, NULL, NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev);
+ ok(!ret, "unexpected return value, got %u.\n", ret);
+
+ ret = lineShutdown(NULL);
+ todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %x.\n", ret);
+
+ ret = lineShutdown(lnApp);
+ ok(!ret, "unexpected return value, got %u.\n", ret);
+}
+
+START_TEST(tapi)
+{
+ test_lineInitialize();
+}
diff --git a/include/tapi.h b/include/tapi.h
index 52ec619aef31..535ca67a4295 100644
--- a/include/tapi.h
+++ b/include/tapi.h
@@ -761,7 +761,7 @@ typedef struct linemessage_tag {
DWORD_PTR dwParam3;
} LINEMESSAGE, *LPLINEMESSAGE;
-typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD, DWORD, DWORD, DWORD);
+typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD_PTR, DWORD_PTR, DWORD_PTR, DWORD_PTR);
typedef struct _PHONEAPP {
int dummy;
--
2.21.0
1
0
Hello guys,
I have pushed wine-4.0.3-rc1 (with tag) to
https://github.com/mstefani/wine-stable/tree/stable
https://people.redhat.com/mstefani/wine/stable/
Nothing really crazy this time.
One regression pulled together with the fix:
65956ae50a ==> bug 47546 ==> fixed by 378204527e
Oh, there are now 2 test failures for me in wininet/http.c due to the
winehq.org server update. I've pulled in 5b406e1446a7 that supposedly
dealt with those but it doesn't for me. So if somebody has an idea
please let me know. If not I'll ignore them as they show now also in 4.0.2.
The important stuff from the ANNOUNCE file:
What's new in this release (see below for details):
- Various bug fixes
- Updates to the National Language Support files
----------------------------------------------------------------
Bugs fixed in 4.0.3 (total 54):
8848 SWAT4 Areas that should be in shadow and people are rendered
solid black
12332 Microsoft Windows Server 2003 DDK SP1 installer crashes
('setupapi.SetupCloseFil
14695 Lifeforce demo misses codecs (msvideo1 needs to support 24 bpp
output)
25180 Clonk Endeavour's intro video is not rendered correctly (iccvid
does not support non-multiple of 4 video width)
27185 Futuremark PC Mark 7 (.NET 4.0 app) fails to run with Wine-Mono
(mscoree:get_runtime Unrecognized version L"v4.0.20926")
28196 Test Drive Unlimited: Water is always rendered on top of
everything.
31350 Multiple .NET 3.x WPF applications crash in Vista/Win7 mode due
to dwmapi.DwmGetTransportAttributes stub returning E_NOTIMPL (T-Online
Mediencenter Assistent, Valil.Chess, Zwift 1.0)
38182 King of Dragon Pass: can't change audio volume level
38421 Windows Media Player 9 & 10: mp3 sound plays too fast
38423 Python 3.5.x exe installer fails with Access denied error
39129 Cygwin's dash.exe crashes during installation
39614 Wine initialises a Critical Section for Mutexes by NULL instead
of (void*)-1
41657 CoolQ 5.x reports network error on startup due to
msscript:ScriptControl_Eval stub
42078 Dungeons & Dragons: Chronicles of Mystara needs
d3dx11_43.dll.D3DX11CreateShaderResourceViewFromMemory
42374 Hardwood Solitaire can not connect to his server
43286 WSARecvMsg wrongly forbids NULL control buffers (Qt 5.7.0
based: Cannot read UDP packets: "errno 90, (Message too long)")
45218 Fallout 4 Script Extender fails to allocate trampoline buffers
45449 Add diagnostic 'mscoree.dll.CorGetSvc' stub (NGEN client) to
hint at broken Microsoft .NET Frameworks installation (Wine-Mono not
uninstalled and/or 'mscoree.dll' placeholders not removed prior install)
45757 Visual Studio 2017 Installer - "The installer manifest failed
signature validation"
45947 Native Access crashes on unimplemented function
virtdisk.dll.OpenVirtualDisk
46450 Volume Control doesn't work in Firefox videos (and browsers
based on it) with PulseAudio driver
46453 The Testament of Sherlock Holmes crashes while loading level
with builtin d3dx9_43
46473 Settlers IV History Edition crashes on startup
46558 win64 dotnet Space Engineers fractal noise generation broken
46655 Adobe Photoshop CC 2015.5: Tabs show completely black
46905 Multiple eventlog monitor applications go haywire (endless
console spam, live-loop CPU) due to advapi32.ReadEventLogA/W returning
lasterror ERROR_CALL_NOT_IMPLEMENTED
47013 winebus.sys: hidraw_set_feature_report buffer too small for
some devices in SteelSeries Engine
47023 Warframe in-game screenshot fails if screenshot directory
already exists
47069 Final Fantasy XIV Launcher renders black (needs better get_Busy
implementation)
47082 NI System Web Server crashes on unimplemented function
authz.dll.AuthzFreeResourceManager
47129 Rendering glitch in Caste Siege/Ballerburg (invalid vertex
count in IDirect3DDevice3::DrawIndexedPrimitiveVB)
47137 Multiple applications from Line 6 (Yamaha Guitar Group) crash
on startup (HX Edit v2.71, POD Farm 2.5)(Wine builtin 'gdiplus.dll'
missing version resource)
47143 Trackbar thumb is too small in Metatrader 4 expert advisor
47178 Grand Prix Legends: Service papycpu2 doesn't load
47190 Custom protocol handler CF doesn't support aggregation
47214 Oracle Java runtime 8.211 online installer crashes in WoW64
47234 Wine fails to properly parse and import some of the standard
root certificates
47236 Adobe InDesign CC 2017: crashes at startup: unimplemented
function msvcp140.dll._Strxfrm
47249 CM_Set_Class_Registry_Property should use PCVOID for buffer
parameter
47285 widl generates incorrect format strings when using -Oicf flag
47327 Japanese texts are overlapped in notepad when using bitmap font.
47352 Levelhead: Can't connect to game's network
47367 Some WPF 4.x apps from Windows 10 SDK (10.0.17763.x) spam
console with fixme:d3d:wined3d_driver_info_init Unhandled OS version
6.3, reporting Win 8. (WinVer set to 'Windows 8.1')
47399 Mozart 11-13 crashes on startup
47418 Quickbooks 2018 installer crashes on Validating Install
47424 DataTransferLength in SCSI_PASS_THROUGH and
SCSI_PASS_THROUGH_DIRECT *must* have return value
47432 bcrypt always chooses ECB mode when using AES, even if a
program indicates otherwise.
47437 Final Fantasy XIV 5.0 crashes on startup when using xaudio2_8.dll
47514 AviUtl: Can't add a file to the ExEdit dialog after the first drop.
47546 Touhou 14-17 experience Spell Name and Music Room text issues
starting in Wine 4.1
47564 Database mistmatch on brazillian timezone (America/Sao_Paulo)
47578 Omni-NFS 4.13's XLPD Server crashes on unimplemented function
ntoskrnl.exe.MmIsThisAnNtAsSystem
47586 The Sims 1 visually freezes after alt-tabbing when in
fullscreen mode
47706 ntdll: Compiler warnings regression on x86_64 [stable]
----------------------------------------------------------------
Changes since 4.0.2:
Akihiro Sagawa (4):
usp10/tests: Add advance width tests with CJK bitmap font.
usp10: Fix advance width when glyph is missing.
shell32/tests: Add DragQueryPoint tests.
shell32: Fix return value for DragQueryPoint.
Alex Henrie (2):
ntoskrnl: Add MmIsThisAnNtAsSystem().
server: Fix use after free in add_committed_range (scan-build).
Alexandre Julliard (5):
ntdll: Use the correct type for %llu scanf format.
server: Fix the returned error code for an invalid NT header offset.
widl: Use %define parse.error verbose instead of %error-verbose.
d3dcompiler: Use %define parse.error verbose instead of
%error-verbose.
wbemprox: Use %define parse.error verbose instead of %error-verbose.
Alistair Leslie-Hughes (5):
authz: Add AuthzFreeResourceManager stub.
winebus.sys: Increase buffer size to match max length available.
wininet: Always set last error in InternetReadFile.
dinput: Ensure buffer doesn't overflow (Coverity).
advapi32: Don't read a value that might be uninitialized (Coverity).
Andrew Eikum (1):
ntdll: Fix memory region check in NtQueryVirtualMemory.
Andrey Gusev (1):
d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry.
Aric Stewart (1):
dinput: Handle case where IOHIDDeviceGetValue fails.
Austin English (1):
advapi32: In ReadEventLogA/W, return ERROR_HANDLE_EOF instead of
ERROR_CALL_NOT_IMPLEMENTED.
Bryon Roche (1):
windowscodecs: Byte swap png read/write for 16-bpp data.
Damjan Jovanovic (1):
ws2_32: WSARecvMsg allows a NULL control buffer when no control
messages arrive.
Dmitry Timoshkov (6):
crypt32: CryptMsgUpdate should skip broken certificates.
urlmon/tests: Add a test for ProtocolCF_CreateInstance not
supporting aggregation.
urlmon: If ProtocolCF_CreateInstance doesn't support aggregation
retry without it.
windowscodecs/tests: Add a bunch of new tests for indexed format
conversions.
windowscodecs: Add support for 32bppRGB, 32bppRGBA and 32bppPRGBA
to format converter.
msvcrt: Fix handling of dst == src in wcscpy_s.
Enol Puente (3):
wrc: Add Asturian locale.
wmc: Support Asturian.
kernel32: Add Asturian locale.
Erich Hoover (2):
advapi32: Move the DACL combining code into a separate routine.
advapi32: Fix the initialization of combined DACLs when the new
DACL is empty.
Ethan Lee (1):
xaudio2: Export functions by ordinal.
Fabian Maurer (2):
gdi32: CreatePolyPolygonRgn() returns an empty region when the
area is empty.
setupapi: Correct function parameter for
CM_Set_Class_Registry_PropertyA/W.
Gabriel Ivăncescu (4):
winealsa.drv: Adjust the buffer volume before sending it to ALSA.
winepulse.drv: Adjust the buffer volume before sending it to
PulseAudio.
comctl32/listbox: Fix mouse wheel scrolling for multi-column
listboxes.
user32/listbox: Fix mouse wheel scrolling for multi-column listboxes.
Gijs Vermeulen (1):
wine.inf: Update E. South America Standard Time.
Hans Leidekker (5):
bcrypt: Implement BCryptGenerate/FinalizeKeyPair for ECDH P256.
bcrypt: Ignore the size parameter in BCRYPT_CHAINING_MODE setters.
winhttp/tests: Fix some test failures.
winhttp: Propagate request errors in request_wait.
wininet/tests: Fix FTP test failures.
Henri Verbeet (2):
wined3d: Handle Windows 8.1 in wined3d_driver_info_init().
wined3d: Add GPU information for AMD VEGA12.
Jacek Caban (2):
ieframe: Keep Busy property in sync with download state.
msxml3: Fix string length handling in
I[VB]SAXContentHandler::characters.
Jactry Zeng (1):
msscript: Partially implement IScriptControl::Eval().
Jeff Smith (1):
d3drm: Fix reference leak in d3drm_viewport2_Clear().
John Thomson (1):
shell32: Do not fail in SHCreateDirectoryExW for ERROR_ALREADY_EXISTS.
Kai Krakow (1):
wined3d: Add GPU information for NVIDIA GTX 1660 Ti.
Ken Thomases (1):
winemac: Fix failure to render OpenGL on macOS 10.14 (Mojave).
Kristján Gerhardsson (3):
wined3d: Add GPU information for various Mac GPUs.
wined3d: Add GPU information for AMD VEGA20.
wined3d: Add GPU information for a few more Intel KBL GPUs.
Louis Lenders (2):
dwmapi: Return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in
DwmGetTransportAttributes.
gdiplus: Add version resource.
Martin Liska (1):
include: Avoid compound literals for WCHAR strings.
Michael Müller (5):
avifil32: Correctly handle compressed frames when desired format
is specified.
wininet: Allow to set INTERNET_OPTION_HTTP_DECODING on sessions
and connections.
iccvid: Fix calculation of stride and size.
msvidc32: Add support for converting 16 bit depth to 24 bit.
msvidc32: Fix calculation of stride and size.
Nikolay Sivov (7):
kernel32/tests: Add a test for critical section DebugInfo initial
value.
ntdll: Initialize critical section debug info with correct pointer
value.
comctl32/trackbar: Do not consider window size when initializing
fixed length thumb.
kernel32/nls: Add LOCALE_SPERCENT locale data.
kernel32/nls: Add LOCALE_SPERMILLE data.
kernel32/nls: Add percent formatting values.
kernel32/nls: Add locale data for positive and negative infinity.
Owen Rudge (1):
wininet/tests: Fix http tests to reflect current state of winehq
test server.
Paul Gofman (14):
d3dx9: Factor out {lock|unlock}_surface() functions.
d3dx9: Use temporary surface in D3DXFillTexture() for unmappable
textures.
d3dx9: Do not ignore surface map failure in
D3DXSaveSurfaceToFileInMemory().
d3dx9: Use temporary surface in D3DXSaveSurfaceToFileInMemory()
for unmappable textures.
d3dx9: Use {lock|unlock}_surface() in D3DXLoadSurfaceFromMemory().
d3dx9: Pass rectangle to {lock|unlock}_surface().
wined3d: Apply stencil mask to stencil reference value.
ddraw: Fix vertex count in d3d_device3_DrawIndexedPrimitiveVB().
wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend.
ddraw: Return DDERR_SURFACELOST from _GetAttachedSurface() if
surface is lost.
ddraw: Restore complex attached surfaces when restoring surface.
ddraw/tests: Test restoring attached surface for ddraw4.
ddraw/tests: Test restoring attached surface for ddraw2.
ddraw/tests: Test restoring attached surface for ddraw1.
Piotr Caban (2):
msvcp: Add _Strxfrm implementation.
services: Don't double release process in service_start.
Qian Hong (1):
advapi32: Initialize the LsaLookupSids() LSA_TRANSLATED_NAME.Name
string properly.
Rémi Bernon (1):
wined3d: Add GPU information for Intel UHD Graphics 620.
Stefan Dösinger (1):
include: Remove backslashes from D3D12_COLOR_WRITE_ENABLE_ALL.
Sven Baars (8):
wmp: Fix a crash in put_volume when basic_audio is NULL.
shell32: Fix an item identifier list leak (Valgrind).
user32: Fix some leaks on error path (Coverity).
msrle32: Fix a memory leak (Valgrind).
comctl32: Always free the tooltip text before setting it (Valgrind).
d3dx9: Release the full parameter name when a parameter is
released (Valgrind).
d3dx9: Always free samplers (Valgrind).
shell32: Fix a use after free (Coverity).
Tim Schumacher (1):
services: Allow reading binary registry values as DWORDs.
Vijay Kiran Kamuju (12):
virtdisk: Add stub and tests for OpenVirtualDisk.
kernel/nls: Fix country name in Tatar locale.
kernel/nls: Fix LOCALE_SNAME for Azeri (Cyrillic).
kernel/nls: Fix LOCALE_SNAME for Uzbek (Cyrillic).
kernel/nls: Fix LOCALE_SNAME for Serbian (Cyrillic).
kernel/nls: Fix country name and sname in English-Caribbean locale.
kernel/nls: Fix country name in Manx Gaelic locale.
kernel/nls: Add LOCALE_SMONTHDAY to all supported languages.
kernel/nls: Fix LOCALE_SLONGDATE and LOCALE_SYEARMONTH for some
chinese locales.
kernel32: Add implementation of CAL_SSHORTESTDAYNAME*.
kernel32: Add implementation for CAL_SMONTHDAY.
kernel/nls: Fix LOCALE_SABBREVCTRYNAME for Serbian.
Vincent Povirk (3):
mscoree: Accept old framework build in exe metadata.
windowscodecs: Treat 16-bit channels as little endian.
mscoree: Add diagnostic CorGetSvc stub.
Zebediah Figura (14):
setupapi: Add magic bytes to struct file_queue and validate them
in SetupCloseFileQueue().
msxml3: Load the version 1 typelib before trying to access it.
widl: Use IsSimpleRef only for explicitly declared arrays.
widl: Also allocate top-level pointers to arrays as on-stack in
-Oicf mode.
widl: Mark unions, user types, and ranges as IsSimpleRef.
quartz/tests: Clean up CommitDecommitTest().
quartz/tests: Add more tests for standard media samples.
quartz/memallocator: Clear some sample properties when freeing the
sample.
msi: Close all handles opened by a custom action thread.
ntdll: Correctly fill DataTransferLength in SCSI_PASS_THROUGH and
SCSI_PASS_THROUGH_DIRECT.
ucrtbase/tests: Add some tests for __stdio_common_vsscanf().
ucrtbase: Write the %hh prefix as a single char.
d3d8/tests: Flush events after sending SC_MAXIMIZE.
d3d9/tests: Add another flush to work around an intermittent test
failure on fvwm2.
Zhiyi Zhang (3):
d3d9/tests: Add a test for stencil reference value truncation.
wined3d: Truncate stencil reference values to the stencil
component size.
msctf: Add ITfContextOwnerCompositionServices stub.
--
Michael Stefaniuc
mstefani(a)winehq.org
1
0
16 Nov '19
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
configure | 1 +
configure.ac | 1 +
dlls/tapi32/tests/Makefile.in | 5 +++
dlls/tapi32/tests/tapi.c | 62 +++++++++++++++++++++++++++++++++++
4 files changed, 69 insertions(+)
create mode 100644 dlls/tapi32/tests/Makefile.in
create mode 100644 dlls/tapi32/tests/tapi.c
diff --git a/configure b/configure
index 483efc02d3a9..bcc08e4412de 100755
--- a/configure
+++ b/configure
@@ -20844,6 +20844,7 @@ wine_fn_config_makefile dlls/system.drv16 enable_win16
wine_fn_config_makefile dlls/t2embed enable_t2embed
wine_fn_config_makefile dlls/t2embed/tests enable_tests
wine_fn_config_makefile dlls/tapi32 enable_tapi32
+wine_fn_config_makefile dlls/tapi32/tests enable_tests
wine_fn_config_makefile dlls/taskschd enable_taskschd
wine_fn_config_makefile dlls/taskschd/tests enable_tests
wine_fn_config_makefile dlls/tdh enable_tdh
diff --git a/configure.ac b/configure.ac
index 64721e96449f..52e211c97983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3694,6 +3694,7 @@ WINE_CONFIG_MAKEFILE(dlls/system.drv16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/t2embed)
WINE_CONFIG_MAKEFILE(dlls/t2embed/tests)
WINE_CONFIG_MAKEFILE(dlls/tapi32)
+WINE_CONFIG_MAKEFILE(dlls/tapi32/tests)
WINE_CONFIG_MAKEFILE(dlls/taskschd)
WINE_CONFIG_MAKEFILE(dlls/taskschd/tests)
WINE_CONFIG_MAKEFILE(dlls/tdh)
diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in
new file mode 100644
index 000000000000..126eed1c85ce
--- /dev/null
+++ b/dlls/tapi32/tests/Makefile.in
@@ -0,0 +1,5 @@
+TESTDLL = tapi32.dll
+IMPORTS = tapi32
+
+C_SRCS = \
+ tapi.c
diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c
new file mode 100644
index 000000000000..13772c8c7d49
--- /dev/null
+++ b/dlls/tapi32/tests/tapi.c
@@ -0,0 +1,62 @@
+/*
+ * TAPI32 API tests
+ *
+ * Copyright 2019 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "tapi.h"
+
+#include "wine/test.h"
+
+static void CALLBACK line_callback(DWORD hDev, DWORD dwMsg, DWORD_PTR dwInst, DWORD_PTR param1, DWORD_PTR param2, DWORD_PTR param3)
+{
+}
+
+static void test_lineInitialize(void)
+{
+ ULONG ret;
+ DWORD dev;
+ HLINEAPP lnApp;
+
+ ret = lineInitialize(NULL, NULL, NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev);
+ ok(!ret, "unexpected return value, got %u.\n", ret);
+
+ ret = lineShutdown(NULL);
+ todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %x.\n", ret);
+
+ ret = lineShutdown(lnApp);
+ ok(!ret, "unexpected return value, got %u.\n", ret);
+}
+
+START_TEST(tapi)
+{
+ test_lineInitialize();
+}
--
2.21.0
1
0
[PATCH] ole32/tests: Check more return values in moniker tests (Coverity).
by Nikolay Sivov 16 Nov '19
by Nikolay Sivov 16 Nov '19
16 Nov '19
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/ole32/tests/moniker.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c
index 9e2c23b421..644f2f5b15 100644
--- a/dlls/ole32/tests/moniker.c
+++ b/dlls/ole32/tests/moniker.c
@@ -1049,36 +1049,33 @@ todo_wine
ok_ole_success(hr, CreateBindCtx);
hr = CreateFileMoniker(wszFileName1, &pmk1);
- ok(hr==0, "CreateFileMoniker for file hr=%08x\n", hr);
+ ok(hr == S_OK, "Failed to create file moniker, hr %#x.\n", hr);
hr = CreateFileMoniker(wszFileName2, &pmk2);
- ok(hr==0, "CreateFileMoniker for file hr=%08x\n", hr);
+ ok(hr == S_OK, "Failed to create file moniker, hr %#x.\n", hr);
hr = IBindCtx_GetRunningObjectTable(pbc, &pprot);
- ok(hr==0, "IBindCtx_GetRunningObjectTable hr=%08x\n", hr);
+ ok(hr == S_OK, "Failed to get ROT, hr %#x.\n", hr);
/* Check EnumMoniker before registering */
hr = IRunningObjectTable_EnumRunning(pprot, &spEM1);
- ok(hr==0, "IRunningObjectTable_EnumRunning hr=%08x\n", hr);
- hr = IEnumMoniker_QueryInterface(spEM1, &IID_IUnknown, (void*) &lpEM1);
+ ok(hr == S_OK, "Failed to get enum object, hr %#x.\n", hr);
+ hr = IEnumMoniker_QueryInterface(spEM1, &IID_IUnknown, (void *)&lpEM1);
/* Register a couple of Monikers and check is ok */
- ok(hr==0, "IEnumMoniker_QueryInterface hr %08x %p\n", hr, lpEM1);
-
+ ok(hr == S_OK, "Failed to get interface, hr %#x.\n");
+
matchCnt = count_moniker_matches(pbc, spEM1);
trace("Number of matches is %i\n", matchCnt);
grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE;
hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk1, &pdwReg1);
- ok(hr==0, "IRunningObjectTable_Register hr=%08x %p %08x %p %p %d\n",
- hr, pprot, grflags, lpEM1, pmk1, pdwReg1);
+ ok(hr == S_OK, "Failed to register object, hr %#x.\n");
- trace("IROT::Register\n");
grflags=0;
grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE;
hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk2, &pdwReg2);
- ok(hr==0, "IRunningObjectTable_Register hr=%08x %p %08x %p %p %d\n", hr,
- pprot, grflags, lpEM1, pmk2, pdwReg2);
+ ok(hr == S_OK, "Failed to register object, hr %#x.\n", hr);
hr = IRunningObjectTable_EnumRunning(pprot, &spEM2);
- ok(hr==0, "IRunningObjectTable_EnumRunning hr=%08x\n", hr);
+ ok(hr == S_OK, "Failed to get enum object, hr %#x.\n", hr);
matchCnt = count_moniker_matches(pbc, spEM2);
ok(matchCnt==2, "Number of matches should be equal to 2 not %i\n", matchCnt);
@@ -1094,8 +1091,10 @@ todo_wine
matchCnt = count_moniker_matches(pbc, spEM3);
ok(matchCnt==2, "Number of matches should be equal to 2 not %i\n", matchCnt);
- IRunningObjectTable_Revoke(pprot,pdwReg1);
- IRunningObjectTable_Revoke(pprot,pdwReg2);
+ hr = IRunningObjectTable_Revoke(pprot,pdwReg1);
+ ok(hr == S_OK, "Failed to revoke, hr %#x.\n", hr);
+ hr = IRunningObjectTable_Revoke(pprot,pdwReg2);
+ ok(hr == S_OK, "Failed to revoke, hr %#x.\n", hr);
IUnknown_Release(lpEM1);
IEnumMoniker_Release(spEM1);
IEnumMoniker_Release(spEM2);
--
2.24.0
1
0
16 Nov '19
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
configure | 1 +
configure.ac | 1 +
dlls/tapi32/tests/Makefile.in | 5 +++
dlls/tapi32/tests/tapi.c | 62 +++++++++++++++++++++++++++++++++++
4 files changed, 69 insertions(+)
create mode 100644 dlls/tapi32/tests/Makefile.in
create mode 100644 dlls/tapi32/tests/tapi.c
diff --git a/configure b/configure
index 483efc02d3a9..bcc08e4412de 100755
--- a/configure
+++ b/configure
@@ -20844,6 +20844,7 @@ wine_fn_config_makefile dlls/system.drv16 enable_win16
wine_fn_config_makefile dlls/t2embed enable_t2embed
wine_fn_config_makefile dlls/t2embed/tests enable_tests
wine_fn_config_makefile dlls/tapi32 enable_tapi32
+wine_fn_config_makefile dlls/tapi32/tests enable_tests
wine_fn_config_makefile dlls/taskschd enable_taskschd
wine_fn_config_makefile dlls/taskschd/tests enable_tests
wine_fn_config_makefile dlls/tdh enable_tdh
diff --git a/configure.ac b/configure.ac
index 64721e96449f..52e211c97983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3694,6 +3694,7 @@ WINE_CONFIG_MAKEFILE(dlls/system.drv16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/t2embed)
WINE_CONFIG_MAKEFILE(dlls/t2embed/tests)
WINE_CONFIG_MAKEFILE(dlls/tapi32)
+WINE_CONFIG_MAKEFILE(dlls/tapi32/tests)
WINE_CONFIG_MAKEFILE(dlls/taskschd)
WINE_CONFIG_MAKEFILE(dlls/taskschd/tests)
WINE_CONFIG_MAKEFILE(dlls/tdh)
diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in
new file mode 100644
index 000000000000..126eed1c85ce
--- /dev/null
+++ b/dlls/tapi32/tests/Makefile.in
@@ -0,0 +1,5 @@
+TESTDLL = tapi32.dll
+IMPORTS = tapi32
+
+C_SRCS = \
+ tapi.c
diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c
new file mode 100644
index 000000000000..a232010438e7
--- /dev/null
+++ b/dlls/tapi32/tests/tapi.c
@@ -0,0 +1,62 @@
+/*
+ * TAPI32 API tests
+ *
+ * Copyright 2019 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "tapi.h"
+
+#include "wine/test.h"
+
+static void CALLBACK line_callback(DWORD hDev, DWORD dwMsg, DWORD_PTR dwInst, DWORD_PTR param1, DWORD_PTR param2, DWORD_PTR param3)
+{
+}
+
+static void test_lineInitialize(void)
+{
+ ULONG ret;
+ DWORD dev;
+ HLINEAPP lnApp;
+
+ ret = lineInitialize(NULL, NULL, NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev);
+ ok(!ret, "unexpected return value, got %u.\n", ret);
+
+ ret = lineShutdown(NULL);
+ todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %x.\n", ret);
+
+ ret = lineShutdown(lnApp);
+ ok(!ret, "unexpected return value, got %u.\n", ret);
+}
+
+START_TEST(line)
+{
+ test_lineInitialize();
+}
--
2.21.0
3
2
16 Nov '19
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
configure | 1 +
configure.ac | 1 +
dlls/tapi32/tests/Makefile.in | 5 +++
dlls/tapi32/tests/line.c | 63 +++++++++++++++++++++++++++++++++++
4 files changed, 70 insertions(+)
create mode 100644 dlls/tapi32/tests/Makefile.in
create mode 100644 dlls/tapi32/tests/line.c
diff --git a/configure b/configure
index 8ddfb4ecdd..af37617bd8 100755
--- a/configure
+++ b/configure
@@ -20846,6 +20846,7 @@ wine_fn_config_makefile dlls/system.drv16 enable_win16
wine_fn_config_makefile dlls/t2embed enable_t2embed
wine_fn_config_makefile dlls/t2embed/tests enable_tests
wine_fn_config_makefile dlls/tapi32 enable_tapi32
+wine_fn_config_makefile dlls/tapi32/tests enable_tests
wine_fn_config_makefile dlls/taskschd enable_taskschd
wine_fn_config_makefile dlls/taskschd/tests enable_tests
wine_fn_config_makefile dlls/tdh enable_tdh
diff --git a/configure.ac b/configure.ac
index 31aac11d31..0eec89e3df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3699,6 +3699,7 @@ WINE_CONFIG_MAKEFILE(dlls/system.drv16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/t2embed)
WINE_CONFIG_MAKEFILE(dlls/t2embed/tests)
WINE_CONFIG_MAKEFILE(dlls/tapi32)
+WINE_CONFIG_MAKEFILE(dlls/tapi32/tests)
WINE_CONFIG_MAKEFILE(dlls/taskschd)
WINE_CONFIG_MAKEFILE(dlls/taskschd/tests)
WINE_CONFIG_MAKEFILE(dlls/tdh)
diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in
new file mode 100644
index 0000000000..4193f0808e
--- /dev/null
+++ b/dlls/tapi32/tests/Makefile.in
@@ -0,0 +1,5 @@
+TESTDLL = tapi32.dll
+IMPORTS = tapi32
+
+C_SRCS = \
+ line.c
diff --git a/dlls/tapi32/tests/line.c b/dlls/tapi32/tests/line.c
new file mode 100644
index 0000000000..e94b68ba30
--- /dev/null
+++ b/dlls/tapi32/tests/line.c
@@ -0,0 +1,63 @@
+/*
+ * TAPI32 API tests
+ *
+ * Copyright 2019 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "tapi.h"
+
+#include "wine/test.h"
+
+static void CALLBACK line_callback(DWORD hDev, DWORD dwMsg, DWORD_PTR dwInst, DWORD_PTR param1, DWORD_PTR param2, DWORD_PTR param3)
+{
+ ok(1, "Received notification (%d, %d, %ld, %ld, %ld %ld)\n", hDev, dwMsg, dwInst, param1, param2, param3);
+}
+
+static void test_lineInitialize(void)
+{
+ ULONG ret;
+ DWORD dev;
+ HLINEAPP lnApp;
+
+ ret = lineInitialize(NULL, NULL, NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), (LINECALLBACK) line_callback, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), (LINECALLBACK) line_callback, NULL, &dev);
+ ok(!ret, "unexpected return valuei, got %u.\n", ret);
+
+ ret = lineShutdown(NULL);
+ todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %x.\n", ret);
+
+ ret = lineShutdown(lnApp);
+ ok(!ret, "unexpected return valuei, got %u.\n", ret);
+}
+
+START_TEST(line)
+{
+ test_lineInitialize();
+}
--
2.20.1
2
3
[PATCH 1/2] strmbase: Get rid of the unused "cs" parameter to strmbase_video_init().
by Zebediah Figura 16 Nov '19
by Zebediah Figura 16 Nov '19
16 Nov '19
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
dlls/quartz/videorenderer.c | 3 +--
dlls/quartz/vmr9.c | 3 +--
dlls/strmbase/video.c | 3 +--
include/wine/strmbase.h | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index 5c2c3934fc..2e770cdf4c 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -764,8 +764,7 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out)
if (FAILED(hr))
goto fail;
- hr = strmbase_video_init(&pVideoRenderer->baseControlVideo,
- &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.filter.csFilter,
+ hr = strmbase_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter,
&pVideoRenderer->renderer.sink.pin, &renderer_BaseControlVideoFuncTable);
if (FAILED(hr))
goto fail;
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index 1a4f85c87c..a2ed46d05d 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -2239,8 +2239,7 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid)
goto fail;
hr = strmbase_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter,
- &pVMR->renderer.filter.csFilter, &pVMR->renderer.sink.pin,
- &renderer_BaseControlVideoFuncTable);
+ &pVMR->renderer.sink.pin, &renderer_BaseControlVideoFuncTable);
if (FAILED(hr))
goto fail;
diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c
index d1ebbdf235..081794e9b3 100644
--- a/dlls/strmbase/video.c
+++ b/dlls/strmbase/video.c
@@ -648,11 +648,10 @@ static const IBasicVideoVtbl basic_video_vtbl =
};
HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter,
- CRITICAL_SECTION *cs, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table)
+ struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table)
{
video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl;
video->pFilter = filter;
- video->pInterfaceLock = cs;
video->pPin = pin;
video->pFuncsTable = func_table;
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index f92a375a56..7f9d2cb64d 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -477,7 +477,6 @@ typedef struct tagBaseControlVideo
IBasicVideo IBasicVideo_iface;
struct strmbase_filter *pFilter;
- CRITICAL_SECTION* pInterfaceLock;
struct strmbase_pin *pPin;
const struct BaseControlVideoFuncTable* pFuncsTable;
@@ -509,7 +508,7 @@ typedef struct BaseControlVideoFuncTable {
} BaseControlVideoFuncTable;
HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter,
- CRITICAL_SECTION *cs, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table);
+ struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table);
HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo);
#endif
#endif
--
2.24.0
1
1
16 Nov '19
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48111
Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com>
---
dlls/odbccp32/odbccp32.c | 3 ++-
dlls/odbccp32/tests/misc.c | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c
index 1198b487f3..a09d6571f3 100644
--- a/dlls/odbccp32/odbccp32.c
+++ b/dlls/odbccp32/odbccp32.c
@@ -583,7 +583,8 @@ BOOL WINAPI SQLGetInstalledDrivers(char *buf, WORD size, WORD *sizeout)
return FALSE;
}
- *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL);
+ if (sizeout)
+ *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL);
WideCharToMultiByte(CP_ACP, 0, wbuf, written, buf, size, NULL, NULL);
heap_free(wbuf);
diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c
index dc2ca7ed3f..e2f48ee732 100644
--- a/dlls/odbccp32/tests/misc.c
+++ b/dlls/odbccp32/tests/misc.c
@@ -643,6 +643,11 @@ static void test_SQLGetInstalledDrivers(void)
ok(!ret, "got %d\n", ret);
check_error(ODBC_ERROR_INVALID_BUFF_LEN);
+ ret = SQLGetInstalledDrivers(buffer, 10, NULL);
+ ok(ret, "got %d\n", ret);
+ ok(strlen(buffer) == 8, "got len %u\n", lstrlenA(buffer));
+ ok(!buffer[9], "buffer not doubly null-terminated\n");
+
ret = SQLGetInstalledDrivers(buffer, 10, &written);
ok(ret, "got %d\n", ret);
ok(strlen(buffer) == 8, "got len %u\n", lstrlenA(buffer));
--
2.24.0
1
0
The function COMBO_SelectString() has parameter "start" declared as INT, but there is not a good reason to do so, since it is used only as parameter for SendMessage(). I suggest to change it from INT to WPARAM, for removing the cast to INT inside CB_SELECTSTRING and fixing the warning that I'm getting on Windows because INT to WPARAM type mismatch.
Sincerely.
Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net>
1
0
16 Nov '19
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
configure | 1 +
configure.ac | 1 +
dlls/tapi32/tests/Makefile.in | 5 +++
dlls/tapi32/tests/tapi.c | 63 +++++++++++++++++++++++++++++++++++
4 files changed, 70 insertions(+)
create mode 100644 dlls/tapi32/tests/Makefile.in
create mode 100644 dlls/tapi32/tests/tapi.c
diff --git a/configure b/configure
index 483efc02d3a9..bcc08e4412de 100755
--- a/configure
+++ b/configure
@@ -20844,6 +20844,7 @@ wine_fn_config_makefile dlls/system.drv16 enable_win16
wine_fn_config_makefile dlls/t2embed enable_t2embed
wine_fn_config_makefile dlls/t2embed/tests enable_tests
wine_fn_config_makefile dlls/tapi32 enable_tapi32
+wine_fn_config_makefile dlls/tapi32/tests enable_tests
wine_fn_config_makefile dlls/taskschd enable_taskschd
wine_fn_config_makefile dlls/taskschd/tests enable_tests
wine_fn_config_makefile dlls/tdh enable_tdh
diff --git a/configure.ac b/configure.ac
index 64721e96449f..52e211c97983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3694,6 +3694,7 @@ WINE_CONFIG_MAKEFILE(dlls/system.drv16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/t2embed)
WINE_CONFIG_MAKEFILE(dlls/t2embed/tests)
WINE_CONFIG_MAKEFILE(dlls/tapi32)
+WINE_CONFIG_MAKEFILE(dlls/tapi32/tests)
WINE_CONFIG_MAKEFILE(dlls/taskschd)
WINE_CONFIG_MAKEFILE(dlls/taskschd/tests)
WINE_CONFIG_MAKEFILE(dlls/tdh)
diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in
new file mode 100644
index 000000000000..4193f0808e73
--- /dev/null
+++ b/dlls/tapi32/tests/Makefile.in
@@ -0,0 +1,5 @@
+TESTDLL = tapi32.dll
+IMPORTS = tapi32
+
+C_SRCS = \
+ line.c
diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c
new file mode 100644
index 000000000000..e94b68ba306c
--- /dev/null
+++ b/dlls/tapi32/tests/tapi.c
@@ -0,0 +1,63 @@
+/*
+ * TAPI32 API tests
+ *
+ * Copyright 2019 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "tapi.h"
+
+#include "wine/test.h"
+
+static void CALLBACK line_callback(DWORD hDev, DWORD dwMsg, DWORD_PTR dwInst, DWORD_PTR param1, DWORD_PTR param2, DWORD_PTR param3)
+{
+ ok(1, "Received notification (%d, %d, %ld, %ld, %ld %ld)\n", hDev, dwMsg, dwInst, param1, param2, param3);
+}
+
+static void test_lineInitialize(void)
+{
+ ULONG ret;
+ DWORD dev;
+ HLINEAPP lnApp;
+
+ ret = lineInitialize(NULL, NULL, NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), (LINECALLBACK) line_callback, NULL, NULL);
+ todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret);
+
+ ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), (LINECALLBACK) line_callback, NULL, &dev);
+ ok(!ret, "unexpected return valuei, got %u.\n", ret);
+
+ ret = lineShutdown(NULL);
+ todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %x.\n", ret);
+
+ ret = lineShutdown(lnApp);
+ ok(!ret, "unexpected return valuei, got %u.\n", ret);
+}
+
+START_TEST(line)
+{
+ test_lineInitialize();
+}
--
2.21.0
2
1
One thing winedbg has always lacked in the ability
to change the current thread, making commands like
"info locals" unusable, since they apply to the current
stack frame, set by "frame N", which applies to the
current thread, which cannot be changed.
This patch implements that feature. It adds a new
winedbg command, "thread N", which changes the
current thread to the thread whose TID is N.
Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com>
---
programs/winedbg/dbg.y | 1 +
programs/winedbg/debug.l | 1 +
programs/winedbg/debugger.h | 1 +
programs/winedbg/info.c | 2 +-
programs/winedbg/tgt_active.c | 23 +++++++++++++++++++++++
programs/winedbg/winedbg.man.in | 3 +++
6 files changed, 30 insertions(+), 1 deletion(-)
1
0
Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr>
---
dlls/wbemprox/builtin.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 96d1e0b..56d7d67 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -2341,7 +2341,9 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c
goto done;
}
if (!wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW )) continue;
+
new_path = append_path( path, data.cFileName, &len );
+ /* FIXME: What if new_path == NULL? */
if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
{
@@ -2354,6 +2356,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c
rec = (struct record_datafile *)(table->data + offset);
rec->name = build_name( root[0], new_path );
rec->version = get_file_version( rec->name );
+ heap_free( new_path );
if (!match_row( table, row, cond, &status ))
{
free_row_values( table, row );
@@ -2466,6 +2469,8 @@ static enum fill_status fill_directory( struct table *table, const struct expr *
continue;
new_path = append_path( path, data.cFileName, &len );
+ /* FIXME: What if new_path == NULL? */
+
if (!(push_dir( dirstack, new_path, len )))
{
heap_free( new_path );
@@ -2476,6 +2481,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr *
rec = (struct record_directory *)(table->data + offset);
rec->accessmask = FILE_ALL_ACCESS;
rec->name = build_name( root[0], new_path );
+ heap_free( new_path );
if (!match_row( table, row, cond, &status ))
{
free_row_values( table, row );
--
2.10.0.windows.1
1
0
Hello everybody,
I'm looking to implement dssenh for wine. I think more than 65% of
code from rsaenh can be reused. So I am trying to figure out how to do
it.
My idea goes as follows: move the functions from rsaenh.c that can be
reused into rsaenh/cryptoprovutils.c, and keep the functions specific
to rsaenh.dll in rsaenh.c. When implementing dssenh.dll, link dssenh.c
together with rsaenh/cryptoprovutils.c. create
rsaenh/cryptoprovconfig.h and dssenh/cryptoprovconfig.h, put the
rsa/dss specific constant/struct definitions in them, and
cryptoprovconfig.h is included in cryptoprovutils.c. In this way, we
can reuse the functions from rsaenh.c. Patch 2/2 illustrated how I
implemented DSSENH_CPAcquireContext and DSSENH_CPReleaseContext.
These patches passes rsaenh/tests and test_acquire_context in
dssenh/tests. Other functions are to be implemented.
Looking forward to any suggestions.
---
dlls/dssenh/Makefile.in | 6 +-
dlls/dssenh/dssenh.c | 706 ++++++++++++++++++++++++++++++++++++++++
dlls/dssenh/dssenh.rgs | 32 ++
dlls/dssenh/dssenh.spec | 50 +--
dlls/dssenh/main.c | 59 ----
dlls/dssenh/rsrc.rc | 31 ++
6 files changed, 799 insertions(+), 85 deletions(-)
create mode 100644 dlls/dssenh/dssenh.c
create mode 100644 dlls/dssenh/dssenh.rgs
delete mode 100644 dlls/dssenh/main.c
create mode 100644 dlls/dssenh/rsrc.rc
diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in
index 4f05beee51..54295f99ba 100644
--- a/dlls/dssenh/Makefile.in
+++ b/dlls/dssenh/Makefile.in
@@ -1,6 +1,10 @@
MODULE = dssenh.dll
+IMPORTLIB = dssenh
+IMPORTS = bcrypt crypt32 advapi32
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
- main.c
+ dssenh.c
+
+RC_SRCS = rsrc.rc
diff --git a/dlls/dssenh/dssenh.c b/dlls/dssenh/dssenh.c
new file mode 100644
index 0000000000..5dc5464724
--- /dev/null
+++ b/dlls/dssenh/dssenh.c
@@ -0,0 +1,706 @@
+/*
+ * Copyright 2008 Maarten Lankhorst
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wincrypt.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dssenh);
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+ TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
+
+ switch (fdwReason)
+ {
+ case DLL_WINE_PREATTACH:
+ return FALSE; /* prefer native version */
+ case DLL_PROCESS_ATTACH:
+ DisableThreadLibraryCalls(hinstDLL);
+ break;
+ }
+ return TRUE;
+}
+
+/*****************************************************
+ * DllRegisterServer (DSSENH.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+ FIXME("Not implemented.\n");
+ return E_UNEXPECTED;
+}
+
+/*****************************************************
+ * DllUnregisterServer (DSSENH.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+ FIXME("Not implemented.\n");
+ return E_UNEXPECTED;
+}
+
+/******************************************************************************
+ * CPAcquireContext (DSSENH.@)
+ *
+ * Acquire a handle to the key container specified by pszContainer
+ *
+ * PARAMS
+ * phProv [O] Pointer to the location the acquired handle will
be written to.
+ * pszContainer [I] Name of the desired key container. See Notes
+ * dwFlags [I] Flags. See Notes.
+ * pVTable [I] Pointer to a VTableProvStruc containing callbacks.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ *
+ * NOTES
+ * If pszContainer is NULL or points to a zero length string the user's login
+ * name will be used as the key container name.
+ *
+ * If the CRYPT_NEW_KEYSET flag is set in dwFlags a new keyset will
be created.
+ * If a keyset with the given name already exists, the function fails and sets
+ * last error to NTE_EXISTS. If CRYPT_NEW_KEYSET is not set and the specified
+ * key container does not exist, function fails and sets last error to
+ * NTE_BAD_KEYSET.
+ */
+BOOL WINAPI DSSENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer,
+ DWORD dwFlags, PVTableProvStruc pVTable)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPCreateHash (DSSENH.@)
+ *
+ * CPCreateHash creates and initializes a new hash object.
+ *
+ * PARAMS
+ * hProv [I] Handle to the key container to which the new hash will belong.
+ * Algid [I] Identifies the hash algorithm, which will be used for the hash.
+ * hKey [I] Handle to a session key applied for keyed hashes.
+ * dwFlags [I] Currently no flags defined. Must be zero.
+ * phHash [O] Points to the location where a handle to the new hash
will be stored.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ *
+ * NOTES
+ * hKey is a handle to a session key applied in keyed hashes like
MAC and HMAC.
+ * If a normal hash object is to be created (like e.g. MD2 or SHA1)
hKey must be zero.
+ */
+BOOL WINAPI DSSENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid,
HCRYPTKEY hKey, DWORD dwFlags,
+ HCRYPTHASH *phHash)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPDecrypt (DSSENH.@)
+ *
+ * Decrypt data.
+ *
+ * PARAMS
+ * hProv [I] The key container hKey and hHash belong to.
+ * hKey [I] The key used to decrypt the data.
+ * hHash [I] An optional hash object for parallel hashing. See notes.
+ * Final [I] Indicates if this is the last block of data to decrypt.
+ * dwFlags [I] Must be zero or CRYPT_OAEP
+ * pbData [I/O] Pointer to the data to decrypt. Plaintext will
also be stored there.
+ * pdwDataLen [I/O] I: Length of ciphertext, O: Length of plaintext.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ *
+ * NOTES
+ * If a hash object handle is provided in hHash, it will be updated
with the plaintext.
+ * This is useful for message signatures.
+ *
+ * This function uses the standard WINAPI protocol for querying data
of dynamic length.
+ */
+BOOL WINAPI DSSENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey,
HCRYPTHASH hHash, BOOL Final,
+ DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPDeriveKey (DSSENH.@)
+ *
+ * Derives a key from a hash value.
+ *
+ * PARAMS
+ * hProv [I] Key container for which a key is to be generated.
+ * Algid [I] Crypto algorithm identifier for the key to be generated.
+ * hBaseData [I] Hash from whose value the key will be derived.
+ * dwFlags [I] See Notes.
+ * phKey [O] The generated key.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ *
+ * NOTES
+ * Defined flags:
+ * - CRYPT_EXPORTABLE: Key can be exported.
+ * - CRYPT_NO_SALT: No salt is used for 40 bit keys.
+ * - CRYPT_CREATE_SALT: Use remaining bits as salt value.
+ */
+BOOL WINAPI DSSENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid,
HCRYPTHASH hBaseData,
+ DWORD dwFlags, HCRYPTKEY *phKey)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPDestroyHash (DSSENH.@)
+ *
+ * Releases the handle to a hash object. The object is destroyed if
its reference
+ * count reaches zero.
+ *
+ * PARAMS
+ * hProv [I] Handle to the key container to which the hash object belongs.
+ * hHash [I] Handle to the hash object to be released.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ */
+BOOL WINAPI DSSENH_CPDestroyHash(HCRYPTPROV hProv, HCRYPTHASH hHash)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPDestroyKey (DSSENH.@)
+ *
+ * Releases the handle to a key object. The object is destroyed if
its reference
+ * count reaches zero.
+ *
+ * PARAMS
+ * hProv [I] Handle to the key container to which the key object belongs.
+ * hKey [I] Handle to the key object to be released.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ */
+BOOL WINAPI DSSENH_CPDestroyKey(HCRYPTPROV hProv, HCRYPTKEY hKey)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPDuplicateHash (DSSENH.@)
+ *
+ * Clones a hash object including its current state.
+ *
+ * PARAMS
+ * hUID [I] Handle to the key container the hash belongs to.
+ * hHash [I] Handle to the hash object to be cloned.
+ * pdwReserved [I] Reserved. Must be NULL.
+ * dwFlags [I] No flags are currently defined. Must be 0.
+ * phHash [O] Handle to the cloned hash object.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ */
+BOOL WINAPI DSSENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash,
DWORD *pdwReserved,
+ DWORD dwFlags, HCRYPTHASH *phHash)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPDuplicateKey (DSSENH.@)
+ *
+ * Clones a key object including its current state.
+ *
+ * PARAMS
+ * hUID [I] Handle to the key container the hash belongs to.
+ * hKey [I] Handle to the key object to be cloned.
+ * pdwReserved [I] Reserved. Must be NULL.
+ * dwFlags [I] No flags are currently defined. Must be 0.
+ * phHash [O] Handle to the cloned key object.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ */
+BOOL WINAPI DSSENH_CPDuplicateKey(HCRYPTPROV hUID, HCRYPTKEY hKey,
DWORD *pdwReserved,
+ DWORD dwFlags, HCRYPTKEY *phKey)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPEncrypt (DSSENH.@)
+ *
+ * Encrypt data.
+ *
+ * PARAMS
+ * hProv [I] The key container hKey and hHash belong to.
+ * hKey [I] The key used to encrypt the data.
+ * hHash [I] An optional hash object for parallel hashing. See notes.
+ * Final [I] Indicates if this is the last block of data to encrypt.
+ * dwFlags [I] Must be zero or CRYPT_OAEP
+ * pbData [I/O] Pointer to the data to encrypt. Encrypted data
will also be stored there.
+ * pdwDataLen [I/O] I: Length of data to encrypt, O: Length of encrypted data.
+ * dwBufLen [I] Size of the buffer at pbData.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ *
+ * NOTES
+ * If a hash object handle is provided in hHash, it will be updated
with the plaintext.
+ * This is useful for message signatures.
+ *
+ * This function uses the standard WINAPI protocol for querying data
of dynamic length.
+ */
+BOOL WINAPI DSSENH_CPEncrypt(HCRYPTPROV hProv, HCRYPTKEY hKey,
HCRYPTHASH hHash, BOOL Final,
+ DWORD dwFlags, BYTE *pbData, DWORD
*pdwDataLen, DWORD dwBufLen)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPExportKey (DSSENH.@)
+ *
+ * Export a key into a binary large object (BLOB).
+ *
+ * PARAMS
+ * hProv [I] Key container from which a key is to be exported.
+ * hKey [I] Key to be exported.
+ * hPubKey [I] Key used to encrypt sensitive BLOB data.
+ * dwBlobType [I] SIMPLEBLOB, PUBLICKEYBLOB or PRIVATEKEYBLOB.
+ * dwFlags [I] Currently none defined.
+ * pbData [O] Pointer to a buffer where the BLOB will be written to.
+ * pdwDataLen [I/O] I: Size of buffer at pbData, O: Size of BLOB
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ */
+BOOL WINAPI DSSENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey,
HCRYPTKEY hPubKey,
+ DWORD dwBlobType, DWORD dwFlags, BYTE
*pbData, DWORD *pdwDataLen)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPGenKey (DSSENH.@)
+ *
+ * Generate a key in the key container
+ *
+ * PARAMS
+ * hProv [I] Key container for which a key is to be generated.
+ * Algid [I] Crypto algorithm identifier for the key to be generated.
+ * dwFlags [I] Upper 16 bits: Binary length of key. Lower 16 bits:
Flags. See Notes
+ * phKey [O] Handle to the generated key.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ *
+ * NOTES
+ * Private key-exchange- and signature-keys can be generated with
Algid AT_KEYEXCHANGE
+ * and AT_SIGNATURE values.
+ */
+BOOL WINAPI DSSENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD
dwFlags, HCRYPTKEY *phKey)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPGenRandom (DSSENH.@)
+ *
+ * Generate a random byte stream.
+ *
+ * PARAMS
+ * hProv [I] Key container that is used to generate random bytes.
+ * dwLen [I] Specifies the number of requested random data bytes.
+ * pbBuffer [O] Random bytes will be stored here.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ */
+BOOL WINAPI DSSENH_CPGenRandom(HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPGetHashParam (DSSENH.@)
+ *
+ * Query parameters of an hash object.
+ *
+ * PARAMS
+ * hProv [I] The key container, which the hash belongs to.
+ * hHash [I] The hash object that is to be queried.
+ * dwParam [I] Specifies the parameter that is to be queried.
+ * pbData [I] Pointer to the buffer where the parameter value
will be stored.
+ * pdwDataLen [I/O] I: Buffer length at pbData, O: Length of the
parameter value.
+ * dwFlags [I] None currently defined.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ *
+ * NOTES
+ * Valid dwParams are: HP_ALGID, HP_HASHSIZE, HP_HASHVALUE. The hash will be
+ * finalized if HP_HASHVALUE is queried.
+ */
+BOOL WINAPI DSSENH_CPGetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash,
DWORD dwParam, BYTE *pbData,
+ DWORD *pdwDataLen, DWORD dwFlags)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPGetKeyParam (DSSENH.@)
+ *
+ * Query a key parameter.
+ *
+ * PARAMS
+ * hProv [I] The key container, which the key belongs to.
+ * hHash [I] The key object that is to be queried.
+ * dwParam [I] Specifies the parameter that is to be queried.
+ * pbData [I] Pointer to the buffer where the parameter value
will be stored.
+ * pdwDataLen [I/O] I: Buffer length at pbData, O: Length of the
parameter value.
+ * dwFlags [I] None currently defined.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ *
+ * NOTES
+ * Defined dwParam types are:
+ * - KP_MODE: Values MODE_CBC, MODE_ECB, MODE_CFB.
+ * - KP_MODE_BITS: Shift width for cipher feedback mode.
+ * (Currently ignored by MS CSP's - always eight)
+ * - KP_PERMISSIONS: Or'ed combination of CRYPT_ENCRYPT, CRYPT_DECRYPT,
+ * CRYPT_EXPORT, CRYPT_READ, CRYPT_WRITE, CRYPT_MAC
+ * - KP_IV: Initialization vector.
+ * - KP_KEYLEN: Bitwidth of the key.
+ * - KP_BLOCKLEN: Size of a block cipher block.
+ * - KP_SALT: Salt value.
+ */
+BOOL WINAPI DSSENH_CPGetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey,
DWORD dwParam, BYTE *pbData,
+ DWORD *pdwDataLen, DWORD dwFlags)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPGetProvParam (DSSENH.@)
+ *
+ * Query a CSP parameter.
+ *
+ * PARAMS
+ * hProv [I] The key container that is to be queried.
+ * dwParam [I] Specifies the parameter that is to be queried.
+ * pbData [I] Pointer to the buffer where the parameter value
will be stored.
+ * pdwDataLen [I/O] I: Buffer length at pbData, O: Length of the
parameter value.
+ * dwFlags [I] CRYPT_FIRST: Start enumeration (for PP_ENUMALGS{_EX}).
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ * NOTES:
+ * Defined dwParam types:
+ * - PP_CONTAINER: Name of the key container.
+ * - PP_NAME: Name of the cryptographic service provider.
+ * - PP_SIG_KEYSIZE_INC: RSA signature keywidth granularity in bits.
+ * - PP_KEYX_KEYSIZE_INC: RSA key-exchange keywidth granularity in bits.
+ * - PP_ENUMALGS{_EX}: Query provider capabilities.
+ * - PP_KEYSET_SEC_DESCR: Retrieve security descriptor on container.
+ */
+BOOL WINAPI DSSENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam,
BYTE *pbData,
+ DWORD *pdwDataLen, DWORD dwFlags)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPGetUserKey (DSSENH.@)
+ *
+ * Returns a handle to the user's private key-exchange- or signature-key.
+ *
+ * PARAMS
+ * hProv [I] The key container from which a user key is requested.
+ * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
+ * phUserKey [O] Handle to the requested key or INVALID_HANDLE_VALUE
in case of failure.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ *
+ * NOTE
+ * A newly created key container does not contain private user key.
Create them with CPGenKey.
+ */
+BOOL WINAPI DSSENH_CPGetUserKey(HCRYPTPROV hProv, DWORD dwKeySpec,
HCRYPTKEY *phUserKey)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPHashData (DSSENH.@)
+ *
+ * Updates a hash object with the given data.
+ *
+ * PARAMS
+ * hProv [I] Key container to which the hash object belongs.
+ * hHash [I] Hash object which is to be updated.
+ * pbData [I] Pointer to data with which the hash object is to be updated.
+ * dwDataLen [I] Length of the data.
+ * dwFlags [I] Currently none defined.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ *
+ * NOTES
+ * The actual hash value is queried with CPGetHashParam, which will finalize
+ * the hash. Updating a finalized hash will fail with a last error
NTE_BAD_HASH_STATE.
+ */
+BOOL WINAPI DSSENH_CPHashData(HCRYPTPROV hProv, HCRYPTHASH hHash,
const BYTE *pbData,
+ DWORD dwDataLen, DWORD dwFlags)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPHashSessionKey (DSSENH.@)
+ *
+ * Updates a hash object with the binary representation of a symmetric key.
+ *
+ * PARAMS
+ * hProv [I] Key container to which the hash object belongs.
+ * hHash [I] Hash object which is to be updated.
+ * hKey [I] The symmetric key, whose binary value will be added
to the hash.
+ * dwFlags [I] CRYPT_LITTLE_ENDIAN, if the binary key value shall
be interpreted as little endian.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ */
+BOOL WINAPI DSSENH_CPHashSessionKey(HCRYPTPROV hProv, HCRYPTHASH
hHash, HCRYPTKEY hKey,
+ DWORD dwFlags)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPImportKey (DSSENH.@)
+ *
+ * Import a BLOB'ed key into a key container.
+ *
+ * PARAMS
+ * hProv [I] Key container into which the key is to be imported.
+ * pbData [I] Pointer to a buffer which holds the BLOB.
+ * dwDataLen [I] Length of data in buffer at pbData.
+ * hPubKey [I] Key used to decrypt sensitive BLOB data.
+ * dwFlags [I] One of:
+ * CRYPT_EXPORTABLE: the imported key is marked exportable
+ * phKey [O] Handle to the imported key.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ */
+BOOL WINAPI DSSENH_CPImportKey(HCRYPTPROV hProv, const BYTE *pbData,
DWORD dwDataLen,
+ HCRYPTKEY hPubKey, DWORD dwFlags,
HCRYPTKEY *phKey)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPReleaseContext (DSSENH.@)
+ *
+ * Release a key container.
+ *
+ * PARAMS
+ * hProv [I] Key container to be released.
+ * dwFlags [I] Currently none defined.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ */
+BOOL WINAPI DSSENH_CPReleaseContext(HCRYPTPROV hProv, DWORD dwFlags)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPSetHashParam (DSSENH.@)
+ *
+ * Set a parameter of a hash object.
+ *
+ * PARAMS
+ * hProv [I] The key container to which the key belongs.
+ * hHash [I] The hash object for which a parameter is to be set.
+ * dwParam [I] Parameter type. See Notes.
+ * pbData [I] Pointer to the parameter value.
+ * dwFlags [I] Currently none defined.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ *
+ * NOTES
+ * Currently only the HP_HMAC_INFO dwParam type is defined.
+ * The HMAC_INFO struct will be deep copied into the hash object.
+ * See Internet RFC 2104 for details on the HMAC algorithm.
+ */
+BOOL WINAPI DSSENH_CPSetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash,
DWORD dwParam,
+ BYTE *pbData, DWORD dwFlags)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPSetKeyParam (DSSENH.@)
+ *
+ * Set a parameter of a key object.
+ *
+ * PARAMS
+ * hProv [I] The key container to which the key belongs.
+ * hKey [I] The key for which a parameter is to be set.
+ * dwParam [I] Parameter type. See Notes.
+ * pbData [I] Pointer to the parameter value.
+ * dwFlags [I] Currently none defined.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ *
+ * NOTES:
+ */
+BOOL WINAPI DSSENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey,
DWORD dwParam, BYTE *pbData,
+ DWORD dwFlags)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPSetProvParam (DSSENH.@)
+ *
+ * Set a parameter of a provider.
+ *
+ * PARAMS
+ * hProv [I] The key container for which to set parameters.
+ * dwParam [I] Parameter type. See Notes.
+ * pbData [I] Pointer to the parameter value
+ * dwFlags [I] Currently none defined.
+ *
+ * RETURNS:
+ * Success: TRUE.
+ * Failure: FALSE.
+ *
+ * NOTES:
+ */
+BOOL WINAPI DSSENH_CPSetProvParam(HCRYPTPROV hProv, DWORD dwParam,
BYTE *pbData, DWORD dwFlags)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPSignHash (DSSENH.@)
+ *
+ * Sign a hash object
+ *
+ * PARAMS
+ * hProv [I] The key container, to which the hash object belongs.
+ * hHash [I] The hash object to be signed.
+ * dwKeySpec [I] AT_SIGNATURE or AT_KEYEXCHANGE: Key used to
generate the signature.
+ * sDescription [I] Should be NULL for security reasons.
+ * dwFlags [I] 0, CRYPT_NOHASHOID or CRYPT_X931_FORMAT:
Format of the signature.
+ * pbSignature [O] Buffer, to which the signature will be stored.
May be NULL to query SigLen.
+ * pdwSigLen [I/O] Size of the buffer (in), Length of the signature (out)
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ */
+BOOL WINAPI DSSENH_CPSignHash(HCRYPTPROV hProv, HCRYPTHASH hHash,
DWORD dwKeySpec,
+ LPCWSTR sDescription, DWORD dwFlags,
BYTE *pbSignature,
+ DWORD *pdwSigLen)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * CPVerifySignature (DSSENH.@)
+ *
+ * Verify the signature of a hash object.
+ *
+ * PARAMS
+ * hProv [I] The key container, to which the hash belongs.
+ * hHash [I] The hash for which the signature is verified.
+ * pbSignature [I] The binary signature.
+ * dwSigLen [I] Length of the signature BLOB.
+ * hPubKey [I] Public key used to verify the signature.
+ * sDescription [I] Should be NULL for security reasons.
+ * dwFlags [I] 0, CRYPT_NOHASHOID or CRYPT_X931_FORMAT: Format
of the signature.
+ *
+ * RETURNS
+ * Success: TRUE (Signature is valid)
+ * Failure: FALSE (GetLastError() == NTE_BAD_SIGNATURE, if signature
is invalid)
+ */
+BOOL WINAPI DSSENH_CPVerifySignature(HCRYPTPROV hProv, HCRYPTHASH
hHash, const BYTE *pbSignature,
+ DWORD dwSigLen, HCRYPTKEY
hPubKey, LPCWSTR sDescription,
+ DWORD dwFlags)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
diff --git a/dlls/dssenh/dssenh.rgs b/dlls/dssenh/dssenh.rgs
new file mode 100644
index 0000000000..19899cb516
--- /dev/null
+++ b/dlls/dssenh/dssenh.rgs
@@ -0,0 +1,32 @@
+HKLM
+{
+ NoRemove Software
+ {
+ NoRemove Microsoft
+ {
+ NoRemove Cryptography
+ {
+ NoRemove Defaults
+ {
+ NoRemove Provider
+ {
+ ForceRemove 'Microsoft Enhanced DSS and
Diffie-Hellman Cryptographic Provider'
+ {
+ val 'Image Path' = s '%MODULE%'
+ val 'Signature' = b deadbeef
+ val 'Type' = d 13
+ }
+ }
+ NoRemove 'Provider Types'
+ {
+ ForceRemove 'Type 013'
+ {
+ val 'Name' = s 'Microsoft Enhanced DSS
and Diffie-Hellman Cryptographic Provider'
+ val 'TypeName' = s 'DSS Signature with
Diffe-zhellman Key Exchange'
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec
index c5c2545281..330b8914b3 100644
--- a/dlls/dssenh/dssenh.spec
+++ b/dlls/dssenh/dssenh.spec
@@ -1,27 +1,27 @@
-@ stub CPAcquireContext
-@ stub CPCreateHash
-@ stub CPDecrypt
-@ stub CPDeriveKey
-@ stub CPDestroyHash
-@ stub CPDestroyKey
-@ stub CPDuplicateHash
-@ stub CPDuplicateKey
-@ stub CPEncrypt
-@ stub CPExportKey
-@ stub CPGenKey
-@ stub CPGenRandom
-@ stub CPGetHashParam
-@ stub CPGetKeyParam
-@ stub CPGetProvParam
-@ stub CPGetUserKey
-@ stub CPHashData
-@ stub CPHashSessionKey
-@ stub CPImportKey
-@ stub CPReleaseContext
-@ stub CPSetHashParam
-@ stub CPSetKeyParam
-@ stub CPSetProvParam
-@ stub CPSignHash
-@ stub CPVerifySignature
+@ stdcall CPAcquireContext(ptr str long ptr) DSSENH_CPAcquireContext
+@ stdcall CPCreateHash(long long ptr long ptr) DSSENH_CPCreateHash
+@ stdcall CPDecrypt(long long long long long ptr ptr) DSSENH_CPDecrypt
+@ stdcall CPDeriveKey(long long long long ptr) DSSENH_CPDeriveKey
+@ stdcall CPDestroyHash(long long) DSSENH_CPDestroyHash
+@ stdcall CPDestroyKey(long long) DSSENH_CPDestroyKey
+@ stdcall CPDuplicateHash(long long ptr long ptr) DSSENH_CPDuplicateHash
+@ stdcall CPDuplicateKey(long long ptr long ptr) DSSENH_CPDuplicateKey
+@ stdcall CPEncrypt(long long long long long ptr ptr long) DSSENH_CPEncrypt
+@ stdcall CPExportKey(long long long long long ptr ptr) DSSENH_CPExportKey
+@ stdcall CPGenKey(long long long ptr) DSSENH_CPGenKey
+@ stdcall CPGenRandom(long long ptr) DSSENH_CPGenRandom
+@ stdcall CPGetHashParam(long long long ptr ptr long) DSSENH_CPGetHashParam
+@ stdcall CPGetKeyParam(long long long ptr ptr long) DSSENH_CPGetKeyParam
+@ stdcall CPGetProvParam(long long ptr ptr long) DSSENH_CPGetProvParam
+@ stdcall CPGetUserKey(long long ptr) DSSENH_CPGetUserKey
+@ stdcall CPHashData(long long ptr long long) DSSENH_CPHashData
+@ stdcall CPHashSessionKey(long long long long) DSSENH_CPHashSessionKey
+@ stdcall CPImportKey(long ptr long long long ptr) DSSENH_CPImportKey
+@ stdcall CPReleaseContext(long long) DSSENH_CPReleaseContext
+@ stdcall CPSetHashParam(long long long ptr long) DSSENH_CPSetHashParam
+@ stdcall CPSetKeyParam(long long long ptr long) DSSENH_CPSetKeyParam
+@ stdcall CPSetProvParam(long long ptr long) DSSENH_CPSetProvParam
+@ stdcall CPSignHash(long long long wstr long ptr ptr) DSSENH_CPSignHash
+@ stdcall CPVerifySignature(long long ptr long long wstr long)
DSSENH_CPVerifySignature
@ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer()
diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c
deleted file mode 100644
index b60b3447a3..0000000000
--- a/dlls/dssenh/main.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2008 Maarten Lankhorst
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dssenh);
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
- TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
-
- switch (fdwReason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(hinstDLL);
- break;
- }
- return TRUE;
-}
-
-/*****************************************************
- * DllRegisterServer (DSSENH.@)
- */
-HRESULT WINAPI DllRegisterServer(void)
-{
- FIXME("Not implemented.\n");
- return E_UNEXPECTED;
-}
-
-/*****************************************************
- * DllUnregisterServer (DSSENH.@)
- */
-HRESULT WINAPI DllUnregisterServer(void)
-{
- FIXME("Not implemented.\n");
- return E_UNEXPECTED;
-}
diff --git a/dlls/dssenh/rsrc.rc b/dlls/dssenh/rsrc.rc
new file mode 100644
index 0000000000..3ec4fc17f1
--- /dev/null
+++ b/dlls/dssenh/rsrc.rc
@@ -0,0 +1,31 @@
+/*
+ * Resources for dssenh
+ *
+ * Copyright (c) 2007 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* @makedep: dssenh.rgs */
+1 WINE_REGISTRY dssenh.rgs
+
+#define WINE_FILEDESCRIPTION_STR "Wine dssenh"
+#define WINE_FILENAME_STR "dssenh.dll"
+#define WINE_FILEVERSION 5,1,2600,2180
+#define WINE_FILEVERSION_STR "5.1.2600.2180"
+#define WINE_PRODUCTVERSION 5,1,2600,2180
+#define WINE_PRODUCTVERSION_STR "5.1.2600.2180"
+
+#include "wine/wine_common_ver.rc"
--
2.21.0
3
2
[PATCH v3 1/2] include: add colordlg.h header file for color dialogs
by Vijay Kiran Kamuju 16 Nov '19
by Vijay Kiran Kamuju 16 Nov '19
16 Nov '19
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
include/Makefile.in | 1 +
include/colordlg.h | 62 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+)
create mode 100644 include/colordlg.h
diff --git a/include/Makefile.in b/include/Makefile.in
index c31fb50d7498..421e3d6c5988 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -60,6 +60,7 @@ SOURCES = \
cmdtxt.idl \
cmnquery.idl \
colinf.idl \
+ colordlg.h \
comcat.idl \
commctrl.h \
commctrl.rh \
diff --git a/include/colordlg.h b/include/colordlg.h
new file mode 100644
index 000000000000..330659f7a435
--- /dev/null
+++ b/include/colordlg.h
@@ -0,0 +1,62 @@
+/*
+ * Color Dialog definitions
+ *
+ * Copyright (C) 2019 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_COLORDLG_H
+#define __WINE_COLORDLG_H
+
+#define DLG_COLOR
+
+#define COLOR_HUESCROLL 700
+#define COLOR_SATSCROLL 701
+#define COLOR_LUMSCROLL 702
+#define COLOR_HUE 703
+#define COLOR_SAT 704
+#define COLOR_LUM 705
+#define COLOR_RED 706
+#define COLOR_GREEN 707
+#define COLOR_BLUE 708
+#define COLOR_CURRENT 709
+#define COLOR_RAINBOW 710
+#define COLOR_SAVE 711
+#define COLOR_ADD 712
+#define COLOR_SOLID 713
+#define COLOR_TUNE 714
+#define COLOR_SCHEMES 715
+#define COLOR_ELEMENT 716
+#define COLOR_SAMPLES 717
+#define COLOR_PALETTE 718
+#define COLOR_MIX 719
+#define COLOR_BOX1 720
+#define COLOR_CUSTOM1 721
+
+#define COLOR_HUEACCEL 723
+#define COLOR_SATACCEL 724
+#define COLOR_LUMACCEL 725
+#define COLOR_REDACCEL 726
+#define COLOR_GREENACCEL 727
+#define COLOR_BLUEACCEL 728
+
+#define COLOR_SOLID_LEFT 730
+#define COLOR_SOLID_RIGHT 731
+
+#define NUM_BASIC_COLORS 48
+#define NUM_CUSTOM_COLORS 16
+
+#endif /* __WINE_COLORDLG_H */
--
2.21.0
1
1
16 Nov '19
---
dlls/dssenh/Makefile.in | 5 +-
dlls/dssenh/cryptoprovconfig.h | 85 +++++
dlls/dssenh/dssenh.c | 96 ++++-
dlls/dssenh/dssenh.rgs | 28 ++
dlls/rsaenh/Makefile.in | 3 +-
dlls/rsaenh/cryptoprovconfig.h | 88 +++++
dlls/rsaenh/cryptoprovutils.c | 649 ++++++++++++++++++++++++++++++++
dlls/rsaenh/cryptoprovutils.h | 81 ++++
dlls/rsaenh/rsaenh.c | 656 +--------------------------------
9 files changed, 1026 insertions(+), 665 deletions(-)
create mode 100644 dlls/dssenh/cryptoprovconfig.h
create mode 100644 dlls/rsaenh/cryptoprovconfig.h
create mode 100644 dlls/rsaenh/cryptoprovutils.c
create mode 100644 dlls/rsaenh/cryptoprovutils.h
diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in
index 54295f99ba..cb34ad3ae2 100644
--- a/dlls/dssenh/Makefile.in
+++ b/dlls/dssenh/Makefile.in
@@ -1,10 +1,13 @@
MODULE = dssenh.dll
IMPORTLIB = dssenh
IMPORTS = bcrypt crypt32 advapi32
+EXTRAINCL = -I$(top_srcdir)/dlls/
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
- dssenh.c
+ dssenh.c \
+ ../rsaenh/cryptoprovutils.c \
+ ../rsaenh/handle.c
RC_SRCS = rsrc.rc
diff --git a/dlls/dssenh/cryptoprovconfig.h b/dlls/dssenh/cryptoprovconfig.h
new file mode 100644
index 0000000000..f6e307bc96
--- /dev/null
+++ b/dlls/dssenh/cryptoprovconfig.h
@@ -0,0 +1,85 @@
+/*
+ * dlls/rsaenh/cryptoprovconfig.h
+ * Definitions of some constants used by crypto provider.
+ * It is copied to build dir then included by cryptoprovutils.h,
+ * the build dir comes first in include search paths.
+ * So a new provider implementation only needs to provide its own
+ * cryptoprovconfig.h.
+ *
+ * Copyright 2002 TransGaming Technologies (David Hammerton)
+ * Copyright 2004 Mike McCormack for CodeWeavers
+ * Copyright 2004, 2005 Michael Jung
+ * Copyright 2007 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_CRYPTOPROVCONFIG_H
+#define __WINE_CRYPTOPROVCONFIG_H
+#define DSSENH_MAGIC_KEY 0x73620457u
+#define DSSENH_MAX_KEY_SIZE 64
+#define DSSENH_MAX_BLOCK_SIZE 24
+#define DSSENH_MAGIC_CONTAINER 0x26384993u
+#define DSSENH_REGKEY "Software\\Wine\\Crypto\\DSS\\%s"
+
+#define CRYPTO_PROV_MAGIC_KEY DSSENH_MAGIC_KEY
+#define CRYPTO_PROV_MAX_KEY_SIZE DSSENH_MAX_KEY_SIZE
+#define CRYPTO_PROV_MAX_BLOCK_SIZE DSSENH_MAX_BLOCK_SIZE
+#define CRYPTO_PROV_MAGIC_CONTAINER DSSENH_MAGIC_CONTAINER
+#define CRYPTO_PROV_REGKEY DSSENH_REGKEY
+
+/******************************************************************************
+ * CRYPTKEY - key objects
+ */
+#define DSSENH_KEYSTATE_IDLE 0
+#define DSSENH_KEYSTATE_ENCRYPTING 1
+#define DSSENH_KEYSTATE_MASTERKEY 2
+typedef struct _DSSENH_SCHANNEL_INFO
+{
+ SCHANNEL_ALG saEncAlg;
+ SCHANNEL_ALG saMACAlg;
+ CRYPT_DATA_BLOB blobClientRandom;
+ CRYPT_DATA_BLOB blobServerRandom;
+} DSSENH_SCHANNEL_INFO;
+#define CRYPTO_PROV_SCHANNEL_INFO DSSENH_SCHANNEL_INFO
+
+/******************************************************************************
+ * KEYCONTAINER - key containers
+ */
+#define DSSENH_PERSONALITY_BASE 0u
+#define DSSENH_PERSONALITY_BASE_DH 1u
+#define DSSENH_PERSONALITY_ENHANCED 2u
+#define DSSENH_PERSONALITY_SCHANNEL 3u
+
+/******************************************************************************
+ * Used by new_key_container to determine the personality via provider name.
+ * The first entry in aProvNamePersonalityPairs should be the default
personality.
+ */
+typedef struct tagPROVNAMEPERSONALITYPAIR
+{
+ LPCSTR pszProvName;
+ DWORD dwPersonality;
+} PROVNAMEPERSONALITYPAIR;
+
+static const DWORD dwNProvNamePersonalityPairs = 0;
+static const PROVNAMEPERSONALITYPAIR aProvNamePersonalityPairs[6] =
+{
+ {"", DSSENH_PERSONALITY_ENHANCED},
+ {MS_DEF_DSS_PROV_A, DSSENH_PERSONALITY_BASE},
+ {MS_DEF_DSS_DH_PROV_A, DSSENH_PERSONALITY_BASE_DH},
+ {MS_DEF_DH_SCHANNEL_PROV_A, DSSENH_PERSONALITY_SCHANNEL}
+};
+
+#endif /* __WINE_CRYPTOPROVCONFIG_H */
diff --git a/dlls/dssenh/dssenh.c b/dlls/dssenh/dssenh.c
index 5dc5464724..a3c8af8f48 100644
--- a/dlls/dssenh/dssenh.c
+++ b/dlls/dssenh/dssenh.c
@@ -21,21 +21,39 @@
#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "wincrypt.h"
+#include "objbase.h"
+#include "rpcproxy.h"
+#include "rsaenh/handle.h"
+#include "rsaenh/cryptoprovutils.h"
#include "wine/debug.h"
+
WINE_DEFAULT_DEBUG_CHANNEL(dssenh);
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+static HINSTANCE instance;
+
+/******************************************************************************
+ * CSP's handle table (used by all acquired key containers)
+ */
+struct handle_table handle_table;
+
+BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID reserved)
{
- TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
+ TRACE("(0x%p, %d, %p)\n", hInstance, fdwReason, reserved);
switch (fdwReason)
{
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(hinstDLL);
+ instance = hInstance;
+ DisableThreadLibraryCalls(hInstance);
+ init_handle_table(&handle_table);
+ break;
+
+ case DLL_PROCESS_DETACH:
+ if (reserved) break;
+ destroy_handle_table(&handle_table);
break;
}
return TRUE;
@@ -46,8 +64,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD
fdwReason, LPVOID lpvReserved)
*/
HRESULT WINAPI DllRegisterServer(void)
{
- FIXME("Not implemented.\n");
- return E_UNEXPECTED;
+ return __wine_register_resources( instance );
}
/*****************************************************
@@ -55,8 +72,63 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
- FIXME("Not implemented.\n");
- return E_UNEXPECTED;
+ return __wine_unregister_resources( instance );
+}
+
+/******************************************************************************
+ * crypt_export_key [Internal]
+ *
+ * Export a key into a binary large object (BLOB). Called by CPExportKey and
+ * by store_key_pair.
+ *
+ * PARAMS
+ * pCryptKey [I] Key to be exported.
+ * hPubKey [I] Key used to encrypt sensitive BLOB data.
+ * dwBlobType [I] SIMPLEBLOB, PUBLICKEYBLOB or PRIVATEKEYBLOB.
+ * dwFlags [I] Currently none defined.
+ * force [I] If TRUE, the key is written no matter what the key's
+ * permissions are. Otherwise the key's permissions are
+ * checked before exporting.
+ * pbData [O] Pointer to a buffer where the BLOB will be written to.
+ * pdwDataLen [I/O] I: Size of buffer at pbData, O: Size of BLOB
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ */
+BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey,
+ DWORD dwBlobType, DWORD dwFlags, BOOL force,
+ BYTE *pbData, DWORD *pdwDataLen)
+{
+ FIXME("stub\n");
+ return FALSE;
+}
+
+/******************************************************************************
+ * import_key [Internal]
+ *
+ * Import a BLOB'ed key into a key container, optionally storing the key's
+ * value to the registry.
+ *
+ * PARAMS
+ * hProv [I] Key container into which the key is to be imported.
+ * pbData [I] Pointer to a buffer which holds the BLOB.
+ * dwDataLen [I] Length of data in buffer at pbData.
+ * hPubKey [I] Key used to decrypt sensitive BLOB data.
+ * dwFlags [I] One of:
+ * CRYPT_EXPORTABLE: the imported key is marked exportable
+ * fStoreKey [I] If TRUE, the imported key is stored to the registry.
+ * phKey [O] Handle to the imported key.
+ *
+ * RETURNS
+ * Success: TRUE.
+ * Failure: FALSE.
+ */
+BOOL import_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD
dwDataLen, HCRYPTKEY hPubKey,
+ DWORD dwFlags, BOOL fStoreKey, HCRYPTKEY *phKey)
+{
+ FIXME("stub\n");
+ return FALSE;
}
/******************************************************************************
@@ -87,8 +159,7 @@ HRESULT WINAPI DllUnregisterServer(void)
BOOL WINAPI DSSENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer,
DWORD dwFlags, PVTableProvStruc pVTable)
{
- FIXME("stub\n");
- return FALSE;
+ return CRYPTO_PROV_CPAcquireContext(phProv, pszContainer,
dwFlags, pVTable);
}
/******************************************************************************
@@ -573,8 +644,7 @@ BOOL WINAPI DSSENH_CPImportKey(HCRYPTPROV hProv,
const BYTE *pbData, DWORD dwDat
*/
BOOL WINAPI DSSENH_CPReleaseContext(HCRYPTPROV hProv, DWORD dwFlags)
{
- FIXME("stub\n");
- return FALSE;
+ return CRYPTO_PROV_CPReleaseContext(hProv, dwFlags);
}
/******************************************************************************
diff --git a/dlls/dssenh/dssenh.rgs b/dlls/dssenh/dssenh.rgs
index 19899cb516..e16d8e0bc7 100644
--- a/dlls/dssenh/dssenh.rgs
+++ b/dlls/dssenh/dssenh.rgs
@@ -16,6 +16,24 @@ HKLM
val 'Signature' = b deadbeef
val 'Type' = d 13
}
+ ForceRemove 'Microsoft Base DSS and
Diffie-Hellman Cryptographic Provider'
+ {
+ val 'Image Path' = s '%MODULE%'
+ val 'Signature' = b deadbeef
+ val 'Type' = d 13
+ }
+ ForceRemove 'Microsoft Base DSS Cryptographic Provider'
+ {
+ val 'Image Path' = s '%MODULE%'
+ val 'Signature' = b deadbeef
+ val 'Type' = d 3
+ }
+ ForceRemove 'Microsoft DH SChannel
Cryptographic Provider'
+ {
+ val 'Image Path' = s '%MODULE%'
+ val 'Signature' = b deadbeef
+ val 'Type' = d 18
+ }
}
NoRemove 'Provider Types'
{
@@ -24,6 +42,16 @@ HKLM
val 'Name' = s 'Microsoft Enhanced DSS
and Diffie-Hellman Cryptographic Provider'
val 'TypeName' = s 'DSS Signature with
Diffe-zhellman Key Exchange'
}
+ ForceRemove 'Type 003'
+ {
+ val 'Name' = s 'Microsoft Base DSS
Cryptographic Provider'
+ val 'TypeName' = s 'DSS Signature'
+ }
+ ForceRemove 'Type 018'
+ {
+ val 'Name' = s 'Microsoft DH SChannel
Cryptographic Provider'
+ val 'TypeName' = s 'Diffie-Hellman SChannel'
+ }
}
}
}
diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in
index 80680d6622..dd8574fcaf 100644
--- a/dlls/rsaenh/Makefile.in
+++ b/dlls/rsaenh/Makefile.in
@@ -13,6 +13,7 @@ C_SRCS = \
rc2.c \
rc4.c \
rsa.c \
- rsaenh.c
+ rsaenh.c \
+ cryptoprovutils.c
RC_SRCS = rsrc.rc
diff --git a/dlls/rsaenh/cryptoprovconfig.h b/dlls/rsaenh/cryptoprovconfig.h
new file mode 100644
index 0000000000..667bb475ac
--- /dev/null
+++ b/dlls/rsaenh/cryptoprovconfig.h
@@ -0,0 +1,88 @@
+/*
+ * dlls/rsaenh/cryptoprovconfig.h
+ * Definitions of some constants used by crypto provider.
+ * It is copied to build dir then included by cryptoprovutils.h,
+ * the build dir comes first in include search paths.
+ * So a new provider implementation only needs to provide its own
+ * cryptoprovconfig.h.
+ *
+ * Copyright 2002 TransGaming Technologies (David Hammerton)
+ * Copyright 2004 Mike McCormack for CodeWeavers
+ * Copyright 2004, 2005 Michael Jung
+ * Copyright 2007 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_CRYPTOPROVCONFIG_H
+#define __WINE_CRYPTOPROVCONFIG_H
+#define RSAENH_MAGIC_KEY 0x73620457u
+#define RSAENH_MAX_KEY_SIZE 64
+#define RSAENH_MAX_BLOCK_SIZE 24
+#define RSAENH_MAGIC_CONTAINER 0x26384993u
+#define RSAENH_REGKEY "Software\\Wine\\Crypto\\RSA\\%s"
+
+#define CRYPTO_PROV_MAGIC_KEY RSAENH_MAGIC_KEY
+#define CRYPTO_PROV_MAX_KEY_SIZE RSAENH_MAX_KEY_SIZE
+#define CRYPTO_PROV_MAX_BLOCK_SIZE RSAENH_MAX_BLOCK_SIZE
+#define CRYPTO_PROV_MAGIC_CONTAINER RSAENH_MAGIC_CONTAINER
+#define CRYPTO_PROV_REGKEY RSAENH_REGKEY
+
+/******************************************************************************
+ * CRYPTKEY - key objects
+ */
+#define RSAENH_KEYSTATE_IDLE 0
+#define RSAENH_KEYSTATE_ENCRYPTING 1
+#define RSAENH_KEYSTATE_MASTERKEY 2
+typedef struct _RSAENH_SCHANNEL_INFO
+{
+ SCHANNEL_ALG saEncAlg;
+ SCHANNEL_ALG saMACAlg;
+ CRYPT_DATA_BLOB blobClientRandom;
+ CRYPT_DATA_BLOB blobServerRandom;
+} RSAENH_SCHANNEL_INFO;
+#define CRYPTO_PROV_SCHANNEL_INFO RSAENH_SCHANNEL_INFO
+
+/******************************************************************************
+ * KEYCONTAINER - key containers
+ */
+#define RSAENH_PERSONALITY_BASE 0u
+#define RSAENH_PERSONALITY_STRONG 1u
+#define RSAENH_PERSONALITY_ENHANCED 2u
+#define RSAENH_PERSONALITY_SCHANNEL 3u
+#define RSAENH_PERSONALITY_AES 4u
+
+/******************************************************************************
+ * Used by new_key_container to determine the personality via provider name.
+ * The first entry in aProvNamePersonalityPairs should be the default
personality.
+ */
+typedef struct tagPROVNAMEPERSONALITYPAIR
+{
+ LPCSTR pszProvName;
+ DWORD dwPersonality;
+} PROVNAMEPERSONALITYPAIR;
+
+static const DWORD dwNProvNamePersonalityPairs = 6;
+static const PROVNAMEPERSONALITYPAIR aProvNamePersonalityPairs[6] =
+{
+ {"", RSAENH_PERSONALITY_STRONG},
+ {MS_DEF_PROV_A, RSAENH_PERSONALITY_BASE},
+ {MS_ENHANCED_PROV_A, RSAENH_PERSONALITY_ENHANCED},
+ {MS_DEF_RSA_SCHANNEL_PROV_A, RSAENH_PERSONALITY_SCHANNEL},
+ {MS_ENH_RSA_AES_PROV_A, RSAENH_PERSONALITY_AES},
+ {MS_ENH_RSA_AES_PROV_XP_A, RSAENH_PERSONALITY_AES}
+};
+
+#endif /* __WINE_CRYPTOPROVCONFIG_H */
diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c
new file mode 100644
index 0000000000..c37c4e7925
--- /dev/null
+++ b/dlls/rsaenh/cryptoprovutils.c
@@ -0,0 +1,649 @@
+/*
+ * dlls/rsaenh/cryptoprovutils.c
+ * Utility functions to implement crypto privider.
+ *
+ * Copyright 2002 TransGaming Technologies (David Hammerton)
+ * Copyright 2004 Mike McCormack for CodeWeavers
+ * Copyright 2004, 2005 Michael Jung
+ * Copyright 2007 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "wincrypt.h"
+#include "handle.h"
+#include "cryptoprovutils.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(crypt);
+extern struct handle_table handle_table;
+
+/******************************************************************************
+ * create_container_key [Internal]
+ *
+ * Creates the registry key for a key container's persistent storage.
+ *
+ * PARAMS
+ * pKeyContainer [I] Pointer to the key container
+ * sam [I] Desired registry access
+ * phKey [O] Returned key
+ */
+BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey)
+{
+ CHAR szBase[sizeof(CRYPTO_PROV_REGKEY) + MAX_PATH];
+ HKEY hRootKey;
+
+ sprintf(szBase, CRYPTO_PROV_REGKEY, pKeyContainer->szName);
+
+ if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET)
+ hRootKey = HKEY_LOCAL_MACHINE;
+ else
+ hRootKey = HKEY_CURRENT_USER;
+
+ /* @@ Wine registry key: HKLM\Software\Wine\Crypto\[CRYPTO_PROV] */
+ /* @@ Wine registry key: HKCU\Software\Wine\Crypto\[CRYPTO_PROV] */
+ return RegCreateKeyExA(hRootKey, szBase, 0, NULL,
+ REG_OPTION_NON_VOLATILE, sam, NULL, phKey, NULL)
+ == ERROR_SUCCESS;
+}
+
+/******************************************************************************
+ * open_container_key [Internal]
+ *
+ * Opens a key container's persistent storage for reading.
+ *
+ * PARAMS
+ * pszContainerName [I] Name of the container to be opened. May be the empty
+ * string if the parent key of all containers is to be
+ * opened.
+ * dwFlags [I] Flags indicating which keyset to be opened.
+ * phKey [O] Returned key
+ */
+BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags,
REGSAM access, HKEY *phKey)
+{
+ CHAR szRegBase[sizeof(CRYPTO_PROV_REGKEY) + MAX_PATH];
+ HKEY hRootKey;
+
+ sprintf(szRegBase, CRYPTO_PROV_REGKEY, pszContainerName);
+
+ if (dwFlags & CRYPT_MACHINE_KEYSET)
+ hRootKey = HKEY_LOCAL_MACHINE;
+ else
+ hRootKey = HKEY_CURRENT_USER;
+
+ /* @@ Wine registry key: HKLM\Software\Wine\Crypto\[CRYPTO_PROV] */
+ /* @@ Wine registry key: HKCU\Software\Wine\Crypto\[CRYPTO_PROV] */
+ return RegOpenKeyExA(hRootKey, szRegBase, 0, access, phKey) ==
+ ERROR_SUCCESS;
+}
+
+/******************************************************************************
+ * delete_container_key [Internal]
+ *
+ * Deletes a key container's persistent storage.
+ *
+ * PARAMS
+ * pszContainerName [I] Name of the container to be opened.
+ * dwFlags [I] Flags indicating which keyset to be opened.
+ */
+static BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags)
+{
+ CHAR szRegKey[sizeof(CRYPTO_PROV_REGKEY) + MAX_PATH];
+ HKEY hRootKey;
+
+ sprintf(szRegKey, CRYPTO_PROV_REGKEY, pszContainerName);
+
+ if (dwFlags & CRYPT_MACHINE_KEYSET)
+ hRootKey = HKEY_LOCAL_MACHINE;
+ else
+ hRootKey = HKEY_CURRENT_USER;
+ if (!RegDeleteKeyA(hRootKey, szRegKey)) {
+ SetLastError(ERROR_SUCCESS);
+ return TRUE;
+ } else {
+ SetLastError(NTE_BAD_KEYSET);
+ return FALSE;
+ }
+}
+
+/******************************************************************************
+ * new_key_container [Internal]
+ *
+ * Create a new key container. The personality of the CSP is determined via
+ * the pVTable->pszProvName string.
+ *
+ * PARAMS
+ * pszContainerName [I] Name of the key container.
+ * pVTable [I] Callback functions and context info provided by the OS
+ *
+ * RETURNS
+ * Success: Handle to the new key container.
+ * Failure: INVALID_HANDLE_VALUE
+ */
+HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags,
const VTableProvStruc *pVTable)
+{
+ KEYCONTAINER *pKeyContainer;
+ HCRYPTPROV hKeyContainer;
+ DWORD i;
+
+ hKeyContainer = new_object(&handle_table, sizeof(KEYCONTAINER),
+ CRYPTO_PROV_MAGIC_CONTAINER, destroy_key_container,
+ (OBJECTHDR**)&pKeyContainer);
+ if (hKeyContainer != (HCRYPTPROV)INVALID_HANDLE_VALUE)
+ {
+ lstrcpynA(pKeyContainer->szName, pszContainerName, MAX_PATH);
+ pKeyContainer->dwFlags = dwFlags;
+ pKeyContainer->dwEnumAlgsCtr = 0;
+ pKeyContainer->hKeyExchangeKeyPair = (HCRYPTKEY)INVALID_HANDLE_VALUE;
+ pKeyContainer->hSignatureKeyPair = (HCRYPTKEY)INVALID_HANDLE_VALUE;
+ if (pVTable && pVTable->pszProvName) {
+ lstrcpynA(pKeyContainer->szProvName,
pVTable->pszProvName, MAX_PATH);
+ pKeyContainer->dwPersonality
+ = aProvNamePersonalityPairs[0].dwPersonality;
+ for (i = 1; i < dwNProvNamePersonalityPairs; i++) {
+ if (!strcmp(pVTable->pszProvName,
+ aProvNamePersonalityPairs[i].pszProvName)) {
+ pKeyContainer->dwPersonality
+ = aProvNamePersonalityPairs[i].dwPersonality;
+ break;
+ }
+ }
+ }
+
+ /* The new key container has to be inserted into the CSP immediately
+ * after creation to be available for CPGetProvParam's
PP_ENUMCONTAINERS. */
+ if (!(dwFlags & CRYPT_VERIFYCONTEXT)) {
+ HKEY hKey;
+
+ if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
+ RegCloseKey(hKey);
+ }
+ }
+
+ return hKeyContainer;
+}
+
+/******************************************************************************
+ * destroy_key_container [Internal]
+ *
+ * Destructor for key containers.
+ *
+ * PARAMS
+ * pObjectHdr [I] Pointer to the key container to be destroyed.
+ */
+void destroy_key_container(OBJECTHDR *pObjectHdr)
+{
+ KEYCONTAINER *pKeyContainer = (KEYCONTAINER*)pObjectHdr;
+
+ if (!(pKeyContainer->dwFlags & CRYPT_VERIFYCONTEXT))
+ {
+ store_key_container_keys(pKeyContainer);
+ store_key_container_permissions(pKeyContainer);
+ release_key_container_keys(pKeyContainer);
+ }
+ else
+ release_key_container_keys(pKeyContainer);
+ HeapFree( GetProcessHeap(), 0, pKeyContainer );
+}
+
+/******************************************************************************
+ * store_key_container_keys [Internal]
+ *
+ * Stores key container's keys in a persistent location.
+ *
+ * PARAMS
+ * pKeyContainer [I] Pointer to the key container whose keys are to be saved
+ */
+void store_key_container_keys(KEYCONTAINER *pKeyContainer)
+{
+ HKEY hKey;
+ DWORD dwFlags;
+
+ /* On WinXP, persistent keys are stored in a file located at:
+ * $AppData$\\Microsoft\\Crypto\\[CRYPTO_PROV]\\$SID$\\some_hex_string
+ */
+
+ if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET)
+ dwFlags = CRYPTPROTECT_LOCAL_MACHINE;
+ else
+ dwFlags = 0;
+
+ if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
+ {
+ store_key_pair(pKeyContainer->hKeyExchangeKeyPair, hKey,
+ AT_KEYEXCHANGE, dwFlags);
+ store_key_pair(pKeyContainer->hSignatureKeyPair, hKey,
+ AT_SIGNATURE, dwFlags);
+ RegCloseKey(hKey);
+ }
+}
+
+/******************************************************************************
+ * store_key_pair [Internal]
+ *
+ * Stores a key pair to the registry
+ *
+ * PARAMS
+ * hCryptKey [I] Handle to the key to be stored
+ * hKey [I] Registry key where the key pair is to be stored
+ * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
+ * dwFlags [I] Flags for protecting the key
+ */
+void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec,
DWORD dwFlags)
+{
+ LPCSTR szValueName;
+ DATA_BLOB blobIn, blobOut;
+ CRYPTKEY *pKey;
+ DWORD dwLen;
+ BYTE *pbKey;
+
+ if (!(szValueName = map_key_spec_to_key_pair_name(dwKeySpec)))
+ return;
+ if (lookup_handle(&handle_table, hCryptKey, CRYPTO_PROV_MAGIC_KEY,
+ (OBJECTHDR**)&pKey))
+ {
+ if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, 0, &dwLen))
+ {
+ pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen);
+ if (pbKey)
+ {
+ if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, pbKey,
+ &dwLen))
+ {
+ blobIn.pbData = pbKey;
+ blobIn.cbData = dwLen;
+
+ if (CryptProtectData(&blobIn, NULL, NULL, NULL, NULL,
+ dwFlags, &blobOut))
+ {
+ RegSetValueExA(hKey, szValueName, 0, REG_BINARY,
+ blobOut.pbData, blobOut.cbData);
+ LocalFree(blobOut.pbData);
+ }
+ }
+ HeapFree(GetProcessHeap(), 0, pbKey);
+ }
+ }
+ }
+}
+
+/******************************************************************************
+ * store_key_container_permissions [Internal]
+ *
+ * Stores key container's key permissions in a persistent location.
+ *
+ * PARAMS
+ * pKeyContainer [I] Pointer to the key container whose key permissions are to
+ * be saved
+ */
+void store_key_container_permissions(KEYCONTAINER *pKeyContainer)
+{
+ HKEY hKey;
+
+ if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
+ {
+ store_key_permissions(pKeyContainer->hKeyExchangeKeyPair, hKey,
+ AT_KEYEXCHANGE);
+ store_key_permissions(pKeyContainer->hSignatureKeyPair, hKey,
+ AT_SIGNATURE);
+ RegCloseKey(hKey);
+ }
+}
+
+/******************************************************************************
+ * store_key_permissions [Internal]
+ *
+ * Stores a key's permissions to the registry
+ *
+ * PARAMS
+ * hCryptKey [I] Handle to the key whose permissions are to be stored
+ * hKey [I] Registry key where the key permissions are to be stored
+ * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
+ */
+void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec)
+{
+ LPCSTR szValueName;
+ CRYPTKEY *pKey;
+
+ if (!(szValueName = map_key_spec_to_permissions_name(dwKeySpec)))
+ return;
+ if (lookup_handle(&handle_table, hCryptKey, CRYPTO_PROV_MAGIC_KEY,
+ (OBJECTHDR**)&pKey))
+ RegSetValueExA(hKey, szValueName, 0, REG_DWORD,
+ (BYTE *)&pKey->dwPermissions,
+ sizeof(pKey->dwPermissions));
+}
+
+/******************************************************************************
+ * release_key_container_keys [Internal]
+ *
+ * Releases key container's keys.
+ *
+ * PARAMS
+ * pKeyContainer [I] Pointer to the key container whose keys are to
be released.
+ */
+void release_key_container_keys(KEYCONTAINER *pKeyContainer)
+{
+ release_handle(&handle_table, pKeyContainer->hKeyExchangeKeyPair,
+ CRYPTO_PROV_MAGIC_KEY);
+ release_handle(&handle_table, pKeyContainer->hSignatureKeyPair,
+ CRYPTO_PROV_MAGIC_KEY);
+}
+
+/******************************************************************************
+ * map_key_spec_to_key_pair_name [Internal]
+ *
+ * Returns the name of the registry value associated with a key spec.
+ *
+ * PARAMS
+ * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
+ *
+ * RETURNS
+ * Success: Name of registry value.
+ * Failure: NULL
+ */
+LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec)
+{
+ LPCSTR szValueName;
+
+ switch (dwKeySpec)
+ {
+ case AT_KEYEXCHANGE:
+ szValueName = "KeyExchangeKeyPair";
+ break;
+ case AT_SIGNATURE:
+ szValueName = "SignatureKeyPair";
+ break;
+ default:
+ WARN("invalid key spec %d\n", dwKeySpec);
+ szValueName = NULL;
+ }
+ return szValueName;
+}
+
+/******************************************************************************
+ * map_key_spec_to_permissions_name [Internal]
+ *
+ * Returns the name of the registry value associated with the permissions for
+ * a key spec.
+ *
+ * PARAMS
+ * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
+ *
+ * RETURNS
+ * Success: Name of registry value.
+ * Failure: NULL
+ */
+LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec)
+{
+ LPCSTR szValueName;
+
+ switch (dwKeySpec)
+ {
+ case AT_KEYEXCHANGE:
+ szValueName = "KeyExchangePermissions";
+ break;
+ case AT_SIGNATURE:
+ szValueName = "SignaturePermissions";
+ break;
+ default:
+ WARN("invalid key spec %d\n", dwKeySpec);
+ szValueName = NULL;
+ }
+ return szValueName;
+}
+
+/******************************************************************************
+ * read_key_value [Internal]
+ *
+ * Reads a key pair value from the registry
+ *
+ * PARAMS
+ * hKeyContainer [I] Crypt provider to use to import the key
+ * hKey [I] Registry key from which to read the key pair
+ * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
+ * dwFlags [I] Flags for unprotecting the key
+ * phCryptKey [O] Returned key
+ */
+static BOOL read_key_value(HCRYPTPROV hKeyContainer, HKEY hKey, DWORD
dwKeySpec, DWORD dwFlags, HCRYPTKEY *phCryptKey)
+{
+ LPCSTR szValueName;
+ DWORD dwValueType, dwLen;
+ BYTE *pbKey;
+ DATA_BLOB blobIn, blobOut;
+ BOOL ret = FALSE;
+
+ if (!(szValueName = map_key_spec_to_key_pair_name(dwKeySpec)))
+ return FALSE;
+ if (RegQueryValueExA(hKey, szValueName, 0, &dwValueType, NULL, &dwLen) ==
+ ERROR_SUCCESS)
+ {
+ pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen);
+ if (pbKey)
+ {
+ if (RegQueryValueExA(hKey, szValueName, 0, &dwValueType,
pbKey, &dwLen) ==
+ ERROR_SUCCESS)
+ {
+ blobIn.pbData = pbKey;
+ blobIn.cbData = dwLen;
+
+ if (CryptUnprotectData(&blobIn, NULL, NULL, NULL, NULL,
+ dwFlags, &blobOut))
+ {
+ ret = import_key(hKeyContainer, blobOut.pbData,
blobOut.cbData, 0, 0,
+ FALSE, phCryptKey);
+ LocalFree(blobOut.pbData);
+ }
+ }
+ HeapFree(GetProcessHeap(), 0, pbKey);
+ }
+ }
+ if (ret)
+ {
+ CRYPTKEY *pKey;
+
+ if (lookup_handle(&handle_table, *phCryptKey, CRYPTO_PROV_MAGIC_KEY,
+ (OBJECTHDR**)&pKey))
+ {
+ if ((szValueName = map_key_spec_to_permissions_name(dwKeySpec)))
+ {
+ dwLen = sizeof(pKey->dwPermissions);
+ RegQueryValueExA(hKey, szValueName, 0, NULL,
+ (BYTE *)&pKey->dwPermissions, &dwLen);
+ }
+ }
+ }
+ return ret;
+}
+
+/******************************************************************************
+ * read_key_container [Internal]
+ *
+ * Tries to read the persistent state of the key container (mainly
the signature
+ * and key exchange private keys) given by pszContainerName.
+ *
+ * PARAMS
+ * pszContainerName [I] Name of the key container to read from the registry
+ * pVTable [I] Pointer to context data provided by the
operating system
+ *
+ * RETURNS
+ * Success: Handle to the key container read from the registry
+ * Failure: INVALID_HANDLE_VALUE
+ */
+static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD
dwFlags, const VTableProvStruc *pVTable)
+{
+ HKEY hKey;
+ KEYCONTAINER *pKeyContainer;
+ HCRYPTPROV hKeyContainer;
+ HCRYPTKEY hCryptKey;
+
+ if (!open_container_key(pszContainerName, dwFlags, KEY_READ, &hKey))
+ {
+ SetLastError(NTE_BAD_KEYSET);
+ return (HCRYPTPROV)INVALID_HANDLE_VALUE;
+ }
+
+ hKeyContainer = new_key_container(pszContainerName, dwFlags, pVTable);
+ if (hKeyContainer != (HCRYPTPROV)INVALID_HANDLE_VALUE)
+ {
+ DWORD dwProtectFlags = (dwFlags & CRYPT_MACHINE_KEYSET) ?
+ CRYPTPROTECT_LOCAL_MACHINE : 0;
+
+ if (!lookup_handle(&handle_table, hKeyContainer,
CRYPTO_PROV_MAGIC_CONTAINER,
+ (OBJECTHDR**)&pKeyContainer))
+ return (HCRYPTPROV)INVALID_HANDLE_VALUE;
+
+ /* read_key_value calls import_key, which calls import_private_key,
+ * which implicitly installs the key value into the appropriate key
+ * container key. Thus the ref count is incremented twice, once for
+ * the output key value, and once for the implicit install, and needs
+ * to be decremented to balance the two.
+ */
+ if (read_key_value(hKeyContainer, hKey, AT_KEYEXCHANGE,
+ dwProtectFlags, &hCryptKey))
+ release_handle(&handle_table, hCryptKey, CRYPTO_PROV_MAGIC_KEY);
+ if (read_key_value(hKeyContainer, hKey, AT_SIGNATURE,
+ dwProtectFlags, &hCryptKey))
+ release_handle(&handle_table, hCryptKey, CRYPTO_PROV_MAGIC_KEY);
+ }
+
+ return hKeyContainer;
+}
+
+/******************************************************************************
+ * CPAcquireContext (CRYPTO_PROV_PFX.@)
+ *
+ * Acquire a handle to the key container specified by pszContainer
+ *
+ * PARAMS
+ * phProv [O] Pointer to the location the acquired handle will
be written to.
+ * pszContainer [I] Name of the desired key container. See Notes
+ * dwFlags [I] Flags. See Notes.
+ * pVTable [I] Pointer to a PVTableProvStruct containing callbacks.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ *
+ * NOTES
+ * If pszContainer is NULL or points to a zero length string the user's login
+ * name will be used as the key container name.
+ *
+ * If the CRYPT_NEW_KEYSET flag is set in dwFlags a new keyset will
be created.
+ * If a keyset with the given name already exists, the function fails and sets
+ * last error to NTE_EXISTS. If CRYPT_NEW_KEYSET is not set and the specified
+ * key container does not exist, function fails and sets last error to
+ * NTE_BAD_KEYSET.
+ */
+BOOL CRYPTO_PROV_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer,
+ DWORD dwFlags, PVTableProvStruc pVTable)
+{
+ CHAR szKeyContainerName[MAX_PATH];
+
+ TRACE("(phProv=%p, pszContainer=%s, dwFlags=%08x, pVTable=%p)\n", phProv,
+ debugstr_a(pszContainer), dwFlags, pVTable);
+
+ if (pszContainer && *pszContainer)
+ {
+ lstrcpynA(szKeyContainerName, pszContainer, MAX_PATH);
+ }
+ else
+ {
+ DWORD dwLen = sizeof(szKeyContainerName);
+ if (!GetUserNameA(szKeyContainerName, &dwLen)) return FALSE;
+ }
+
+ switch (dwFlags & (CRYPT_NEWKEYSET|CRYPT_VERIFYCONTEXT|CRYPT_DELETEKEYSET))
+ {
+ case 0:
+ *phProv = read_key_container(szKeyContainerName, dwFlags, pVTable);
+ break;
+
+ case CRYPT_DELETEKEYSET:
+ return delete_container_key(szKeyContainerName, dwFlags);
+
+ case CRYPT_NEWKEYSET:
+ *phProv = read_key_container(szKeyContainerName, dwFlags, pVTable);
+ if (*phProv != (HCRYPTPROV)INVALID_HANDLE_VALUE)
+ {
+ release_handle(&handle_table, *phProv,
CRYPTO_PROV_MAGIC_CONTAINER);
+ TRACE("Can't create new keyset, already exists\n");
+ SetLastError(NTE_EXISTS);
+ return FALSE;
+ }
+ *phProv = new_key_container(szKeyContainerName, dwFlags, pVTable);
+ break;
+
+ case CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET:
+ case CRYPT_VERIFYCONTEXT:
+ if (pszContainer && *pszContainer) {
+ TRACE("pszContainer should be empty\n");
+ SetLastError(NTE_BAD_FLAGS);
+ return FALSE;
+ }
+ *phProv = new_key_container("", dwFlags, pVTable);
+ break;
+
+ default:
+ *phProv = (HCRYPTPROV)INVALID_HANDLE_VALUE;
+ SetLastError(NTE_BAD_FLAGS);
+ return FALSE;
+ }
+
+ if (*phProv != (HCRYPTPROV)INVALID_HANDLE_VALUE) {
+ SetLastError(ERROR_SUCCESS);
+ return TRUE;
+ } else {
+ return FALSE;
+ }
+}
+
+/******************************************************************************
+ * CPReleaseContext (CRYPTO_PROV.@)
+ *
+ * Release a key container.
+ *
+ * PARAMS
+ * hProv [I] Key container to be released.
+ * dwFlags [I] Currently none defined.
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ */
+BOOL CRYPTO_PROV_CPReleaseContext(HCRYPTPROV hProv, DWORD dwFlags)
+{
+ TRACE("(hProv=%08lx, dwFlags=%08x)\n", hProv, dwFlags);
+
+ if (!release_handle(&handle_table, hProv, CRYPTO_PROV_MAGIC_CONTAINER))
+ {
+ /* MSDN: hProv not containing valid context handle */
+ SetLastError(NTE_BAD_UID);
+ return FALSE;
+ }
+
+ if (dwFlags) {
+ SetLastError(NTE_BAD_FLAGS);
+ return FALSE;
+ }
+
+ return TRUE;
+}
diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h
new file mode 100644
index 0000000000..c4997bb35e
--- /dev/null
+++ b/dlls/rsaenh/cryptoprovutils.h
@@ -0,0 +1,81 @@
+/*
+ * dlls/rsaenh/cryptoprovutils.h
+ * Header of utility functions to implement crypto privider.
+ *
+ * Copyright 2002 TransGaming Technologies (David Hammerton)
+ * Copyright 2004 Mike McCormack for CodeWeavers
+ * Copyright 2004, 2005 Michael Jung
+ * Copyright 2007 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_CRYPTOPROVUTILS_H
+#define __WINE_CRYPTOPROVUTILS_H
+#include <cryptoprovconfig.h>
+#include "implglue.h"
+typedef struct tagKEYCONTAINER
+{
+ OBJECTHDR header;
+ DWORD dwFlags;
+ DWORD dwPersonality;
+ DWORD dwEnumAlgsCtr;
+ DWORD dwEnumContainersCtr;
+ char szName[MAX_PATH];
+ char szProvName[MAX_PATH];
+ HCRYPTKEY hKeyExchangeKeyPair;
+ HCRYPTKEY hSignatureKeyPair;
+} KEYCONTAINER;
+
+typedef struct tagCRYPTKEY
+{
+ OBJECTHDR header;
+ ALG_ID aiAlgid;
+ HCRYPTPROV hProv;
+ DWORD dwMode;
+ DWORD dwModeBits;
+ DWORD dwPermissions;
+ DWORD dwKeyLen;
+ DWORD dwEffectiveKeyLen;
+ DWORD dwSaltLen;
+ DWORD dwBlockLen;
+ DWORD dwState;
+ KEY_CONTEXT context;
+ BYTE abKeyValue[CRYPTO_PROV_MAX_KEY_SIZE];
+ BYTE abInitVector[CRYPTO_PROV_MAX_BLOCK_SIZE];
+ BYTE abChainVector[CRYPTO_PROV_MAX_BLOCK_SIZE];
+ CRYPTO_PROV_SCHANNEL_INFO siSChannelInfo;
+ CRYPT_DATA_BLOB blobHmacKey;
+} CRYPTKEY;
+
+HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags,
const VTableProvStruc *pVTable);
+BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam,
HKEY *phKey);
+void destroy_key_container(OBJECTHDR *pObjectHdr);
+void store_key_container_keys(KEYCONTAINER *pKeyContainer);
+void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec,
DWORD dwFlags);
+void store_key_container_permissions(KEYCONTAINER *pKeyContainer);
+void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec);
+void release_key_container_keys(KEYCONTAINER *pKeyContainer);
+LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec);
+BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey,
+ DWORD dwBlobType, DWORD dwFlags, BOOL force,
+ BYTE *pbData, DWORD *pdwDataLen);
+LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec);
+BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags,
REGSAM access, HKEY *phKey);
+BOOL CRYPTO_PROV_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer,
+ DWORD dwFlags, PVTableProvStruc pVTable);
+BOOL import_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD
dwDataLen, HCRYPTKEY hPubKey,
+ DWORD dwFlags, BOOL fStoreKey, HCRYPTKEY *phKey);
+#endif /* __WINE_CRYPTOPROVUTILS_H */
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index 9119d4be2d..6a746d7b07 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -34,6 +34,7 @@
#include "objbase.h"
#include "rpcproxy.h"
#include "aclapi.h"
+#include "cryptoprovutils.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
@@ -66,67 +67,6 @@ typedef struct tagCRYPTHASH
RSAENH_TLS1PRF_PARAMS tpPRFParams;
} CRYPTHASH;
-/******************************************************************************
- * CRYPTKEY - key objects
- */
-#define RSAENH_MAGIC_KEY 0x73620457u
-#define RSAENH_MAX_KEY_SIZE 64
-#define RSAENH_MAX_BLOCK_SIZE 24
-#define RSAENH_KEYSTATE_IDLE 0
-#define RSAENH_KEYSTATE_ENCRYPTING 1
-#define RSAENH_KEYSTATE_MASTERKEY 2
-typedef struct _RSAENH_SCHANNEL_INFO
-{
- SCHANNEL_ALG saEncAlg;
- SCHANNEL_ALG saMACAlg;
- CRYPT_DATA_BLOB blobClientRandom;
- CRYPT_DATA_BLOB blobServerRandom;
-} RSAENH_SCHANNEL_INFO;
-
-typedef struct tagCRYPTKEY
-{
- OBJECTHDR header;
- ALG_ID aiAlgid;
- HCRYPTPROV hProv;
- DWORD dwMode;
- DWORD dwModeBits;
- DWORD dwPermissions;
- DWORD dwKeyLen;
- DWORD dwEffectiveKeyLen;
- DWORD dwSaltLen;
- DWORD dwBlockLen;
- DWORD dwState;
- KEY_CONTEXT context;
- BYTE abKeyValue[RSAENH_MAX_KEY_SIZE];
- BYTE abInitVector[RSAENH_MAX_BLOCK_SIZE];
- BYTE abChainVector[RSAENH_MAX_BLOCK_SIZE];
- RSAENH_SCHANNEL_INFO siSChannelInfo;
- CRYPT_DATA_BLOB blobHmacKey;
-} CRYPTKEY;
-
-/******************************************************************************
- * KEYCONTAINER - key containers
- */
-#define RSAENH_PERSONALITY_BASE 0u
-#define RSAENH_PERSONALITY_STRONG 1u
-#define RSAENH_PERSONALITY_ENHANCED 2u
-#define RSAENH_PERSONALITY_SCHANNEL 3u
-#define RSAENH_PERSONALITY_AES 4u
-
-#define RSAENH_MAGIC_CONTAINER 0x26384993u
-typedef struct tagKEYCONTAINER
-{
- OBJECTHDR header;
- DWORD dwFlags;
- DWORD dwPersonality;
- DWORD dwEnumAlgsCtr;
- DWORD dwEnumContainersCtr;
- CHAR szName[MAX_PATH];
- CHAR szProvName[MAX_PATH];
- HCRYPTKEY hKeyExchangeKeyPair;
- HCRYPTKEY hSignatureKeyPair;
-} KEYCONTAINER;
-
/******************************************************************************
* Some magic constants
*/
@@ -149,7 +89,6 @@ typedef struct tagKEYCONTAINER
#define RSAENH_SSL3_VERSION_MINOR 0
#define RSAENH_TLS1_VERSION_MAJOR 3
#define RSAENH_TLS1_VERSION_MINOR 1
-#define RSAENH_REGKEY "Software\\Wine\\Crypto\\RSA\\%s"
#define RSAENH_MIN(a,b) ((a)<(b)?(a):(b))
/******************************************************************************
@@ -316,26 +255,6 @@ RSAENH_CPDestroyHash(
HCRYPTHASH hHash
);
-static BOOL crypt_export_key(
- CRYPTKEY *pCryptKey,
- HCRYPTKEY hPubKey,
- DWORD dwBlobType,
- DWORD dwFlags,
- BOOL force,
- BYTE *pbData,
- DWORD *pdwDataLen
-);
-
-static BOOL import_key(
- HCRYPTPROV hProv,
- const BYTE *pbData,
- DWORD dwDataLen,
- HCRYPTKEY hPubKey,
- DWORD dwFlags,
- BOOL fStoreKey,
- HCRYPTKEY *phKey
-);
-
BOOL WINAPI
RSAENH_CPHashData(
HCRYPTPROV hProv,
@@ -348,7 +267,7 @@ RSAENH_CPHashData(
/******************************************************************************
* CSP's handle table (used by all acquired key containers)
*/
-static struct handle_table handle_table;
+struct handle_table handle_table;
/******************************************************************************
* DllMain (RSAENH.@)
@@ -933,498 +852,6 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv,
ALG_ID aiAlgid, DWORD dwFlags, CRYPTK
return hCryptKey;
}
-/******************************************************************************
- * map_key_spec_to_key_pair_name [Internal]
- *
- * Returns the name of the registry value associated with a key spec.
- *
- * PARAMS
- * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
- *
- * RETURNS
- * Success: Name of registry value.
- * Failure: NULL
- */
-static LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec)
-{
- LPCSTR szValueName;
-
- switch (dwKeySpec)
- {
- case AT_KEYEXCHANGE:
- szValueName = "KeyExchangeKeyPair";
- break;
- case AT_SIGNATURE:
- szValueName = "SignatureKeyPair";
- break;
- default:
- WARN("invalid key spec %d\n", dwKeySpec);
- szValueName = NULL;
- }
- return szValueName;
-}
-
-/******************************************************************************
- * store_key_pair [Internal]
- *
- * Stores a key pair to the registry
- *
- * PARAMS
- * hCryptKey [I] Handle to the key to be stored
- * hKey [I] Registry key where the key pair is to be stored
- * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
- * dwFlags [I] Flags for protecting the key
- */
-static void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD
dwKeySpec, DWORD dwFlags)
-{
- LPCSTR szValueName;
- DATA_BLOB blobIn, blobOut;
- CRYPTKEY *pKey;
- DWORD dwLen;
- BYTE *pbKey;
-
- if (!(szValueName = map_key_spec_to_key_pair_name(dwKeySpec)))
- return;
- if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY,
- (OBJECTHDR**)&pKey))
- {
- if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, 0, &dwLen))
- {
- pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen);
- if (pbKey)
- {
- if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, pbKey,
- &dwLen))
- {
- blobIn.pbData = pbKey;
- blobIn.cbData = dwLen;
-
- if (CryptProtectData(&blobIn, NULL, NULL, NULL, NULL,
- dwFlags, &blobOut))
- {
- RegSetValueExA(hKey, szValueName, 0, REG_BINARY,
- blobOut.pbData, blobOut.cbData);
- LocalFree(blobOut.pbData);
- }
- }
- HeapFree(GetProcessHeap(), 0, pbKey);
- }
- }
- }
-}
-
-/******************************************************************************
- * map_key_spec_to_permissions_name [Internal]
- *
- * Returns the name of the registry value associated with the permissions for
- * a key spec.
- *
- * PARAMS
- * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
- *
- * RETURNS
- * Success: Name of registry value.
- * Failure: NULL
- */
-static LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec)
-{
- LPCSTR szValueName;
-
- switch (dwKeySpec)
- {
- case AT_KEYEXCHANGE:
- szValueName = "KeyExchangePermissions";
- break;
- case AT_SIGNATURE:
- szValueName = "SignaturePermissions";
- break;
- default:
- WARN("invalid key spec %d\n", dwKeySpec);
- szValueName = NULL;
- }
- return szValueName;
-}
-
-/******************************************************************************
- * store_key_permissions [Internal]
- *
- * Stores a key's permissions to the registry
- *
- * PARAMS
- * hCryptKey [I] Handle to the key whose permissions are to be stored
- * hKey [I] Registry key where the key permissions are to be stored
- * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
- */
-static void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey,
DWORD dwKeySpec)
-{
- LPCSTR szValueName;
- CRYPTKEY *pKey;
-
- if (!(szValueName = map_key_spec_to_permissions_name(dwKeySpec)))
- return;
- if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY,
- (OBJECTHDR**)&pKey))
- RegSetValueExA(hKey, szValueName, 0, REG_DWORD,
- (BYTE *)&pKey->dwPermissions,
- sizeof(pKey->dwPermissions));
-}
-
-/******************************************************************************
- * create_container_key [Internal]
- *
- * Creates the registry key for a key container's persistent storage.
- *
- * PARAMS
- * pKeyContainer [I] Pointer to the key container
- * sam [I] Desired registry access
- * phKey [O] Returned key
- */
-static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM
sam, HKEY *phKey)
-{
- CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH];
- HKEY hRootKey;
-
- sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName);
-
- if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET)
- hRootKey = HKEY_LOCAL_MACHINE;
- else
- hRootKey = HKEY_CURRENT_USER;
-
- /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */
- /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */
- return RegCreateKeyExA(hRootKey, szRSABase, 0, NULL,
- REG_OPTION_NON_VOLATILE, sam, NULL, phKey, NULL)
- == ERROR_SUCCESS;
-}
-
-/******************************************************************************
- * open_container_key [Internal]
- *
- * Opens a key container's persistent storage for reading.
- *
- * PARAMS
- * pszContainerName [I] Name of the container to be opened. May be the empty
- * string if the parent key of all containers is to be
- * opened.
- * dwFlags [I] Flags indicating which keyset to be opened.
- * phKey [O] Returned key
- */
-static BOOL open_container_key(LPCSTR pszContainerName, DWORD
dwFlags, REGSAM access, HKEY *phKey)
-{
- CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH];
- HKEY hRootKey;
-
- sprintf(szRSABase, RSAENH_REGKEY, pszContainerName);
-
- if (dwFlags & CRYPT_MACHINE_KEYSET)
- hRootKey = HKEY_LOCAL_MACHINE;
- else
- hRootKey = HKEY_CURRENT_USER;
-
- /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */
- /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */
- return RegOpenKeyExA(hRootKey, szRSABase, 0, access, phKey) ==
- ERROR_SUCCESS;
-}
-
-/******************************************************************************
- * delete_container_key [Internal]
- *
- * Deletes a key container's persistent storage.
- *
- * PARAMS
- * pszContainerName [I] Name of the container to be opened.
- * dwFlags [I] Flags indicating which keyset to be opened.
- */
-static BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags)
-{
- CHAR szRegKey[sizeof(RSAENH_REGKEY) + MAX_PATH];
- HKEY hRootKey;
-
- sprintf(szRegKey, RSAENH_REGKEY, pszContainerName);
-
- if (dwFlags & CRYPT_MACHINE_KEYSET)
- hRootKey = HKEY_LOCAL_MACHINE;
- else
- hRootKey = HKEY_CURRENT_USER;
- if (!RegDeleteKeyA(hRootKey, szRegKey)) {
- SetLastError(ERROR_SUCCESS);
- return TRUE;
- } else {
- SetLastError(NTE_BAD_KEYSET);
- return FALSE;
- }
-}
-
-/******************************************************************************
- * store_key_container_keys [Internal]
- *
- * Stores key container's keys in a persistent location.
- *
- * PARAMS
- * pKeyContainer [I] Pointer to the key container whose keys are to be saved
- */
-static void store_key_container_keys(KEYCONTAINER *pKeyContainer)
-{
- HKEY hKey;
- DWORD dwFlags;
-
- /* On WinXP, persistent keys are stored in a file located at:
- * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string
- */
-
- if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET)
- dwFlags = CRYPTPROTECT_LOCAL_MACHINE;
- else
- dwFlags = 0;
-
- if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
- {
- store_key_pair(pKeyContainer->hKeyExchangeKeyPair, hKey,
- AT_KEYEXCHANGE, dwFlags);
- store_key_pair(pKeyContainer->hSignatureKeyPair, hKey,
- AT_SIGNATURE, dwFlags);
- RegCloseKey(hKey);
- }
-}
-
-/******************************************************************************
- * store_key_container_permissions [Internal]
- *
- * Stores key container's key permissions in a persistent location.
- *
- * PARAMS
- * pKeyContainer [I] Pointer to the key container whose key permissions are to
- * be saved
- */
-static void store_key_container_permissions(KEYCONTAINER *pKeyContainer)
-{
- HKEY hKey;
-
- if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
- {
- store_key_permissions(pKeyContainer->hKeyExchangeKeyPair, hKey,
- AT_KEYEXCHANGE);
- store_key_permissions(pKeyContainer->hSignatureKeyPair, hKey,
- AT_SIGNATURE);
- RegCloseKey(hKey);
- }
-}
-
-/******************************************************************************
- * release_key_container_keys [Internal]
- *
- * Releases key container's keys.
- *
- * PARAMS
- * pKeyContainer [I] Pointer to the key container whose keys are to
be released.
- */
-static void release_key_container_keys(KEYCONTAINER *pKeyContainer)
-{
- release_handle(&handle_table, pKeyContainer->hKeyExchangeKeyPair,
- RSAENH_MAGIC_KEY);
- release_handle(&handle_table, pKeyContainer->hSignatureKeyPair,
- RSAENH_MAGIC_KEY);
-}
-
-/******************************************************************************
- * destroy_key_container [Internal]
- *
- * Destructor for key containers.
- *
- * PARAMS
- * pObjectHdr [I] Pointer to the key container to be destroyed.
- */
-static void destroy_key_container(OBJECTHDR *pObjectHdr)
-{
- KEYCONTAINER *pKeyContainer = (KEYCONTAINER*)pObjectHdr;
-
- if (!(pKeyContainer->dwFlags & CRYPT_VERIFYCONTEXT))
- {
- store_key_container_keys(pKeyContainer);
- store_key_container_permissions(pKeyContainer);
- release_key_container_keys(pKeyContainer);
- }
- else
- release_key_container_keys(pKeyContainer);
- HeapFree( GetProcessHeap(), 0, pKeyContainer );
-}
-
-/******************************************************************************
- * new_key_container [Internal]
- *
- * Create a new key container. The personality (RSA Base, Strong or
Enhanced CP)
- * of the CSP is determined via the pVTable->pszProvName string.
- *
- * PARAMS
- * pszContainerName [I] Name of the key container.
- * pVTable [I] Callback functions and context info provided by the OS
- *
- * RETURNS
- * Success: Handle to the new key container.
- * Failure: INVALID_HANDLE_VALUE
- */
-static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD
dwFlags, const VTableProvStruc *pVTable)
-{
- KEYCONTAINER *pKeyContainer;
- HCRYPTPROV hKeyContainer;
-
- hKeyContainer = new_object(&handle_table, sizeof(KEYCONTAINER),
RSAENH_MAGIC_CONTAINER,
- destroy_key_container,
(OBJECTHDR**)&pKeyContainer);
- if (hKeyContainer != (HCRYPTPROV)INVALID_HANDLE_VALUE)
- {
- lstrcpynA(pKeyContainer->szName, pszContainerName, MAX_PATH);
- pKeyContainer->dwFlags = dwFlags;
- pKeyContainer->dwEnumAlgsCtr = 0;
- pKeyContainer->hKeyExchangeKeyPair = (HCRYPTKEY)INVALID_HANDLE_VALUE;
- pKeyContainer->hSignatureKeyPair = (HCRYPTKEY)INVALID_HANDLE_VALUE;
- if (pVTable && pVTable->pszProvName) {
- lstrcpynA(pKeyContainer->szProvName,
pVTable->pszProvName, MAX_PATH);
- if (!strcmp(pVTable->pszProvName, MS_DEF_PROV_A)) {
- pKeyContainer->dwPersonality = RSAENH_PERSONALITY_BASE;
- } else if (!strcmp(pVTable->pszProvName, MS_ENHANCED_PROV_A)) {
- pKeyContainer->dwPersonality = RSAENH_PERSONALITY_ENHANCED;
- } else if (!strcmp(pVTable->pszProvName,
MS_DEF_RSA_SCHANNEL_PROV_A)) {
- pKeyContainer->dwPersonality = RSAENH_PERSONALITY_SCHANNEL;
- } else if (!strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_A) ||
- !strcmp(pVTable->pszProvName,
MS_ENH_RSA_AES_PROV_XP_A)) {
- pKeyContainer->dwPersonality = RSAENH_PERSONALITY_AES;
- } else {
- pKeyContainer->dwPersonality = RSAENH_PERSONALITY_STRONG;
- }
- }
-
- /* The new key container has to be inserted into the CSP immediately
- * after creation to be available for CPGetProvParam's
PP_ENUMCONTAINERS. */
- if (!(dwFlags & CRYPT_VERIFYCONTEXT)) {
- HKEY hKey;
-
- if (create_container_key(pKeyContainer, KEY_WRITE, &hKey))
- RegCloseKey(hKey);
- }
- }
-
- return hKeyContainer;
-}
-
-/******************************************************************************
- * read_key_value [Internal]
- *
- * Reads a key pair value from the registry
- *
- * PARAMS
- * hKeyContainer [I] Crypt provider to use to import the key
- * hKey [I] Registry key from which to read the key pair
- * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE
- * dwFlags [I] Flags for unprotecting the key
- * phCryptKey [O] Returned key
- */
-static BOOL read_key_value(HCRYPTPROV hKeyContainer, HKEY hKey, DWORD
dwKeySpec, DWORD dwFlags, HCRYPTKEY *phCryptKey)
-{
- LPCSTR szValueName;
- DWORD dwValueType, dwLen;
- BYTE *pbKey;
- DATA_BLOB blobIn, blobOut;
- BOOL ret = FALSE;
-
- if (!(szValueName = map_key_spec_to_key_pair_name(dwKeySpec)))
- return FALSE;
- if (RegQueryValueExA(hKey, szValueName, 0, &dwValueType, NULL, &dwLen) ==
- ERROR_SUCCESS)
- {
- pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen);
- if (pbKey)
- {
- if (RegQueryValueExA(hKey, szValueName, 0, &dwValueType,
pbKey, &dwLen) ==
- ERROR_SUCCESS)
- {
- blobIn.pbData = pbKey;
- blobIn.cbData = dwLen;
-
- if (CryptUnprotectData(&blobIn, NULL, NULL, NULL, NULL,
- dwFlags, &blobOut))
- {
- ret = import_key(hKeyContainer, blobOut.pbData,
blobOut.cbData, 0, 0,
- FALSE, phCryptKey);
- LocalFree(blobOut.pbData);
- }
- }
- HeapFree(GetProcessHeap(), 0, pbKey);
- }
- }
- if (ret)
- {
- CRYPTKEY *pKey;
-
- if (lookup_handle(&handle_table, *phCryptKey, RSAENH_MAGIC_KEY,
- (OBJECTHDR**)&pKey))
- {
- if ((szValueName = map_key_spec_to_permissions_name(dwKeySpec)))
- {
- dwLen = sizeof(pKey->dwPermissions);
- RegQueryValueExA(hKey, szValueName, 0, NULL,
- (BYTE *)&pKey->dwPermissions, &dwLen);
- }
- }
- }
- return ret;
-}
-
-/******************************************************************************
- * read_key_container [Internal]
- *
- * Tries to read the persistent state of the key container (mainly
the signature
- * and key exchange private keys) given by pszContainerName.
- *
- * PARAMS
- * pszContainerName [I] Name of the key container to read from the registry
- * pVTable [I] Pointer to context data provided by the
operating system
- *
- * RETURNS
- * Success: Handle to the key container read from the registry
- * Failure: INVALID_HANDLE_VALUE
- */
-static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD
dwFlags, const VTableProvStruc *pVTable)
-{
- HKEY hKey;
- KEYCONTAINER *pKeyContainer;
- HCRYPTPROV hKeyContainer;
- HCRYPTKEY hCryptKey;
-
- if (!open_container_key(pszContainerName, dwFlags, KEY_READ, &hKey))
- {
- SetLastError(NTE_BAD_KEYSET);
- return (HCRYPTPROV)INVALID_HANDLE_VALUE;
- }
-
- hKeyContainer = new_key_container(pszContainerName, dwFlags, pVTable);
- if (hKeyContainer != (HCRYPTPROV)INVALID_HANDLE_VALUE)
- {
- DWORD dwProtectFlags = (dwFlags & CRYPT_MACHINE_KEYSET) ?
- CRYPTPROTECT_LOCAL_MACHINE : 0;
-
- if (!lookup_handle(&handle_table, hKeyContainer,
RSAENH_MAGIC_CONTAINER,
- (OBJECTHDR**)&pKeyContainer))
- return (HCRYPTPROV)INVALID_HANDLE_VALUE;
-
- /* read_key_value calls import_key, which calls import_private_key,
- * which implicitly installs the key value into the appropriate key
- * container key. Thus the ref count is incremented twice, once for
- * the output key value, and once for the implicit install, and needs
- * to be decremented to balance the two.
- */
- if (read_key_value(hKeyContainer, hKey, AT_KEYEXCHANGE,
- dwProtectFlags, &hCryptKey))
- release_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY);
- if (read_key_value(hKeyContainer, hKey, AT_SIGNATURE,
- dwProtectFlags, &hCryptKey))
- release_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY);
- }
-
- return hKeyContainer;
-}
-
/******************************************************************************
* build_hash_signature [Internal]
*
@@ -2073,64 +1500,7 @@ static BOOL unpad_data(HCRYPTPROV hProv, const
BYTE *abData, DWORD dwDataLen, BY
BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer,
DWORD dwFlags, PVTableProvStruc pVTable)
{
- CHAR szKeyContainerName[MAX_PATH];
-
- TRACE("(phProv=%p, pszContainer=%s, dwFlags=%08x, pVTable=%p)\n", phProv,
- debugstr_a(pszContainer), dwFlags, pVTable);
-
- if (pszContainer && *pszContainer)
- {
- lstrcpynA(szKeyContainerName, pszContainer, MAX_PATH);
- }
- else
- {
- DWORD dwLen = sizeof(szKeyContainerName);
- if (!GetUserNameA(szKeyContainerName, &dwLen)) return FALSE;
- }
-
- switch (dwFlags & (CRYPT_NEWKEYSET|CRYPT_VERIFYCONTEXT|CRYPT_DELETEKEYSET))
- {
- case 0:
- *phProv = read_key_container(szKeyContainerName, dwFlags, pVTable);
- break;
-
- case CRYPT_DELETEKEYSET:
- return delete_container_key(szKeyContainerName, dwFlags);
-
- case CRYPT_NEWKEYSET:
- *phProv = read_key_container(szKeyContainerName, dwFlags, pVTable);
- if (*phProv != (HCRYPTPROV)INVALID_HANDLE_VALUE)
- {
- release_handle(&handle_table, *phProv, RSAENH_MAGIC_CONTAINER);
- TRACE("Can't create new keyset, already exists\n");
- SetLastError(NTE_EXISTS);
- return FALSE;
- }
- *phProv = new_key_container(szKeyContainerName, dwFlags, pVTable);
- break;
-
- case CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET:
- case CRYPT_VERIFYCONTEXT:
- if (pszContainer && *pszContainer) {
- TRACE("pszContainer should be empty\n");
- SetLastError(NTE_BAD_FLAGS);
- return FALSE;
- }
- *phProv = new_key_container("", dwFlags, pVTable);
- break;
-
- default:
- *phProv = (HCRYPTPROV)INVALID_HANDLE_VALUE;
- SetLastError(NTE_BAD_FLAGS);
- return FALSE;
- }
-
- if (*phProv != (HCRYPTPROV)INVALID_HANDLE_VALUE) {
- SetLastError(ERROR_SUCCESS);
- return TRUE;
- } else {
- return FALSE;
- }
+ return CRYPTO_PROV_CPAcquireContext(phProv, pszContainer,
dwFlags, pVTable);
}
/******************************************************************************
@@ -2906,7 +2276,7 @@ static BOOL crypt_export_plaintext_key(CRYPTKEY
*pCryptKey, BYTE *pbData,
* Success: TRUE.
* Failure: FALSE.
*/
-static BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey,
+BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey,
DWORD dwBlobType, DWORD dwFlags, BOOL force,
BYTE *pbData, DWORD *pdwDataLen)
{
@@ -3351,7 +2721,7 @@ static BOOL import_plaintext_key(HCRYPTPROV
hProv, const BYTE *pbData, DWORD dwD
* Success: TRUE.
* Failure: FALSE.
*/
-static BOOL import_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD
dwDataLen, HCRYPTKEY hPubKey,
+BOOL import_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD
dwDataLen, HCRYPTKEY hPubKey,
DWORD dwFlags, BOOL fStoreKey, HCRYPTKEY *phKey)
{
KEYCONTAINER *pKeyContainer;
@@ -4549,21 +3919,7 @@ BOOL WINAPI RSAENH_CPHashSessionKey(HCRYPTPROV
hProv, HCRYPTHASH hHash, HCRYPTKE
*/
BOOL WINAPI RSAENH_CPReleaseContext(HCRYPTPROV hProv, DWORD dwFlags)
{
- TRACE("(hProv=%08lx, dwFlags=%08x)\n", hProv, dwFlags);
-
- if (!release_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER))
- {
- /* MSDN: hProv not containing valid context handle */
- SetLastError(NTE_BAD_UID);
- return FALSE;
- }
-
- if (dwFlags) {
- SetLastError(NTE_BAD_FLAGS);
- return FALSE;
- }
-
- return TRUE;
+ return CRYPTO_PROV_CPReleaseContext(hProv, dwFlags);
}
/******************************************************************************
--
2.21.0
2
1
With some tablet configurations, the InExt value passed to
ScaleForContext can be very large, leading to an integer overflow. Using
MulDiv prevents this problem by internally using 64-bit math.
---
dlls/wintab32/context.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c
index 0514dd78b4..ff9a4ca677 100644
--- a/dlls/wintab32/context.c
+++ b/dlls/wintab32/context.c
@@ -178,9 +178,9 @@ int TABLET_PostTabletMessage(LPOPENCONTEXT
newcontext, UINT msg, WPARAM wParam,
static inline DWORD ScaleForContext(DWORD In, LONG InOrg, LONG InExt,
LONG OutOrg, LONG OutExt)
{
if (((InExt > 0 )&&(OutExt > 0)) || ((InExt<0) && (OutExt < 0)))
- return ((In - InOrg) * abs(OutExt) / abs(InExt)) + OutOrg;
+ return MulDiv(In - InOrg, abs(OutExt), abs(InExt)) + OutOrg;
else
- return ((abs(InExt) - (In - InOrg))*abs(OutExt) / abs(InExt)) + OutOrg;
+ return MulDiv(abs(InExt) - (In - InOrg), abs(OutExt),
abs(InExt)) + OutOrg;
}
LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd)
--
2.23.0
2
1
Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com>
---
dlls/sapi/Makefile.in | 3 +-
dlls/sapi/main.c | 3 +
dlls/sapi/sapi_classes.idl | 13 ++
dlls/sapi/sapi_private.h | 1 +
dlls/sapi/tests/Makefile.in | 3 +-
dlls/sapi/tests/tts.c | 71 +++++++
dlls/sapi/tts.c | 414 ++++++++++++++++++++++++++++++++++++
include/sapi.idl | 11 +-
8 files changed, 516 insertions(+), 3 deletions(-)
create mode 100644 dlls/sapi/tests/tts.c
create mode 100644 dlls/sapi/tts.c
diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in
index 94e21bdd52..640c56223d 100644
--- a/dlls/sapi/Makefile.in
+++ b/dlls/sapi/Makefile.in
@@ -5,7 +5,8 @@ EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
main.c \
- token.c
+ token.c \
+ tts.c
IDL_SRCS = \
sapi_classes.idl \
diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c
index f86fee25ca..ce51c37483 100644
--- a/dlls/sapi/main.c
+++ b/dlls/sapi/main.c
@@ -106,6 +106,7 @@ static const struct IClassFactoryVtbl class_factory_vtbl =
};
static struct class_factory data_key_cf = { { &class_factory_vtbl }, data_key_create };
+static struct class_factory speech_voice_cf = { { &class_factory_vtbl }, speech_voice_create };
static struct class_factory token_category_cf = { { &class_factory_vtbl }, token_category_create };
static struct class_factory token_enum_cf = { { &class_factory_vtbl }, token_enum_create };
@@ -124,6 +125,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj )
cf = &token_category_cf.IClassFactory_iface;
else if (IsEqualCLSID( clsid, &CLSID_SpObjectTokenEnum ))
cf = &token_enum_cf.IClassFactory_iface;
+ else if (IsEqualCLSID( clsid, &CLSID_SpVoice ))
+ cf = &speech_voice_cf.IClassFactory_iface;
if (!cf) return CLASS_E_CLASSNOTAVAILABLE;
diff --git a/dlls/sapi/sapi_classes.idl b/dlls/sapi/sapi_classes.idl
index 40886f5974..dbb08c9ae2 100644
--- a/dlls/sapi/sapi_classes.idl
+++ b/dlls/sapi/sapi_classes.idl
@@ -50,3 +50,16 @@ coclass SpObjectTokenEnum
interface ISpObjectTokenEnumBuilder;
[default] interface IEnumSpObjectTokens;
}
+
+[
+ uuid(96749377-3391-11d2-9ee3-00c04f797396),
+ helpstring("Speech Voice"),
+ progid("SAPI.SpVoice.1"),
+ vi_progid("SAPI.SpVoice"),
+ threading(both)
+]
+coclass SpVoice
+{
+ interface ISpVoice;
+ [default] interface ISpeechVoice;
+}
diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h
index 1f89672242..8db4b47bbd 100644
--- a/dlls/sapi/sapi_private.h
+++ b/dlls/sapi/sapi_private.h
@@ -21,6 +21,7 @@
#include "wine/heap.h"
HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
+HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
diff --git a/dlls/sapi/tests/Makefile.in b/dlls/sapi/tests/Makefile.in
index bf924d7ed9..bb89e0d8e0 100644
--- a/dlls/sapi/tests/Makefile.in
+++ b/dlls/sapi/tests/Makefile.in
@@ -2,4 +2,5 @@ TESTDLL = sapi.dll
IMPORTS = ole32 user32 advapi32
C_SRCS = \
- token.c
+ token.c \
+ tts.c
diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
new file mode 100644
index 0000000000..8d13ed0053
--- /dev/null
+++ b/dlls/sapi/tests/tts.c
@@ -0,0 +1,71 @@
+/*
+ * Speech API (SAPI) text-to-speech tests.
+ *
+ * Copyright 2019 Jactry Zeng for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define COBJMACROS
+
+#include "sapiddk.h"
+#include "sperror.h"
+
+#include "wine/test.h"
+
+#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__)
+static void _expect_ref(IUnknown *obj, ULONG ref, int line)
+{
+ ULONG rc;
+ IUnknown_AddRef(obj);
+ rc = IUnknown_Release(obj);
+ ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref);
+}
+
+static void test_interfaces(void)
+{
+ ISpeechVoice *speech_voice;
+ IDispatch *dispatch;
+ IUnknown *unk;
+ HRESULT hr;
+
+ hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER,
+ &IID_ISpeechVoice, (void **)&speech_voice);
+ ok(hr == S_OK, "Failed to create ISpVoice interface: %#x.\n", hr);
+ EXPECT_REF(speech_voice, 1);
+
+ hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IDispatch, (void **)&dispatch);
+ ok(hr == S_OK, "Failed to create IDispatch interface: %#x.\n", hr);
+ EXPECT_REF(dispatch, 1);
+ EXPECT_REF(speech_voice, 1);
+ IDispatch_Release(dispatch);
+
+ hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IUnknown, (void **)&unk);
+ ok(hr == S_OK, "Failed to create IUnknown interface: %#x.\n", hr);
+ EXPECT_REF(unk, 1);
+ EXPECT_REF(speech_voice, 1);
+ IUnknown_Release(unk);
+
+ ISpeechVoice_Release(speech_voice);
+}
+
+START_TEST(tts)
+{
+ CoInitialize(NULL);
+ test_interfaces();
+ CoUninitialize();
+}
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
new file mode 100644
index 0000000000..4000db11f5
--- /dev/null
+++ b/dlls/sapi/tts.c
@@ -0,0 +1,414 @@
+/*
+ * Speech API (SAPI) text-to-speech implementation.
+ *
+ * Copyright 2019 Jactry Zeng for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "objbase.h"
+
+#include "sapiddk.h"
+
+#include "wine/debug.h"
+
+#include "sapi_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(sapi);
+
+struct speech_voice
+{
+ ISpeechVoice ISpeechVoice_iface;
+ LONG ref;
+};
+
+static inline struct speech_voice *impl_from_ISpeechVoice(ISpeechVoice *iface)
+{
+ return CONTAINING_RECORD(iface, struct speech_voice, ISpeechVoice_iface);
+}
+
+/* ISpeechVoice interface */
+static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj)
+{
+ struct speech_voice *This = impl_from_ISpeechVoice(iface);
+
+ TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj);
+
+ if (IsEqualIID(iid, &IID_IUnknown) ||
+ IsEqualIID(iid, &IID_IDispatch) ||
+ IsEqualIID(iid, &IID_ISpeechVoice))
+ *obj = &This->ISpeechVoice_iface;
+ else
+ {
+ *obj = NULL;
+ FIXME("interface %s not implemented.\n", debugstr_guid(iid));
+ return E_NOINTERFACE;
+ }
+
+ IUnknown_AddRef((IUnknown *)*obj);
+ return S_OK;
+}
+
+static ULONG WINAPI speech_voice_AddRef(ISpeechVoice *iface)
+{
+ struct speech_voice *This = impl_from_ISpeechVoice(iface);
+ ULONG ref = InterlockedIncrement(&This->ref);
+
+ TRACE("(%p): ref=%u.\n", iface, ref);
+
+ return ref;
+}
+
+static ULONG WINAPI speech_voice_Release(ISpeechVoice *iface)
+{
+ struct speech_voice *This = impl_from_ISpeechVoice(iface);
+ ULONG ref = InterlockedDecrement(&This->ref);
+
+ TRACE("(%p): ref=%u.\n", iface, ref);
+
+ if (!ref)
+ {
+ heap_free(This);
+ }
+
+ return ref;
+}
+
+static HRESULT WINAPI speech_voice_GetTypeInfoCount(ISpeechVoice *iface, UINT *info)
+{
+ FIXME("(%p, %p): stub.\n", iface, info);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT info, LCID lcid,
+ ITypeInfo **type_info)
+{
+ FIXME("(%p, %u, %u, %p): stub.\n", iface, info, lcid, type_info);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_GetIDsOfNames(ISpeechVoice *iface, REFIID riid, LPOLESTR *names,
+ UINT count, LCID lcid, DISPID *dispid)
+{
+ FIXME("(%p, %s, %p, %u, %u, %p): stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_Invoke(ISpeechVoice *iface, DISPID dispid, REFIID riid, LCID lcid,
+ WORD flags, DISPPARAMS *params, VARIANT *result,
+ EXCEPINFO *excepinfo, UINT *argerr)
+{
+ FIXME("(%p, %d, %s, %#x, %#x, %p, %p, %p, %p): stub.\n", iface, dispid, debugstr_guid(riid),
+ lcid, flags, params, result, excepinfo, argerr);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_Status(ISpeechVoice *iface, ISpeechVoiceStatus **status)
+{
+ FIXME("(%p, %p): stub.\n", iface, status);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_Voice(ISpeechVoice *iface, ISpeechObjectToken **voice)
+{
+ FIXME("(%p, %p): stub.\n", iface, voice);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_putref_Voice(ISpeechVoice *iface, ISpeechObjectToken *voice)
+{
+ FIXME("(%p, %p): stub.\n", iface, voice);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_AudioOutput(ISpeechVoice *iface, ISpeechObjectToken **output)
+{
+ FIXME("(%p, %p): stub.\n", iface, output);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_putref_AudioOutput(ISpeechVoice *iface, ISpeechObjectToken *output)
+{
+ FIXME("(%p, %p): stub.\n", iface, output);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_AudioOutputStream(ISpeechVoice *iface, ISpeechBaseStream **output)
+{
+ FIXME("(%p, %p): stub.\n", iface, output);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_putref_AudioOutputStream(ISpeechVoice *iface, ISpeechBaseStream *output)
+{
+ FIXME("(%p, %p): stub.\n", iface, output);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_Rate(ISpeechVoice *iface, LONG *rate)
+{
+ FIXME("(%p, %p): stub.\n", iface, rate);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_Rate(ISpeechVoice *iface, LONG rate)
+{
+ FIXME("(%p, %d): stub.\n", iface, rate);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_Volume(ISpeechVoice *iface, LONG *volume)
+{
+ FIXME("(%p, %p): stub.\n", iface, volume);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_Volume(ISpeechVoice *iface, LONG volume)
+{
+ FIXME("(%p, %d): stub.\n", iface, volume);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_AllowAudioOutputFormatChangesOnNextSet(ISpeechVoice *iface,
+ VARIANT_BOOL allow)
+{
+ FIXME("(%p, %d): stub.\n", iface, allow);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_AllowAudioOutputFormatChangesOnNextSet(ISpeechVoice *iface, VARIANT_BOOL *allow)
+{
+ FIXME("(%p, %p): stub.\n", iface, allow);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_EventInterests(ISpeechVoice *iface, SpeechVoiceEvents *flags)
+{
+ FIXME("(%p, %p): stub.\n", iface, flags);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_EventInterests(ISpeechVoice *iface, SpeechVoiceEvents flags)
+{
+ FIXME("(%p, %#x): stub.\n", iface, flags);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_Priority(ISpeechVoice *iface, SpeechVoicePriority priority)
+{
+ FIXME("(%p, %d): stub.\n", iface, priority);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_Priority(ISpeechVoice *iface, SpeechVoicePriority *priority)
+{
+ FIXME("(%p, %p): stub.\n", iface, priority);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_AlertBoundary(ISpeechVoice *iface, SpeechVoiceEvents boundary)
+{
+ FIXME("(%p, %#x): stub.\n", iface, boundary);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_AlertBoundary(ISpeechVoice *iface, SpeechVoiceEvents *boundary)
+{
+ FIXME("(%p, %p): stub.\n", iface, boundary);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_put_SynchronousSpeakTimeout(ISpeechVoice *iface, LONG timeout)
+{
+ FIXME("(%p, %d): stub.\n", iface, timeout);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_get_SynchronousSpeakTimeout(ISpeechVoice *iface, LONG *timeout)
+{
+ FIXME("(%p, %p): stub.\n", iface, timeout);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_Speak(ISpeechVoice *iface, BSTR text, SpeechVoiceSpeakFlags flags, LONG *number)
+{
+ FIXME("(%p, %s, %#x, %p): stub.\n", iface, debugstr_w(text), flags, number);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_SpeakStream(ISpeechVoice *iface, ISpeechBaseStream *stream,
+ SpeechVoiceSpeakFlags flags, LONG *number)
+{
+ FIXME("(%p, %p, %#x, %p): stub.\n", iface, stream, flags, number);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_Pause(ISpeechVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_Resume(ISpeechVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_Skip(ISpeechVoice *iface, const BSTR type, LONG items, LONG *skipped)
+{
+ FIXME("(%p, %s, %d, %p): stub.\n", iface, debugstr_w(type), items, skipped);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_GetVoices(ISpeechVoice *iface, BSTR required, BSTR optional,
+ ISpeechObjectTokens **tokens)
+{
+ FIXME("(%p, %s, %s, %p): stub.\n", iface, debugstr_w(required), debugstr_w(optional), tokens);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_GetAudioOutputs(ISpeechVoice *iface, BSTR required, BSTR optional,
+ ISpeechObjectTokens **tokens)
+{
+ FIXME("(%p, %s, %s, %p): stub.\n", iface, debugstr_w(required), debugstr_w(optional), tokens);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_WaitUntilDone(ISpeechVoice *iface, LONG timeout, VARIANT_BOOL *done)
+{
+ FIXME("(%p, %d, %p): stub.\n", iface, timeout, done);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_SpeakCompleteEvent(ISpeechVoice *iface, LONG *handle)
+{
+ FIXME("(%p, %p): stub.\n", iface, handle);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_IsUISupported(ISpeechVoice *iface, const BSTR typeui, const VARIANT *data,
+ VARIANT_BOOL *supported)
+{
+ FIXME("(%p, %s, %p, %p): stub.\n", iface, debugstr_w(typeui), data, supported);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_voice_DisplayUI(ISpeechVoice *iface, LONG hwnd, BSTR title,
+ const BSTR typeui, const VARIANT *data)
+{
+ FIXME("(%p, %d, %s, %s, %p): stub.\n", iface, hwnd, debugstr_w(title), debugstr_w(typeui), data);
+
+ return E_NOTIMPL;
+}
+
+static const ISpeechVoiceVtbl speech_voice_vtbl =
+{
+ speech_voice_QueryInterface,
+ speech_voice_AddRef,
+ speech_voice_Release,
+ speech_voice_GetTypeInfoCount,
+ speech_voice_GetTypeInfo,
+ speech_voice_GetIDsOfNames,
+ speech_voice_Invoke,
+ speech_voice_get_Status,
+ speech_voice_get_Voice,
+ speech_voice_putref_Voice,
+ speech_voice_get_AudioOutput,
+ speech_voice_putref_AudioOutput,
+ speech_voice_get_AudioOutputStream,
+ speech_voice_putref_AudioOutputStream,
+ speech_voice_get_Rate,
+ speech_voice_put_Rate,
+ speech_voice_get_Volume,
+ speech_voice_put_Volume,
+ speech_voice_put_AllowAudioOutputFormatChangesOnNextSet,
+ speech_voice_get_AllowAudioOutputFormatChangesOnNextSet,
+ speech_voice_get_EventInterests,
+ speech_voice_put_EventInterests,
+ speech_voice_put_Priority,
+ speech_voice_get_Priority,
+ speech_voice_put_AlertBoundary,
+ speech_voice_get_AlertBoundary,
+ speech_voice_put_SynchronousSpeakTimeout,
+ speech_voice_get_SynchronousSpeakTimeout,
+ speech_voice_Speak,
+ speech_voice_SpeakStream,
+ speech_voice_Pause,
+ speech_voice_Resume,
+ speech_voice_Skip,
+ speech_voice_GetVoices,
+ speech_voice_GetAudioOutputs,
+ speech_voice_WaitUntilDone,
+ speech_voice_SpeakCompleteEvent,
+ speech_voice_IsUISupported,
+ speech_voice_DisplayUI,
+};
+
+HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)
+{
+ struct speech_voice *This = heap_alloc(sizeof(*This));
+ HRESULT hr;
+
+ if (!This) return E_OUTOFMEMORY;
+ This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl;
+ This->ref = 1;
+
+ hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj);
+
+ ISpeechVoice_Release(&This->ISpeechVoice_iface);
+ return hr;
+}
diff --git a/include/sapi.idl b/include/sapi.idl
index 365d594a20..e87478cac6 100644
--- a/include/sapi.idl
+++ b/include/sapi.idl
@@ -839,7 +839,7 @@ interface ISpVoice : ISpEventSource
[out] SPVOICESTATUS *status,
[out, string] WCHAR **bookmark);
- HRESULT Skip([in,string] WCHAR* type, [in] long items, [out] ULONG *skipped);
+ HRESULT Skip([in,string] const WCHAR *type, [in] long items, [out] ULONG *skipped);
HRESULT SetPriority([in] SPVPRIORITY priority);
HRESULT GetPriority([out] SPVPRIORITY* priority);
@@ -1047,4 +1047,13 @@ library SpeechLib
/*[default] interface ISpeechRecognizer;*/
interface ISpRecognizer;
};
+
+ [
+ uuid(96749377-3391-11d2-9ee3-00c04f797396)
+ ]
+ coclass SpVoice
+ {
+ interface ISpVoice;
+ [default] interface ISpeechVoice;
+ };
}
--
2.24.0
3
4
With some tablet configurations, the InExt value passed to
ScaleForContext can be very large, leading to an integer overflow. Using
64-bit integers is a simple way to ensure that there is no overflow
without making the code more complicated.
---
dlls/wintab32/context.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c
index 0514dd78b4..9050a12df5 100644
--- a/dlls/wintab32/context.c
+++ b/dlls/wintab32/context.c
@@ -175,7 +175,7 @@ int TABLET_PostTabletMessage(LPOPENCONTEXT
newcontext, UINT msg, WPARAM wParam,
return 0;
}
-static inline DWORD ScaleForContext(DWORD In, LONG InOrg, LONG InExt,
LONG OutOrg, LONG OutExt)
+static inline DWORD ScaleForContext(ULONGLONG In, LONGLONG InOrg,
LONGLONG InExt, LONGLONG OutOrg, LONGLONG OutExt)
{
if (((InExt > 0 )&&(OutExt > 0)) || ((InExt<0) && (OutExt < 0)))
return ((In - InOrg) * abs(OutExt) / abs(InExt)) + OutOrg;
--
2.23.0
3
3
[PATCH v6 3/3] kernel32: Make GetUserGeoID() pretend we set a GeoID even if we didn't.
by João Diogo Ferreira 16 Nov '19
by João Diogo Ferreira 16 Nov '19
16 Nov '19
This undocumented behaviour was implemented in Windows 10 v1709 along
all the GeoName functions.
For Wine, this fixes an edge-case scenario where we would autodetect a
region-class ID from a locale, leaving the nation class empty.
As most apps only care about nations, this would make some apps crash
regardless of our autodetection mechanism.
For Windows developers, it means bugs in their programs can no longer
be tested and found, and now their apps are crashing on Wine.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46196
Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt>
---
GetUserDefaultGeoName stub added to allow testing.
V6: Include testing.
Supersedes: 173069
---
dlls/kernel32/kernel32.spec | 1 +
dlls/kernel32/locale.c | 5 ++---
dlls/kernel32/tests/locale.c | 28 ++++++++++++++++++++++++++++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index cf2f622a77..9cfaa51b85 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -869,6 +869,7 @@
# @ stub GetUILanguageInfo
@ stdcall -arch=x86_64 GetUmsCompletionListEvent(ptr ptr)
# @ stub -arch=x86_64 GetUmsSystemThreadInformation
+@ stub GetUserDefaultGeoName(wstr long)
@ stdcall -import GetUserDefaultLCID()
@ stdcall -import GetUserDefaultLangID()
@ stdcall -import GetUserDefaultLocaleName(ptr long)
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index f1ff3fbaa7..40d5296be9 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -4016,7 +4016,7 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid)
*/
GEOID WINAPI GetUserGeoID(GEOCLASS geoclass)
{
- GEOID ret = GEOID_NOT_AVAILABLE;
+ GEOID ret = 39070;
static const WCHAR geoW[] = {'G','e','o',0};
static const WCHAR nationW[] = {'N','a','t','i','o','n',0};
static const WCHAR regionW[] = {'R','e','g','i','o','n',0};
@@ -4025,7 +4025,6 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass)
UNICODE_STRING keyW;
const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW;
DWORD count = sizeof(bufferW);
- RtlInitUnicodeString(&keyW, nationW);
switch (geoclass)
{
@@ -4037,7 +4036,7 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass)
break;
default:
WARN("Unknown geoclass %d\n", geoclass);
- return ret;
+ return GEOID_NOT_AVAILABLE;
}
if (!(hkey = create_registry_key())) return ret;
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 81e74531ea..8a49259836 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -98,6 +98,8 @@ static INT (WINAPI *pCompareStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT
static INT (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, LPSTR, INT, LANGID);
static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID);
static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC);
+static GEOID (WINAPI *pGetUserGeoID)(GEOCLASS);
+static int (WINAPI *pGetUserDefaultGeoName)(WCHAR*, int);
static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*);
static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*);
static BOOL (WINAPI *pGetUserPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*);
@@ -136,6 +138,8 @@ static void InitFunctionPointers(void)
X(GetGeoInfoA);
X(GetGeoInfoW);
X(EnumSystemGeoID);
+ X(GetUserGeoID);
+ X(GetUserDefaultGeoName);
X(GetSystemPreferredUILanguages);
X(GetThreadPreferredUILanguages);
X(GetUserPreferredUILanguages);
@@ -4893,6 +4897,29 @@ static void test_EnumSystemGeoID(void)
}
}
+static void test_GetUserGeoID(void)
+{
+ GEOID id;
+
+ if (pGetUserDefaultGeoName)
+ {
+ ok(GEOID_NOT_AVAILABLE != GetUserGeoID(GEOCLASS_NATION),
+ "GEOCLASS_NATION: should never return GEOID_NOT_AVAILABLE in this platform.\n");
+ ok(GEOID_NOT_AVAILABLE != GetUserGeoID(GEOCLASS_REGION),
+ "GEOCLASS_REGION: should never return GEOID_NOT_AVAILABLE in this platform.\n");
+ }
+ else
+ win_skip("This platform allows returning GEOID_NOT_AVAILABLE on success.\n");
+
+ id = GetUserGeoID(GEOCLASS_ALL);
+ ok(id == GEOID_NOT_AVAILABLE,
+ "GEOCLASS_ALL: expected GEOID_NOT_AVAILABLE, got %d.\n", id);
+
+ id = GetUserGeoID(0xdeadbeef);
+ ok(id == GEOID_NOT_AVAILABLE,
+ "Gibberish argument: expected GEOID_NOT_AVAILABLE, got %d.\n", id);
+}
+
struct invariant_entry {
const char *name;
int id;
@@ -6048,6 +6075,7 @@ START_TEST(locale)
test_IsValidLocaleName();
test_CompareStringOrdinal();
test_GetGeoInfo();
+ test_GetUserGeoID();
test_EnumSystemGeoID();
test_invariant();
test_GetSystemPreferredUILanguages();
--
2.24.0
2
1
[PATCH v6 2/3] kernel32: Autoinitialize geographic values when launching any program.
by João Diogo Ferreira 16 Nov '19
by João Diogo Ferreira 16 Nov '19
16 Nov '19
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46196
Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt>
---
V6: Use LOCALE_IGEOID instead of geonames.
Yeah, turns out this works after all.
Supersedes: 172991
---
dlls/kernel32/kernel_main.c | 3 +++
dlls/kernel32/kernel_private.h | 1 +
dlls/kernel32/locale.c | 9 +++++++++
3 files changed, 13 insertions(+)
diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c
index dfa66f0295..206972c210 100644
--- a/dlls/kernel32/kernel_main.c
+++ b/dlls/kernel32/kernel_main.c
@@ -88,6 +88,9 @@ static BOOL process_attach( HMODULE module )
/* Setup registry locale information */
LOCALE_InitRegistry();
+ /* Setup registry geographic information */
+ LOCALE_InitGeo();
+
/* Setup registry timezone information */
TIMEZONE_InitRegistry();
diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h
index cd6c63efa3..e9f5f51029 100644
--- a/dlls/kernel32/kernel_private.h
+++ b/dlls/kernel32/kernel_private.h
@@ -75,6 +75,7 @@ extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN;
/* locale.c */
extern void LOCALE_Init(void) DECLSPEC_HIDDEN;
extern void LOCALE_InitRegistry(void) DECLSPEC_HIDDEN;
+extern void LOCALE_InitGeo(void) DECLSPEC_HIDDEN;
/* time.c */
extern void TIMEZONE_InitRegistry(void) DECLSPEC_HIDDEN;
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index 0f91728e84..f1ff3fbaa7 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -845,6 +845,15 @@ void LOCALE_InitRegistry(void)
NtClose( hkey );
}
+/* Initialize the geographic information in the registry. */
+void LOCALE_InitGeo(void)
+{
+ GEOID id;
+
+ if (GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_IGEOID|LOCALE_RETURN_NUMBER,
+ (WCHAR *)&id, sizeof(id) / sizeof(WCHAR)))
+ SetUserGeoID(id);
+}
#ifdef __APPLE__
/***********************************************************************
--
2.24.0
2
1
16 Nov '19
Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt>
---
These GeoIDs were taken from Wine's own geoinfodata array via a script,
so they should match with Windows (and do for the handful I tested.)
---
dlls/kernel32/nls/afk.nls | 1 +
dlls/kernel32/nls/ara.nls | 1 +
dlls/kernel32/nls/arb.nls | 1 +
dlls/kernel32/nls/are.nls | 1 +
dlls/kernel32/nls/arg.nls | 1 +
dlls/kernel32/nls/arh.nls | 1 +
dlls/kernel32/nls/ari.nls | 1 +
dlls/kernel32/nls/arj.nls | 1 +
dlls/kernel32/nls/ark.nls | 1 +
dlls/kernel32/nls/arl.nls | 1 +
dlls/kernel32/nls/arm.nls | 1 +
dlls/kernel32/nls/aro.nls | 1 +
dlls/kernel32/nls/arq.nls | 1 +
dlls/kernel32/nls/ars.nls | 1 +
dlls/kernel32/nls/art.nls | 1 +
dlls/kernel32/nls/aru.nls | 1 +
dlls/kernel32/nls/ary.nls | 1 +
dlls/kernel32/nls/ast.nls | 1 +
dlls/kernel32/nls/aze.nls | 1 +
dlls/kernel32/nls/azl.nls | 1 +
dlls/kernel32/nls/bel.nls | 1 +
dlls/kernel32/nls/ben.nls | 1 +
dlls/kernel32/nls/bgr.nls | 1 +
dlls/kernel32/nls/brf.nls | 1 +
dlls/kernel32/nls/cat.nls | 1 +
dlls/kernel32/nls/chs.nls | 1 +
dlls/kernel32/nls/cht.nls | 1 +
dlls/kernel32/nls/cor.nls | 1 +
dlls/kernel32/nls/csy.nls | 1 +
dlls/kernel32/nls/cym.nls | 1 +
dlls/kernel32/nls/dan.nls | 1 +
dlls/kernel32/nls/dea.nls | 1 +
dlls/kernel32/nls/dec.nls | 1 +
dlls/kernel32/nls/del.nls | 1 +
dlls/kernel32/nls/des.nls | 1 +
dlls/kernel32/nls/deu.nls | 1 +
dlls/kernel32/nls/div.nls | 1 +
dlls/kernel32/nls/ell.nls | 1 +
dlls/kernel32/nls/ena.nls | 1 +
dlls/kernel32/nls/enb.nls | 1 +
dlls/kernel32/nls/enc.nls | 1 +
dlls/kernel32/nls/eng.nls | 1 +
dlls/kernel32/nls/eni.nls | 1 +
dlls/kernel32/nls/enj.nls | 1 +
dlls/kernel32/nls/enl.nls | 1 +
dlls/kernel32/nls/enp.nls | 1 +
dlls/kernel32/nls/ens.nls | 1 +
dlls/kernel32/nls/ent.nls | 1 +
dlls/kernel32/nls/enu.nls | 1 +
dlls/kernel32/nls/enw.nls | 1 +
dlls/kernel32/nls/enz.nls | 1 +
dlls/kernel32/nls/eox.nls | 1 +
dlls/kernel32/nls/esa.nls | 1 +
dlls/kernel32/nls/esb.nls | 1 +
dlls/kernel32/nls/esc.nls | 1 +
dlls/kernel32/nls/esd.nls | 1 +
dlls/kernel32/nls/ese.nls | 1 +
dlls/kernel32/nls/esf.nls | 1 +
dlls/kernel32/nls/esg.nls | 1 +
dlls/kernel32/nls/esh.nls | 1 +
dlls/kernel32/nls/esi.nls | 1 +
dlls/kernel32/nls/esl.nls | 1 +
dlls/kernel32/nls/esm.nls | 1 +
dlls/kernel32/nls/esn.nls | 1 +
dlls/kernel32/nls/eso.nls | 1 +
dlls/kernel32/nls/esp.nls | 1 +
dlls/kernel32/nls/esr.nls | 1 +
dlls/kernel32/nls/ess.nls | 1 +
dlls/kernel32/nls/esu.nls | 1 +
dlls/kernel32/nls/esv.nls | 1 +
dlls/kernel32/nls/esy.nls | 1 +
dlls/kernel32/nls/esz.nls | 1 +
dlls/kernel32/nls/eti.nls | 1 +
dlls/kernel32/nls/euq.nls | 1 +
dlls/kernel32/nls/far.nls | 1 +
dlls/kernel32/nls/fin.nls | 1 +
dlls/kernel32/nls/fos.nls | 1 +
dlls/kernel32/nls/fra.nls | 1 +
dlls/kernel32/nls/frb.nls | 1 +
dlls/kernel32/nls/frc.nls | 1 +
dlls/kernel32/nls/frl.nls | 1 +
dlls/kernel32/nls/frm.nls | 1 +
dlls/kernel32/nls/frs.nls | 1 +
dlls/kernel32/nls/gae.nls | 1 +
dlls/kernel32/nls/gdh.nls | 1 +
dlls/kernel32/nls/gdv.nls | 1 +
dlls/kernel32/nls/glc.nls | 1 +
dlls/kernel32/nls/guj.nls | 1 +
dlls/kernel32/nls/heb.nls | 1 +
dlls/kernel32/nls/hin.nls | 1 +
dlls/kernel32/nls/hrv.nls | 1 +
dlls/kernel32/nls/hun.nls | 1 +
dlls/kernel32/nls/hye.nls | 1 +
dlls/kernel32/nls/ind.nls | 1 +
dlls/kernel32/nls/isl.nls | 1 +
dlls/kernel32/nls/ita.nls | 1 +
dlls/kernel32/nls/its.nls | 1 +
dlls/kernel32/nls/ivl.nls | 1 +
dlls/kernel32/nls/jpn.nls | 1 +
dlls/kernel32/nls/kan.nls | 1 +
dlls/kernel32/nls/kat.nls | 1 +
dlls/kernel32/nls/kkz.nls | 1 +
dlls/kernel32/nls/knk.nls | 1 +
dlls/kernel32/nls/kor.nls | 1 +
dlls/kernel32/nls/kyr.nls | 1 +
dlls/kernel32/nls/lth.nls | 1 +
dlls/kernel32/nls/lvi.nls | 1 +
dlls/kernel32/nls/mar.nls | 1 +
dlls/kernel32/nls/mki.nls | 1 +
dlls/kernel32/nls/mon.nls | 1 +
dlls/kernel32/nls/msb.nls | 1 +
dlls/kernel32/nls/msl.nls | 1 +
dlls/kernel32/nls/nep.nls | 1 +
dlls/kernel32/nls/nlb.nls | 1 +
dlls/kernel32/nls/nld.nls | 1 +
dlls/kernel32/nls/nls.nls | 1 +
dlls/kernel32/nls/non.nls | 1 +
dlls/kernel32/nls/nor.nls | 1 +
dlls/kernel32/nls/pan.nls | 1 +
dlls/kernel32/nls/plk.nls | 1 +
dlls/kernel32/nls/ptb.nls | 1 +
dlls/kernel32/nls/ptg.nls | 1 +
dlls/kernel32/nls/rmc.nls | 1 +
dlls/kernel32/nls/rom.nls | 1 +
dlls/kernel32/nls/rus.nls | 1 +
dlls/kernel32/nls/san.nls | 1 +
dlls/kernel32/nls/sin.nls | 1 +
dlls/kernel32/nls/sky.nls | 1 +
dlls/kernel32/nls/slv.nls | 1 +
dlls/kernel32/nls/sqi.nls | 1 +
dlls/kernel32/nls/srb.nls | 1 +
dlls/kernel32/nls/srl.nls | 1 +
dlls/kernel32/nls/sve.nls | 1 +
dlls/kernel32/nls/svf.nls | 1 +
dlls/kernel32/nls/swk.nls | 1 +
dlls/kernel32/nls/syr.nls | 1 +
dlls/kernel32/nls/tam.nls | 1 +
dlls/kernel32/nls/tel.nls | 1 +
dlls/kernel32/nls/tha.nls | 1 +
dlls/kernel32/nls/trk.nls | 1 +
dlls/kernel32/nls/ttt.nls | 1 +
dlls/kernel32/nls/ukr.nls | 1 +
dlls/kernel32/nls/urd.nls | 1 +
dlls/kernel32/nls/uzb.nls | 1 +
dlls/kernel32/nls/uzl.nls | 1 +
dlls/kernel32/nls/vit.nls | 1 +
dlls/kernel32/nls/wal.nls | 1 +
dlls/kernel32/nls/zhh.nls | 1 +
dlls/kernel32/nls/zhi.nls | 1 +
dlls/kernel32/nls/zhm.nls | 1 +
150 files changed, 150 insertions(+)
diff --git a/dlls/kernel32/nls/afk.nls b/dlls/kernel32/nls/afk.nls
index 359368d1b8..aa33aa06d5 100644
--- a/dlls/kernel32/nls/afk.nls
+++ b/dlls/kernel32/nls/afk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "209"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0436"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ara.nls b/dlls/kernel32/nls/ara.nls
index db475ec95f..ff63164d47 100644
--- a/dlls/kernel32/nls/ara.nls
+++ b/dlls/kernel32/nls/ara.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "205"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0401"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arb.nls b/dlls/kernel32/nls/arb.nls
index e2ee977275..fb854ac44c 100644
--- a/dlls/kernel32/nls/arb.nls
+++ b/dlls/kernel32/nls/arb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LEBANON
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "139"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3001"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/are.nls b/dlls/kernel32/nls/are.nls
index 861ddc7f39..b044d3299b 100644
--- a/dlls/kernel32/nls/are.nls
+++ b/dlls/kernel32/nls/are.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "67"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "0c01"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arg.nls b/dlls/kernel32/nls/arg.nls
index 0d8f64cd12..6c10551f01 100644
--- a/dlls/kernel32/nls/arg.nls
+++ b/dlls/kernel32/nls/arg.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_ALGERIA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "4"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1401"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arh.nls b/dlls/kernel32/nls/arh.nls
index 08a4c40fcf..ce2fe000d4 100644
--- a/dlls/kernel32/nls/arh.nls
+++ b/dlls/kernel32/nls/arh.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "17"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "3c01"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ari.nls b/dlls/kernel32/nls/ari.nls
index 56d6b0a66a..466fa2540b 100644
--- a/dlls/kernel32/nls/ari.nls
+++ b/dlls/kernel32/nls/ari.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_IRAQ
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "121"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0801"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arj.nls b/dlls/kernel32/nls/arj.nls
index 6de87ba1d7..fc4f15c509 100644
--- a/dlls/kernel32/nls/arj.nls
+++ b/dlls/kernel32/nls/arj.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "126"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "2c01"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ark.nls b/dlls/kernel32/nls/ark.nls
index 5714cb2016..9086b62226 100644
--- a/dlls/kernel32/nls/ark.nls
+++ b/dlls/kernel32/nls/ark.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_KUWAIT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "136"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "3401"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arl.nls b/dlls/kernel32/nls/arl.nls
index b355537860..22bde6893f 100644
--- a/dlls/kernel32/nls/arl.nls
+++ b/dlls/kernel32/nls/arl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LIBYA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "148"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1001"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arm.nls b/dlls/kernel32/nls/arm.nls
index 4655544a94..8ac926550a 100644
--- a/dlls/kernel32/nls/arm.nls
+++ b/dlls/kernel32/nls/arm.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_MOROCCO
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "159"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1801"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/aro.nls b/dlls/kernel32/nls/aro.nls
index f05719620e..953b761de7 100644
--- a/dlls/kernel32/nls/aro.nls
+++ b/dlls/kernel32/nls/aro.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_OMAN
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "164"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2001"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/arq.nls b/dlls/kernel32/nls/arq.nls
index 328455231c..25ac8b9132 100644
--- a/dlls/kernel32/nls/arq.nls
+++ b/dlls/kernel32/nls/arq.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_QATAR
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "197"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "4001"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ars.nls b/dlls/kernel32/nls/ars.nls
index f0c22ed5dc..803ca07118 100644
--- a/dlls/kernel32/nls/ars.nls
+++ b/dlls/kernel32/nls/ars.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "222"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2801"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/art.nls b/dlls/kernel32/nls/art.nls
index 6c8335d265..55e34ac77f 100644
--- a/dlls/kernel32/nls/art.nls
+++ b/dlls/kernel32/nls/art.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "234"
LOCALE_IINTLCURRDIGITS "3"
LOCALE_ILANGUAGE "1c01"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/aru.nls b/dlls/kernel32/nls/aru.nls
index 7e431370f5..d519b38bdd 100644
--- a/dlls/kernel32/nls/aru.nls
+++ b/dlls/kernel32/nls/aru.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_UAE
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "224"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3801"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ary.nls b/dlls/kernel32/nls/ary.nls
index c51b59f5d5..0cb1bb88b6 100644
--- a/dlls/kernel32/nls/ary.nls
+++ b/dlls/kernel32/nls/ary.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_YEMEN
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "261"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2401"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ast.nls b/dlls/kernel32/nls/ast.nls
index f4a0489abe..4a6a77aa72 100644
--- a/dlls/kernel32/nls/ast.nls
+++ b/dlls/kernel32/nls/ast.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "04a5"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/aze.nls b/dlls/kernel32/nls/aze.nls
index a9b093e787..e2860d088f 100644
--- a/dlls/kernel32/nls/aze.nls
+++ b/dlls/kernel32/nls/aze.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "5"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "082c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/azl.nls b/dlls/kernel32/nls/azl.nls
index f6a237b6ee..86d49a6b5f 100644
--- a/dlls/kernel32/nls/azl.nls
+++ b/dlls/kernel32/nls/azl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "5"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/bel.nls b/dlls/kernel32/nls/bel.nls
index d390871163..e6cc7a58df 100644
--- a/dlls/kernel32/nls/bel.nls
+++ b/dlls/kernel32/nls/bel.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "29"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0423"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ben.nls b/dlls/kernel32/nls/ben.nls
index f1031b09a7..bead15abaf 100644
--- a/dlls/kernel32/nls/ben.nls
+++ b/dlls/kernel32/nls/ben.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_BANGLA, SUBLANG_BANGLA_INDIA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0445"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/bgr.nls b/dlls/kernel32/nls/bgr.nls
index 4951098a1d..5f1f0e6697 100644
--- a/dlls/kernel32/nls/bgr.nls
+++ b/dlls/kernel32/nls/bgr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "35"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0402"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/brf.nls b/dlls/kernel32/nls/brf.nls
index e0dcf12e89..06862e665c 100644
--- a/dlls/kernel32/nls/brf.nls
+++ b/dlls/kernel32/nls/brf.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "84"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0493"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/cat.nls b/dlls/kernel32/nls/cat.nls
index b58cd75c27..5f1fa43e02 100644
--- a/dlls/kernel32/nls/cat.nls
+++ b/dlls/kernel32/nls/cat.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0403"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/chs.nls b/dlls/kernel32/nls/chs.nls
index 2829e52d66..c7f6114768 100644
--- a/dlls/kernel32/nls/chs.nls
+++ b/dlls/kernel32/nls/chs.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "45"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0804"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/cht.nls b/dlls/kernel32/nls/cht.nls
index b8bac7be3e..1cfeb840f0 100644
--- a/dlls/kernel32/nls/cht.nls
+++ b/dlls/kernel32/nls/cht.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "237"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0404"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/cor.nls b/dlls/kernel32/nls/cor.nls
index 535239aaf6..36c7e7f234 100644
--- a/dlls/kernel32/nls/cor.nls
+++ b/dlls/kernel32/nls/cor.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_CORNISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "242"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0492"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/csy.nls b/dlls/kernel32/nls/csy.nls
index 4cfb2afd4d..d03494e4cd 100644
--- a/dlls/kernel32/nls/csy.nls
+++ b/dlls/kernel32/nls/csy.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "75"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0405"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/cym.nls b/dlls/kernel32/nls/cym.nls
index 9d0f272ef2..41a25c415b 100644
--- a/dlls/kernel32/nls/cym.nls
+++ b/dlls/kernel32/nls/cym.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "242"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0492"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/dan.nls b/dlls/kernel32/nls/dan.nls
index 444e5a78d2..3e567cd333 100644
--- a/dlls/kernel32/nls/dan.nls
+++ b/dlls/kernel32/nls/dan.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "61"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0406"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/dea.nls b/dlls/kernel32/nls/dea.nls
index 0caf414af0..f97ae8ebe3 100644
--- a/dlls/kernel32/nls/dea.nls
+++ b/dlls/kernel32/nls/dea.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "14"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c07"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/dec.nls b/dlls/kernel32/nls/dec.nls
index ee3a95cdf2..b6b492b84d 100644
--- a/dlls/kernel32/nls/dec.nls
+++ b/dlls/kernel32/nls/dec.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "145"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1407"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/del.nls b/dlls/kernel32/nls/del.nls
index b92df675fa..6a7258d9fe 100644
--- a/dlls/kernel32/nls/del.nls
+++ b/dlls/kernel32/nls/del.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "147"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1007"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/des.nls b/dlls/kernel32/nls/des.nls
index f67f1d7bd8..bb6fed059c 100644
--- a/dlls/kernel32/nls/des.nls
+++ b/dlls/kernel32/nls/des.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "223"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0807"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/deu.nls b/dlls/kernel32/nls/deu.nls
index 66c0554032..b02639801b 100644
--- a/dlls/kernel32/nls/deu.nls
+++ b/dlls/kernel32/nls/deu.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "94"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0407"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/div.nls b/dlls/kernel32/nls/div.nls
index e8b1c72830..1c7989e006 100644
--- a/dlls/kernel32/nls/div.nls
+++ b/dlls/kernel32/nls/div.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_DIVEHI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "165"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0465"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ell.nls b/dlls/kernel32/nls/ell.nls
index cb129e75ad..d86fe9e473 100644
--- a/dlls/kernel32/nls/ell.nls
+++ b/dlls/kernel32/nls/ell.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "98"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0408"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ena.nls b/dlls/kernel32/nls/ena.nls
index e57be4732d..f34a20b96d 100644
--- a/dlls/kernel32/nls/ena.nls
+++ b/dlls/kernel32/nls/ena.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "12"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c09"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/enb.nls b/dlls/kernel32/nls/enb.nls
index 164c94ebf2..ca6af6766e 100644
--- a/dlls/kernel32/nls/enb.nls
+++ b/dlls/kernel32/nls/enb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "161832257"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2409"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/enc.nls b/dlls/kernel32/nls/enc.nls
index 01b4b8af7a..0f3a394263 100644
--- a/dlls/kernel32/nls/enc.nls
+++ b/dlls/kernel32/nls/enc.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "39"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1009"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/eng.nls b/dlls/kernel32/nls/eng.nls
index 72cac4180c..779bd0ae6d 100644
--- a/dlls/kernel32/nls/eng.nls
+++ b/dlls/kernel32/nls/eng.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "242"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0809"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/eni.nls b/dlls/kernel32/nls/eni.nls
index 31c137512c..9796b0f6cd 100644
--- a/dlls/kernel32/nls/eni.nls
+++ b/dlls/kernel32/nls/eni.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_EIRE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "68"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1809"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/enj.nls b/dlls/kernel32/nls/enj.nls
index 9b1afeec61..36134691ef 100644
--- a/dlls/kernel32/nls/enj.nls
+++ b/dlls/kernel32/nls/enj.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_JAMAICA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "124"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2009"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/enl.nls b/dlls/kernel32/nls/enl.nls
index 6bbe6d9952..ee78870cc8 100644
--- a/dlls/kernel32/nls/enl.nls
+++ b/dlls/kernel32/nls/enl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_BELIZE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "24"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2809"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/enp.nls b/dlls/kernel32/nls/enp.nls
index 8f4cd835ea..5af8b97efc 100644
--- a/dlls/kernel32/nls/enp.nls
+++ b/dlls/kernel32/nls/enp.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_PHILIPPINES
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "201"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3409"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/ens.nls b/dlls/kernel32/nls/ens.nls
index e94af6370e..ee2403196f 100644
--- a/dlls/kernel32/nls/ens.nls
+++ b/dlls/kernel32/nls/ens.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "209"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1c09"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ent.nls b/dlls/kernel32/nls/ent.nls
index b0e849101c..48bfb26b15 100644
--- a/dlls/kernel32/nls/ent.nls
+++ b/dlls/kernel32/nls/ent.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "225"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2c09"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/enu.nls b/dlls/kernel32/nls/enu.nls
index 6a5a63b155..527d6430f0 100644
--- a/dlls/kernel32/nls/enu.nls
+++ b/dlls/kernel32/nls/enu.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "244"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0409"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/enw.nls b/dlls/kernel32/nls/enw.nls
index de51ae2f8b..1ba782fc32 100644
--- a/dlls/kernel32/nls/enw.nls
+++ b/dlls/kernel32/nls/enw.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_ZIMBABWE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "264"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3009"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/enz.nls b/dlls/kernel32/nls/enz.nls
index cc2532454a..e4571a765b 100644
--- a/dlls/kernel32/nls/enz.nls
+++ b/dlls/kernel32/nls/enz.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_NZ
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "183"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1409"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls
index f67c955fde..bbd617eac4 100644
--- a/dlls/kernel32/nls/eox.nls
+++ b/dlls/kernel32/nls/eox.nls
@@ -56,6 +56,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "39070" /* World */
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "048f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esa.nls b/dlls/kernel32/nls/esa.nls
index f89e234f83..a311d796eb 100644
--- a/dlls/kernel32/nls/esa.nls
+++ b/dlls/kernel32/nls/esa.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PANAMA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "192"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "180a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esb.nls b/dlls/kernel32/nls/esb.nls
index ef5c4300b2..ce95402300 100644
--- a/dlls/kernel32/nls/esb.nls
+++ b/dlls/kernel32/nls/esb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "26"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "400a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esc.nls b/dlls/kernel32/nls/esc.nls
index 8eccd4c137..60ed24e706 100644
--- a/dlls/kernel32/nls/esc.nls
+++ b/dlls/kernel32/nls/esc.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "54"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "140a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esd.nls b/dlls/kernel32/nls/esd.nls
index d956d0cd65..93b6bb0005 100644
--- a/dlls/kernel32/nls/esd.nls
+++ b/dlls/kernel32/nls/esd.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "65"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ese.nls b/dlls/kernel32/nls/ese.nls
index e2f9f5ab91..a68c027440 100644
--- a/dlls/kernel32/nls/ese.nls
+++ b/dlls/kernel32/nls/ese.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "72"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "440a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esf.nls b/dlls/kernel32/nls/esf.nls
index a70f5e249d..65f47d73a2 100644
--- a/dlls/kernel32/nls/esf.nls
+++ b/dlls/kernel32/nls/esf.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ECUADOR
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "66"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "300a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esg.nls b/dlls/kernel32/nls/esg.nls
index 2b6138960c..a9c9a8a860 100644
--- a/dlls/kernel32/nls/esg.nls
+++ b/dlls/kernel32/nls/esg.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "99"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "100a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esh.nls b/dlls/kernel32/nls/esh.nls
index 8d329cebc8..5593836b44 100644
--- a/dlls/kernel32/nls/esh.nls
+++ b/dlls/kernel32/nls/esh.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_HONDURAS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "106"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "480a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esi.nls b/dlls/kernel32/nls/esi.nls
index 6ba9a78786..ac4bdb79d0 100644
--- a/dlls/kernel32/nls/esi.nls
+++ b/dlls/kernel32/nls/esi.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "182"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "4c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esl.nls b/dlls/kernel32/nls/esl.nls
index 9b5c16d72b..57f35643b6 100644
--- a/dlls/kernel32/nls/esl.nls
+++ b/dlls/kernel32/nls/esl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_CHILE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "46"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "340a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esm.nls b/dlls/kernel32/nls/esm.nls
index 09f246504b..8c404f1733 100644
--- a/dlls/kernel32/nls/esm.nls
+++ b/dlls/kernel32/nls/esm.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "166"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "080a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esn.nls b/dlls/kernel32/nls/esn.nls
index 373445cabf..0cb88fa366 100644
--- a/dlls/kernel32/nls/esn.nls
+++ b/dlls/kernel32/nls/esn.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/eso.nls b/dlls/kernel32/nls/eso.nls
index d1831c4bc9..9f7131066a 100644
--- a/dlls/kernel32/nls/eso.nls
+++ b/dlls/kernel32/nls/eso.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "51"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "240a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esp.nls b/dlls/kernel32/nls/esp.nls
index c80b650ea3..a557a52b7d 100644
--- a/dlls/kernel32/nls/esp.nls
+++ b/dlls/kernel32/nls/esp.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esr.nls b/dlls/kernel32/nls/esr.nls
index 050e5e9f7b..752120dadf 100644
--- a/dlls/kernel32/nls/esr.nls
+++ b/dlls/kernel32/nls/esr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PERU
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "187"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "280a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ess.nls b/dlls/kernel32/nls/ess.nls
index c10084416b..30c96a0bf7 100644
--- a/dlls/kernel32/nls/ess.nls
+++ b/dlls/kernel32/nls/ess.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "11"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "2c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esu.nls b/dlls/kernel32/nls/esu.nls
index 25e5792edc..eb2ec3b04a 100644
--- a/dlls/kernel32/nls/esu.nls
+++ b/dlls/kernel32/nls/esu.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "202"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "500a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esv.nls b/dlls/kernel32/nls/esv.nls
index baa4396841..155ebef33c 100644
--- a/dlls/kernel32/nls/esv.nls
+++ b/dlls/kernel32/nls/esv.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "249"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "200a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esy.nls b/dlls/kernel32/nls/esy.nls
index 41d5f48480..9444f436a1 100644
--- a/dlls/kernel32/nls/esy.nls
+++ b/dlls/kernel32/nls/esy.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_URUGUAY
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "246"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "380a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/esz.nls b/dlls/kernel32/nls/esz.nls
index 34c321bc66..82eb4241b2 100644
--- a/dlls/kernel32/nls/esz.nls
+++ b/dlls/kernel32/nls/esz.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "185"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "3c0a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/eti.nls b/dlls/kernel32/nls/eti.nls
index 31b8aa0349..8d7f0fe39c 100644
--- a/dlls/kernel32/nls/eti.nls
+++ b/dlls/kernel32/nls/eti.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "70"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0425"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/euq.nls b/dlls/kernel32/nls/euq.nls
index f5570f02cc..38d34312ea 100644
--- a/dlls/kernel32/nls/euq.nls
+++ b/dlls/kernel32/nls/euq.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042d"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls
index c67b78ae3c..ddc4495f77 100644
--- a/dlls/kernel32/nls/far.nls
+++ b/dlls/kernel32/nls/far.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "116"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0429"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/fin.nls b/dlls/kernel32/nls/fin.nls
index bc1221dcb3..29b7d2e897 100644
--- a/dlls/kernel32/nls/fin.nls
+++ b/dlls/kernel32/nls/fin.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "77"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040b"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/fos.nls b/dlls/kernel32/nls/fos.nls
index ad74d06ae6..5d53bcc81f 100644
--- a/dlls/kernel32/nls/fos.nls
+++ b/dlls/kernel32/nls/fos.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FAEROESE, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "81"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0438"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/fra.nls b/dlls/kernel32/nls/fra.nls
index 7a2da391dd..9a588a932e 100644
--- a/dlls/kernel32/nls/fra.nls
+++ b/dlls/kernel32/nls/fra.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "84"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frb.nls b/dlls/kernel32/nls/frb.nls
index 904e8e7f2e..7ee0b29751 100644
--- a/dlls/kernel32/nls/frb.nls
+++ b/dlls/kernel32/nls/frb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "21"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "080c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frc.nls b/dlls/kernel32/nls/frc.nls
index 8626473fc6..79eac11d96 100644
--- a/dlls/kernel32/nls/frc.nls
+++ b/dlls/kernel32/nls/frc.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "39"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c0c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frl.nls b/dlls/kernel32/nls/frl.nls
index cb7d36d2c9..29d2ad0c9c 100644
--- a/dlls/kernel32/nls/frl.nls
+++ b/dlls/kernel32/nls/frl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "147"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "140c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frm.nls b/dlls/kernel32/nls/frm.nls
index 5c3e6b192e..fa38552812 100644
--- a/dlls/kernel32/nls/frm.nls
+++ b/dlls/kernel32/nls/frm.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_MONACO
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "158"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "180c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/frs.nls b/dlls/kernel32/nls/frs.nls
index 303be0a31b..cefb9d36db 100644
--- a/dlls/kernel32/nls/frs.nls
+++ b/dlls/kernel32/nls/frs.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "223"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "100c"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/gae.nls b/dlls/kernel32/nls/gae.nls
index 8167cbcd60..e817403c43 100644
--- a/dlls/kernel32/nls/gae.nls
+++ b/dlls/kernel32/nls/gae.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_IRISH, SUBLANG_IRISH_IRELAND
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "68"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "083c"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/gdh.nls b/dlls/kernel32/nls/gdh.nls
index f8bdaa0b64..0cd5699120 100644
--- a/dlls/kernel32/nls/gdh.nls
+++ b/dlls/kernel32/nls/gdh.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_SCOTTISH_GAELIC, SUBLANG_SCOTTISH_GAELIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "242"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0491"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/gdv.nls b/dlls/kernel32/nls/gdv.nls
index c836eee807..0723813c14 100644
--- a/dlls/kernel32/nls/gdv.nls
+++ b/dlls/kernel32/nls/gdv.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "15126"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0494"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/glc.nls b/dlls/kernel32/nls/glc.nls
index 71b49390d8..f60a0aac69 100644
--- a/dlls/kernel32/nls/glc.nls
+++ b/dlls/kernel32/nls/glc.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "217"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0456"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/guj.nls b/dlls/kernel32/nls/guj.nls
index 4731cc5004..e24ba5e43f 100644
--- a/dlls/kernel32/nls/guj.nls
+++ b/dlls/kernel32/nls/guj.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GUJARATI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0447"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/heb.nls b/dlls/kernel32/nls/heb.nls
index 2ba57a50ab..2d69ffd467 100644
--- a/dlls/kernel32/nls/heb.nls
+++ b/dlls/kernel32/nls/heb.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "117"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040d"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/hin.nls b/dlls/kernel32/nls/hin.nls
index 3a70dc0db6..b32a057265 100644
--- a/dlls/kernel32/nls/hin.nls
+++ b/dlls/kernel32/nls/hin.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_HINDI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0439"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/hrv.nls b/dlls/kernel32/nls/hrv.nls
index faa39455d0..958e15e59e 100644
--- a/dlls/kernel32/nls/hrv.nls
+++ b/dlls/kernel32/nls/hrv.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "108"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/hun.nls b/dlls/kernel32/nls/hun.nls
index 3c95372f4f..c3dbb9773f 100644
--- a/dlls/kernel32/nls/hun.nls
+++ b/dlls/kernel32/nls/hun.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "109"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040e"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/hye.nls b/dlls/kernel32/nls/hye.nls
index fbd4b2b63a..2000280fe1 100644
--- a/dlls/kernel32/nls/hye.nls
+++ b/dlls/kernel32/nls/hye.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "7"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042b"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ind.nls b/dlls/kernel32/nls/ind.nls
index f160c6829e..c33acb8a3e 100644
--- a/dlls/kernel32/nls/ind.nls
+++ b/dlls/kernel32/nls/ind.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "111"
LOCALE_IINTLCURRDIGITS "0"
LOCALE_ILANGUAGE "0421"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/isl.nls b/dlls/kernel32/nls/isl.nls
index 0f13d17562..5a6c3d67e3 100644
--- a/dlls/kernel32/nls/isl.nls
+++ b/dlls/kernel32/nls/isl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ICELANDIC, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "110"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "040f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ita.nls b/dlls/kernel32/nls/ita.nls
index 205384f42e..256d546819 100644
--- a/dlls/kernel32/nls/ita.nls
+++ b/dlls/kernel32/nls/ita.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "118"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0410"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/its.nls b/dlls/kernel32/nls/its.nls
index f8a67e7b19..c9a6c1744c 100644
--- a/dlls/kernel32/nls/its.nls
+++ b/dlls/kernel32/nls/its.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN_SWISS
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "223"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0810"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ivl.nls b/dlls/kernel32/nls/ivl.nls
index c55bea948f..6bfaf0f950 100644
--- a/dlls/kernel32/nls/ivl.nls
+++ b/dlls/kernel32/nls/ivl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_INVARIANT, SUBLANG_NEUTRAL
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "39070" /* World*/
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "007f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/jpn.nls b/dlls/kernel32/nls/jpn.nls
index 06ddccf859..39507dee84 100644
--- a/dlls/kernel32/nls/jpn.nls
+++ b/dlls/kernel32/nls/jpn.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "122"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0411"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/kan.nls b/dlls/kernel32/nls/kan.nls
index 9c82d16dc9..e6934d1a42 100644
--- a/dlls/kernel32/nls/kan.nls
+++ b/dlls/kernel32/nls/kan.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KANNADA, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "044b"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/kat.nls b/dlls/kernel32/nls/kat.nls
index e2596483c3..26e165001e 100644
--- a/dlls/kernel32/nls/kat.nls
+++ b/dlls/kernel32/nls/kat.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_GEORGIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "88"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0437"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/kkz.nls b/dlls/kernel32/nls/kkz.nls
index c23ded5a00..5a8451563b 100644
--- a/dlls/kernel32/nls/kkz.nls
+++ b/dlls/kernel32/nls/kkz.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KAZAK, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "137"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "043f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/knk.nls b/dlls/kernel32/nls/knk.nls
index 44e19e8a7b..c2526d2c81 100644
--- a/dlls/kernel32/nls/knk.nls
+++ b/dlls/kernel32/nls/knk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KONKANI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0457"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/kor.nls b/dlls/kernel32/nls/kor.nls
index 26ebe7f520..9d44870b39 100644
--- a/dlls/kernel32/nls/kor.nls
+++ b/dlls/kernel32/nls/kor.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KOREAN, SUBLANG_KOREAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "134"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0412"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/kyr.nls b/dlls/kernel32/nls/kyr.nls
index e0ade28a16..7ab2a4d0b6 100644
--- a/dlls/kernel32/nls/kyr.nls
+++ b/dlls/kernel32/nls/kyr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_KYRGYZ, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "130"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0440"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/lth.nls b/dlls/kernel32/nls/lth.nls
index 9f3fc4f195..fa1417357a 100644
--- a/dlls/kernel32/nls/lth.nls
+++ b/dlls/kernel32/nls/lth.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "141"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0427"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/lvi.nls b/dlls/kernel32/nls/lvi.nls
index bdff4bf2b8..3faa56bf54 100644
--- a/dlls/kernel32/nls/lvi.nls
+++ b/dlls/kernel32/nls/lvi.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "140"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0426"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/mar.nls b/dlls/kernel32/nls/mar.nls
index d7b31a757b..3069a59070 100644
--- a/dlls/kernel32/nls/mar.nls
+++ b/dlls/kernel32/nls/mar.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MARATHI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "044e"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/mki.nls b/dlls/kernel32/nls/mki.nls
index 6103b42265..30efc19b37 100644
--- a/dlls/kernel32/nls/mki.nls
+++ b/dlls/kernel32/nls/mki.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MACEDONIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "19618"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/mon.nls b/dlls/kernel32/nls/mon.nls
index 41516fb4bc..c60ec86c91 100644
--- a/dlls/kernel32/nls/mon.nls
+++ b/dlls/kernel32/nls/mon.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MONGOLIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "0"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "154"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0450"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/msb.nls b/dlls/kernel32/nls/msb.nls
index bbba93f642..0e232cfcb0 100644
--- a/dlls/kernel32/nls/msb.nls
+++ b/dlls/kernel32/nls/msb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "37"
LOCALE_IINTLCURRDIGITS "0"
LOCALE_ILANGUAGE "083e"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/msl.nls b/dlls/kernel32/nls/msl.nls
index 3bffbb6d1d..1df52003c2 100644
--- a/dlls/kernel32/nls/msl.nls
+++ b/dlls/kernel32/nls/msl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_MALAYSIA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "167"
LOCALE_IINTLCURRDIGITS "0"
LOCALE_ILANGUAGE "043e"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/nep.nls b/dlls/kernel32/nls/nep.nls
index c8b5d74def..63946744cb 100644
--- a/dlls/kernel32/nls/nep.nls
+++ b/dlls/kernel32/nls/nep.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_NEPALI, SUBLANG_NEPALI_NEPAL
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "178"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0461"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/nlb.nls b/dlls/kernel32/nls/nlb.nls
index 8af8f48ee1..17fd3790de 100644
--- a/dlls/kernel32/nls/nlb.nls
+++ b/dlls/kernel32/nls/nlb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_BELGIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "21"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0813"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/nld.nls b/dlls/kernel32/nls/nld.nls
index 6abf0dd3fd..47de663dec 100644
--- a/dlls/kernel32/nls/nld.nls
+++ b/dlls/kernel32/nls/nld.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "176"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0413"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/nls.nls b/dlls/kernel32/nls/nls.nls
index 8ebbfdf071..b29f0bc3a1 100644
--- a/dlls/kernel32/nls/nls.nls
+++ b/dlls/kernel32/nls/nls.nls
@@ -46,6 +46,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_SURINAM
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "181"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c13"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/non.nls b/dlls/kernel32/nls/non.nls
index 9a2eefa42f..ac6827536f 100644
--- a/dlls/kernel32/nls/non.nls
+++ b/dlls/kernel32/nls/non.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "177"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0814"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/nor.nls b/dlls/kernel32/nls/nor.nls
index eb65152380..bd78390541 100644
--- a/dlls/kernel32/nls/nor.nls
+++ b/dlls/kernel32/nls/nor.nls
@@ -41,6 +41,7 @@ STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "177"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0414"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/pan.nls b/dlls/kernel32/nls/pan.nls
index 358a9eb97a..bd8aeb883f 100644
--- a/dlls/kernel32/nls/pan.nls
+++ b/dlls/kernel32/nls/pan.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_PUNJABI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0446"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/plk.nls b/dlls/kernel32/nls/plk.nls
index 6e1447dc15..b79020ecb0 100644
--- a/dlls/kernel32/nls/plk.nls
+++ b/dlls/kernel32/nls/plk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "191"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0415"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ptb.nls b/dlls/kernel32/nls/ptb.nls
index e66c09a3cc..66cc65be83 100644
--- a/dlls/kernel32/nls/ptb.nls
+++ b/dlls/kernel32/nls/ptb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "32"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0416"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ptg.nls b/dlls/kernel32/nls/ptg.nls
index a7c6496b25..c75d5a1caf 100644
--- a/dlls/kernel32/nls/ptg.nls
+++ b/dlls/kernel32/nls/ptg.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "193"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0816"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/rmc.nls b/dlls/kernel32/nls/rmc.nls
index c41a31dedd..f54db3585a 100644
--- a/dlls/kernel32/nls/rmc.nls
+++ b/dlls/kernel32/nls/rmc.nls
@@ -51,6 +51,7 @@ STRINGTABLE LANGUAGE LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "223"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0417"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/rom.nls b/dlls/kernel32/nls/rom.nls
index 420154c5d1..fd519238dd 100644
--- a/dlls/kernel32/nls/rom.nls
+++ b/dlls/kernel32/nls/rom.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "200"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0418"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/rus.nls b/dlls/kernel32/nls/rus.nls
index a066c81c4a..5c78460f66 100644
--- a/dlls/kernel32/nls/rus.nls
+++ b/dlls/kernel32/nls/rus.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "203"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0419"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/san.nls b/dlls/kernel32/nls/san.nls
index 57ee6a54b2..4f44f3e3d9 100644
--- a/dlls/kernel32/nls/san.nls
+++ b/dlls/kernel32/nls/san.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SANSKRIT, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "044f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls
index cc5465f4dc..31d258b673 100644
--- a/dlls/kernel32/nls/sin.nls
+++ b/dlls/kernel32/nls/sin.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "42"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "045B"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/sky.nls b/dlls/kernel32/nls/sky.nls
index 0e140e02de..29647b2b1b 100644
--- a/dlls/kernel32/nls/sky.nls
+++ b/dlls/kernel32/nls/sky.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "143"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041b"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/slv.nls b/dlls/kernel32/nls/slv.nls
index f5c0ffc94f..8f7fc66ac7 100644
--- a/dlls/kernel32/nls/slv.nls
+++ b/dlls/kernel32/nls/slv.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "212"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0424"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/sqi.nls b/dlls/kernel32/nls/sqi.nls
index 41b4085e10..6f4048230e 100644
--- a/dlls/kernel32/nls/sqi.nls
+++ b/dlls/kernel32/nls/sqi.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_ALBANIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "6"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041c"
LOCALE_ILDATE "2"
diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls
index 500e36bb63..eb500cf0fd 100644
--- a/dlls/kernel32/nls/srb.nls
+++ b/dlls/kernel32/nls/srb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "271"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c1a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls
index 85f156d656..948b5e11a2 100644
--- a/dlls/kernel32/nls/srl.nls
+++ b/dlls/kernel32/nls/srl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "271"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "081a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/sve.nls b/dlls/kernel32/nls/sve.nls
index cff29a267a..6c8db124a6 100644
--- a/dlls/kernel32/nls/sve.nls
+++ b/dlls/kernel32/nls/sve.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "221"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041d"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/svf.nls b/dlls/kernel32/nls/svf.nls
index 2b97b4fe03..59982e8a39 100644
--- a/dlls/kernel32/nls/svf.nls
+++ b/dlls/kernel32/nls/svf.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
+ LOCALE_IGEOID "77"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "081d"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/swk.nls b/dlls/kernel32/nls/swk.nls
index 28e9dfc1aa..6308562991 100644
--- a/dlls/kernel32/nls/swk.nls
+++ b/dlls/kernel32/nls/swk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SWAHILI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "129"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0441"
LOCALE_ILDATE "0"
diff --git a/dlls/kernel32/nls/syr.nls b/dlls/kernel32/nls/syr.nls
index 9e6453d77f..6f8aa76602 100644
--- a/dlls/kernel32/nls/syr.nls
+++ b/dlls/kernel32/nls/syr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_SYRIAC, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "5"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "222"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "045a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/tam.nls b/dlls/kernel32/nls/tam.nls
index ba32416f42..8db932bf65 100644
--- a/dlls/kernel32/nls/tam.nls
+++ b/dlls/kernel32/nls/tam.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_TAMIL, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0449"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/tel.nls b/dlls/kernel32/nls/tel.nls
index 59078d15ee..37586776ea 100644
--- a/dlls/kernel32/nls/tel.nls
+++ b/dlls/kernel32/nls/tel.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_TELUGU, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "113"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "044a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls
index 3995c74368..2097b3728d 100644
--- a/dlls/kernel32/nls/tha.nls
+++ b/dlls/kernel32/nls/tha.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "227"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041e"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/trk.nls b/dlls/kernel32/nls/trk.nls
index 0b68b5bbce..3954b4b63e 100644
--- a/dlls/kernel32/nls/trk.nls
+++ b/dlls/kernel32/nls/trk.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "235"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "041f"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ttt.nls b/dlls/kernel32/nls/ttt.nls
index cae2f9418c..64cdb3d102 100644
--- a/dlls/kernel32/nls/ttt.nls
+++ b/dlls/kernel32/nls/ttt.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "203"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0444"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/ukr.nls b/dlls/kernel32/nls/ukr.nls
index 142133ea9c..e13ac684fc 100644
--- a/dlls/kernel32/nls/ukr.nls
+++ b/dlls/kernel32/nls/ukr.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "241"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0422"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/urd.nls b/dlls/kernel32/nls/urd.nls
index d8b6c30135..1bebe46e74 100644
--- a/dlls/kernel32/nls/urd.nls
+++ b/dlls/kernel32/nls/urd.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_URDU, SUBLANG_URDU_PAKISTAN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "1"
+ LOCALE_IGEOID "190"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0420"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/uzb.nls b/dlls/kernel32/nls/uzb.nls
index 022f7f59af..1257f39f2f 100644
--- a/dlls/kernel32/nls/uzb.nls
+++ b/dlls/kernel32/nls/uzb.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "247"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0843"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/uzl.nls b/dlls/kernel32/nls/uzl.nls
index 88206a9038..b03cfb6fb1 100644
--- a/dlls/kernel32/nls/uzl.nls
+++ b/dlls/kernel32/nls/uzl.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_LATIN
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "247"
LOCALE_IINTLCURRDIGITS "0"
LOCALE_ILANGUAGE "0443"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls
index 3813cafb6b..17389243dc 100644
--- a/dlls/kernel32/nls/vit.nls
+++ b/dlls/kernel32/nls/vit.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "251"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "042a"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/wal.nls b/dlls/kernel32/nls/wal.nls
index d86f9d6803..3e5f9585d7 100644
--- a/dlls/kernel32/nls/wal.nls
+++ b/dlls/kernel32/nls/wal.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "21"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0490"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/zhh.nls b/dlls/kernel32/nls/zhh.nls
index 19e1961393..f6aca66bd1 100644
--- a/dlls/kernel32/nls/zhh.nls
+++ b/dlls/kernel32/nls/zhh.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "104"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c04"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/zhi.nls b/dlls/kernel32/nls/zhi.nls
index 941ec6e664..8b304d7514 100644
--- a/dlls/kernel32/nls/zhi.nls
+++ b/dlls/kernel32/nls/zhi.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "215"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1004"
LOCALE_ILDATE "1"
diff --git a/dlls/kernel32/nls/zhm.nls b/dlls/kernel32/nls/zhm.nls
index 8cef84265b..1a915bda16 100644
--- a/dlls/kernel32/nls/zhm.nls
+++ b/dlls/kernel32/nls/zhm.nls
@@ -40,6 +40,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU
LOCALE_IDIGITSUBSTITUTION "1"
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IGEOID "151"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "1404"
LOCALE_ILDATE "1"
--
2.24.0
1
0
See attachment.
2
1
See attachment.
2
1
See attachment.
2
1
See attachment.
2
1
Binary packages for various distributions will be available from:
https://www.winehq.org/download
Summary since last release
* Rebased to current wine 4.20 (832 patches are applied to wine vanilla)
Upstreamed (Either directly from staging or fixed with a similar patch).
* dsdmo: Added dll
* winebus.inf: Add new INF file and copy it to the INF directory.
* winebus.sys: Implement AddDevice().
* wineboot: Create a root-enumerated device object for winebus.
* winebus.sys: Initialize and teardown the HID backends while the bus
FDO is still extant.
* ntoskrnl.exe: IoInvalidateDeviceRelations() receives the parent PDO.
* wine.inf: Remove registration for the winebus service.
* ole32: Implement returning a name in IEnumSTATPROPSTG.
Added:
* [46735] The Sims 2 demo needs Direct3DShaderValidatorCreate9()
implementation
Updated:
* winebuild-Fake_Dlls
* ntdll-NtContinue
* ntdll-MemoryWorkingSetExInformation
Where can you help
* Run Steam/Battle.net/GOG/UPlay/Epic
* Test your favorite game.
* Test your favorite applications.
* Improve staging patches and get them accepted upstream.
As always, if you find a bug, please report it via
https://bugs.winehq.org
Best Regards
Alistair.
1
0
[PATCH v2 1/2] include: add colordlg.h header file for color dialogs
by Vijay Kiran Kamuju 16 Nov '19
by Vijay Kiran Kamuju 16 Nov '19
16 Nov '19
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
include/Makefile.in | 1 +
include/colordlg.h | 62 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+)
create mode 100644 include/colordlg.h
diff --git a/include/Makefile.in b/include/Makefile.in
index c31fb50d7498..421e3d6c5988 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -60,6 +60,7 @@ SOURCES = \
cmdtxt.idl \
cmnquery.idl \
colinf.idl \
+ colordlg.h \
comcat.idl \
commctrl.h \
commctrl.rh \
diff --git a/include/colordlg.h b/include/colordlg.h
new file mode 100644
index 000000000000..330659f7a435
--- /dev/null
+++ b/include/colordlg.h
@@ -0,0 +1,62 @@
+/*
+ * Color Dialog definitions
+ *
+ * Copyright (C) 2019 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_COLORDLG_H
+#define __WINE_COLORDLG_H
+
+#define DLG_COLOR
+
+#define COLOR_HUESCROLL 700
+#define COLOR_SATSCROLL 701
+#define COLOR_LUMSCROLL 702
+#define COLOR_HUE 703
+#define COLOR_SAT 704
+#define COLOR_LUM 705
+#define COLOR_RED 706
+#define COLOR_GREEN 707
+#define COLOR_BLUE 708
+#define COLOR_CURRENT 709
+#define COLOR_RAINBOW 710
+#define COLOR_SAVE 711
+#define COLOR_ADD 712
+#define COLOR_SOLID 713
+#define COLOR_TUNE 714
+#define COLOR_SCHEMES 715
+#define COLOR_ELEMENT 716
+#define COLOR_SAMPLES 717
+#define COLOR_PALETTE 718
+#define COLOR_MIX 719
+#define COLOR_BOX1 720
+#define COLOR_CUSTOM1 721
+
+#define COLOR_HUEACCEL 723
+#define COLOR_SATACCEL 724
+#define COLOR_LUMACCEL 725
+#define COLOR_REDACCEL 726
+#define COLOR_GREENACCEL 727
+#define COLOR_BLUEACCEL 728
+
+#define COLOR_SOLID_LEFT 730
+#define COLOR_SOLID_RIGHT 731
+
+#define NUM_BASIC_COLORS 48
+#define NUM_CUSTOM_COLORS 16
+
+#endif /* __WINE_COLORDLG_H */
--
2.21.0
2
2
16 Nov '19
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
include/Makefile.in | 1 +
include/colordlg.h | 62 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+)
create mode 100644 include/colordlg.h
diff --git a/include/Makefile.in b/include/Makefile.in
index c31fb50d7498..421e3d6c5988 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -60,6 +60,7 @@ SOURCES = \
cmdtxt.idl \
cmnquery.idl \
colinf.idl \
+ colordlg.h \
comcat.idl \
commctrl.h \
commctrl.rh \
diff --git a/include/colordlg.h b/include/colordlg.h
new file mode 100644
index 000000000000..330659f7a435
--- /dev/null
+++ b/include/colordlg.h
@@ -0,0 +1,62 @@
+/*
+ * Color Dialog definitions
+ *
+ * Copyright (C) 2019 Vijay Kiran Kamuju
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_COLORDLG_H
+#define __WINE_COLORDLG_H
+
+#define DLG_COLOR
+
+#define COLOR_HUESCROLL 700
+#define COLOR_SATSCROLL 701
+#define COLOR_LUMSCROLL 702
+#define COLOR_HUE 703
+#define COLOR_SAT 704
+#define COLOR_LUM 705
+#define COLOR_RED 706
+#define COLOR_GREEN 707
+#define COLOR_BLUE 708
+#define COLOR_CURRENT 709
+#define COLOR_RAINBOW 710
+#define COLOR_SAVE 711
+#define COLOR_ADD 712
+#define COLOR_SOLID 713
+#define COLOR_TUNE 714
+#define COLOR_SCHEMES 715
+#define COLOR_ELEMENT 716
+#define COLOR_SAMPLES 717
+#define COLOR_PALETTE 718
+#define COLOR_MIX 719
+#define COLOR_BOX1 720
+#define COLOR_CUSTOM1 721
+
+#define COLOR_HUEACCEL 723
+#define COLOR_SATACCEL 724
+#define COLOR_LUMACCEL 725
+#define COLOR_REDACCEL 726
+#define COLOR_GREENACCEL 727
+#define COLOR_BLUEACCEL 728
+
+#define COLOR_SOLID_LEFT 730
+#define COLOR_SOLID_RIGHT 731
+
+#define NUM_BASIC_COLORS 48
+#define NUM_CUSTOM_COLORS 16
+
+#endif /* __WINE_COLORDLG_H */
--
2.21.0
2
2
15 Nov '19
As a regression test for bug 48072.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
dlls/ddraw/tests/ddraw2.c | 26 +++++++++++++++++++++++++-
dlls/ddraw/tests/ddraw4.c | 32 +++++++++++++++++++++++++++++++-
dlls/ddraw/tests/ddraw7.c | 32 +++++++++++++++++++++++++++++++-
3 files changed, 87 insertions(+), 3 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index bf0cfef0b1a..cc48c2ae356 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -929,6 +929,14 @@ static void test_coop_level_d3d_state(void)
HWND window;
HRESULT hr;
+ static D3DLVERTEX quad[] =
+ {
+ {{-1.0f}, {-1.0f}, {0.0f}, 0, {0x800000ff}},
+ {{-1.0f}, { 1.0f}, {0.0f}, 0, {0x800000ff}},
+ {{ 1.0f}, {-1.0f}, {0.0f}, 0, {0x800000ff}},
+ {{ 1.0f}, { 1.0f}, {0.0f}, 0, {0x800000ff}},
+ };
+
window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
@@ -944,6 +952,11 @@ static void test_coop_level_d3d_state(void)
viewport = create_viewport(device, 0, 0, 640, 480);
viewport_set_background(device, viewport, background);
+ hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_DESTBLEND, D3DBLEND_DESTALPHA);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
hr = IDirect3DDevice2_GetRenderTarget(device, &rt);
ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value);
@@ -984,12 +997,23 @@ static void test_coop_level_d3d_state(void)
hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value);
ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr);
ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value);
- hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET);
+ hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER);
ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr);
color = get_surface_color(rt, 320, 240);
ok(compare_color(color, 0x0000ff00, 1) || broken(compare_color(color, 0x00000000, 1)),
"Got unexpected color 0x%08x.\n", color);
+ hr = IDirect3DDevice2_SetCurrentViewport(device, viewport);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice2_BeginScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice2_EndScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ color = get_surface_color(rt, 320, 240);
+ todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color);
+
destroy_viewport(device, viewport);
destroy_material(background);
IDirectDrawSurface_Release(surface);
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index e3146ca45d0..5cdc74e50f9 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -1117,6 +1117,19 @@ static void test_coop_level_d3d_state(void)
HWND window;
HRESULT hr;
+ static struct
+ {
+ struct vec3 position;
+ DWORD diffuse;
+ }
+ quad[] =
+ {
+ {{-1.0f, -1.0f, 0.0f}, 0x800000ff},
+ {{-1.0f, 1.0f, 0.0f}, 0x800000ff},
+ {{ 1.0f, -1.0f, 0.0f}, 0x800000ff},
+ {{ 1.0f, 1.0f, 0.0f}, 0x800000ff},
+ };
+
window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
@@ -1127,6 +1140,11 @@ static void test_coop_level_d3d_state(void)
viewport = create_viewport(device, 0, 0, 640, 480);
+ hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_DESTBLEND, D3DBLEND_DESTALPHA);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
hr = IDirect3DDevice3_GetRenderTarget(device, &rt);
ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value);
@@ -1164,11 +1182,23 @@ static void test_coop_level_d3d_state(void)
hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value);
ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr);
ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value);
- hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0);
+ hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 1.0f, 0);
ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr);
color = get_surface_color(rt, 320, 240);
ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color);
+ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice3_BeginScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP,
+ D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice3_EndScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ color = get_surface_color(rt, 320, 240);
+ todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color);
+
destroy_viewport(device, viewport);
IDirectDrawSurface4_Release(surface);
IDirectDrawSurface4_Release(rt);
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 2cd3b516f14..5f4d1a166dd 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -1002,6 +1002,19 @@ static void test_coop_level_d3d_state(void)
HWND window;
HRESULT hr;
+ static struct
+ {
+ struct vec3 position;
+ DWORD diffuse;
+ }
+ quad[] =
+ {
+ {{-1.0f, -1.0f, 0.1f}, 0x800000ff},
+ {{-1.0f, 1.0f, 0.1f}, 0x800000ff},
+ {{ 1.0f, -1.0f, 0.1f}, 0x800000ff},
+ {{ 1.0f, 1.0f, 0.1f}, 0x800000ff},
+ };
+
window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
@@ -1010,6 +1023,13 @@ static void test_coop_level_d3d_state(void)
return;
}
+ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_DESTBLEND, D3DBLEND_DESTALPHA);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
hr = IDirect3DDevice7_GetRenderTarget(device, &rt);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value);
@@ -1066,11 +1086,21 @@ static void test_coop_level_d3d_state(void)
hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value);
- hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0);
+ hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 1.0f, 0);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
color = get_surface_color(rt, 320, 240);
ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color);
+ hr = IDirect3DDevice7_BeginScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP,
+ D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice7_EndScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ color = get_surface_color(rt, 320, 240);
+ todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color);
+
IDirectDrawSurface7_Release(surface);
IDirectDrawSurface7_Release(rt);
IDirect3DDevice7_Release(device);
--
2.23.0
3
5
15 Nov '19
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
dlls/wined3d/stateblock.c | 18 ++++++++++++++++++
dlls/wined3d/wined3d.spec | 1 +
include/wine/wined3d.h | 1 +
3 files changed, 20 insertions(+)
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index bf1e577f85c..898a4bc93d4 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -1679,6 +1679,24 @@ HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock
return wined3d_light_state_set_light(&stateblock->stateblock_state.light_state, light_idx, light, &object);
}
+HRESULT CDECL wined3d_stateblock_set_light_enable(struct wined3d_stateblock *stateblock, UINT light_idx, BOOL enable)
+{
+ struct wined3d_light_info *light_info;
+ HRESULT hr;
+
+ TRACE("stateblock %p, light_idx %u, enable %#x.\n", stateblock, light_idx, enable);
+
+ if (!(light_info = wined3d_light_state_get_light(&stateblock->stateblock_state.light_state, light_idx)))
+ {
+ if (FAILED(hr = wined3d_light_state_set_light(&stateblock->stateblock_state.light_state, light_idx,
+ &WINED3D_default_light, &light_info)))
+ return hr;
+ }
+ wined3d_light_state_enable_light(&stateblock->stateblock_state.light_state,
+ &stateblock->device->adapter->d3d_info, light_info, enable);
+ return S_OK;
+}
+
static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info)
{
union
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 8591aa51648..ea04c85d385 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -268,6 +268,7 @@
@ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr)
@ cdecl wined3d_stateblock_set_index_buffer(ptr ptr long)
@ cdecl wined3d_stateblock_set_light(ptr long ptr)
+@ cdecl wined3d_stateblock_set_light_enable(ptr long long)
@ cdecl wined3d_stateblock_set_material(ptr ptr)
@ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr)
@ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 33f668f9347..fac9eef5be2 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2677,6 +2677,7 @@ void __cdecl wined3d_stateblock_set_index_buffer(struct wined3d_stateblock *stat
struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id);
HRESULT __cdecl wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock,
UINT light_idx, const struct wined3d_light *light);
+HRESULT __cdecl wined3d_stateblock_set_light_enable(struct wined3d_stateblock *stateblock, UINT light_idx, BOOL enable);
void __cdecl wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock, const struct wined3d_material *material);
void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);
HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock,
--
2.23.0
2
7
15 Nov '19
Signed-off-by: Sven Baars <sven.wine(a)gmail.com>
---
dlls/msvcp140/tests/msvcp140.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c
index 8ad172495d..727efa0890 100644
--- a/dlls/msvcp140/tests/msvcp140.c
+++ b/dlls/msvcp140/tests/msvcp140.c
@@ -892,7 +892,8 @@ static void test_Stat(void)
perms = 0xdeadbeef;
val = p_Stat(sys_path, &perms);
ok(directory_file == val, "_Stat(): expect: regular, got %d\n", val);
- ok(0777 == perms, "_Stat(): perms expect: 0777, got 0%o\n", perms);
+ ok(0777 == perms || broken(0555 == perms) /* Windows 8 */,
+ "_Stat(): perms expect: 0777, got 0%o\n", perms);
if(ret) {
todo_wine ok(DeleteFileW(test_f1_linkW), "expect wine_test_dir/f1_link to exist\n");
--
2.17.1
2
1
15 Nov '19
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
include/knownfolders.h | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/include/knownfolders.h b/include/knownfolders.h
index 28e867cb210b..1b0bb7f3c47e 100644
--- a/include/knownfolders.h
+++ b/include/knownfolders.h
@@ -40,15 +40,27 @@
EXTERN_C const GUID name DECLSPEC_HIDDEN
#endif
+DEFINE_KNOWN_FOLDER(FOLDERID_AccountPictures, 0x008ca0b1, 0x55b4, 0x4c56, 0xb8, 0xa8, 0x4d, 0xe4, 0xb2, 0x99, 0xd3, 0xbe);
DEFINE_KNOWN_FOLDER(FOLDERID_AddNewPrograms, 0xde61d971, 0x5ebc, 0x4f02, 0xa3, 0xa9, 0x6c, 0x82, 0x89, 0x5e, 0x5c, 0x04);
DEFINE_KNOWN_FOLDER(FOLDERID_AdminTools, 0x724ef170, 0xa42d, 0x4fef, 0x9f, 0x26, 0xb6, 0x0e, 0x84, 0x6f, 0xba, 0x4f);
+DEFINE_KNOWN_FOLDER(FOLDERID_AllAppMods, 0x7ad67899, 0x66af, 0x43ba, 0x91, 0x56, 0x6a, 0xad, 0x42, 0xe6, 0xc5, 0x96);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppCaptures, 0xedc0fe71, 0x98d8, 0x4f4a, 0xb9, 0x20, 0xc8, 0xdc, 0x13, 0x3c, 0xb1, 0x65);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppDataDesktop, 0xb2c5e279, 0x7add, 0x439f, 0xb2, 0x8c, 0xc4, 0x1f, 0xe1, 0xbb, 0xf6, 0x72);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppDataDocuments, 0x7be16610, 0x1f7f, 0x44ac, 0xbf, 0xf0, 0x83, 0xe1, 0x5f, 0x2f, 0xfc, 0xa1);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppDataFavorites, 0x7cfbefbc, 0xde1f, 0x45aa, 0xb8, 0x43, 0xa5, 0x42, 0xac, 0x53, 0x6c, 0xc9);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppDataProgramData, 0x559d40a3, 0xa036, 0x40fa, 0xaf, 0x61, 0x84, 0xcb, 0x43, 0x0a, 0x4d, 0x34);
+DEFINE_KNOWN_FOLDER(FOLDERID_ApplicationShortcuts, 0xa3918781, 0xe5f2, 0x4890, 0xb3, 0xd9, 0xa7, 0xe5, 0x43, 0x32, 0x32, 0x8c);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppsFolder, 0x1e87508d, 0x89c2, 0x42f0, 0x8a, 0x7e, 0x64, 0x5a, 0x0f, 0x50, 0xca, 0x58);
DEFINE_KNOWN_FOLDER(FOLDERID_AppUpdates, 0xa305ce99, 0xf527, 0x492b, 0x8b, 0x1a, 0x7e, 0x76, 0xfa, 0x98, 0xd6, 0xe4);
+DEFINE_KNOWN_FOLDER(FOLDERID_CameraRoll, 0xab5fb87b, 0x7ce2, 0x4f83, 0x91, 0x5d, 0x55, 0x08, 0x46, 0xc9, 0x53, 0x7b);
+DEFINE_KNOWN_FOLDER(FOLDERID_CameraRollLibrary, 0x2b20df75, 0x1eda, 0x4039, 0x80, 0x97, 0x38, 0x79, 0x82, 0x27, 0xd5, 0xb7);
DEFINE_KNOWN_FOLDER(FOLDERID_CDBurning, 0x9e52ab10, 0xf80d, 0x49df, 0xac, 0xb8, 0x43, 0x30, 0xf5, 0x68, 0x78, 0x55);
DEFINE_KNOWN_FOLDER(FOLDERID_ChangeRemovePrograms, 0xdf7266ac, 0x9274, 0x4867, 0x8d, 0x55, 0x3b, 0xd6, 0x61, 0xde, 0x87, 0x2d);
DEFINE_KNOWN_FOLDER(FOLDERID_CommonAdminTools, 0xd0384e7d, 0xbac3, 0x4797, 0x8f, 0x14, 0xcb, 0xa2, 0x29, 0xb3, 0x92, 0xb5);
DEFINE_KNOWN_FOLDER(FOLDERID_CommonOEMLinks, 0xc1bae2d0, 0x10df, 0x4334, 0xbe, 0xdd, 0x7a, 0xa2, 0x0b, 0x22, 0x7a, 0x9d);
DEFINE_KNOWN_FOLDER(FOLDERID_CommonPrograms, 0x0139d44e, 0x6afe, 0x49f2, 0x86, 0x90, 0x3d, 0xaf, 0xca, 0xe6, 0xff, 0xb8);
DEFINE_KNOWN_FOLDER(FOLDERID_CommonStartMenu, 0xa4115719, 0xd62e, 0x491d, 0xaa, 0x7c, 0xe7, 0x4b, 0x8b, 0xe3, 0xb0, 0x67);
+DEFINE_KNOWN_FOLDER(FOLDERID_CommonStartMenuPlaces, 0xa440879f, 0x87a0, 0x4f7d, 0xb7, 0x00, 0x02, 0x07, 0xb9, 0x66, 0x19, 0x4a);
DEFINE_KNOWN_FOLDER(FOLDERID_CommonStartup, 0x82a5ea35, 0xd9cd, 0x47c5, 0x96, 0x29, 0xe1, 0x5d, 0x2f, 0x71, 0x4e, 0x6e);
DEFINE_KNOWN_FOLDER(FOLDERID_CommonTemplates, 0xb94237e7, 0x57ac, 0x4347, 0x91, 0x51, 0xb0, 0x8c, 0x6c, 0x32, 0xd1, 0xf7);
DEFINE_KNOWN_FOLDER(FOLDERID_ComputerFolder, 0x0ac0837c, 0xbbf8, 0x452a, 0x85, 0x0d, 0x79, 0xd0, 0x8e, 0x66, 0x7c, 0xa7);
@@ -57,7 +69,10 @@ DEFINE_KNOWN_FOLDER(FOLDERID_ConnectionsFolder, 0x6f0cd92b, 0x2e97, 0x45d1,
DEFINE_KNOWN_FOLDER(FOLDERID_Contacts, 0x56784854, 0xc6cb, 0x462b, 0x81, 0x69, 0x88, 0xe3, 0x50, 0xac, 0xb8, 0x82);
DEFINE_KNOWN_FOLDER(FOLDERID_ControlPanelFolder, 0x82a74aeb, 0xaeb4, 0x465c, 0xa0, 0x14, 0xd0, 0x97, 0xee, 0x34, 0x6d, 0x63);
DEFINE_KNOWN_FOLDER(FOLDERID_Cookies, 0x2b0f765d, 0xc0e9, 0x4171, 0x90, 0x8e, 0x08, 0xa6, 0x11, 0xb8, 0x4f, 0xf6);
+DEFINE_KNOWN_FOLDER(FOLDERID_CurrentAppMods, 0x3db40b20, 0x2a30, 0x4dbe, 0x91, 0x7e, 0x77, 0x1d, 0xd2, 0x1d, 0xd0, 0x99);
DEFINE_KNOWN_FOLDER(FOLDERID_Desktop, 0xb4bfcc3a, 0xdb2c, 0x424c, 0xb0, 0x29, 0x7f, 0xe9, 0x9a, 0x87, 0xc6, 0x41);
+DEFINE_KNOWN_FOLDER(FOLDERID_DevelopmentFiles, 0xdbe8e08e, 0x3053, 0x4bbc, 0xb1, 0x83, 0x2a, 0x7b, 0x2b, 0x19, 0x1e, 0x59);
+DEFINE_KNOWN_FOLDER(FOLDERID_Device, 0x1c2ac1dc, 0x4358, 0x4b6c, 0x97, 0x33, 0xaf, 0x21, 0x15, 0x65, 0x76, 0xf0);
DEFINE_KNOWN_FOLDER(FOLDERID_DeviceMetadataStore, 0x5ce4a5e9, 0xe4eb, 0x479d, 0xb8, 0x9f, 0x13, 0x0c, 0x02, 0x88, 0x61, 0x55);
DEFINE_KNOWN_FOLDER(FOLDERID_Documents, 0xfdd39ad0, 0x238f, 0x46af, 0xad, 0xb4, 0x6c, 0x85, 0x48, 0x03, 0x69, 0xc7);
DEFINE_KNOWN_FOLDER(FOLDERID_DocumentsLibrary, 0x7b0db17d, 0x9cd2, 0x4a93, 0x97, 0x33, 0x46, 0xcc, 0x89, 0x02, 0x2e, 0x7c);
@@ -68,6 +83,7 @@ DEFINE_KNOWN_FOLDER(FOLDERID_Games, 0xcac52c1a, 0xb53d, 0x4edc,
DEFINE_KNOWN_FOLDER(FOLDERID_GameTasks, 0x054fae61, 0x4dd8, 0x4787, 0x80, 0xb6, 0x09, 0x02, 0x20, 0xc4, 0xb7, 0x00);
DEFINE_KNOWN_FOLDER(FOLDERID_History, 0xd9dc8a3b, 0xb784, 0x432e, 0xa7, 0x81, 0x5a, 0x11, 0x30, 0xa7, 0x59, 0x63);
DEFINE_KNOWN_FOLDER(FOLDERID_HomeGroup, 0x52528a6b, 0xb9e3, 0x4add, 0xb6, 0x0d, 0x58, 0x8c, 0x2d, 0xba, 0x84, 0x2d);
+DEFINE_KNOWN_FOLDER(FOLDERID_HomeGroupCurrentUser, 0x9b74b6a3, 0x0dfd, 0x4f11, 0x9e, 0x78, 0x5f, 0x78, 0x00, 0xf2, 0xe7, 0x72);
DEFINE_KNOWN_FOLDER(FOLDERID_ImplicitAppShortcuts, 0xbcb5256f, 0x79f6, 0x4cee, 0xb7, 0x25, 0xdc, 0x34, 0xe4, 0x02, 0xfd, 0x46);
DEFINE_KNOWN_FOLDER(FOLDERID_InternetCache, 0x352481e8, 0x33be, 0x4251, 0xba, 0x85, 0x60, 0x07, 0xca, 0xed, 0xcf, 0x9d);
DEFINE_KNOWN_FOLDER(FOLDERID_InternetFolder, 0x4d9f7874, 0x4e0c, 0x4904, 0x96, 0x7b, 0x40, 0xb0, 0xd2, 0x0c, 0x3e, 0x4b);
@@ -75,11 +91,18 @@ DEFINE_KNOWN_FOLDER(FOLDERID_Libraries, 0x1b3ea5dc, 0xb587, 0x4786,
DEFINE_KNOWN_FOLDER(FOLDERID_Links, 0xbfb9d5e0, 0xc6a9, 0x404c, 0xb2, 0xb2, 0xae, 0x6d, 0xb6, 0xaf, 0x49, 0x68);
DEFINE_KNOWN_FOLDER(FOLDERID_LocalAppData, 0xf1b32785, 0x6fba, 0x4fcf, 0x9d, 0x55, 0x7b, 0x8e, 0x7f, 0x15, 0x70, 0x91);
DEFINE_KNOWN_FOLDER(FOLDERID_LocalAppDataLow, 0xa520a1a4, 0x1780, 0x4ff6, 0xbd, 0x18, 0x16, 0x73, 0x43, 0xc5, 0xaf, 0x16);
+DEFINE_KNOWN_FOLDER(FOLDERID_LocalDocuments, 0xf42ee2d3, 0x909f, 0x4907, 0x88, 0x71, 0x4c, 0x22, 0xfc, 0x0b, 0xf7, 0x56);
+DEFINE_KNOWN_FOLDER(FOLDERID_LocalDownloads, 0x7d83ee9b, 0x2244, 0x4e70, 0xb1, 0xf5, 0x53, 0x93, 0x04, 0x2a, 0xf1, 0xe4);
DEFINE_KNOWN_FOLDER(FOLDERID_LocalizedResourcesDir, 0x2a00375e, 0x224c, 0x49de, 0xb8, 0xd1, 0x44, 0x0d, 0xf7, 0xef, 0x3d, 0xdc);
+DEFINE_KNOWN_FOLDER(FOLDERID_LocalMusic, 0xa0c69a99, 0x21c8, 0x4671, 0x87, 0x03, 0x79, 0x34, 0x16, 0x2f, 0xcf, 0x1d);
+DEFINE_KNOWN_FOLDER(FOLDERID_LocalPictures, 0x0ddd015d, 0xb06c, 0x45d5, 0x8c, 0x4c, 0xf5, 0x97, 0x13, 0x85, 0x46, 0x39);
+DEFINE_KNOWN_FOLDER(FOLDERID_LocalVideos, 0x35286a68, 0x3c57, 0x41a1, 0xbb, 0xb1, 0x0e, 0xae, 0x73, 0xd7, 0x6c, 0x95);
DEFINE_KNOWN_FOLDER(FOLDERID_Music, 0x4bd8d571, 0x6d19, 0x48d3, 0xbe, 0x97, 0x42, 0x22, 0x20, 0x08, 0x0e, 0x43);
DEFINE_KNOWN_FOLDER(FOLDERID_MusicLibrary, 0x2112ab0a, 0xc86a, 0x4ffe, 0xa3, 0x68, 0x0d, 0xe9, 0x6e, 0x47, 0x01, 0x2e);
DEFINE_KNOWN_FOLDER(FOLDERID_NetHood, 0xc5abbf53, 0xe17f, 0x4121, 0x89, 0x00, 0x86, 0x62, 0x6f, 0xc2, 0xc9, 0x73);
DEFINE_KNOWN_FOLDER(FOLDERID_NetworkFolder, 0xd20beec4, 0x5ca8, 0x4905, 0xae, 0x3b, 0xbf, 0x25, 0x1e, 0xa0, 0x9b, 0x53);
+DEFINE_KNOWN_FOLDER(FOLDERID_Objects3D, 0x31c0dd25, 0x9439, 0x4f12, 0xbf, 0x41, 0x7f, 0xf4, 0xed, 0xa3, 0x87, 0x22);
+DEFINE_KNOWN_FOLDER(FOLDERID_OneDrive, 0xa52bba46, 0xe9e1, 0x435f, 0xb3, 0xd9, 0x28, 0xda, 0xa6, 0x48, 0xc0, 0xf6);
DEFINE_KNOWN_FOLDER(FOLDERID_OriginalImages, 0x2c36c0aa, 0x5812, 0x4b87, 0xbf, 0xd0, 0x4c, 0xd0, 0xdf, 0xb1, 0x9b, 0x39);
DEFINE_KNOWN_FOLDER(FOLDERID_PhotoAlbums, 0x69d2cf90, 0xfc33, 0x4fb7, 0x9a, 0x0c, 0xeb, 0xb0, 0xf0, 0xfc, 0xb4, 0x3c);
DEFINE_KNOWN_FOLDER(FOLDERID_Pictures, 0x33e28130, 0x4e1e, 0x4676, 0x83, 0x5a, 0x98, 0x39, 0x5c, 0x3b, 0xc3, 0xbb);
@@ -105,28 +128,44 @@ DEFINE_KNOWN_FOLDER(FOLDERID_PublicLibraries, 0x48daf80b, 0xe6cf, 0x4f4e,
DEFINE_KNOWN_FOLDER(FOLDERID_PublicMusic, 0x3214fab5, 0x9757, 0x4298, 0xbb, 0x61, 0x92, 0xa9, 0xde, 0xaa, 0x44, 0xff);
DEFINE_KNOWN_FOLDER(FOLDERID_PublicPictures, 0xb6ebfb86, 0x6907, 0x413c, 0x9a, 0xf7, 0x4f, 0xc2, 0xab, 0xf0, 0x7c, 0xc5);
DEFINE_KNOWN_FOLDER(FOLDERID_PublicRingtones, 0xe555ab60, 0x153b, 0x4d17, 0x9f, 0x04, 0xa5, 0xfe, 0x99, 0xfc, 0x15, 0xec);
+DEFINE_KNOWN_FOLDER(FOLDERID_PublicUserTiles, 0x0482af6c, 0x08f1, 0x4c34, 0x8c, 0x90, 0xe1, 0x7e, 0xc9, 0x8b, 0x1e, 0x17);
DEFINE_KNOWN_FOLDER(FOLDERID_PublicVideos, 0x2400183a, 0x6185, 0x49fb, 0xa2, 0xd8, 0x4a, 0x39, 0x2a, 0x60, 0x2b, 0xa3);
DEFINE_KNOWN_FOLDER(FOLDERID_QuickLaunch, 0x52a4f021, 0x7b75, 0x48a9, 0x9f, 0x6b, 0x4b, 0x87, 0xa2, 0x10, 0xbc, 0x8f);
DEFINE_KNOWN_FOLDER(FOLDERID_Recent, 0xae50c081, 0xebd2, 0x438a, 0x86, 0x55, 0x8a, 0x09, 0x2e, 0x34, 0x98, 0x7a);
+DEFINE_KNOWN_FOLDER(FOLDERID_RecordedCalls, 0x2f8b40c2, 0x83ed, 0x48ee, 0xb3, 0x83, 0xa1, 0xf1, 0x57, 0xec, 0x6f, 0x9a);
DEFINE_KNOWN_FOLDER(FOLDERID_RecordedTV, 0xbd85e001, 0x112e, 0x431e, 0x98, 0x3b, 0x7b, 0x15, 0xac, 0x09, 0xff, 0xf1);
DEFINE_KNOWN_FOLDER(FOLDERID_RecordedTVLibrary, 0x1a6fdba2, 0xf42d, 0x4358, 0xa7, 0x98, 0xb7, 0x4d, 0x74, 0x59, 0x26, 0xc5);
DEFINE_KNOWN_FOLDER(FOLDERID_RecycleBinFolder, 0xb7534046, 0x3ecb, 0x4c18, 0xbe, 0x4e, 0x64, 0xcd, 0x4c, 0xb7, 0xd6, 0xac);
DEFINE_KNOWN_FOLDER(FOLDERID_ResourceDir, 0x8ad10c31, 0x2adb, 0x4296, 0xa8, 0xf7, 0xe4, 0x70, 0x12, 0x32, 0xc9, 0x72);
+DEFINE_KNOWN_FOLDER(FOLDERID_RetailDemo, 0x12d4c69e, 0x24ad, 0x4923, 0xbe, 0x19, 0x31, 0x32, 0x1c, 0x43, 0xa7, 0x67);
DEFINE_KNOWN_FOLDER(FOLDERID_Ringtones, 0xc870044b, 0xf49e, 0x4126, 0xa9, 0xc3, 0xb5, 0x2a, 0x1f, 0xf4, 0x11, 0xe8);
+DEFINE_KNOWN_FOLDER(FOLDERID_RoamedTileImages, 0xaaa8d5a5, 0xf1d6, 0x4259, 0xba, 0xa8, 0x78, 0xe7, 0xef, 0x60, 0x83, 0x5e);
DEFINE_KNOWN_FOLDER(FOLDERID_RoamingAppData, 0x3eb685db, 0x65f9, 0x4cf6, 0xa0, 0x3a, 0xe3, 0xef, 0x65, 0x72, 0x9f, 0x3d);
+DEFINE_KNOWN_FOLDER(FOLDERID_RoamingTiles, 0x00bcfc5a, 0xed94, 0x4e48, 0x96, 0xa1, 0x3f, 0x62, 0x17, 0xf2, 0x19, 0x90);
DEFINE_KNOWN_FOLDER(FOLDERID_SampleMusic, 0xb250c668, 0xf57d, 0x4ee1, 0xa6, 0x3c, 0x29, 0x0e, 0xe7, 0xd1, 0xaa, 0x1f);
DEFINE_KNOWN_FOLDER(FOLDERID_SamplePictures, 0xc4900540, 0x2379, 0x4c75, 0x84, 0x4b, 0x64, 0xe6, 0xfa, 0xf8, 0x71, 0x6b);
DEFINE_KNOWN_FOLDER(FOLDERID_SamplePlaylists, 0x15ca69b3, 0x30ee, 0x49c1, 0xac, 0xe1, 0x6b, 0x5e, 0xc3, 0x72, 0xaf, 0xb5);
DEFINE_KNOWN_FOLDER(FOLDERID_SampleVideos, 0x859ead94, 0x2e85, 0x48ad, 0xa7, 0x1a, 0x09, 0x69, 0xcb, 0x56, 0xa6, 0xcd);
DEFINE_KNOWN_FOLDER(FOLDERID_SavedGames, 0x4c5c32ff, 0xbb9d, 0x43b0, 0xb5, 0xb4, 0x2d, 0x72, 0xe5, 0x4e, 0xaa, 0xa4);
+DEFINE_KNOWN_FOLDER(FOLDERID_SavedPictures, 0x3b193882, 0xd3ad, 0x4eab, 0x96, 0x5a, 0x69, 0x82, 0x9d, 0x1f, 0xb5, 0x9f);
+DEFINE_KNOWN_FOLDER(FOLDERID_SavedPicturesLibrary, 0xe25b5812, 0xbe88, 0x4bd9, 0x94, 0xb0, 0x29, 0x23, 0x34, 0x77, 0xb6, 0xc3);
DEFINE_KNOWN_FOLDER(FOLDERID_SavedSearches, 0x7d1d3a04, 0xdebb, 0x4115, 0x95, 0xcf, 0x2f, 0x29, 0xda, 0x29, 0x20, 0xda);
+DEFINE_KNOWN_FOLDER(FOLDERID_Screenshots, 0xb7bede81, 0xdf94, 0x4682, 0xa7, 0xd8, 0x57, 0xa5, 0x26, 0x20, 0xb8, 0x6f);
DEFINE_KNOWN_FOLDER(FOLDERID_SEARCH_CSC, 0xee32e446, 0x31ca, 0x4aba, 0x81, 0x4f, 0xa5, 0xeb, 0xd2, 0xfd, 0x6d, 0x5e);
+DEFINE_KNOWN_FOLDER(FOLDERID_SearchHistory, 0x0d4c3db6, 0x03a3, 0x462f, 0xa0, 0xe6, 0x08, 0x92, 0x4c, 0x41, 0xb5, 0xd4);
DEFINE_KNOWN_FOLDER(FOLDERID_SearchHome, 0x190337d1, 0xb8ca, 0x4121, 0xa6, 0x39, 0x6d, 0x47, 0x2d, 0x16, 0x97, 0x2a);
DEFINE_KNOWN_FOLDER(FOLDERID_SEARCH_MAPI, 0x98ec0e18, 0x2098, 0x4d44, 0x86, 0x44, 0x66, 0x97, 0x93, 0x15, 0xa2, 0x81);
+DEFINE_KNOWN_FOLDER(FOLDERID_SearchTemplates, 0x7e636bfe, 0xdfa9, 0x4d5e, 0xb4, 0x56, 0xd7, 0xb3, 0x98, 0x51, 0xd8, 0xa9);
DEFINE_KNOWN_FOLDER(FOLDERID_SendTo, 0x8983036c, 0x27c0, 0x404b, 0x8f, 0x08, 0x10, 0x2d, 0x10, 0xdc, 0xfd, 0x74);
DEFINE_KNOWN_FOLDER(FOLDERID_SidebarDefaultParts, 0x7b396e54, 0x9ec5, 0x4300, 0xbe, 0x0a, 0x24, 0x82, 0xeb, 0xae, 0x1a, 0x26);
DEFINE_KNOWN_FOLDER(FOLDERID_SidebarParts, 0xa75d362e, 0x50fc, 0x4fb7, 0xac, 0x2c, 0xa8, 0xbe, 0xaa, 0x31, 0x44, 0x93);
+DEFINE_KNOWN_FOLDER(FOLDERID_SkyDrive, 0xa52bba46, 0xe9e1, 0x435f, 0xb3, 0xd9, 0x28, 0xda, 0xa6, 0x48, 0xc0, 0xf6);
+DEFINE_KNOWN_FOLDER(FOLDERID_SkyDriveCameraRoll, 0x767e6811, 0x49cb, 0x4273, 0x87, 0xc2, 0x20, 0xf3, 0x55, 0xe1, 0x08, 0x5b);
+DEFINE_KNOWN_FOLDER(FOLDERID_SkyDriveDocuments, 0x24d89e24, 0x2f19, 0x4534, 0x9d, 0xde, 0x6a, 0x66, 0x71, 0xfb, 0xb8, 0xfe);
+DEFINE_KNOWN_FOLDER(FOLDERID_SkyDriveMusic, 0xc3f2459e, 0x80d6, 0x45dc, 0xbf, 0xef, 0x1f, 0x76, 0x9f, 0x2b, 0xe7, 0x30);
+DEFINE_KNOWN_FOLDER(FOLDERID_SkyDrivePictures, 0x339719b5, 0x8c47, 0x4894, 0x94, 0xc2, 0xd8, 0xf7, 0x7a, 0xdd, 0x44, 0xa6);
DEFINE_KNOWN_FOLDER(FOLDERID_StartMenu, 0x625b53c3, 0xab48, 0x4ec1, 0xba, 0x1f, 0xa1, 0xef, 0x41, 0x46, 0xfc, 0x19);
+DEFINE_KNOWN_FOLDER(FOLDERID_StartMenuAllPrograms, 0xf26305ef, 0x6948, 0x40b9, 0xb2, 0x55, 0x81, 0x45, 0x3d, 0x09, 0xc7, 0x85);
DEFINE_KNOWN_FOLDER(FOLDERID_Startup, 0xb97d20bb, 0xf46a, 0x4c97, 0xba, 0x10, 0x5e, 0x36, 0x08, 0x43, 0x08, 0x54);
DEFINE_KNOWN_FOLDER(FOLDERID_SyncManagerFolder, 0x43668bf8, 0xc14e, 0x49b2, 0x97, 0xc9, 0x74, 0x77, 0x84, 0xd7, 0x84, 0xb7);
DEFINE_KNOWN_FOLDER(FOLDERID_SyncResultsFolder, 0x289a9a43, 0xbe44, 0x4057, 0xa4, 0x1b, 0x58, 0x7a, 0x76, 0xd7, 0xe7, 0xf9);
--
2.21.0
1
0
15 Nov '19
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
include/knownfolders.h | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/include/knownfolders.h b/include/knownfolders.h
index 28e867cb210b..5a42c00a2ad4 100644
--- a/include/knownfolders.h
+++ b/include/knownfolders.h
@@ -40,15 +40,28 @@
EXTERN_C const GUID name DECLSPEC_HIDDEN
#endif
+DEFINE_KNOWN_FOLDER(FOLDERID_AccountPictures, 0x008ca0b1, 0x55b4, 0x4c56, 0xb8, 0xa8, 0x4d, 0xe4, 0xb2, 0x99, 0xd3, 0xbe);
DEFINE_KNOWN_FOLDER(FOLDERID_AddNewPrograms, 0xde61d971, 0x5ebc, 0x4f02, 0xa3, 0xa9, 0x6c, 0x82, 0x89, 0x5e, 0x5c, 0x04);
DEFINE_KNOWN_FOLDER(FOLDERID_AdminTools, 0x724ef170, 0xa42d, 0x4fef, 0x9f, 0x26, 0xb6, 0x0e, 0x84, 0x6f, 0xba, 0x4f);
+DEFINE_KNOWN_FOLDER(FOLDERID_AllAppMods, 0x7ad67899, 0x66af, 0x43ba, 0x91, 0x56, 0x6a, 0xad, 0x42, 0xe6, 0xc5, 0x96);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppCaptures, 0xedc0fe71, 0x98d8, 0x4f4a, 0xb9, 0x20, 0xc8, 0xdc, 0x13, 0x3c, 0xb1, 0x65);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppDataDesktop, 0xb2c5e279, 0x7add, 0x439f, 0xb2, 0x8c, 0xc4, 0x1f, 0xe1, 0xbb, 0xf6, 0x72);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppDataDocuments, 0x7be16610, 0x1f7f, 0x44ac, 0xbf, 0xf0, 0x83, 0xe1, 0x5f, 0x2f, 0xfc, 0xa1);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppDataFavorites, 0x7cfbefbc, 0xde1f, 0x45aa, 0xb8, 0x43, 0xa5, 0x42, 0xac, 0x53, 0x6c, 0xc9);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppDataProgramData, 0x559d40a3, 0xa036, 0x40fa, 0xaf, 0x61, 0x84, 0xcb, 0x43, 0x0a, 0x4d, 0x34);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppDataProgramData, 0x559d40a3, 0xa036, 0x40fa, 0xaf, 0x61, 0x84, 0xcb, 0x43, 0x0a, 0x4d, 0x34);
+DEFINE_KNOWN_FOLDER(FOLDERID_ApplicationShortcuts, 0xa3918781, 0xe5f2, 0x4890, 0xb3, 0xd9, 0xa7, 0xe5, 0x43, 0x32, 0x32, 0x8c);
+DEFINE_KNOWN_FOLDER(FOLDERID_AppsFolder, 0x1e87508d, 0x89c2, 0x42f0, 0x8a, 0x7e, 0x64, 0x5a, 0x0f, 0x50, 0xca, 0x58);
DEFINE_KNOWN_FOLDER(FOLDERID_AppUpdates, 0xa305ce99, 0xf527, 0x492b, 0x8b, 0x1a, 0x7e, 0x76, 0xfa, 0x98, 0xd6, 0xe4);
+DEFINE_KNOWN_FOLDER(FOLDERID_CameraRoll, 0xab5fb87b, 0x7ce2, 0x4f83, 0x91, 0x5d, 0x55, 0x08, 0x46, 0xc9, 0x53, 0x7b);
+DEFINE_KNOWN_FOLDER(FOLDERID_CameraRollLibrary, 0x2b20df75, 0x1eda, 0x4039, 0x80, 0x97, 0x38, 0x79, 0x82, 0x27, 0xd5, 0xb7);
DEFINE_KNOWN_FOLDER(FOLDERID_CDBurning, 0x9e52ab10, 0xf80d, 0x49df, 0xac, 0xb8, 0x43, 0x30, 0xf5, 0x68, 0x78, 0x55);
DEFINE_KNOWN_FOLDER(FOLDERID_ChangeRemovePrograms, 0xdf7266ac, 0x9274, 0x4867, 0x8d, 0x55, 0x3b, 0xd6, 0x61, 0xde, 0x87, 0x2d);
DEFINE_KNOWN_FOLDER(FOLDERID_CommonAdminTools, 0xd0384e7d, 0xbac3, 0x4797, 0x8f, 0x14, 0xcb, 0xa2, 0x29, 0xb3, 0x92, 0xb5);
DEFINE_KNOWN_FOLDER(FOLDERID_CommonOEMLinks, 0xc1bae2d0, 0x10df, 0x4334, 0xbe, 0xdd, 0x7a, 0xa2, 0x0b, 0x22, 0x7a, 0x9d);
DEFINE_KNOWN_FOLDER(FOLDERID_CommonPrograms, 0x0139d44e, 0x6afe, 0x49f2, 0x86, 0x90, 0x3d, 0xaf, 0xca, 0xe6, 0xff, 0xb8);
DEFINE_KNOWN_FOLDER(FOLDERID_CommonStartMenu, 0xa4115719, 0xd62e, 0x491d, 0xaa, 0x7c, 0xe7, 0x4b, 0x8b, 0xe3, 0xb0, 0x67);
+DEFINE_KNOWN_FOLDER(FOLDERID_CommonStartMenuPlaces, 0xa440879f, 0x87a0, 0x4f7d, 0xb7, 0x00, 0x02, 0x07, 0xb9, 0x66, 0x19, 0x4a);
DEFINE_KNOWN_FOLDER(FOLDERID_CommonStartup, 0x82a5ea35, 0xd9cd, 0x47c5, 0x96, 0x29, 0xe1, 0x5d, 0x2f, 0x71, 0x4e, 0x6e);
DEFINE_KNOWN_FOLDER(FOLDERID_CommonTemplates, 0xb94237e7, 0x57ac, 0x4347, 0x91, 0x51, 0xb0, 0x8c, 0x6c, 0x32, 0xd1, 0xf7);
DEFINE_KNOWN_FOLDER(FOLDERID_ComputerFolder, 0x0ac0837c, 0xbbf8, 0x452a, 0x85, 0x0d, 0x79, 0xd0, 0x8e, 0x66, 0x7c, 0xa7);
@@ -57,7 +70,10 @@ DEFINE_KNOWN_FOLDER(FOLDERID_ConnectionsFolder, 0x6f0cd92b, 0x2e97, 0x45d1,
DEFINE_KNOWN_FOLDER(FOLDERID_Contacts, 0x56784854, 0xc6cb, 0x462b, 0x81, 0x69, 0x88, 0xe3, 0x50, 0xac, 0xb8, 0x82);
DEFINE_KNOWN_FOLDER(FOLDERID_ControlPanelFolder, 0x82a74aeb, 0xaeb4, 0x465c, 0xa0, 0x14, 0xd0, 0x97, 0xee, 0x34, 0x6d, 0x63);
DEFINE_KNOWN_FOLDER(FOLDERID_Cookies, 0x2b0f765d, 0xc0e9, 0x4171, 0x90, 0x8e, 0x08, 0xa6, 0x11, 0xb8, 0x4f, 0xf6);
+DEFINE_KNOWN_FOLDER(FOLDERID_CurrentAppMods, 0x3db40b20, 0x2a30, 0x4dbe, 0x91, 0x7e, 0x77, 0x1d, 0xd2, 0x1d, 0xd0, 0x99);
DEFINE_KNOWN_FOLDER(FOLDERID_Desktop, 0xb4bfcc3a, 0xdb2c, 0x424c, 0xb0, 0x29, 0x7f, 0xe9, 0x9a, 0x87, 0xc6, 0x41);
+DEFINE_KNOWN_FOLDER(FOLDERID_DevelopmentFiles, 0xdbe8e08e, 0x3053, 0x4bbc, 0xb1, 0x83, 0x2a, 0x7b, 0x2b, 0x19, 0x1e, 0x59);
+DEFINE_KNOWN_FOLDER(FOLDERID_Device, 0x1c2ac1dc, 0x4358, 0x4b6c, 0x97, 0x33, 0xaf, 0x21, 0x15, 0x65, 0x76, 0xf0);
DEFINE_KNOWN_FOLDER(FOLDERID_DeviceMetadataStore, 0x5ce4a5e9, 0xe4eb, 0x479d, 0xb8, 0x9f, 0x13, 0x0c, 0x02, 0x88, 0x61, 0x55);
DEFINE_KNOWN_FOLDER(FOLDERID_Documents, 0xfdd39ad0, 0x238f, 0x46af, 0xad, 0xb4, 0x6c, 0x85, 0x48, 0x03, 0x69, 0xc7);
DEFINE_KNOWN_FOLDER(FOLDERID_DocumentsLibrary, 0x7b0db17d, 0x9cd2, 0x4a93, 0x97, 0x33, 0x46, 0xcc, 0x89, 0x02, 0x2e, 0x7c);
@@ -68,6 +84,7 @@ DEFINE_KNOWN_FOLDER(FOLDERID_Games, 0xcac52c1a, 0xb53d, 0x4edc,
DEFINE_KNOWN_FOLDER(FOLDERID_GameTasks, 0x054fae61, 0x4dd8, 0x4787, 0x80, 0xb6, 0x09, 0x02, 0x20, 0xc4, 0xb7, 0x00);
DEFINE_KNOWN_FOLDER(FOLDERID_History, 0xd9dc8a3b, 0xb784, 0x432e, 0xa7, 0x81, 0x5a, 0x11, 0x30, 0xa7, 0x59, 0x63);
DEFINE_KNOWN_FOLDER(FOLDERID_HomeGroup, 0x52528a6b, 0xb9e3, 0x4add, 0xb6, 0x0d, 0x58, 0x8c, 0x2d, 0xba, 0x84, 0x2d);
+DEFINE_KNOWN_FOLDER(FOLDERID_HomeGroupCurrentUser, 0x9b74b6a3, 0x0dfd, 0x4f11, 0x9e, 0x78, 0x5f, 0x78, 0x00, 0xf2, 0xe7, 0x72);
DEFINE_KNOWN_FOLDER(FOLDERID_ImplicitAppShortcuts, 0xbcb5256f, 0x79f6, 0x4cee, 0xb7, 0x25, 0xdc, 0x34, 0xe4, 0x02, 0xfd, 0x46);
DEFINE_KNOWN_FOLDER(FOLDERID_InternetCache, 0x352481e8, 0x33be, 0x4251, 0xba, 0x85, 0x60, 0x07, 0xca, 0xed, 0xcf, 0x9d);
DEFINE_KNOWN_FOLDER(FOLDERID_InternetFolder, 0x4d9f7874, 0x4e0c, 0x4904, 0x96, 0x7b, 0x40, 0xb0, 0xd2, 0x0c, 0x3e, 0x4b);
@@ -75,11 +92,18 @@ DEFINE_KNOWN_FOLDER(FOLDERID_Libraries, 0x1b3ea5dc, 0xb587, 0x4786,
DEFINE_KNOWN_FOLDER(FOLDERID_Links, 0xbfb9d5e0, 0xc6a9, 0x404c, 0xb2, 0xb2, 0xae, 0x6d, 0xb6, 0xaf, 0x49, 0x68);
DEFINE_KNOWN_FOLDER(FOLDERID_LocalAppData, 0xf1b32785, 0x6fba, 0x4fcf, 0x9d, 0x55, 0x7b, 0x8e, 0x7f, 0x15, 0x70, 0x91);
DEFINE_KNOWN_FOLDER(FOLDERID_LocalAppDataLow, 0xa520a1a4, 0x1780, 0x4ff6, 0xbd, 0x18, 0x16, 0x73, 0x43, 0xc5, 0xaf, 0x16);
+DEFINE_KNOWN_FOLDER(FOLDERID_LocalDocuments, 0xf42ee2d3, 0x909f, 0x4907, 0x88, 0x71, 0x4c, 0x22, 0xfc, 0x0b, 0xf7, 0x56);
+DEFINE_KNOWN_FOLDER(FOLDERID_LocalDownloads, 0x7d83ee9b, 0x2244, 0x4e70, 0xb1, 0xf5, 0x53, 0x93, 0x04, 0x2a, 0xf1, 0xe4);
DEFINE_KNOWN_FOLDER(FOLDERID_LocalizedResourcesDir, 0x2a00375e, 0x224c, 0x49de, 0xb8, 0xd1, 0x44, 0x0d, 0xf7, 0xef, 0x3d, 0xdc);
+DEFINE_KNOWN_FOLDER(FOLDERID_LocalMusic, 0xa0c69a99, 0x21c8, 0x4671, 0x87, 0x03, 0x79, 0x34, 0x16, 0x2f, 0xcf, 0x1d);
+DEFINE_KNOWN_FOLDER(FOLDERID_LocalPictures, 0x0ddd015d, 0xb06c, 0x45d5, 0x8c, 0x4c, 0xf5, 0x97, 0x13, 0x85, 0x46, 0x39);
+DEFINE_KNOWN_FOLDER(FOLDERID_LocalVideos, 0x35286a68, 0x3c57, 0x41a1, 0xbb, 0xb1, 0x0e, 0xae, 0x73, 0xd7, 0x6c, 0x95);
DEFINE_KNOWN_FOLDER(FOLDERID_Music, 0x4bd8d571, 0x6d19, 0x48d3, 0xbe, 0x97, 0x42, 0x22, 0x20, 0x08, 0x0e, 0x43);
DEFINE_KNOWN_FOLDER(FOLDERID_MusicLibrary, 0x2112ab0a, 0xc86a, 0x4ffe, 0xa3, 0x68, 0x0d, 0xe9, 0x6e, 0x47, 0x01, 0x2e);
DEFINE_KNOWN_FOLDER(FOLDERID_NetHood, 0xc5abbf53, 0xe17f, 0x4121, 0x89, 0x00, 0x86, 0x62, 0x6f, 0xc2, 0xc9, 0x73);
DEFINE_KNOWN_FOLDER(FOLDERID_NetworkFolder, 0xd20beec4, 0x5ca8, 0x4905, 0xae, 0x3b, 0xbf, 0x25, 0x1e, 0xa0, 0x9b, 0x53);
+DEFINE_KNOWN_FOLDER(FOLDERID_Objects3D, 0x31c0dd25, 0x9439, 0x4f12, 0xbf, 0x41, 0x7f, 0xf4, 0xed, 0xa3, 0x87, 0x22);
+DEFINE_KNOWN_FOLDER(FOLDERID_OneDrive, 0xa52bba46, 0xe9e1, 0x435f, 0xb3, 0xd9, 0x28, 0xda, 0xa6, 0x48, 0xc0, 0xf6);
DEFINE_KNOWN_FOLDER(FOLDERID_OriginalImages, 0x2c36c0aa, 0x5812, 0x4b87, 0xbf, 0xd0, 0x4c, 0xd0, 0xdf, 0xb1, 0x9b, 0x39);
DEFINE_KNOWN_FOLDER(FOLDERID_PhotoAlbums, 0x69d2cf90, 0xfc33, 0x4fb7, 0x9a, 0x0c, 0xeb, 0xb0, 0xf0, 0xfc, 0xb4, 0x3c);
DEFINE_KNOWN_FOLDER(FOLDERID_Pictures, 0x33e28130, 0x4e1e, 0x4676, 0x83, 0x5a, 0x98, 0x39, 0x5c, 0x3b, 0xc3, 0xbb);
@@ -105,28 +129,44 @@ DEFINE_KNOWN_FOLDER(FOLDERID_PublicLibraries, 0x48daf80b, 0xe6cf, 0x4f4e,
DEFINE_KNOWN_FOLDER(FOLDERID_PublicMusic, 0x3214fab5, 0x9757, 0x4298, 0xbb, 0x61, 0x92, 0xa9, 0xde, 0xaa, 0x44, 0xff);
DEFINE_KNOWN_FOLDER(FOLDERID_PublicPictures, 0xb6ebfb86, 0x6907, 0x413c, 0x9a, 0xf7, 0x4f, 0xc2, 0xab, 0xf0, 0x7c, 0xc5);
DEFINE_KNOWN_FOLDER(FOLDERID_PublicRingtones, 0xe555ab60, 0x153b, 0x4d17, 0x9f, 0x04, 0xa5, 0xfe, 0x99, 0xfc, 0x15, 0xec);
+DEFINE_KNOWN_FOLDER(FOLDERID_PublicUserTiles, 0x0482af6c, 0x08f1, 0x4c34, 0x8c, 0x90, 0xe1, 0x7e, 0xc9, 0x8b, 0x1e, 0x17);
DEFINE_KNOWN_FOLDER(FOLDERID_PublicVideos, 0x2400183a, 0x6185, 0x49fb, 0xa2, 0xd8, 0x4a, 0x39, 0x2a, 0x60, 0x2b, 0xa3);
DEFINE_KNOWN_FOLDER(FOLDERID_QuickLaunch, 0x52a4f021, 0x7b75, 0x48a9, 0x9f, 0x6b, 0x4b, 0x87, 0xa2, 0x10, 0xbc, 0x8f);
DEFINE_KNOWN_FOLDER(FOLDERID_Recent, 0xae50c081, 0xebd2, 0x438a, 0x86, 0x55, 0x8a, 0x09, 0x2e, 0x34, 0x98, 0x7a);
+DEFINE_KNOWN_FOLDER(FOLDERID_RecordedCalls, 0x2f8b40c2, 0x83ed, 0x48ee, 0xb3, 0x83, 0xa1, 0xf1, 0x57, 0xec, 0x6f, 0x9a);
DEFINE_KNOWN_FOLDER(FOLDERID_RecordedTV, 0xbd85e001, 0x112e, 0x431e, 0x98, 0x3b, 0x7b, 0x15, 0xac, 0x09, 0xff, 0xf1);
DEFINE_KNOWN_FOLDER(FOLDERID_RecordedTVLibrary, 0x1a6fdba2, 0xf42d, 0x4358, 0xa7, 0x98, 0xb7, 0x4d, 0x74, 0x59, 0x26, 0xc5);
DEFINE_KNOWN_FOLDER(FOLDERID_RecycleBinFolder, 0xb7534046, 0x3ecb, 0x4c18, 0xbe, 0x4e, 0x64, 0xcd, 0x4c, 0xb7, 0xd6, 0xac);
DEFINE_KNOWN_FOLDER(FOLDERID_ResourceDir, 0x8ad10c31, 0x2adb, 0x4296, 0xa8, 0xf7, 0xe4, 0x70, 0x12, 0x32, 0xc9, 0x72);
+DEFINE_KNOWN_FOLDER(FOLDERID_RetailDemo, 0x12d4c69e, 0x24ad, 0x4923, 0xbe, 0x19, 0x31, 0x32, 0x1c, 0x43, 0xa7, 0x67);
DEFINE_KNOWN_FOLDER(FOLDERID_Ringtones, 0xc870044b, 0xf49e, 0x4126, 0xa9, 0xc3, 0xb5, 0x2a, 0x1f, 0xf4, 0x11, 0xe8);
+DEFINE_KNOWN_FOLDER(FOLDERID_RoamedTileImages, 0xaaa8d5a5, 0xf1d6, 0x4259, 0xba, 0xa8, 0x78, 0xe7, 0xef, 0x60, 0x83, 0x5e);
DEFINE_KNOWN_FOLDER(FOLDERID_RoamingAppData, 0x3eb685db, 0x65f9, 0x4cf6, 0xa0, 0x3a, 0xe3, 0xef, 0x65, 0x72, 0x9f, 0x3d);
+DEFINE_KNOWN_FOLDER(FOLDERID_RoamingTiles, 0x00bcfc5a, 0xed94, 0x4e48, 0x96, 0xa1, 0x3f, 0x62, 0x17, 0xf2, 0x19, 0x90);
DEFINE_KNOWN_FOLDER(FOLDERID_SampleMusic, 0xb250c668, 0xf57d, 0x4ee1, 0xa6, 0x3c, 0x29, 0x0e, 0xe7, 0xd1, 0xaa, 0x1f);
DEFINE_KNOWN_FOLDER(FOLDERID_SamplePictures, 0xc4900540, 0x2379, 0x4c75, 0x84, 0x4b, 0x64, 0xe6, 0xfa, 0xf8, 0x71, 0x6b);
DEFINE_KNOWN_FOLDER(FOLDERID_SamplePlaylists, 0x15ca69b3, 0x30ee, 0x49c1, 0xac, 0xe1, 0x6b, 0x5e, 0xc3, 0x72, 0xaf, 0xb5);
DEFINE_KNOWN_FOLDER(FOLDERID_SampleVideos, 0x859ead94, 0x2e85, 0x48ad, 0xa7, 0x1a, 0x09, 0x69, 0xcb, 0x56, 0xa6, 0xcd);
DEFINE_KNOWN_FOLDER(FOLDERID_SavedGames, 0x4c5c32ff, 0xbb9d, 0x43b0, 0xb5, 0xb4, 0x2d, 0x72, 0xe5, 0x4e, 0xaa, 0xa4);
+DEFINE_KNOWN_FOLDER(FOLDERID_SavedPictures, 0x3b193882, 0xd3ad, 0x4eab, 0x96, 0x5a, 0x69, 0x82, 0x9d, 0x1f, 0xb5, 0x9f);
+DEFINE_KNOWN_FOLDER(FOLDERID_SavedPicturesLibrary, 0xe25b5812, 0xbe88, 0x4bd9, 0x94, 0xb0, 0x29, 0x23, 0x34, 0x77, 0xb6, 0xc3);
DEFINE_KNOWN_FOLDER(FOLDERID_SavedSearches, 0x7d1d3a04, 0xdebb, 0x4115, 0x95, 0xcf, 0x2f, 0x29, 0xda, 0x29, 0x20, 0xda);
+DEFINE_KNOWN_FOLDER(FOLDERID_Screenshots, 0xb7bede81, 0xdf94, 0x4682, 0xa7, 0xd8, 0x57, 0xa5, 0x26, 0x20, 0xb8, 0x6f);
DEFINE_KNOWN_FOLDER(FOLDERID_SEARCH_CSC, 0xee32e446, 0x31ca, 0x4aba, 0x81, 0x4f, 0xa5, 0xeb, 0xd2, 0xfd, 0x6d, 0x5e);
+DEFINE_KNOWN_FOLDER(FOLDERID_SearchHistory, 0x0d4c3db6, 0x03a3, 0x462f, 0xa0, 0xe6, 0x08, 0x92, 0x4c, 0x41, 0xb5, 0xd4);
DEFINE_KNOWN_FOLDER(FOLDERID_SearchHome, 0x190337d1, 0xb8ca, 0x4121, 0xa6, 0x39, 0x6d, 0x47, 0x2d, 0x16, 0x97, 0x2a);
DEFINE_KNOWN_FOLDER(FOLDERID_SEARCH_MAPI, 0x98ec0e18, 0x2098, 0x4d44, 0x86, 0x44, 0x66, 0x97, 0x93, 0x15, 0xa2, 0x81);
+DEFINE_KNOWN_FOLDER(FOLDERID_SearchTemplates, 0x7e636bfe, 0xdfa9, 0x4d5e, 0xb4, 0x56, 0xd7, 0xb3, 0x98, 0x51, 0xd8, 0xa9);
DEFINE_KNOWN_FOLDER(FOLDERID_SendTo, 0x8983036c, 0x27c0, 0x404b, 0x8f, 0x08, 0x10, 0x2d, 0x10, 0xdc, 0xfd, 0x74);
DEFINE_KNOWN_FOLDER(FOLDERID_SidebarDefaultParts, 0x7b396e54, 0x9ec5, 0x4300, 0xbe, 0x0a, 0x24, 0x82, 0xeb, 0xae, 0x1a, 0x26);
DEFINE_KNOWN_FOLDER(FOLDERID_SidebarParts, 0xa75d362e, 0x50fc, 0x4fb7, 0xac, 0x2c, 0xa8, 0xbe, 0xaa, 0x31, 0x44, 0x93);
+DEFINE_KNOWN_FOLDER(FOLDERID_SkyDrive, 0xa52bba46, 0xe9e1, 0x435f, 0xb3, 0xd9, 0x28, 0xda, 0xa6, 0x48, 0xc0, 0xf6);
+DEFINE_KNOWN_FOLDER(FOLDERID_SkyDriveCameraRoll, 0x767e6811, 0x49cb, 0x4273, 0x87, 0xc2, 0x20, 0xf3, 0x55, 0xe1, 0x08, 0x5b);
+DEFINE_KNOWN_FOLDER(FOLDERID_SkyDriveDocuments, 0x24d89e24, 0x2f19, 0x4534, 0x9d, 0xde, 0x6a, 0x66, 0x71, 0xfb, 0xb8, 0xfe);
+DEFINE_KNOWN_FOLDER(FOLDERID_SkyDriveMusic, 0xc3f2459e, 0x80d6, 0x45dc, 0xbf, 0xef, 0x1f, 0x76, 0x9f, 0x2b, 0xe7, 0x30);
+DEFINE_KNOWN_FOLDER(FOLDERID_SkyDrivePictures, 0x339719b5, 0x8c47, 0x4894, 0x94, 0xc2, 0xd8, 0xf7, 0x7a, 0xdd, 0x44, 0xa6);
DEFINE_KNOWN_FOLDER(FOLDERID_StartMenu, 0x625b53c3, 0xab48, 0x4ec1, 0xba, 0x1f, 0xa1, 0xef, 0x41, 0x46, 0xfc, 0x19);
+DEFINE_KNOWN_FOLDER(FOLDERID_StartMenuAllPrograms, 0xf26305ef, 0x6948, 0x40b9, 0xb2, 0x55, 0x81, 0x45, 0x3d, 0x09, 0xc7, 0x85);
DEFINE_KNOWN_FOLDER(FOLDERID_Startup, 0xb97d20bb, 0xf46a, 0x4c97, 0xba, 0x10, 0x5e, 0x36, 0x08, 0x43, 0x08, 0x54);
DEFINE_KNOWN_FOLDER(FOLDERID_SyncManagerFolder, 0x43668bf8, 0xc14e, 0x49b2, 0x97, 0xc9, 0x74, 0x77, 0x84, 0xd7, 0x84, 0xb7);
DEFINE_KNOWN_FOLDER(FOLDERID_SyncResultsFolder, 0x289a9a43, 0xbe44, 0x4057, 0xa4, 0x1b, 0x58, 0x7a, 0x76, 0xd7, 0xe7, 0xf9);
--
2.21.0
2
1
[PATCH v2 01/10] vbscript: Move the global lists to the script dispatch object.
by Gabriel Ivăncescu 15 Nov '19
by Gabriel Ivăncescu 15 Nov '19
15 Nov '19
Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
Note that we have to move the non-persistent vbscode from the context's list,
so it can be freed by the dispatch object only when it is released.
This is needed for the TypeInfo (and named contexts).
dlls/vbscript/compile.c | 15 ++++----
dlls/vbscript/interp.c | 39 +++++++++++----------
dlls/vbscript/vbdisp.c | 38 +++++++++++++++-----
dlls/vbscript/vbscript.c | 75 +++++++++++++++-------------------------
dlls/vbscript/vbscript.h | 43 ++++++++++++-----------
5 files changed, 107 insertions(+), 103 deletions(-)
diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c
index bc00209..9ddfacf 100644
--- a/dlls/vbscript/compile.c
+++ b/dlls/vbscript/compile.c
@@ -1758,21 +1758,22 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl)
static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier)
{
+ ScriptDisp *obj = script->script_obj;
class_desc_t *class;
vbscode_t *code;
unsigned i;
- for(i = 0; i < script->global_vars_cnt; i++) {
- if(!wcsicmp(script->global_vars[i]->name, identifier))
+ for(i = 0; i < obj->global_vars_cnt; i++) {
+ if(!wcsicmp(obj->global_vars[i]->name, identifier))
return TRUE;
}
- for(i = 0; i < script->global_funcs_cnt; i++) {
- if(!wcsicmp(script->global_funcs[i]->name, identifier))
+ for(i = 0; i < obj->global_funcs_cnt; i++) {
+ if(!wcsicmp(obj->global_funcs[i]->name, identifier))
return TRUE;
}
- for(class = script->classes; class; class = class->next) {
+ for(class = obj->classes; class; class = class->next) {
if(!wcsicmp(class->name, identifier))
return TRUE;
}
@@ -1977,8 +1978,8 @@ HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *d
desc->func_cnt = 1;
desc->funcs->entries[VBDISP_CALLGET] = &code->main_code;
- desc->next = script->procs;
- script->procs = desc;
+ desc->next = script->script_obj->procs;
+ script->script_obj->procs = desc;
*ret = desc;
return S_OK;
diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index d15a1b5..66ad206 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -94,7 +94,7 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re
return FALSE;
}
-static BOOL lookup_global_vars(script_ctx_t *script, const WCHAR *name, ref_t *ref)
+static BOOL lookup_global_vars(ScriptDisp *script, const WCHAR *name, ref_t *ref)
{
dynamic_var_t **vars = script->global_vars;
size_t i, cnt = script->global_vars_cnt;
@@ -112,6 +112,7 @@ static BOOL lookup_global_vars(script_ctx_t *script, const WCHAR *name, ref_t *r
static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref)
{
+ ScriptDisp *script_obj = ctx->script->script_obj;
named_item_t *item;
IDispatch *disp;
unsigned i;
@@ -175,11 +176,11 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_
}
}
- if(lookup_global_vars(ctx->script, name, ref))
+ if(lookup_global_vars(script_obj, name, ref))
return S_OK;
- for(i = 0; i < ctx->script->global_funcs_cnt; i++) {
- function_t *func = ctx->script->global_funcs[i];
+ for(i = 0; i < script_obj->global_funcs_cnt; i++) {
+ function_t *func = script_obj->global_funcs[i];
if(!wcsicmp(func->name, name)) {
ref->type = REF_FUNC;
ref->u.f = func;
@@ -221,12 +222,13 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_
static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name,
BOOL is_const, VARIANT **out_var)
{
+ ScriptDisp *script_obj = ctx->script->script_obj;
dynamic_var_t *new_var;
heap_pool_t *heap;
WCHAR *str;
unsigned size;
- heap = ctx->func->type == FUNC_GLOBAL ? &ctx->script->heap : &ctx->heap;
+ heap = ctx->func->type == FUNC_GLOBAL ? &script_obj->heap : &ctx->heap;
new_var = heap_pool_alloc(heap, sizeof(*new_var));
if(!new_var)
@@ -243,19 +245,19 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name,
V_VT(&new_var->v) = VT_EMPTY;
if(ctx->func->type == FUNC_GLOBAL) {
- size_t cnt = ctx->script->global_vars_cnt + 1;
- if(cnt > ctx->script->global_vars_size) {
+ size_t cnt = script_obj->global_vars_cnt + 1;
+ if(cnt > script_obj->global_vars_size) {
dynamic_var_t **new_vars;
- if(ctx->script->global_vars)
- new_vars = heap_realloc(ctx->script->global_vars, cnt * 2 * sizeof(*new_vars));
+ if(script_obj->global_vars)
+ new_vars = heap_realloc(script_obj->global_vars, cnt * 2 * sizeof(*new_vars));
else
new_vars = heap_alloc(cnt * 2 * sizeof(*new_vars));
if(!new_vars)
return E_OUTOFMEMORY;
- ctx->script->global_vars = new_vars;
- ctx->script->global_vars_size = cnt * 2;
+ script_obj->global_vars = new_vars;
+ script_obj->global_vars_size = cnt * 2;
}
- ctx->script->global_vars[ctx->script->global_vars_cnt++] = new_var;
+ script_obj->global_vars[script_obj->global_vars_cnt++] = new_var;
}else {
new_var->next = ctx->dynamic_vars;
ctx->dynamic_vars = new_var;
@@ -1113,7 +1115,7 @@ static HRESULT interp_new(exec_ctx_t *ctx)
return stack_push(ctx, &v);
}
- for(class_desc = ctx->script->classes; class_desc; class_desc = class_desc->next) {
+ for(class_desc = ctx->script->script_obj->classes; class_desc; class_desc = class_desc->next) {
if(!wcsicmp(class_desc->name, arg))
break;
}
@@ -1133,6 +1135,7 @@ static HRESULT interp_new(exec_ctx_t *ctx)
static HRESULT interp_dim(exec_ctx_t *ctx)
{
+ ScriptDisp *script_obj = ctx->script->script_obj;
const BSTR ident = ctx->instr->arg1.bstr;
const unsigned array_id = ctx->instr->arg2.uint;
const array_desc_t *array_desc;
@@ -1146,13 +1149,13 @@ static HRESULT interp_dim(exec_ctx_t *ctx)
if(ctx->func->type == FUNC_GLOBAL) {
unsigned i;
- for(i = 0; i < ctx->script->global_vars_cnt; i++) {
- if(!wcsicmp(ctx->script->global_vars[i]->name, ident))
+ for(i = 0; i < script_obj->global_vars_cnt; i++) {
+ if(!wcsicmp(script_obj->global_vars[i]->name, ident))
break;
}
- assert(i < ctx->script->global_vars_cnt);
- v = &ctx->script->global_vars[i]->v;
- array_ref = &ctx->script->global_vars[i]->array;
+ assert(i < script_obj->global_vars_cnt);
+ v = &script_obj->global_vars[i]->v;
+ array_ref = &script_obj->global_vars[i]->array;
}else {
ref_t ref;
diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
index 12626e0..8bb2b68 100644
--- a/dlls/vbscript/vbdisp.c
+++ b/dlls/vbscript/vbdisp.c
@@ -569,11 +569,29 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface)
{
ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface);
LONG ref = InterlockedDecrement(&This->ref);
+ unsigned i;
TRACE("(%p) ref=%d\n", This, ref);
if(!ref) {
assert(!This->ctx);
+
+ while (This->procs)
+ {
+ class_desc_t *class_desc = This->procs;
+ This->procs = class_desc->next;
+ heap_free(class_desc);
+ }
+
+ for (i = 0; i < This->global_vars_cnt; i++)
+ release_dynamic_var(This->global_vars[i]);
+
+ while (!list_empty(&This->code_list))
+ release_vbscode(LIST_ENTRY(list_head(&This->code_list), vbscode_t, entry));
+
+ heap_pool_free(&This->heap);
+ heap_free(This->global_vars);
+ heap_free(This->global_funcs);
heap_free(This);
}
@@ -639,15 +657,15 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW
if(!This->ctx)
return E_UNEXPECTED;
- for(i = 0; i < This->ctx->global_vars_cnt; i++) {
- if(!wcsicmp(This->ctx->global_vars[i]->name, bstrName)) {
+ for(i = 0; i < This->global_vars_cnt; i++) {
+ if(!wcsicmp(This->global_vars[i]->name, bstrName)) {
*pid = i + 1;
return S_OK;
}
}
- for(i = 0; i < This->ctx->global_funcs_cnt; i++) {
- if(!wcsicmp(This->ctx->global_funcs[i]->name, bstrName)) {
+ for(i = 0; i < This->global_funcs_cnt; i++) {
+ if(!wcsicmp(This->global_funcs[i]->name, bstrName)) {
*pid = i + 1 + DISPID_FUNCTION_MASK;
return S_OK;
}
@@ -668,14 +686,14 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
if (id & DISPID_FUNCTION_MASK)
{
id &= ~DISPID_FUNCTION_MASK;
- if (id > This->ctx->global_funcs_cnt)
+ if (id > This->global_funcs_cnt)
return DISP_E_MEMBERNOTFOUND;
switch (wFlags)
{
case DISPATCH_METHOD:
case DISPATCH_METHOD | DISPATCH_PROPERTYGET:
- hres = exec_script(This->ctx, TRUE, This->ctx->global_funcs[id - 1], NULL, pdp, pvarRes);
+ hres = exec_script(This->ctx, TRUE, This->global_funcs[id - 1], NULL, pdp, pvarRes);
break;
default:
FIXME("Unsupported flags %x\n", wFlags);
@@ -685,16 +703,16 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
return hres;
}
- if (id > This->ctx->global_vars_cnt)
+ if (id > This->global_vars_cnt)
return DISP_E_MEMBERNOTFOUND;
- if (This->ctx->global_vars[id - 1]->is_const)
+ if (This->global_vars[id - 1]->is_const)
{
FIXME("const not supported\n");
return E_NOTIMPL;
}
- return invoke_variant_prop(This->ctx, &This->ctx->global_vars[id - 1]->v, wFlags, pdp, pvarRes);
+ return invoke_variant_prop(This->ctx, &This->global_vars[id - 1]->v, wFlags, pdp, pvarRes);
}
static HRESULT WINAPI ScriptDisp_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)
@@ -768,6 +786,8 @@ HRESULT create_script_disp(script_ctx_t *ctx, ScriptDisp **ret)
script_disp->IDispatchEx_iface.lpVtbl = &ScriptDispVtbl;
script_disp->ref = 1;
script_disp->ctx = ctx;
+ heap_pool_init(&script_disp->heap);
+ list_init(&script_disp->code_list);
*ret = script_disp;
return S_OK;
diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c
index fdade9f..9d20433 100644
--- a/dlls/vbscript/vbscript.c
+++ b/dlls/vbscript/vbscript.c
@@ -82,41 +82,42 @@ static inline BOOL is_started(VBScript *This)
static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res)
{
+ ScriptDisp *obj = ctx->script_obj;
function_t *func_iter, **new_funcs;
dynamic_var_t *var, **new_vars;
size_t cnt, i;
- cnt = ctx->global_vars_cnt + code->main_code.var_cnt;
- if (cnt > ctx->global_vars_size)
+ cnt = obj->global_vars_cnt + code->main_code.var_cnt;
+ if (cnt > obj->global_vars_size)
{
- if (ctx->global_vars)
- new_vars = heap_realloc(ctx->global_vars, cnt * sizeof(*new_vars));
+ if (obj->global_vars)
+ new_vars = heap_realloc(obj->global_vars, cnt * sizeof(*new_vars));
else
new_vars = heap_alloc(cnt * sizeof(*new_vars));
if (!new_vars)
return E_OUTOFMEMORY;
- ctx->global_vars = new_vars;
- ctx->global_vars_size = cnt;
+ obj->global_vars = new_vars;
+ obj->global_vars_size = cnt;
}
- cnt = ctx->global_funcs_cnt;
+ cnt = obj->global_funcs_cnt;
for (func_iter = code->funcs; func_iter; func_iter = func_iter->next)
cnt++;
- if (cnt > ctx->global_funcs_size)
+ if (cnt > obj->global_funcs_size)
{
- if (ctx->global_funcs)
- new_funcs = heap_realloc(ctx->global_funcs, cnt * sizeof(*new_funcs));
+ if (obj->global_funcs)
+ new_funcs = heap_realloc(obj->global_funcs, cnt * sizeof(*new_funcs));
else
new_funcs = heap_alloc(cnt * sizeof(*new_funcs));
if (!new_funcs)
return E_OUTOFMEMORY;
- ctx->global_funcs = new_funcs;
- ctx->global_funcs_size = cnt;
+ obj->global_funcs = new_funcs;
+ obj->global_funcs_size = cnt;
}
for (i = 0; i < code->main_code.var_cnt; i++)
{
- if (!(var = heap_pool_alloc(&ctx->heap, sizeof(*var))))
+ if (!(var = heap_pool_alloc(&obj->heap, sizeof(*var))))
return E_OUTOFMEMORY;
var->name = code->main_code.vars[i].name;
@@ -124,24 +125,24 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res
var->is_const = FALSE;
var->array = NULL;
- ctx->global_vars[ctx->global_vars_cnt + i] = var;
+ obj->global_vars[obj->global_vars_cnt + i] = var;
}
- ctx->global_vars_cnt += code->main_code.var_cnt;
+ obj->global_vars_cnt += code->main_code.var_cnt;
for (func_iter = code->funcs; func_iter; func_iter = func_iter->next)
{
- for (i = 0; i < ctx->global_funcs_cnt; i++)
+ for (i = 0; i < obj->global_funcs_cnt; i++)
{
- if (!wcsicmp(ctx->global_funcs[i]->name, func_iter->name))
+ if (!wcsicmp(obj->global_funcs[i]->name, func_iter->name))
{
/* global function already exists, replace it */
- ctx->global_funcs[i] = func_iter;
+ obj->global_funcs[i] = func_iter;
break;
}
}
- if (i == ctx->global_funcs_cnt)
- ctx->global_funcs[ctx->global_funcs_cnt++] = func_iter;
+ if (i == obj->global_funcs_cnt)
+ obj->global_funcs[obj->global_funcs_cnt++] = func_iter;
}
if (code->classes)
@@ -156,8 +157,8 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res
class = class->next;
}
- class->next = ctx->classes;
- ctx->classes = code->classes;
+ class->next = obj->classes;
+ obj->classes = code->classes;
code->last_class = class;
}
@@ -210,24 +211,10 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag
static void release_script(script_ctx_t *ctx)
{
vbscode_t *code, *code_next;
- class_desc_t *class_desc;
- unsigned i;
collect_objects(ctx);
clear_ei(&ctx->ei);
- for(i = 0; i < ctx->global_vars_cnt; i++)
- release_dynamic_var(ctx->global_vars[i]);
-
- heap_free(ctx->global_vars);
- heap_free(ctx->global_funcs);
- ctx->global_vars = NULL;
- ctx->global_vars_cnt = 0;
- ctx->global_vars_size = 0;
- ctx->global_funcs = NULL;
- ctx->global_funcs_cnt = 0;
- ctx->global_funcs_size = 0;
-
LIST_FOR_EACH_ENTRY_SAFE(code, code_next, &ctx->code_list, vbscode_t, entry)
{
if(code->is_persistent)
@@ -236,7 +223,10 @@ static void release_script(script_ctx_t *ctx)
if(code->last_class) code->last_class->next = NULL;
}
else
- release_vbscode(code);
+ {
+ list_remove(&code->entry);
+ list_add_tail(&ctx->script_obj->code_list, &code->entry);
+ }
}
while(!list_empty(&ctx->named_items)) {
@@ -249,13 +239,6 @@ static void release_script(script_ctx_t *ctx)
heap_free(iter);
}
- while(ctx->procs) {
- class_desc = ctx->procs;
- ctx->procs = class_desc->next;
-
- heap_free(class_desc);
- }
-
if(ctx->host_global) {
IDispatch_Release(ctx->host_global);
ctx->host_global = NULL;
@@ -278,9 +261,6 @@ static void release_script(script_ctx_t *ctx)
script_obj->ctx = NULL;
IDispatchEx_Release(&script_obj->IDispatchEx_iface);
}
-
- heap_pool_free(&ctx->heap);
- heap_pool_init(&ctx->heap);
}
static void release_code_list(script_ctx_t *ctx)
@@ -1054,7 +1034,6 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU
}
ctx->safeopt = INTERFACE_USES_DISPEX;
- heap_pool_init(&ctx->heap);
list_init(&ctx->objects);
list_init(&ctx->code_list);
list_init(&ctx->named_items);
diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h
index 1cc36fd..58db0b5 100644
--- a/dlls/vbscript/vbscript.h
+++ b/dlls/vbscript/vbscript.h
@@ -120,11 +120,33 @@ struct _vbdisp_t {
VARIANT props[1];
};
+typedef struct _dynamic_var_t {
+ struct _dynamic_var_t *next;
+ VARIANT v;
+ const WCHAR *name;
+ BOOL is_const;
+ SAFEARRAY *array;
+} dynamic_var_t;
+
typedef struct {
IDispatchEx IDispatchEx_iface;
LONG ref;
+ dynamic_var_t **global_vars;
+ size_t global_vars_cnt;
+ size_t global_vars_size;
+
+ function_t **global_funcs;
+ size_t global_funcs_cnt;
+ size_t global_funcs_size;
+
+ class_desc_t *classes;
+ class_desc_t *procs;
+
script_ctx_t *ctx;
+ heap_pool_t heap;
+
+ struct list code_list;
} ScriptDisp;
typedef struct _builtin_prop_t builtin_prop_t;
@@ -158,14 +180,6 @@ static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i)
return dp->rgvarg + dp->cArgs-i-1;
}
-typedef struct _dynamic_var_t {
- struct _dynamic_var_t *next;
- VARIANT v;
- const WCHAR *name;
- BOOL is_const;
- SAFEARRAY *array;
-} dynamic_var_t;
-
struct _script_ctx_t {
IActiveScriptSite *site;
LCID lcid;
@@ -182,19 +196,6 @@ struct _script_ctx_t {
EXCEPINFO ei;
- dynamic_var_t **global_vars;
- size_t global_vars_cnt;
- size_t global_vars_size;
-
- function_t **global_funcs;
- size_t global_funcs_cnt;
- size_t global_funcs_size;
-
- class_desc_t *classes;
- class_desc_t *procs;
-
- heap_pool_t heap;
-
struct list objects;
struct list code_list;
struct list named_items;
--
2.21.0
2
12
[PATCH 1/2] winetest/dissect: Pids are always present so simplify the regexes.
by Francois Gouget 15 Nov '19
by Francois Gouget 15 Nov '19
15 Nov '19
Nowadays the tests themselves always put the pid on the unhandled
exception and test summary lines.
And both WineTest and TestLauncher always put it on the done lines.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
winetest/dissect | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/winetest/dissect b/winetest/dissect
index 1bbd78ef2..9cd3f9d60 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -670,9 +670,9 @@ while ($line = <IN>) {
get_source_link($l_unit, $l_num) .": ".
escapeHTML($l_text));
}
- elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or
+ elsif ($line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or
($unit ne "" and
- $line =~ /(?:([0-9a-f]+):)?($units_re): unhandled exception [0-9a-fA-F]{8} at /))
+ $line =~ /([0-9a-f]+):($units_re): unhandled exception [0-9a-fA-F]{8} at /))
{
my ($l_pid, $l_unit) = ($1, $2);
if ($units{$l_unit})
@@ -685,9 +685,9 @@ while ($line = <IN>) {
check_unit($l_unit, "unhandled exception");
$failures++;
}
- elsif ($line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): (\d+) tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./ or
+ elsif ($line =~ /^([0-9a-f]+):([_a-z0-9]+): (\d+) tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./ or
($unit ne "" and
- $line =~ /(?:([0-9a-f]+):)?($unit): (\d+) tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./))
+ $line =~ /([0-9a-f]+):($unit): (\d+) tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./))
{
my ($l_pid, $l_unit, $l_total, $l_todo, $l_failures, $l_skipped) = ($1, $2, $3, $4, $5, $6);
@@ -709,9 +709,9 @@ while ($line = <IN>) {
check_unit($l_unit, "test summary") if ($class ne "result");
}
}
- elsif ($line =~ /^([_.a-z0-9-]+):([_a-z0-9]+)(?::([0-9a-f]+))? done \((-?\d+)\)(?:\r?$| in)/ or
+ elsif ($line =~ /^([_.a-z0-9-]+):([_a-z0-9]+):([0-9a-f]+) done \((-?\d+)\)(?:\r?$| in)/ or
($dll ne "" and
- $line =~ /(\Q$dll\E):([_a-z0-9]+)(?::([0-9a-f]+))? done \((-?\d+)\)(?:\r?$| in)/))
+ $line =~ /(\Q$dll\E):([_a-z0-9]+):([0-9a-f]+) done \((-?\d+)\)(?:\r?$| in)/))
{
my ($l_dll, $l_unit, $l_pid, $l_rc) = ($1, $2, $3, $4);
--
2.20.1
1
1
[PATCH 1/2] testbot/LogUtils: Pids are always present so simplify the regexes.
by Francois Gouget 15 Nov '19
by Francois Gouget 15 Nov '19
15 Nov '19
Nowadays the tests themselves always put the pid on the unhandled
exception and test summary lines.
And both WineTest and TestLauncher always put it on the done lines.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
testbot/lib/WineTestBot/LogUtils.pm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 99b1568e1..5e5af0e2c 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -414,9 +414,9 @@ sub ParseWineTestReport($$$)
$Cur->{LineFailures}++;
}
- elsif ($Line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or
+ elsif ($Line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or
($Cur->{Unit} ne "" and
- $Line =~ /(?:([0-9a-f]+):)?($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /))
+ $Line =~ /([0-9a-f]+):($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /))
{
my ($Pid, $Unit) = ($1, $2);
@@ -429,9 +429,9 @@ sub ParseWineTestReport($$$)
_CheckUnit($Parser, $Cur, $Unit, "unhandled exception");
$Cur->{LineFailures}++;
}
- elsif ($Line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): \d+ tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./ or
+ elsif ($Line =~ /^([0-9a-f]+):([_a-z0-9]+): \d+ tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./ or
($Cur->{Unit} ne "" and
- $Line =~ /(?:([0-9a-f]+):)?($Cur->{Unit}): \d+ tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./))
+ $Line =~ /([0-9a-f]+):($Cur->{Unit}): \d+ tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./))
{
my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5);
@@ -451,9 +451,9 @@ sub ParseWineTestReport($$$)
_CheckUnit($Parser, $Cur, $Unit, "test summary") if ($Todos or $Failures);
}
}
- elsif ($Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*)(?::([0-9a-f]+))? done \((-?\d+)\)(?:\r?$| in)/ or
+ elsif ($Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done \((-?\d+)\)(?:\r?$| in)/ or
($Cur->{Dll} ne "" and
- $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*)(?::([0-9a-f]+))? done \((-?\d+)\)(?:\r?$| in)/))
+ $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done \((-?\d+)\)(?:\r?$| in)/))
{
my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4);
@@ -766,7 +766,7 @@ sub GetLogErrors($)
next if ($GetCategory->($Line) !~ /error/);
- if ($Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done \(258\)/)
+ if ($Line =~ m/^[^:]+:([^:]*):[0-9a-f]+ done \(258\)/)
{
my $Unit = $1;
$Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout";
--
2.20.1
1
1
[PATCH] winetest/dissect: Simplify a couple of $units_re initializations.
by Francois Gouget 15 Nov '19
by Francois Gouget 15 Nov '19
15 Nov '19
There is no need for a join() when there is no subtest, yet.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
winetest/dissect | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/winetest/dissect b/winetest/dissect
index 13e258e61..6c6c59427 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -603,7 +603,7 @@ while ($line = <IN>) {
($dll, $unit, $source, $rev) = ($l_dll, $l_unit, $l_source, $l_rev);
%units = ($unit => 1);
- $units_re = join("|", keys %units);
+ $units_re = $unit;
$testbox = create_test_unit_box();
if ($l_type eq "skipped")
@@ -728,7 +728,7 @@ while ($line = <IN>) {
# and that its results may be inconsistent.
($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-");
%units = ($unit => 1);
- $units_re = join("|", keys %units);
+ $units_re = $unit;
$testbox = create_test_unit_box();
add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)");
--
2.20.1
1
0
An application that I have here checks comctl32.dll version information
and refuses to run, changing DLL version to 6.0 makes it run.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/comctl32/comctl32.h | 2 +-
dlls/comctl32/comctl32.rc | 2 +-
include/commctrl.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
index f3e889c4bd..ca1738085a 100644
--- a/dlls/comctl32/comctl32.h
+++ b/dlls/comctl32/comctl32.h
@@ -192,7 +192,7 @@ INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN;
BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN;
-#define COMCTL32_VERSION_MINOR 81
+#define COMCTL32_VERSION_MINOR 0
/* Our internal stack structure of the window procedures to subclass */
typedef struct _SUBCLASSPROCS {
diff --git a/dlls/comctl32/comctl32.rc b/dlls/comctl32/comctl32.rc
index c9aa1ba625..be6e242519 100644
--- a/dlls/comctl32/comctl32.rc
+++ b/dlls/comctl32/comctl32.rc
@@ -114,7 +114,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#define WINE_FILEDESCRIPTION_STR "Wine Common Controls"
#define WINE_FILENAME_STR "comctl32.dll"
#define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704, 1100
-#define WINE_FILEVERSION_STR "5.81"
+#define WINE_FILEVERSION_STR "6.00.4704.1100"
#define WINE_PRODUCTVERSION WINE_FILEVERSION
#define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR
diff --git a/include/commctrl.h b/include/commctrl.h
index 700b335fbb..029a4b4545 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -51,7 +51,7 @@ enum _LI_METRIC
HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
-#define COMCTL32_VERSION 5 /* dll version */
+#define COMCTL32_VERSION 6 /* dll version */
#ifndef _WIN32_IE
#define _WIN32_IE 0x0400
--
2.20.1
6
13
15 Nov '19
Hello. No news about these patches?
Regards.
David
Le ven. 1 nov. 2019 à 21:49, Marvin <testbot(a)winehq.org> a écrit :
> Thank you for your contribution to Wine!
>
> This is an automated notification to let you know that your patch has
> been reviewed and its status set to "Assigned".
>
> This means that the patch has been assigned to a reviewer. If the
> reviewer signs off on the patch, it will be committed, otherwise
> you'll receive advice on how to improve it. If you don't hear anything
> after a couple of weeks, please resend the patch.
>
1
0
15 Nov '19
As a regression test for bug 48072.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
dlls/ddraw/tests/ddraw4.c | 28 ++++++++++++++++++++++++++++
dlls/ddraw/tests/ddraw7.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+)
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index e3146ca45d0..a29dec02d93 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -1117,6 +1117,19 @@ static void test_coop_level_d3d_state(void)
HWND window;
HRESULT hr;
+ static struct
+ {
+ struct vec3 position;
+ DWORD diffuse;
+ }
+ quad[] =
+ {
+ {{-1.0f, -1.0f, 0.0f}, 0x800000ff},
+ {{-1.0f, 1.0f, 0.0f}, 0x800000ff},
+ {{ 1.0f, -1.0f, 0.0f}, 0x800000ff},
+ {{ 1.0f, 1.0f, 0.0f}, 0x800000ff},
+ };
+
window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
@@ -1127,6 +1140,11 @@ static void test_coop_level_d3d_state(void)
viewport = create_viewport(device, 0, 0, 640, 480);
+ hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_DESTBLEND, D3DBLEND_DESTALPHA);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
hr = IDirect3DDevice3_GetRenderTarget(device, &rt);
ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value);
@@ -1169,6 +1187,16 @@ static void test_coop_level_d3d_state(void)
color = get_surface_color(rt, 320, 240);
ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color);
+ hr = IDirect3DDevice3_BeginScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP,
+ D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice3_EndScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ color = get_surface_color(rt, 320, 240);
+ todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color);
+
destroy_viewport(device, viewport);
IDirectDrawSurface4_Release(surface);
IDirectDrawSurface4_Release(rt);
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 2cd3b516f14..2e06844ed55 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -1002,6 +1002,19 @@ static void test_coop_level_d3d_state(void)
HWND window;
HRESULT hr;
+ static struct
+ {
+ struct vec3 position;
+ DWORD diffuse;
+ }
+ quad[] =
+ {
+ {{-1.0f, -1.0f, 0.0f}, 0x800000ff},
+ {{-1.0f, 1.0f, 0.0f}, 0x800000ff},
+ {{ 1.0f, -1.0f, 0.0f}, 0x800000ff},
+ {{ 1.0f, 1.0f, 0.0f}, 0x800000ff},
+ };
+
window = create_window();
if (!(device = create_device(window, DDSCL_NORMAL)))
{
@@ -1010,6 +1023,13 @@ static void test_coop_level_d3d_state(void)
return;
}
+ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_DESTBLEND, D3DBLEND_DESTALPHA);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
hr = IDirect3DDevice7_GetRenderTarget(device, &rt);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value);
@@ -1071,6 +1091,16 @@ static void test_coop_level_d3d_state(void)
color = get_surface_color(rt, 320, 240);
ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color);
+ hr = IDirect3DDevice7_BeginScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP,
+ D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice7_EndScene(device);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ color = get_surface_color(rt, 320, 240);
+ todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color);
+
IDirectDrawSurface7_Release(surface);
IDirectDrawSurface7_Release(rt);
IDirect3DDevice7_Release(device);
--
2.23.0
2
3
15 Nov '19
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
This supersedes patch 173750.
configure.ac | 2 ++
libs/vkd3d/utils.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 819e768..355aaab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,8 @@ AC_CHECK_DECL([SpvCapabilityDemoteToHelperInvocationEXT],, [AC_MSG_ERROR([SPIR-V
# include "vulkan/spirv.h"
#endif])
+AC_CHECK_DECLS([program_invocation_name],,,[#include <errno.h>])
+
dnl Check for libraries
m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])])
diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c
index 1fc0e9d..cf0448d 100644
--- a/libs/vkd3d/utils.c
+++ b/libs/vkd3d/utils.c
@@ -828,7 +828,7 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs,
return S_OK;
}
-#ifdef _GNU_SOURCE
+#if HAVE_DECL_PROGRAM_INVOCATION_NAME
bool vkd3d_get_program_name(char program_name[PATH_MAX])
{
@@ -870,7 +870,7 @@ bool vkd3d_get_program_name(char program_name[PATH_MAX])
return false;
}
-#endif /* _GNU_SOURCE */
+#endif /* HAVE_DECL_PROGRAM_INVOCATION_NAME */
static struct vkd3d_private_data *vkd3d_private_store_get_private_data(
const struct vkd3d_private_store *store, const GUID *tag)
--
2.11.0
2
1
15 Nov '19
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
configure.ac | 2 ++
libs/vkd3d/utils.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 819e768..355aaab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,8 @@ AC_CHECK_DECL([SpvCapabilityDemoteToHelperInvocationEXT],, [AC_MSG_ERROR([SPIR-V
# include "vulkan/spirv.h"
#endif])
+AC_CHECK_DECLS([program_invocation_name],,,[#include <errno.h>])
+
dnl Check for libraries
m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])])
diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c
index 1fc0e9d..1cb8599 100644
--- a/libs/vkd3d/utils.c
+++ b/libs/vkd3d/utils.c
@@ -828,7 +828,7 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs,
return S_OK;
}
-#ifdef _GNU_SOURCE
+#ifdef HAVE_DECL_PROGRAM_INVOCATION_NAME
bool vkd3d_get_program_name(char program_name[PATH_MAX])
{
@@ -870,7 +870,7 @@ bool vkd3d_get_program_name(char program_name[PATH_MAX])
return false;
}
-#endif /* _GNU_SOURCE */
+#endif /* HAVE_DECL_PROGRAM_INVOCATION_NAME */
static struct vkd3d_private_data *vkd3d_private_store_get_private_data(
const struct vkd3d_private_store *store, const GUID *tag)
--
2.11.0
3
2
v2:
* Add some tests to exhibit broken behavior, then fix it.
* Add some tests for foreground/background behavior, and fixed the
assumptions made about it.
* Removed the dinput8 patches for now, they can be added later.
* Renamed the SEND_HWMSG_* flags.
Rémi Bernon (8):
user32/tests: Add rawinput test for ClipCursor interactions.
user32/tests: Add rawinput test for cross-thread interactions.
user32/tests: Add rawinput test for cross-process interactions.
server: Add send_hardware_message flags for rawinput translation.
server: Broadcast rawinput message if request flag is
SEND_HWMSG_RAWINPUT.
user32: Add __wine_send_input flags to hint raw input translation.
winex11.drv: Advertise XInput2 version 2.1 support.
winex11.drv: Listen to RawMotion and RawButton* events in the desktop
thread.
dlls/user32/input.c | 8 +-
dlls/user32/tests/input.c | 335 ++++++++++++++++++++++++++++++++
dlls/user32/user32.spec | 2 +-
dlls/wineandroid.drv/keyboard.c | 2 +-
dlls/wineandroid.drv/window.c | 4 +-
dlls/winemac.drv/ime.c | 4 +-
dlls/winemac.drv/keyboard.c | 2 +-
dlls/winemac.drv/mouse.c | 2 +-
dlls/winex11.drv/event.c | 10 +-
dlls/winex11.drv/keyboard.c | 2 +-
dlls/winex11.drv/mouse.c | 128 +++++++-----
dlls/winex11.drv/x11drv.h | 6 +-
dlls/winex11.drv/x11drv_main.c | 4 +
include/winuser.h | 2 +-
server/protocol.def | 2 +
server/queue.c | 110 ++++++++---
16 files changed, 528 insertions(+), 95 deletions(-)
--
2.24.0.rc2
2
13
[PATCH] d3dcompiler/tests: Fix some d3dcompiler_47 test failures on Windows 8.
by Sven Baars 14 Nov '19
by Sven Baars 14 Nov '19
14 Nov '19
Signed-off-by: Sven Baars <sven.wine(a)gmail.com>
---
dlls/d3dcompiler_43/tests/reflection.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c
index fb117fd6a9..2dcee6d945 100644
--- a/dlls/d3dcompiler_43/tests/reflection.c
+++ b/dlls/d3dcompiler_43/tests/reflection.c
@@ -106,10 +106,12 @@ static void test_reflection_references(void)
expected = E_NOINTERFACE;
#endif
hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection, (void **)&ref10);
- ok(hr == expected, "D3DReflect failed, got %x, expected %x\n", hr, expected);
+ ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */,
+ "D3DReflect failed, got %x, expected %x\n", hr, expected);
hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1);
- ok(hr == expected, "D3DReflect failed, got %x, expected %x\n", hr, expected);
+ ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */,
+ "D3DReflect failed, got %x, expected %x\n", hr, expected);
hr = pD3DReflect(NULL, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1);
ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL);
--
2.17.1
3
3
14 Nov '19
Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
---
dlls/wined3d/context.c | 179 ++++++++++++++++++++++-------------------
1 file changed, 98 insertions(+), 81 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index f4c0d46f8e..5cb1b927e5 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -1935,11 +1935,11 @@ HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct w
return WINED3D_OK;
}
-HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain_gl *swapchain_gl)
+static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context_gl,
+ struct wined3d_swapchain_gl *swapchain_gl)
{
const struct wined3d_format *color_format, *ds_format;
struct wined3d_context *context = &context_gl->c;
- const struct wined3d_d3d_info *d3d_info;
const struct wined3d_gl_info *gl_info;
struct wined3d_resource *target;
unsigned int target_bind_flags;
@@ -1947,81 +1947,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
HGLRC ctx, share_ctx;
unsigned int i;
- TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain_gl);
-
- wined3d_context_init(&context_gl->c, &swapchain_gl->s);
-
device = context->device;
gl_info = &device->adapter->gl_info;
- context_gl->gl_info = gl_info;
- d3d_info = context->d3d_info;
-
- context_gl->tid = GetCurrentThreadId();
- context_gl->window = context->swapchain->win_handle;
- if (context_gl->window == GetDesktopWindow())
- {
- TRACE("Swapchain is created on the desktop window, trying backup device context.\n");
- context_gl->dc = NULL;
- }
- else if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE)))
- WARN("Failed to retrieve device context, trying swapchain backup.\n");
-
- if (!context_gl->dc)
- {
- if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl)))
- {
- ERR("Failed to retrieve a device context.\n");
- return E_FAIL;
- }
- context_gl->dc_is_private = TRUE;
- }
-
- list_init(&context_gl->fbo_list);
- list_init(&context_gl->fbo_destroy_list);
-
- list_init(&context_gl->occlusion_queries);
- list_init(&context_gl->fences);
- list_init(&context_gl->timestamp_queries);
- list_init(&context_gl->so_statistics_queries);
- list_init(&context_gl->pipeline_statistics_queries);
-
- for (i = 0; i < ARRAY_SIZE(context_gl->tex_unit_map); ++i)
- context_gl->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE;
- for (i = 0; i < ARRAY_SIZE(context_gl->rev_tex_unit_map); ++i)
- context_gl->rev_tex_unit_map[i] = WINED3D_UNMAPPED_STAGE;
- if (gl_info->limits.graphics_samplers >= WINED3D_MAX_COMBINED_SAMPLERS)
- {
- /* Initialize the texture unit mapping to a 1:1 mapping. */
- unsigned int base, count;
-
- wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count);
- if (base + WINED3D_MAX_FRAGMENT_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map))
- {
- ERR("Unexpected texture unit base index %u.\n", base);
- goto fail;
- }
- for (i = 0; i < min(count, WINED3D_MAX_FRAGMENT_SAMPLERS); ++i)
- {
- context_gl->tex_unit_map[i] = base + i;
- context_gl->rev_tex_unit_map[base + i] = i;
- }
-
- wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count);
- if (base + WINED3D_MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map))
- {
- ERR("Unexpected texture unit base index %u.\n", base);
- goto fail;
- }
- for (i = 0; i < min(count, WINED3D_MAX_VERTEX_SAMPLERS); ++i)
- {
- context_gl->tex_unit_map[WINED3D_MAX_FRAGMENT_SAMPLERS + i] = base + i;
- context_gl->rev_tex_unit_map[base + i] = WINED3D_MAX_FRAGMENT_SAMPLERS + i;
- }
- }
-
- if (!(context_gl->texture_type = heap_calloc(gl_info->limits.combined_samplers,
- sizeof(*context_gl->texture_type))))
- goto fail;
target = &context->current_rt.texture->resource;
target_bind_flags = target->bind_flags;
@@ -2095,7 +2022,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
}
if (!context_gl->pixel_format)
- goto fail;
+ return FALSE;
wined3d_context_gl_enter(context_gl);
@@ -2103,7 +2030,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
{
ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc);
context_release(context);
- goto fail;
+ return FALSE;
}
share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL;
@@ -2112,7 +2039,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
if (!(ctx = context_create_wgl_attribs(gl_info, context_gl->dc, share_ctx)))
{
context_release(context);
- goto fail;
+ return FALSE;
}
}
else
@@ -2121,7 +2048,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
{
ERR("Failed to create a WGL context.\n");
context_release(context);
- goto fail;
+ return FALSE;
}
if (share_ctx && !wglShareLists(share_ctx, ctx))
@@ -2130,7 +2057,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
context_release(context);
if (!wglDeleteContext(ctx))
ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError());
- goto fail;
+ return FALSE;
}
}
@@ -2149,9 +2076,99 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi
context_release(context);
if (!wglDeleteContext(ctx))
ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError());
- goto fail;
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain_gl *swapchain_gl)
+{
+ struct wined3d_context *context = &context_gl->c;
+ const struct wined3d_d3d_info *d3d_info;
+ const struct wined3d_gl_info *gl_info;
+ struct wined3d_device *device;
+ unsigned int i;
+
+ TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain_gl);
+
+ wined3d_context_init(&context_gl->c, &swapchain_gl->s);
+
+ device = context->device;
+ gl_info = &device->adapter->gl_info;
+ context_gl->gl_info = gl_info;
+ d3d_info = context->d3d_info;
+
+ context_gl->tid = GetCurrentThreadId();
+ context_gl->window = context->swapchain->win_handle;
+ if (context_gl->window == GetDesktopWindow())
+ {
+ TRACE("Swapchain is created on the desktop window, trying backup device context.\n");
+ context_gl->dc = NULL;
+ }
+ else if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE)))
+ WARN("Failed to retrieve device context, trying swapchain backup.\n");
+
+ if (!context_gl->dc)
+ {
+ if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl)))
+ {
+ ERR("Failed to retrieve a device context.\n");
+ return E_FAIL;
+ }
+ context_gl->dc_is_private = TRUE;
+ }
+
+ list_init(&context_gl->fbo_list);
+ list_init(&context_gl->fbo_destroy_list);
+
+ list_init(&context_gl->occlusion_queries);
+ list_init(&context_gl->fences);
+ list_init(&context_gl->timestamp_queries);
+ list_init(&context_gl->so_statistics_queries);
+ list_init(&context_gl->pipeline_statistics_queries);
+
+ for (i = 0; i < ARRAY_SIZE(context_gl->tex_unit_map); ++i)
+ context_gl->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE;
+ for (i = 0; i < ARRAY_SIZE(context_gl->rev_tex_unit_map); ++i)
+ context_gl->rev_tex_unit_map[i] = WINED3D_UNMAPPED_STAGE;
+ if (gl_info->limits.graphics_samplers >= WINED3D_MAX_COMBINED_SAMPLERS)
+ {
+ /* Initialize the texture unit mapping to a 1:1 mapping. */
+ unsigned int base, count;
+
+ wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count);
+ if (base + WINED3D_MAX_FRAGMENT_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map))
+ {
+ ERR("Unexpected texture unit base index %u.\n", base);
+ goto fail;
+ }
+ for (i = 0; i < min(count, WINED3D_MAX_FRAGMENT_SAMPLERS); ++i)
+ {
+ context_gl->tex_unit_map[i] = base + i;
+ context_gl->rev_tex_unit_map[base + i] = i;
+ }
+
+ wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count);
+ if (base + WINED3D_MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map))
+ {
+ ERR("Unexpected texture unit base index %u.\n", base);
+ goto fail;
+ }
+ for (i = 0; i < min(count, WINED3D_MAX_VERTEX_SAMPLERS); ++i)
+ {
+ context_gl->tex_unit_map[WINED3D_MAX_FRAGMENT_SAMPLERS + i] = base + i;
+ context_gl->rev_tex_unit_map[base + i] = WINED3D_MAX_FRAGMENT_SAMPLERS + i;
+ }
}
+ if (!(context_gl->texture_type = heap_calloc(gl_info->limits.combined_samplers,
+ sizeof(*context_gl->texture_type))))
+ goto fail;
+
+ if (!wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl))
+ goto fail;
+
if (context_debug_output_enabled(gl_info))
{
GL_EXTCALL(glDebugMessageCallback(wined3d_debug_callback, context));
--
2.23.0
1
1
14 Nov '19
From: Connor McAdams <conmanx360(a)gmail.com>
Signed-off-by: Connor McAdams <conmanx360(a)gmail.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
dlls/d3dcompiler_43/reflection.c | 107 +++++++++++++++++++++++++++++++
1 file changed, 107 insertions(+)
diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c
index a79439a3fe5..93819534e69 100644
--- a/dlls/d3dcompiler_43/reflection.c
+++ b/dlls/d3dcompiler_43/reflection.c
@@ -1312,6 +1312,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d
return NULL;
type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3dcompiler_shader_reflection_type_vtbl;
+ type->ID3D10ShaderReflectionType_iface.lpVtbl = &d3d10_shader_reflection_type_vtbl;
type->id = offset;
type->reflection = reflection;
@@ -2143,6 +2144,112 @@ static const struct ID3D10ShaderReflectionVariableVtbl d3d10_shader_reflection_v
d3d10_shader_reflection_variable_GetType,
};
+static inline struct d3dcompiler_shader_reflection_type *impl_from_ID3D10ShaderReflectionType(
+ ID3D10ShaderReflectionType *iface)
+{
+ return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_type, ID3D10ShaderReflectionType_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_type_GetDesc(ID3D10ShaderReflectionType *iface,
+ D3D10_SHADER_TYPE_DESC *desc)
+{
+ struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D10ShaderReflectionType(iface);
+
+ TRACE("iface %p, desc %p.\n", iface, desc);
+
+ if (type == &null_type)
+ {
+ WARN("Null type specified.\n");
+ return E_FAIL;
+ }
+
+ if (!desc)
+ {
+ WARN("Invalid argument specified.\n");
+ return E_FAIL;
+ }
+
+ memcpy(desc, &type->desc, sizeof(*desc));
+
+ return S_OK;
+}
+
+static ID3D10ShaderReflectionType * STDMETHODCALLTYPE d3d10_shader_reflection_type_GetMemberTypeByIndex(
+ ID3D10ShaderReflectionType *iface, UINT index)
+{
+ struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D10ShaderReflectionType(iface);
+
+ TRACE("iface %p, index %u.\n", iface, index);
+
+ if (index >= type->desc.Members)
+ {
+ WARN("Invalid index specified.\n");
+ return &null_type.ID3D10ShaderReflectionType_iface;
+ }
+
+ return &type->members[index].type->ID3D10ShaderReflectionType_iface;
+}
+
+static ID3D10ShaderReflectionType * STDMETHODCALLTYPE d3d10_shader_reflection_type_GetMemberTypeByName(
+ ID3D10ShaderReflectionType *iface, const char *name)
+{
+ struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D10ShaderReflectionType(iface);
+ unsigned int i;
+
+ TRACE("iface %p, name %s.\n", iface, debugstr_a(name));
+
+ if (!name)
+ {
+ WARN("Invalid argument specified.\n");
+ return &null_type.ID3D10ShaderReflectionType_iface;
+ }
+
+ for (i = 0; i < type->desc.Members; ++i)
+ {
+ struct d3dcompiler_shader_reflection_type_member *member = &type->members[i];
+
+ if (!strcmp(member->name, name))
+ {
+ TRACE("Returning ID3D10ShaderReflectionType %p.\n", member->type);
+ return &member->type->ID3D10ShaderReflectionType_iface;
+ }
+ }
+
+ WARN("Invalid name specified.\n");
+
+ return &null_type.ID3D10ShaderReflectionType_iface;
+}
+
+static const char * STDMETHODCALLTYPE d3d10_shader_reflection_type_GetMemberTypeName(
+ ID3D10ShaderReflectionType *iface, UINT index)
+{
+ struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D10ShaderReflectionType(iface);
+
+ TRACE("iface %p, index %u.\n", iface, index);
+
+ if (type == &null_type)
+ {
+ WARN("Null type specified.\n");
+ return "$Invalid";
+ }
+
+ if (index >= type->desc.Members)
+ {
+ WARN("Invalid index specified.\n");
+ return NULL;
+ }
+
+ return type->members[index].name;
+}
+
+static const struct ID3D10ShaderReflectionTypeVtbl d3d10_shader_reflection_type_vtbl =
+{
+ d3d10_shader_reflection_type_GetDesc,
+ d3d10_shader_reflection_type_GetMemberTypeByIndex,
+ d3d10_shader_reflection_type_GetMemberTypeByName,
+ d3d10_shader_reflection_type_GetMemberTypeName,
+};
+
HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector)
{
struct d3dcompiler_shader_reflection *object;
--
2.21.0
1
5
14 Nov '19
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
v2: Avoid LPJUNK style types
dlls/dmime/segtriggertrack.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c
index 4b3a71c9a4..3050a5031b 100644
--- a/dlls/dmime/segtriggertrack.c
+++ b/dlls/dmime/segtriggertrack.c
@@ -21,6 +21,8 @@
#include "dmime_private.h"
#include "dmobject.h"
+#include "wine/heap.h"
+
WINE_DEFAULT_DEBUG_CHANNEL(dmime);
WINE_DECLARE_DEBUG_CHANNEL(dmfile);
@@ -81,7 +83,19 @@ static ULONG WINAPI segment_track_Release(IDirectMusicTrack8 *iface)
TRACE("(%p) ref=%d\n", This, ref);
if (!ref) {
- HeapFree(GetProcessHeap(), 0, This);
+ struct list *cursor, *cursor2;
+ DMUS_PRIVATE_SEGMENT_ITEM *item;
+
+ LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) {
+ item = LIST_ENTRY(cursor, DMUS_PRIVATE_SEGMENT_ITEM, entry);
+ list_remove(cursor);
+
+ if (item->pObject)
+ IDirectMusicObject_Release(item->pObject);
+ heap_free(item);
+ }
+
+ heap_free(This);
DMIME_UnlockModule();
}
--
2.20.1
1
0
14 Nov '19
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
v2: Avoid LPJUNK style types
dlls/dmime/tempotrack.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c
index 1ee6c5ac78..7aff40dbfd 100644
--- a/dlls/dmime/tempotrack.c
+++ b/dlls/dmime/tempotrack.c
@@ -21,6 +21,8 @@
#include "dmime_private.h"
#include "dmobject.h"
+#include "wine/heap.h"
+
WINE_DEFAULT_DEBUG_CHANNEL(dmime);
WINE_DECLARE_DEBUG_CHANNEL(dmfile);
@@ -82,7 +84,17 @@ static ULONG WINAPI tempo_track_Release(IDirectMusicTrack8 *iface)
TRACE("(%p) ref=%d\n", This, ref);
if (!ref) {
- HeapFree(GetProcessHeap(), 0, This);
+ struct list *cursor, *cursor2;
+ DMUS_PRIVATE_TEMPO_ITEM *item;
+
+ LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) {
+ item = LIST_ENTRY(cursor, DMUS_PRIVATE_TEMPO_ITEM, entry);
+ list_remove(cursor);
+
+ heap_free(item);
+ }
+
+ heap_free(This);
DMIME_UnlockModule();
}
--
2.20.1
1
0
14 Nov '19
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
v2: Avoid LPJUNK style types
dlls/dmstyle/styletrack.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c
index 496e0c5ba7..cc15bd81d1 100644
--- a/dlls/dmstyle/styletrack.c
+++ b/dlls/dmstyle/styletrack.c
@@ -20,6 +20,8 @@
#include "dmstyle_private.h"
#include "dmobject.h"
+#include "wine/heap.h"
+
WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);
WINE_DECLARE_DEBUG_CHANNEL(dmfile);
@@ -80,7 +82,18 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface)
TRACE("(%p) ref=%d\n", This, ref);
if (!ref) {
- HeapFree(GetProcessHeap(), 0, This);
+ struct list *cursor, *cursor2;
+ DMUS_PRIVATE_STYLE_ITEM *item;
+
+ LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) {
+ item = LIST_ENTRY(cursor, DMUS_PRIVATE_STYLE_ITEM, entry);
+ list_remove(cursor);
+
+ IDirectMusicStyle8_Release(item->pObject);
+ heap_free(item);
+ }
+
+ heap_free(This);
DMSTYLE_UnlockModule();
}
--
2.20.1
1
0
[PATCH v2 1/4] dmime: SegTrigger track supports parameter GUID_IDirectMusicStyle.
by Michael Stefaniuc 14 Nov '19
by Michael Stefaniuc 14 Nov '19
14 Nov '19
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
v2: Get rid of the Hungarian notation for a parameter name
dlls/dmime/segtriggertrack.c | 15 +++++++++------
dlls/dmime/tests/dmime.c | 10 ++++++++++
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c
index 37d7e46d20..4b3a71c9a4 100644
--- a/dlls/dmime/segtriggertrack.c
+++ b/dlls/dmime/segtriggertrack.c
@@ -136,14 +136,17 @@ static HRESULT WINAPI segment_track_SetParam(IDirectMusicTrack8 *iface, REFGUID
return S_OK;
}
-static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType)
+static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type)
{
- IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
+ IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+ TRACE("(%p, %s)\n", This, debugstr_dmguid(type));
+
+ if (IsEqualGUID(type, &GUID_IDirectMusicStyle))
+ return S_OK;
- TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType));
- /* didn't find any params */
- TRACE("param unsupported\n");
- return DMUS_E_TYPE_UNSUPPORTED;
+ TRACE("param unsupported\n");
+ return DMUS_E_TYPE_UNSUPPORTED;
}
static HRESULT WINAPI segment_track_AddNotificationType(IDirectMusicTrack8 *iface,
diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c
index b7bf542fd8..944a278dbb 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -565,6 +565,16 @@ static void test_track(void)
ok(hr == E_NOTIMPL, "IDirectMusicTrack_SetParam failed: %08x\n", hr);
hr = IDirectMusicTrack_IsParamSupported(dmt, NULL);
ok(hr == E_NOTIMPL, "IDirectMusicTrack_IsParamSupported failed: %08x\n", hr);
+
+ hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle);
+ ok(hr == E_NOTIMPL, "got: %08x\n", hr);
+ }
+ else {
+ hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle);
+ if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack)
+ ok(hr == S_OK, "got: %08x\n", hr);
+ else
+ ok(hr == DMUS_E_TYPE_UNSUPPORTED, "got: %08x\n", hr);
}
if (class[i].clsid != &CLSID_DirectMusicMarkerTrack &&
class[i].clsid != &CLSID_DirectMusicTimeSigTrack) {
--
2.20.1
1
0
[PATCH] wined3d: Also reset the device state to the default in wined3d_device_uninit_3d().
by Zebediah Figura 14 Nov '19
by Zebediah Figura 14 Nov '19
14 Nov '19
Fixes a regression introduced by 96547e622b04f403bc0c78d649275d1f844ed40e.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48072
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
dlls/wined3d/device.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 2a4d3778486..baf9f25e98d 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1142,6 +1142,8 @@ void wined3d_device_uninit_3d(struct wined3d_device *device)
wined3d_cs_emit_reset_state(device->cs);
state_cleanup(&device->state);
+ memset(&device->state, 0, sizeof(device->state));
+ state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT);
for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i)
{
wined3d_device_set_rendertarget_view(device, i, NULL, FALSE);
--
2.23.0
1
0
[PATCH 1/2] kernel32/tests: Windows 10 dropped support for SetConsoleFont().
by Francois Gouget 14 Nov '19
by Francois Gouget 14 Nov '19
14 Nov '19
Windows 10 1507 still supports it but not 1607+.
Signed-off-by: Francois Gouget <fgouget(a)free.fr>
---
Same thing as the GetConsoleFontInfo():
https://www.winehq.org/pipermail/wine-devel/2019-November/153939.html
dlls/kernel32/tests/console.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index a22051deafe..171b2dad4d6 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -2967,6 +2967,12 @@ static void test_SetConsoleFont(HANDLE std_output)
SetLastError(0xdeadbeef);
ret = pSetConsoleFont(NULL, 0);
ok(!ret, "got %d, expected zero\n", ret);
+ if (GetLastError() == LOWORD(E_NOTIMPL) /* win10 1709+ */ ||
+ broken(GetLastError() == ERROR_GEN_FAILURE) /* win10 1607 */)
+ {
+ skip("SetConsoleFont is not implemented\n");
+ return;
+ }
todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError());
SetLastError(0xdeadbeef);
--
2.20.1
2
3
[PATCH] wined3d: Avoid crash in swapchain_gl_present() if context could not be acquired.
by Paul Gofman 14 Nov '19
by Paul Gofman 14 Nov '19
14 Nov '19
Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
---
dlls/wined3d/swapchain.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 62bab65fcf..e4ffce8965 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -453,7 +453,12 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain,
struct wined3d_context *context;
BOOL render_to_fbo;
- context = context_acquire(swapchain->device, swapchain->front_buffer, 0);
+ if (!(context = context_acquire(swapchain->device, swapchain->front_buffer, 0)))
+ {
+ WARN("Could not get context, skipping present.\n");
+ return;
+ }
+
context_gl = wined3d_context_gl(context);
if (!context_gl->valid)
{
--
2.23.0
2
13
14 Nov '19
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/dnsapi/query.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c
index e601191c5de..f540662dfd2 100644
--- a/dlls/dnsapi/query.c
+++ b/dlls/dnsapi/query.c
@@ -71,7 +71,7 @@ static const char *dns_section_to_str( ns_sect section )
case ns_s_ar: return "Additional";
default:
{
- static char tmp[5];
+ static char tmp[11];
FIXME( "unknown section: 0x%02x\n", section );
sprintf( tmp, "0x%02x", section );
return tmp;
--
2.24.0.rc2
4
14
14 Nov '19
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
dlls/wined3d/stateblock.c | 38 ++++++++++++++++++++++++++++++++++++++
dlls/wined3d/wined3d.spec | 1 +
include/wine/wined3d.h | 2 ++
3 files changed, 41 insertions(+)
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 933ad46a93d..bf1e577f85c 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -1640,6 +1640,44 @@ HRESULT CDECL wined3d_stateblock_set_stream_source_freq(struct wined3d_statebloc
stateblock->changed.streamFreq |= 1u << stream_idx;
return WINED3D_OK;
}
+HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock,
+ UINT light_idx, const struct wined3d_light *light)
+{
+ struct wined3d_light_info *object = NULL;
+
+ TRACE("stateblock %p, light_idx %u, light %p.\n", stateblock, light_idx, light);
+
+ /* Check the parameter range. Need for speed most wanted sets junk lights
+ * which confuse the GL driver. */
+ if (!light)
+ return WINED3DERR_INVALIDCALL;
+
+ switch (light->type)
+ {
+ case WINED3D_LIGHT_POINT:
+ case WINED3D_LIGHT_SPOT:
+ case WINED3D_LIGHT_GLSPOT:
+ /* Incorrect attenuation values can cause the gl driver to crash.
+ * Happens with Need for speed most wanted. */
+ if (light->attenuation0 < 0.0f || light->attenuation1 < 0.0f || light->attenuation2 < 0.0f)
+ {
+ WARN("Attenuation is negative, returning WINED3DERR_INVALIDCALL.\n");
+ return WINED3DERR_INVALIDCALL;
+ }
+ break;
+
+ case WINED3D_LIGHT_DIRECTIONAL:
+ case WINED3D_LIGHT_PARALLELPOINT:
+ /* Ignores attenuation */
+ break;
+
+ default:
+ WARN("Light type out of range, returning WINED3DERR_INVALIDCALL.\n");
+ return WINED3DERR_INVALIDCALL;
+ }
+
+ return wined3d_light_state_set_light(&stateblock->stateblock_state.light_state, light_idx, light, &object);
+}
static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info)
{
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index a4caebe7185..8591aa51648 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -267,6 +267,7 @@
@ cdecl wined3d_stateblock_set_blend_factor(ptr ptr)
@ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr)
@ cdecl wined3d_stateblock_set_index_buffer(ptr ptr long)
+@ cdecl wined3d_stateblock_set_light(ptr long ptr)
@ cdecl wined3d_stateblock_set_material(ptr ptr)
@ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr)
@ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index a05305f4d6c..33f668f9347 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2675,6 +2675,8 @@ HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *sta
UINT plane_idx, const struct wined3d_vec4 *plane);
void __cdecl wined3d_stateblock_set_index_buffer(struct wined3d_stateblock *stateblock,
struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id);
+HRESULT __cdecl wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock,
+ UINT light_idx, const struct wined3d_light *light);
void __cdecl wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock, const struct wined3d_material *material);
void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);
HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock,
--
2.23.0
2
7
14 Nov '19
Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com>
---
dlls/sapi/tests/tts.c | 8 ++++++
dlls/sapi/tts.c | 62 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+)
diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index 2d62a9651d..092ea40c3b 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -37,6 +37,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line)
static void test_interfaces(void)
{
ISpeechVoice *speech_voice, *speech_voice2;
+ IConnectionPointContainer *container;
ISpVoice *spvoice, *spvoice2;
IDispatch *dispatch;
IUnknown *unk;
@@ -82,6 +83,13 @@ static void test_interfaces(void)
ISpVoice_Release(spvoice2);
ISpVoice_Release(spvoice);
+ hr = ISpeechVoice_QueryInterface(speech_voice, &IID_IConnectionPointContainer,
+ (void **)&container);
+ ok(hr == S_OK, "ISpeechVoice_QueryInterface failed: %#x.\n", hr);
+ EXPECT_REF(speech_voice, 2);
+ EXPECT_REF(container, 2);
+ IConnectionPointContainer_Release(container);
+
ISpeechVoice_Release(speech_voice);
}
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 8f1ecd1894..584c3d56b7 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -38,6 +38,7 @@ struct speech_voice
{
ISpeechVoice ISpeechVoice_iface;
ISpVoice ISpVoice_iface;
+ IConnectionPointContainer IConnectionPointContainer_iface;
LONG ref;
};
@@ -51,6 +52,11 @@ static inline struct speech_voice *impl_from_ISpVoice(ISpVoice *iface)
return CONTAINING_RECORD(iface, struct speech_voice, ISpVoice_iface);
}
+static inline struct speech_voice *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface)
+{
+ return CONTAINING_RECORD(iface, struct speech_voice, IConnectionPointContainer_iface);
+}
+
/* ISpeechVoice interface */
static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj)
{
@@ -64,6 +70,8 @@ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID ii
*obj = &This->ISpeechVoice_iface;
else if (IsEqualIID(iid, &IID_ISpVoice))
*obj = &This->ISpVoice_iface;
+ else if (IsEqualIID(iid, &IID_IConnectionPointContainer))
+ *obj = &This->IConnectionPointContainer_iface;
else
{
*obj = NULL;
@@ -726,6 +734,59 @@ static const ISpVoiceVtbl spvoice_vtbl =
spvoice_DisplayUI
};
+/* IConnectionPointContainer interface */
+static HRESULT WINAPI container_QueryInterface(IConnectionPointContainer *iface, REFIID iid, void **obj)
+{
+ struct speech_voice *This = impl_from_IConnectionPointContainer(iface);
+
+ TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj);
+
+ return ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj);
+}
+
+static ULONG WINAPI container_AddRef(IConnectionPointContainer *iface)
+{
+ struct speech_voice *This = impl_from_IConnectionPointContainer(iface);
+
+ TRACE("(%p).\n", iface);
+
+ return ISpeechVoice_AddRef(&This->ISpeechVoice_iface);
+}
+
+static ULONG WINAPI container_Release(IConnectionPointContainer *iface)
+{
+ struct speech_voice *This = impl_from_IConnectionPointContainer(iface);
+
+ TRACE("(%p).\n", iface);
+
+ return ISpeechVoice_Release(&This->ISpeechVoice_iface);
+}
+
+static HRESULT WINAPI container_EnumConnectionPoints(IConnectionPointContainer *iface,
+ IEnumConnectionPoints **enum_cp)
+{
+ FIXME("(%p, %p): stub.\n", iface, enum_cp);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI container_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid,
+ IConnectionPoint **cp)
+{
+ FIXME("(%p, %s, %p): stub.\n", iface, debugstr_guid(riid), cp);
+
+ return E_NOTIMPL;
+}
+
+const static IConnectionPointContainerVtbl container_vtbl =
+{
+ container_QueryInterface,
+ container_AddRef,
+ container_Release,
+ container_EnumConnectionPoints,
+ container_FindConnectionPoint
+};
+
HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)
{
struct speech_voice *This = heap_alloc(sizeof(*This));
@@ -734,6 +795,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)
if (!This) return E_OUTOFMEMORY;
This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl;
This->ISpVoice_iface.lpVtbl = &spvoice_vtbl;
+ This->IConnectionPointContainer_iface.lpVtbl = &container_vtbl;
This->ref = 1;
hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj);
--
2.24.0
2
1
Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com>
---
dlls/sapi/tests/tts.c | 24 ++-
dlls/sapi/tts.c | 329 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 352 insertions(+), 1 deletion(-)
diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index 8d13ed0053..2d62a9651d 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -36,7 +36,8 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line)
static void test_interfaces(void)
{
- ISpeechVoice *speech_voice;
+ ISpeechVoice *speech_voice, *speech_voice2;
+ ISpVoice *spvoice, *spvoice2;
IDispatch *dispatch;
IUnknown *unk;
HRESULT hr;
@@ -60,6 +61,27 @@ static void test_interfaces(void)
EXPECT_REF(speech_voice, 1);
IUnknown_Release(unk);
+ hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER,
+ &IID_ISpVoice, (void **)&spvoice);
+ ok(hr == S_OK, "Failed to create ISpVoice interface: %#x.\n", hr);
+ EXPECT_REF(spvoice, 1);
+ EXPECT_REF(speech_voice, 1);
+
+ hr = ISpVoice_QueryInterface(spvoice, &IID_ISpeechVoice, (void **)&speech_voice2);
+ ok(hr == S_OK, "ISpVoice_QueryInterface failed: %#x.\n", hr);
+ EXPECT_REF(speech_voice2, 2);
+ EXPECT_REF(spvoice, 2);
+ EXPECT_REF(speech_voice, 1);
+ ISpeechVoice_Release(speech_voice2);
+
+ hr = ISpeechVoice_QueryInterface(speech_voice, &IID_ISpVoice, (void **)&spvoice2);
+ ok(hr == S_OK, "ISpeechVoice_QueryInterface failed: %#x.\n", hr);
+ EXPECT_REF(speech_voice, 2);
+ EXPECT_REF(spvoice2, 2);
+ EXPECT_REF(spvoice, 1);
+ ISpVoice_Release(spvoice2);
+ ISpVoice_Release(spvoice);
+
ISpeechVoice_Release(speech_voice);
}
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 4000db11f5..8f1ecd1894 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(sapi);
struct speech_voice
{
ISpeechVoice ISpeechVoice_iface;
+ ISpVoice ISpVoice_iface;
LONG ref;
};
@@ -45,6 +46,11 @@ static inline struct speech_voice *impl_from_ISpeechVoice(ISpeechVoice *iface)
return CONTAINING_RECORD(iface, struct speech_voice, ISpeechVoice_iface);
}
+static inline struct speech_voice *impl_from_ISpVoice(ISpVoice *iface)
+{
+ return CONTAINING_RECORD(iface, struct speech_voice, ISpVoice_iface);
+}
+
/* ISpeechVoice interface */
static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj)
{
@@ -56,6 +62,8 @@ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID ii
IsEqualIID(iid, &IID_IDispatch) ||
IsEqualIID(iid, &IID_ISpeechVoice))
*obj = &This->ISpeechVoice_iface;
+ else if (IsEqualIID(iid, &IID_ISpVoice))
+ *obj = &This->ISpVoice_iface;
else
{
*obj = NULL;
@@ -398,6 +406,326 @@ static const ISpeechVoiceVtbl speech_voice_vtbl =
speech_voice_DisplayUI,
};
+/* ISpVoice interface */
+static HRESULT WINAPI spvoice_QueryInterface(ISpVoice *iface, REFIID iid, void **obj)
+{
+ struct speech_voice *This = impl_from_ISpVoice(iface);
+
+ TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj);
+
+ return ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj);
+}
+
+static ULONG WINAPI spvoice_AddRef(ISpVoice *iface)
+{
+ struct speech_voice *This = impl_from_ISpVoice(iface);
+
+ TRACE("(%p).\n", iface);
+
+ return ISpeechVoice_AddRef(&This->ISpeechVoice_iface);
+}
+
+static ULONG WINAPI spvoice_Release(ISpVoice *iface)
+{
+ struct speech_voice *This = impl_from_ISpVoice(iface);
+
+ TRACE("(%p).\n", iface);
+
+ return ISpeechVoice_Release(&This->ISpeechVoice_iface);
+}
+
+static HRESULT WINAPI spvoice_SetNotifySink(ISpVoice *iface, ISpNotifySink *sink)
+{
+ FIXME("(%p, %p): stub.\n", iface, sink);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetNotifyWindowMessage(ISpVoice *iface, HWND hwnd, UINT msg,
+ WPARAM wparam, LPARAM lparam)
+{
+ FIXME("(%p, %p, %u, %lx, %lx): stub.\n", iface, hwnd, msg, wparam, lparam);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetNotifyCallbackFunction(ISpVoice *iface, SPNOTIFYCALLBACK *callback,
+ WPARAM wparam, LPARAM lparam)
+{
+ FIXME("(%p, %p, %lx, %lx): stub.\n", iface, callback, wparam, lparam);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetNotifyCallbackInterface(ISpVoice *iface, ISpNotifyCallback *callback,
+ WPARAM wparam, LPARAM lparam)
+{
+ FIXME("(%p, %p, %lx, %lx): stub.\n", iface, callback, wparam, lparam);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetNotifyWin32Event(ISpVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_WaitForNotifyEvent(ISpVoice *iface, DWORD milliseconds)
+{
+ FIXME("(%p, %d): stub.\n", iface, milliseconds);
+
+ return E_NOTIMPL;
+}
+
+static HANDLE WINAPI spvoice_GetNotifyEventHandle(ISpVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return NULL;
+}
+
+static HRESULT WINAPI spvoice_SetInterest(ISpVoice *iface, ULONGLONG event, ULONGLONG queued)
+{
+ FIXME("(%p, %s, %s): stub.\n", iface, wine_dbgstr_longlong(event), wine_dbgstr_longlong(queued));
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetEvents(ISpVoice *iface, ULONG count, SPEVENT *array, ULONG *fetched)
+{
+ FIXME("(%p, %u, %p, %p): stub.\n", iface, count, array, fetched);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetInfo(ISpVoice *iface, SPEVENTSOURCEINFO *info)
+{
+ FIXME("(%p, %p): stub.\n", iface, info);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetOutput(ISpVoice *iface, IUnknown *unk, BOOL changes)
+{
+ FIXME("(%p, %p, %d: stub.\n)", iface, unk, changes);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetOutputObjectToken(ISpVoice *iface, ISpObjectToken **token)
+{
+ FIXME("(%p, %p): stub.\n", iface, token);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetOutputStream(ISpVoice *iface, ISpStreamFormat **stream)
+{
+ FIXME("(%p, %p): stub.\n", iface, stream);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_Pause(ISpVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_Resume(ISpVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetVoice(ISpVoice *iface, ISpObjectToken *token)
+{
+ FIXME("(%p, %p): stub.\n", iface, token);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token)
+{
+ FIXME("(%p, %p): stub.\n", iface, token);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWORD flags, ULONG *number)
+{
+ FIXME("(%p, %p, %#x, %p): stub.\n", iface, contents, flags, number);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SpeakStream(ISpVoice *iface, IStream *stream, DWORD flags, ULONG *number)
+{
+ FIXME("(%p, %p, %#x, %p): stub.\n", iface, stream, flags, number);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetStatus(ISpVoice *iface, SPVOICESTATUS *status, WCHAR **bookmark)
+{
+ FIXME("(%p, %p, %p): stub.\n", iface, status, bookmark);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_Skip(ISpVoice *iface, const WCHAR *type, LONG items, ULONG *skipped)
+{
+ FIXME("(%p, %s, %d, %p): stub.\n", iface, debugstr_w(type), items, skipped);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetPriority(ISpVoice *iface, SPVPRIORITY priority)
+{
+ FIXME("(%p, %d): stub.\n", iface, priority);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetPriority(ISpVoice *iface, SPVPRIORITY *priority)
+{
+ FIXME("(%p, %p): stub.\n", iface, priority);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetAlertBoundary(ISpVoice *iface, SPEVENTENUM boundary)
+{
+ FIXME("(%p, %d): stub.\n", iface, boundary);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetAlertBoundary(ISpVoice *iface, SPEVENTENUM *boundary)
+{
+ FIXME("(%p, %p): stub.\n", iface, boundary);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetRate(ISpVoice *iface, LONG adjust)
+{
+ FIXME("(%p, %d): stub.\n", iface, adjust);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetRate(ISpVoice *iface, LONG *adjust)
+{
+ FIXME("(%p, %p): stub.\n", iface, adjust);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetVolume(ISpVoice *iface, USHORT volume)
+{
+ FIXME("(%p, %d): stub.\n", iface, volume);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetVolume(ISpVoice *iface, USHORT *volume)
+{
+ FIXME("(%p, %p): stub.\n", iface, volume);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_WaitUntilDone(ISpVoice *iface, ULONG timeout)
+{
+ FIXME("(%p, %d): stub.\n", iface, timeout);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_SetSyncSpeakTimeout(ISpVoice *iface, ULONG timeout)
+{
+ FIXME("(%p, %d): stub.\n", iface, timeout);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_GetSyncSpeakTimeout(ISpVoice *iface, ULONG *timeout)
+{
+ FIXME("(%p, %p): stub.\n", iface, timeout);
+
+ return E_NOTIMPL;
+}
+
+static HANDLE WINAPI spvoice_SpeakCompleteEvent(ISpVoice *iface)
+{
+ FIXME("(%p): stub.\n", iface);
+
+ return NULL;
+}
+
+static HRESULT WINAPI spvoice_IsUISupported(ISpVoice *iface, const WCHAR *type, void *extra,
+ ULONG count, BOOL *supported)
+{
+ FIXME("(%p, %p, %p, %d, %p): stub.\n", iface, type, extra, count, supported);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI spvoice_DisplayUI(ISpVoice *iface, HWND parent, const WCHAR *title,
+ const WCHAR *type, void *extra, ULONG count)
+{
+ FIXME("(%p, %p, %p, %p, %p, %d): stub.\n", iface, parent, title, type, extra, count);
+
+ return E_NOTIMPL;
+}
+
+static const ISpVoiceVtbl spvoice_vtbl =
+{
+ spvoice_QueryInterface,
+ spvoice_AddRef,
+ spvoice_Release,
+ spvoice_SetNotifySink,
+ spvoice_SetNotifyWindowMessage,
+ spvoice_SetNotifyCallbackFunction,
+ spvoice_SetNotifyCallbackInterface,
+ spvoice_SetNotifyWin32Event,
+ spvoice_WaitForNotifyEvent,
+ spvoice_GetNotifyEventHandle,
+ spvoice_SetInterest,
+ spvoice_GetEvents,
+ spvoice_GetInfo,
+ spvoice_SetOutput,
+ spvoice_GetOutputObjectToken,
+ spvoice_GetOutputStream,
+ spvoice_Pause,
+ spvoice_Resume,
+ spvoice_SetVoice,
+ spvoice_GetVoice,
+ spvoice_Speak,
+ spvoice_SpeakStream,
+ spvoice_GetStatus,
+ spvoice_Skip,
+ spvoice_SetPriority,
+ spvoice_GetPriority,
+ spvoice_SetAlertBoundary,
+ spvoice_GetAlertBoundary,
+ spvoice_SetRate,
+ spvoice_GetRate,
+ spvoice_SetVolume,
+ spvoice_GetVolume,
+ spvoice_WaitUntilDone,
+ spvoice_SetSyncSpeakTimeout,
+ spvoice_GetSyncSpeakTimeout,
+ spvoice_SpeakCompleteEvent,
+ spvoice_IsUISupported,
+ spvoice_DisplayUI
+};
+
HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)
{
struct speech_voice *This = heap_alloc(sizeof(*This));
@@ -405,6 +733,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)
if (!This) return E_OUTOFMEMORY;
This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl;
+ This->ISpVoice_iface.lpVtbl = &spvoice_vtbl;
This->ref = 1;
hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj);
--
2.24.0
2
1
[PATCH v2 1/7] wined3d: Add extra memory management fields to struct wined3d_adapter.
by Conor McCarthy 14 Nov '19
by Conor McCarthy 14 Nov '19
14 Nov '19
Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com>
---
dlls/wined3d/adapter_gl.c | 4 +++-
dlls/wined3d/adapter_vk.c | 4 +++-
dlls/wined3d/device.c | 6 +++---
dlls/wined3d/directx.c | 11 +++++++----
dlls/wined3d/wined3d_private.h | 10 +++++++++-
5 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 7018c6da..2cc6aaf9 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -3881,7 +3881,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n",
driver_info->version_high, driver_info->version_low);
- adapter->vram_bytes_used = 0;
+ memset(&adapter->memory_usage, 0, sizeof(adapter->memory_usage));
+ adapter->memory_events = NULL;
+ adapter->event_count = 0;
TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(driver_info->vram_bytes));
if (gl_info->supported[EXT_MEMORY_OBJECT])
diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index 21163a20..81526ade 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -1180,7 +1180,9 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk,
VK_CALL(vkGetPhysicalDeviceMemoryProperties(adapter_vk->physical_device, &memory_properties));
adapter_vk_init_driver_info(adapter, &properties2.properties, &memory_properties);
- adapter->vram_bytes_used = 0;
+ memset(&adapter->memory_usage, 0, sizeof(adapter->memory_usage));
+ adapter->memory_events = NULL;
+ adapter->event_count = 0;
TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes));
memcpy(&adapter->driver_uuid, id_properties.driverUUID, sizeof(adapter->driver_uuid));
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 2a4d3778..3f525e8e 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1202,10 +1202,10 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device
TRACE("Emulating 0x%s bytes. 0x%s used, returning 0x%s left.\n",
wine_dbgstr_longlong(driver_info->vram_bytes),
- wine_dbgstr_longlong(device->adapter->vram_bytes_used),
- wine_dbgstr_longlong(driver_info->vram_bytes - device->adapter->vram_bytes_used));
+ wine_dbgstr_longlong(device->adapter->memory_usage[0].bytes_used),
+ wine_dbgstr_longlong(driver_info->vram_bytes - device->adapter->memory_usage[0].bytes_used));
- return min(UINT_MAX, driver_info->vram_bytes - device->adapter->vram_bytes_used);
+ return min(UINT_MAX, driver_info->vram_bytes - device->adapter->memory_usage[0].bytes_used);
}
void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx,
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 902cc444..fa991d36 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -146,16 +146,17 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, const WCHAR *d
/* Adjust the amount of used texture memory */
UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount)
{
- adapter->vram_bytes_used += amount;
+ adapter->memory_usage[0].bytes_used += amount;
TRACE("Adjusted used adapter memory by 0x%s to 0x%s.\n",
wine_dbgstr_longlong(amount),
- wine_dbgstr_longlong(adapter->vram_bytes_used));
- return adapter->vram_bytes_used;
+ wine_dbgstr_longlong(adapter->memory_usage[0].bytes_used));
+ return adapter->memory_usage[0].bytes_used;
}
void wined3d_adapter_cleanup(struct wined3d_adapter *adapter)
{
wined3d_output_cleanup(&adapter->output);
+ heap_free(adapter->memory_events);
heap_free(adapter->formats);
}
@@ -2778,7 +2779,9 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal,
return NULL;
wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0, 0);
- adapter->vram_bytes_used = 0;
+ memset(&adapter->memory_usage, 0, sizeof(adapter->memory_usage));
+ adapter->memory_events = NULL;
+ adapter->event_count = 0;
TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes));
if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_no3d_ops))
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index f86853e9..65e7d43f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2868,6 +2868,12 @@ struct wined3d_output
D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id;
};
+struct wined3d_adapter_memory_usage
+{
+ UINT64 bytes_used;
+ UINT64 bytes_reserved;
+};
+
/* The adapter structure */
struct wined3d_adapter
{
@@ -2879,7 +2885,9 @@ struct wined3d_adapter
struct wined3d_d3d_info d3d_info;
struct wined3d_driver_info driver_info;
struct wined3d_output output;
- UINT64 vram_bytes_used;
+ struct wined3d_adapter_memory_usage memory_usage[2];
+ HANDLE *memory_events;
+ DWORD event_count;
GUID driver_uuid;
GUID device_uuid;
LUID luid;
--
2.23.0
2
7
[PATCH] shell32: Fix definitions for FOLDERID_ProgramFilesX64 and FOLDERID_ProgramFilesCommonX64 on 64-bit.
by Hans Leidekker 14 Nov '19
by Hans Leidekker 14 Nov '19
14 Nov '19
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/shell32/shellpath.c | 12 ++++++++++++
dlls/shell32/tests/shellpath.c | 22 ++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 8c6e8a89b2..d9d65cbaed 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -2697,9 +2697,15 @@ static const CSIDL_DATA CSIDL_Data[] =
},
{ /* 0x54 */
&FOLDERID_ProgramFilesX64,
+#ifdef _WIN64
+ CSIDL_Type_CurrVer,
+ ProgramFilesDirW,
+ Program_FilesW,
+#else
CSIDL_Type_NonExistent,
NULL,
NULL,
+#endif
KF_CATEGORY_FIXED, /* category */
ProgramFilesX64W, /* name */
@@ -2717,9 +2723,15 @@ static const CSIDL_DATA CSIDL_Data[] =
},
{ /* 0x55 */
&FOLDERID_ProgramFilesCommonX64,
+#ifdef _WIN64
+ CSIDL_Type_CurrVer,
+ ProgramFilesCommonX64W,
+ Program_Files_Common_FilesW,
+#else
CSIDL_Type_NonExistent,
NULL,
NULL,
+#endif
KF_CATEGORY_FIXED, /* category */
ProgramFilesCommonX64W, /* name */
diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c
index f768f44c8b..262714a9f3 100644
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -1932,6 +1932,28 @@ if (0) { /* crashes */
hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len + 1);
ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr);
+
+ path = NULL;
+ hr = pSHGetKnownFolderPath(&FOLDERID_ProgramFilesX64, 0, NULL, &path);
+#ifdef _WIN64
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(path != NULL, "path not set\n");
+ CoTaskMemFree(path);
+#else
+ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr);
+ ok(path == NULL, "path set\n");
+#endif
+
+ path = NULL;
+ hr = pSHGetKnownFolderPath(&FOLDERID_ProgramFilesCommonX64, 0, NULL, &path);
+#ifdef _WIN64
+ ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr);
+ ok(path != NULL, "path not set\n");
+ CoTaskMemFree(path);
+#else
+ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr);
+ ok(path == NULL, "path set\n");
+#endif
}
static BOOL is_in_strarray(const WCHAR *needle, const char *hay)
--
2.20.1
1
0
2
1
This seems to have been fixed by recent changes to CreateProcess() implementation.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
dlls/advapi32/tests/service.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index aa9a69fed2..bd70ecaddf 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -1793,7 +1793,7 @@ static void test_wow64(void)
ok(!!service, "Failed to create service, error %u.\n", GetLastError());
ret = StartServiceA(service, 0, NULL);
ok(!ret, "Expected failure.\n");
- todo_wine ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError());
+ ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError());
ret = DeleteService(service);
ok(ret, "Failed to delete service, error %u.\n", GetLastError());
--
2.24.0
2
1
This seems to have been fixed by the recent changes to CreateProcess().
---
dlls/advapi32/tests/service.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index aa9a69fed2..bd70ecaddf 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -1793,7 +1793,7 @@ static void test_wow64(void)
ok(!!service, "Failed to create service, error %u.\n", GetLastError());
ret = StartServiceA(service, 0, NULL);
ok(!ret, "Expected failure.\n");
- todo_wine ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError());
+ ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError());
ret = DeleteService(service);
ok(ret, "Failed to delete service, error %u.\n", GetLastError());
--
2.24.0
2
1
14 Nov '19
Selection is stored in character cell coords, not in pixels.
"Mark" functionality behaves correctly.
In order to reproduce the bug run wineconsole, press right mouse button,
choose Edit -> Select all, then Edit -> Copy, and paste the result into
text editor (under Wine or native).
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
programs/wineconsole/user.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c
index 28e81261e9..5cc405d5b7 100644
--- a/programs/wineconsole/user.c
+++ b/programs/wineconsole/user.c
@@ -1310,8 +1310,8 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
break;
case IDS_SELECTALL:
PRIVATE(data)->selectPt1.X = PRIVATE(data)->selectPt1.Y = 0;
- PRIVATE(data)->selectPt2.X = (data->curcfg.sb_width - 1) * data->curcfg.cell_width;
- PRIVATE(data)->selectPt2.Y = (data->curcfg.sb_height - 1) * data->curcfg.cell_height;
+ PRIVATE(data)->selectPt2.X = data->curcfg.sb_width - 1;
+ PRIVATE(data)->selectPt2.Y = data->curcfg.sb_height - 1;
WCUSER_SetSelection(data, 0);
PRIVATE(data)->has_selection = TRUE;
break;
--
2.20.1
1
0
14 Nov '19
Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com>
---
dlls/d3d12/tests/d3d12.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c
index 33f5288a..9634564b 100644
--- a/dlls/d3d12/tests/d3d12.c
+++ b/dlls/d3d12/tests/d3d12.c
@@ -601,6 +601,8 @@ static HWND create_window(DWORD style)
static IDXGISwapChain3 *create_swapchain(struct test_context *context, ID3D12CommandQueue *queue,
HWND window, unsigned int buffer_count, DXGI_FORMAT format, unsigned int width, unsigned int height)
{
+ D3D12_HEAP_PROPERTIES heap_properties;
+ D3D12_HEAP_FLAGS heap_flags;
IDXGISwapChain1 *swapchain1;
DXGI_SWAP_CHAIN_DESC1 desc;
IDXGISwapChain3 *swapchain;
@@ -646,6 +648,13 @@ static IDXGISwapChain3 *create_swapchain(struct test_context *context, ID3D12Com
{
hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&context->render_target[i]);
ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr);
+ hr = ID3D12Resource_GetHeapProperties(context->render_target[i], &heap_properties, &heap_flags);
+ ok(hr == S_OK, "Failed to get swapchain buffer %u heap properties, hr %#x.\n", i, hr);
+ ok(heap_properties.Type == D3D12_HEAP_TYPE_DEFAULT, "Got unexpected heap type 0x%x.\n", heap_properties.Type);
+ ok(heap_properties.CPUPageProperty == 0, "Got unexpected cpu page property 0x%x.\n", heap_properties.CPUPageProperty);
+ ok(heap_properties.MemoryPoolPreference == 0, "Got unexpected memory pool preference 0x%x.\n", heap_properties.MemoryPoolPreference);
+ ok(heap_properties.CreationNodeMask == 1, "Got unexpected node mask 0x%x.\n", heap_properties.CreationNodeMask);
+ ok(heap_properties.VisibleNodeMask == 1, "Got unexpected node mask 0x%x.\n", heap_properties.VisibleNodeMask);
ID3D12Device_CreateRenderTargetView(context->device, context->render_target[i], NULL, context->rtv[i]);
}
}
--
2.23.0
1
0