From 22836dbefa8b57fd788adf2693d7aab73c4de16a Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 25 Mar 2016 10:50:11 -0700 Subject: [PATCH] glsl/shader_enums: Add an enum for Vulkan InstanceIndex In Vulkan, you have InstanceIndex which begins at the base instance value rather than the zero-based InstanceID of GL. Reviewed-by: Rob Clark --- src/compiler/shader_enums.c | 1 + src/compiler/shader_enums.h | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/compiler/shader_enums.c b/src/compiler/shader_enums.c index 942d152b129..003ad3b8ab6 100644 --- a/src/compiler/shader_enums.c +++ b/src/compiler/shader_enums.c @@ -201,6 +201,7 @@ gl_system_value_name(gl_system_value sysval) static const char *names[] = { ENUM(SYSTEM_VALUE_VERTEX_ID), ENUM(SYSTEM_VALUE_INSTANCE_ID), + ENUM(SYSTEM_VALUE_INSTANCE_INDEX), ENUM(SYSTEM_VALUE_VERTEX_ID_ZERO_BASE), ENUM(SYSTEM_VALUE_BASE_VERTEX), ENUM(SYSTEM_VALUE_INVOCATION_ID), diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h index 07ae9ee2de7..0c43d5a92cb 100644 --- a/src/compiler/shader_enums.h +++ b/src/compiler/shader_enums.h @@ -378,6 +378,13 @@ typedef enum */ SYSTEM_VALUE_INSTANCE_ID, + /** + * Vulkan InstanceIndex. + * + * InstanceIndex = gl_InstanceID + gl_BaseInstance + */ + SYSTEM_VALUE_INSTANCE_INDEX, + /** * DirectX-style vertex ID. * -- 2.30.2