diff --git a/chip/ps4_gpu_regs.pas b/chip/ps4_gpu_regs.pas index 2756ac5..bd90abe 100644 --- a/chip/ps4_gpu_regs.pas +++ b/chip/ps4_gpu_regs.pas @@ -786,7 +786,7 @@ begin COLOR_8_8_8_8: Case RENDER_TARGET[i].INFO.NUMBER_TYPE of NUMBER_UNORM:Result.FImageInfo.cformat:=VK_FORMAT_R8G8B8A8_UNORM; - NUMBER_SRGB :Result.FImageInfo.cformat:=VK_FORMAT_R8G8B8A8_UNORM{VK_FORMAT_R8G8B8A8_SRGB}; + NUMBER_SRGB :Result.FImageInfo.cformat:=VK_FORMAT_R8G8B8A8_SRGB; else Assert(false,'TODO'); end; diff --git a/vulkan/vFlip.pas b/vulkan/vFlip.pas index 418a27c..bf437f6 100644 --- a/vulkan/vFlip.pas +++ b/vulkan/vFlip.pas @@ -341,7 +341,7 @@ begin end; Const - SRGB_HACK=False;//True; + SRGB_HACK=True; Procedure TvFlip.SetImageFormat(format,tmode:DWORD); begin diff --git a/vulkan/vRender.pas b/vulkan/vRender.pas index efaab23..950e770 100644 --- a/vulkan/vRender.pas +++ b/vulkan/vRender.pas @@ -184,8 +184,8 @@ begin am:=GetColorAccessMask(IMAGE_USAGE); - dependency.srcAccessMask:=dependency.srcAccessMask or (am and (not ord(VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT))); - dependency.dstAccessMask:=dependency.dstAccessMask or (am and (not ord(VK_ACCESS_COLOR_ATTACHMENT_READ_BIT ))); + dependency.srcAccessMask:=dependency.srcAccessMask or am; + dependency.dstAccessMask:=dependency.dstAccessMask or am; end; Procedure TvRenderPass.SetDepthStencilRef(id:TVkUInt32;DEPTH_USAGE,STENCIL_USAGE:Byte); @@ -199,8 +199,8 @@ begin am:=GetDepthStencilAccessMask(DEPTH_USAGE,STENCIL_USAGE); - dependency.srcAccessMask:=dependency.srcAccessMask or (am and (not ord(VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT))); - dependency.dstAccessMask:=dependency.dstAccessMask or (am and (not ord(VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT ))); + dependency.srcAccessMask:=dependency.srcAccessMask or am; + dependency.dstAccessMask:=dependency.dstAccessMask or am; end; Procedure TvRenderPass.AddColorAt(format:TVkFormat;IMAGE_USAGE:Byte;samples:TVkSampleCountFlagBits);