From 06550ea42faebe44846b4cb485fedbe7a55a8bf0 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 11 Oct 2017 09:05:10 -0400 Subject: [PATCH] Add support for OpenGL 4.6 Compile fix in rawvolumewriter --- apps/OpenSpace/main.cpp | 3 ++- ext/sgct | 2 +- modules/volume/rawvolumewriter.inl | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp index 01c475f5e5..b17adaa7b4 100644 --- a/apps/OpenSpace/main.cpp +++ b/apps/OpenSpace/main.cpp @@ -555,7 +555,8 @@ int main_main(int argc, char** argv) { { { 4, 2 }, sgct::Engine::RunMode::OpenGL_4_2_Core_Profile }, { { 4, 3 }, sgct::Engine::RunMode::OpenGL_4_3_Core_Profile }, { { 4, 4 }, sgct::Engine::RunMode::OpenGL_4_4_Core_Profile }, - { { 4, 5 }, sgct::Engine::RunMode::OpenGL_4_5_Core_Profile } + { { 4, 5 }, sgct::Engine::RunMode::OpenGL_4_5_Core_Profile }, + { { 4, 6 }, sgct::Engine::RunMode::OpenGL_4_6_Core_Profile } }; ghoul_assert( versionMapping.find(glVersion) != versionMapping.end(), diff --git a/ext/sgct b/ext/sgct index 34d3ebb4dd..ee29d15894 160000 --- a/ext/sgct +++ b/ext/sgct @@ -1 +1 @@ -Subproject commit 34d3ebb4ddae8524f512af12df943bd2aa058f46 +Subproject commit ee29d158944eed9bafbccbccdfb9856b3a96cac0 diff --git a/modules/volume/rawvolumewriter.inl b/modules/volume/rawvolumewriter.inl index 018b6bf255..ae2cc3cea3 100644 --- a/modules/volume/rawvolumewriter.inl +++ b/modules/volume/rawvolumewriter.inl @@ -41,7 +41,7 @@ size_t RawVolumeWriter::coordsToIndex(const glm::uvec3& cartesian) co template glm::ivec3 RawVolumeWriter::indexToCoords(size_t linear) const { - return indexToCoords(linear, dimensions()); + return volume::indexToCoords(linear, dimensions()); } template