Fix clear cache

Baekalfen · Nov 2, 2023 · 44c8e01 · 44c8e01
1 parent c0b275c
commit 44c8e01
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git a/pyboy/core/lcd.pxd b/pyboy/core/lcd.pxd
@@ -179,10 +179,6 @@ cdef class Renderer:
     cdef void sort_sprites(self, int) noexcept nogil
 
     cdef void clear_cache(self) noexcept nogil
-    cdef void clear_tilecache0(self) noexcept nogil
-    cdef void clear_tilecache1(self) noexcept nogil # CGB Only
-    cdef void clear_spritecache0(self) noexcept nogil
-    cdef void clear_spritecache1(self) noexcept nogil
     @cython.locals(
         x=int,
         t=int,

diff --git a/pyboy/core/lcd.py b/pyboy/core/lcd.py
@@ -662,9 +662,12 @@ def scanline_sprites(self, lcd, ly, buffer, ignore_priority):
             x -= 8
 
     def clear_cache(self):
-        self.clear_tilecache0()
-        self.clear_spritecache0()
-        self.clear_spritecache1()
+        for i in range(TILES):
+            self._tilecache0_state[i] = 0
+        for i in range(TILES):
+            self._spritecache0_state[i] = 0
+        for i in range(TILES):
+            self._spritecache1_state[i] = 0
 
     def invalidate_tile(self, tile, vbank):
         if vbank and self.cgb:
@@ -679,18 +682,6 @@ def invalidate_tile(self, tile, vbank):
             self._spritecache0_state[tile] = 0
             self._spritecache1_state[tile] = 0
 
-    def clear_tilecache0(self):
-        self._tilecache0_state[:] = 0
-
-    def clear_tilecache1(self):
-        pass
-
-    def clear_spritecache0(self):
-        self._spritecache0_state[:] = 0
-
-    def clear_spritecache1(self):
-        self._spritecache1_state[:] = 0
-
     def update_tilecache0(self, lcd, t, bank):
         if self._tilecache0_state[t]:
             return
@@ -816,13 +807,14 @@ def __init__(self):
         self.clear_cache()
 
     def clear_cache(self):
-        self.clear_tilecache0()
-        self.clear_tilecache1()
-        self.clear_spritecache0()
-        self.clear_spritecache1()
-
-    def clear_tilecache1(self):
-        self._tilecache1_state[:] = 0
+        for i in range(TILES):
+            self._tilecache0_state[i] = 0
+        for i in range(TILES):
+            self._tilecache1_state[i] = 0 # CGB Only
+        for i in range(TILES):
+            self._spritecache0_state[i] = 0
+        for i in range(TILES):
+            self._spritecache1_state[i] = 0
 
     def update_tilecache0(self, lcd, t, bank):
         if self._tilecache0_state[t]: