Force GLSL version 140 for macOS
This commit is contained in:
parent
a3ee10d43e
commit
47f515a86b
4 changed files with 14 additions and 7 deletions
|
@ -17,5 +17,3 @@ publish-maven:
|
||||||
stage: publish
|
stage: publish
|
||||||
script:
|
script:
|
||||||
- 'gradle publish'
|
- 'gradle publish'
|
||||||
rules:
|
|
||||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx1G
|
||||||
org.gradle.parallel = true
|
org.gradle.parallel = true
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
version = 1.0.2+1.20
|
version = 1.0.4-DEV+1.20
|
||||||
maven_group = gay.eviee
|
maven_group = gay.eviee
|
||||||
archives_base_name = imguiquilt
|
archives_base_name = imguiquilt
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,8 @@ import imgui.flag.ImGuiConfigFlags;
|
||||||
import imgui.gl3.ImGuiImplGl3;
|
import imgui.gl3.ImGuiImplGl3;
|
||||||
import imgui.glfw.ImGuiImplGlfw;
|
import imgui.glfw.ImGuiImplGlfw;
|
||||||
|
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
import static org.lwjgl.glfw.GLFW.*;
|
import static org.lwjgl.glfw.GLFW.*;
|
||||||
|
|
||||||
public class ImguiLoader {
|
public class ImguiLoader {
|
||||||
|
@ -20,7 +22,14 @@ public class ImguiLoader {
|
||||||
public static void onGlfwInit(long handle) {
|
public static void onGlfwInit(long handle) {
|
||||||
initializeImGui(handle);
|
initializeImGui(handle);
|
||||||
imGuiGlfw.init(handle,true);
|
imGuiGlfw.init(handle,true);
|
||||||
imGuiGl3.init();
|
|
||||||
|
if (System.getProperty("os.name").toLowerCase(Locale.getDefault()).contains("mac")) {
|
||||||
|
// force it to use opengl 3.1 instead of 3.0 because Apple
|
||||||
|
imGuiGl3.init("#version 140");
|
||||||
|
} else {
|
||||||
|
imGuiGl3.init("#version 130");
|
||||||
|
}
|
||||||
|
|
||||||
windowHandle = handle;
|
windowHandle = handle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,9 @@
|
||||||
},
|
},
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"contact": {
|
"contact": {
|
||||||
"homepage": "https://sr.ht/~eviee/imgui-quilt/",
|
"homepage": "https://git.gaycatgirl.sex/evie/imgui-quilt",
|
||||||
"issues": "https://todo.sr.ht/~eviee/imgui-quilt",
|
"issues": "https://git.gaycatgirl.sex/evie/imgui-quilt/-/issues",
|
||||||
"sources": "https://git.sr.ht/~eviee/imgui-quilt"
|
"sources": "https://git.gaycatgirl.sex/evie/imgui-quilt"
|
||||||
},
|
},
|
||||||
"icon": "assets/imguiquilt/icon.png"
|
"icon": "assets/imguiquilt/icon.png"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Add table
Reference in a new issue