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

Unified Diff: ui/gl/gl_bindings_skia_in_process.cc

Issue 660173002: Type conversion fixes, ui/ edition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 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 | « ui/events/win/events_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_bindings_skia_in_process.cc
diff --git a/ui/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
index 0e2dfe56ba4e8c19daa659d5fa6592d33801edf4..a01bc381e57073bd0b7c9105eb3d06cfd9534850 100644
--- a/ui/gl/gl_bindings_skia_in_process.cc
+++ b/ui/gl/gl_bindings_skia_in_process.cc
@@ -467,7 +467,7 @@ GLvoid StubGLTexSubImage2D(GLenum target, GLint level, GLint xoffset,
}
GLvoid StubGLUniform1f(GLint location, GLfloat v) {
- glUniform1i(location, v);
+ glUniform1f(location, v);
}
GLvoid StubGLUniform1i(GLint location, GLint v) {
@@ -483,7 +483,7 @@ GLvoid StubGLUniform1iv(GLint location, GLsizei count, const GLint* v) {
}
GLvoid StubGLUniform2f(GLint location, GLfloat v0, GLfloat v1) {
- glUniform2i(location, v0, v1);
+ glUniform2f(location, v0, v1);
}
GLvoid StubGLUniform2i(GLint location, GLint v0, GLint v1) {
@@ -499,7 +499,7 @@ GLvoid StubGLUniform2iv(GLint location, GLsizei count, const GLint* v) {
}
GLvoid StubGLUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) {
- glUniform3i(location, v0, v1, v2);
+ glUniform3f(location, v0, v1, v2);
}
GLvoid StubGLUniform3i(GLint location, GLint v0, GLint v1, GLint v2) {
@@ -516,7 +516,7 @@ GLvoid StubGLUniform3iv(GLint location, GLsizei count, const GLint* v) {
GLvoid StubGLUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
GLfloat v3) {
- glUniform4i(location, v0, v1, v2, v3);
+ glUniform4f(location, v0, v1, v2, v3);
}
GLvoid StubGLUniform4i(GLint location, GLint v0, GLint v1, GLint v2,
« no previous file with comments | « ui/events/win/events_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698