diff options
| author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-01 08:00:04 +0000 |
|---|---|---|
| committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-01 08:00:04 +0000 |
| commit | ce8de041dd51d4b47a9027c95670521f8363f460 (patch) | |
| tree | 46f0df7402d449546892b80afe61e8a697470d2f /o3d | |
| parent | cf9db21597c56cbec3c87ba0304d74e465543a2d (diff) | |
| download | chromium_src-ce8de041dd51d4b47a9027c95670521f8363f460.zip chromium_src-ce8de041dd51d4b47a9027c95670521f8363f460.tar.gz chromium_src-ce8de041dd51d4b47a9027c95670521f8363f460.tar.bz2 | |
Fix for param array support in effects for GL
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/core/cross/gl/param_cache_gl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/o3d/core/cross/gl/param_cache_gl.cc b/o3d/core/cross/gl/param_cache_gl.cc index 0828140..aae2acd 100644 --- a/o3d/core/cross/gl/param_cache_gl.cc +++ b/o3d/core/cross/gl/param_cache_gl.cc @@ -325,12 +325,13 @@ class EffectParamArraySamplerHandlerGL : public EffectParamHandlerGL { for (int i = 0; i < size; ++i) { Param* untyped_element = param->GetUntypedParam(i); if (untyped_element->IsA(ParamSampler::GetApparentClass())) { + CGparameter cg_element = cgGetArrayParameter(cg_param, i); ParamSampler* element = down_cast<ParamSampler*>(untyped_element); SamplerGL* sampler_gl = down_cast<SamplerGL*>(element->value()); if (!sampler_gl) { sampler_gl = down_cast<SamplerGL*>(renderer->error_sampler()); } - sampler_gl->ResetTexture(cg_param); + sampler_gl->ResetTexture(cg_element); } } } |