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

Downgrade OpenGL to 3.3 since no 4.0+ features were used

Browse Source
This commit is contained in:
DBotThePony 2023-09-18 19:58:40 +07:00
parent 1de2b4c167
commit 123573e056
Signed by: DBot
GPG Key ID: DCC23B5715498507
18 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt
View File

@ -173,8 +173,8 @@ class StarboundClient : Closeable {
GLFW.glfwWindowHint(GLFW.GLFW_VISIBLE, GLFW.GLFW_FALSE) GLFW.glfwWindowHint(GLFW.GLFW_VISIBLE, GLFW.GLFW_FALSE)
GLFW.glfwWindowHint(GLFW.GLFW_RESIZABLE, GLFW.GLFW_TRUE) GLFW.glfwWindowHint(GLFW.GLFW_RESIZABLE, GLFW.GLFW_TRUE)
GLFW.glfwWindowHint(GLFW.GLFW_CONTEXT_VERSION_MAJOR, 4) GLFW.glfwWindowHint(GLFW.GLFW_CONTEXT_VERSION_MAJOR, 3)
GLFW.glfwWindowHint(GLFW.GLFW_CONTEXT_VERSION_MINOR, 6) GLFW.glfwWindowHint(GLFW.GLFW_CONTEXT_VERSION_MINOR, 3)
GLFW.glfwWindowHint(GLFW.GLFW_OPENGL_PROFILE, GLFW.GLFW_OPENGL_CORE_PROFILE) GLFW.glfwWindowHint(GLFW.GLFW_OPENGL_PROFILE, GLFW.GLFW_OPENGL_CORE_PROFILE)
window = GLFW.glfwCreateWindow(800, 600, "KStarbound", MemoryUtil.NULL, MemoryUtil.NULL) window = GLFW.glfwCreateWindow(800, 600, "KStarbound", MemoryUtil.NULL, MemoryUtil.NULL)
@ -843,7 +843,6 @@ class StarboundClient : Closeable {
ensureSameThread() ensureSameThread()
var diff = nextRender - System.nanoTime() var diff = nextRender - System.nanoTime()
var yields = 0
// try to sleep until next frame as precise as possible // try to sleep until next frame as precise as possible
while (diff > 0L) { while (diff > 0L) {
@ -851,7 +850,6 @@ class StarboundClient : Closeable {
LockSupport.parkNanos(1_000_000L) LockSupport.parkNanos(1_000_000L)
} else { } else {
Thread.yield() Thread.yield()
yields++
} }
diff = nextRender - System.nanoTime() diff = nextRender - System.nanoTime()

2
src/main/kotlin/ru/dbotthepony/kstarbound/client/world/ClientWorld.kt
View File

@ -90,7 +90,7 @@ class ClientWorld(
val tile = view.getTile(x, y) ?: continue val tile = view.getTile(x, y) ?: continue
val material = tile.material val material = tile.material
if (material != null && !material.isMeta) { if (!material.isMeta) {
client.tileRenderers.getMaterialRenderer(material.materialName).tesselate(tile, view, meshes, Vector2i(x, y), background = isBackground) client.tileRenderers.getMaterialRenderer(material.materialName).tesselate(tile, view, meshes, Vector2i(x, y), background = isBackground)
} }

2
src/main/resources/shaders/flat.fsh
View File

@ -1,5 +1,5 @@
#version 460 #version 330
uniform vec4 color; uniform vec4 color;
out vec4 color_out; out vec4 color_out;

2
src/main/resources/shaders/flat.vsh
View File

@ -1,5 +1,5 @@
#version 460 #version 330
layout (location = 0) in vec2 pos; layout (location = 0) in vec2 pos;
uniform mat4 transform; uniform mat4 transform;

2
src/main/resources/shaders/flat_color.fsh
View File

@ -1,5 +1,5 @@
#version 460 #version 330
in vec4 finalVertexColor; in vec4 finalVertexColor;

2
src/main/resources/shaders/flat_color.vsh
View File

@ -1,5 +1,5 @@
#version 460 #version 330
layout (location = 0) in vec2 vertexPos; layout (location = 0) in vec2 vertexPos;
layout (location = 1) in vec4 vertexColor; layout (location = 1) in vec4 vertexColor;

2
src/main/resources/shaders/font.fsh
View File

@ -1,5 +1,5 @@
#version 460 #version 330
in vec2 uv_out; in vec2 uv_out;
out vec4 color_out; out vec4 color_out;

2
src/main/resources/shaders/font.vsh
View File

@ -1,5 +1,5 @@
#version 460 #version 330
layout (location = 0) in vec2 pos; layout (location = 0) in vec2 pos;
layout (location = 1) in vec2 uv_in; layout (location = 1) in vec2 uv_in;

2
src/main/resources/shaders/fragment/texture.glsl
View File

@ -1,5 +1,5 @@
#version 460 #version 330
uniform sampler2D texture0; uniform sampler2D texture0;

2
src/main/resources/shaders/fragment/texture_color.glsl
View File

@ -1,5 +1,5 @@
#version 460 #version 330
uniform sampler2D texture0; uniform sampler2D texture0;
uniform vec4 color; uniform vec4 color;

2
src/main/resources/shaders/light.fsh
View File

@ -1,5 +1,5 @@
#version 460 #version 330
in vec2 oUVCoords; in vec2 oUVCoords;
out vec4 resultColor; out vec4 resultColor;

2
src/main/resources/shaders/light.vsh
View File

@ -1,5 +1,5 @@
#version 460 #version 330
layout (location = 0) in vec2 vertexPos; layout (location = 0) in vec2 vertexPos;
layout (location = 1) in vec2 uvCoords; layout (location = 1) in vec2 uvCoords;

2
src/main/resources/shaders/liquid.fsh
View File

@ -1,5 +1,5 @@
#version 460 #version 330
out vec4 resultColor; out vec4 resultColor;

2
src/main/resources/shaders/liquid.vsh
View File

@ -1,5 +1,5 @@
#version 460 #version 330
layout (location = 0) in vec2 vertexPos; layout (location = 0) in vec2 vertexPos;

2
src/main/resources/shaders/tile.fsh
View File

@ -1,5 +1,5 @@
#version 460 #version 330
uniform sampler2D texture0; uniform sampler2D texture0;
uniform vec4 color; uniform vec4 color;

2
src/main/resources/shaders/tile.vsh
View File

@ -1,5 +1,5 @@
#version 460 #version 330
layout (location = 0) in vec3 pos; layout (location = 0) in vec3 pos;
layout (location = 1) in vec2 uv_in; layout (location = 1) in vec2 uv_in;

2
src/main/resources/shaders/vertex/2dtexture.glsl
View File

@ -1,5 +1,5 @@
#version 460 #version 330
layout (location = 0) in vec2 pos; layout (location = 0) in vec2 pos;
layout (location = 1) in vec2 uv_in; layout (location = 1) in vec2 uv_in;

2
src/main/resources/shaders/vertex/texture.glsl
View File

@ -1,5 +1,5 @@
#version 460 #version 330
layout (location = 0) in vec3 pos; layout (location = 0) in vec3 pos;
layout (location = 1) in vec2 uv_in; layout (location = 1) in vec2 uv_in;