Commit 563de12b authored by Robert Sesek's avatar Robert Sesek Committed by Chromium LUCI CQ

mac: Remove code to support OS X 10.10 in //gpu

Bug: 1153883
Change-Id: I91cabcc04d78ad3d3d97bdb55855bedc9eb92114
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2571805Reviewed-by: default avatarZhenyao Mo <zmo@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833430}
parent 0e75ebad
...@@ -35,8 +35,8 @@ namespace gpu { ...@@ -35,8 +35,8 @@ namespace gpu {
namespace { namespace {
base::scoped_nsprotocol<id<MTLTexture>> API_AVAILABLE(macos(10.11)) base::scoped_nsprotocol<id<MTLTexture>> CreateMetalTexture(
CreateMetalTexture(id<MTLDevice> mtl_device, id<MTLDevice> mtl_device,
IOSurfaceRef io_surface, IOSurfaceRef io_surface,
const gfx::Size& size, const gfx::Size& size,
viz::ResourceFormat format) { viz::ResourceFormat format) {
...@@ -175,7 +175,6 @@ SharedImageBackingFactoryIOSurface::ProduceSkiaPromiseTextureMetal( ...@@ -175,7 +175,6 @@ SharedImageBackingFactoryIOSurface::ProduceSkiaPromiseTextureMetal(
SharedImageBacking* backing, SharedImageBacking* backing,
scoped_refptr<SharedContextState> context_state, scoped_refptr<SharedContextState> context_state,
scoped_refptr<gl::GLImage> image) { scoped_refptr<gl::GLImage> image) {
if (@available(macOS 10.11, *)) {
DCHECK(context_state->GrContextIsMetal()); DCHECK(context_state->GrContextIsMetal());
base::ScopedCFTypeRef<IOSurfaceRef> io_surface = base::ScopedCFTypeRef<IOSurfaceRef> io_surface =
...@@ -193,8 +192,6 @@ SharedImageBackingFactoryIOSurface::ProduceSkiaPromiseTextureMetal( ...@@ -193,8 +192,6 @@ SharedImageBackingFactoryIOSurface::ProduceSkiaPromiseTextureMetal(
GrBackendTexture(backing->size().width(), backing->size().height(), GrBackendTexture(backing->size().width(), backing->size().height(),
GrMipMapped::kNo, info); GrMipMapped::kNo, info);
return SkPromiseImageTexture::Make(gr_backend_texture); return SkPromiseImageTexture::Make(gr_backend_texture);
}
return nullptr;
} }
// static // static
......
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