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

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

Issue 6961031: Roll skia r1385:1395 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('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 "ui/gfx/gl/gl_bindings.h" 9 #include "ui/gfx/gl/gl_bindings.h"
10 #include "ui/gfx/gl/gl_implementation.h" 10 #include "ui/gfx/gl/gl_implementation.h"
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 StubGLFramebufferRenderbuffer, 559 StubGLFramebufferRenderbuffer,
560 StubGLFramebufferTexture2D, 560 StubGLFramebufferTexture2D,
561 StubGLGenFramebuffers, 561 StubGLGenFramebuffers,
562 StubGLGenRenderbuffers, 562 StubGLGenRenderbuffers,
563 StubGLRenderBufferStorage, 563 StubGLRenderBufferStorage,
564 StubGLRenderbufferStorageMultisample, 564 StubGLRenderbufferStorageMultisample,
565 StubGLBlitFramebuffer, 565 StubGLBlitFramebuffer,
566 NULL, // glResolveMultisampleFramebuffer 566 NULL, // glResolveMultisampleFramebuffer
567 StubGLMapBuffer, 567 StubGLMapBuffer,
568 StubGLUnmapBuffer, 568 StubGLUnmapBuffer,
569 NULL, // glBindFragDataLocationIndexed
569 GrGLInterface::kStaticInitEndGuard, 570 GrGLInterface::kStaticInitEndGuard,
570 }; 571 };
571 GrGLSetGLInterface(&host_gl_interface); 572 GrGLSetGLInterface(&host_gl_interface);
572 host_StubGL_installed = true; 573 host_StubGL_installed = true;
573 } 574 }
574 } 575 }
575 576
576 } // namespace gfx 577 } // namespace gfx
577 578
OLDNEW
« no previous file with comments | « DEPS ('k') | webkit/glue/gl_bindings_skia_cmd_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698