style: reformat C/C++ sources and headers with clang-format
Run clang-format over all project C/C++ source and header files (.c, .cpp, .cc, .h, .hpp, .hh, .m, .mm) under app/ and tests/. Non-source files (svg, qm, qrc, etc.) were not touched.
This commit is contained in:
@@ -21,7 +21,8 @@ TEST(DynamicRenderBackend, LoadsExperimentalOpenGLBackend)
|
||||
#else
|
||||
olive::DynamicRenderer renderer(QStringLiteral("opengl"));
|
||||
if (!renderer.Load()) {
|
||||
GTEST_SKIP() << "opengl backend library could not be loaded in this environment";
|
||||
GTEST_SKIP()
|
||||
<< "opengl backend library could not be loaded in this environment";
|
||||
}
|
||||
|
||||
EXPECT_EQ(renderer.OpenGLContext(), nullptr);
|
||||
@@ -48,11 +49,13 @@ TEST(DynamicRenderBackend, OpenGLBackendFollowsAdapterToRenderThread)
|
||||
#else
|
||||
olive::DynamicRenderer renderer(QStringLiteral("opengl"));
|
||||
if (!renderer.Load()) {
|
||||
GTEST_SKIP() << "opengl backend library could not be loaded in this environment";
|
||||
GTEST_SKIP()
|
||||
<< "opengl backend library could not be loaded in this environment";
|
||||
}
|
||||
|
||||
if (!renderer.Init()) {
|
||||
GTEST_SKIP() << "OpenGL backend could not be initialized on this system";
|
||||
GTEST_SKIP()
|
||||
<< "OpenGL backend could not be initialized on this system";
|
||||
}
|
||||
|
||||
QThread render_thread;
|
||||
@@ -71,9 +74,9 @@ TEST(DynamicRenderBackend, OpenGLBackendFollowsAdapterToRenderThread)
|
||||
&renderer,
|
||||
[&]() {
|
||||
renderer.PostInit();
|
||||
texture = renderer.CreateTexture(olive::VideoParams(
|
||||
64, 64, olive::PixelFormat::U8,
|
||||
olive::VideoParams::kRGBAChannelCount));
|
||||
texture = renderer.CreateTexture(
|
||||
olive::VideoParams(64, 64, olive::PixelFormat::U8,
|
||||
olive::VideoParams::kRGBAChannelCount));
|
||||
},
|
||||
Qt::BlockingQueuedConnection);
|
||||
|
||||
@@ -94,7 +97,8 @@ TEST(DynamicRenderBackend, LoadsExperimentalVulkanBackendWhenAvailable)
|
||||
#else
|
||||
olive::DynamicRenderer renderer(QStringLiteral("vulkan"));
|
||||
if (!renderer.Load()) {
|
||||
GTEST_SKIP() << "vulkan backend library could not be loaded in this environment";
|
||||
GTEST_SKIP()
|
||||
<< "vulkan backend library could not be loaded in this environment";
|
||||
}
|
||||
|
||||
OakRenderBackendInfo info = {};
|
||||
@@ -121,13 +125,15 @@ TEST(DynamicRenderBackend, FallsBackWhenExperimentalVulkanUnavailable)
|
||||
#else
|
||||
olive::DynamicRenderer renderer(QStringLiteral("vulkan"));
|
||||
if (!renderer.Load()) {
|
||||
GTEST_SKIP() << "vulkan backend library could not be loaded in this environment";
|
||||
GTEST_SKIP()
|
||||
<< "vulkan backend library could not be loaded in this environment";
|
||||
}
|
||||
|
||||
OakRenderBackendInfo info = {};
|
||||
ASSERT_TRUE(renderer.GetBackendInfo(&info));
|
||||
if (info.kind == OAK_RENDER_BACKEND_VULKAN) {
|
||||
GTEST_SKIP() << "Vulkan backend is available on this system; skip fallback test";
|
||||
GTEST_SKIP()
|
||||
<< "Vulkan backend is available on this system; skip fallback test";
|
||||
}
|
||||
EXPECT_EQ(renderer.backend_name(), QStringLiteral("opengl"));
|
||||
EXPECT_EQ(renderer.OpenGLContext(), nullptr);
|
||||
@@ -145,7 +151,8 @@ TEST(DynamicRenderBackend, VulkanUploadBlitDownload)
|
||||
#else
|
||||
olive::DynamicRenderer renderer(QStringLiteral("vulkan"));
|
||||
if (!renderer.Load()) {
|
||||
GTEST_SKIP() << "vulkan backend library could not be loaded in this environment";
|
||||
GTEST_SKIP()
|
||||
<< "vulkan backend library could not be loaded in this environment";
|
||||
}
|
||||
|
||||
OakRenderBackendInfo info = {};
|
||||
@@ -168,8 +175,8 @@ TEST(DynamicRenderBackend, VulkanUploadBlitDownload)
|
||||
QByteArray src_data(kSize * kSize * 4, 0);
|
||||
for (int i = 0; i < kSize * kSize; ++i) {
|
||||
src_data[i * 4 + 0] = static_cast<char>(255); // R
|
||||
src_data[i * 4 + 1] = static_cast<char>(0); // G
|
||||
src_data[i * 4 + 2] = static_cast<char>(0); // B
|
||||
src_data[i * 4 + 1] = static_cast<char>(0); // G
|
||||
src_data[i * 4 + 2] = static_cast<char>(0); // B
|
||||
src_data[i * 4 + 3] = static_cast<char>(255); // A
|
||||
}
|
||||
src->Upload(src_data.data(), kSize);
|
||||
@@ -178,23 +185,24 @@ TEST(DynamicRenderBackend, VulkanUploadBlitDownload)
|
||||
ASSERT_NE(dst, nullptr);
|
||||
ASSERT_FALSE(dst->IsDummy());
|
||||
|
||||
const QString vert = QStringLiteral(
|
||||
"uniform mat4 ove_mvpmat;\n"
|
||||
"in vec4 a_position;\n"
|
||||
"in vec2 a_texcoord;\n"
|
||||
"out vec2 ove_texcoord;\n"
|
||||
"void main() {\n"
|
||||
" gl_Position = ove_mvpmat * a_position;\n"
|
||||
" ove_texcoord = a_texcoord;\n"
|
||||
"}\n");
|
||||
const QString frag = QStringLiteral(
|
||||
"uniform sampler2D ove_maintex;\n"
|
||||
"in vec2 ove_texcoord;\n"
|
||||
"out vec4 frag_color;\n"
|
||||
"void main() {\n"
|
||||
" frag_color = texture(ove_maintex, ove_texcoord);\n"
|
||||
"}\n");
|
||||
QVariant shader = renderer.CreateNativeShader(olive::ShaderCode(frag, vert));
|
||||
const QString vert =
|
||||
QStringLiteral("uniform mat4 ove_mvpmat;\n"
|
||||
"in vec4 a_position;\n"
|
||||
"in vec2 a_texcoord;\n"
|
||||
"out vec2 ove_texcoord;\n"
|
||||
"void main() {\n"
|
||||
" gl_Position = ove_mvpmat * a_position;\n"
|
||||
" ove_texcoord = a_texcoord;\n"
|
||||
"}\n");
|
||||
const QString frag =
|
||||
QStringLiteral("uniform sampler2D ove_maintex;\n"
|
||||
"in vec2 ove_texcoord;\n"
|
||||
"out vec4 frag_color;\n"
|
||||
"void main() {\n"
|
||||
" frag_color = texture(ove_maintex, ove_texcoord);\n"
|
||||
"}\n");
|
||||
QVariant shader =
|
||||
renderer.CreateNativeShader(olive::ShaderCode(frag, vert));
|
||||
ASSERT_FALSE(shader.isNull());
|
||||
|
||||
olive::ShaderJob job;
|
||||
@@ -226,7 +234,8 @@ TEST(DynamicRenderBackend, VulkanNullDestinationBlitDoesNotCrash)
|
||||
#else
|
||||
olive::DynamicRenderer renderer(QStringLiteral("vulkan"));
|
||||
if (!renderer.Load()) {
|
||||
GTEST_SKIP() << "vulkan backend library could not be loaded in this environment";
|
||||
GTEST_SKIP()
|
||||
<< "vulkan backend library could not be loaded in this environment";
|
||||
}
|
||||
|
||||
OakRenderBackendInfo info = {};
|
||||
@@ -253,23 +262,24 @@ TEST(DynamicRenderBackend, VulkanNullDestinationBlitDoesNotCrash)
|
||||
}
|
||||
src->Upload(src_data.data(), kSize);
|
||||
|
||||
const QString vert = QStringLiteral(
|
||||
"uniform mat4 ove_mvpmat;\n"
|
||||
"in vec4 a_position;\n"
|
||||
"in vec2 a_texcoord;\n"
|
||||
"out vec2 ove_texcoord;\n"
|
||||
"void main() {\n"
|
||||
" gl_Position = ove_mvpmat * a_position;\n"
|
||||
" ove_texcoord = a_texcoord;\n"
|
||||
"}\n");
|
||||
const QString frag = QStringLiteral(
|
||||
"uniform sampler2D ove_maintex;\n"
|
||||
"in vec2 ove_texcoord;\n"
|
||||
"out vec4 frag_color;\n"
|
||||
"void main() {\n"
|
||||
" frag_color = texture(ove_maintex, ove_texcoord);\n"
|
||||
"}\n");
|
||||
QVariant shader = renderer.CreateNativeShader(olive::ShaderCode(frag, vert));
|
||||
const QString vert =
|
||||
QStringLiteral("uniform mat4 ove_mvpmat;\n"
|
||||
"in vec4 a_position;\n"
|
||||
"in vec2 a_texcoord;\n"
|
||||
"out vec2 ove_texcoord;\n"
|
||||
"void main() {\n"
|
||||
" gl_Position = ove_mvpmat * a_position;\n"
|
||||
" ove_texcoord = a_texcoord;\n"
|
||||
"}\n");
|
||||
const QString frag =
|
||||
QStringLiteral("uniform sampler2D ove_maintex;\n"
|
||||
"in vec2 ove_texcoord;\n"
|
||||
"out vec4 frag_color;\n"
|
||||
"void main() {\n"
|
||||
" frag_color = texture(ove_maintex, ove_texcoord);\n"
|
||||
"}\n");
|
||||
QVariant shader =
|
||||
renderer.CreateNativeShader(olive::ShaderCode(frag, vert));
|
||||
ASSERT_FALSE(shader.isNull());
|
||||
|
||||
olive::ShaderJob job;
|
||||
@@ -294,7 +304,8 @@ TEST(DynamicRenderBackend, VulkanIterativeBlitPingPong)
|
||||
#else
|
||||
olive::DynamicRenderer renderer(QStringLiteral("vulkan"));
|
||||
if (!renderer.Load()) {
|
||||
GTEST_SKIP() << "vulkan backend library could not be loaded in this environment";
|
||||
GTEST_SKIP()
|
||||
<< "vulkan backend library could not be loaded in this environment";
|
||||
}
|
||||
|
||||
OakRenderBackendInfo info = {};
|
||||
@@ -327,24 +338,25 @@ TEST(DynamicRenderBackend, VulkanIterativeBlitPingPong)
|
||||
ASSERT_FALSE(dst->IsDummy());
|
||||
|
||||
// Shader that samples the iterative input and scales RGB by 0.5 each pass.
|
||||
const QString vert = QStringLiteral(
|
||||
"uniform mat4 ove_mvpmat;\n"
|
||||
"in vec4 a_position;\n"
|
||||
"in vec2 a_texcoord;\n"
|
||||
"out vec2 ove_texcoord;\n"
|
||||
"void main() {\n"
|
||||
" gl_Position = ove_mvpmat * a_position;\n"
|
||||
" ove_texcoord = a_texcoord;\n"
|
||||
"}\n");
|
||||
const QString frag = QStringLiteral(
|
||||
"uniform sampler2D ove_maintex;\n"
|
||||
"in vec2 ove_texcoord;\n"
|
||||
"out vec4 frag_color;\n"
|
||||
"void main() {\n"
|
||||
" vec4 c = texture(ove_maintex, ove_texcoord);\n"
|
||||
" frag_color = vec4(c.rgb * 0.5, c.a);\n"
|
||||
"}\n");
|
||||
QVariant shader = renderer.CreateNativeShader(olive::ShaderCode(frag, vert));
|
||||
const QString vert =
|
||||
QStringLiteral("uniform mat4 ove_mvpmat;\n"
|
||||
"in vec4 a_position;\n"
|
||||
"in vec2 a_texcoord;\n"
|
||||
"out vec2 ove_texcoord;\n"
|
||||
"void main() {\n"
|
||||
" gl_Position = ove_mvpmat * a_position;\n"
|
||||
" ove_texcoord = a_texcoord;\n"
|
||||
"}\n");
|
||||
const QString frag =
|
||||
QStringLiteral("uniform sampler2D ove_maintex;\n"
|
||||
"in vec2 ove_texcoord;\n"
|
||||
"out vec4 frag_color;\n"
|
||||
"void main() {\n"
|
||||
" vec4 c = texture(ove_maintex, ove_texcoord);\n"
|
||||
" frag_color = vec4(c.rgb * 0.5, c.a);\n"
|
||||
"}\n");
|
||||
QVariant shader =
|
||||
renderer.CreateNativeShader(olive::ShaderCode(frag, vert));
|
||||
ASSERT_FALSE(shader.isNull());
|
||||
|
||||
olive::ShaderJob job;
|
||||
@@ -378,7 +390,8 @@ TEST(DynamicRenderBackend, VulkanUploadDownloadThreeChannel)
|
||||
#else
|
||||
olive::DynamicRenderer renderer(QStringLiteral("vulkan"));
|
||||
if (!renderer.Load()) {
|
||||
GTEST_SKIP() << "vulkan backend library could not be loaded in this environment";
|
||||
GTEST_SKIP()
|
||||
<< "vulkan backend library could not be loaded in this environment";
|
||||
}
|
||||
|
||||
OakRenderBackendInfo info = {};
|
||||
|
||||
Reference in New Issue
Block a user