diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt index 911e5366a..546b01150 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt @@ -166,4 +166,10 @@ interface RenderSystem { } var viewport: Vec2i + + fun reportErrors() { + val errors = getErrors() + if (errors.isEmpty()) return + throw Exception(errors.first().toString()) + } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLNativeShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLNativeShader.kt index f14a8e612..865138fd7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLNativeShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLNativeShader.kt @@ -81,7 +81,6 @@ class OpenGLNativeShader( defines["HAS_GEOMETRY_SHADER"] = " " } handler = glCreateProgram() - glUseProgram(handler) if (handler.toLong() == MemoryUtil.NULL) { throw ShaderLoadingException() diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/AMDOpenGLVendor.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/AMDOpenGLVendor.kt index cc086ab51..af699c9e7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/AMDOpenGLVendor.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/AMDOpenGLVendor.kt @@ -27,4 +27,6 @@ object AMDOpenGLVendor : OpenGLVendor { override val hacks = DriverHacks.set( DriverHacks.USE_QUADS_OVER_TRIANGLE, ) + + override fun toString() = "amd" } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/IntelOpenGLVendor.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/IntelOpenGLVendor.kt index b5005c47f..f6b003f80 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/IntelOpenGLVendor.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/IntelOpenGLVendor.kt @@ -19,4 +19,6 @@ object IntelOpenGLVendor : OpenGLVendor { override val shaderDefine: String = "__INTEL" override val hacks = DriverHacks.set() + + override fun toString() = "intel" } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/NvidiaOpenGLVendor.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/NvidiaOpenGLVendor.kt index c954eb337..c5c15c1a2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/NvidiaOpenGLVendor.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/NvidiaOpenGLVendor.kt @@ -31,4 +31,6 @@ object NvidiaOpenGLVendor : OpenGLVendor { DriverHacks.UNIFORM_ARRAY_AS_ARRAY, DriverHacks.USE_QUADS_OVER_TRIANGLE, ) + + override fun toString() = "nvidia" } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/OtherOpenGLVendor.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/OtherOpenGLVendor.kt index 43d140909..594b25114 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/OtherOpenGLVendor.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/OtherOpenGLVendor.kt @@ -19,4 +19,6 @@ object OtherOpenGLVendor : OpenGLVendor { override val shaderDefine: String = "__OTHER" override val hacks = DriverHacks.set() + + override fun toString() = "other" }