diff --git a/drape_frontend/drape_frontend_tests/compile_shaders_test.cpp b/drape_frontend/drape_frontend_tests/compile_shaders_test.cpp index 4fe2c04f58..396d89ddae 100644 --- a/drape_frontend/drape_frontend_tests/compile_shaders_test.cpp +++ b/drape_frontend/drape_frontend_tests/compile_shaders_test.cpp @@ -16,15 +16,19 @@ #include #include -#if defined(OMIM_OS_MAC) - std::string const kCompilersDir = "shaders_compiler"; -std::string const kMaliCompilerOpenGLES2Dir = "mali_compiler"; -std::string const kMaliCompilerOpenGLES3Dir = "mali_compiler_es3"; -std::string const kCompilerOpenGLES2 = "GLSLESCompiler_Series5.mac"; + +#if defined(OMIM_OS_MAC) +std::string const kMaliCompilerOpenGLES2Dir = "macos/mali_compiler"; +std::string const kMaliCompilerOpenGLES3Dir = "macos/mali_compiler_es3"; +std::string const kCompilerOpenGLES2 = "macos/GLSLESCompiler_Series5.mac"; std::string const kCompilerMaliOpenGLES2 = kMaliCompilerOpenGLES2Dir + "/malisc"; -std::string const kCompilerOpenGLES3 = "GLSLESCompiler_Series6.mac"; +std::string const kCompilerOpenGLES3 = "macos/GLSLESCompiler_Series6.mac"; std::string const kCompilerMaliOpenGLES3 = kMaliCompilerOpenGLES3Dir + "/malisc"; +#elif defined(OMIM_OS_LINUX) +std::string const kMaliCompilerOpenGLES3Dir = "linux/mali_compiler_es3"; +std::string const kCompilerMaliOpenGLES3 = kMaliCompilerOpenGLES3Dir + "/malisc"; +#endif std::string DebugPrint(QString const & s) { return s.toStdString(); } @@ -106,6 +110,8 @@ std::string GetCompilerPath(std::string const & compilerName) } } // namespace +#if defined(OMIM_OS_MAC) + UNIT_TEST(CompileShaders_Test) { struct CompilerData @@ -164,6 +170,8 @@ UNIT_TEST(CompileShaders_Test) } } +#endif + UNIT_TEST(MALI_CompileShaders_Test) { struct ReleaseVersion @@ -189,6 +197,7 @@ UNIT_TEST(MALI_CompileShaders_Test) std::vector m_driverSets; }; +#if defined(OMIM_OS_MAC) std::vector const driversES2old = { {"Mali-400_r4p0-00rel1", {{"Mali-200", "r0p1", true}, {"Mali-200", "r0p2", true}, @@ -209,6 +218,7 @@ UNIT_TEST(MALI_CompileShaders_Test) {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true}, {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true}, {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true}}}}; +#endif std::vector const driversES3new = { {"Mali-T600_r3p0-00rel0", @@ -405,10 +415,12 @@ UNIT_TEST(MALI_CompileShaders_Test) driversES2new.insert(driversES2new.end(), driversES3new.begin(), driversES3new.end()); std::vector const compilers = { +#if defined(OMIM_OS_MAC) {dp::ApiVersion::OpenGLES2, GetCompilerPath(kCompilerMaliOpenGLES2), GetCompilerPath(kMaliCompilerOpenGLES2Dir), driversES2old}, +#endif {dp::ApiVersion::OpenGLES2, GetCompilerPath(kCompilerMaliOpenGLES3), GetCompilerPath(kMaliCompilerOpenGLES3Dir), @@ -441,7 +453,7 @@ UNIT_TEST(MALI_CompileShaders_Test) auto procPrepare = [&env](QProcess & p) { p.setProcessEnvironment(env); }; QString shaderType = "-v"; auto argForming = [&](QStringList & args, QString const & fileName) { - args << shaderType// << "-V" + args << shaderType << "-r" << version.m_version << "-c" << version.m_series << "-d" << set.m_driverName << fileName; }; @@ -462,4 +474,3 @@ UNIT_TEST(MALI_CompileShaders_Test) } } } -#endif diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/THIRD-PARTY-LICENSES.txt b/tools/shaders_compiler/linux/mali_compiler_es3/THIRD-PARTY-LICENSES.txt new file mode 100644 index 0000000000..2e7be4e379 --- /dev/null +++ b/tools/shaders_compiler/linux/mali_compiler_es3/THIRD-PARTY-LICENSES.txt @@ -0,0 +1,72 @@ +Mali Offline Compiler 5.2.0 includes the following open source software under the license as designated: + +================================================ + +License: MIT + +Project: dirent.h - dirent API for Microsoft Visual Studio + Copyright (C) 2006-2012 Toni Ronkko + +Project: TCLAP + Copyright (c) 2003, Michael E. Smoot . + Copyright (c) 2004, Michael E. Smoot, Daniel Aarno. + All rights reverved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +================================================ + +License: University of Illinois/NCSA Open Source License + +Project: LLVM + Portions of LLVM are licensed to you under the terms of the University of Illinois/NCSA Open Source License + University of Illinois/NCSA Open Source License + Copyright (c) 2003-2010 University of Illinois at Urbana-Champaign. + All rights reserved. + Developed by: + LLVM Team + University of Illinois at Urbana-Champaign + http://llvm.org + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal with +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + + * Neither the names of the LLVM Team, University of Illinois at + Urbana-Champaign, nor the names of its contributors may be used to + endorse or promote products derived from this Software without specific + prior written permission. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE +SOFTWARE. diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/libcompiler_manager.so b/tools/shaders_compiler/linux/mali_compiler_es3/libcompiler_manager.so new file mode 100644 index 0000000000..4bb0aff3fd Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/libcompiler_manager.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/malisc b/tools/shaders_compiler/linux/mali_compiler_es3/malisc new file mode 100755 index 0000000000..11cf573362 Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/malisc differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-400_r4p0-00rel1.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-400_r4p0-00rel1.so new file mode 100644 index 0000000000..097f1f8ccb Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-400_r4p0-00rel1.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-400_r5p0-01rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-400_r5p0-01rel0.so new file mode 100644 index 0000000000..813615c301 Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-400_r5p0-01rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-400_r6p1-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-400_r6p1-00rel0.so new file mode 100644 index 0000000000..52d8169391 Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-400_r6p1-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-400_r7p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-400_r7p0-00rel0.so new file mode 100644 index 0000000000..52d8169391 Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-400_r7p0-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-Gxx_r3p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-Gxx_r3p0-00rel0.so new file mode 100644 index 0000000000..4c85a77413 Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-Gxx_r3p0-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r10p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r10p0-00rel0.so new file mode 100644 index 0000000000..477673993b Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r10p0-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r11p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r11p0-00rel0.so new file mode 100644 index 0000000000..3026aea4fb Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r11p0-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r12p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r12p0-00rel0.so new file mode 100644 index 0000000000..149c6323b3 Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r12p0-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r13p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r13p0-00rel0.so new file mode 100644 index 0000000000..dedf413021 Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r13p0-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r3p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r3p0-00rel0.so new file mode 100644 index 0000000000..6b71bbdd68 Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r3p0-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r4p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r4p0-00rel0.so new file mode 100644 index 0000000000..2fa475cdec Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r4p0-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r4p1-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r4p1-00rel0.so new file mode 100644 index 0000000000..73836e4256 Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r4p1-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r5p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r5p0-00rel0.so new file mode 100644 index 0000000000..9d05dcbf8f Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r5p0-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r5p1-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r5p1-00rel0.so new file mode 100644 index 0000000000..263bd4a25b Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r5p1-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r6p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r6p0-00rel0.so new file mode 100644 index 0000000000..1346b1bc5a Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r6p0-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r7p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r7p0-00rel0.so new file mode 100644 index 0000000000..8e5eb36362 Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r7p0-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r8p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r8p0-00rel0.so new file mode 100644 index 0000000000..b0090c782b Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r8p0-00rel0.so differ diff --git a/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r9p0-00rel0.so b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r9p0-00rel0.so new file mode 100644 index 0000000000..64482323f7 Binary files /dev/null and b/tools/shaders_compiler/linux/mali_compiler_es3/openglessl/libMali-T600_r9p0-00rel0.so differ diff --git a/tools/shaders_compiler/GLSLESCompiler_Series5.mac b/tools/shaders_compiler/macos/GLSLESCompiler_Series5.mac similarity index 100% rename from tools/shaders_compiler/GLSLESCompiler_Series5.mac rename to tools/shaders_compiler/macos/GLSLESCompiler_Series5.mac diff --git a/tools/shaders_compiler/GLSLESCompiler_Series6.mac b/tools/shaders_compiler/macos/GLSLESCompiler_Series6.mac similarity index 100% rename from tools/shaders_compiler/GLSLESCompiler_Series6.mac rename to tools/shaders_compiler/macos/GLSLESCompiler_Series6.mac diff --git a/tools/shaders_compiler/mali_compiler/libcompiler_manager.dylib b/tools/shaders_compiler/macos/mali_compiler/libcompiler_manager.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler/libcompiler_manager.dylib rename to tools/shaders_compiler/macos/mali_compiler/libcompiler_manager.dylib diff --git a/tools/shaders_compiler/mali_compiler/malisc b/tools/shaders_compiler/macos/mali_compiler/malisc similarity index 100% rename from tools/shaders_compiler/mali_compiler/malisc rename to tools/shaders_compiler/macos/mali_compiler/malisc diff --git a/tools/shaders_compiler/mali_compiler/openglessl/libMali-400_r4p0-00rel1.dylib b/tools/shaders_compiler/macos/mali_compiler/openglessl/libMali-400_r4p0-00rel1.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler/openglessl/libMali-400_r4p0-00rel1.dylib rename to tools/shaders_compiler/macos/mali_compiler/openglessl/libMali-400_r4p0-00rel1.dylib diff --git a/tools/shaders_compiler/mali_compiler/openglessl/libMali-T600_r4p0-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler/openglessl/libMali-T600_r4p0-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler/openglessl/libMali-T600_r4p0-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler/openglessl/libMali-T600_r4p0-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler/openglessl/libMali-T600_r4p1-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler/openglessl/libMali-T600_r4p1-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler/openglessl/libMali-T600_r4p1-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler/openglessl/libMali-T600_r4p1-00rel0.dylib diff --git a/tools/shaders_compiler/macos/mali_compiler_es3/THIRD-PARTY-LICENSES.txt b/tools/shaders_compiler/macos/mali_compiler_es3/THIRD-PARTY-LICENSES.txt new file mode 100644 index 0000000000..2e7be4e379 --- /dev/null +++ b/tools/shaders_compiler/macos/mali_compiler_es3/THIRD-PARTY-LICENSES.txt @@ -0,0 +1,72 @@ +Mali Offline Compiler 5.2.0 includes the following open source software under the license as designated: + +================================================ + +License: MIT + +Project: dirent.h - dirent API for Microsoft Visual Studio + Copyright (C) 2006-2012 Toni Ronkko + +Project: TCLAP + Copyright (c) 2003, Michael E. Smoot . + Copyright (c) 2004, Michael E. Smoot, Daniel Aarno. + All rights reverved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +================================================ + +License: University of Illinois/NCSA Open Source License + +Project: LLVM + Portions of LLVM are licensed to you under the terms of the University of Illinois/NCSA Open Source License + University of Illinois/NCSA Open Source License + Copyright (c) 2003-2010 University of Illinois at Urbana-Champaign. + All rights reserved. + Developed by: + LLVM Team + University of Illinois at Urbana-Champaign + http://llvm.org + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal with +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + + * Neither the names of the LLVM Team, University of Illinois at + Urbana-Champaign, nor the names of its contributors may be used to + endorse or promote products derived from this Software without specific + prior written permission. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE +SOFTWARE. diff --git a/tools/shaders_compiler/mali_compiler_es3/libcompiler_manager.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/libcompiler_manager.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/libcompiler_manager.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/libcompiler_manager.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/malisc b/tools/shaders_compiler/macos/mali_compiler_es3/malisc similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/malisc rename to tools/shaders_compiler/macos/mali_compiler_es3/malisc diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-400_r4p0-00rel1.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-400_r4p0-00rel1.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-400_r4p0-00rel1.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-400_r4p0-00rel1.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-400_r5p0-01rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-400_r5p0-01rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-400_r5p0-01rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-400_r5p0-01rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-400_r6p1-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-400_r6p1-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-400_r6p1-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-400_r6p1-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-400_r7p0-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-400_r7p0-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-400_r7p0-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-400_r7p0-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r10p0-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r10p0-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r10p0-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r10p0-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r11p0-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r11p0-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r11p0-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r11p0-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r12p0-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r12p0-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r12p0-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r12p0-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r13p0-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r13p0-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r13p0-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r13p0-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r4p0-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r4p0-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r4p0-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r4p0-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r4p1-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r4p1-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r4p1-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r4p1-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r5p0-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r5p0-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r5p0-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r5p0-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r5p1-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r5p1-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r5p1-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r5p1-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r6p0-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r6p0-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r6p0-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r6p0-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r7p0-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r7p0-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r7p0-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r7p0-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r8p0-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r8p0-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r8p0-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r8p0-00rel0.dylib diff --git a/tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r9p0-00rel0.dylib b/tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r9p0-00rel0.dylib similarity index 100% rename from tools/shaders_compiler/mali_compiler_es3/openglessl/libMali-T600_r9p0-00rel0.dylib rename to tools/shaders_compiler/macos/mali_compiler_es3/openglessl/libMali-T600_r9p0-00rel0.dylib