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

Unified Diff: gpu/command_buffer/service/async_pixel_transfer_manager_android.cc

Issue 1186393004: gpu: Remove async texture uploads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 4 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
Index: gpu/command_buffer/service/async_pixel_transfer_manager_android.cc
diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc b/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc
deleted file mode 100644
index 9b6b7e212c602268a40f971a3e80b39d6dcc7cf1..0000000000000000000000000000000000000000
--- a/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "gpu/command_buffer/service/async_pixel_transfer_manager.h"
-
-#include "base/command_line.h"
-#include "base/sys_info.h"
-#include "base/trace_event/trace_event.h"
-#include "gpu/command_buffer/service/async_pixel_transfer_manager_egl.h"
-#include "gpu/command_buffer/service/async_pixel_transfer_manager_idle.h"
-#include "gpu/command_buffer/service/async_pixel_transfer_manager_stub.h"
-#include "gpu/command_buffer/service/async_pixel_transfer_manager_sync.h"
-#include "gpu/command_buffer/service/gpu_switches.h"
-#include "ui/gl/gl_context.h"
-#include "ui/gl/gl_implementation.h"
-
-namespace gpu {
-namespace {
-
-enum GpuType {
- GPU_BROADCOM,
- GPU_IMAGINATION,
- GPU_NVIDIA_ES31,
- GPU_ADRENO_420,
- GPU_OTHER,
-};
-
-std::string MakeString(const char* s) {
- return std::string(s ? s : "");
-}
-
-GpuType GetGpuType() {
- const std::string vendor = MakeString(
- reinterpret_cast<const char*>(glGetString(GL_VENDOR)));
- const std::string renderer = MakeString(
- reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
- const std::string version = MakeString(
- reinterpret_cast<const char*>(glGetString(GL_VERSION)));
-
- if (vendor.find("Broadcom") != std::string::npos)
- return GPU_BROADCOM;
-
- if (vendor.find("Imagination") != std::string::npos)
- return GPU_IMAGINATION;
-
- if (vendor.find("NVIDIA") != std::string::npos &&
- version.find("OpenGL ES 3.1") != std::string::npos) {
- return GPU_NVIDIA_ES31;
- }
-
- if (vendor.find("Qualcomm") != std::string::npos &&
- renderer.find("Adreno (TM) 420") != std::string::npos) {
- return GPU_ADRENO_420;
- }
-
- return GPU_OTHER;
-}
-
-bool AllowTransferThreadForGpu() {
- GpuType gpu = GetGpuType();
- return gpu != GPU_BROADCOM && gpu != GPU_IMAGINATION &&
- gpu != GPU_NVIDIA_ES31 && gpu != GPU_ADRENO_420;
-}
-
-}
-
-// We only used threaded uploads when we can:
-// - Create EGLImages out of OpenGL textures (EGL_KHR_gl_texture_2D_image)
-// - Bind EGLImages to OpenGL textures (GL_OES_EGL_image)
-// - Use fences (to test for upload completion).
-// - The heap size is large enough.
-// TODO(kaanb|epenner): Remove the IsImagination() check pending the
-// resolution of crbug.com/249147
-// TODO(kaanb|epenner): Remove the IsLowEndDevice() check pending the
-// resolution of crbug.com/271929
-AsyncPixelTransferManager* AsyncPixelTransferManager::Create(
- gfx::GLContext* context) {
- DCHECK(context->IsCurrent(NULL));
- base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
-
- // Threaded mailbox uses EGLImage which conflicts with EGL uploader.
- // The spec only allows one EGL image per sibling group, but currently the
- // image handle cannot be shared between the threaded mailbox code and
- // AsyncPixelTransferManagerEGL.
- bool uses_threaded_mailboxes =
- cl->HasSwitch(switches::kEnableThreadedTextureMailboxes);
- // TexImage2D orphans the EGLImage used for threaded mailbox sharing.
- bool use_teximage2d_over_texsubimage2d = !uses_threaded_mailboxes;
- switch (gfx::GetGLImplementation()) {
- case gfx::kGLImplementationEGLGLES2:
- DCHECK(context);
- if (!base::SysInfo::IsLowEndDevice() &&
- context->HasExtension("EGL_KHR_fence_sync") &&
- context->HasExtension("EGL_KHR_image") &&
- context->HasExtension("EGL_KHR_image_base") &&
- context->HasExtension("EGL_KHR_gl_texture_2D_image") &&
- context->HasExtension("GL_OES_EGL_image") &&
- !uses_threaded_mailboxes && AllowTransferThreadForGpu()) {
- TRACE_EVENT0("gpu", "AsyncPixelTransferManager_CreateWithThread");
- return new AsyncPixelTransferManagerEGL;
- }
- return new AsyncPixelTransferManagerIdle(
- use_teximage2d_over_texsubimage2d);
- case gfx::kGLImplementationOSMesaGL: {
- TRACE_EVENT0("gpu", "AsyncPixelTransferManager_CreateIdle");
- return new AsyncPixelTransferManagerIdle(
- use_teximage2d_over_texsubimage2d);
- }
- case gfx::kGLImplementationMockGL:
- return new AsyncPixelTransferManagerStub;
- default:
- NOTREACHED();
- return NULL;
- }
-}
-
-} // namespace gpu

Powered by Google App Engine
This is Rietveld 408576698