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

Side by Side Diff: ui/gl/gl_bindings_skia_in_process.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 | « ui/gl/generate_bindings.py ('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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 339
340 GLvoid StubGLGetTexLevelParameteriv(GLenum target, GLint level, 340 GLvoid StubGLGetTexLevelParameteriv(GLenum target, GLint level,
341 GLenum pname, GLint* params) { 341 GLenum pname, GLint* params) {
342 glGetTexLevelParameteriv(target, level, pname, params); 342 glGetTexLevelParameteriv(target, level, pname, params);
343 } 343 }
344 344
345 GLint StubGLGetUniformLocation(GLuint program, const char* name) { 345 GLint StubGLGetUniformLocation(GLuint program, const char* name) {
346 return glGetUniformLocation(program, name); 346 return glGetUniformLocation(program, name);
347 } 347 }
348 348
349 GLvoid StubGLInsertEventMarker(GLsizei length, const char* marker) {
350 glInsertEventMarkerEXT(length, marker);
351 }
352
349 GLvoid StubGLLineWidth(GLfloat width) { 353 GLvoid StubGLLineWidth(GLfloat width) {
350 glLineWidth(width); 354 glLineWidth(width);
351 } 355 }
352 356
353 GLvoid StubGLLinkProgram(GLuint program) { 357 GLvoid StubGLLinkProgram(GLuint program) {
354 glLinkProgram(program); 358 glLinkProgram(program);
355 } 359 }
356 360
357 void* StubGLMapBuffer(GLenum target, GLenum access) { 361 void* StubGLMapBuffer(GLenum target, GLenum access) {
358 return glMapBuffer(target, access); 362 return glMapBuffer(target, access);
359 } 363 }
360 364
361 GLvoid StubGLPixelStorei(GLenum pname, GLint param) { 365 GLvoid StubGLPixelStorei(GLenum pname, GLint param) {
362 glPixelStorei(pname, param); 366 glPixelStorei(pname, param);
363 } 367 }
364 368
369 GLvoid StubGLPopGroupMarker() {
370 glPopGroupMarkerEXT();
371 }
372
373 GLvoid StubGLPushGroupMarker(GLsizei length, const char* marker) {
374 glPushGroupMarkerEXT(length, marker);
375 }
376
365 GLvoid StubGLQueryCounter(GLuint id, GLenum target) { 377 GLvoid StubGLQueryCounter(GLuint id, GLenum target) {
366 glQueryCounter(id, target); 378 glQueryCounter(id, target);
367 } 379 }
368 380
369 GLvoid StubGLReadBuffer(GLenum src) { 381 GLvoid StubGLReadBuffer(GLenum src) {
370 glReadBuffer(src); 382 glReadBuffer(src);
371 } 383 }
372 384
373 GLvoid StubGLReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, 385 GLvoid StubGLReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
374 GLenum format, GLenum type, void* pixels) { 386 GLenum format, GLenum type, void* pixels) {
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 functions->fGetQueryObjectiv = StubGLGetQueryObjectiv; 653 functions->fGetQueryObjectiv = StubGLGetQueryObjectiv;
642 functions->fGetQueryObjectui64v = StubGLGetQueryObjectui64v; 654 functions->fGetQueryObjectui64v = StubGLGetQueryObjectui64v;
643 functions->fGetQueryObjectuiv = StubGLGetQueryObjectuiv; 655 functions->fGetQueryObjectuiv = StubGLGetQueryObjectuiv;
644 functions->fGetProgramInfoLog = StubGLGetProgramInfoLog; 656 functions->fGetProgramInfoLog = StubGLGetProgramInfoLog;
645 functions->fGetProgramiv = StubGLGetProgramiv; 657 functions->fGetProgramiv = StubGLGetProgramiv;
646 functions->fGetShaderInfoLog = StubGLGetShaderInfoLog; 658 functions->fGetShaderInfoLog = StubGLGetShaderInfoLog;
647 functions->fGetShaderiv = StubGLGetShaderiv; 659 functions->fGetShaderiv = StubGLGetShaderiv;
648 functions->fGetString = StubGLGetString; 660 functions->fGetString = StubGLGetString;
649 functions->fGetTexLevelParameteriv = StubGLGetTexLevelParameteriv; 661 functions->fGetTexLevelParameteriv = StubGLGetTexLevelParameteriv;
650 functions->fGetUniformLocation = StubGLGetUniformLocation; 662 functions->fGetUniformLocation = StubGLGetUniformLocation;
663 functions->fInsertEventMarker = StubGLInsertEventMarker;
651 functions->fLineWidth = StubGLLineWidth; 664 functions->fLineWidth = StubGLLineWidth;
652 functions->fLinkProgram = StubGLLinkProgram; 665 functions->fLinkProgram = StubGLLinkProgram;
653 functions->fPixelStorei = StubGLPixelStorei; 666 functions->fPixelStorei = StubGLPixelStorei;
667 functions->fPopGroupMarker = StubGLPopGroupMarker;
668 functions->fPushGroupMarker = StubGLPushGroupMarker;
654 functions->fQueryCounter = StubGLQueryCounter; 669 functions->fQueryCounter = StubGLQueryCounter;
655 functions->fReadBuffer = StubGLReadBuffer; 670 functions->fReadBuffer = StubGLReadBuffer;
656 functions->fReadPixels = StubGLReadPixels; 671 functions->fReadPixels = StubGLReadPixels;
657 functions->fScissor = StubGLScissor; 672 functions->fScissor = StubGLScissor;
658 functions->fShaderSource = StubGLShaderSource; 673 functions->fShaderSource = StubGLShaderSource;
659 functions->fStencilFunc = StubGLStencilFunc; 674 functions->fStencilFunc = StubGLStencilFunc;
660 functions->fStencilFuncSeparate = StubGLStencilFuncSeparate; 675 functions->fStencilFuncSeparate = StubGLStencilFuncSeparate;
661 functions->fStencilMask = StubGLStencilMask; 676 functions->fStencilMask = StubGLStencilMask;
662 functions->fStencilMaskSeparate = StubGLStencilMaskSeparate; 677 functions->fStencilMaskSeparate = StubGLStencilMaskSeparate;
663 functions->fStencilOp = StubGLStencilOp; 678 functions->fStencilOp = StubGLStencilOp;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 functions->fBlitFramebuffer = StubGLBlitFramebuffer; 725 functions->fBlitFramebuffer = StubGLBlitFramebuffer;
711 functions->fMapBuffer = StubGLMapBuffer; 726 functions->fMapBuffer = StubGLMapBuffer;
712 functions->fUnmapBuffer = StubGLUnmapBuffer; 727 functions->fUnmapBuffer = StubGLUnmapBuffer;
713 functions->fBindFragDataLocationIndexed = 728 functions->fBindFragDataLocationIndexed =
714 StubGLBindFragDataLocationIndexed; 729 StubGLBindFragDataLocationIndexed;
715 730
716 return interface; 731 return interface;
717 } 732 }
718 733
719 } // namespace gfx 734 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/generate_bindings.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698