mesa: fix another "out of samplers" problem
authorBrian Paul <brianp@vmware.com>
Tue, 6 Jan 2009 16:20:55 +0000 (09:20 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 6 Jan 2009 16:20:55 +0000 (09:20 -0700)
commit8e0b601e311ec2f9f8e6205e6a2e6a7642009a96
treef05d741736d7d001166d15b234dd0b6fffc64b45
parent7bfe6a9375b413d92982e065fb48c810d144c632
mesa: fix another "out of samplers" problem

Now only the samplers that are actually used by texture() functions are
saved in the uniform variable list.  Before, we could run out of samplers
if too many were declared while only some of them were actually used.

(cherry picked from commit 1fad6ccb756ae33ca3115f59c99ca8abbeb0321e)

Conflicts:

src/mesa/shader/slang/slang_link.c
src/mesa/shader/prog_parameter.c
src/mesa/shader/slang/slang_emit.c
src/mesa/shader/slang/slang_link.c