GSdx: Add CPU Frame buffer Conversion Hack #2086

lightningterror · 2017-10-05T00:12:57Z

Add HwW Hack that enables 4-bit and 8-bit Frame buffer Conversion on the CPU.
Can fix broken textures on games but at the cost of slower performance.
List of games: Harry Potter games, Fifa Street games, MGS3 games.
Games like Call of Duty, Kung fu Panda might also be affected as well as others especially on Direct3D.
Add HW Hack GUI option on Windows/Linux for Framebuffer Convertion hack named "CPU FB Conversion."

Should fix
https://forums.pcsx2.net/Thread-Harry-Potter-and-The-Chamber-of-Secrets-SLES-51192-E-artifacting

Should Improve
#569

plugins/GSdx/GSSetting.cpp

@@ -122,6 +122,13 @@ const char* dialog_message(int ID, bool* updateText) {
 		case IDC_TC_DEPTH:
 			return "Disable the support of Depth buffer in the texture cache.\n"
 				"It can help to increase speed but it will likely create various glitches.";
+		case IDC_8BITCPUFBHACK:


plugins/GSdx/GSSetting.h

@@ -63,6 +63,7 @@ enum {
 	IDC_ACCURATE_BLEND_UNIT,
 	IDC_ACCURATE_DATE,
 	IDC_TC_DEPTH,
+	IDC_8BITCPUFBHACK,


plugins/GSdx/GSSettingsDlg.cpp

@@ -698,6 +698,7 @@ void GSHacksDlg::OnInit()
 	CheckDlgButton(m_hWnd, IDC_PRELOAD_GS, theApp.GetConfigB("preload_frame_with_gs_data"));
 	CheckDlgButton(m_hWnd, IDC_ALIGN_SPRITE, theApp.GetConfigB("UserHacks_align_sprite_X"));
 	CheckDlgButton(m_hWnd, IDC_TC_DEPTH, theApp.GetConfigB("UserHacks_DisableDepthSupport"));
+	CheckDlgButton(m_hWnd, IDC_8BITCPUFBHACK, theApp.GetConfigB("UserHack_cpu_8bis_fb_conversion"));


plugins/GSdx/GSdx.rc

@@ -142,6 +142,7 @@ BEGIN
    CONTROL         "Alpha",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,71,34,8
    CONTROL         "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,71,57,8
    CONTROL         "Disable Depth Emulation",IDC_TC_DEPTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,84,92,8
+    CONTROL         "CPU FB Conversion", IDC_8BITCPUFBHACK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 84, 91, 8


plugins/GSdx/GSTextureCache.cpp

+					// 2/ even with upscaling
+					// 3/ for both DX and OpenGL
+					if (m_cpu_8bit_fb_coversion && psm == PSM_PSMT8)
+						// Hack can fix broken textures on games such as: Harry Potter games (Direct3D and OpenGL), Fifa Street games (Direct3D only), MGS3 (Direct3D only).


gregory38 · 2017-10-05T06:40:51Z

HLSL <=> GLSL

vec2 => float2
uvec2 (vector of 2 unsigned int) => uint2 
ivec2 (vector 2 signed int) => int2
gl_FragCoord => SV_Position (I hope you won't have issue with the Y axis order)
texelFetch => Load

Copy/past GLSL code, replace the above. Update header/return based on other HLSL equivalent (ps_main0).

Oh I just saw that you need also the ScalingFactor constant buffer parameter. My code is awful without comment...

plugins/GSdx/GSSetting.cpp

@@ -122,6 +122,13 @@ const char* dialog_message(int ID, bool* updateText) {
 		case IDC_TC_DEPTH:
 			return "Disable the support of Depth buffer in the texture cache.\n"
 				"It can help to increase speed but it will likely create various glitches.";
+		case IDC_8BIT_CPU_FBHACK:
+			return "Forces 8-bit shader conversion to be done on the CPU instead of the GPU but performance will be slower.\n"
+				"Direct3D doesn't support shader conversion , OpenGL does support shader conversion but it doesn't render some corners properly.\n"


plugins/GSdx/GSSetting.cpp

+				"Direct3D doesn't support shader conversion , OpenGL does support shader conversion but it doesn't render some corners properly.\n"
+				"The hack can fix glitches or broken graphics in some games.\n"
+				"Harry Potter games (Direct3D and OpenGL).\n"
+				"Fifa Street games (Direct3D).\n"


plugins/GSdx/GSdx.rc

@@ -142,6 +142,7 @@ BEGIN
    CONTROL         "Alpha",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,71,34,8
    CONTROL         "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,71,57,8
    CONTROL         "Disable Depth Emulation",IDC_TC_DEPTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,84,92,8
+    CONTROL         "CPU 8-bit FB Conversion", IDC_8BIT_CPU_FBHACK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 84, 92, 8


plugins/GSdx/GSTextureCache.cpp

+					// 3/ for both DX and OpenGL
+					if (m_cpu_8bit_fb_coversion && psm == PSM_PSMT8)
+						// Direct3D doesn't have a shader conversion so it needs to be done on the CPU side which causes slowdowns (Fifa Street).
+						// OpenGL has a shader but it doesn't handle some corners properly (Harry Potter, COD ?, Kung fu Panda ?).


plugins/GSdx/GSTextureCache.cpp

+					// 1/ it just works :)
+					// 2/ even with upscaling
+					// 3/ for both DX and OpenGL
+					if (m_cpu_8bit_fb_coversion && psm == PSM_PSMT8)


plugins/GSdx/GSTextureCache.h

@@ -130,6 +130,7 @@ class GSTextureCache
 	bool m_preload_frame;
 	uint8* m_temp;
 	bool m_can_convert_depth;
+	bool m_cpu_8bit_fb_coversion;


lightningterror · 2017-10-11T01:00:51Z

Updated.

p.s. the shader port will be in a separate pr. Don't wanna delay this a month (maybe) or so.

plugins/GSdx/GSdx.rc

@@ -142,6 +142,7 @@ BEGIN
    CONTROL         "Alpha",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,71,34,8
    CONTROL         "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,71,57,8
    CONTROL         "Disable Depth Emulation",IDC_TC_DEPTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,84,92,8
+    CONTROL         "CPU 8-bit FB Conversion",IDC_8BIT_CPU_FBHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 14, 84, 92, 8


lightningterror · 2017-10-13T22:43:24Z

You can merge it if the code is ok @turtleli.

plugins/GSdx/GSSetting.cpp

@@ -122,6 +122,13 @@ const char* dialog_message(int ID, bool* updateText) {
 		case IDC_TC_DEPTH:
 			return "Disable the support of Depth buffer in the texture cache.\n"
 				"It can help to increase speed but it will likely create various glitches.";
+		case IDC_8BIT_CPU_FBHACK:
+			return "Forces 8-bit shader conversion to be done on the CPU instead of the GPU but performance will be slower.\n"
+				"Direct3D doesn't support shader conversion, OpenGL does support shader conversion but it doesn't render some corner cases properly.\n"


plugins/GSdx/GSSetting.cpp

@@ -122,6 +122,13 @@ const char* dialog_message(int ID, bool* updateText) {
 		case IDC_TC_DEPTH:
 			return "Disable the support of Depth buffer in the texture cache.\n"
 				"It can help to increase speed but it will likely create various glitches.";
+		case IDC_CPU_FB_CONVERSION:
+			return "Enables 4-bit and 8-bit frame buffer conversion to be done on the CPU instead of the GPU.\n\n"


Add HW Hack that enables Framebuffer Conversion on the CPU instead of the GPU. Can fix broken textures on games but at the cost of slower performance. List of games: Harry Potter games, FIFA Street games. Games like Call of Duty, Kung fu Panda might also be affected as well as others especially on Direct3D. Add HW Hack GUI option on Windows/Linux for 4-bit and 8-bit Framebuffer conversion hack named "Frame Buffer Conversion".

lightningterror · 2017-10-26T19:17:24Z

Updated.

ghost · 2017-10-26T19:22:39Z

This hack cause massive slowdown and a driver crash (nvidia) in Mercenaries 2.It also cause graphics glitch and slowdown in MGS3 under OpenGL (DX is better with it).
This hack don't solve Kung fu panda and cause a GSDX out of memory issue.

lightningterror · 2017-10-27T00:11:32Z

It's a hack. It should be enabled only if a game needs it. Otherwise no.

willkuer · 2017-10-27T00:17:06Z

I guess it shouldn't produce crashes, or? Slowdowns and glitches are obviously a different story.

ssakash · 2017-10-27T04:57:51Z

Why is this actually described as a hack? It's more accurate than the shader alternative, right?

gregory38 · 2017-10-27T08:07:42Z

@atomic83GitHub
OpenGL is capable to convert the frame buffer directly on the GPU in a fast and mostly accurate way. Except some rare games, you shouldn't enable it.

Did you get the crash on OpenGL or Dx ? Maybe it consume too much memory.

Speed wise, this hack will range from slow to very slow. Because you need
1/ stop to send command to GPU
2/ Finish current work
3/ read data from GPU

@ssakash
It is just too slow. And it seems it isn't that stable.

ghost · 2017-10-27T08:11:13Z

#gregory38 I use DX mode and I can confirm that the driver crash is a out of memory issue.

gregory38 · 2017-11-02T09:51:44Z

@atomic83GitHub thanks for the info.Potentially we could reduce the memory usage.

So far we do

create an offscreen texture which contains a data buffer
read the data
put the texture in GSdx garbage collector

All calls are synchronous (hence the slowness). So even if we have multiple offscreen texture, only one data buffer will be used. So instead to duplicate all data buffers, we could use a big common one. Anyway, my feeling is that this hack isn't a good solution most of the time. I.e. better port the glsl shader that can handle 90% of conversion at fast speed.

lightningterror · 2017-11-07T02:30:14Z

Anyway, my feeling is that this hack isn't a good solution most of the time. I.e. better port the glsl shader that can handle 90% of conversion at fast speed.

Agreed. So far it seems only Harry Potter and TCoS will need it even with the ported shader. And I guess games that use 4-bit as well.

FlatOutPS2 · 2018-01-22T14:22:21Z

All calls are synchronous (hence the slowness). So even if we have multiple offscreen texture, only one data buffer will be used. So instead to duplicate all data buffers, we could use a big common one. Anyway, my feeling is that this hack isn't a good solution most of the time. I.e. better port the glsl shader that can handle 90% of conversion at fast speed.

@gregory38 Which shader is it? I don't get different results on OGL compared to DX with this hack.

lightningterror · 2018-01-22T14:43:56Z

pcsx2/plugins/GSdx/res/glsl/convert.glsl

Line 199 in 51c64fc

#ifdef ps_main17

FIFA-Street-8bits and Blending.zip
You can use this as a testcase.

FlatOutPS2 · 2018-01-22T21:48:39Z

@lightningterror Thanks for the info.

I tried a quick port to DX for easier testing, but speed was terrible. I hope I did something wrong. :p Will look more into it later to hopefully improve/expand the shader.

lightningterror · 2018-01-22T21:56:47Z

From Gregory: Note you might need to add some dummy/stub shader for 11-16

This might help 😛

FlatOutPS2 · 2018-01-22T22:56:04Z

This might help 😛

You don't need to add those. If anything, that would make things slower.

EDIT: Turns out I did make a mistake unrelated to the shader that made things slower. :)

lightningterror · 2018-01-23T00:20:20Z

EDIT: Turns out I did make a mistake unrelated to the shader that made things slower. :)

I sense a PR Soon™.

Btw the shader on ogl isn't perfect either.
Harry Potter COS.zip
Harry Potter COS doesn't like the shader so it could be tweaked a bit more, do you wanna try to debug/solve the issue ?

FlatOutPS2 · 2018-01-23T00:28:10Z

do you wanna try to debug/solve the issue ?

That was the point of my interest. I noticed your hack helps Stuntman, but I suspect the current shader doesn't work on that game because the game uses 4-bits.

Have you found any more games that need the hack/improved shader?

lightningterror · 2018-01-23T01:08:34Z

doesn't work on that game because the game uses 4-bits

The shader is only for 8-bits. A new shader probably needs to be written for 4-bit.

MGS3 maybe ? I'm not sure.
On OGL enabling FBC causes a whole bunch of other graphical issues. Plus high GS usage.
No result from disabling the shader inside the code, I don't see any difference or maybe it's used in a different part of the game.

I get no results on D3D with the FBC hack. The only result I get is enabling texture shuffle on D3D so it could be related to why I don't get any result in the first place. On top of that MGS3 also uses channel shuffle I think. Not sure tho.
MGS3-Demo.zip

gregory38 · 2018-01-23T08:56:32Z

The shader have 2 limitations

4 bits format isn't handled.
page offset isn't supported either. This offset changes the pixel position.

In my opinion we should build a lookup table (texture) with the pixel position based on the various format offset.

8 bits texture is often uses with depth effect / channel shuffling / texture shuffling. It doesn't help to reduce the complexity...

For the story I create the version of this shader for the blue fog of MGS3. However I don't remember if it was related to depth. I vaguely remember a (box?) fighting game (with night in the name) that also use 8 bits format (but it could be blending issue too).

I really should upload all my gsdump somewhere...

FlatOutPS2 · 2018-01-23T14:45:39Z

vaguely remember a (box?) fighting game (with night in the name) that also use 8 bits format (but it could be blending issue too).

Yeah, I found it. It's Fight Night Round 2. Another EA title(like FIFA Street). And like FIFA Street it also needs blending to properly fix the issue.
And my suspicion about Stuntman was proven correct. It does need a 4 bits handler.

lightningterror · 2018-01-24T15:01:57Z

I'll just add this info here, it may be important. The FBC hack breaks channel shuffle effect on MGS3, dunno about other games.
All the more reason to replace the hack with a shader.

lightningterror · 2018-01-31T15:09:39Z

How is progress going ?

FlatOutPS2 · 2018-01-31T16:15:49Z

How is progress going ?

There's hardly been any progress. I've been busy with other PCSX2 projects. I'll have to add some basic blending too for this work properly in Direct3D, so it'll take longer than just a simple shader port plus improvements.

lightningterror assigned gregory38 Oct 5, 2017

lightningterror force-pushed the 8bit-cpu-textureconvertion branch from 301e841 to 7dffd51 Compare October 5, 2017 00:28

MrCK1 reviewed Oct 5, 2017

View reviewed changes

lightningterror force-pushed the 8bit-cpu-textureconvertion branch 2 times, most recently from e1deb2f to 66faf74 Compare October 5, 2017 00:39

lightningterror changed the title ~~GSdx: Add 8bit CPU Framebuffer conversion hack~~ GSdx: Add 8bit CPU Framebuffer Conversion Hack Oct 5, 2017

lightningterror force-pushed the 8bit-cpu-textureconvertion branch 2 times, most recently from b6444b1 to a02a091 Compare October 5, 2017 00:55

lightningterror changed the title ~~GSdx: Add 8bit CPU Framebuffer Conversion Hack~~ GSdx: Add CPU 8Bit Framebuffer Conversion Hack Oct 5, 2017

lightningterror added the GS label Oct 5, 2017

lightningterror force-pushed the 8bit-cpu-textureconvertion branch 3 times, most recently from b970e55 to 7d13e95 Compare October 5, 2017 02:00

gregory38 reviewed Oct 5, 2017

View reviewed changes

lightningterror force-pushed the 8bit-cpu-textureconvertion branch 5 times, most recently from 8f69412 to 9b25560 Compare October 7, 2017 18:14

turtleli reviewed Oct 10, 2017

View reviewed changes

lightningterror assigned turtleli Oct 11, 2017

lightningterror force-pushed the 8bit-cpu-textureconvertion branch from 9b25560 to f8ce3af Compare October 11, 2017 00:50

lightningterror force-pushed the 8bit-cpu-textureconvertion branch 2 times, most recently from 6caec8d to 7e83c54 Compare October 11, 2017 01:05

turtleli reviewed Oct 11, 2017

View reviewed changes

lightningterror force-pushed the 8bit-cpu-textureconvertion branch from 7e83c54 to f9c648f Compare October 11, 2017 23:49

turtleli reviewed Oct 14, 2017

View reviewed changes

lightningterror force-pushed the 8bit-cpu-textureconvertion branch 2 times, most recently from effa6b2 to fa9fe49 Compare October 17, 2017 22:11

gregory38 reviewed Oct 26, 2017

View reviewed changes

lightningterror force-pushed the 8bit-cpu-textureconvertion branch from fa9fe49 to 5184d36 Compare October 26, 2017 19:15

gregory38 approved these changes Nov 2, 2017

View reviewed changes

gregory38 merged commit 1cbd4c5 into PCSX2:master Nov 2, 2017

lightningterror deleted the 8bit-cpu-textureconvertion branch November 2, 2017 14:55

GSdx: Add CPU Frame buffer Conversion Hack #2086

GSdx: Add CPU Frame buffer Conversion Hack #2086

Conversation

lightningterror commented Oct 5, 2017 • edited Loading

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

gregory38 commented Oct 5, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

lightningterror commented Oct 11, 2017

This comment was marked as spam.

This comment was marked as spam.

lightningterror commented Oct 13, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

lightningterror commented Oct 26, 2017

ghost commented Oct 26, 2017 • edited by ghost Loading

lightningterror commented Oct 27, 2017 • edited Loading

willkuer commented Oct 27, 2017

ssakash commented Oct 27, 2017

gregory38 commented Oct 27, 2017

ghost commented Oct 27, 2017

gregory38 commented Nov 2, 2017

lightningterror commented Nov 7, 2017

FlatOutPS2 commented Jan 22, 2018

lightningterror commented Jan 22, 2018

FlatOutPS2 commented Jan 22, 2018

lightningterror commented Jan 22, 2018

FlatOutPS2 commented Jan 22, 2018 • edited Loading

lightningterror commented Jan 23, 2018

FlatOutPS2 commented Jan 23, 2018

lightningterror commented Jan 23, 2018 • edited Loading

gregory38 commented Jan 23, 2018

FlatOutPS2 commented Jan 23, 2018

lightningterror commented Jan 24, 2018

lightningterror commented Jan 31, 2018

FlatOutPS2 commented Jan 31, 2018 • edited Loading

lightningterror commented Oct 5, 2017 •

edited

Loading

ghost commented Oct 26, 2017 •

edited by ghost

Loading

lightningterror commented Oct 27, 2017 •

edited

Loading

FlatOutPS2 commented Jan 22, 2018 •

edited

Loading

lightningterror commented Jan 23, 2018 •

edited

Loading

FlatOutPS2 commented Jan 31, 2018 •

edited

Loading