Another missing copy connected to Bravely Default II
adds blit_image_helper.ConvertABGR8ToD32F and fragment shader for performing ABGR and BGRA to D32F copies
This commit is contained in:
		@@ -19,6 +19,7 @@ set(SHADER_FILES
 | 
			
		||||
    block_linear_unswizzle_2d.comp
 | 
			
		||||
    block_linear_unswizzle_3d.comp
 | 
			
		||||
    convert_abgr8_to_d24s8.frag
 | 
			
		||||
    convert_abgr8_to_d32f.frag
 | 
			
		||||
    convert_d32f_to_abgr8.frag
 | 
			
		||||
    convert_d32f_to_bgra8.frag
 | 
			
		||||
    convert_d24s8_to_abgr8.frag
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										18
									
								
								src/video_core/host_shaders/convert_abgr8_to_d32f.frag
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								src/video_core/host_shaders/convert_abgr8_to_d32f.frag
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,18 @@
 | 
			
		||||
// SPDX-FileCopyrightText: Copyright 2023 Your Project
 | 
			
		||||
// SPDX-License-Identifier: GPL-2.0-or-later
 | 
			
		||||
 | 
			
		||||
#version 450
 | 
			
		||||
 | 
			
		||||
layout(binding = 0) uniform sampler2D color_texture;
 | 
			
		||||
 | 
			
		||||
void main() {
 | 
			
		||||
    ivec2 coord = ivec2(gl_FragCoord.xy);
 | 
			
		||||
    vec4 color = texelFetch(color_texture, coord, 0).abgr;
 | 
			
		||||
 | 
			
		||||
    uvec4 bytes = uvec4(color * (exp2(8) - 1.0f)) << uvec4(24, 16, 8, 0);
 | 
			
		||||
    uint depth_unorm = bytes.x | bytes.y | bytes.z | bytes.w;
 | 
			
		||||
 | 
			
		||||
    float depth_float = uintBitsToFloat(depth_unorm);
 | 
			
		||||
 | 
			
		||||
    gl_FragDepth = depth_float;
 | 
			
		||||
}
 | 
			
		||||
@@ -8,6 +8,7 @@
 | 
			
		||||
#include "common/settings.h"
 | 
			
		||||
#include "video_core/host_shaders/blit_color_float_frag_spv.h"
 | 
			
		||||
#include "video_core/host_shaders/convert_abgr8_to_d24s8_frag_spv.h"
 | 
			
		||||
#include "video_core/host_shaders/convert_abgr8_to_d32f_frag_spv.h"
 | 
			
		||||
#include "video_core/host_shaders/convert_d24s8_to_abgr8_frag_spv.h"
 | 
			
		||||
#include "video_core/host_shaders/convert_d32f_to_abgr8_frag_spv.h"
 | 
			
		||||
#include "video_core/host_shaders/convert_d32f_to_bgra8_frag_spv.h"
 | 
			
		||||
@@ -561,6 +562,13 @@ void BlitImageHelper::ConvertABGR8ToD24S8(const Framebuffer* dst_framebuffer,
 | 
			
		||||
    Convert(*convert_abgr8_to_d24s8_pipeline, dst_framebuffer, src_image_view);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void BlitImageHelper::ConvertABGR8ToD32F(const Framebuffer* dst_framebuffer,
 | 
			
		||||
                                          const ImageView& src_image_view) {
 | 
			
		||||
    ConvertPipelineDepthTargetEx(convert_abgr8_to_d32f_pipeline, dst_framebuffer->RenderPass(),
 | 
			
		||||
                                 convert_abgr8_to_d32f_frag);
 | 
			
		||||
    Convert(*convert_abgr8_to_d32f_pipeline, dst_framebuffer, src_image_view);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void BlitImageHelper::ConvertD32FToABGR8(const Framebuffer* dst_framebuffer,
 | 
			
		||||
                                         ImageView& src_image_view) {
 | 
			
		||||
    ConvertPipelineColorTargetEx(convert_d32f_to_abgr8_pipeline, dst_framebuffer->RenderPass(),
 | 
			
		||||
 
 | 
			
		||||
@@ -67,6 +67,8 @@ public:
 | 
			
		||||
 | 
			
		||||
    void ConvertABGR8ToD24S8(const Framebuffer* dst_framebuffer, const ImageView& src_image_view);
 | 
			
		||||
 | 
			
		||||
    void ConvertABGR8ToD32F(const Framebuffer* dst_framebuffer, const ImageView& src_image_view);
 | 
			
		||||
 | 
			
		||||
    void ConvertD32FToABGR8(const Framebuffer* dst_framebuffer, ImageView& src_image_view);
 | 
			
		||||
 | 
			
		||||
    void ConvertD24S8ToABGR8(const Framebuffer* dst_framebuffer, ImageView& src_image_view);
 | 
			
		||||
@@ -132,6 +134,7 @@ private:
 | 
			
		||||
    vk::ShaderModule convert_depth_to_float_frag;
 | 
			
		||||
    vk::ShaderModule convert_float_to_depth_frag;
 | 
			
		||||
    vk::ShaderModule convert_abgr8_to_d24s8_frag;
 | 
			
		||||
    vk::ShaderModule convert_abgr8_to_d32f_frag;
 | 
			
		||||
    vk::ShaderModule convert_d32f_to_abgr8_frag;
 | 
			
		||||
    vk::ShaderModule convert_d24s8_to_abgr8_frag;
 | 
			
		||||
    vk::ShaderModule convert_s8d24_to_abgr8_frag;
 | 
			
		||||
@@ -152,6 +155,7 @@ private:
 | 
			
		||||
    vk::Pipeline convert_d16_to_r16_pipeline;
 | 
			
		||||
    vk::Pipeline convert_r16_to_d16_pipeline;
 | 
			
		||||
    vk::Pipeline convert_abgr8_to_d24s8_pipeline;
 | 
			
		||||
    vk::Pipeline convert_abgr8_to_d32f_pipeline;
 | 
			
		||||
    vk::Pipeline convert_d32f_to_abgr8_pipeline;
 | 
			
		||||
    vk::Pipeline convert_d24s8_to_abgr8_pipeline;
 | 
			
		||||
    vk::Pipeline convert_s8d24_to_abgr8_pipeline;
 | 
			
		||||
 
 | 
			
		||||
@@ -1236,6 +1236,10 @@ void TextureCacheRuntime::ConvertImage(Framebuffer* dst, ImageView& dst_view, Im
 | 
			
		||||
        }
 | 
			
		||||
        break;
 | 
			
		||||
    case PixelFormat::D32_FLOAT:
 | 
			
		||||
        if (src_view.format == PixelFormat::A8B8G8R8_SRGB ||
 | 
			
		||||
            src_view.format == PixelFormat::B8G8R8A8_SRGB) {
 | 
			
		||||
            return blit_image_helper.ConvertABGR8ToD32F(dst, src_view);
 | 
			
		||||
        }
 | 
			
		||||
        if (src_view.format == PixelFormat::R32_FLOAT) {
 | 
			
		||||
            return blit_image_helper.ConvertR32ToD32(dst, src_view);
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user