AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-13 17:37:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

option to disable compressed font textures

Browse Source 
That can workaround issues on some gpus
This commit is contained in:
Moritz Zwerger 2023-12-05 23:28:31 +01:00
parent dc575601a9
commit 803cdcc552
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyFontTextureArray.kt
View File

@ -20,7 +20,7 @@ import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureStates
import de.bixilon.minosoft.gui.rendering.system.base.texture.array.FontTextureArray import de.bixilon.minosoft.gui.rendering.system.base.texture.array.FontTextureArray
import de.bixilon.minosoft.gui.rendering.system.base.texture.array.TextureArrayProperties import de.bixilon.minosoft.gui.rendering.system.base.texture.array.TextureArrayProperties
class DummyFontTextureArray(context: RenderContext) : FontTextureArray(context, 1024) { class DummyFontTextureArray(context: RenderContext) : FontTextureArray(context, 1024, false) {
override fun load(latch: AbstractLatch) { override fun load(latch: AbstractLatch) {
for (texture in textures) { for (texture in textures) {
texture.renderData = DummyTextureRenderData texture.renderData = DummyTextureRenderData

7
src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/textures/TexturesC.kt
View File

@ -13,6 +13,7 @@
package de.bixilon.minosoft.config.profile.profiles.rendering.textures package de.bixilon.minosoft.config.profile.profiles.rendering.textures
import de.bixilon.minosoft.config.profile.delegate.primitive.BooleanDelegate
import de.bixilon.minosoft.config.profile.delegate.primitive.IntDelegate import de.bixilon.minosoft.config.profile.delegate.primitive.IntDelegate
import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile
@ -22,4 +23,10 @@ class TexturesC(profile: RenderingProfile) {
* Weather to use mipmaps for all static textures * Weather to use mipmaps for all static textures
*/ */
var mipmaps by IntDelegate(profile, 4, arrayOf(0..4)) var mipmaps by IntDelegate(profile, 4, arrayOf(0..4))
/**
* Font texture can be compressed on the gpu which massively reduces vram usage.
* It may not work with all drivers well, so disable it when font is just black.
*/
var compressedFont by BooleanDelegate(profile, true)
} }

1
src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/array/FontTextureArray.kt
View File

@ -25,6 +25,7 @@ import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture
abstract class FontTextureArray( abstract class FontTextureArray(
val context: RenderContext, val context: RenderContext,
val resolution: Int, val resolution: Int,
val compressed: Boolean,
) : TextureArray { ) : TextureArray {
protected val textures: MutableSet<Texture> = mutableSetOf() protected val textures: MutableSet<Texture> = mutableSetOf()
private val lock = SimpleLock() private val lock = SimpleLock()

6
src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLFontTextureArray.kt
View File

@ -35,7 +35,8 @@ import java.nio.ByteBuffer
class OpenGLFontTextureArray( class OpenGLFontTextureArray(
context: RenderContext, context: RenderContext,
) : FontTextureArray(context, RESOLUTION) { compressed: Boolean,
) : FontTextureArray(context, RESOLUTION, compressed) {
val index = context.system.unsafeCast<OpenGLRenderSystem>().textureBindingIndex++ val index = context.system.unsafeCast<OpenGLRenderSystem>().textureBindingIndex++
private var handle = -1 private var handle = -1
private var textureIndex = 0 private var textureIndex = 0
@ -43,9 +44,10 @@ class OpenGLFontTextureArray(
override fun upload(latch: AbstractLatch?) { override fun upload(latch: AbstractLatch?) {
this.handle = OpenGLTextureUtil.createTextureArray(0) this.handle = OpenGLTextureUtil.createTextureArray(0)
val format = if (compressed) GL_COMPRESSED_LUMINANCE_ALPHA else GL_RGBA8
// glTexParameteriv(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_SWIZZLE_RGBA, intArrayOf(GL_LUMINANCE, GL_LUMINANCE, GL_LUMINANCE, GL_LUMINANCE)) // TODO: not working? // glTexParameteriv(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_SWIZZLE_RGBA, intArrayOf(GL_LUMINANCE, GL_LUMINANCE, GL_LUMINANCE, GL_LUMINANCE)) // TODO: not working?
glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_COMPRESSED_LUMINANCE_ALPHA, RESOLUTION, RESOLUTION, textures.size, 0, GL_RGBA, GL_UNSIGNED_BYTE, null as ByteBuffer?) glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, format, RESOLUTION, RESOLUTION, textures.size, 0, GL_RGBA, GL_UNSIGNED_BYTE, null as ByteBuffer?)
for (texture in textures) { for (texture in textures) {
val renderData = texture.renderData as OpenGLTextureData val renderData = texture.renderData as OpenGLTextureData

8
src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureManager.kt
View File

@ -19,8 +19,8 @@ import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureManager
import de.bixilon.minosoft.gui.rendering.system.opengl.texture.dynamic.OpenGLDynamicTextureArray import de.bixilon.minosoft.gui.rendering.system.opengl.texture.dynamic.OpenGLDynamicTextureArray
class OpenGLTextureManager(val context: RenderContext) : TextureManager() { class OpenGLTextureManager(val context: RenderContext) : TextureManager() {
private val mipmaps = context.connection.profiles.rendering.textures.mipmaps private val config = context.connection.profiles.rendering.textures
override val static = OpenGLTextureArray(context, true, mipmaps) override val static = OpenGLTextureArray(context, true, config.mipmaps)
override val dynamic = OpenGLDynamicTextureArray(context, context.system.unsafeCast(), resolution = 64, mipmaps = mipmaps) override val dynamic = OpenGLDynamicTextureArray(context, context.system.unsafeCast(), resolution = 64, mipmaps = config.mipmaps)
override val font = OpenGLFontTextureArray(context) override val font = OpenGLFontTextureArray(context, config.compressedFont)
} }