diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-18 08:28:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-18 08:28:35 +0200 |
| commit | 230fe896faed312ef22d915e871fb5aee3ecfad0 (patch) | |
| tree | 971b0c0899c72496f97970319bfadfae383abbea /mesalib/src/glsl/builtin_variables.cpp | |
| parent | 180290f941da61bd80284d817e27c01cf789ee53 (diff) | |
| parent | b071050b9eda9d5e5185e582dbe9f4adba863ccc (diff) | |
| download | vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.tar.gz vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.tar.bz2 vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libXmu libxcb/xcb-proto mesa mkfontscale pixman xkeyboard-config git update 18 June 2013
Diffstat (limited to 'mesalib/src/glsl/builtin_variables.cpp')
| -rw-r--r-- | mesalib/src/glsl/builtin_variables.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mesalib/src/glsl/builtin_variables.cpp b/mesalib/src/glsl/builtin_variables.cpp index 4bb361c2e..f4ac20543 100644 --- a/mesalib/src/glsl/builtin_variables.cpp +++ b/mesalib/src/glsl/builtin_variables.cpp @@ -790,6 +790,13 @@ generate_130_uniforms(exec_list *instructions, state->Const.MaxClipPlanes); add_builtin_constant(instructions, symtab, "gl_MaxVaryingComponents", state->Const.MaxVaryingFloats); + + if (state->ARB_shading_language_420pack_enable) { + add_builtin_constant(instructions, symtab, "gl_MinProgramTexelOffset", + state->Const.MinProgramTexelOffset); + add_builtin_constant(instructions, symtab, "gl_MaxProgramTexelOffset", + state->Const.MaxProgramTexelOffset); + } } |