From 1ec715ce8b126da3cfe3b383054f9a176960c218 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Fri, 13 Feb 2015 22:03:47 -0500 Subject: [PATCH] glsl: teach std140_base_alignment about samplers These functions are about to be used more aggressively for determining uniform layout. Samplers may be inside of structs, and it's easier to reuse the existing base alignment logic. Signed-off-by: Ilia Mirkin Reviewed-by: Dave Airlie --- src/glsl/glsl_types.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index be87b0a2d24..38b37a6a94b 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -1077,6 +1077,15 @@ glsl_type::std140_base_alignment(bool row_major) const return base_alignment; } + /* A sampler may never occur in a UBO (without bindless of some sort), + * however it is convenient to use this alignment function even with + * regular uniforms. This allows use of this function on uniform structs + * that contain samplers. + */ + if (this->is_sampler()) { + return 0; + } + assert(!"not reached"); return -1; } -- 2.30.2