From 0e01f4b41cedd0a46a2ed584d718ecad51a006b4 Mon Sep 17 00:00:00 2001 From: "Chance.H" Date: Thu, 12 Sep 2024 15:21:38 +0800 Subject: [PATCH] ci: fix macos build error --- test/system_test/MassSpring3D/main.cpp | 3 ++- test/system_test/MassSpring3D/shaders/basic.vshader | 2 +- test/system_test/MassSpring3D/shaders/phong.fshader | 2 +- test/system_test/MassSpring3D/shaders/pick.fshader | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/system_test/MassSpring3D/main.cpp b/test/system_test/MassSpring3D/main.cpp index e07efea..6f81efc 100644 --- a/test/system_test/MassSpring3D/main.cpp +++ b/test/system_test/MassSpring3D/main.cpp @@ -160,7 +160,8 @@ static void initGlutState(int argc, char** argv, const char* window_title = "", glutInitWindowPosition(0, 0); glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH); #ifdef __APPLE__ - glutInitContextFlags(GLUT_FORWARD_COMPATIBLE | GLUT_DEBUG); + glutInitContextVersion(3, 3); + glutInitContextFlags(GLUT_CORE_PROFILE); #endif glutCreateWindow(window_title); glutDisplayFunc(&display); diff --git a/test/system_test/MassSpring3D/shaders/basic.vshader b/test/system_test/MassSpring3D/shaders/basic.vshader index 6402c32..85c7bd3 100644 --- a/test/system_test/MassSpring3D/shaders/basic.vshader +++ b/test/system_test/MassSpring3D/shaders/basic.vshader @@ -1,4 +1,4 @@ -#version 330 +#version 330 core uniform mat4 uModelViewMatrix; // uniform mat4 uNormalMatrix; diff --git a/test/system_test/MassSpring3D/shaders/phong.fshader b/test/system_test/MassSpring3D/shaders/phong.fshader index 37767c0..17be2e7 100644 --- a/test/system_test/MassSpring3D/shaders/phong.fshader +++ b/test/system_test/MassSpring3D/shaders/phong.fshader @@ -1,4 +1,4 @@ -#version 330 +#version 330 core in vec3 vNormal; out vec4 fragColor; diff --git a/test/system_test/MassSpring3D/shaders/pick.fshader b/test/system_test/MassSpring3D/shaders/pick.fshader index 09683fa..2ecaae9 100644 --- a/test/system_test/MassSpring3D/shaders/pick.fshader +++ b/test/system_test/MassSpring3D/shaders/pick.fshader @@ -1,4 +1,4 @@ -#version 330 +#version 330 core in vec2 vTexCoord; out vec4 fragColor;