diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/service/shader_translator.cc | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -42,7 +42,7 @@ deps = { (Var("googlecode_url") % "googlemock") + "/trunk@374", "src/third_party/angle": - (Var("googlecode_url") % "angleproject") + "/trunk@609", + (Var("googlecode_url") % "angleproject") + "/trunk@626", # Note that this is *not* where we check out WebKit -- this just # puts some extra files into place for the real WebKit checkout to diff --git a/gpu/command_buffer/service/shader_translator.cc b/gpu/command_buffer/service/shader_translator.cc index 43b29ef..27d5e04 100644 --- a/gpu/command_buffer/service/shader_translator.cc +++ b/gpu/command_buffer/service/shader_translator.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -47,10 +47,10 @@ void GetVariableInfo(ShHandle compiler, ShShaderInfo var_type, switch (var_type) { case SH_ACTIVE_ATTRIBUTES: - ShGetActiveAttrib(compiler, i, NULL, &size, &type, name.get()); + ShGetActiveAttrib(compiler, i, NULL, &size, &type, name.get(), NULL); break; case SH_ACTIVE_UNIFORMS: - ShGetActiveUniform(compiler, i, NULL, &size, &type, name.get()); + ShGetActiveUniform(compiler, i, NULL, &size, &type, name.get(), NULL); break; default: NOTREACHED(); } |