Mesa (master): glsl: add support for texture functions with offset arrays
Chris Forbes
chrisf at kemper.freedesktop.org
Sat Oct 26 09:28:56 UTC 2013
Module: Mesa
Branch: master
Commit: a9de744a26bc575a1a269e133c550f813c95904f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9de744a26bc575a1a269e133c550f813c95904f
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Thu Oct 10 21:34:03 2013 +1300
glsl: add support for texture functions with offset arrays
This is needed for textureGatherOffsets()
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/glsl/builtin_functions.cpp | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
index deedddb..1b23677 100644
--- a/src/glsl/builtin_functions.cpp
+++ b/src/glsl/builtin_functions.cpp
@@ -507,6 +507,7 @@ private:
#define TEX_OFFSET 2
#define TEX_COMPONENT 4
#define TEX_OFFSET_NONCONST 8
+#define TEX_OFFSET_ARRAY 16
ir_function_signature *_texture(ir_texture_opcode opcode,
builtin_available_predicate avail,
@@ -3432,6 +3433,14 @@ builtin_builder::_texture(ir_texture_opcode opcode,
tex->offset = var_ref(offset);
}
+ if (flags & TEX_OFFSET_ARRAY) {
+ ir_variable *offsets =
+ new(mem_ctx) ir_variable(glsl_type::get_array_instance(glsl_type::ivec2_type, 4),
+ "offsets", ir_var_const_in);
+ sig->parameters.push_tail(offsets);
+ tex->offset = var_ref(offsets);
+ }
+
if (opcode == ir_tg4) {
if (flags & TEX_COMPONENT) {
ir_variable *component =
More information about the mesa-commit
mailing list