[PATCH v6 3/3] vkd3d-shader/hlsl: Validate that referenced objects are uniform.

[Francisco Casas]

From: Francisco Casas

---
 libs/vkd3d-shader/hlsl_codegen.c         | 32 ++++++++++++++++++------
 libs/vkd3d-shader/vkd3d_shader_private.h |  1 +
 tests/object-references.shader_test      | 10 ++++----
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index e4173ddc..2d38a272 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -1012,26 +1012,44 @@ static bool validate_static_object_references(struct hlsl_ctx *ctx, struct hlsl_
     {
         struct hlsl_ir_resource_load *load = hlsl_ir_resource_load(instr);

-        if (!hlsl_component_index_range_from_deref(ctx, &load->resource, &start, &count))
+        if (!load->resource.var->is_uniform)
+        {
+            hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_UNINITIALIZED_OBJECT_REF,
+                    "Loaded resource not initialized.");
+        }
+        else if (!hlsl_component_index_range_from_deref(ctx, &load->resource, &start, &count))
         {
             hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_NON_STATIC_OBJECT_REF,
                     "Loaded resource from "%s" must be determinable at compile time.",
                     load->resource.var->name);
             note_non_static_deref_expressions(ctx, &load->resource, "loaded resource");
         }
-        if (load->sampler.var && !hlsl_component_index_range_from_deref(ctx, &load->sampler, &start, &count))
+        if (load->sampler.var)
         {
-            hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_NON_STATIC_OBJECT_REF,
-                    "Resource load sampler from "%s" must be determinable at compile time.",
-                    load->sampler.var->name);
-            note_non_static_deref_expressions(ctx, &load->sampler, "resource load sampler");
+            if (!load->sampler.var->is_uniform)
+            {
+                hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_UNINITIALIZED_OBJECT_REF,
+                        "Resource load sampler not initialized.");
+            }
+            else if (!hlsl_component_index_range_from_deref(ctx, &load->sampler, &start, &count))
+            {
+                hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_NON_STATIC_OBJECT_REF,
+                        "Resource load sampler from "%s" must be determinable at compile time.",
+                        load->sampler.var->name);
+                note_non_static_deref_expressions(ctx, &load->sampler, "resource load sampler");
+            }
         }
     }
     else if (instr->type == HLSL_IR_RESOURCE_STORE)
     {
         struct hlsl_ir_resource_store *store = hlsl_ir_resource_store(instr);

-        if (!hlsl_component_index_range_from_deref(ctx, &store->resource, &start, &count))
+        if (!store->resource.var->is_uniform)
+        {
+            hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_UNINITIALIZED_OBJECT_REF,
+                    "Accessed resource not initialized.");
+        }
+        else if (!hlsl_component_index_range_from_deref(ctx, &store->resource, &start, &count))
         {
             hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_NON_STATIC_OBJECT_REF,
                     "Accessed resource from "%s" must be determinable at compile time.",
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 74edf049..e2f14ea3 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -121,6 +121,7 @@ enum vkd3d_shader_error
     VKD3D_SHADER_ERROR_HLSL_NON_STATIC_OBJECT_REF       = 5022,
     VKD3D_SHADER_ERROR_HLSL_INVALID_THREAD_COUNT        = 5023,
     VKD3D_SHADER_ERROR_HLSL_MISSING_ATTRIBUTE           = 5024,
+    VKD3D_SHADER_ERROR_HLSL_UNINITIALIZED_OBJECT_REF    = 5025,

VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION       = 5300,
     VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO          = 5301,
diff --git a/tests/object-references.shader_test b/tests/object-references.shader_test
index 39716e64..50dd52f2 100644
--- a/tests/object-references.shader_test
+++ b/tests/object-references.shader_test
@@ -1,4 +1,4 @@
-[pixel shader fail todo]
+[pixel shader fail]
 sampler sam;

float4 main() : sv_target
@@ -10,7 +10,7 @@ float4 main() : sv_target
 }

-[pixel shader fail todo]
+[pixel shader fail]
 sampler sam;

float4 main() : sv_target
@@ -21,7 +21,7 @@ float4 main() : sv_target
 }

-[pixel shader fail todo]
+[pixel shader fail]
 Texture2D tex;

float4 main() : sv_target
@@ -32,7 +32,7 @@ float4 main() : sv_target
 }

-[pixel shader fail todo]
+[pixel shader fail]
 float4 main() : sv_target
 {
     RWTexture2D<float4> u;
@@ -42,7 +42,7 @@ float4 main() : sv_target
 }

-[pixel shader fail todo]
+[pixel shader fail]
 float4 main() : sv_target
 {
     RWTexture2D<float4> u;