From f108b64acc0832eda2c5bcaae6eb81cbdaf0aca9 Mon Sep 17 00:00:00 2001 From: Faerbit Date: Mon, 15 Dec 2014 13:31:31 +0100 Subject: [PATCH] Now using OpenGL 4.0. --- CMakeLists.txt | 4 ++-- Shader/phong.fsh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d051df..4e1a247 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ add_subdirectory(converter) PROJECT(MarbleRaceGroupC) # ACGL setup -SET(ACGL_OPENGL_SUPPORT CORE_32) -ADD_DEFINITIONS(-DACGL_OPENGL_VERSION_32) +SET(ACGL_OPENGL_SUPPORT CORE_40) +ADD_DEFINITIONS(-DACGL_OPENGL_VERSION_40) ADD_DEFINITIONS(-DACGL_OPENGL_PROFILE_CORE) # create the newest availabe OpenGL context, independent of the ACGL version: #ADD_DEFINITIONS(-DGLFW_OPENGL_LATEST_VERSION) diff --git a/Shader/phong.fsh b/Shader/phong.fsh index af8a2e8..f80b4d4 100644 --- a/Shader/phong.fsh +++ b/Shader/phong.fsh @@ -1,4 +1,4 @@ -#version 150 +#version 400 in vec3 vNormal; in vec2 vTexCoord;