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

Unified Diff: gpu/perftests/texture_upload_perftest.cc

Issue 1920163005: Split //ui/gl into //ui/gl + //ui/gi/init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/ipc/service/image_transport_surface_win.cc ('k') | gpu/tools/compositor_model_bench/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/perftests/texture_upload_perftest.cc
diff --git a/gpu/perftests/texture_upload_perftest.cc b/gpu/perftests/texture_upload_perftest.cc
index 3cbcd07a7ac395bf2c5670a84fa7e525961f2609..86eeb021d2ff3cda26762359db6c1ff3e76e755d 100644
--- a/gpu/perftests/texture_upload_perftest.cc
+++ b/gpu/perftests/texture_upload_perftest.cc
@@ -25,6 +25,7 @@
#include "ui/gl/gl_surface.h"
#include "ui/gl/gl_version_info.h"
#include "ui/gl/gpu_timing.h"
+#include "ui/gl/init/gl_factory.h"
#include "ui/gl/scoped_make_current.h"
#if defined(USE_OZONE)
@@ -183,13 +184,13 @@ class TextureUploadPerfTest : public testing::Test {
// thread.
base::MessageLoopForUI main_loop;
#endif
- static bool gl_initialized = gfx::GLSurface::InitializeOneOff();
+ static bool gl_initialized = gl::init::InitializeGLOneOff();
DCHECK(gl_initialized);
// Initialize an offscreen surface and a gl context.
- surface_ = gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size());
- gl_context_ = gfx::GLContext::CreateGLContext(NULL, // share_group
- surface_.get(),
- gfx::PreferIntegratedGpu);
+ surface_ = gl::init::CreateOffscreenGLSurface(gfx::Size());
+ gl_context_ =
+ gl::init::CreateGLContext(nullptr, // share_group
+ surface_.get(), gfx::PreferIntegratedGpu);
ui::ScopedMakeCurrent smc(gl_context_.get(), surface_.get());
glGenTextures(1, &color_texture_);
glBindTexture(GL_TEXTURE_2D, color_texture_);
« no previous file with comments | « gpu/ipc/service/image_transport_surface_win.cc ('k') | gpu/tools/compositor_model_bench/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698