rsx: Fixes by kd-11 · Pull Request #3931 · RPCS3/rpcs3

kd-11 · 2017-12-11T08:52:52Z

Implement deferred swizzle remaps for twice-remapped resources
Fix blit engine operations on RGB565
Add a timeout on nv406e::semaphore_acquire. Requires further inevstigations why some semaphore addresses always lock up
Fix WCB causing hanging due to incorrect memory range approximation
Properly synchronize FIFO ctrl updates. Can improve stability in some cases. The issue still happens if the SPUs lag too far behind RSX
Implement variable point size Corrupted graphics - Hyperdimension Neptunia [BLES01178] #3740
Implement FP instructions BEM, TEXBEM, TXPBEM (untested, rarely used)
Fix for LG2 fp instruction processing invalid values. Thanks to @MaikelChan for assistance narrowing down the broken shader
Framebuffer setup fixes to avoid lost draw calls

danilaml · 2017-12-11T14:40:59Z

+			//Redirect parameter 0 to the x2d temp register for TEXBEM
+			//TODO: Organize this a little better
+			std::pair<std::string, std::string> repl[] = { { "$0", "x2d" } };
+			std::string result = fmt::replace_all(code, repl);


is this used anywhere?

copypasta, should have been used in the next line instead of code var

danilaml · 2017-12-11T14:46:04Z

 			image_type = type;
 		}

+		void set_sampler_status(const rsx::texture_sampler_status status)


missing ref?

its an enum value so no. Its never used with allocated vars

I see, const in signature confused me since it's not needed here (see my other comment) and usually considered bad style.

danilaml · 2017-12-11T14:52:11Z

+
+		GLenum remap_values[4];
+
+		for (u8 channel = 0; channel < 4; ++channel)


using u8 just because the loop variable fits in range isn't really beneficial and can have negative performance (especially if it's used in indexing). plain int /unsigned is usually faster. Also, you can use something like int_fast8_t.

danilaml · 2017-12-11T14:56:01Z

-		std::vector<rsx_subresource_layout>& subresources_layout, std::pair<std::array<u8, 4>, std::array<u8, 4>>& decoded_remap, bool static_state);
+		std::vector<rsx_subresource_layout>& subresources_layout, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& decoded_remap, bool static_state);
+
+	void apply_swizzle_remap(const GLenum target, const std::array<GLenum, 4>& swizzle_remap, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& decoded_remap);


const GLenum target

adding const to pass-by value in declaration is meaningless and can bit omitted.

danilaml · 2017-12-11T14:58:12Z

 			m_discarded_memory_size = 0;
 		}
+
+		VkComponentMapping apply_swizzle_remap(const std::array<VkComponentSwizzle, 4> base_remap, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap_vector)


do you need to pass base_remap by value here?

Kravickas · 2017-12-11T20:20:17Z

Winter star
When entering ingame

F {SPU[0x2000002] Thread (20 spu_runtime) [0x055e0]} class std::runtime_error thrown: Unknown STOP code: 0x100 (Out_MBox is empty)
(in file Emu\Cell\SPUThread.cpp:1772)
F {SPU[0x2000004] Thread (40 spu_runtime) [0x055e0]} class std::runtime_error thrown: Unknown STOP code: 0x100 (Out_MBox is empty)
(in file Emu\Cell\SPUThread.cpp:1772)
F {SPU[0x2000003] Thread (30 spu_runtime) [0x055e0]} class std::runtime_error thrown: Unknown STOP code: 0x100 (Out_MBox is empty)
(in file Emu\Cell\SPUThread.cpp:1772)
F {SPU[0x2000001] Thread (10 spu_runtime) [0x055e0]} class std::runtime_error thrown: Unknown STOP code: 0x100 (Out_MBox is empty)
(in file Emu\Cell\SPUThread.cpp:1772)
F {SPU[0x2000000] Thread (00 spu_runtime) [0x055e0]} class std::runtime_error thrown: Unknown STOP code: 0x100 (Out_MBox is empty)
(in file Emu\Cell\SPUThread.cpp:1772)

after unpause

with few frames like this

and spam E {rsx::thread} RSX: nv406e::semaphore_acquire has timed out. semaphore_address=0x40300560

MarioSonic2987 · 2017-12-12T16:42:41Z

Fixes car's reflection in MCLA with OpenGL:

stumts · 2017-12-13T02:35:15Z

It fixes Virtua Tennis 4 menu:

But no change ingame:

greentop · 2017-12-13T05:16:02Z

Hyperdimension Neptunia is seeing much improvement. Fixing the blooming in Vulkan will really make this game more playable.

Kravickas · 2017-12-13T15:07:49Z

Winter Star is just worse , less time outs but even less fps ...cant get single ''normal'' render, but that game need spu recompiler for speed anyway more than anything.

Illynir · 2017-12-13T15:12:18Z

the last commit on Semaphore timeout is critical on Nier/Nier Replicant. Game freeze 1 second every time the error appears now and Vulkan crash after a while with error:

F {rsx::thread} class std::runtime_error thrown: Assertion Failed! Vulkan API call failed with unrecoverable error: Device lost (Driver crashed with unspecified error or stopped responding and recovered) (VK_ERROR_DEVICE_LOST)
(in file c:\projects\rpcs3\rpcs3\emu\rsx\vk\VKHelpers.h:1130)

- Fixes remap vectors for memory copied via blit engine as it has no context

- Handle blit resources in a more consistent way - TODO: Handle some corner cases (piyotama)

- Fixes messed up BG on retroarch glyphs

- Abort nv406e semaphore acquire if the rsx thread stalls/crashes - Fix texture size approximation to take mipmaps into account. Fixes some games hanging with WCB

- Sometimes square renders are done to surfaces with pitch=64 and re-uploaded with swizzle scanning -- This setup avoids discarding targets if they are square and pitch == 64

- Force mipmap count to 1 if sampling from an RTV/DSV - TODO: Better wcb flush detection, it should be better to re-upload the texture after it has been dwnloaded if expected mipmaps are > 1

- Implement BEM - Add LG2 to special instructions

kd-11 · 2017-12-18T07:44:40Z

@Illynir The two errors seem to be unrelated, but I had to raise the hang detection timeout. 33ms is too short a duration to truly detect if something has gone wrong and attempt a recovery. A more comprehensive solution will be required as well as more tests.

@danilaml Critiques noted. The 'const' madness is borne of gcc paranoia (it's all over the texture code) and will need a more thorough set of changes that I will submit in a separate PR. I don't want to wrestle travis with all the other functional changes in the same PR.

danilaml reviewed Dec 11, 2017

View reviewed changes

kd-11 changed the title ~~rsx: Fixes~~ [WIP] rsx: Fixes Dec 12, 2017

StarWolf3000 mentioned this pull request Dec 13, 2017

Corrupted graphics - Hyperdimension Neptunia [BLES01178] #3740

Closed

kd-11 force-pushed the rsx_volatile branch from e55e7a6 to 4dabec0 Compare December 18, 2017 06:21

kd-11 added 16 commits December 18, 2017 09:34

rsx: Implement delayed swizzle remap for blit engine resources

221956a

- Fixes remap vectors for memory copied via blit engine as it has no context

rsx: Texture cache fixes

89cc3e2

- Handle blit resources in a more consistent way - TODO: Handle some corner cases (piyotama)

fix linux builds

0cdf8fa

rsx: Fix RGB565 blits. Data is byteswapped on input

0f1b5f8

- Fixes messed up BG on retroarch glyphs

rsx: Minor fixes

fb1f16f

- Abort nv406e semaphore acquire if the rsx thread stalls/crashes - Fix texture size approximation to take mipmaps into account. Fixes some games hanging with WCB

rsx: Framebuffer setup fixes

fd55ed5

- Sometimes square renders are done to surfaces with pitch=64 and re-uploaded with swizzle scanning -- This setup avoids discarding targets if they are square and pitch == 64

rsx/cfg: Lower the default scaling threshold to 16x16

89be4e8

rsx: framebuffer textures do not have mipmaps!

4607048

- Force mipmap count to 1 if sampling from an RTV/DSV - TODO: Better wcb flush detection, it should be better to re-upload the texture after it has been dwnloaded if expected mipmaps are > 1

rsx: Pause FIFO queue when changing ctrl registers

36ce361

rsx: Implement variable point size

d4d8e28

rsx/fp: Stuff

4a28b3a

- Implement BEM - Add LG2 to special instructions

rsx/fp: Implement TEXBEM (untested)

4522a56

rsx/fp: Implement TXPBEM

c5a2213

rsx/fp: Hotfix for TEXBEM/TXPBEM

3229602

Update FragmentProgramDecompiler.cpp

891168d

rsx/fp: Fix typo

7c64210

rsx: Raise semaphore timeout duration bacause some games are very slow

33483b2

kd-11 force-pushed the rsx_volatile branch from 4dabec0 to 33483b2 Compare December 18, 2017 06:37

kd-11 changed the title ~~[WIP] rsx: Fixes~~ rsx: Fixes Dec 18, 2017

kd-11 merged commit de5dab3 into RPCS3:master Dec 18, 2017

Kojikun1 mentioned this pull request Dec 18, 2017

Regression: Nier Replicant [BLJM60223] (Vulkan) #3768

Closed

Asinin3 mentioned this pull request Dec 18, 2017

Regressions with #3931 #3947

Closed

AniLeo mentioned this pull request Dec 27, 2017

RetroArch PS3 graphics issues #3905

Closed

xplosion666 mentioned this pull request Jan 9, 2018

Regression: The Legend of Heroes: Trails of Cold Steel II (#3931) #4038

Closed


		GLenum remap_values[4];

		for (u8 channel = 0; channel < 4; ++channel)

Uh oh!

Uh oh!

Conversation

kd-11 commented Dec 11, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

danilaml Dec 11, 2017

Choose a reason for hiding this comment

Uh oh!

kd-11 Dec 11, 2017

Choose a reason for hiding this comment

Uh oh!

danilaml Dec 11, 2017

Choose a reason for hiding this comment

Uh oh!

kd-11 Dec 11, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

danilaml Dec 11, 2017

Choose a reason for hiding this comment

Uh oh!

danilaml Dec 11, 2017

Choose a reason for hiding this comment

Uh oh!

danilaml Dec 11, 2017

Choose a reason for hiding this comment

Uh oh!

danilaml Dec 11, 2017

Choose a reason for hiding this comment

Uh oh!

Kravickas commented Dec 11, 2017

Uh oh!

MarioSonic2987 commented Dec 12, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

stumts commented Dec 13, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

greentop commented Dec 13, 2017

Uh oh!

Kravickas commented Dec 13, 2017

Uh oh!

Illynir commented Dec 13, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kd-11 commented Dec 18, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

kd-11 commented Dec 11, 2017 •

edited

Loading

kd-11 Dec 11, 2017 •

edited

Loading

MarioSonic2987 commented Dec 12, 2017 •

edited

Loading

stumts commented Dec 13, 2017 •

edited

Loading

Illynir commented Dec 13, 2017 •

edited

Loading