From 4844bc044edb58e9207984a42466ea7aa9c02825 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sat, 20 Apr 2019 00:28:09 +0900 Subject: [PATCH] Revert "graphicsdriver/metal: Bug fix: Release drawable correctly" This reverts commit c44accbfb5c93c96a50af30f10b803cad536c697. Reason: This change doesn't make sense --- internal/graphicsdriver/metal/ca/ca.go | 4 ---- internal/graphicsdriver/metal/ca/ca.h | 1 - internal/graphicsdriver/metal/ca/ca.m | 4 ---- internal/graphicsdriver/metal/driver.go | 1 - 4 files changed, 10 deletions(-) diff --git a/internal/graphicsdriver/metal/ca/ca.go b/internal/graphicsdriver/metal/ca/ca.go index d7df1a94e..30f44aae5 100644 --- a/internal/graphicsdriver/metal/ca/ca.go +++ b/internal/graphicsdriver/metal/ca/ca.go @@ -152,7 +152,3 @@ func (md MetalDrawable) Drawable() unsafe.Pointer { return md.metalDrawable } func (md MetalDrawable) Texture() mtl.Texture { return mtl.NewTexture(C.MetalDrawable_Texture(md.metalDrawable)) } - -func (md MetalDrawable) Release() { - C.MetalDrawable_Release(md.metalDrawable) -} diff --git a/internal/graphicsdriver/metal/ca/ca.h b/internal/graphicsdriver/metal/ca/ca.h index 435965975..4190a41f2 100644 --- a/internal/graphicsdriver/metal/ca/ca.h +++ b/internal/graphicsdriver/metal/ca/ca.h @@ -31,4 +31,3 @@ void MetalLayer_SetDrawableSize(void *metalLayer, double width, double height); void *MetalLayer_NextDrawable(void *metalLayer); void *MetalDrawable_Texture(void *drawable); -void MetalDrawable_Release(void *drawable); diff --git a/internal/graphicsdriver/metal/ca/ca.m b/internal/graphicsdriver/metal/ca/ca.m index a8a47f195..b168c8d18 100644 --- a/internal/graphicsdriver/metal/ca/ca.m +++ b/internal/graphicsdriver/metal/ca/ca.m @@ -89,7 +89,3 @@ void *MetalLayer_NextDrawable(void *metalLayer) { void *MetalDrawable_Texture(void *metalDrawable) { return ((id)metalDrawable).texture; } - -void MetalDrawable_Release(void *metalDrawable) { - [(id)metalDrawable release]; -} diff --git a/internal/graphicsdriver/metal/driver.go b/internal/graphicsdriver/metal/driver.go index 4ce4af2a9..5b6a21cb1 100644 --- a/internal/graphicsdriver/metal/driver.go +++ b/internal/graphicsdriver/metal/driver.go @@ -598,7 +598,6 @@ func (d *Driver) Draw(indexLen int, indexOffset int, mode graphics.CompositeMode } t = d.screenDrawable.Texture() } else { - d.screenDrawable.Release() d.screenDrawable = ca.MetalDrawable{} t = d.dst.texture }