gl/vk: Enable vertex texture fetch by kd-11 · Pull Request #2127 · RPCS3/rpcs3

kd-11 · 2016-09-05T22:43:47Z

Enable vertex textures.
Most of the rsx side was already done, so adding to the renderer should not be a big deal.
However, currently, the decompiler only addresses vertex texture 0.

This PR enables vertex texture fetch in GL backend only (for now)

mention-bot · 2016-09-05T22:43:49Z

@kd-11, thanks for your PR! By analyzing the annotation information on this pull request, we identified @vlj, @raven02 and @Nekotekina to be potential reviewers

kd-11 · 2016-09-05T22:46:49Z

@raven02 Please check for regressions. The vertex texture sample works, ~~but the texture seems to have repeat set to false (atleast for the W32_Z32_Y32_X32_FLOAT test) which confines the geometry to a small block. Maybe we shouldn't honor clamping modes?~~
Texture wrap for vertex textures is unimplemented

kd-11 · 2016-09-05T23:30:24Z

Sort of working now. Some bugs are visible but they seem unrelated, I think the strange geometry over the "terrain" may be a shader effect for depth fog that isn't working properly. If you can get to the underside of the "terrain" you can see the vertex deformations are correct.

kd-11 · 2016-09-05T23:33:29Z

Spurious build failure with appveyor.

dbz400 · 2016-09-05T23:59:36Z

Nice @kd-11 .Will check it for regression once the appveyor build ok

Nezarn · 2016-09-06T10:27:55Z

Hatsune Miku Dreamy Theater, 2nd, and extend can now boot
http://i.imgur.com/LTAHxP1.png

ps: someone should restart appveyor, since it didn't had any build errors (at least i can't see any), and also VS builds fine

dbz400 · 2016-09-06T11:32:17Z

I tested a bit as well and looks okay for most games.

Fix #1850

kd-11 · 2016-09-06T13:22:13Z

Thats good news. Will update with vulkan and dx12 support.

kd-11 · 2016-09-08T14:12:47Z

Fixed opengl vertex issue, it seems rsx decode returns 0x7fffffff when restart index is 0xffffffff. For some reason bit 31 is 0 when it shouldn't be.
Added vulkan vertex textures and fix for cases where custom restart indices would be used

D3D12 vertex textures is still WIP. I'm almost certain I messed up the descriptor bindings somehow and I'm short on time to keep digging. @vlj please take a look (I get the invalid parameter error)

@raven02 please test for vulkan and ogl regressions

Some more work needs to go into the decompiler itself to get the vertex index being sampled. The dst opcode structure still contains some unknowns. I'll have to ask from those familiar with rsx internals (@vlj) or refer to nouveau docs for the ISA. If anyone has insight into this feel free to chip in. Should probably be a 2-bit encoding in one of the Dx sections.

ghost · 2016-09-08T14:22:14Z

 	CELL_GCM_TEXTURE_MAX_ANISO_16 = 7,

 	// Texture Filter
+	CELL_GCM_TEXTURE_FILTER_NONE = 0,


There is no such filter.

Vertex textures do not specify filtering. In the geforce 7 era, filtering vertex textures was not supported at all. I checked this, and on the vertex_texture sample, texture filter modes are set to 0.

EDIT: I could optionally remove that enum and make calls to vertex_texture::min/mag_filter() always return CELL_GCM_TEXTURE_FILTER_NEAREST.

Whatever they do, CELL_GCM_TEXTURE_FILTER_NONE simply doesn't exist. We didn't invent these constants, it's confusing. And note my recent issue about gcm_enums, this problem seems relevant that the values are checked in the situation they shouldn't.

dbz400 · 2016-09-08T15:35:38Z

Tested for some games with both GL and Vulkan backend .It looks good.

SakataGintokiYT · 2016-09-08T17:22:20Z

@kd-11
[3a3c1eb3]

kd-11 · 2016-09-08T20:03:44Z

I'll have to revert some texture format changes on vulkan/gl.

kd-11 · 2016-09-08T20:14:25Z

@SakataGintokiYT Are the vulkan/gl issues regressions? If so, @raven02 I'll need your help to figure out which texture format I botched here. I only changed swizzles for X32/16 and W32_Z32_Y32_X32 which were wrong based on inspection of shader code using the textures.

kd-11 · 2016-09-08T21:35:14Z

Minor bugfixes and reworked a few areas.
Currently:

OpenGL

Vulkan

For D3D12, the shaders generated are okay, but the upload/binding code is probably where it breaks.

dbz400 · 2016-09-09T01:42:45Z

@SakataGintokiYT , is master also broken the Naruto as well ? as i found some games already broken with master and not related to this vertex texture enhancement.

SakataGintokiYT · 2016-09-09T12:30:31Z

@kd-11
@raven02

The games of naruto are broken in master build , in VK and GL It is not a regression this commit.

dbz400 · 2016-09-09T13:26:50Z

Thanks for checking this out .It would be nice if you can cross check which commit start the breaking so we can fix the regression .

SakataGintokiYT · 2016-09-09T19:31:08Z

Naruto games only work in DX12 . Never work correctly on Vulkan and OGL so it's not a regression

kd-11 · 2016-09-17T16:44:59Z

I've removed dx12 part for now. The shaders and upload code is fine, but the resource binding/descriptor stuff is causing a mismatch. See https://github.com/kd-11/rpcs3/tree/dx12

Travis-Ci and appveyor are crashing before compilation starts, I'm not sure why. Should be good to go as part 1 for now as it shouldn't cause any regressions.

dbz400 · 2016-09-18T02:23:56Z

Need someone to restart appveyor

remove old logging method that overwrites single file

revert inadvertent decompiler update

kd-11 · 2016-09-20T13:19:32Z

Appveyor failing again during pre-compilation setup

dbz400 · 2016-09-20T13:28:32Z

@Nekotekina , please help to restart the appveyor.

* Porting of DH's user clip implementation in gl * Tweak clang-format * rsx: Move inline array to draw_clause structure. * rsx: Use variant based draw commands. * rsx: Dump DRAW_ARRAYS and DRAW_INDEX_ARRAYS. * GL: old recompiler clean up (#2142) * RSX texture refactor (#2144) * gl/vk: Enable vertex texture fetch (#2127) * gl: Enable vertex textures * rsx: use textureLod instead of generic texture sample * rsx: handle uploading of W32_X32_Y32_Z32 * gl: Re-enable proper shader logging remove old logging method that overwrites single file * gl: Declare texture_coord_scale for vertex samplers * gl: texture remap fixes; enable remap for vertex textures * gl: offset texture indices to base layer 16 * rsx: Fix W32_Z32_Y32_X32_FLOAT subresource layout * vk: Enable vertex textures * rsx: define special calls for vertex texture fetch * gl: improved vertex texture fetch setup * vk: Fix texture formats and component mapping * vk: Implement vertex texture fetch functions properly * vk/gl: proper fix for primitive restart index revert inadvertent decompiler update * gl: Disable filtering for vertex textures * Hopefully fix appveyor build (#2148) * GL/Vulkan: Bug fixes and improvements; alphakill for vulkan (#2146) * vk: Zero-initialize some more structs * gl: Clean up fragment program generation code * vk: Enable alpha kill * vk: Fix surface clear; redirect output for surface_type:b * vk: Tie renderpass to program object to avoid incompatible passes * vk: Properly compute descriptor pool size (#2150) * rsx: Set default attribute format to float. * rsx: vertex attribute size is 1 again for CMP, let backend handles this formats properties. * rsx: Move printing function in a separate header/cpp * Porting of DH's user clip implementation in gl

dbz400 added Enhancement Render: OpenGL labels Sep 6, 2016

kd-11 force-pushed the master branch from 61d3ccc to 5950141 Compare September 8, 2016 14:06

ghost reviewed Sep 8, 2016
View reviewed changes

dbz400 added Render: Vulkan Render: Direct3D 12 labels Sep 8, 2016

kd-11 force-pushed the master branch 2 times, most recently from 4df75d4 to d2da682 Compare September 8, 2016 21:28

kd-11 force-pushed the master branch 2 times, most recently from 9391c8b to d54b802 Compare September 17, 2016 15:55

kd-11 changed the title ~~Enable vertex texture fetch (WIP)~~ gl/vk: Enable vertex texture fetch Sep 17, 2016

dbz400 removed the Render: Direct3D 12 label Sep 18, 2016

kd-11 added 15 commits September 20, 2016 16:07

gl: Enable vertex textures

6f415be

rsx: use textureLod instead of generic texture sample

bc31fee

rsx: handle uploading of W32_X32_Y32_Z32

2688ffa

gl: Re-enable proper shader logging

40136d2

remove old logging method that overwrites single file

gl: Declare texture_coord_scale for vertex samplers

4e69b3b

gl: texture remap fixes; enable remap for vertex textures

7cc602d

gl: offset texture indices to base layer 16

4d83faa

rsx: Fix W32_Z32_Y32_X32_FLOAT subresource layout

8389a24

vk: Enable vertex textures

e4ef6a3

rsx: define special calls for vertex texture fetch

bc21baa

gl: improved vertex texture fetch setup

a9507b9

vk: Fix texture formats and component mapping

5b81875

vk: Implement vertex texture fetch functions properly

ab5f5cd

vk/gl: proper fix for primitive restart index

c9a11da

revert inadvertent decompiler update

gl: Disable filtering for vertex textures

a519281

kd-11 force-pushed the master branch from d54b802 to a519281 Compare September 20, 2016 13:12

dbz400 merged commit 867e921 into RPCS3:master Sep 20, 2016

SakataGintokiYT mentioned this pull request Oct 8, 2016

GL/Vulkan: The Walking Dead: Michonne #2190

Closed

Uh oh!

Uh oh!

Conversation

kd-11 commented Sep 5, 2016

Uh oh!

mention-bot commented Sep 5, 2016

Uh oh!

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

Uh oh!

Uh oh!

kd-11 commented Sep 5, 2016

Uh oh!

kd-11 commented Sep 5, 2016

Uh oh!

dbz400 commented Sep 5, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Nezarn commented Sep 6, 2016

Uh oh!

dbz400 commented Sep 6, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kd-11 commented Sep 6, 2016

Uh oh!

kd-11 commented Sep 8, 2016

Uh oh!

ghost Sep 8, 2016

Choose a reason for hiding this comment

Uh oh!

kd-11 Sep 8, 2016 • 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!

ghost Sep 8, 2016

Choose a reason for hiding this comment

Uh oh!

dbz400 commented Sep 8, 2016

Uh oh!

SakataGintokiYT commented Sep 8, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kd-11 commented Sep 8, 2016

Uh oh!

kd-11 commented Sep 8, 2016

Uh oh!

kd-11 commented Sep 8, 2016

Uh oh!

dbz400 commented Sep 9, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SakataGintokiYT commented Sep 9, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dbz400 commented Sep 9, 2016

Uh oh!

SakataGintokiYT commented Sep 9, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kd-11 commented Sep 17, 2016

Uh oh!

dbz400 commented Sep 18, 2016

Uh oh!

kd-11 commented Sep 20, 2016

Uh oh!

dbz400 commented Sep 20, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

kd-11 commented Sep 5, 2016 •

edited

Loading

dbz400 commented Sep 5, 2016 •

edited

Loading

dbz400 commented Sep 6, 2016 •

edited

Loading

kd-11 Sep 8, 2016 •

edited

Loading

SakataGintokiYT commented Sep 8, 2016 •

edited

Loading

dbz400 commented Sep 9, 2016 •

edited

Loading

SakataGintokiYT commented Sep 9, 2016 •

edited

Loading

SakataGintokiYT commented Sep 9, 2016 •

edited

Loading