[PATCH 0/2] MR505: vkd3d-shader/dxil: Fix two small issues.

[Conor McCarthy (＠cmccarthy)]

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/505

[PATCH 1/2] vkd3d-shader/dxil: Count global variables in dxil_block_compute_module_decl_count().

[Conor McCarthy]

From: Conor McCarthy <cmccarthy(a)codeweavers.com>

---
 libs/vkd3d-shader/dxil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index beb9ae574..b5a72c4df 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -1210,7 +1210,7 @@ static size_t dxil_block_compute_module_decl_count(const struct dxil_block *bloc
     size_t i, count;
 
     for (i = 0, count = 0; i < block->record_count; ++i)
-        count += block->records[i]->code == MODULE_CODE_FUNCTION;
+        count += block->records[i]->code == MODULE_CODE_FUNCTION || block->records[i]->code == MODULE_CODE_GLOBALVAR;
     return count;
 }
 
-- 
GitLab


https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/505

[PATCH 2/2] vkd3d-shader/dxil: Pre-allocate instruction space for globals in sm6_parser_globals_init().

[Conor McCarthy]

From: Conor McCarthy <cmccarthy(a)codeweavers.com>

For simplicity, declaration handlers assume instruction allocation will
not fail.
---
 libs/vkd3d-shader/dxil.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index b5a72c4df..b36ad3d23 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -2810,11 +2810,15 @@ static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6)
     const struct dxil_record *record;
     enum vkd3d_result ret;
     uint64_t version;
-    size_t i;
+    size_t i, count;
 
     sm6->p.location.line = block->id;
     sm6->p.location.column = 0;
 
+    for (i = 0, count = 0; i < block->record_count; ++i)
+        count += block->records[i]->code == MODULE_CODE_GLOBALVAR;
+    sm6_parser_require_space(sm6, count);
+
     for (i = 0; i < block->record_count; ++i)
     {
         sm6->p.location.column = i;
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/505

[PATCH 0/2] MR505: vkd3d-shader/dxil: Fix two small issues. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/505