diff options
| author | brianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-24 03:43:13 +0000 |
|---|---|---|
| committer | brianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-24 03:43:13 +0000 |
| commit | 8e7c5ac618adec42b322d4ee2ea7be53efcb2c72 (patch) | |
| tree | f790c6fd9aa7f705d8286815066a1c47b9839655 /cc/output/program_binding.h | |
| parent | a7a1b3ce2a1e8e568580eced075ab8c3f1c07e04 (diff) | |
| download | chromium_src-8e7c5ac618adec42b322d4ee2ea7be53efcb2c72.zip chromium_src-8e7c5ac618adec42b322d4ee2ea7be53efcb2c72.tar.gz chromium_src-8e7c5ac618adec42b322d4ee2ea7be53efcb2c72.tar.bz2 | |
cc: Chromify shader.cc and shader.h
BUG=none
Review URL: https://chromiumcodereview.appspot.com/12764030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/program_binding.h')
| -rw-r--r-- | cc/output/program_binding.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/output/program_binding.h b/cc/output/program_binding.h index 77396cc..213213e 100644 --- a/cc/output/program_binding.h +++ b/cc/output/program_binding.h @@ -48,8 +48,8 @@ class ProgramBinding : public ProgramBindingBase { public: explicit ProgramBinding(WebKit::WebGraphicsContext3D* context) { ProgramBindingBase::Init(context, - vertex_shader_.getShaderString(), - fragment_shader_.getShaderString()); + vertex_shader_.GetShaderString(), + fragment_shader_.GetShaderString()); } void Initialize(WebKit::WebGraphicsContext3D* context, @@ -65,9 +65,9 @@ class ProgramBinding : public ProgramBindingBase { Link(context); int base_uniform_index = 0; - vertex_shader_.init( + vertex_shader_.Init( context, program_, using_bind_uniform, &base_uniform_index); - fragment_shader_.init( + fragment_shader_.Init( context, program_, using_bind_uniform, &base_uniform_index); // Link after binding uniforms |