reduce openGL version 4.6 -> 4.0
This commit is contained in:
parent
e50cfffb19
commit
f683654ba0
3 changed files with 5 additions and 5 deletions
2
Makefile
2
Makefile
|
@ -1,7 +1,7 @@
|
||||||
CXX = clang++
|
CXX = clang++
|
||||||
CFLAGS = -Wall -Wextra -pedantic
|
CFLAGS = -Wall -Wextra -pedantic
|
||||||
INC = -Ithird_party -Ithird_party/imgui
|
INC = -Ithird_party -Ithird_party/imgui
|
||||||
ROOT = /opt/root/build
|
ROOT = $(HOME)/root_build/debug
|
||||||
ROOTFLAGS = -std=c++17 -m64 -I$(ROOT)/include
|
ROOTFLAGS = -std=c++17 -m64 -I$(ROOT)/include
|
||||||
ROOTLIBS = -L$(ROOT)/lib -lCore -lRIO -lROOTNTuple -Wl,-rpath,$(ROOT)/lib -pthread
|
ROOTLIBS = -L$(ROOT)/lib -lCore -lRIO -lROOTNTuple -Wl,-rpath,$(ROOT)/lib -pthread
|
||||||
LIBS = -lglfw
|
LIBS = -lglfw
|
||||||
|
|
|
@ -8,7 +8,7 @@ Size=1152,1414
|
||||||
|
|
||||||
[Window][main]
|
[Window][main]
|
||||||
Pos=0,0
|
Pos=0,0
|
||||||
Size=1115,470
|
Size=1143,1388
|
||||||
|
|
||||||
[Window][Hex View]
|
[Window][Hex View]
|
||||||
Pos=91,62
|
Pos=91,62
|
||||||
|
|
|
@ -47,7 +47,7 @@ b8 init_imgui(GLFWwindow* window) {
|
||||||
ImGui::StyleColorsDark();
|
ImGui::StyleColorsDark();
|
||||||
|
|
||||||
ImGui_ImplGlfw_InitForOpenGL(window, true);
|
ImGui_ImplGlfw_InitForOpenGL(window, true);
|
||||||
ImGui_ImplOpenGL3_Init("#version 460");
|
ImGui_ImplOpenGL3_Init("#version 400");
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -63,13 +63,13 @@ GLFWwindow* init_glfw(i32 desired_win_width, i32 desired_win_height)
|
||||||
glfwSetErrorCallback(glfw_error_callback);
|
glfwSetErrorCallback(glfw_error_callback);
|
||||||
glfwInit();
|
glfwInit();
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6);
|
// glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
|
||||||
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
||||||
glfwWindowHint(GLFW_DOUBLEBUFFER, GLFW_TRUE);
|
glfwWindowHint(GLFW_DOUBLEBUFFER, GLFW_TRUE);
|
||||||
glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
|
glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
|
||||||
glfwWindowHint(GLFW_DECORATED, GLFW_TRUE);
|
glfwWindowHint(GLFW_DECORATED, GLFW_TRUE);
|
||||||
glfwWindowHint(GLFW_DEPTH_BITS, 32);
|
glfwWindowHint(GLFW_DEPTH_BITS, 32);
|
||||||
#if defined(HARU_SLOW)
|
#ifndef NDEBUG
|
||||||
glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, true);
|
glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, true);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue