chromium/src
0
Fork 0
Code Activity

gpu: Remove release-after-use workaround.

Browse Source 
This is no longer used after removing in-process GPU service support
for CHROMIUM_image.

BUG=418553

Review URL: https://codereview.chromium.org/604833005

Cr-Commit-Position: refs/heads/master@{#297276}
This commit is contained in:
reveman
2014-09-29 14:46:23 -07:00
committed by Commit bot
parent 6a4c65109c
commit c0c002bded
8 changed files with 3 additions and 57 deletions

4
content/common/gpu/gpu_command_buffer_stub.cc

@ -984,10 +984,6 @@ void GpuCommandBufferStub::OnRegisterGpuMemoryBuffer(
if (!image.get())
return;
// For Android specific workaround.
if (context_group_->feature_info()->workarounds().release_image_after_use)
image->SetReleaseAfterUse();
image_manager->AddImage(image.get(), id);
}

5
gpu/command_buffer/service/texture_definition.cc

@ -44,7 +44,6 @@ class GLImageSync : public gfx::GLImage {
gfx::OverlayTransform transform,
const gfx::Rect& bounds_rect,
const gfx::RectF& crop_rect) OVERRIDE;
virtual void SetReleaseAfterUse() OVERRIDE;
protected:
virtual ~GLImageSync();
@ -117,10 +116,6 @@ bool GLImageSync::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
return false;
}
void GLImageSync::SetReleaseAfterUse() {
NOTREACHED();
}
#if !defined(OS_MACOSX)
class NativeImageBufferEGL : public NativeImageBuffer {
public:

18
gpu/config/gpu_driver_bug_list_json.cc

@ -19,7 +19,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
{
"name": "gpu driver bug list",
// Please update the version number whenever you change this file.
"version": "7.3",
"version": "7.4",
"entries": [
{
"id": 1,
@ -580,22 +580,6 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
"wake_up_gpu_before_drawing"
]
},
{
"id": 50,
"description": "NVIDIA driver requires unbinding a GpuMemoryBuffer from the texture before mapping it to main memory",
"os": {
"type": "android"
},
"gl_type": "gles",
"gl_version": {
"op": "<",
"value": "3.1"
},
"gl_vendor": "NVIDIA.*",
"features": [
"release_image_after_use"
]
},
{
"id": 51,
"description": "TexSubImage2D() is faster for full uploads on ANGLE",

2
gpu/config/gpu_driver_bug_workaround_type.h

@ -80,8 +80,6 @@
needs_offscreen_buffer_workaround) \
GPU_OP(REGENERATE_STRUCT_NAMES, \
regenerate_struct_names) \
GPU_OP(RELEASE_IMAGE_AFTER_USE, \
release_image_after_use) \
GPU_OP(RESTORE_SCISSOR_ON_FBO_CHANGE, \
restore_scissor_on_fbo_change) \
GPU_OP(REVERSE_POINT_SPRITE_COORD_ORIGIN, \

1
ui/gl/BUILD.gn

@ -57,7 +57,6 @@ component("gl") {
"gl_fence_nv.h",
"gl_gl_api_implementation.cc",
"gl_gl_api_implementation.h",
"gl_image.cc",
"gl_image.h",
"gl_image_memory.cc",
"gl_image_memory.h",

1
ui/gl/gl.gyp

@ -76,7 +76,6 @@
'gl_fence_nv.h',
'gl_gl_api_implementation.cc',
'gl_gl_api_implementation.h',
'gl_image.cc',
'gl_image.h',
'gl_image_memory.cc',
'gl_image_memory.h',

21
ui/gl/gl_image.cc

@ -1,21 +0,0 @@
// Copyright (c) 2012 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 "ui/gl/gl_image.h"
namespace gfx {
GLImage::GLImage() {
}
GLImage::~GLImage() {
}
bool GLImage::CopyTexImage(unsigned target) { return false; }
void GLImage::SetReleaseAfterUse() {
// Default no-op implementation for workaround.
}
} // namespace gfx

8
ui/gl/gl_image.h

@ -19,7 +19,7 @@ namespace gfx {
// specific management.
class GL_EXPORT GLImage : public base::RefCounted<GLImage> {
public:
GLImage();
GLImage() {}
// Destroys the image.
virtual void Destroy(bool have_context) = 0;
@ -55,12 +55,8 @@ class GL_EXPORT GLImage : public base::RefCounted<GLImage> {
const Rect& bounds_rect,
const RectF& crop_rect) = 0;
// Indicate that image should be released after use.
// (For an Android work-around only).
virtual void SetReleaseAfterUse();
protected:
virtual ~GLImage();
virtual ~GLImage() {}
private:
friend class base::RefCounted<GLImage>;