mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-19 21:13:35 +00:00
Format all C++ and Java code via clang-format
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
@@ -150,8 +150,7 @@ std::string GetDumpFilePath()
|
||||
}
|
||||
} // namespace
|
||||
|
||||
VulkanPipeline::VulkanPipeline(VkDevice device, uint32_t appVersionCode)
|
||||
: m_appVersionCode(appVersionCode)
|
||||
VulkanPipeline::VulkanPipeline(VkDevice device, uint32_t appVersionCode) : m_appVersionCode(appVersionCode)
|
||||
{
|
||||
// Read dump.
|
||||
std::vector<uint8_t> dumpData;
|
||||
@@ -177,8 +176,7 @@ VulkanPipeline::VulkanPipeline(VkDevice device, uint32_t appVersionCode)
|
||||
}
|
||||
catch (FileReader::Exception const & exception)
|
||||
{
|
||||
LOG(LWARNING, ("Exception while reading file:", dumpFilePath,
|
||||
"reason:", exception.what()));
|
||||
LOG(LWARNING, ("Exception while reading file:", dumpFilePath, "reason:", exception.what()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -230,16 +228,14 @@ void VulkanPipeline::Dump(VkDevice device)
|
||||
}
|
||||
catch (FileWriter::Exception const & exception)
|
||||
{
|
||||
LOG(LWARNING, ("Exception while writing file:", dumpFilePath,
|
||||
"reason:", exception.what()));
|
||||
LOG(LWARNING, ("Exception while writing file:", dumpFilePath, "reason:", exception.what()));
|
||||
}
|
||||
m_isChanged = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG(LWARNING, ("Maximum pipeline cache size exceeded (", cacheSize, "/", kMaxCacheSizeInBytes,
|
||||
"bytes)"));
|
||||
LOG(LWARNING, ("Maximum pipeline cache size exceeded (", cacheSize, "/", kMaxCacheSizeInBytes, "bytes)"));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -299,8 +295,8 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
|
||||
|
||||
// Blending.
|
||||
VkPipelineColorBlendAttachmentState pipelineColorBlendAttachmentState = {};
|
||||
pipelineColorBlendAttachmentState.colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT |
|
||||
VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT;
|
||||
pipelineColorBlendAttachmentState.colorWriteMask =
|
||||
VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT;
|
||||
pipelineColorBlendAttachmentState.blendEnable = key.m_blendingEnabled ? VK_TRUE : VK_FALSE;
|
||||
if (key.m_blendingEnabled)
|
||||
{
|
||||
@@ -328,9 +324,8 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
|
||||
multisampleStateCreateInfo.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT;
|
||||
|
||||
// Dynamic.
|
||||
static std::array<VkDynamicState, 4> dynamicState = {
|
||||
VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR, VK_DYNAMIC_STATE_LINE_WIDTH,
|
||||
VK_DYNAMIC_STATE_STENCIL_REFERENCE};
|
||||
static std::array<VkDynamicState, 4> dynamicState = {VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR,
|
||||
VK_DYNAMIC_STATE_LINE_WIDTH, VK_DYNAMIC_STATE_STENCIL_REFERENCE};
|
||||
VkPipelineDynamicStateCreateInfo dynamicStateCreateInfo = {};
|
||||
dynamicStateCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
|
||||
dynamicStateCreateInfo.pDynamicStates = dynamicState.data();
|
||||
@@ -356,8 +351,8 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
|
||||
BindingDecl const & bindingDecl = key.m_bindingInfo[i].GetBindingDecl(j);
|
||||
attributeDescriptions[bindingCounter].location = bindingCounter;
|
||||
attributeDescriptions[bindingCounter].binding = static_cast<uint32_t>(i);
|
||||
attributeDescriptions[bindingCounter].format = GetAttributeFormat(bindingDecl.m_componentCount,
|
||||
bindingDecl.m_componentType);
|
||||
attributeDescriptions[bindingCounter].format =
|
||||
GetAttributeFormat(bindingDecl.m_componentCount, bindingDecl.m_componentType);
|
||||
attributeDescriptions[bindingCounter].offset = bindingDecl.m_offset;
|
||||
|
||||
bindingCounter++;
|
||||
@@ -378,8 +373,7 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
|
||||
if (key.m_depthStencil.m_depthEnabled)
|
||||
{
|
||||
depthStencilState.depthWriteEnable = VK_TRUE;
|
||||
depthStencilState.depthCompareOp =
|
||||
DecodeTestFunction(static_cast<uint8_t>(key.m_depthStencil.m_depthFunction));
|
||||
depthStencilState.depthCompareOp = DecodeTestFunction(static_cast<uint8_t>(key.m_depthStencil.m_depthFunction));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -391,25 +385,25 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
|
||||
{
|
||||
depthStencilState.stencilTestEnable = VK_TRUE;
|
||||
depthStencilState.front.compareOp =
|
||||
DecodeTestFunction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontFunctionByte));
|
||||
DecodeTestFunction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontFunctionByte));
|
||||
depthStencilState.front.failOp =
|
||||
DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontFailActionByte));
|
||||
depthStencilState.front.depthFailOp = DecodeStencilAction(
|
||||
GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontDepthFailActionByte));
|
||||
DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontFailActionByte));
|
||||
depthStencilState.front.depthFailOp =
|
||||
DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontDepthFailActionByte));
|
||||
depthStencilState.front.passOp =
|
||||
DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontPassActionByte));
|
||||
DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontPassActionByte));
|
||||
depthStencilState.front.writeMask = 0xffffffff;
|
||||
depthStencilState.front.compareMask = 0xffffffff;
|
||||
depthStencilState.front.reference = 1;
|
||||
|
||||
depthStencilState.back.compareOp =
|
||||
DecodeTestFunction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackFunctionByte));
|
||||
DecodeTestFunction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackFunctionByte));
|
||||
depthStencilState.back.failOp =
|
||||
DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackFailActionByte));
|
||||
depthStencilState.back.depthFailOp = DecodeStencilAction(
|
||||
GetStateByte(key.m_depthStencil.m_stencil, kStencilBackDepthFailActionByte));
|
||||
DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackFailActionByte));
|
||||
depthStencilState.back.depthFailOp =
|
||||
DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackDepthFailActionByte));
|
||||
depthStencilState.back.passOp =
|
||||
DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackPassActionByte));
|
||||
DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackPassActionByte));
|
||||
depthStencilState.back.writeMask = 0xffffffff;
|
||||
depthStencilState.back.compareMask = 0xffffffff;
|
||||
depthStencilState.back.reference = 1;
|
||||
@@ -442,8 +436,8 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
|
||||
pipelineCreateInfo.pStages = shaders.data();
|
||||
|
||||
VkPipeline pipeline;
|
||||
auto const result = vkCreateGraphicsPipelines(device, m_vulkanPipelineCache, 1,
|
||||
&pipelineCreateInfo, nullptr, &pipeline);
|
||||
auto const result =
|
||||
vkCreateGraphicsPipelines(device, m_vulkanPipelineCache, 1, &pipelineCreateInfo, nullptr, &pipeline);
|
||||
if (result == VK_INCOMPLETE)
|
||||
{
|
||||
// Some Adreno GPUs return this not standard compliant code.
|
||||
@@ -467,17 +461,17 @@ void VulkanPipeline::DepthStencilKey::SetDepthTestEnabled(bool enabled)
|
||||
{
|
||||
m_depthEnabled = enabled;
|
||||
}
|
||||
|
||||
|
||||
void VulkanPipeline::DepthStencilKey::SetDepthTestFunction(TestFunction depthFunction)
|
||||
{
|
||||
m_depthFunction = depthFunction;
|
||||
}
|
||||
|
||||
|
||||
void VulkanPipeline::DepthStencilKey::SetStencilTestEnabled(bool enabled)
|
||||
{
|
||||
m_stencilEnabled = enabled;
|
||||
}
|
||||
|
||||
|
||||
void VulkanPipeline::DepthStencilKey::SetStencilFunction(StencilFace face, TestFunction stencilFunction)
|
||||
{
|
||||
switch (face)
|
||||
@@ -494,7 +488,7 @@ void VulkanPipeline::DepthStencilKey::SetStencilFunction(StencilFace face, TestF
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void VulkanPipeline::DepthStencilKey::SetStencilActions(StencilFace face, StencilAction stencilFailAction,
|
||||
StencilAction depthFailAction, StencilAction passAction)
|
||||
{
|
||||
@@ -525,13 +519,13 @@ bool VulkanPipeline::DepthStencilKey::operator<(DepthStencilKey const & rhs) con
|
||||
{
|
||||
if (m_depthEnabled != rhs.m_depthEnabled)
|
||||
return m_depthEnabled < rhs.m_depthEnabled;
|
||||
|
||||
|
||||
if (m_stencilEnabled != rhs.m_stencilEnabled)
|
||||
return m_stencilEnabled < rhs.m_stencilEnabled;
|
||||
|
||||
|
||||
if (m_depthFunction != rhs.m_depthFunction)
|
||||
return m_depthFunction < rhs.m_depthFunction;
|
||||
|
||||
|
||||
return m_stencil < rhs.m_stencil;
|
||||
}
|
||||
|
||||
@@ -548,7 +542,7 @@ bool VulkanPipeline::PipelineKey::operator<(PipelineKey const & rhs) const
|
||||
|
||||
if (m_program != rhs.m_program)
|
||||
return m_program < rhs.m_program;
|
||||
|
||||
|
||||
if (m_depthStencil != rhs.m_depthStencil)
|
||||
return m_depthStencil < rhs.m_depthStencil;
|
||||
|
||||
@@ -556,10 +550,8 @@ bool VulkanPipeline::PipelineKey::operator<(PipelineKey const & rhs) const
|
||||
return m_bindingInfoCount < rhs.m_bindingInfoCount;
|
||||
|
||||
for (uint8_t i = 0; i < m_bindingInfoCount; ++i)
|
||||
{
|
||||
if (m_bindingInfo[i] != rhs.m_bindingInfo[i])
|
||||
return m_bindingInfo[i] < rhs.m_bindingInfo[i];
|
||||
}
|
||||
|
||||
if (m_primitiveTopology != rhs.m_primitiveTopology)
|
||||
return m_primitiveTopology < rhs.m_primitiveTopology;
|
||||
|
||||
Reference in New Issue
Block a user