- Wine-Commits - list.winehq.org

Stefan Dösinger : vkd3d: Implement vkd3d_shader_cache_put.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: vkd3d Branch: master Commit: aad76f4ed2f6d8cfb1ea6b1578b7290b7862edc1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aad76f4ed2f6d8cfb1ea6b1578b72… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 23 21:44:39 2023 +0300 vkd3d: Implement vkd3d_shader_cache_put. --- include/private/vkd3d_common.h | 5 ++ include/vkd3d_types.h | 2 + libs/vkd3d-common/error.c | 2 + libs/vkd3d/cache.c | 122 +++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/device.c | 16 +++++- libs/vkd3d/vkd3d_private.h | 2 + 6 files changed, 146 insertions(+), 3 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 4b7da0a1..79682483 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -340,6 +340,11 @@ static inline int vkd3d_u32_compare(uint32_t x, uint32_t y) return (x > y) - (x < y); } +static inline int vkd3d_u64_compare(uint64_t x, uint64_t y) +{ + return (x > y) - (x < y); +} + #define VKD3D_BITMAP_SIZE(x) (((x) + 0x1f) >> 5) static inline bool bitmap_clear(uint32_t *map, unsigned int idx) diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 9060fa08..18aa118f 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -53,6 +53,8 @@ enum vkd3d_result VKD3D_ERROR_INVALID_SHADER = -4, /** The operation is not implemented in this version of vkd3d. */ VKD3D_ERROR_NOT_IMPLEMENTED = -5, + /** The object or entry already exists. \since 1.12 */ + VKD3D_ERROR_KEY_ALREADY_EXISTS = -6, VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), }; diff --git a/libs/vkd3d-common/error.c b/libs/vkd3d-common/error.c index b8350a54..a6efedde 100644 --- a/libs/vkd3d-common/error.c +++ b/libs/vkd3d-common/error.c @@ -35,6 +35,8 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) return E_INVALIDARG; case VKD3D_ERROR_NOT_IMPLEMENTED: return E_NOTIMPL; + case VKD3D_ERROR_KEY_ALREADY_EXISTS: + return DXGI_ERROR_ALREADY_EXISTS; default: FIXME("Unhandled vkd3d result %d.\n", vkd3d_result); return E_FAIL; diff --git a/libs/vkd3d/cache.c b/libs/vkd3d/cache.c index 56ba6990..05b717ba 100644 --- a/libs/vkd3d/cache.c +++ b/libs/vkd3d/cache.c @@ -18,11 +18,58 @@ #include "vkd3d_private.h" +struct vkd3d_cache_entry_header +{ + uint64_t hash; + uint64_t key_size; + uint64_t value_size; +}; + struct vkd3d_shader_cache { unsigned int refcount; + struct rb_tree tree; +}; + +struct shader_cache_entry +{ + struct vkd3d_cache_entry_header h; + struct rb_entry entry; + uint8_t *payload; }; +struct shader_cache_key +{ + uint64_t hash; + const void *key; + uint64_t key_size; +}; + +static int vkd3d_shader_cache_compare_key(const void *key, const struct rb_entry *entry) +{ + const struct shader_cache_entry *e = RB_ENTRY_VALUE(entry, struct shader_cache_entry, entry); + const struct shader_cache_key *k = key; + int ret; + + if ((ret = vkd3d_u64_compare(k->hash, e->h.hash))) + return ret; + if ((ret = vkd3d_u64_compare(k->key_size, e->h.key_size))) + return ret; + + /* Until now we have not seen an actual hash collision. If the key didn't match it was always + * due to a bug in the serialization code or memory corruption. If you see this FIXME please + * investigate. */ + if ((ret = memcmp(k->key, e->payload, k->key_size))) + FIXME("Actual case of a hash collision found.\n"); + return ret; +} + +static void vkd3d_shader_cache_add_entry(struct vkd3d_shader_cache *cache, + struct shader_cache_entry *e) +{ + rb_put(&cache->tree, &e->h.hash, &e->entry); +} + int vkd3d_shader_open_cache(struct vkd3d_shader_cache **cache) { struct vkd3d_shader_cache *object; @@ -34,6 +81,8 @@ int vkd3d_shader_open_cache(struct vkd3d_shader_cache **cache) return VKD3D_ERROR_OUT_OF_MEMORY; object->refcount = 1; + rb_init(&object->tree, vkd3d_shader_cache_compare_key); + *cache = object; return VKD3D_OK; @@ -46,6 +95,13 @@ unsigned int vkd3d_shader_cache_incref(struct vkd3d_shader_cache *cache) return refcount; } +static void vkd3d_shader_cache_destroy_entry(struct rb_entry *entry, void *context) +{ + struct shader_cache_entry *e = RB_ENTRY_VALUE(entry, struct shader_cache_entry, entry); + vkd3d_free(e->payload); + vkd3d_free(e); +} + unsigned int vkd3d_shader_cache_decref(struct vkd3d_shader_cache *cache) { unsigned int refcount = vkd3d_atomic_decrement_u32(&cache->refcount); @@ -54,6 +110,72 @@ unsigned int vkd3d_shader_cache_decref(struct vkd3d_shader_cache *cache) if (refcount) return refcount; + rb_destroy(&cache->tree, vkd3d_shader_cache_destroy_entry, NULL); + vkd3d_free(cache); return 0; } + +static uint64_t vkd3d_shader_cache_hash_key(const void *key, size_t size) +{ + static const uint64_t fnv_prime = 0x00000100000001b3; + uint64_t hash = 0xcbf29ce484222325; + const uint8_t *k = key; + size_t i; + + for (i = 0; i < size; ++i) + hash = (hash ^ k[i]) * fnv_prime; + + return hash; +} + +int vkd3d_shader_cache_put(struct vkd3d_shader_cache *cache, + const void *key, size_t key_size, const void *value, size_t value_size) +{ + struct shader_cache_entry *e; + struct shader_cache_key k; + struct rb_entry *entry; + enum vkd3d_result ret; + + TRACE("%p, %p, %#zx, %p, %#zx.\n", cache, key, key_size, value, value_size); + + k.hash = vkd3d_shader_cache_hash_key(key, key_size); + k.key = key; + k.key_size = key_size; + entry = rb_get(&cache->tree, &k); + e = entry ? RB_ENTRY_VALUE(entry, struct shader_cache_entry, entry) : NULL; + + if (e) + { + WARN("Key already exists, returning VKD3D_ERROR_KEY_ALREADY_EXISTS.\n"); + ret = VKD3D_ERROR_KEY_ALREADY_EXISTS; + goto done; + } + + e = vkd3d_malloc(sizeof(*e)); + if (!e) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto done; + } + e->payload = vkd3d_malloc(key_size + value_size); + if (!e->payload) + { + vkd3d_free(e); + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto done; + } + + e->h.key_size = key_size; + e->h.value_size = value_size; + e->h.hash = k.hash; + memcpy(e->payload, key, key_size); + memcpy(e->payload + key_size, value, value_size); + + vkd3d_shader_cache_add_entry(cache, e); + TRACE("Cache entry %#"PRIx64" stored.\n", k.hash); + ret = VKD3D_OK; + +done: + return ret; +} diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 13d354a7..fe2669b2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2694,10 +2694,20 @@ static HRESULT STDMETHODCALLTYPE d3d12_cache_session_FindValue(ID3D12ShaderCache static HRESULT STDMETHODCALLTYPE d3d12_cache_session_StoreValue(ID3D12ShaderCacheSession *iface, const void *key, UINT key_size, const void *value, UINT value_size) { - FIXME("iface %p, key %p, key_size %#x, value %p, value_size %u stub!\n", iface, key, key_size, - value, value_size); + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + enum vkd3d_result ret; - return E_NOTIMPL; + TRACE("iface %p, key %p, key_size %#x, value %p, value_size %u.\n", + iface, key, key_size, value, value_size); + + if (!key || !key_size || !value || !value_size) + { + WARN("Invalid input parameters, returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + + ret = vkd3d_shader_cache_put(session->cache, key, key_size, value, value_size); + return hresult_from_vkd3d_result(ret); } static void STDMETHODCALLTYPE d3d12_cache_session_SetDeleteOnDestroy(ID3D12ShaderCacheSession *iface) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4d0c4a3c..63bfce7d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1776,5 +1776,7 @@ struct vkd3d_shader_cache; int vkd3d_shader_open_cache(struct vkd3d_shader_cache **cache); unsigned int vkd3d_shader_cache_incref(struct vkd3d_shader_cache *cache); unsigned int vkd3d_shader_cache_decref(struct vkd3d_shader_cache *cache); +int vkd3d_shader_cache_put(struct vkd3d_shader_cache *cache, + const void *key, size_t key_size, const void *value, size_t value_size); #endif /* __VKD3D_PRIVATE_H */

1 0

Henri Verbeet : vkd3d-common: Introduce vkd3d_atomic_exchange_u32().
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: vkd3d Branch: master Commit: b1c326ce564280638212d7602138ce21a6ab4ba5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b1c326ce564280638212d7602138c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 18:59:20 2024 +0200 vkd3d-common: Introduce vkd3d_atomic_exchange_u32(). --- include/private/vkd3d_common.h | 18 ++++++++++++++++++ libs/vkd3d/resource.c | 12 ++++++------ libs/vkd3d/vkd3d_private.h | 20 -------------------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 88c563eb..3e853b06 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -442,6 +442,24 @@ static inline bool vkd3d_atomic_compare_exchange_u32(uint32_t volatile *x, uint3 #endif } +static inline uint32_t vkd3d_atomic_exchange_u32(uint32_t volatile *x, uint32_t val) +{ +#if HAVE_ATOMIC_EXCHANGE_N + return __atomic_exchange_n(x, val, __ATOMIC_SEQ_CST); +#elif defined(_WIN32) + return InterlockedExchange((LONG *)x, val); +#else + uint32_t expected; + + do + { + expected = *x; + } while (!vkd3d_atomic_compare_exchange_u32(x, expected, val)); + + return expected; +#endif +} + struct vkd3d_mutex { #ifdef _WIN32 diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ff9721fb..e3d1661a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2356,10 +2356,10 @@ static void *vkd3d_desc_object_cache_get(struct vkd3d_desc_object_cache *cache) { vkd3d_atomic_decrement_u32(&cache->free_count); cache->heads[i].head = u.header->next; - vkd3d_atomic_exchange(&cache->heads[i].spinlock, 0); + vkd3d_atomic_exchange_u32(&cache->heads[i].spinlock, 0); return u.object; } - vkd3d_atomic_exchange(&cache->heads[i].spinlock, 0); + vkd3d_atomic_exchange_u32(&cache->heads[i].spinlock, 0); } /* Keeping a free count avoids uncertainty over when this loop should terminate, * which could result in excess allocations gradually increasing without limit. */ @@ -2389,7 +2389,7 @@ static void vkd3d_desc_object_cache_push(struct vkd3d_desc_object_cache *cache, head = cache->heads[i].head; u.header->next = head; cache->heads[i].head = u.object; - vkd3d_atomic_exchange(&cache->heads[i].spinlock, 0); + vkd3d_atomic_exchange_u32(&cache->heads[i].spinlock, 0); vkd3d_atomic_increment_u32(&cache->free_count); } @@ -2652,7 +2652,7 @@ void d3d12_desc_flush_vk_heap_updates_locked(struct d3d12_descriptor_heap *descr union d3d12_desc_object u; unsigned int i, next; - if ((i = vkd3d_atomic_exchange(&descriptor_heap->dirty_list_head, UINT_MAX)) == UINT_MAX) + if ((i = vkd3d_atomic_exchange_u32(&descriptor_heap->dirty_list_head, UINT_MAX)) == UINT_MAX) return; writes.null_vk_cbv_info.buffer = VK_NULL_HANDLE; @@ -2667,7 +2667,7 @@ void d3d12_desc_flush_vk_heap_updates_locked(struct d3d12_descriptor_heap *descr for (; i != UINT_MAX; i = next) { src = &descriptors[i]; - next = vkd3d_atomic_exchange(&src->next, 0); + next = vkd3d_atomic_exchange_u32(&src->next, 0); next = (int)next >> 1; /* A race exists here between updating src->next and getting the current object. The best @@ -2701,7 +2701,7 @@ static void d3d12_desc_mark_as_modified(struct d3d12_desc *dst, struct d3d12_des while (!vkd3d_atomic_compare_exchange_u32(&descriptor_heap->dirty_list_head, head, i)) { head = descriptor_heap->dirty_list_head; - vkd3d_atomic_exchange(&dst->next, (head << 1) | 1); + vkd3d_atomic_exchange_u32(&dst->next, (head << 1) | 1); } } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f9b0a093..efe049a2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -204,11 +204,6 @@ union vkd3d_thread_handle void *handle; }; -static inline unsigned int vkd3d_atomic_exchange(unsigned int volatile *x, unsigned int val) -{ - return InterlockedExchange((LONG volatile *)x, val); -} - static inline void *vkd3d_atomic_exchange_pointer(void * volatile *x, void *val) { return InterlockedExchangePointer(x, val); @@ -225,26 +220,11 @@ union vkd3d_thread_handle }; # if HAVE_ATOMIC_EXCHANGE_N -static inline unsigned int vkd3d_atomic_exchange(unsigned int volatile *x, unsigned int val) -{ - return __atomic_exchange_n(x, val, __ATOMIC_SEQ_CST); -} - static inline void *vkd3d_atomic_exchange_pointer(void * volatile *x, void *val) { return __atomic_exchange_n(x, val, __ATOMIC_SEQ_CST); } # elif HAVE_SYNC_BOOL_COMPARE_AND_SWAP -static inline unsigned int vkd3d_atomic_exchange(unsigned int volatile *x, unsigned int val) -{ - unsigned int i; - do - { - i = *x; - } while (!__sync_bool_compare_and_swap(x, i, val)); - return i; -} - static inline void *vkd3d_atomic_exchange_pointer(void * volatile *x, void *val) { void *p;

1 0

Henri Verbeet : vkd3d-common: Introduce vkd3d_atomic_compare_exchange_u32().
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: vkd3d Branch: master Commit: 5c8a90a6c995d221033af863a7f667ec6c9f7bed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5c8a90a6c995d221033af863a7f66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 18:23:41 2024 +0200 vkd3d-common: Introduce vkd3d_atomic_compare_exchange_u32(). --- include/private/vkd3d_common.h | 11 +++++++++++ libs/vkd3d/resource.c | 8 ++++---- libs/vkd3d/vkd3d_private.h | 16 +--------------- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index de6878a4..88c563eb 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -431,6 +431,17 @@ static inline uint32_t vkd3d_atomic_increment_u32(uint32_t volatile *x) return vkd3d_atomic_add_fetch_u32(x, 1); } +static inline bool vkd3d_atomic_compare_exchange_u32(uint32_t volatile *x, uint32_t expected, uint32_t val) +{ +#if HAVE_SYNC_BOOL_COMPARE_AND_SWAP + return __sync_bool_compare_and_swap(x, expected, val); +#elif defined(_WIN32) + return InterlockedCompareExchange((LONG *)x, val, expected) == expected; +#else +# error "vkd3d_atomic_compare_exchange_u32() not implemented for this platform" +#endif +} + struct vkd3d_mutex { #ifdef _WIN32 diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6ee3afa4..ff9721fb 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2350,7 +2350,7 @@ static void *vkd3d_desc_object_cache_get(struct vkd3d_desc_object_cache *cache) i = vkd3d_atomic_increment_u32(&cache->next_index) & HEAD_INDEX_MASK; for (;;) { - if (vkd3d_atomic_compare_exchange(&cache->heads[i].spinlock, 0, 1)) + if (vkd3d_atomic_compare_exchange_u32(&cache->heads[i].spinlock, 0, 1)) { if ((u.object = cache->heads[i].head)) { @@ -2381,7 +2381,7 @@ static void vkd3d_desc_object_cache_push(struct vkd3d_desc_object_cache *cache, i = vkd3d_atomic_increment_u32(&cache->next_index) & HEAD_INDEX_MASK; for (;;) { - if (vkd3d_atomic_compare_exchange(&cache->heads[i].spinlock, 0, 1)) + if (vkd3d_atomic_compare_exchange_u32(&cache->heads[i].spinlock, 0, 1)) break; i = (i + 1) & HEAD_INDEX_MASK; } @@ -2695,10 +2695,10 @@ static void d3d12_desc_mark_as_modified(struct d3d12_desc *dst, struct d3d12_des head = descriptor_heap->dirty_list_head; /* Only one thread can swap the value away from zero. */ - if (!vkd3d_atomic_compare_exchange(&dst->next, 0, (head << 1) | 1)) + if (!vkd3d_atomic_compare_exchange_u32(&dst->next, 0, (head << 1) | 1)) return; /* Now it is safe to modify 'next' to another nonzero value if necessary. */ - while (!vkd3d_atomic_compare_exchange(&descriptor_heap->dirty_list_head, head, i)) + while (!vkd3d_atomic_compare_exchange_u32(&descriptor_heap->dirty_list_head, head, i)) { head = descriptor_heap->dirty_list_head; vkd3d_atomic_exchange(&dst->next, (head << 1) | 1); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bf02a76f..f9b0a093 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -204,11 +204,6 @@ union vkd3d_thread_handle void *handle; }; -static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsigned int cmp, unsigned int xchg) -{ - return InterlockedCompareExchange((LONG volatile *)x, xchg, cmp) == cmp; -} - static inline unsigned int vkd3d_atomic_exchange(unsigned int volatile *x, unsigned int val) { return InterlockedExchange((LONG volatile *)x, val); @@ -229,15 +224,6 @@ union vkd3d_thread_handle void *handle; }; -# if HAVE_SYNC_BOOL_COMPARE_AND_SWAP -static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsigned int cmp, unsigned int xchg) -{ - return __sync_bool_compare_and_swap(x, cmp, xchg); -} -# else -# error "vkd3d_atomic_compare_exchange() not implemented for this platform" -# endif - # if HAVE_ATOMIC_EXCHANGE_N static inline unsigned int vkd3d_atomic_exchange(unsigned int volatile *x, unsigned int val) { @@ -735,7 +721,7 @@ static inline bool vkd3d_view_incref(void *desc) if (refcount <= 0) return false; } - while (!vkd3d_atomic_compare_exchange(&h->refcount, refcount, refcount + 1)); + while (!vkd3d_atomic_compare_exchange_u32(&h->refcount, refcount, refcount + 1)); return true; }

1 0

Henri Verbeet : vkd3d: Get rid of vkd3d_atomic_compare_exchange_pointer().
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: vkd3d Branch: master Commit: bfbd29efe6e7e428adf94a1ffc7a14418c8e0937 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bfbd29efe6e7e428adf94a1ffc7a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 18:31:10 2024 +0200 vkd3d: Get rid of vkd3d_atomic_compare_exchange_pointer(). The only uses of this were remove by commit 3ca225980755032b385b36142d4cc44e78a987fd. --- libs/vkd3d/vkd3d_private.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 77d95111..bf02a76f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -214,11 +214,6 @@ static inline unsigned int vkd3d_atomic_exchange(unsigned int volatile *x, unsig return InterlockedExchange((LONG volatile *)x, val); } -static inline bool vkd3d_atomic_compare_exchange_pointer(void * volatile *x, void *cmp, void *xchg) -{ - return InterlockedCompareExchangePointer(x, xchg, cmp) == cmp; -} - static inline void *vkd3d_atomic_exchange_pointer(void * volatile *x, void *val) { return InterlockedExchangePointer(x, val); @@ -239,11 +234,6 @@ static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsig { return __sync_bool_compare_and_swap(x, cmp, xchg); } - -static inline bool vkd3d_atomic_compare_exchange_pointer(void * volatile *x, void *cmp, void *xchg) -{ - return __sync_bool_compare_and_swap(x, cmp, xchg); -} # else # error "vkd3d_atomic_compare_exchange() not implemented for this platform" # endif

1 0

Stefan Dösinger : vkd3d: Implement cache locking.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: vkd3d Branch: master Commit: cb6c868460cb045d52c780092cc38e4a8a90a15b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cb6c868460cb045d52c780092cc38… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 14 21:23:10 2024 +0300 vkd3d: Implement cache locking. --- libs/vkd3d/cache.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d/cache.c b/libs/vkd3d/cache.c index 448dfc6d..a0a29ed3 100644 --- a/libs/vkd3d/cache.c +++ b/libs/vkd3d/cache.c @@ -28,6 +28,8 @@ struct vkd3d_cache_entry_header struct vkd3d_shader_cache { unsigned int refcount; + struct vkd3d_mutex lock; + struct rb_tree tree; }; @@ -82,6 +84,7 @@ int vkd3d_shader_open_cache(struct vkd3d_shader_cache **cache) object->refcount = 1; rb_init(&object->tree, vkd3d_shader_cache_compare_key); + vkd3d_mutex_init(&object->lock); *cache = object; @@ -111,6 +114,7 @@ unsigned int vkd3d_shader_cache_decref(struct vkd3d_shader_cache *cache) return refcount; rb_destroy(&cache->tree, vkd3d_shader_cache_destroy_entry, NULL); + vkd3d_mutex_destroy(&cache->lock); vkd3d_free(cache); return 0; @@ -129,6 +133,16 @@ static uint64_t vkd3d_shader_cache_hash_key(const void *key, size_t size) return hash; } +static void vkd3d_shader_cache_lock(struct vkd3d_shader_cache *cache) +{ + vkd3d_mutex_lock(&cache->lock); +} + +static void vkd3d_shader_cache_unlock(struct vkd3d_shader_cache *cache) +{ + vkd3d_mutex_unlock(&cache->lock); +} + int vkd3d_shader_cache_put(struct vkd3d_shader_cache *cache, const void *key, size_t key_size, const void *value, size_t value_size) { @@ -142,6 +156,9 @@ int vkd3d_shader_cache_put(struct vkd3d_shader_cache *cache, k.hash = vkd3d_shader_cache_hash_key(key, key_size); k.key = key; k.key_size = key_size; + + vkd3d_shader_cache_lock(cache); + entry = rb_get(&cache->tree, &k); e = entry ? RB_ENTRY_VALUE(entry, struct shader_cache_entry, entry) : NULL; @@ -177,6 +194,7 @@ int vkd3d_shader_cache_put(struct vkd3d_shader_cache *cache, ret = VKD3D_OK; done: + vkd3d_shader_cache_unlock(cache); return ret; } @@ -196,6 +214,9 @@ int vkd3d_shader_cache_get(struct vkd3d_shader_cache *cache, k.hash = vkd3d_shader_cache_hash_key(key, key_size); k.key = key; k.key_size = key_size; + + vkd3d_shader_cache_lock(cache); + entry = rb_get(&cache->tree, &k); if (!entry) { @@ -228,5 +249,6 @@ int vkd3d_shader_cache_get(struct vkd3d_shader_cache *cache, TRACE("Returning cached item %#"PRIx64".\n", e->h.hash); done: + vkd3d_shader_cache_unlock(cache); return ret; }

1 0

Stefan Dösinger : vkd3d: Implement vkd3d_shader_cache_get.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: vkd3d Branch: master Commit: 71f1955cd64bcb1f61138fca2428f0a71f167d55 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/71f1955cd64bcb1f61138fca2428f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 5 17:21:53 2024 +0300 vkd3d: Implement vkd3d_shader_cache_get. --- include/vkd3d_types.h | 4 ++++ libs/vkd3d-common/error.c | 4 ++++ libs/vkd3d/cache.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/device.c | 18 ++++++++++++++-- libs/vkd3d/vkd3d_private.h | 2 ++ 5 files changed, 77 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 18aa118f..420dd787 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -55,6 +55,10 @@ enum vkd3d_result VKD3D_ERROR_NOT_IMPLEMENTED = -5, /** The object or entry already exists. \since 1.12 */ VKD3D_ERROR_KEY_ALREADY_EXISTS = -6, + /** The requested object was not found. \since 1.12 */ + VKD3D_ERROR_NOT_FOUND = -7, + /** The output buffer is larger than the requested object \since 1.12. */ + VKD3D_ERROR_MORE_DATA = -8, VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), }; diff --git a/libs/vkd3d-common/error.c b/libs/vkd3d-common/error.c index a6efedde..2f978c49 100644 --- a/libs/vkd3d-common/error.c +++ b/libs/vkd3d-common/error.c @@ -37,6 +37,10 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) return E_NOTIMPL; case VKD3D_ERROR_KEY_ALREADY_EXISTS: return DXGI_ERROR_ALREADY_EXISTS; + case VKD3D_ERROR_NOT_FOUND: + return DXGI_ERROR_NOT_FOUND; + case VKD3D_ERROR_MORE_DATA: + return DXGI_ERROR_MORE_DATA; default: FIXME("Unhandled vkd3d result %d.\n", vkd3d_result); return E_FAIL; diff --git a/libs/vkd3d/cache.c b/libs/vkd3d/cache.c index 05b717ba..448dfc6d 100644 --- a/libs/vkd3d/cache.c +++ b/libs/vkd3d/cache.c @@ -179,3 +179,54 @@ int vkd3d_shader_cache_put(struct vkd3d_shader_cache *cache, done: return ret; } + +int vkd3d_shader_cache_get(struct vkd3d_shader_cache *cache, + const void *key, size_t key_size, void *value, size_t *value_size) +{ + struct shader_cache_entry *e; + struct shader_cache_key k; + struct rb_entry *entry; + enum vkd3d_result ret; + size_t size_in; + + TRACE("%p, %p, %#zx, %p, %p.\n", cache, key, key_size, value, value_size); + + size_in = *value_size; + + k.hash = vkd3d_shader_cache_hash_key(key, key_size); + k.key = key; + k.key_size = key_size; + entry = rb_get(&cache->tree, &k); + if (!entry) + { + WARN("Entry not found.\n"); + ret = VKD3D_ERROR_NOT_FOUND; + goto done; + } + + e = RB_ENTRY_VALUE(entry, struct shader_cache_entry, entry); + + *value_size = e->h.value_size; + if (!value) + { + TRACE("Found item %#"PRIx64", returning needed size %#"PRIx64".\n", + e->h.hash, e->h.value_size); + ret = VKD3D_OK; + goto done; + } + + if (size_in < e->h.value_size) + { + WARN("Output buffer is too small for item %#"PRIx64", got %#zx want %#"PRIx64".\n", + e->h.hash, size_in, e->h.value_size); + ret = VKD3D_ERROR_MORE_DATA; + goto done; + } + + memcpy(value, e->payload + e->h.key_size, e->h.value_size); + ret = VKD3D_OK; + TRACE("Returning cached item %#"PRIx64".\n", e->h.hash); + +done: + return ret; +} diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fe2669b2..cb2b6ad0 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2685,10 +2685,24 @@ static HRESULT STDMETHODCALLTYPE d3d12_cache_session_GetDevice(ID3D12ShaderCache static HRESULT STDMETHODCALLTYPE d3d12_cache_session_FindValue(ID3D12ShaderCacheSession *iface, const void *key, UINT key_size, void *value, UINT *value_size) { - FIXME("iface %p, key %p, key_size %#x, value %p, value_size %p stub!\n", + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + enum vkd3d_result ret; + size_t size; + + TRACE("iface %p, key %p, key_size %#x, value %p, value_size %p.\n", iface, key, key_size, value, value_size); - return DXGI_ERROR_NOT_FOUND; + if (!value_size) + { + WARN("value_size is NULL, returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + + size = *value_size; + ret = vkd3d_shader_cache_get(session->cache, key, key_size, value, &size); + *value_size = size; + + return hresult_from_vkd3d_result(ret); } static HRESULT STDMETHODCALLTYPE d3d12_cache_session_StoreValue(ID3D12ShaderCacheSession *iface, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 63bfce7d..84bdee92 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1778,5 +1778,7 @@ unsigned int vkd3d_shader_cache_incref(struct vkd3d_shader_cache *cache); unsigned int vkd3d_shader_cache_decref(struct vkd3d_shader_cache *cache); int vkd3d_shader_cache_put(struct vkd3d_shader_cache *cache, const void *key, size_t key_size, const void *value, size_t value_size); +int vkd3d_shader_cache_get(struct vkd3d_shader_cache *cache, + const void *key, size_t key_size, void *value, size_t *value_size); #endif /* __VKD3D_PRIVATE_H */

1 0

Henri Verbeet : vkd3d: Use WIDL_C_INLINE_WRAPPERS.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: vkd3d Branch: master Commit: d5717d333b5dd5c647e824b34c6b26889ce46fc9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d5717d333b5dd5c647e824b34c6b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 20:00:46 2024 +0200 vkd3d: Use WIDL_C_INLINE_WRAPPERS. --- libs/vkd3d/device.c | 2 +- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 2 +- libs/vkd3d/vkd3d_private.h | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a394e3f7..13d354a7 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2833,7 +2833,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_QueryInterface(ID3D12Device9 *ifac || IsEqualGUID(riid, &IID_ID3D12Object) || IsEqualGUID(riid, &IID_IUnknown)) { - ID3D12Device_AddRef(iface); + ID3D12Device9_AddRef(iface); *object = iface; return S_OK; } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 17999914..6ee3afa4 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1271,7 +1271,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_QueryInterface(ID3D12Resource2 * || IsEqualGUID(riid, &IID_ID3D12Object) || IsEqualGUID(riid, &IID_IUnknown)) { - ID3D12Resource_AddRef(iface); + ID3D12Resource2_AddRef(iface); *object = iface; return S_OK; } diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 29305fbd..c7431bd8 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -71,7 +71,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, if (!device) { - ID3D12Device_Release(&object->ID3D12Device9_iface); + ID3D12Device9_Release(&object->ID3D12Device9_iface); return S_FALSE; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index fa9e1f05..77d95111 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -19,6 +19,9 @@ #ifndef __VKD3D_PRIVATE_H #define __VKD3D_PRIVATE_H +#ifndef __MINGW32__ +#define WIDL_C_INLINE_WRAPPERS +#endif #define COBJMACROS #define NONAMELESSUNION #define VK_NO_PROTOTYPES

1 0

Conor McCarthy : vkd3d-shader/ir: Always check for undominated SSA use in register relative addresses.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: vkd3d Branch: master Commit: 075979fa21f0975a01f3f71eaccefac29c25039a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/075979fa21f0975a01f3f71eaccef… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 24 18:07:16 2024 +1000 vkd3d-shader/ir: Always check for undominated SSA use in register relative addresses. --- libs/vkd3d-shader/ir.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index f313eb65..121b0fe3 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -5098,12 +5098,12 @@ static void register_map_undominated_use(struct vkd3d_shader_register *reg, stru { unsigned int i; - if (!register_is_ssa(reg)) - return; - - i = reg->idx[0].offset; - if (alloc->table[i] == UINT_MAX && !vsir_block_dominates(origin_blocks[i], block)) - alloc->table[i] = alloc->next_temp_idx++; + if (register_is_ssa(reg)) + { + i = reg->idx[0].offset; + if (alloc->table[i] == UINT_MAX && !vsir_block_dominates(origin_blocks[i], block)) + alloc->table[i] = alloc->next_temp_idx++; + } for (i = 0; i < reg->idx_count; ++i) if (reg->idx[i].rel_addr)

1 0

Henri Verbeet : vkd3d-common: Use WIDL_C_INLINE_WRAPPERS.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: vkd3d Branch: master Commit: 11db8c17191021391bd97f69952cb7e16ff66b65 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/11db8c17191021391bd97f69952cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 20:04:41 2024 +0200 vkd3d-common: Use WIDL_C_INLINE_WRAPPERS. --- libs/vkd3d-common/blob.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-common/blob.c b/libs/vkd3d-common/blob.c index b12d9630..469f9810 100644 --- a/libs/vkd3d-common/blob.c +++ b/libs/vkd3d-common/blob.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __MINGW32__ +#define WIDL_C_INLINE_WRAPPERS +#endif #define COBJMACROS #define INITGUID #define CONST_VTABLE

1 0

Henri Verbeet : vkd3d-utils: Use WIDL_C_INLINE_WRAPPERS.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: vkd3d Branch: master Commit: 534044181b50f45a6e6e72dbc4b4c56788dcf619 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/534044181b50f45a6e6e72dbc4b4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 20:02:50 2024 +0200 vkd3d-utils: Use WIDL_C_INLINE_WRAPPERS. --- libs/vkd3d-utils/reflection.c | 2 +- libs/vkd3d-utils/vkd3d_utils_private.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-utils/reflection.c b/libs/vkd3d-utils/reflection.c index 920cc371..f4cc78bc 100644 --- a/libs/vkd3d-utils/reflection.c +++ b/libs/vkd3d-utils/reflection.c @@ -340,7 +340,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_reflection_QueryInterface( if (IsEqualGUID(riid, &IID_ID3D12ShaderReflection) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D12ShaderReflection_AddRef(iface); *object = iface; return S_OK; } diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 7fece3d6..84f7372e 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -19,6 +19,9 @@ #ifndef __VKD3D_UTILS_PRIVATE_H #define __VKD3D_UTILS_PRIVATE_H +#ifndef __MINGW32__ +#define WIDL_C_INLINE_WRAPPERS +#endif #define COBJMACROS #define NONAMELESSUNION #define VK_NO_PROTOTYPES

1 0