Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: cc/output/program_binding.h

Issue 12764030: cc: Chromify shader.cc and shader.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/shader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/program_binding.h
diff --git a/cc/output/program_binding.h b/cc/output/program_binding.h
index 77396cc46974b56a374174f5cada599b5562a467..213213e9bef50bad902a463dd83ce10738833383 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
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/shader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698