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

Side by Side Diff: ui/gl/gl_bindings_skia_in_process.cc

Issue 1254893008: Add glBlendBarrierKHR to Skia's GL bindings. (Closed) Base URL: https://github.com/domokit/mojo.git@master
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 unified diff | Download patch
« no previous file with comments | « gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 5
6 #include "ui/gl/gl_bindings_skia_in_process.h" 6 #include "ui/gl/gl_bindings_skia_in_process.h"
7 7
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "third_party/skia/include/gpu/gl/GrGLInterface.h" 9 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
10 #include "ui/gl/gl_bindings.h" 10 #include "ui/gl/gl_bindings.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 57 }
58 58
59 GLvoid StubGLBindTexture(GLenum target, GLuint texture) { 59 GLvoid StubGLBindTexture(GLenum target, GLuint texture) {
60 glBindTexture(target, texture); 60 glBindTexture(target, texture);
61 } 61 }
62 62
63 GLvoid StubGLBindVertexArray(GLuint array) { 63 GLvoid StubGLBindVertexArray(GLuint array) {
64 glBindVertexArrayOES(array); 64 glBindVertexArrayOES(array);
65 } 65 }
66 66
67 GLvoid StubGLBlendBarrier() {
68 glBlendBarrierKHR();
69 }
70
67 GLvoid StubGLBlendColor(GLclampf red, GLclampf green, GLclampf blue, 71 GLvoid StubGLBlendColor(GLclampf red, GLclampf green, GLclampf blue,
68 GLclampf alpha) { 72 GLclampf alpha) {
69 glBlendColor(red, green, blue, alpha); 73 glBlendColor(red, green, blue, alpha);
70 } 74 }
71 75
72 GLvoid StubGLBlendEquation(GLenum mode) { 76 GLvoid StubGLBlendEquation(GLenum mode) {
73 glBlendEquation(mode); 77 glBlendEquation(mode);
74 } 78 }
75 79
76 GLvoid StubGLBlendFunc(GLenum sfactor, GLenum dfactor) { 80 GLvoid StubGLBlendFunc(GLenum sfactor, GLenum dfactor) {
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 703
700 GrGLInterface::Functions* functions = &interface->fFunctions; 704 GrGLInterface::Functions* functions = &interface->fFunctions;
701 functions->fActiveTexture = StubGLActiveTexture; 705 functions->fActiveTexture = StubGLActiveTexture;
702 functions->fAttachShader = StubGLAttachShader; 706 functions->fAttachShader = StubGLAttachShader;
703 functions->fBeginQuery = StubGLBeginQuery; 707 functions->fBeginQuery = StubGLBeginQuery;
704 functions->fBindAttribLocation = StubGLBindAttribLocation; 708 functions->fBindAttribLocation = StubGLBindAttribLocation;
705 functions->fBindBuffer = StubGLBindBuffer; 709 functions->fBindBuffer = StubGLBindBuffer;
706 functions->fBindFragDataLocation = StubGLBindFragDataLocation; 710 functions->fBindFragDataLocation = StubGLBindFragDataLocation;
707 functions->fBindTexture = StubGLBindTexture; 711 functions->fBindTexture = StubGLBindTexture;
708 functions->fBindVertexArray = StubGLBindVertexArray; 712 functions->fBindVertexArray = StubGLBindVertexArray;
713 functions->fBlendBarrier = StubGLBlendBarrier;
709 functions->fBlendColor = StubGLBlendColor; 714 functions->fBlendColor = StubGLBlendColor;
710 functions->fBlendEquation = StubGLBlendEquation; 715 functions->fBlendEquation = StubGLBlendEquation;
711 functions->fBlendFunc = StubGLBlendFunc; 716 functions->fBlendFunc = StubGLBlendFunc;
712 functions->fBufferData = StubGLBufferData; 717 functions->fBufferData = StubGLBufferData;
713 functions->fBufferSubData = StubGLBufferSubData; 718 functions->fBufferSubData = StubGLBufferSubData;
714 functions->fClear = StubGLClear; 719 functions->fClear = StubGLClear;
715 functions->fClearColor = StubGLClearColor; 720 functions->fClearColor = StubGLClearColor;
716 functions->fClearStencil = StubGLClearStencil; 721 functions->fClearStencil = StubGLClearStencil;
717 functions->fColorMask = StubGLColorMask; 722 functions->fColorMask = StubGLColorMask;
718 functions->fCompileShader = StubGLCompileShader; 723 functions->fCompileShader = StubGLCompileShader;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 functions->fMapBuffer = StubGLMapBuffer; 850 functions->fMapBuffer = StubGLMapBuffer;
846 functions->fUnmapBuffer = StubGLUnmapBuffer; 851 functions->fUnmapBuffer = StubGLUnmapBuffer;
847 functions->fBindFragDataLocationIndexed = 852 functions->fBindFragDataLocationIndexed =
848 StubGLBindFragDataLocationIndexed; 853 StubGLBindFragDataLocationIndexed;
849 functions->fGetProgramResourceLocation = StubGLGetProgramResourceLocation; 854 functions->fGetProgramResourceLocation = StubGLGetProgramResourceLocation;
850 855
851 return interface; 856 return interface;
852 } 857 }
853 858
854 } // namespace gfx 859 } // namespace gfx
OLDNEW
« no previous file with comments | « gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698