From: Steinar H. Gunderson Date: Sat, 18 Nov 2017 20:13:14 +0000 (+0100) Subject: Bump compute shader header to #version 150. X-Git-Tag: 1.6.0~58 X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=b4ec29a251e118f463ce940ffaf0945188bf6894;hp=b9da5758dedda56a1e2616647ebae129edb0c2db Bump compute shader header to #version 150. NVIDIA requires this for the layout qualifier, and it's probably right. Note that this required moving the unit tests to a core context, due to Mesa's demands. --- diff --git a/gtest_sdl_main.cpp b/gtest_sdl_main.cpp index be8bdd4..f4a4d05 100644 --- a/gtest_sdl_main.cpp +++ b/gtest_sdl_main.cpp @@ -21,15 +21,10 @@ int main(int argc, char **argv) { SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); - // You can uncomment this if you want to try a core context. - // For Mesa, you can get the same effect by doing - // - // export MESA_GL_VERSION_OVERRIDE=3.1FC - // - // before running tests. -// SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); -// SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); -// SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2); + // Use a core context, because Mesa only allows certain OpenGL versions in core. + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2); // See also init.cpp for how to enable debugging. // SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG); diff --git a/header.comp b/header.comp index 5487b20..2766568 100644 --- a/header.comp +++ b/header.comp @@ -1,4 +1,4 @@ -#version 130 +#version 150 #extension GL_ARB_compute_shader : enable #extension GL_ARB_shader_image_load_store : enable