zink: generically handle matrix types
there's a bunch of glsl 1.10 tests for this
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6268>
diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
index bcbb208..97ea028 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
@@ -285,6 +285,12 @@
return ret;
}
+ if (glsl_type_is_matrix(type))
+ return spirv_builder_type_matrix(&ctx->builder,
+ spirv_builder_type_vector(&ctx->builder,
+ get_glsl_basetype(ctx, glsl_get_base_type(type)),
+ glsl_get_vector_elements(type)),
+ glsl_get_matrix_columns(type));
unreachable("we shouldn't get here, I think...");
}
diff --git a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
index 1b7c676..3a522c4 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
@@ -916,6 +916,15 @@
}
SpvId
+spirv_builder_type_matrix(struct spirv_builder *b, SpvId component_type,
+ unsigned component_count)
+{
+ assert(component_count > 1);
+ uint32_t args[] = { component_type, component_count };
+ return get_type_def(b, SpvOpTypeMatrix, args, ARRAY_SIZE(args));
+}
+
+SpvId
spirv_builder_type_array(struct spirv_builder *b, SpvId component_type,
SpvId length)
{
diff --git a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h
index a1e9b6c..487d4f7 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h
+++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h
@@ -302,6 +302,10 @@
unsigned component_count);
SpvId
+spirv_builder_type_matrix(struct spirv_builder *b, SpvId component_type,
+ unsigned component_count);
+
+SpvId
spirv_builder_type_array(struct spirv_builder *b, SpvId component_type,
SpvId length);
