From c78f48b314d147bd1d468df2773d6723e96c7ae1 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Mon, 27 Nov 2023 23:47:23 +0100 Subject: [PATCH] Rename OpenGLVendor::strict --- .../gui/rendering/system/opengl/OpenGLRenderSystem.kt | 2 +- .../gui/rendering/system/opengl/vendor/ATIOpenGLVendor.kt | 4 ++-- .../gui/rendering/system/opengl/vendor/MesaOpenGLVendor.kt | 4 ++-- .../gui/rendering/system/opengl/vendor/NvidiaOpenGLVendor.kt | 4 ++-- .../gui/rendering/system/opengl/vendor/OpenGLVendor.kt | 4 ++-- .../gui/rendering/system/opengl/vendor/OtherOpenGLVendor.kt | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt index 16b6ed522..220a27a2a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt @@ -123,7 +123,7 @@ class OpenGLRenderSystem( vendorString.contains("amd") || vendorString.contains("ati") -> ATIOpenGLVendor else -> OtherOpenGLVendor } - if (context.preferQuads && vendor.strictSpecification) { + if (context.preferQuads && vendor.strict) { throw IllegalStateException("Your GPU driver strictly follows the open gl specification. The setting `prefer_quads` is not working!") } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/ATIOpenGLVendor.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/ATIOpenGLVendor.kt index 94920f523..9fbaf5f95 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/ATIOpenGLVendor.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/ATIOpenGLVendor.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2021 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -17,7 +17,7 @@ import org.lwjgl.opengl.ATIMeminfo.GL_VBO_FREE_MEMORY_ATI import org.lwjgl.opengl.GL11.glGetInteger object ATIOpenGLVendor : OpenGLVendor { - override val strictSpecification: Boolean = false + override val strict: Boolean = false override val shaderDefine: String = "__ATI" override val availableVRAM: Long diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/MesaOpenGLVendor.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/MesaOpenGLVendor.kt index 6aacb4afc..891fa842b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/MesaOpenGLVendor.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/MesaOpenGLVendor.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2021 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -14,6 +14,6 @@ package de.bixilon.minosoft.gui.rendering.system.opengl.vendor object MesaOpenGLVendor : OpenGLVendor { - override val strictSpecification: Boolean = true + override val strict: Boolean = true override val shaderDefine: String = "__MESA" } 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 ce3b4e3c7..53a1d8fa3 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 @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2021 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -18,7 +18,7 @@ import org.lwjgl.opengl.NVXGPUMemoryInfo.GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VI import org.lwjgl.opengl.NVXGPUMemoryInfo.GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX object NvidiaOpenGLVendor : OpenGLVendor { - override val strictSpecification: Boolean = false + override val strict: Boolean = false override val shaderDefine: String = "__NVIDIA" override val availableVRAM: Long diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/OpenGLVendor.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/OpenGLVendor.kt index 62a6d24fa..dd96a9062 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/OpenGLVendor.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/vendor/OpenGLVendor.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2021 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.system.opengl.vendor import de.bixilon.minosoft.gui.rendering.system.base.GPUVendor interface OpenGLVendor : GPUVendor { - val strictSpecification: Boolean + val strict: Boolean val usedVRAM: Long get() = -1L 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 c76e4d316..248ae96ed 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 @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2021 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -14,6 +14,6 @@ package de.bixilon.minosoft.gui.rendering.system.opengl.vendor object OtherOpenGLVendor : OpenGLVendor { - override val strictSpecification: Boolean = true + override val strict: Boolean = true override val shaderDefine: String = "__OTHER" }