diff options
| author | dpranke <dpranke@chromium.org> | 2015-09-16 13:56:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-16 20:57:15 +0000 |
| commit | c6374e2ea63356bd00853ae2dde9b4bcdb204a92 (patch) | |
| tree | ee26102671127258e5e05a5b183e9d450e85d586 /mojo/runner/native_application_support.cc | |
| parent | 3311ef8ae73ccc479fbb1adc3a4cebb2a8b07377 (diff) | |
| download | chromium_src-c6374e2ea63356bd00853ae2dde9b4bcdb204a92.zip chromium_src-c6374e2ea63356bd00853ae2dde9b4bcdb204a92.tar.gz chromium_src-c6374e2ea63356bd00853ae2dde9b4bcdb204a92.tar.bz2 | |
Revert of Mandoline: Add WebGL support (patchset #9 id:180001 of https://codereview.chromium.org/1338433002/ )
Reason for revert:
Unfortunately, this broke `gn check` with an improper dependency.
http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/32063/steps/gn_check/logs/stdio
I have a patch in-flight that will re-enable gn check on the trybots so that this breakages don't get through, but in the meantime I'm reverting this.
Sorry!
Original issue's description:
> 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
>
> Committed: https://crrev.com/ab7a90daddbe7d44558d8703b12204570ae98431
> Cr-Commit-Position: refs/heads/master@{#349206}
TBR=sky@chromium.org,piman@chromium.org,fsamuel@chromium.org,penghuang@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=525159
Review URL: https://codereview.chromium.org/1343303003
Cr-Commit-Position: refs/heads/master@{#349226}
Diffstat (limited to 'mojo/runner/native_application_support.cc')
| -rw-r--r-- | mojo/runner/native_application_support.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mojo/runner/native_application_support.cc b/mojo/runner/native_application_support.cc index 02af9dd..7e9ecf1 100644 --- a/mojo/runner/native_application_support.cc +++ b/mojo/runner/native_application_support.cc @@ -10,7 +10,6 @@ #include "base/logging.h" #include "mojo/platform_handle/platform_handle_private_thunks.h" #include "mojo/public/platform/native/gles2_impl_chromium_copy_texture_thunks.h" -#include "mojo/public/platform/native/gles2_impl_chromium_framebuffer_multisample_thunks.h" #include "mojo/public/platform/native/gles2_impl_chromium_image_thunks.h" #include "mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.h" #include "mojo/public/platform/native/gles2_impl_chromium_pixel_transfer_buffer_object_thunks.h" @@ -85,9 +84,6 @@ bool RunNativeApplication(base::NativeLibrary app_library, // they are missing. SetThunks(MojoMakeGLES2ImplChromiumCopyTextureThunks, "MojoSetGLES2ImplChromiumCopyTextureThunks", app_library); - SetThunks(MojoMakeGLES2ImplChromiumFramebufferMultisampleThunks, - "MojoSetGLES2ImplChromiumFramebufferMultisampleThunks", - app_library); SetThunks(MojoMakeGLES2ImplChromiumImageThunks, "MojoSetGLES2ImplChromiumImageThunks", app_library); SetThunks(MojoMakeGLES2ImplChromiumMiscellaneousThunks, |