Commit c0c002bd authored by reveman's avatar reveman Committed by Commit bot

gpu: Remove release-after-use workaround.

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}
parent 6a4c6510
...@@ -984,10 +984,6 @@ void GpuCommandBufferStub::OnRegisterGpuMemoryBuffer( ...@@ -984,10 +984,6 @@ void GpuCommandBufferStub::OnRegisterGpuMemoryBuffer(
if (!image.get()) if (!image.get())
return; return;
// For Android specific workaround.
if (context_group_->feature_info()->workarounds().release_image_after_use)
image->SetReleaseAfterUse();
image_manager->AddImage(image.get(), id); image_manager->AddImage(image.get(), id);
} }
......
...@@ -44,7 +44,6 @@ class GLImageSync : public gfx::GLImage { ...@@ -44,7 +44,6 @@ class GLImageSync : public gfx::GLImage {
gfx::OverlayTransform transform, gfx::OverlayTransform transform,
const gfx::Rect& bounds_rect, const gfx::Rect& bounds_rect,
const gfx::RectF& crop_rect) OVERRIDE; const gfx::RectF& crop_rect) OVERRIDE;
virtual void SetReleaseAfterUse() OVERRIDE;
protected: protected:
virtual ~GLImageSync(); virtual ~GLImageSync();
...@@ -117,10 +116,6 @@ bool GLImageSync::ScheduleOverlayPlane(gfx::AcceleratedWidget widget, ...@@ -117,10 +116,6 @@ bool GLImageSync::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
return false; return false;
} }
void GLImageSync::SetReleaseAfterUse() {
NOTREACHED();
}
#if !defined(OS_MACOSX) #if !defined(OS_MACOSX)
class NativeImageBufferEGL : public NativeImageBuffer { class NativeImageBufferEGL : public NativeImageBuffer {
public: public:
......
...@@ -19,7 +19,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST( ...@@ -19,7 +19,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
{ {
"name": "gpu driver bug list", "name": "gpu driver bug list",
// Please update the version number whenever you change this file. // Please update the version number whenever you change this file.
"version": "7.3", "version": "7.4",
"entries": [ "entries": [
{ {
"id": 1, "id": 1,
...@@ -580,22 +580,6 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST( ...@@ -580,22 +580,6 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
"wake_up_gpu_before_drawing" "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, "id": 51,
"description": "TexSubImage2D() is faster for full uploads on ANGLE", "description": "TexSubImage2D() is faster for full uploads on ANGLE",
......
...@@ -80,8 +80,6 @@ ...@@ -80,8 +80,6 @@
needs_offscreen_buffer_workaround) \ needs_offscreen_buffer_workaround) \
GPU_OP(REGENERATE_STRUCT_NAMES, \ GPU_OP(REGENERATE_STRUCT_NAMES, \
regenerate_struct_names) \ regenerate_struct_names) \
GPU_OP(RELEASE_IMAGE_AFTER_USE, \
release_image_after_use) \
GPU_OP(RESTORE_SCISSOR_ON_FBO_CHANGE, \ GPU_OP(RESTORE_SCISSOR_ON_FBO_CHANGE, \
restore_scissor_on_fbo_change) \ restore_scissor_on_fbo_change) \
GPU_OP(REVERSE_POINT_SPRITE_COORD_ORIGIN, \ GPU_OP(REVERSE_POINT_SPRITE_COORD_ORIGIN, \
......
...@@ -57,7 +57,6 @@ component("gl") { ...@@ -57,7 +57,6 @@ component("gl") {
"gl_fence_nv.h", "gl_fence_nv.h",
"gl_gl_api_implementation.cc", "gl_gl_api_implementation.cc",
"gl_gl_api_implementation.h", "gl_gl_api_implementation.h",
"gl_image.cc",
"gl_image.h", "gl_image.h",
"gl_image_memory.cc", "gl_image_memory.cc",
"gl_image_memory.h", "gl_image_memory.h",
......
...@@ -76,7 +76,6 @@ ...@@ -76,7 +76,6 @@
'gl_fence_nv.h', 'gl_fence_nv.h',
'gl_gl_api_implementation.cc', 'gl_gl_api_implementation.cc',
'gl_gl_api_implementation.h', 'gl_gl_api_implementation.h',
'gl_image.cc',
'gl_image.h', 'gl_image.h',
'gl_image_memory.cc', 'gl_image_memory.cc',
'gl_image_memory.h', 'gl_image_memory.h',
......
// 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
...@@ -19,7 +19,7 @@ namespace gfx { ...@@ -19,7 +19,7 @@ namespace gfx {
// specific management. // specific management.
class GL_EXPORT GLImage : public base::RefCounted<GLImage> { class GL_EXPORT GLImage : public base::RefCounted<GLImage> {
public: public:
GLImage(); GLImage() {}
// Destroys the image. // Destroys the image.
virtual void Destroy(bool have_context) = 0; virtual void Destroy(bool have_context) = 0;
...@@ -55,12 +55,8 @@ class GL_EXPORT GLImage : public base::RefCounted<GLImage> { ...@@ -55,12 +55,8 @@ class GL_EXPORT GLImage : public base::RefCounted<GLImage> {
const Rect& bounds_rect, const Rect& bounds_rect,
const RectF& crop_rect) = 0; const RectF& crop_rect) = 0;
// Indicate that image should be released after use.
// (For an Android work-around only).
virtual void SetReleaseAfterUse();
protected: protected:
virtual ~GLImage(); virtual ~GLImage() {}
private: private:
friend class base::RefCounted<GLImage>; friend class base::RefCounted<GLImage>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment