|
|
1
|
+From: Jordan Justen <jordan.l.justen@intel.com>
|
|
|
2
|
+Date: Mon, 14 Apr 2025 14:56:22 -0700
|
|
|
3
|
+Subject: ext_external_objects: Fix two null-handle misassignments
|
|
|
4
|
+
|
|
|
5
|
+Setting to NULL (a pointer, rather than handle), causes build issues
|
|
|
6
|
+on 32-bit architectures.
|
|
|
7
|
+
|
|
|
8
|
+Fixes: 18c82454d ("ext_external_objects: Add compute shader infrastructure")
|
|
|
9
|
+Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
|
|
|
10
|
+---
|
|
|
11
|
+ tests/spec/ext_external_objects/vk.c | 4 ++--
|
|
|
12
|
+ 1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
13
|
+
|
|
|
14
|
+diff --git a/tests/spec/ext_external_objects/vk.c b/tests/spec/ext_external_objects/vk.c
|
|
|
15
|
+index b5f3de7..5518629 100644
|
|
|
16
|
+--- a/tests/spec/ext_external_objects/vk.c
|
|
|
17
|
++++ b/tests/spec/ext_external_objects/vk.c
|
|
|
18
|
+@@ -1380,7 +1380,7 @@ vk_create_compute_pipeline(struct vk_ctx *ctx,
|
|
|
19
|
+ s_layout_info.pBindings = bindings;
|
|
|
20
|
+ if (vkCreateDescriptorSetLayout(ctx->dev, &s_layout_info, NULL, &cp->set_layout) != VK_SUCCESS) {
|
|
|
21
|
+ fprintf(stderr, "Failed to create descriptor set layout\n");
|
|
|
22
|
+- cp->set_layout = NULL;
|
|
|
23
|
++ cp->set_layout = VK_NULL_HANDLE;
|
|
|
24
|
+ free(bindings);
|
|
|
25
|
+ goto fail;
|
|
|
26
|
+ }
|
|
|
27
|
+@@ -1395,7 +1395,7 @@ vk_create_compute_pipeline(struct vk_ctx *ctx,
|
|
|
28
|
+ p_layout_info.pSetLayouts = &cp->set_layout;
|
|
|
29
|
+ if (vkCreatePipelineLayout(ctx->dev, &p_layout_info, NULL, &cp->pipeline_layout) != VK_SUCCESS) {
|
|
|
30
|
+ fprintf(stderr, "Failed to create pipeline layout\n");
|
|
|
31
|
+- cp->pipeline_layout = NULL;
|
|
|
32
|
++ cp->pipeline_layout = VK_NULL_HANDLE;
|
|
|
33
|
+ goto fail;
|
|
|
34
|
+ }
|
|
|
35
|
+ |