Revert CoreTextureManager changes per feedback

Author: wouterlucas

src/core/CoreTextureManager.ts

@@ -254,32 +254,6 @@ export class CoreTextureManager {
     }
   }
 
-  /**
-   * Remove a `Texture` from the texture cache
-   *
-   * @param texture
-   */
-  removeTexture(texture: Texture): void {
-    const { textureRefCountMap } = this;
-
-    if (textureRefCountMap.has(texture)) {
-      const refCountObj = textureRefCountMap.get(texture);
-      assertTruthy(refCountObj);
-      refCountObj.count--;
-      if (refCountObj.count === 0) {
-        textureRefCountMap.delete(texture);
-        // If the texture is not referenced anywhere else, remove it from the key cache
-        // as well.
-        // This should allow the `Texture` instance to be garbage collected.
-        if (refCountObj.cacheKey) {
-          this.textureKeyCache.delete(refCountObj.cacheKey);
-        }
-      }
-    }
-    // Free the ctx texture if it exists.
-    this.ctxTextureCache.get(texture)?.free();
-  }
-
   /**
    * Remove a `Texture` from the texture cache by its texture desc ID
    *
@@ -292,40 +266,31 @@ export class CoreTextureManager {
    * @param textureDescId
    */
   removeTextureIdFromCache(textureDescId: number): void {
-    const { textureIdCache } = this;
+    const { textureIdCache, textureRefCountMap } = this;
     const texture = textureIdCache.get(textureDescId);
     if (!texture) {
       // Sometimes a texture is removed from the cache before it ever gets
       // added to the cache. This is fine and not an error.
       return;
     }
     textureIdCache.delete(textureDescId);
-
-    // remove the texture
-    this.removeTexture(texture);
-  }
-
-  /**
-   * Remove a `Texture` from the texture cache by its cache key
-   *
-   * @remarks
-   * Same as removeTextureIdFromCache, but then by cache key.
-   *
-   * @param cacheKey
-   */
-  removeTextureCacheKeyFromCache(cacheKey: string): void {
-    const { textureKeyCache } = this;
-    const texture = this.textureKeyCache.get(cacheKey);
-    if (!texture) {
-      // Sometimes a texture is removed from the cache before it ever gets
-      // added to the cache. This is fine and not an error.
-      return;
+    if (textureRefCountMap.has(texture)) {
+      const refCountObj = textureRefCountMap.get(texture);
+      assertTruthy(refCountObj);
+      refCountObj.count--;
+      if (refCountObj.count === 0) {
+        textureRefCountMap.delete(texture);
+        // If the texture is not referenced anywhere else, remove it from the key cache
+        // as well.
+        // This should allow the `Texture` instance to be garbage collected.
+        if (refCountObj.cacheKey) {
+          this.textureKeyCache.delete(refCountObj.cacheKey);
+        }
+      }
     }
 
-    textureKeyCache.delete(cacheKey);
-
-    // remove the texture
-    this.removeTexture(texture);
+    // Free the ctx texture if it exists.
+    this.ctxTextureCache.get(texture)?.free();
   }
 
   /**