mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-20 13:23:59 +00:00
[Drape] Remove GLES2-related code
Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
This commit is contained in:
committed by
Konstantin Pastbin
parent
705c715356
commit
b23c2ba3e3
@@ -10,9 +10,9 @@
|
||||
|
||||
using namespace std::placeholders;
|
||||
|
||||
void CompileShaders(bool apiOpenGLES3, bool enableVTF)
|
||||
void CompileShaders(bool enableVTF)
|
||||
{
|
||||
auto const api = apiOpenGLES3 ? dp::ApiVersion::OpenGLES3 : dp::ApiVersion::OpenGLES2;
|
||||
auto constexpr api = dp::ApiVersion::OpenGLES3;
|
||||
GLFunctions::Init(api);
|
||||
gpu::GLProgramPool pool(api);
|
||||
if (enableVTF)
|
||||
@@ -24,29 +24,17 @@ void CompileShaders(bool apiOpenGLES3, bool enableVTF)
|
||||
|
||||
// These unit tests create Qt application and OGL context so can't be run in GUI-less Linux machine.
|
||||
#ifdef OMIM_OS_MAC
|
||||
UNIT_TEST(DesktopCompileShaders_GLES2_Test)
|
||||
{
|
||||
RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES2_Test", false /* apiOpenGLES3 */,
|
||||
std::bind(&CompileShaders, _1, false /* enableVTF */));
|
||||
}
|
||||
|
||||
UNIT_TEST(DesktopCompileShaders_GLES3_Test)
|
||||
{
|
||||
RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES3_Test", true /* apiOpenGLES3 */,
|
||||
std::bind(&CompileShaders, _1, false /* enableVTF */));
|
||||
RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES3_Test",
|
||||
std::bind(&CompileShaders, false /* enableVTF */));
|
||||
|
||||
}
|
||||
|
||||
UNIT_TEST(DesktopCompileShaders_GLES2_VTF_Test)
|
||||
{
|
||||
RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES2_VTF_Test", false /* apiOpenGLES3 */,
|
||||
std::bind(&CompileShaders, _1, true /* enableVTF */));
|
||||
}
|
||||
|
||||
UNIT_TEST(DesktopCompileShaders_GLES3_VTF_Test)
|
||||
{
|
||||
RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES3_VTF_Test", true /* apiOpenGLES3 */,
|
||||
std::bind(&CompileShaders, _1, true /* enableVTF */));
|
||||
RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES3_VTF_Test",
|
||||
std::bind(&CompileShaders, true /* enableVTF */));
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user