From 49130ed028567ece38493db0cb9be2ed22ed7f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 6 Mar 2023 11:15:13 +0100 Subject: [PATCH] Shaders: have a dedicated resource list on ES2 builds. There are no geometry shaders, and gradually more and more shaders will be ES3+ only. --- src/Magnum/Shaders/CMakeLists.txt | 6 +++- src/Magnum/Shaders/resources-gles2.conf | 46 +++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 src/Magnum/Shaders/resources-gles2.conf diff --git a/src/Magnum/Shaders/CMakeLists.txt b/src/Magnum/Shaders/CMakeLists.txt index 43761f573..4503a70ef 100644 --- a/src/Magnum/Shaders/CMakeLists.txt +++ b/src/Magnum/Shaders/CMakeLists.txt @@ -31,7 +31,11 @@ if(NOT MAGNUM_WITH_GL) message(SEND_ERROR "Shaders are available only if MAGNUM_WITH_GL is enabled") endif() -corrade_add_resource(MagnumShaders_RESOURCES_GL resources-gl.conf) +if(MAGNUM_TARGET_GLES2) + corrade_add_resource(MagnumShaders_RESOURCES_GL resources-gles2.conf) +else() + corrade_add_resource(MagnumShaders_RESOURCES_GL resources-gl.conf) +endif() set(MagnumShaders_SRCS ${MagnumShaders_RESOURCES_GL}) diff --git a/src/Magnum/Shaders/resources-gles2.conf b/src/Magnum/Shaders/resources-gles2.conf new file mode 100644 index 000000000..de8685a25 --- /dev/null +++ b/src/Magnum/Shaders/resources-gles2.conf @@ -0,0 +1,46 @@ +group=MagnumShadersGL +nullTerminated=true + +[file] +filename=Flat.vert + +[file] +filename=Flat.frag + +[file] +filename=FullScreenTriangle.glsl + +[file] +filename=generic.glsl + +[file] +filename=MeshVisualizer.vert + +# MeshVisualizer.geom missing + +[file] +filename=MeshVisualizer.frag + +[file] +filename=Phong.vert + +[file] +filename=Phong.frag + +[file] +filename=Vector.vert + +[file] +filename=Vector.frag + +[file] +filename=DistanceFieldVector.frag + +[file] +filename=VertexColor.vert + +[file] +filename=VertexColor.frag + +[file] +filename=compatibility.glsl