Zebediah Figura : vkd3d-shader/d3dbc: Skip generic sampler declarations.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 1bd873fb2b887d6b4a21d0f009374ddf7cff8303
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/1bd873fb2b887d6b4a21d0f009374d...

Author: Zebediah Figura 
Date:   Wed Jul 26 18:41:26 2023 -0500

vkd3d-shader/d3dbc: Skip generic sampler declarations.

Instead of asserting.

---

libs/vkd3d-shader/d3dbc.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c
index 9a147e3d..34dc4bab 100644
--- a/libs/vkd3d-shader/d3dbc.c
+++ b/libs/vkd3d-shader/d3dbc.c
@@ -2034,7 +2034,12 @@ static void write_sm1_sampler_dcls(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b
             if (var->objects_usage[HLSL_REGSET_SAMPLERS][i].used)
             {
                 sampler_dim = var->objects_usage[HLSL_REGSET_SAMPLERS][i].sampler_dim;
-                assert(sampler_dim != HLSL_SAMPLER_DIM_GENERIC);
+                if (sampler_dim == HLSL_SAMPLER_DIM_GENERIC)
+                {
+                    /* These can appear in sm4-style combined sample instructions. */
+                    hlsl_fixme(ctx, &var->loc, "Generic samplers need to be lowered.");
+                    continue;
+                }

reg_id = var->regs[HLSL_REGSET_SAMPLERS].id + i;
                 write_sm1_sampler_dcl(ctx, buffer, reg_id, sampler_dim);