diff options
author | marha <marha@users.sourceforge.net> | 2013-07-19 08:33:43 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-07-19 08:33:43 +0200 |
commit | 45b71fd5b777a968310c537ace5efcd1443085a0 (patch) | |
tree | a3ef2b449659c3ba6c885d169c7796b3ef948867 /mesalib/src/glsl/ir.h | |
parent | 08bafbbe05abefabdb0c3238c3d9ecdcce1b692f (diff) | |
parent | 89bc3ee988b62eb5e10284bac32a176955546410 (diff) | |
download | vcxsrv-45b71fd5b777a968310c537ace5efcd1443085a0.tar.gz vcxsrv-45b71fd5b777a968310c537ace5efcd1443085a0.tar.bz2 vcxsrv-45b71fd5b777a968310c537ace5efcd1443085a0.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkbcomp git update 19 Jul 2013
Diffstat (limited to 'mesalib/src/glsl/ir.h')
-rw-r--r-- | mesalib/src/glsl/ir.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h index 1f0dc0906..7ac291cf4 100644 --- a/mesalib/src/glsl/ir.h +++ b/mesalib/src/glsl/ir.h @@ -471,6 +471,14 @@ public: unsigned explicit_index:1; /** + * Was an initial binding explicitly set in the shader? + * + * If so, constant_value contains an integer ir_constant representing the + * initial binding point. + */ + unsigned explicit_binding:1; + + /** * Does this variable have an initializer? * * This is used by the linker to cross-validiate initializers of global @@ -528,6 +536,13 @@ public: int index; /** + * Initial binding point for a sampler or UBO. + * + * For array types, this represents the binding point for the first element. + */ + int binding; + + /** * Built-in state that backs this uniform * * Once set at variable creation, \c state_slots must remain invariant. |