summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-17 18:28:09 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-17 18:28:09 +0000
commit658f03f18b7bb5f475e8536d4689e153549e5ac9 (patch)
tree39f9f4117ac60ad7f7f7737215d1491bab994ffb /gpu
parenteacc2f41a8b08d2dea319e88759b3d27e22a1cf1 (diff)
downloadchromium_src-658f03f18b7bb5f475e8536d4689e153549e5ac9.zip
chromium_src-658f03f18b7bb5f475e8536d4689e153549e5ac9.tar.gz
chromium_src-658f03f18b7bb5f475e8536d4689e153549e5ac9.tar.bz2
Delete usage and support for EGL_ANGLE_software_display extension.
We aren't using it anymore. It used to be used to switch to SwitchShader but the new version of SwiftShader exposes a EGL / GLES2 interface without ANGLE in between. TBR=kbr@chromium.org, senorblanco@chromium.org Review URL: https://codereview.chromium.org/17110007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc3
-rw-r--r--gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc2
-rw-r--r--gpu/command_buffer/tests/gl_manager.cc4
-rw-r--r--gpu/command_buffer/tests/gl_unittests_android.cc2
-rw-r--r--gpu/config/gpu_info_collector.cc2
-rw-r--r--gpu/demos/framework/window.cc2
-rw-r--r--gpu/gles2_conform_support/egl/display.cc4
7 files changed, 9 insertions, 10 deletions
diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc b/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc
index 8564e01..4931bfe 100644
--- a/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc
@@ -102,8 +102,7 @@ class TransferThread : public base::Thread {
virtual void Init() OVERRIDE {
gfx::GLShareGroup* share_group = NULL;
- bool software = false;
- surface_ = new gfx::PbufferGLSurfaceEGL(software, gfx::Size(1,1));
+ surface_ = new gfx::PbufferGLSurfaceEGL(gfx::Size(1, 1));
surface_->Initialize();
context_ = gfx::GLContext::CreateGLContext(
share_group, surface_.get(), gfx::PreferDiscreteGpu);
diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc b/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc
index 67aa52e..2e13e7f 100644
--- a/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc
@@ -99,7 +99,7 @@ class TransferThread : public base::Thread {
return;
}
- surface_ = gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1));
+ surface_ = gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1));
if (!surface_.get()) {
LOG(ERROR) << "Unable to create GLSurface";
caller_wait->Signal();
diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc
index cb05e35..9089579 100644
--- a/gpu/command_buffer/tests/gl_manager.cc
+++ b/gpu/command_buffer/tests/gl_manager.cc
@@ -148,7 +148,7 @@ void GLManager::Initialize(const GLManager::Options& options) {
decoder_->set_engine(gpu_scheduler_.get());
- surface_ = gfx::GLSurface::CreateOffscreenGLSurface(false, options.size);
+ surface_ = gfx::GLSurface::CreateOffscreenGLSurface(options.size);
ASSERT_TRUE(surface_.get() != NULL) << "could not create offscreen surface";
if (real_gl_context) {
@@ -217,7 +217,7 @@ void GLManager::SetupBaseContext() {
new gfx::GLShareGroup);
gfx::Size size(4, 4);
base_surface_ = new scoped_refptr<gfx::GLSurface>(
- gfx::GLSurface::CreateOffscreenGLSurface(false, size));
+ gfx::GLSurface::CreateOffscreenGLSurface(size));
gfx::GpuPreference gpu_preference(gfx::PreferDiscreteGpu);
base_context_ = new scoped_refptr<gfx::GLContext>(
gfx::GLContext::CreateGLContext(base_share_group_->get(),
diff --git a/gpu/command_buffer/tests/gl_unittests_android.cc b/gpu/command_buffer/tests/gl_unittests_android.cc
index b1d4151..870bedb 100644
--- a/gpu/command_buffer/tests/gl_unittests_android.cc
+++ b/gpu/command_buffer/tests/gl_unittests_android.cc
@@ -44,7 +44,7 @@ TEST_F(GLSurfaceTextureTest, SimpleTest) {
EXPECT_TRUE(window != NULL);
scoped_refptr<gfx::GLSurface> gl_surface =
- gfx::GLSurface::CreateViewGLSurface(false, window);
+ gfx::GLSurface::CreateViewGLSurface(window);
EXPECT_TRUE(gl_surface.get() != NULL);
gl_.SetSurface(gl_surface.get());
diff --git a/gpu/config/gpu_info_collector.cc b/gpu/config/gpu_info_collector.cc
index f66833c..d15cc47 100644
--- a/gpu/config/gpu_info_collector.cc
+++ b/gpu/config/gpu_info_collector.cc
@@ -22,7 +22,7 @@ namespace {
scoped_refptr<gfx::GLSurface> InitializeGLSurface() {
scoped_refptr<gfx::GLSurface> surface(
- gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1)));
+ gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1)));
if (!surface.get()) {
LOG(ERROR) << "gfx::GLContext::CreateOffscreenGLSurface failed";
return NULL;
diff --git a/gpu/demos/framework/window.cc b/gpu/demos/framework/window.cc
index 6606c19..b2fb5f8 100644
--- a/gpu/demos/framework/window.cc
+++ b/gpu/demos/framework/window.cc
@@ -92,7 +92,7 @@ bool Window::CreateRenderContext(gfx::AcceleratedWidget hwnd) {
decoder_->set_engine(gpu_scheduler_.get());
- surface_ = gfx::GLSurface::CreateViewGLSurface(false, hwnd);
+ surface_ = gfx::GLSurface::CreateViewGLSurface(hwnd);
if (!surface_.get())
return false;
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc
index 9df88e5..5288a9b 100644
--- a/gpu/gles2_conform_support/egl/display.cc
+++ b/gpu/gles2_conform_support/egl/display.cc
@@ -126,12 +126,12 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
decoder_->set_engine(gpu_scheduler_.get());
gfx::Size size(create_offscreen_width_, create_offscreen_height_);
if (create_offscreen_) {
- gl_surface_ = gfx::GLSurface::CreateOffscreenGLSurface(false, size);
+ gl_surface_ = gfx::GLSurface::CreateOffscreenGLSurface(size);
create_offscreen_ = false;
create_offscreen_width_ = 0;
create_offscreen_height_ = 0;
} else {
- gl_surface_ = gfx::GLSurface::CreateViewGLSurface(false, win);
+ gl_surface_ = gfx::GLSurface::CreateViewGLSurface(win);
}
if (!gl_surface_.get())
return EGL_NO_SURFACE;