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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2867523002: Update Skia GL bindings to include query and MRT functions (Closed)
Patch Set: Created 3 years, 7 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 | 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 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 #include "gpu/command_buffer/client/gles2_interface.h" 7 #include "gpu/command_buffer/client/gles2_interface.h"
8 #include "third_party/skia/include/gpu/gl/GrGLInterface.h" 8 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
9 9
10 using gpu::gles2::GLES2Interface; 10 using gpu::gles2::GLES2Interface;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 gles_bind(&GLES2Interface::DeleteVertexArraysOES, impl); 70 gles_bind(&GLES2Interface::DeleteVertexArraysOES, impl);
71 functions->fDepthMask = gles_bind(&GLES2Interface::DepthMask, impl); 71 functions->fDepthMask = gles_bind(&GLES2Interface::DepthMask, impl);
72 functions->fDisable = gles_bind(&GLES2Interface::Disable, impl); 72 functions->fDisable = gles_bind(&GLES2Interface::Disable, impl);
73 functions->fDisableVertexAttribArray = 73 functions->fDisableVertexAttribArray =
74 gles_bind(&GLES2Interface::DisableVertexAttribArray, impl); 74 gles_bind(&GLES2Interface::DisableVertexAttribArray, impl);
75 functions->fDiscardFramebuffer = 75 functions->fDiscardFramebuffer =
76 gles_bind(&GLES2Interface::DiscardFramebufferEXT, impl); 76 gles_bind(&GLES2Interface::DiscardFramebufferEXT, impl);
77 functions->fDrawArrays = gles_bind(&GLES2Interface::DrawArrays, impl); 77 functions->fDrawArrays = gles_bind(&GLES2Interface::DrawArrays, impl);
78 functions->fDrawArraysInstanced = 78 functions->fDrawArraysInstanced =
79 gles_bind(&GLES2Interface::DrawArraysInstancedANGLE, impl); 79 gles_bind(&GLES2Interface::DrawArraysInstancedANGLE, impl);
80 functions->fDrawBuffers = gles_bind(&GLES2Interface::DrawBuffersEXT, impl);
80 functions->fDrawElements = gles_bind(&GLES2Interface::DrawElements, impl); 81 functions->fDrawElements = gles_bind(&GLES2Interface::DrawElements, impl);
81 functions->fDrawElementsInstanced = 82 functions->fDrawElementsInstanced =
82 gles_bind(&GLES2Interface::DrawElementsInstancedANGLE, impl); 83 gles_bind(&GLES2Interface::DrawElementsInstancedANGLE, impl);
83 functions->fDrawRangeElements = 84 functions->fDrawRangeElements =
84 gles_bind(&GLES2Interface::DrawRangeElements, impl); 85 gles_bind(&GLES2Interface::DrawRangeElements, impl);
85 functions->fEnable = gles_bind(&GLES2Interface::Enable, impl); 86 functions->fEnable = gles_bind(&GLES2Interface::Enable, impl);
86 functions->fEnableVertexAttribArray = 87 functions->fEnableVertexAttribArray =
87 gles_bind(&GLES2Interface::EnableVertexAttribArray, impl); 88 gles_bind(&GLES2Interface::EnableVertexAttribArray, impl);
89 functions->fEndQuery = gles_bind(&GLES2Interface::EndQueryEXT, impl);
88 functions->fFenceSync = gles_bind(&GLES2Interface::FenceSync, impl); 90 functions->fFenceSync = gles_bind(&GLES2Interface::FenceSync, impl);
89 functions->fFinish = gles_bind(&GLES2Interface::Finish, impl); 91 functions->fFinish = gles_bind(&GLES2Interface::Finish, impl);
90 functions->fFlush = gles_bind(&GLES2Interface::Flush, impl); 92 functions->fFlush = gles_bind(&GLES2Interface::Flush, impl);
91 functions->fFlushMappedBufferRange = 93 functions->fFlushMappedBufferRange =
92 gles_bind(&GLES2Interface::FlushMappedBufferRange, impl); 94 gles_bind(&GLES2Interface::FlushMappedBufferRange, impl);
93 functions->fFrontFace = gles_bind(&GLES2Interface::FrontFace, impl); 95 functions->fFrontFace = gles_bind(&GLES2Interface::FrontFace, impl);
94 functions->fGenBuffers = gles_bind(&GLES2Interface::GenBuffers, impl); 96 functions->fGenBuffers = gles_bind(&GLES2Interface::GenBuffers, impl);
95 functions->fGenTextures = gles_bind(&GLES2Interface::GenTextures, impl); 97 functions->fGenTextures = gles_bind(&GLES2Interface::GenTextures, impl);
96 functions->fGenVertexArrays = 98 functions->fGenVertexArrays =
97 gles_bind(&GLES2Interface::GenVertexArraysOES, impl); 99 gles_bind(&GLES2Interface::GenVertexArraysOES, impl);
98 functions->fGetBufferParameteriv = 100 functions->fGetBufferParameteriv =
99 gles_bind(&GLES2Interface::GetBufferParameteriv, impl); 101 gles_bind(&GLES2Interface::GetBufferParameteriv, impl);
100 functions->fGetError = gles_bind(&GLES2Interface::GetError, impl); 102 functions->fGetError = gles_bind(&GLES2Interface::GetError, impl);
101 functions->fGetIntegerv = get_integerv; 103 functions->fGetIntegerv = get_integerv;
102 functions->fGetProgramInfoLog = 104 functions->fGetProgramInfoLog =
103 gles_bind(&GLES2Interface::GetProgramInfoLog, impl); 105 gles_bind(&GLES2Interface::GetProgramInfoLog, impl);
104 functions->fGetProgramiv = gles_bind(&GLES2Interface::GetProgramiv, impl); 106 functions->fGetProgramiv = gles_bind(&GLES2Interface::GetProgramiv, impl);
107 functions->fGetQueryiv = gles_bind(&GLES2Interface::GetQueryivEXT, impl);
108 functions->fGetQueryObjectuiv =
109 gles_bind(&GLES2Interface::GetQueryObjectuivEXT, impl);
105 functions->fGetShaderInfoLog = 110 functions->fGetShaderInfoLog =
106 gles_bind(&GLES2Interface::GetShaderInfoLog, impl); 111 gles_bind(&GLES2Interface::GetShaderInfoLog, impl);
107 functions->fGetShaderiv = gles_bind(&GLES2Interface::GetShaderiv, impl); 112 functions->fGetShaderiv = gles_bind(&GLES2Interface::GetShaderiv, impl);
108 functions->fGetShaderPrecisionFormat = 113 functions->fGetShaderPrecisionFormat =
109 gles_bind(&GLES2Interface::GetShaderPrecisionFormat, impl); 114 gles_bind(&GLES2Interface::GetShaderPrecisionFormat, impl);
110 functions->fGetString = get_string; 115 functions->fGetString = get_string;
111 functions->fGetStringi = get_stringi; 116 functions->fGetStringi = get_stringi;
112 functions->fGetUniformLocation = 117 functions->fGetUniformLocation =
113 gles_bind(&GLES2Interface::GetUniformLocation, impl); 118 gles_bind(&GLES2Interface::GetUniformLocation, impl);
114 functions->fInsertEventMarker = 119 functions->fInsertEventMarker =
115 gles_bind(&GLES2Interface::InsertEventMarkerEXT, impl); 120 gles_bind(&GLES2Interface::InsertEventMarkerEXT, impl);
116 functions->fInvalidateFramebuffer = 121 functions->fInvalidateFramebuffer =
117 gles_bind(&GLES2Interface::InvalidateFramebuffer, impl); 122 gles_bind(&GLES2Interface::InvalidateFramebuffer, impl);
118 functions->fInvalidateSubFramebuffer = 123 functions->fInvalidateSubFramebuffer =
119 gles_bind(&GLES2Interface::InvalidateSubFramebuffer, impl); 124 gles_bind(&GLES2Interface::InvalidateSubFramebuffer, impl);
120 functions->fIsTexture = gles_bind(&GLES2Interface::IsTexture, impl); 125 functions->fIsTexture = gles_bind(&GLES2Interface::IsTexture, impl);
121 functions->fLineWidth = gles_bind(&GLES2Interface::LineWidth, impl); 126 functions->fLineWidth = gles_bind(&GLES2Interface::LineWidth, impl);
122 functions->fLinkProgram = gles_bind(&GLES2Interface::LinkProgram, impl); 127 functions->fLinkProgram = gles_bind(&GLES2Interface::LinkProgram, impl);
123 functions->fMapBufferRange = gles_bind(&GLES2Interface::MapBufferRange, impl); 128 functions->fMapBufferRange = gles_bind(&GLES2Interface::MapBufferRange, impl);
124 functions->fMapBufferSubData = 129 functions->fMapBufferSubData =
125 gles_bind(&GLES2Interface::MapBufferSubDataCHROMIUM, impl); 130 gles_bind(&GLES2Interface::MapBufferSubDataCHROMIUM, impl);
126 functions->fMapTexSubImage2D = 131 functions->fMapTexSubImage2D =
127 gles_bind(&GLES2Interface::MapTexSubImage2DCHROMIUM, impl); 132 gles_bind(&GLES2Interface::MapTexSubImage2DCHROMIUM, impl);
128 functions->fPixelStorei = gles_bind(&GLES2Interface::PixelStorei, impl); 133 functions->fPixelStorei = gles_bind(&GLES2Interface::PixelStorei, impl);
129 functions->fPopGroupMarker = 134 functions->fPopGroupMarker =
130 gles_bind(&GLES2Interface::PopGroupMarkerEXT, impl); 135 gles_bind(&GLES2Interface::PopGroupMarkerEXT, impl);
131 functions->fPushGroupMarker = 136 functions->fPushGroupMarker =
132 gles_bind(&GLES2Interface::PushGroupMarkerEXT, impl); 137 gles_bind(&GLES2Interface::PushGroupMarkerEXT, impl);
138 functions->fReadBuffer = gles_bind(&GLES2Interface::ReadBuffer, impl);
133 functions->fReadPixels = gles_bind(&GLES2Interface::ReadPixels, impl); 139 functions->fReadPixels = gles_bind(&GLES2Interface::ReadPixels, impl);
134 functions->fScissor = gles_bind(&GLES2Interface::Scissor, impl); 140 functions->fScissor = gles_bind(&GLES2Interface::Scissor, impl);
135 functions->fShaderSource = gles_bind(&GLES2Interface::ShaderSource, impl); 141 functions->fShaderSource = gles_bind(&GLES2Interface::ShaderSource, impl);
136 functions->fStencilFunc = gles_bind(&GLES2Interface::StencilFunc, impl); 142 functions->fStencilFunc = gles_bind(&GLES2Interface::StencilFunc, impl);
137 functions->fStencilFuncSeparate = 143 functions->fStencilFuncSeparate =
138 gles_bind(&GLES2Interface::StencilFuncSeparate, impl); 144 gles_bind(&GLES2Interface::StencilFuncSeparate, impl);
139 functions->fStencilMask = gles_bind(&GLES2Interface::StencilMask, impl); 145 functions->fStencilMask = gles_bind(&GLES2Interface::StencilMask, impl);
140 functions->fStencilMaskSeparate = 146 functions->fStencilMaskSeparate =
141 gles_bind(&GLES2Interface::StencilMaskSeparate, impl); 147 gles_bind(&GLES2Interface::StencilMaskSeparate, impl);
142 functions->fStencilOp = gles_bind(&GLES2Interface::StencilOp, impl); 148 functions->fStencilOp = gles_bind(&GLES2Interface::StencilOp, impl);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 functions->fVertexAttribDivisor = 190 functions->fVertexAttribDivisor =
185 gles_bind(&GLES2Interface::VertexAttribDivisorANGLE, impl); 191 gles_bind(&GLES2Interface::VertexAttribDivisorANGLE, impl);
186 functions->fVertexAttribPointer = 192 functions->fVertexAttribPointer =
187 gles_bind(&GLES2Interface::VertexAttribPointer, impl); 193 gles_bind(&GLES2Interface::VertexAttribPointer, impl);
188 functions->fVertexAttribIPointer = 194 functions->fVertexAttribIPointer =
189 gles_bind(&GLES2Interface::VertexAttribIPointer, impl); 195 gles_bind(&GLES2Interface::VertexAttribIPointer, impl);
190 functions->fViewport = gles_bind(&GLES2Interface::Viewport, impl); 196 functions->fViewport = gles_bind(&GLES2Interface::Viewport, impl);
191 functions->fWaitSync = gles_bind(&GLES2Interface::WaitSync, impl); 197 functions->fWaitSync = gles_bind(&GLES2Interface::WaitSync, impl);
192 functions->fBindFramebuffer = 198 functions->fBindFramebuffer =
193 gles_bind(&GLES2Interface::BindFramebuffer, impl); 199 gles_bind(&GLES2Interface::BindFramebuffer, impl);
200 functions->fBeginQuery = gles_bind(&GLES2Interface::BeginQueryEXT, impl);
194 functions->fBindRenderbuffer = 201 functions->fBindRenderbuffer =
195 gles_bind(&GLES2Interface::BindRenderbuffer, impl); 202 gles_bind(&GLES2Interface::BindRenderbuffer, impl);
196 functions->fCheckFramebufferStatus = 203 functions->fCheckFramebufferStatus =
197 gles_bind(&GLES2Interface::CheckFramebufferStatus, impl); 204 gles_bind(&GLES2Interface::CheckFramebufferStatus, impl);
198 functions->fDeleteFramebuffers = 205 functions->fDeleteFramebuffers =
199 gles_bind(&GLES2Interface::DeleteFramebuffers, impl); 206 gles_bind(&GLES2Interface::DeleteFramebuffers, impl);
207 functions->fDeleteQueries =
208 gles_bind(&GLES2Interface::DeleteQueriesEXT, impl);
200 functions->fDeleteRenderbuffers = 209 functions->fDeleteRenderbuffers =
201 gles_bind(&GLES2Interface::DeleteRenderbuffers, impl); 210 gles_bind(&GLES2Interface::DeleteRenderbuffers, impl);
202 functions->fFramebufferRenderbuffer = 211 functions->fFramebufferRenderbuffer =
203 gles_bind(&GLES2Interface::FramebufferRenderbuffer, impl); 212 gles_bind(&GLES2Interface::FramebufferRenderbuffer, impl);
204 functions->fFramebufferTexture2D = 213 functions->fFramebufferTexture2D =
205 gles_bind(&GLES2Interface::FramebufferTexture2D, impl); 214 gles_bind(&GLES2Interface::FramebufferTexture2D, impl);
206 functions->fFramebufferTexture2DMultisample = 215 functions->fFramebufferTexture2DMultisample =
207 gles_bind(&GLES2Interface::FramebufferTexture2DMultisampleEXT, impl); 216 gles_bind(&GLES2Interface::FramebufferTexture2DMultisampleEXT, impl);
208 functions->fGenFramebuffers = 217 functions->fGenFramebuffers =
209 gles_bind(&GLES2Interface::GenFramebuffers, impl); 218 gles_bind(&GLES2Interface::GenFramebuffers, impl);
210 functions->fGenRenderbuffers = 219 functions->fGenRenderbuffers =
211 gles_bind(&GLES2Interface::GenRenderbuffers, impl); 220 gles_bind(&GLES2Interface::GenRenderbuffers, impl);
212 functions->fGetFramebufferAttachmentParameteriv = 221 functions->fGetFramebufferAttachmentParameteriv =
213 gles_bind(&GLES2Interface::GetFramebufferAttachmentParameteriv, impl); 222 gles_bind(&GLES2Interface::GetFramebufferAttachmentParameteriv, impl);
214 functions->fGetRenderbufferParameteriv = 223 functions->fGetRenderbufferParameteriv =
215 gles_bind(&GLES2Interface::GetRenderbufferParameteriv, impl); 224 gles_bind(&GLES2Interface::GetRenderbufferParameteriv, impl);
225 functions->fGenQueries = gles_bind(&GLES2Interface::GenQueriesEXT, impl);
216 functions->fRenderbufferStorage = 226 functions->fRenderbufferStorage =
217 gles_bind(&GLES2Interface::RenderbufferStorage, impl); 227 gles_bind(&GLES2Interface::RenderbufferStorage, impl);
218 functions->fRenderbufferStorageMultisample = 228 functions->fRenderbufferStorageMultisample =
219 gles_bind(&GLES2Interface::RenderbufferStorageMultisampleCHROMIUM, impl); 229 gles_bind(&GLES2Interface::RenderbufferStorageMultisampleCHROMIUM, impl);
220 functions->fRenderbufferStorageMultisampleES2EXT = 230 functions->fRenderbufferStorageMultisampleES2EXT =
221 gles_bind(&GLES2Interface::RenderbufferStorageMultisampleEXT, impl); 231 gles_bind(&GLES2Interface::RenderbufferStorageMultisampleEXT, impl);
222 functions->fBindFragDataLocation = 232 functions->fBindFragDataLocation =
223 gles_bind(&GLES2Interface::BindFragDataLocationEXT, impl); 233 gles_bind(&GLES2Interface::BindFragDataLocationEXT, impl);
224 functions->fBindFragDataLocationIndexed = 234 functions->fBindFragDataLocationIndexed =
225 gles_bind(&GLES2Interface::BindFragDataLocationIndexedEXT, impl); 235 gles_bind(&GLES2Interface::BindFragDataLocationIndexedEXT, impl);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 functions->fProgramPathFragmentInputGen = 281 functions->fProgramPathFragmentInputGen =
272 gles_bind(&GLES2Interface::ProgramPathFragmentInputGenCHROMIUM, impl); 282 gles_bind(&GLES2Interface::ProgramPathFragmentInputGenCHROMIUM, impl);
273 functions->fBindFragmentInputLocation = 283 functions->fBindFragmentInputLocation =
274 gles_bind(&GLES2Interface::BindFragmentInputLocationCHROMIUM, impl); 284 gles_bind(&GLES2Interface::BindFragmentInputLocationCHROMIUM, impl);
275 functions->fCoverageModulation = 285 functions->fCoverageModulation =
276 gles_bind(&GLES2Interface::CoverageModulationCHROMIUM, impl); 286 gles_bind(&GLES2Interface::CoverageModulationCHROMIUM, impl);
277 return interface; 287 return interface;
278 } 288 }
279 289
280 } // namespace skia_bindings 290 } // namespace skia_bindings
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698