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

Unified Diff: ui/gl/gl_bindings_skia_in_process.cc

Issue 1309743005: command_buffer: Implement EXT_blend_func_extended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@new-05-path-fragment-input-gen
Patch Set: ~ Created 5 years, 4 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
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 d76bd7aba160845feac916ba5c51cb2694aee5e9..fb83e51def698b658234426499c32baab87223df 100644
--- a/ui/gl/gl_bindings_skia_in_process.cc
+++ b/ui/gl/gl_bindings_skia_in_process.cc
@@ -39,12 +39,6 @@ GLvoid GR_GL_FUNCTION_TYPE StubGLBindBuffer(GLenum target, GLuint buffer) {
glBindBuffer(target, buffer);
}
-GLvoid GR_GL_FUNCTION_TYPE StubGLBindFragDataLocation(GLuint program,
- GLuint colorNumber,
- const GLchar* name) {
- glBindFragDataLocation(program, colorNumber, name);
-}
-
GLvoid GR_GL_FUNCTION_TYPE
StubGLBindFragDataLocationIndexed(GLuint program,
GLuint colorNumber,
@@ -53,6 +47,12 @@ StubGLBindFragDataLocationIndexed(GLuint program,
glBindFragDataLocationIndexed(program, colorNumber, index, name);
}
+GLvoid GR_GL_FUNCTION_TYPE StubGLBindFragDataLocation(GLuint program,
+ GLuint colorNumber,
+ const GLchar* name) {
+ glBindFragDataLocation(program, colorNumber, name);
+}
+
GLvoid GR_GL_FUNCTION_TYPE StubGLBindFramebuffer(GLenum target,
GLuint framebuffer) {
glBindFramebufferEXT(target, framebuffer);
@@ -850,6 +850,7 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
functions->fBeginQuery = StubGLBeginQuery;
functions->fBindAttribLocation = StubGLBindAttribLocation;
functions->fBindBuffer = StubGLBindBuffer;
+ functions->fBindFragDataLocationIndexed = StubGLBindFragDataLocationIndexed;
functions->fBindFragDataLocation = StubGLBindFragDataLocation;
functions->fBindTexture = StubGLBindTexture;
functions->fBindVertexArray = StubGLBindVertexArray;
@@ -985,8 +986,6 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
functions->fBlitFramebuffer = StubGLBlitFramebuffer;
functions->fMapBuffer = StubGLMapBuffer;
functions->fUnmapBuffer = StubGLUnmapBuffer;
- functions->fBindFragDataLocationIndexed =
- StubGLBindFragDataLocationIndexed;
Mark Kilgard 2015/08/28 19:53:25 Am I missing something? Things are moved around i
functions->fGetProgramResourceLocation = StubGLGetProgramResourceLocation;
return interface;

Powered by Google App Engine
This is Rietveld 408576698