summaryrefslogtreecommitdiffstats
path: root/src/compiler/builtin_type_macros.h
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-02-09 14:09:12 -0800
committerJason Ekstrand <jason.ekstrand@intel.com>2016-02-13 17:22:36 -0800
commit5ec6a65388871cc11ba9058dac4a76f4181c2334 (patch)
tree4757fac2ca5bb43e4cae996f51a3848b3d883258 /src/compiler/builtin_type_macros.h
parentac089126b9b647f930ee2657aa16ea8e8f6a5dd7 (diff)
downloadexternal_mesa3d-5ec6a65388871cc11ba9058dac4a76f4181c2334.zip
external_mesa3d-5ec6a65388871cc11ba9058dac4a76f4181c2334.tar.gz
external_mesa3d-5ec6a65388871cc11ba9058dac4a76f4181c2334.tar.bz2
glsl/types: Add a bare "sampler" type
This is to be used by SPIR-V for representing a sampler that isn't attached to any particular image. In SPIR-V, all of the interesting bits such as dimensionality, sampled type, etc. come from the image, the bare "sampler" type simply uses a sampled type of VOID and 0 values for the rest. Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'src/compiler/builtin_type_macros.h')
-rw-r--r--src/compiler/builtin_type_macros.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/compiler/builtin_type_macros.h b/src/compiler/builtin_type_macros.h
index 7bd2e4e..da3f19e 100644
--- a/src/compiler/builtin_type_macros.h
+++ b/src/compiler/builtin_type_macros.h
@@ -78,6 +78,7 @@ DECL_TYPE(dmat3x4, GL_DOUBLE_MAT3x4, GLSL_TYPE_DOUBLE, 4, 3)
DECL_TYPE(dmat4x2, GL_DOUBLE_MAT4x2, GLSL_TYPE_DOUBLE, 2, 4)
DECL_TYPE(dmat4x3, GL_DOUBLE_MAT4x3, GLSL_TYPE_DOUBLE, 3, 4)
+DECL_TYPE(sampler, GL_SAMPLER_1D, GLSL_TYPE_SAMPLER, GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_VOID)
DECL_TYPE(sampler1D, GL_SAMPLER_1D, GLSL_TYPE_SAMPLER, GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_FLOAT)
DECL_TYPE(sampler2D, GL_SAMPLER_2D, GLSL_TYPE_SAMPLER, GLSL_SAMPLER_DIM_2D, 0, 0, GLSL_TYPE_FLOAT)
DECL_TYPE(sampler3D, GL_SAMPLER_3D, GLSL_TYPE_SAMPLER, GLSL_SAMPLER_DIM_3D, 0, 0, GLSL_TYPE_FLOAT)