feedc0de/dolphin
1
0
Fork 0
forked from dolphin-emu/dolphin
Code Pull Requests Activity
Files
bae1168fe93023e598222bbff7aac2d8aa399ef0
dolphin/Source/Core/VideoCommon/TextureConverterShaderGen.cpp

288 lines
9.8 KiB
C++
Raw Normal View History

VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
// Copyright 2017 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include <array>
#include <cstring>
#include "Common/Assert.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/TextureConverterShaderGen.h"
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"
VideoCommon: Create a namespace for TextureConversionShaderGen.
2017-11-25 11:07:14 +01:00
namespace TextureConversionShaderGen
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
{
VideoCommon: Create a namespace for TextureConversionShaderGen.
2017-11-25 11:07:14 +01:00
TCShaderUid GetShaderUid(EFBCopyFormat dst_format, bool is_depth_copy, bool is_intensity,
TextureConversionShader: Don't sample from adjacent rows when not needed
2018-05-03 14:09:32 +10:00
bool scale_by_half, bool copy_filter)
VideoCommon: Create a namespace for TextureConversionShaderGen.
2017-11-25 11:07:14 +01:00
{
TCShaderUid out;
UidData* uid_data = out.GetUidData<UidData>();
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
memset(uid_data, 0, sizeof(*uid_data));
uid_data->dst_format = dst_format;
uid_data->efb_has_alpha = bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24;
uid_data->is_depth_copy = is_depth_copy;
uid_data->is_intensity = is_intensity;
uid_data->scale_by_half = scale_by_half;
TextureConversionShader: Don't sample from adjacent rows when not needed
2018-05-03 14:09:32 +10:00
uid_data->copy_filter = copy_filter;
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
return out;
}
VideoCommon: Create a namespace for TextureConversionShaderGen.
2017-11-25 11:07:14 +01:00
ShaderCode GenerateShader(APIType api_type, const UidData* uid_data)
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
{
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
const bool mono_depth = uid_data->is_depth_copy && g_ActiveConfig.bStereoEFBMonoDepth;
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
ShaderCode out;
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
if (api_type == APIType::OpenGL)
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
{
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
out.Write("SAMPLER_BINDING(9) uniform sampler2DArray samp9;\n"
Implement EFB copy filter and gamma in hardware backends Also makes y_scale a dynamic parameter for EFB copies, as it doesn't make sense to keep it as part of the uid, otherwise we're generating redundant shaders.
2018-04-29 18:52:30 +10:00
"uniform float3 filter_coefficients;\n"
"uniform float gamma_rcp;\n"
"uniform float2 clamp_tb;\n"
"uniform float pixel_height;\n");
out.Write("float4 SampleEFB(float3 uv, float y_offset) {\n"
" return texture(samp9, float3(uv.x, clamp(uv.y - (y_offset * pixel_height), "
"clamp_tb.x, clamp_tb.y), %s));\n"
"}\n",
mono_depth ? "0.0" : "uv.z");
out.Write("#define uv0 f_uv0\n"
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
"in vec3 uv0;\n"
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
"out vec4 ocol0;\n"
Implement EFB copy filter and gamma in hardware backends Also makes y_scale a dynamic parameter for EFB copies, as it doesn't make sense to keep it as part of the uid, otherwise we're generating redundant shaders.
2018-04-29 18:52:30 +10:00
"void main(){\n");
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
}
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
else if (api_type == APIType::Vulkan)
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
{
Implement EFB copy filter and gamma in hardware backends Also makes y_scale a dynamic parameter for EFB copies, as it doesn't make sense to keep it as part of the uid, otherwise we're generating redundant shaders.
2018-04-29 18:52:30 +10:00
out.Write("UBO_BINDING(std140, 1) uniform PSBlock {\n"
" float3 filter_coefficients;\n"
" float gamma_rcp;\n"
" float2 clamp_tb;\n"
" float pixel_height;\n"
"};\n");
out.Write("SAMPLER_BINDING(0) uniform sampler2DArray samp0;\n");
out.Write("float4 SampleEFB(float3 uv, float y_offset) {\n"
" return texture(samp0, float3(uv.x, clamp(uv.y + (y_offset * pixel_height), "
"clamp_tb.x, clamp_tb.y), %s));\n"
"}\n",
mono_depth ? "0.0" : "uv.z");
out.Write("layout(location = 0) in vec3 uv0;\n"
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
"layout(location = 1) in vec4 col0;\n"
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
"layout(location = 0) out vec4 ocol0;"
Implement EFB copy filter and gamma in hardware backends Also makes y_scale a dynamic parameter for EFB copies, as it doesn't make sense to keep it as part of the uid, otherwise we're generating redundant shaders.
2018-04-29 18:52:30 +10:00
"void main(){\n");
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
}
else if (api_type == APIType::D3D)
{
out.Write("Texture2DArray tex0 : register(t0);\n"
"SamplerState samp0 : register(s0);\n"
Implement EFB copy filter and gamma in hardware backends Also makes y_scale a dynamic parameter for EFB copies, as it doesn't make sense to keep it as part of the uid, otherwise we're generating redundant shaders.
2018-04-29 18:52:30 +10:00
"uniform float3 filter_coefficients;\n"
"uniform float gamma_rcp;\n"
"uniform float2 clamp_tb;\n"
"uniform float pixel_height;\n\n");
out.Write("float4 SampleEFB(float3 uv, float y_offset) {\n"
" return tex0.Sample(samp0, float3(uv.x, clamp(uv.y + (y_offset * pixel_height), "
"clamp_tb.x, clamp_tb.y), %s));\n"
"}\n",
mono_depth ? "0.0" : "uv.z");
out.Write("void main(out float4 ocol0 : SV_Target,\n"
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
" in float4 pos : SV_Position,\n"
Implement EFB copy filter and gamma in hardware backends Also makes y_scale a dynamic parameter for EFB copies, as it doesn't make sense to keep it as part of the uid, otherwise we're generating redundant shaders.
2018-04-29 18:52:30 +10:00
" in float3 uv0 : TEXCOORD0) {\n");
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
}
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
Implement EFB copy filter and gamma in hardware backends Also makes y_scale a dynamic parameter for EFB copies, as it doesn't make sense to keep it as part of the uid, otherwise we're generating redundant shaders.
2018-04-29 18:52:30 +10:00
// The copy filter applies to both color and depth copies. This has been verified on hardware.
// The filter is only applied to the RGB channels, the alpha channel is left intact.
TextureConversionShader: Don't sample from adjacent rows when not needed
2018-05-03 14:09:32 +10:00
if (uid_data->copy_filter)
{
out.Write(" float4 prev_row = SampleEFB(uv0, -1.0f);\n"
" float4 current_row = SampleEFB(uv0, 0.0f);\n"
" float4 next_row = SampleEFB(uv0, 1.0f);\n"
EFB2RAM: Apply copy filter as a float coefficient after sampling Using 8-bit integer math here lead to precision loss for depth copies, which broke various effects in games, e.g. lens flare in MK:DD. It's unlikely the console implements this as a floating-point multiply (fixed-point perhaps), but since we have the float round trip in our EFB2RAM shaders anyway, it's not going to make things any worse. If we do rewrite our shaders to use integer math completely, then it might be worth switching this conversion back to integers. However, the range of the values (format) should be known, or we should expand all values out to 24-bits first.
2018-05-22 12:14:48 +10:00
" float4 texcol = float4(min(prev_row.rgb * filter_coefficients[0] +\n"
" current_row.rgb * filter_coefficients[1] +\n"
" next_row.rgb * filter_coefficients[2], \n"
" float3(1, 1, 1)), current_row.a);\n");
TextureConversionShader: Don't sample from adjacent rows when not needed
2018-05-03 14:09:32 +10:00
}
else
{
out.Write(
" float4 current_row = SampleEFB(uv0, 0.0f);\n"
EFB2RAM: Apply copy filter as a float coefficient after sampling Using 8-bit integer math here lead to precision loss for depth copies, which broke various effects in games, e.g. lens flare in MK:DD. It's unlikely the console implements this as a floating-point multiply (fixed-point perhaps), but since we have the float round trip in our EFB2RAM shaders anyway, it's not going to make things any worse. If we do rewrite our shaders to use integer math completely, then it might be worth switching this conversion back to integers. However, the range of the values (format) should be known, or we should expand all values out to 24-bits first.
2018-05-22 12:14:48 +10:00
" float4 texcol = float4(min(current_row.rgb * filter_coefficients[1], float3(1, 1, 1)),\n"
" current_row.a);\n");
TextureConversionShader: Don't sample from adjacent rows when not needed
2018-05-03 14:09:32 +10:00
}
Implement EFB copy filter and gamma in hardware backends Also makes y_scale a dynamic parameter for EFB copies, as it doesn't make sense to keep it as part of the uid, otherwise we're generating redundant shaders.
2018-04-29 18:52:30 +10:00
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
if (uid_data->is_depth_copy)
{
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
if (api_type == APIType::D3D || api_type == APIType::Vulkan)
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write("texcol.x = 1.0 - texcol.x;\n");
out.Write(" int depth = int(texcol.x * 16777216.0);\n"
// Convert to Z24 format
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
" int4 workspace;\n"
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
" workspace.r = (depth >> 16) & 255;\n"
" workspace.g = (depth >> 8) & 255;\n"
" workspace.b = depth & 255;\n"
// Convert to Z4 format
" workspace.a = (depth >> 16) & 0xF0;\n"
// Normalize components to [0.0..1.0]
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
" texcol = float4(workspace) / 255.0;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
switch (uid_data->dst_format)
{
case EFBCopyFormat::R4: // Z4
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.aaaa;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
case EFBCopyFormat::R8_0x1: // Z8
case EFBCopyFormat::R8: // Z8H
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.rrrr;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::RA8: // Z16
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.gggr;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::RG8: // Z16 (reverse order)
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.rrrg;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::RGBA8: // Z24X8
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
out.Write(" ocol0 = float4(texcol.rgb, 0.0);\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::G8: // Z8M
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.gggg;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::B8: // Z8L
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.bbbb;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::GB8: // Z16L - copy lower 16 depth bits
// expected to be used as an IA8 texture (upper 8 bits stored as intensity, lower 8 bits
// stored as alpha)
// Used e.g. in Zelda: Skyward Sword
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.gggb;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
default:
ERROR_LOG(VIDEO, "Unknown copy zbuf format: 0x%X", static_cast<int>(uid_data->dst_format));
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
out.Write(" ocol0 = float4(texcol.bgr, 0.0);\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
}
}
else if (uid_data->is_intensity)
{
Reimplement EFB copy for intensity formats This is the direct continuation of #5887, and removes the last usage of the colmat matrix in EFB copy conversion shaders.
2017-12-03 00:10:00 +01:00
bool has_four_bits =
(uid_data->dst_format == EFBCopyFormat::R4 || uid_data->dst_format == EFBCopyFormat::RA4);
bool has_alpha =
(uid_data->dst_format == EFBCopyFormat::RA4 || uid_data->dst_format == EFBCopyFormat::RA8);
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
switch (uid_data->dst_format)
{
case EFBCopyFormat::R4: // I4
case EFBCopyFormat::R8_0x1: // I8
case EFBCopyFormat::R8: // I8
case EFBCopyFormat::RA4: // IA4
case EFBCopyFormat::RA8: // IA8
Reimplement EFB copy for intensity formats This is the direct continuation of #5887, and removes the last usage of the colmat matrix in EFB copy conversion shaders.
2017-12-03 00:10:00 +01:00
if (has_four_bits)
out.Write(" texcol = float4(int4(texcol * 255.0) & 0xF0) * (1.0 / 240.0);\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
// TODO - verify these coefficients
Reimplement EFB copy for intensity formats This is the direct continuation of #5887, and removes the last usage of the colmat matrix in EFB copy conversion shaders.
2017-12-03 00:10:00 +01:00
out.Write(" const float3 coefficients = float3(0.257, 0.504, 0.098);\n"
" float intensity = dot(texcol.rgb, coefficients) + 16.0 / 255.0;\n"
" ocol0 = float4(intensity, intensity, intensity, %s);\n",
has_alpha ? "texcol.a" : "intensity");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
default:
ERROR_LOG(VIDEO, "Unknown copy intensity format: 0x%X",
static_cast<int>(uid_data->dst_format));
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
}
}
else
{
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
if (!uid_data->efb_has_alpha)
out.Write(" texcol.a = 1.0;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
switch (uid_data->dst_format)
{
case EFBCopyFormat::R4: // R4
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" float red = float(int(texcol.r * 255.0) & 0xF0) * (1.0 / 240.0);\n"
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
" ocol0 = float4(red, red, red, red);\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
case EFBCopyFormat::R8_0x1: // R8
case EFBCopyFormat::R8: // R8
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.rrrr;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::RA4: // RA4
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
out.Write(" float2 red_alpha = float2(int2(texcol.ra * 255.0) & 0xF0) * (1.0 / 240.0);\n"
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
" ocol0 = red_alpha.rrrg;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
case EFBCopyFormat::RA8: // RA8
out.Write(" ocol0 = texcol.rrra;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::A8: // A8
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.aaaa;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::G8: // G8
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.gggg;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
case EFBCopyFormat::B8: // B8
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.bbbb;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::RG8: // RG8
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.rrrg;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::GB8: // GB8
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol.gggb;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::RGB565: // RGB565
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
out.Write(" float2 red_blue = float2(int2(texcol.rb * 255.0) & 0xF8) * (1.0 / 248.0);\n"
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
" float green = float(int(texcol.g * 255.0) & 0xFC) * (1.0 / 252.0);\n"
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
" ocol0 = float4(red_blue.r, green, red_blue.g, 1.0);\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
case EFBCopyFormat::RGB5A3: // RGB5A3
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
// TODO: The MSB controls whether we have RGB5 or RGB4A3, this selection
// will need to be implemented once we move away from floats.
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
out.Write(" float3 color = float3(int3(texcol.rgb * 255.0) & 0xF8) * (1.0 / 248.0);\n"
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
" float alpha = float(int(texcol.a * 255.0) & 0xE0) * (1.0 / 224.0);\n"
TextureConverterShaderGen: Make generated shaders HLSL-compatible
2017-12-06 03:00:40 +10:00
" ocol0 = float4(color, alpha);\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
case EFBCopyFormat::RGBA8: // RGBA8
out.Write(" ocol0 = texcol;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
Implement EFB copy filter and gamma in hardware backends Also makes y_scale a dynamic parameter for EFB copies, as it doesn't make sense to keep it as part of the uid, otherwise we're generating redundant shaders.
2018-04-29 18:52:30 +10:00
case EFBCopyFormat::XFB:
TextureConversionShader: Fix compile errors in OpenGL ES
2018-05-02 21:54:13 +10:00
out.Write(" ocol0 = float4(pow(texcol.rgb, float3(gamma_rcp, gamma_rcp, gamma_rcp)), "
"texcol.a);\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
default:
ERROR_LOG(VIDEO, "Unknown copy color format: 0x%X", static_cast<int>(uid_data->dst_format));
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write(" ocol0 = texcol;\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
break;
}
}
VideoCommon: Reimplement texture format conversion This fixes the rendering of the scan visor in Metroid Prime 2: Echoes, as seen in https://fifoci.dolphin-emu.org/dff/mp2-scanner/ The alpha channel was off-by-one on Ivy Bridge due to the rounding after multiplication with colmat. This commit removes this matrix altogether in most cases, making them simple GLSL swizzles.
2017-08-04 20:14:14 +02:00
out.Write("}\n");
VideoBackends: Use VideoCommon shader generators for efb2tex copies. This will generate one shader per copy format. For now, it is the same shader with the colmat hard coded. So it should already improve the GPU performance a bit, but a rewrite of the shader generator is suggested. Half of the patch is done by linkmauve1: VideoCommon: Reorganise the shader writes.
2017-08-04 17:56:24 +02:00
return out;
}
VideoCommon: Create a namespace for TextureConversionShaderGen.
2017-11-25 11:07:14 +01:00
} // namespace TextureConversionShaderGen
Copy Permalink