diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-06 00:00:07 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-06 00:00:07 +0000 |
| commit | 5aa6a312dc935c3392e025e97daded48f5363a05 (patch) | |
| tree | 2c1a286841459eba6b8b38528e2a18057f03c9d4 /gpu | |
| parent | 7bc4b5d06145e8753fdc8b2db04a5fb20ab86299 (diff) | |
| download | chromium_src-5aa6a312dc935c3392e025e97daded48f5363a05.zip chromium_src-5aa6a312dc935c3392e025e97daded48f5363a05.tar.gz chromium_src-5aa6a312dc935c3392e025e97daded48f5363a05.tar.bz2 | |
Reland r65152 with mac and linux fix.
Original review URL: http://codereview.chromium.org/3531008
TEST=try, ui_tests
BUG=none
Review URL: http://codereview.chromium.org/4545003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 5 | ||||
| -rw-r--r-- | gpu/demos/demos.gyp | 2 | ||||
| -rw-r--r-- | gpu/demos/framework/pepper.cc | 45 | ||||
| -rw-r--r-- | gpu/demos/pepper_gpu_demo.html | 6 |
4 files changed, 25 insertions, 33 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 8f0d96b..44f97e3 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -1511,11 +1511,6 @@ bool Texture::AllocateStorage(const gfx::Size& size, GLenum format) { DCHECK_NE(id_, 0u); ScopedGLErrorSuppressor suppressor(decoder_); ScopedTexture2DBinder binder(decoder_, id_); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri( - GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexImage2D(GL_TEXTURE_2D, 0, // mip level diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp index d205eea..bae7503 100644 --- a/gpu/demos/demos.gyp +++ b/gpu/demos/demos.gyp @@ -156,7 +156,6 @@ ['OS=="mac"', { 'action': [ '<(PRODUCT_DIR)/Chromium.app/Contents/MacOS/Chromium', - '--enable-gpu-plugin', '--register-pepper-plugins=' '<(PRODUCT_DIR)/$(PRODUCT_NAME).plugin;' 'pepper-application/x-gpu-demo', @@ -165,7 +164,6 @@ }, { # OS != "mac" 'action': [ '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)', - '--enable-gpu-plugin', '--register-pepper-plugins=$(TargetPath);' 'pepper-application/x-gpu-demo', 'file://$(ProjectDir)pepper_gpu_demo.html', diff --git a/gpu/demos/framework/pepper.cc b/gpu/demos/framework/pepper.cc index 9bcf9b1..2d3d50b 100644 --- a/gpu/demos/framework/pepper.cc +++ b/gpu/demos/framework/pepper.cc @@ -35,32 +35,31 @@ class PluginInstance : public pp::Instance { } } - virtual void ViewChanged(const pp::Rect& position, const pp::Rect& /*clip*/) { - if (size_.IsEmpty() && !position.IsEmpty()) { - size_ = position.size(); - demo_->InitWindowSize(size_.width(), size_.height()); + virtual void DidChangeView(const pp::Rect& position, + const pp::Rect& /*clip*/) { + if (size_ == position.size()) + return; + + size_ = position.size(); + demo_->InitWindowSize(size_.width(), size_.height()); + + if (graphics_.is_null()) { graphics_ = pp::Graphics3D_Dev(*this, 0, NULL, NULL); - if (!graphics_.is_null()) { - graphics_.MakeCurrent(); - demo_->InitGL(); - pp::Graphics3D_Dev::ResetCurrent(); - - // TODO(neb): Remove this once the startup order bug (51842) is fixed. - if (true) - // if (demo_->IsAnimated()) - Animate(0); - else - Paint(); - } + if (graphics_.is_null()) + return; + + if (!pp::Instance::BindGraphics(graphics_)) + return; + + graphics_.MakeCurrent(); + demo_->InitGL(); + pp::Graphics3D_Dev::ResetCurrent(); } - } - virtual void Graphics3DContextLost() { - // TODO(neb): Replace this with the correct code once 53889 is fixed. - Paint(); -// pp::Rect fake_position(size_); -// size_ = pp::Size(); -// ViewChanged(fake_position, fake_position); + if (demo_->IsAnimated()) + Animate(0); + else + Paint(); } void Paint() { diff --git a/gpu/demos/pepper_gpu_demo.html b/gpu/demos/pepper_gpu_demo.html index 8be4e57..64d88f7 100644 --- a/gpu/demos/pepper_gpu_demo.html +++ b/gpu/demos/pepper_gpu_demo.html @@ -3,10 +3,10 @@ <title>Pepper GPU Demo</title> </head> -<body style="background-color:Silver"> +<body style="background-color:Silver; -webkit-perspective: 1000;"> <h1>Pepper GPU Demo</h1> -<object id="plugin" type="pepper-application/x-gpu-demo" width="512" height="512" /> - +<embed id="plugin" type="pepper-application/x-gpu-demo" width="512" height="512" style="position:absolute; top: 30px; -webkit-transform: rotateY(30deg);" /> +<p style="position:absolute; top: 256px;">Text on top</p> </body> </html> |