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

fix GL_INVALID_OPERATION error when compiling shader

Browse Source
This commit is contained in:
Moritz Zwerger 2023-12-24 16:36:43 +01:00
parent 92c9c99efc
commit 1fb2aac58e
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
6 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt
View File

@ -166,4 +166,10 @@ interface RenderSystem {
} }
var viewport: Vec2i var viewport: Vec2i
fun reportErrors() {
val errors = getErrors()
if (errors.isEmpty()) return
throw Exception(errors.first().toString())
}
} }

1
src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLNativeShader.kt
View File

@ -81,7 +81,6 @@ class OpenGLNativeShader(
defines["HAS_GEOMETRY_SHADER"] = " " defines["HAS_GEOMETRY_SHADER"] = " "
} }
handler = glCreateProgram() handler = glCreateProgram()
glUseProgram(handler)
if (handler.toLong() == MemoryUtil.NULL) { if (handler.toLong() == MemoryUtil.NULL) {
throw ShaderLoadingException() throw ShaderLoadingException()

2
src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/AMDOpenGLVendor.kt vendored
View File

@ -27,4 +27,6 @@ object AMDOpenGLVendor : OpenGLVendor {
override val hacks = DriverHacks.set( override val hacks = DriverHacks.set(
DriverHacks.USE_QUADS_OVER_TRIANGLE, DriverHacks.USE_QUADS_OVER_TRIANGLE,
) )
override fun toString() = "amd"
} }

2
src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/IntelOpenGLVendor.kt vendored
View File

@ -19,4 +19,6 @@ object IntelOpenGLVendor : OpenGLVendor {
override val shaderDefine: String = "__INTEL" override val shaderDefine: String = "__INTEL"
override val hacks = DriverHacks.set() override val hacks = DriverHacks.set()
override fun toString() = "intel"
} }

2
src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/NvidiaOpenGLVendor.kt vendored
View File

@ -31,4 +31,6 @@ object NvidiaOpenGLVendor : OpenGLVendor {
DriverHacks.UNIFORM_ARRAY_AS_ARRAY, DriverHacks.UNIFORM_ARRAY_AS_ARRAY,
DriverHacks.USE_QUADS_OVER_TRIANGLE, DriverHacks.USE_QUADS_OVER_TRIANGLE,
) )
override fun toString() = "nvidia"
} }

2
src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/OtherOpenGLVendor.kt vendored
View File

@ -19,4 +19,6 @@ object OtherOpenGLVendor : OpenGLVendor {
override val shaderDefine: String = "__OTHER" override val shaderDefine: String = "__OTHER"
override val hacks = DriverHacks.set() override val hacks = DriverHacks.set()
override fun toString() = "other"
} }