ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS: Separate shader convert for float -> 16/32bit int

This commit is contained in:
Connor McLaughlin 2021-12-19 17:07:40 +10:00 committed by refractionpcsx2
parent 8e920d727f
commit b355efd73a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/GS/Renderers/Common/GSDevice.cpp
View File

@ -32,6 +32,7 @@ const char* shaderName(ShaderConvert value)
case ShaderConvert::TRANSPARENCY_FILTER: return "ps_filter_transparency"; case ShaderConvert::TRANSPARENCY_FILTER: return "ps_filter_transparency";
case ShaderConvert::TRIANGULAR_FILTER: return "ps_filter_triangular"; case ShaderConvert::TRIANGULAR_FILTER: return "ps_filter_triangular";
case ShaderConvert::COMPLEX_FILTER: return "ps_filter_complex"; case ShaderConvert::COMPLEX_FILTER: return "ps_filter_complex";
case ShaderConvert::FLOAT32_TO_16_BITS: return "ps_convert_float32_32bits";
case ShaderConvert::FLOAT32_TO_32_BITS: return "ps_convert_float32_32bits"; case ShaderConvert::FLOAT32_TO_32_BITS: return "ps_convert_float32_32bits";
case ShaderConvert::FLOAT32_TO_RGBA8: return "ps_convert_float32_rgba8"; case ShaderConvert::FLOAT32_TO_RGBA8: return "ps_convert_float32_rgba8";
case ShaderConvert::FLOAT16_TO_RGB5A1: return "ps_convert_float16_rgb5a1"; case ShaderConvert::FLOAT16_TO_RGB5A1: return "ps_convert_float16_rgb5a1";

9
pcsx2/GS/Renderers/Common/GSDevice.h
View File

@ -35,19 +35,20 @@ enum class ShaderConvert
DATM_1, DATM_1,
DATM_0, DATM_0,
MOD_256, MOD_256,
SCANLINE = 5, SCANLINE,
DIAGONAL_FILTER, DIAGONAL_FILTER,
TRANSPARENCY_FILTER, TRANSPARENCY_FILTER,
TRIANGULAR_FILTER, TRIANGULAR_FILTER,
COMPLEX_FILTER, COMPLEX_FILTER,
FLOAT32_TO_32_BITS = 10, FLOAT32_TO_16_BITS,
FLOAT32_TO_32_BITS,
FLOAT32_TO_RGBA8, FLOAT32_TO_RGBA8,
FLOAT16_TO_RGB5A1, FLOAT16_TO_RGB5A1,
RGBA8_TO_FLOAT32 = 13, RGBA8_TO_FLOAT32,
RGBA8_TO_FLOAT24, RGBA8_TO_FLOAT24,
RGBA8_TO_FLOAT16, RGBA8_TO_FLOAT16,
RGB5A1_TO_FLOAT16, RGB5A1_TO_FLOAT16,
RGBA_TO_8I = 17, RGBA_TO_8I,
YUV, YUV,
Count Count
}; };

2
pcsx2/GS/Renderers/HW/GSTextureCache.cpp
View File

@ -1687,7 +1687,7 @@ void GSTextureCache::Read(Target* t, const GSVector4i& r)
case PSM_PSMZ16: case PSM_PSMZ16:
case PSM_PSMZ16S: case PSM_PSMZ16S:
fmt = GSTexture::Format::UInt16; fmt = GSTexture::Format::UInt16;
ps_shader = ShaderConvert::FLOAT32_TO_32_BITS; ps_shader = ShaderConvert::FLOAT32_TO_16_BITS;
break; break;
default: default: