summaryrefslogtreecommitdiffstats
path: root/mojo/gpu/mojo_gles2_impl_autogen.cc
diff options
context:
space:
mode:
authorpenghuang <penghuang@chromium.org>2015-09-16 13:11:35 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-16 20:12:04 +0000
commitab7a90daddbe7d44558d8703b12204570ae98431 (patch)
tree3ff87c88b1cf5935b8327ef05fde8e378971764b /mojo/gpu/mojo_gles2_impl_autogen.cc
parenta92068219280fb0f892500f11525ffc0e4a00eee (diff)
downloadchromium_src-ab7a90daddbe7d44558d8703b12204570ae98431.zip
chromium_src-ab7a90daddbe7d44558d8703b12204570ae98431.tar.gz
chromium_src-ab7a90daddbe7d44558d8703b12204570ae98431.tar.bz2
This change adds WebGL support in mandoline. It also adds GL
chromium_framebuffer_multisample extension which is need by WebGL. TODO: * Pass attributes to GPU when create WebGL context. * Get GPU info and fill it into glinfo. TEST= mandoline --enable-webgl http://learningwebgl.com/lessons/lesson03/index.html BUG=525159 NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1338433002 Cr-Commit-Position: refs/heads/master@{#349206}
Diffstat (limited to 'mojo/gpu/mojo_gles2_impl_autogen.cc')
-rw-r--r--mojo/gpu/mojo_gles2_impl_autogen.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/mojo/gpu/mojo_gles2_impl_autogen.cc b/mojo/gpu/mojo_gles2_impl_autogen.cc
index d706d62..d393a0f2 100644
--- a/mojo/gpu/mojo_gles2_impl_autogen.cc
+++ b/mojo/gpu/mojo_gles2_impl_autogen.cc
@@ -12,6 +12,7 @@
#include "base/logging.h"
#include "third_party/mojo/src/mojo/public/c/gles2/chromium_copy_texture.h"
+#include "third_party/mojo/src/mojo/public/c/gles2/chromium_framebuffer_multisample.h"
#include "third_party/mojo/src/mojo/public/c/gles2/chromium_image.h"
#include "third_party/mojo/src/mojo/public/c/gles2/chromium_miscellaneous.h"
#include "third_party/mojo/src/mojo/public/c/gles2/chromium_pixel_transfer_buffer_object.h"
@@ -1221,7 +1222,9 @@ void MojoGLES2Impl::BlitFramebufferCHROMIUM(GLint srcX0,
GLint dstY1,
GLbitfield mask,
GLenum filter) {
- NOTREACHED() << "Unimplemented BlitFramebufferCHROMIUM.";
+ MojoGLES2MakeCurrent(context_);
+ glBlitFramebufferCHROMIUM(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1,
+ dstY1, mask, filter);
}
void MojoGLES2Impl::RenderbufferStorageMultisampleCHROMIUM(
GLenum target,
@@ -1229,7 +1232,9 @@ void MojoGLES2Impl::RenderbufferStorageMultisampleCHROMIUM(
GLenum internalformat,
GLsizei width,
GLsizei height) {
- NOTREACHED() << "Unimplemented RenderbufferStorageMultisampleCHROMIUM.";
+ MojoGLES2MakeCurrent(context_);
+ glRenderbufferStorageMultisampleCHROMIUM(target, samples, internalformat,
+ width, height);
}
void MojoGLES2Impl::RenderbufferStorageMultisampleEXT(GLenum target,
GLsizei samples,