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

Side by Side Diff: gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc

Issue 197393002: Add hooks for GL_EXT_debug_markers for Skia (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit fixes Created 6 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 unified diff | Download patch
« no previous file with comments | « no previous file | ui/gl/generate_bindings.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h" 5 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"
6 6
7 #ifndef GL_GLEXT_PROTOTYPES 7 #ifndef GL_GLEXT_PROTOTYPES
8 #define GL_GLEXT_PROTOTYPES 8 #define GL_GLEXT_PROTOTYPES
9 #endif 9 #endif
10 #include "gpu/GLES2/gl2extchromium.h" 10 #include "gpu/GLES2/gl2extchromium.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 functions->fGenVertexArrays = glGenVertexArraysOES; 63 functions->fGenVertexArrays = glGenVertexArraysOES;
64 functions->fGetBufferParameteriv = glGetBufferParameteriv; 64 functions->fGetBufferParameteriv = glGetBufferParameteriv;
65 functions->fGetError = glGetError; 65 functions->fGetError = glGetError;
66 functions->fGetIntegerv = glGetIntegerv; 66 functions->fGetIntegerv = glGetIntegerv;
67 functions->fGetProgramInfoLog = glGetProgramInfoLog; 67 functions->fGetProgramInfoLog = glGetProgramInfoLog;
68 functions->fGetProgramiv = glGetProgramiv; 68 functions->fGetProgramiv = glGetProgramiv;
69 functions->fGetShaderInfoLog = glGetShaderInfoLog; 69 functions->fGetShaderInfoLog = glGetShaderInfoLog;
70 functions->fGetShaderiv = glGetShaderiv; 70 functions->fGetShaderiv = glGetShaderiv;
71 functions->fGetString = glGetString; 71 functions->fGetString = glGetString;
72 functions->fGetUniformLocation = glGetUniformLocation; 72 functions->fGetUniformLocation = glGetUniformLocation;
73 functions->fInsertEventMarker = glInsertEventMarkerEXT;
73 functions->fLineWidth = glLineWidth; 74 functions->fLineWidth = glLineWidth;
74 functions->fLinkProgram = glLinkProgram; 75 functions->fLinkProgram = glLinkProgram;
75 functions->fPixelStorei = glPixelStorei; 76 functions->fPixelStorei = glPixelStorei;
77 functions->fPopGroupMarker = glPopGroupMarkerEXT;
78 functions->fPushGroupMarker = glPushGroupMarkerEXT;
76 functions->fReadPixels = glReadPixels; 79 functions->fReadPixels = glReadPixels;
77 functions->fScissor = glScissor; 80 functions->fScissor = glScissor;
78 functions->fShaderSource = glShaderSource; 81 functions->fShaderSource = glShaderSource;
79 functions->fStencilFunc = glStencilFunc; 82 functions->fStencilFunc = glStencilFunc;
80 functions->fStencilFuncSeparate = glStencilFuncSeparate; 83 functions->fStencilFuncSeparate = glStencilFuncSeparate;
81 functions->fStencilMask = glStencilMask; 84 functions->fStencilMask = glStencilMask;
82 functions->fStencilMaskSeparate = glStencilMaskSeparate; 85 functions->fStencilMaskSeparate = glStencilMaskSeparate;
83 functions->fStencilOp = glStencilOp; 86 functions->fStencilOp = glStencilOp;
84 functions->fStencilOpSeparate = glStencilOpSeparate; 87 functions->fStencilOpSeparate = glStencilOpSeparate;
85 functions->fTexImage2D = glTexImage2D; 88 functions->fTexImage2D = glTexImage2D;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 functions->fRenderbufferStorageMultisampleES2EXT = 133 functions->fRenderbufferStorageMultisampleES2EXT =
131 glRenderbufferStorageMultisampleEXT; 134 glRenderbufferStorageMultisampleEXT;
132 functions->fBindUniformLocation = glBindUniformLocationCHROMIUM; 135 functions->fBindUniformLocation = glBindUniformLocationCHROMIUM;
133 functions->fBlitFramebuffer = glBlitFramebufferCHROMIUM; 136 functions->fBlitFramebuffer = glBlitFramebufferCHROMIUM;
134 functions->fGenerateMipmap = glGenerateMipmap; 137 functions->fGenerateMipmap = glGenerateMipmap;
135 138
136 return interface; 139 return interface;
137 } 140 }
138 141
139 } // namespace skia 142 } // namespace skia
OLDNEW
« no previous file with comments | « no previous file | ui/gl/generate_bindings.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698