diff options
| author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-14 02:26:12 +0000 |
|---|---|---|
| committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-14 02:26:12 +0000 |
| commit | 81bc3bf24431f11be9f6d778073950ea7b45bc0e (patch) | |
| tree | 014f8a17bd19bd6fbfb405056c544d2a2a903d5a /media/tools | |
| parent | fd284a6475449e912569d130b88c1ada859a6018 (diff) | |
| download | chromium_src-81bc3bf24431f11be9f6d778073950ea7b45bc0e.zip chromium_src-81bc3bf24431f11be9f6d778073950ea7b45bc0e.tar.gz chromium_src-81bc3bf24431f11be9f6d778073950ea7b45bc0e.tar.bz2 | |
Remove unnecessary checks and fix shader_bench.
Fixes various issues found via static analysis (see bug). Also
fixes shader_bench so that it actually works...
BUG=271530
TEST=compiles, media_unittests, content_unittests
Review URL: https://chromiumcodereview.appspot.com/22979002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/shader_bench/shader_bench.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/media/tools/shader_bench/shader_bench.cc b/media/tools/shader_bench/shader_bench.cc index b26733c..0b4236f 100644 --- a/media/tools/shader_bench/shader_bench.cc +++ b/media/tools/shader_bench/shader_bench.cc @@ -13,6 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" +#include "media/base/media.h" #include "media/base/video_frame.h" #include "media/tools/shader_bench/cpu_color_painter.h" #include "media/tools/shader_bench/gpu_color_painter.h" @@ -127,18 +128,19 @@ int main(int argc, char** argv) { // Initialize window and graphics context. base::AtExitManager at_exit_manager; + media::InitializeMediaLibraryForTesting(); gfx::GLSurface::InitializeOneOff(); scoped_ptr<media::Window> window(new media::Window(width, height)); - gfx::GLSurface* surface = - gfx::GLSurface::CreateViewGLSurface(window->PluginWindow()).get(); - gfx::GLContext* context = gfx::GLContext::CreateGLContext( - NULL, surface, gfx::PreferDiscreteGpu).get(); - context->MakeCurrent(surface); + scoped_refptr<gfx::GLSurface> surface = + gfx::GLSurface::CreateViewGLSurface(window->PluginWindow()); + scoped_refptr<gfx::GLContext> context = gfx::GLContext::CreateGLContext( + NULL, surface.get(), gfx::PreferDiscreteGpu); + context->MakeCurrent(surface.get()); // This sets D3DPRESENT_INTERVAL_IMMEDIATE on Windows. context->SetSwapInterval(0); // Initialize and name GPU painters. - static const struct { + const struct { const char* name; GPUPainter* painter; } painters[] = { |