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

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

Issue 8268006: Roll skia to r2478 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 | Annotate | Revision Log
« no previous file with comments | « skia/skia.gyp ('k') | webkit/glue/gl_bindings_skia_cmd_buffer.cc » ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/gfx/gl/gl_bindings_skia_in_process.h" 6 #include "ui/gfx/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/GrGLInterface.h"
9 #include "ui/gfx/gl/gl_bindings.h" 10 #include "ui/gfx/gl/gl_bindings.h"
10 #include "ui/gfx/gl/gl_implementation.h" 11 #include "ui/gfx/gl/gl_implementation.h"
11 12
12 #include "third_party/skia/gpu/include/GrGLInterface.h"
13
14 namespace { 13 namespace {
15 14
16 extern "C" { 15 extern "C" {
17 // The following stub functions are required because the glXXX routines exported 16 // The following stub functions are required because the glXXX routines exported
18 // via gl_bindings.h use call-type GL_BINDING_CALL, which on Windows is stdcall. 17 // via gl_bindings.h use call-type GL_BINDING_CALL, which on Windows is stdcall.
19 // Skia has been built such that its GrGLInterface GL pointers are __cdecl. 18 // Skia has been built such that its GrGLInterface GL pointers are __cdecl.
20 19
21 GLvoid StubGLActiveTexture(GLenum texture) { 20 GLvoid StubGLActiveTexture(GLenum texture) {
22 glActiveTexture(texture); 21 glActiveTexture(texture);
23 } 22 }
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 interface->fBlitFramebuffer = StubGLBlitFramebuffer; 601 interface->fBlitFramebuffer = StubGLBlitFramebuffer;
603 interface->fMapBuffer = StubGLMapBuffer; 602 interface->fMapBuffer = StubGLMapBuffer;
604 interface->fUnmapBuffer = StubGLUnmapBuffer; 603 interface->fUnmapBuffer = StubGLUnmapBuffer;
605 interface->fBindFragDataLocationIndexed = 604 interface->fBindFragDataLocationIndexed =
606 StubGLBindFragDataLocationIndexedARB; 605 StubGLBindFragDataLocationIndexedARB;
607 return interface; 606 return interface;
608 } 607 }
609 608
610 } // namespace gfx 609 } // namespace gfx
611 610
OLDNEW
« no previous file with comments | « skia/skia.gyp ('k') | webkit/glue/gl_bindings_skia_cmd_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698