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

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

Issue 10441122: Roll Skia to r4102. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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) 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 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 GLsizei width, GLsizei height, GLint border, 400 GLsizei width, GLsizei height, GLint border,
401 GLenum format, GLenum type, const void* pixels) { 401 GLenum format, GLenum type, const void* pixels) {
402 glTexImage2D(target, level, internalformat, width, height, border, format, 402 glTexImage2D(target, level, internalformat, width, height, border, format,
403 type, pixels); 403 type, pixels);
404 } 404 }
405 405
406 GLvoid StubGLTexParameteri(GLenum target, GLenum pname, GLint param) { 406 GLvoid StubGLTexParameteri(GLenum target, GLenum pname, GLint param) {
407 glTexParameteri(target, pname, param); 407 glTexParameteri(target, pname, param);
408 } 408 }
409 409
410 GLvoid StubGLTexParameteriv(GLenum target, GLenum pname, const GLint* params) {
411 glTexParameteriv(target, pname, params);
412 }
413
410 GLvoid StubGLTexStorage2D(GLenum target, GLsizei levels, GLenum internalFormat, 414 GLvoid StubGLTexStorage2D(GLenum target, GLsizei levels, GLenum internalFormat,
411 GLsizei width, GLsizei height) { 415 GLsizei width, GLsizei height) {
412 glTexStorage2DEXT(target, levels, internalFormat, width, height); 416 glTexStorage2DEXT(target, levels, internalFormat, width, height);
413 } 417 }
414 418
415 GLvoid StubGLTexSubImage2D(GLenum target, GLint level, GLint xoffset, 419 GLvoid StubGLTexSubImage2D(GLenum target, GLint level, GLint xoffset,
416 GLint yoffset, GLsizei width, GLsizei height, 420 GLint yoffset, GLsizei width, GLsizei height,
417 GLenum format, GLenum type, const void* pixels) { 421 GLenum format, GLenum type, const void* pixels) {
418 glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, 422 glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type,
419 pixels); 423 pixels);
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 interface->fScissor = StubGLScissor; 622 interface->fScissor = StubGLScissor;
619 interface->fShaderSource = StubGLShaderSource; 623 interface->fShaderSource = StubGLShaderSource;
620 interface->fStencilFunc = StubGLStencilFunc; 624 interface->fStencilFunc = StubGLStencilFunc;
621 interface->fStencilFuncSeparate = StubGLStencilFuncSeparate; 625 interface->fStencilFuncSeparate = StubGLStencilFuncSeparate;
622 interface->fStencilMask = StubGLStencilMask; 626 interface->fStencilMask = StubGLStencilMask;
623 interface->fStencilMaskSeparate = StubGLStencilMaskSeparate; 627 interface->fStencilMaskSeparate = StubGLStencilMaskSeparate;
624 interface->fStencilOp = StubGLStencilOp; 628 interface->fStencilOp = StubGLStencilOp;
625 interface->fStencilOpSeparate = StubGLStencilOpSeparate; 629 interface->fStencilOpSeparate = StubGLStencilOpSeparate;
626 interface->fTexImage2D = StubGLTexImage2D; 630 interface->fTexImage2D = StubGLTexImage2D;
627 interface->fTexParameteri = StubGLTexParameteri; 631 interface->fTexParameteri = StubGLTexParameteri;
632 interface->fTexParameteriv = StubGLTexParameteriv;
628 interface->fTexSubImage2D = StubGLTexSubImage2D; 633 interface->fTexSubImage2D = StubGLTexSubImage2D;
629 interface->fTexStorage2D = StubGLTexStorage2D; 634 interface->fTexStorage2D = StubGLTexStorage2D;
630 interface->fUniform1f = StubGLUniform1f; 635 interface->fUniform1f = StubGLUniform1f;
631 interface->fUniform1i = StubGLUniform1i; 636 interface->fUniform1i = StubGLUniform1i;
632 interface->fUniform1fv = StubGLUniform1fv; 637 interface->fUniform1fv = StubGLUniform1fv;
633 interface->fUniform1iv = StubGLUniform1iv; 638 interface->fUniform1iv = StubGLUniform1iv;
634 interface->fUniform2f = StubGLUniform2f; 639 interface->fUniform2f = StubGLUniform2f;
635 interface->fUniform2i = StubGLUniform2i; 640 interface->fUniform2i = StubGLUniform2i;
636 interface->fUniform2fv = StubGLUniform2fv; 641 interface->fUniform2fv = StubGLUniform2fv;
637 interface->fUniform2iv = StubGLUniform2iv; 642 interface->fUniform2iv = StubGLUniform2iv;
(...skipping 29 matching lines...) Expand all
667 StubGLRenderbufferStorageMultisample; 672 StubGLRenderbufferStorageMultisample;
668 interface->fBlitFramebuffer = StubGLBlitFramebuffer; 673 interface->fBlitFramebuffer = StubGLBlitFramebuffer;
669 interface->fMapBuffer = StubGLMapBuffer; 674 interface->fMapBuffer = StubGLMapBuffer;
670 interface->fUnmapBuffer = StubGLUnmapBuffer; 675 interface->fUnmapBuffer = StubGLUnmapBuffer;
671 interface->fBindFragDataLocationIndexed = 676 interface->fBindFragDataLocationIndexed =
672 StubGLBindFragDataLocationIndexed; 677 StubGLBindFragDataLocationIndexed;
673 return interface; 678 return interface;
674 } 679 }
675 680
676 } // namespace gfx 681 } // namespace gfx
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