drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 21:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor shaders to use GLES3 syntax

Browse Source 
Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
This commit is contained in:
renderexpert
2025-01-21 14:39:31 +00:00
committed by Konstantin Pastbin
parent b23c2ba3e3
commit 897d7a253d
84 changed files with 471 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
View File

@@ -150,14 +150,12 @@ void CompileShaders(CompilerData const & compiler, std::string const & additiona
args << fileName;
};
std::string const defines = compiler.m_apiVersion == dp::ApiVersion::OpenGLES3 ?
"#define GLES3\n" + additionalDefines : additionalDefines;
TestShaders(compiler.m_apiVersion, defines, ".vert", GetVertexShaders(compiler.m_apiVersion),
TestShaders(compiler.m_apiVersion, additionalDefines, ".vert", GetVertexShaders(compiler.m_apiVersion),
compilerPath, [](QProcess const &) {}, argsPrepareFn, successChecker, ss);
TestShaders(compiler.m_apiVersion, defines, ".frag", GetFragmentShaders(compiler.m_apiVersion),
TestShaders(compiler.m_apiVersion, additionalDefines, ".frag", GetFragmentShaders(compiler.m_apiVersion),
compilerPath, [](QProcess const &) {}, argsPrepareFn, successChecker, ss);
TEST_EQUAL(errorLog.isEmpty(), true, ("Defines:", defines, additionalDefines, "\n", errorLog));
TEST_EQUAL(errorLog.isEmpty(), true, ("Defines:", additionalDefines, "\n", errorLog));
}
UNIT_TEST(MobileCompileShaders_Test)
@@ -173,11 +171,6 @@ UNIT_TEST(MobileCompileShaders_Test)
"#define ENABLE_VTF\n");
});
workerThread.Push([] {
CompileShaders({dp::ApiVersion::OpenGLES3, GetCompilerPath(kCompilerOpenGLES)},
"#define SAMSUNG_GOOGLE_NEXUS\n");
});
workerThread.Shutdown(base::DelayedThreadPool::Exit::ExecPending);
}
@@ -223,19 +216,16 @@ void MaliCompileShaders(MaliCompilerData const & compiler, MaliDriverSet const &
<< "-r" << version.m_version << "-c" << version.m_series << "-d" << driverSet.m_driverName
<< fileName;
};
std::string const defines =
compiler.m_apiVersion == dp::ApiVersion::OpenGLES3 ? "#define GLES3\n" : "";
QString const compilerPath = QString::fromStdString(compiler.m_compilerPath);
TestShaders(compiler.m_apiVersion, defines, {}, GetVertexShaders(compiler.m_apiVersion),
TestShaders(compiler.m_apiVersion, "", {}, GetVertexShaders(compiler.m_apiVersion),
compilerPath, procPrepare, argForming, successChecker, ss);
shaderType = "-f";
TestShaders(compiler.m_apiVersion, defines, {}, GetFragmentShaders(compiler.m_apiVersion),
TestShaders(compiler.m_apiVersion, "", {}, GetFragmentShaders(compiler.m_apiVersion),
compilerPath, procPrepare, argForming, successChecker, ss);
TEST(errorLog.isEmpty(),
(shaderType, version.m_series, version.m_version, driverSet.m_driverName, defines, errorLog));
(shaderType, version.m_series, version.m_version, driverSet.m_driverName, "", errorLog));
// MALI GPUs do not support ENABLE_VTF. Do not test it here.
// SAMSUNG_GOOGLE_NEXUS doesn't use Mali GPU. Do not test it here.
}
UNIT_TEST(MALI_MobileCompileShaders_Test)