From 6274911a3e7ffd7b78d8680450c438fc925da8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 29 Apr 2020 10:34:11 +0200 Subject: [PATCH] GL: make the double precision shader tests work on llvmpipe. It doesn't support GLSL 4.00 yet, but the extension alone is supported. --- src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp | 4 ++-- .../Test/AbstractShaderProgramGLTestFiles/MyDoubleShader.frag | 2 ++ .../Test/AbstractShaderProgramGLTestFiles/MyDoubleShader.vert | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp index f39a856b1..56c7adaef 100644 --- a/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp @@ -558,8 +558,8 @@ struct MyDoubleShader: AbstractShaderProgram { MyDoubleShader::MyDoubleShader() { Utility::Resource rs("AbstractShaderProgramGLTest"); - Shader vert(Version::GL400, Shader::Type::Vertex); - Shader frag(Version::GL400, Shader::Type::Fragment); + Shader vert(Version::GL320, Shader::Type::Vertex); + Shader frag(Version::GL320, Shader::Type::Fragment); vert.addSource(rs.get("MyDoubleShader.vert")); frag.addSource(rs.get("MyDoubleShader.frag")); diff --git a/src/Magnum/GL/Test/AbstractShaderProgramGLTestFiles/MyDoubleShader.frag b/src/Magnum/GL/Test/AbstractShaderProgramGLTestFiles/MyDoubleShader.frag index 653e4863b..ad5ced24d 100644 --- a/src/Magnum/GL/Test/AbstractShaderProgramGLTestFiles/MyDoubleShader.frag +++ b/src/Magnum/GL/Test/AbstractShaderProgramGLTestFiles/MyDoubleShader.frag @@ -1,3 +1,5 @@ +#extension GL_ARB_gpu_shader_fp64: require + uniform double multiplier; uniform dvec4 color; uniform dvec4 additions[3]; diff --git a/src/Magnum/GL/Test/AbstractShaderProgramGLTestFiles/MyDoubleShader.vert b/src/Magnum/GL/Test/AbstractShaderProgramGLTestFiles/MyDoubleShader.vert index c079452f8..733442ca0 100644 --- a/src/Magnum/GL/Test/AbstractShaderProgramGLTestFiles/MyDoubleShader.vert +++ b/src/Magnum/GL/Test/AbstractShaderProgramGLTestFiles/MyDoubleShader.vert @@ -1,3 +1,5 @@ +#extension GL_ARB_gpu_shader_fp64: require + in vec4 position; uniform dmat4 matrix;