diff --git a/native/cocos/renderer/gfx-base/GFXDef-common.h b/native/cocos/renderer/gfx-base/GFXDef-common.h index ad63150bbe..48abe7b38c 100644 --- a/native/cocos/renderer/gfx-base/GFXDef-common.h +++ b/native/cocos/renderer/gfx-base/GFXDef-common.h @@ -1121,12 +1121,12 @@ struct InputAssemblerInfo { }; struct ALIGNAS(8) ColorAttachment { - Format format{Format::UNKNOWN}; - SampleCount sampleCount{SampleCount::ONE}; - LoadOp loadOp{LoadOp::CLEAR}; - StoreOp storeOp{StoreOp::STORE}; + Format format{Format::UNKNOWN}; + SampleCount sampleCount{SampleCount::ONE}; + LoadOp loadOp{LoadOp::CLEAR}; + StoreOp storeOp{StoreOp::STORE}; GeneralBarrier *barrier{nullptr}; - uint32_t isGeneralLayout{0}; // @ts-boolean + uint32_t isGeneralLayout{0}; // @ts-boolean #if CC_CPU_ARCH == CC_CPU_ARCH_64 uint32_t _padding{0}; #endif @@ -1135,14 +1135,14 @@ struct ALIGNAS(8) ColorAttachment { using ColorAttachmentList = vector; struct ALIGNAS(8) DepthStencilAttachment { - Format format{Format::UNKNOWN}; - SampleCount sampleCount{SampleCount::ONE}; - LoadOp depthLoadOp{LoadOp::CLEAR}; - StoreOp depthStoreOp{StoreOp::STORE}; - LoadOp stencilLoadOp{LoadOp::CLEAR}; - StoreOp stencilStoreOp{StoreOp::STORE}; + Format format{Format::UNKNOWN}; + SampleCount sampleCount{SampleCount::ONE}; + LoadOp depthLoadOp{LoadOp::CLEAR}; + StoreOp depthStoreOp{StoreOp::STORE}; + LoadOp stencilLoadOp{LoadOp::CLEAR}; + StoreOp stencilStoreOp{StoreOp::STORE}; GeneralBarrier *barrier{nullptr}; - uint32_t isGeneralLayout{0}; // @ts-boolean + uint32_t isGeneralLayout{0}; // @ts-boolean #if CC_CPU_ARCH == CC_CPU_ARCH_64 uint32_t _padding{0}; #endif @@ -1163,8 +1163,8 @@ struct SubpassInfo { using SubpassInfoList = vector; struct ALIGNAS(8) SubpassDependency { - uint32_t srcSubpass{0}; - uint32_t dstSubpass{0}; + uint32_t srcSubpass{0}; + uint32_t dstSubpass{0}; GeneralBarrier *barrier{nullptr}; #if CC_CPU_ARCH == CC_CPU_ARCH_32 uint32_t _padding{0}; diff --git a/native/cocos/renderer/gfx-base/GFXTexture.cpp b/native/cocos/renderer/gfx-base/GFXTexture.cpp index 25684f9678..b360eda1cd 100644 --- a/native/cocos/renderer/gfx-base/GFXTexture.cpp +++ b/native/cocos/renderer/gfx-base/GFXTexture.cpp @@ -125,8 +125,8 @@ void Texture::initialize(const SwapchainTextureInfo &info, Texture *out) { out->_info.samples = SampleCount::ONE; out->_info.flags = TextureFlagBit::NONE; out->_info.usage = GFX_FORMAT_INFOS[toNumber(info.format)].hasDepth - ? TextureUsageBit::DEPTH_STENCIL_ATTACHMENT - : TextureUsageBit::COLOR_ATTACHMENT; + ? TextureUsageBit::DEPTH_STENCIL_ATTACHMENT + : TextureUsageBit::COLOR_ATTACHMENT; out->_swapchain = info.swapchain; out->_size = formatSize(info.format, info.width, info.height, 1); diff --git a/native/cocos/renderer/gfx-gles3/GLES3Device.h b/native/cocos/renderer/gfx-gles3/GLES3Device.h index dd15d5c5db..f7eaf91fb1 100644 --- a/native/cocos/renderer/gfx-gles3/GLES3Device.h +++ b/native/cocos/renderer/gfx-gles3/GLES3Device.h @@ -107,7 +107,7 @@ protected: PipelineLayout * createPipelineLayout() override; PipelineState * createPipelineState() override; - Sampler * createSampler(const SamplerInfo &info) override; + Sampler * createSampler(const SamplerInfo &info) override; GeneralBarrier *createGeneralBarrier(const GeneralBarrierInfo &info) override; void copyBuffersToTexture(const uint8_t *const *buffers, Texture *dst, const BufferTextureCopy *regions, uint32_t count) override; diff --git a/native/cocos/renderer/gfx-vulkan/VKCommands.cpp b/native/cocos/renderer/gfx-vulkan/VKCommands.cpp index 3c0039983b..c20eb0ae02 100644 --- a/native/cocos/renderer/gfx-vulkan/VKCommands.cpp +++ b/native/cocos/renderer/gfx-vulkan/VKCommands.cpp @@ -453,7 +453,7 @@ void cmdFuncCCVKCreateRenderPass(CCVKDevice *device, CCVKGPURenderPass *gpuRende VkImageAspectFlags aspect = GFX_FORMAT_INFOS[toNumber(dsFormat)].hasStencil ? VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT : VK_IMAGE_ASPECT_DEPTH_BIT; - VkImageLayout layout = isGeneralLayout ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + VkImageLayout layout = isGeneralLayout ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; attachmentReferences.push_back({VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2, nullptr, subpassInfo.depthStencil, layout, aspect}); } @@ -473,7 +473,7 @@ void cmdFuncCCVKCreateRenderPass(CCVKDevice *device, CCVKGPURenderPass *gpuRende VkImageAspectFlags aspect = GFX_FORMAT_INFOS[toNumber(dsFormat)].hasStencil ? VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT : VK_IMAGE_ASPECT_DEPTH_BIT; - VkImageLayout layout = isGeneralLayout ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + VkImageLayout layout = isGeneralLayout ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; attachmentReferences.push_back({VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2, nullptr, subpassInfo.depthStencilResolve, layout, aspect}); }