DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Двухуровневый кеш текстур

Browse Source
This commit is contained in:
DBotThePony 2023-03-28 22:38:27 +07:00
parent 0910b093f8
commit 952f245e8f
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/GLStateTracker.kt
View File

@ -6,7 +6,6 @@ import org.apache.logging.log4j.LogManager
import org.lwjgl.opengl.GL import org.lwjgl.opengl.GL
import org.lwjgl.opengl.GL46.* import org.lwjgl.opengl.GL46.*
import org.lwjgl.opengl.GLCapabilities import org.lwjgl.opengl.GLCapabilities
import ru.dbotthepony.kstarbound.api.ISBFileLocator
import ru.dbotthepony.kstarbound.client.StarboundClient import ru.dbotthepony.kstarbound.client.StarboundClient
import ru.dbotthepony.kstarbound.client.freetype.FreeType import ru.dbotthepony.kstarbound.client.freetype.FreeType
import ru.dbotthepony.kstarbound.client.freetype.InvalidArgumentException import ru.dbotthepony.kstarbound.client.freetype.InvalidArgumentException
@ -28,10 +27,8 @@ import java.lang.ref.Cleaner
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
import java.time.Duration import java.time.Duration
import java.util.* import java.util.*
import java.util.concurrent.ThreadFactory
import java.util.concurrent.locks.LockSupport import java.util.concurrent.locks.LockSupport
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
import kotlin.collections.HashMap
import kotlin.math.roundToInt import kotlin.math.roundToInt
import kotlin.properties.ReadWriteProperty import kotlin.properties.ReadWriteProperty
import kotlin.reflect.KProperty import kotlin.reflect.KProperty
@ -435,22 +432,27 @@ class GLStateTracker(val client: StarboundClient) {
fun newVAO() = VertexArrayObject(this) fun newVAO() = VertexArrayObject(this)
fun newTexture(name: String = "<unknown>") = GLTexture2D(this, name) fun newTexture(name: String = "<unknown>") = GLTexture2D(this, name)
/** // минимальное время хранения 5 минут и...
* Так как текстуры не занимают память в куче JVM, а только видеопамять, то private val named2DTextures0: Cache<String, GLTexture2D> = Caffeine.newBuilder()
* такой кеш довольно хрупкий
*/
private val named2DTextures: Cache<String, GLTexture2D> = Caffeine.newBuilder()
.softValues() .softValues()
.expireAfterAccess(Duration.ofMinutes(5)) .expireAfterAccess(Duration.ofMinutes(5))
.build() .build()
// ...бесконечное хранение пока кто-то все ещё использует текстуру
private val named2DTextures1: Cache<String, GLTexture2D> = Caffeine.newBuilder()
.weakValues()
.build()
init { init {
val ref = WeakReference(named2DTextures) val ref0 = WeakReference(named2DTextures0)
val ref1 = WeakReference(named2DTextures1)
val worker = Runnable { val worker = Runnable {
while (true) { while (true) {
val get = ref.get() ?: break val get0 = ref0.get() ?: break
get.cleanUp() get0.cleanUp()
val get1 = ref1.get() ?: break
get1.cleanUp()
LockSupport.parkNanos(1_000_000_000L) LockSupport.parkNanos(1_000_000_000L)
} }
} }
@ -473,14 +475,16 @@ class GLStateTracker(val client: StarboundClient) {
fun loadTexture(path: String): GLTexture2D { fun loadTexture(path: String): GLTexture2D {
ensureSameThread() ensureSameThread()
return named2DTextures.get(path) { return named2DTextures0.get(path) {
if (!client.starbound.exists(path)) { named2DTextures1.get(it) {
LOGGER.error("Texture {} is missing! Falling back to {}", path, missingTexturePath) if (!client.starbound.exists(it)) {
missingTexture LOGGER.error("Texture {} is missing! Falling back to {}", it, missingTexturePath)
} else { missingTexture
newTexture(path).upload(client.starbound.imageData(path)).generateMips().also { } else {
it.textureMinFilter = GL_NEAREST newTexture(it).upload(client.starbound.imageData(it)).generateMips().also {
it.textureMagFilter = GL_NEAREST it.textureMinFilter = GL_NEAREST
it.textureMagFilter = GL_NEAREST
}
} }
} }
} }