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

Side by Side Diff: gpu/command_buffer/client/gles2_implementation.h

Issue 629913002: Replacing the OVERRIDE with override and FINAL with final in gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Included autogen python file for OVERRIDE 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 unified diff | Download patch
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 #ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_ 5 #ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
6 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_ 6 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
7 7
8 #include <GLES2/gl2.h> 8 #include <GLES2/gl2.h>
9 9
10 #include <list> 10 #include <list>
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 GLES2CmdHelper* helper() const; 205 GLES2CmdHelper* helper() const;
206 206
207 // Gets client side generated errors. 207 // Gets client side generated errors.
208 GLenum GetClientSideGLError(); 208 GLenum GetClientSideGLError();
209 209
210 // Include the auto-generated part of this class. We split this because 210 // Include the auto-generated part of this class. We split this because
211 // it means we can easily edit the non-auto generated parts right here in 211 // it means we can easily edit the non-auto generated parts right here in
212 // this file instead of having to edit some template or the code generator. 212 // this file instead of having to edit some template or the code generator.
213 #include "gpu/command_buffer/client/gles2_implementation_autogen.h" 213 #include "gpu/command_buffer/client/gles2_implementation_autogen.h"
214 214
215 virtual void DisableVertexAttribArray(GLuint index) OVERRIDE; 215 virtual void DisableVertexAttribArray(GLuint index) override;
216 virtual void EnableVertexAttribArray(GLuint index) OVERRIDE; 216 virtual void EnableVertexAttribArray(GLuint index) override;
217 virtual void GetVertexAttribfv( 217 virtual void GetVertexAttribfv(
218 GLuint index, GLenum pname, GLfloat* params) OVERRIDE; 218 GLuint index, GLenum pname, GLfloat* params) override;
219 virtual void GetVertexAttribiv( 219 virtual void GetVertexAttribiv(
220 GLuint index, GLenum pname, GLint* params) OVERRIDE; 220 GLuint index, GLenum pname, GLint* params) override;
221 221
222 // ContextSupport implementation. 222 // ContextSupport implementation.
223 virtual void Swap() OVERRIDE; 223 virtual void Swap() override;
224 virtual void PartialSwapBuffers(const gfx::Rect& sub_buffer) OVERRIDE; 224 virtual void PartialSwapBuffers(const gfx::Rect& sub_buffer) override;
225 virtual void ScheduleOverlayPlane(int plane_z_order, 225 virtual void ScheduleOverlayPlane(int plane_z_order,
226 gfx::OverlayTransform plane_transform, 226 gfx::OverlayTransform plane_transform,
227 unsigned overlay_texture_id, 227 unsigned overlay_texture_id,
228 const gfx::Rect& display_bounds, 228 const gfx::Rect& display_bounds,
229 const gfx::RectF& uv_rect) OVERRIDE; 229 const gfx::RectF& uv_rect) override;
230 virtual GLuint InsertFutureSyncPointCHROMIUM() OVERRIDE; 230 virtual GLuint InsertFutureSyncPointCHROMIUM() override;
231 virtual void RetireSyncPointCHROMIUM(GLuint sync_point) OVERRIDE; 231 virtual void RetireSyncPointCHROMIUM(GLuint sync_point) override;
232 232
233 void GetProgramInfoCHROMIUMHelper(GLuint program, std::vector<int8>* result); 233 void GetProgramInfoCHROMIUMHelper(GLuint program, std::vector<int8>* result);
234 GLint GetAttribLocationHelper(GLuint program, const char* name); 234 GLint GetAttribLocationHelper(GLuint program, const char* name);
235 GLint GetUniformLocationHelper(GLuint program, const char* name); 235 GLint GetUniformLocationHelper(GLuint program, const char* name);
236 bool GetActiveAttribHelper( 236 bool GetActiveAttribHelper(
237 GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, 237 GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
238 GLint* size, GLenum* type, char* name); 238 GLint* size, GLenum* type, char* name);
239 bool GetActiveUniformHelper( 239 bool GetActiveUniformHelper(
240 GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, 240 GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
241 GLint* size, GLenum* type, char* name); 241 GLint* size, GLenum* type, char* name);
242 242
243 void FreeUnusedSharedMemory(); 243 void FreeUnusedSharedMemory();
244 void FreeEverything(); 244 void FreeEverything();
245 245
246 // ContextSupport implementation. 246 // ContextSupport implementation.
247 virtual void SignalSyncPoint(uint32 sync_point, 247 virtual void SignalSyncPoint(uint32 sync_point,
248 const base::Closure& callback) OVERRIDE; 248 const base::Closure& callback) override;
249 virtual void SignalQuery(uint32 query, 249 virtual void SignalQuery(uint32 query,
250 const base::Closure& callback) OVERRIDE; 250 const base::Closure& callback) override;
251 virtual void SetSurfaceVisible(bool visible) OVERRIDE; 251 virtual void SetSurfaceVisible(bool visible) override;
252 252
253 void SetErrorMessageCallback( 253 void SetErrorMessageCallback(
254 GLES2ImplementationErrorMessageCallback* callback) { 254 GLES2ImplementationErrorMessageCallback* callback) {
255 error_message_callback_ = callback; 255 error_message_callback_ = callback;
256 } 256 }
257 257
258 ShareGroup* share_group() const { 258 ShareGroup* share_group() const {
259 return share_group_.get(); 259 return share_group_.get();
260 } 260 }
261 261
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 819
820 inline bool GLES2Implementation::GetTexParameterivHelper( 820 inline bool GLES2Implementation::GetTexParameterivHelper(
821 GLenum /* target */, GLenum /* pname */, GLint* /* params */) { 821 GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
822 return false; 822 return false;
823 } 823 }
824 824
825 } // namespace gles2 825 } // namespace gles2
826 } // namespace gpu 826 } // namespace gpu
827 827
828 #endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_ 828 #endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
OLDNEW
« no previous file with comments | « gpu/command_buffer/client/gl_in_process_context.cc ('k') | gpu/command_buffer/client/gles2_implementation_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698