diff options
author | marha <marha@users.sourceforge.net> | 2013-06-18 08:23:14 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-06-18 08:23:14 +0200 |
commit | b071050b9eda9d5e5185e582dbe9f4adba863ccc (patch) | |
tree | 6da290f7da04f9afc96691608b65967f2ee0e0fa /mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | |
parent | 150771e7aabf4c864b0b970c5b8d773634793abe (diff) | |
download | vcxsrv-b071050b9eda9d5e5185e582dbe9f4adba863ccc.tar.gz vcxsrv-b071050b9eda9d5e5185e582dbe9f4adba863ccc.tar.bz2 vcxsrv-b071050b9eda9d5e5185e582dbe9f4adba863ccc.zip |
libX11 libXmu libxcb/xcb-proto mesa mkfontscale pixman xkeyboard-config git update 18 June 2013
libxcb/xcb-proto commit e5f7c750815cb5170db363a2e5b09639b7354733
xkeyboard-config commit 30d804538462213ed01e8efc0b44a8e5a0aff990
libX11 commit 9dfb0f3c0a761590bcdc1f3396b1e064da4e18e8
pixman commit 279bdcda7ec3af8ac06312f4514b1b082a279544
mkfontscale commit f731c5c36f28ddd0f25f474d2991c96f9a7a915c
libXmu commit e46ecb4e02b7f919b11efa79448d4db71d1deb69
mesa commit eb2021507556633cd6ba64cda26653e3c43e80df
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index f8176eb77..d6796d7a1 100644 --- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -3096,7 +3096,7 @@ set_uniform_initializer(struct gl_context *ctx, void *mem_ctx, "Couldn't find uniform for initializer %s\n", name); return; } - int loc = _mesa_uniform_merge_location_offset(index, offset); + int loc = _mesa_uniform_merge_location_offset(shader_program, index, offset); for (unsigned int i = 0; i < (type->is_array() ? type->length : 1); i++) { ir_constant *element; |