Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The GPU API MkII #9312

Merged
merged 1 commit into from
Aug 29, 2024
Merged

The GPU API MkII #9312

merged 1 commit into from
Aug 29, 2024

Conversation

flibitijibibo
Copy link
Collaborator

@flibitijibibo flibitijibibo commented Mar 19, 2024

With 3.0 quickly on the horizon, we've decided to fast-track this so we can get more eyeballs sooner:

A close relative to the FNA project is the MoonWorks project, which intends to be more of a successor to XNA rather than a reimplementation like FNA. The graphics component is called Refresh, which is like FNA3D but targets modern APIs like Vulkan. With SDL_gpu still in the early stages, and with Refresh in the process of revamping its API for a 2.0 release anyway, we've decided to just turn Refresh into a possible candidate for the final GPU API.

Currently, Refresh supports Vulkan and the PS5 graphics API, with D3D11 deferred context support on the way. It is being used in production for Samurai Gunn 2 on PC and console. It also includes a shader system, but it takes a different approach by doing compilation offline, at least for now fixed!

@thatcosmonaut will be the main Point of Contact since he's the author, but the FNA core team will try to be involved as well if this seems okay to move forward with.

Our issue tracker can be found here: https://github.com/thatcosmonaut/SDL/issues

@darkerbit
Copy link

Would like to state my support for this, with the following points:

  1. Compute is a first-class feature of Refresh, and I feel SDL_GPU's previous draft not including it was a massive oversight. Compute is a feature in every modern graphics API (and even some older ones) and Refresh's API makes them delightfully simple to work with, which I feel is good to encourage. A more niche point is that compute shaders also solve every practical usecase of a GPU-timeline buffer->texture and texture->buffer copy, which is not a feature that is possible to implement in every graphics API (notably, D3D11)
  2. The shader formats being existing formats is a good thing in my opinion, as there exists standard tooling for creating and debugging them. The benefits are addressed in detail in Proposal: Consume Shaders in DXBC Format SDL_shader_tools#17, though that isn't the solution Refresh is using right now.
  3. Refresh already has an excellent Vulkan backend. This is going to save a tremendous amount of development time, as Refresh's Vulkan backend not only already exists but is also, since 2.0, incredibly performant.
  4. Refresh 2.0 puts great care into ensuring performant resource safety via cycling when possible. SDL_GPU's previous draft included APIs for this, however I don't think this is something that should be exposed to the user, as this is fundamentally backend-specific and complicates API usage. Refresh performs resource safety internally, with fantastic results.

@thatcosmonaut
Copy link
Collaborator

Hello, I'm the author so I'll take some time to explain this proposal.

First, the shader situation. This API's shader solution is a script called shaderbuild.py, it's essentially a frontend for offline shader building tools on the client's machine, and it globs various formats together so they can individually be sent to the appropriate render backends. I'm aware that the original proposal included online shader compilation. This solution doesn't forbid this, because future SDLSL source could just be included in the binary and the CreateShaderModule function can translate it into the desired backend's bytecode on the fly. We wouldn't have to break the public API to allow this, which is a nice plus, and it prevents the shader compiler from being a blocker on using this API. When authoring a shader the API expects certain set layouts depending on the resource and shader stage: vertex samplers are set 0, fragment samplers are set 1, vertex uniforms are set 2 and fragment uniforms are set 3.

This is a modern-style rendering API, so almost all tasks occur in a deferred context and are broken up into render passes, compute passes, and copy passes. All operations that write to a resource have the ability to cycle to avoid inter-frame dependencies - handles to graphics resources like GpuBuffers are just containers so we can cycle references to internal resources. There are some data quirks due to AMD D3D11 drivers being not great - this is why there are a few different WriteOptions enums. I'd like to get rid of these but I haven't fully been able to work around the fact that D3D11 data APIs do not work as advertised on AMD.

Presentation is handled via SDL_GpuAcquireSwapchainTexture, which associates the given command buffer with a swapchain image. When SDL_GpuSubmit is called with this command buffer, the presentation structures are automatically configured and submitted. SDL_GpuSubmit automatically handles submission fences, but the client can choose to explicitly synchronize by calling SDL_GpuSubmitAndAcquireFence and using the returned SDL_GpuFence handle.

The rest of the API is fairly bog-standard binding, render, and compute dispatch calls.

@thatcosmonaut
Copy link
Collaborator

I noticed that the CI treats all warnings as errors, which is fine, but there are some things like unused function variables or pointer size casts that I need to be able to work around. Are there macros for handling these warnings?

I was also having a difficult time getting preprocessor defines showing up correctly in the project from CMake, so I could use some help with that.

@slouken slouken requested review from icculus and madebr March 19, 2024 17:25
include/SDL3/SDL_gpu.h Outdated Show resolved Hide resolved
@icculus
Copy link
Collaborator

icculus commented Mar 19, 2024

This is not what I was expecting to see in my inbox this morning.

I'm going to take some time to study this and think on it. I want to be clear, this might get combined with the other branch somewhere between "this particular idea was better than mine so a pivot makes sense" to "this piece got copy/pasted into the my branch," to "this is better in all ways, so I put my branch in the trash." I don't know how this will shake out yet.

Also to be clear: there is no scenario where either this PR or my branch is landing in the 3.2.0 release in the name of expediency.

@slime73
Copy link
Contributor

slime73 commented Mar 19, 2024

This API's shader solution is a script called shaderbuild.py, it's essentially a frontend for offline shader building tools on the client's machine,

Some 2c from an outsider: I understand some of the reasons for purely offline shader compilation (runtime compilation isn't supported on every possible platform anyway, including third party cross-compile libraries might bloat the binary size considerably – or maintaining custom cross-compilation is a massive maintenance burden, optimization can be more aggressive, etc.) – but purely offline compilation incompatible with the engine I develop, so if SDL_gpu does this it immediately puts it off the table for me.

Also, the way it's set up right now seems to need a lot of setup from developers using it: an install of python in their path, an install of glslc in their path, an install of spirv-cross in their path, some per-project setup to run the script on the appropriate files if you don't want to manually run everything in a terminal, etc. If I did use this, that part would probably feel really frustrating to me.

@thatcosmonaut
Copy link
Collaborator

thatcosmonaut commented Mar 19, 2024

As I mentioned, I know there are perfectly good reasons to support online shader compilation and the proposed format intentionally does not preclude that from being possible. This was the best solution I can think of that does not involve pulling in an enormous dependency and works today. At the end of the day something has to compile a shader language to actual bytecode or else we are completely blocked. I mostly went with python because there are a few other scripts in SDL that use it and there's not really a precedent for SDL shipping something like this. But as long as the input format is well-defined it wouldn't really matter what developers use to generate it.

@slime73
Copy link
Contributor

slime73 commented Mar 19, 2024

and works today.

I don't want to speak for the SDL team too much but I don't get the sense this is really the top priority for SDL_gpu in the current moment - figuring out something that works cleanly and robustly tomorrow is likely more important than something simply working in any state immediately. If you are blocked by a lack of SDL_gpu right now then it probably makes sense to use something else in the meantime instead of hoping it ships in the very near future.

Given the rest of SDL's ecosystem, the most idiomatic offline shader compilation tool for SDL I can think of would be a separate satellite library, which could avoid needing system-wide packages like python/glslc for people using it, and might also let people ship it with their app if they want runtime or otherwise on-device compilation I suppose.

But maybe that's getting a bit too far into the weeds for now given Ryan's previous message, and I should just let him think on it without all the noise from me. :)

@1bsyl
Copy link
Contributor

1bsyl commented Mar 20, 2024

(if possible, SDL could run (with compilation flags) in different flavors: legacy SDL_Render, Ryan's SDL_GPU , etc.. )

@sezero
Copy link
Contributor

sezero commented Mar 20, 2024

Got type redefinition errors:

In file included from /tmp/SDL3-gpu-9312/src/gpu/../video/khronos/vulkan/vulkan.h:11,
                 from /tmp/SDL3-gpu-9312/src/gpu/SDL_gpu_vulkan.c:31:
/tmp/SDL3-gpu-9312/src/gpu/../video/khronos/vulkan/vulkan_core.h:101: error: redefinition of typedef ‘VkInstance’
/tmp/SDL3-gpu-9312/include/SDL3/SDL_vulkan.h:52: note: previous declaration of ‘VkInstance’ was here
In file included from /tmp/SDL3-gpu-9312/src/gpu/../video/khronos/vulkan/vulkan.h:11,
                 from /tmp/SDL3-gpu-9312/src/gpu/SDL_gpu_vulkan.c:31:
/tmp/SDL3-gpu-9312/src/gpu/../video/khronos/vulkan/vulkan_core.h:7513: error: redefinition of typedef ‘VkSurfaceKHR’
/tmp/SDL3-gpu-9312/include/SDL3/SDL_vulkan.h:53: note: previous declaration of ‘VkSurfaceKHR’ was here
make[2]: *** [CMakeFiles/SDL3-shared.dir/src/gpu/SDL_gpu_vulkan.c.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [CMakeFiles/SDL3-shared.dir/all] Error 2
make: *** [all] Error 2

Easy fix:

diff --git a/src/gpu/SDL_gpu_vulkan.c b/src/gpu/SDL_gpu_vulkan.c
index 7feafda..acf57d2 100644
--- a/src/gpu/SDL_gpu_vulkan.c
+++ b/src/gpu/SDL_gpu_vulkan.c
@@ -22,14 +22,14 @@
 #include "SDL_internal.h"
 
 #if SDL_GPU_VULKAN
-#include <SDL3/SDL_vulkan.h>
-
 /* Needed for VK_KHR_portability_subset */
 #define VK_ENABLE_BETA_EXTENSIONS
 
 #define VK_NO_PROTOTYPES
 #include "../video/khronos/vulkan/vulkan.h"
 
+#include <SDL3/SDL_vulkan.h>
+
 #include "SDL_gpu_driver.h"
 
 #define VULKAN_INTERNAL_clamp(val, min, max) SDL_max(min, SDL_min(val, max))

Minor annoying 'maybe used uninitialized' warning (seems bogus):

/tmp/SDL3-gpu-9312/src/gpu/SDL_gpu_vulkan.c: In function ‘VULKAN_INTERNAL_DeterminePhysicalDevice’:
/tmp/SDL3-gpu-9312/src/gpu/SDL_gpu_vulkan.c:11338: warning: ‘suitableQueueFamilyIndex’ may be used uninitialized in this function

Silencing:

diff --git a/src/gpu/SDL_gpu_vulkan.c b/src/gpu/SDL_gpu_vulkan.c
--- a/src/gpu/SDL_gpu_vulkan.c
+++ b/src/gpu/SDL_gpu_vulkan.c
@@ -11385,6 +11385,7 @@ static Uint8 VULKAN_INTERNAL_DeterminePhysicalDevice(
 
     /* Any suitable device will do, but we'd like the best */
     suitableIndex = -1;
+    suitableQueueFamilyIndex = 0;
     highestRank = 0;
     for (i = 0; i < physicalDeviceCount; i += 1)
     {

Noticed that dynapi isn't touched: Running gendynapi.py under src/dynapi/ will update it.
(It will emit lots of missing documentation warnings along the way..)

@meyraud705
Copy link
Contributor

As I am interested in SDL_gpu and am working on an OpenGL implementation of it (icculus#7), here what I think:

I like the idea of SDL_gpu handling cycles. I am not sure why some combination are not allowed: no safe for GPU buffer and no unsafe for texture.

Most of the structs are similar: Device, Pipeline... TransferBuffer which is like the CpuBuffer but looks useful. There is no *Pass struct, user can't do anything with them but they avoid mixing of render and copy command so I think it is better to have them.

For the functions I prefer @icculus version: "put this buffer/texture at this location". Also, while passing ten parameters to a function is ugly, pointer to struct for 2 parameters and nested struct (TextureRegion -> TextureSlice -> Texture) is not better.

I would like to see the spinning cube test (https://github.com/icculus/SDL/blob/5db1fd7491ccf1d9b209c91ba163da0b2fb54f6f/test/testgpu_spinning_cube.c) with this API (including its shader), especially how you handle the absence of binding location.

@flibitijibibo
Copy link
Collaborator Author

flibitijibibo commented Mar 26, 2024

Latest push starts the work on Metal support, and reworks the shader system slightly to make a clear distinction between "raw" shaders and "portable" shaders - in particular, we're using the FNA3D port as a stress test for supporting shader creation at runtime. We're currently using the MojoShader SPIR-V emitter, which can be passed directly when Vulkan is active, and for other backends we're using a separate (and more importantly, optional) library to translate:

https://github.com/thatcosmonaut/SDL_shader

We're using SPIR-V since MojoShader already supports it, but the same idea would apply to SDL's shader format: A separate library would take in the blob and emit what the active SDL_gpu backend needs, and SDL itself doesn't know or care where the shaders came from.

One thing we haven't really touched at all is the formatting - I seem to remember formatting tools getting involved when the decision was made to change some of SDL's style guidelines, but I can't find them anywhere. If that exists somewhere the next push should have the formatting cleaned up.

@flibitijibibo
Copy link
Collaborator Author

As of the latest push, we're in-game:

image

Still some stuff to iron out but we've now got this working with no offline shader compilation needed! Once we've taken care of all the FNA3D TODOs/FIXMEs we'll start cleaning up the SDL side next, and that should set the stage for porting to D3D12/Metal. I believe we have a test program ported from Ryan's draft as well, it just hasn't been added to this repo yet.

@flibitijibibo
Copy link
Collaborator Author

Activity on this will probably calm down over the weekend, so the code shouldn't move too much if anyone's waiting to review this... in the meantime, here's the current revision booting up Streets of Rage 4 (with some bugs on our end, but still!)

image

@thatcosmonaut
Copy link
Collaborator

The main thing I want to look at is streamlining the various WriteOptions. I'll look into that and writing up SDL-style doc comments on the header next week.

@flibitijibibo
Copy link
Collaborator Author

Latest push gets Wizorb running on Metal! We're still pushing forward via FNA3D but if anyone is interested in looking at Metal/D3D12 support in particular, please get in touch.

@flibitijibibo
Copy link
Collaborator Author

Latest push gets in-game for a good chunk of our trace database - for fun, here's Celeste:

image

Interestingly enough, the one component that's actually pretty close to done is the shader system; at this point I'm really happy with how the MojoShader implementation turned out and it shows a good example of supporting shaders without necessarily needing an SDLSL first:

https://github.com/FNA-XNA/FNA3D/blob/sdl_gpu/src/mojoshader_sdlgpu.c

There are some remaining features left before we start focusing on the backends, but we're now pretty much at a point where the overall design is there but may not have the minimum feature set needed just yet (for example, the next push will add hardware instancing support).

@thatcosmonaut
Copy link
Collaborator

Instancing and occlusion queries are in, just need to fill those in on Metal. We'll just keep going through our test cases to ferret out bugs.

@thatcosmonaut
Copy link
Collaborator

Boiled the cycle concept down to a bool and got rid of all the various WriteOption enums. I've documented how this works thoroughly in the code now.

Right now we're working on making the shader module creation struct take the respective IR format of each backend so that SDL itself doesn't have to wrap any shader compilers.

@flibitijibibo
Copy link
Collaborator Author

Will do - we're all going to get some rest now 😅

@flibitijibibo flibitijibibo deleted the gpu branch August 29, 2024 23:06
@slouken
Copy link
Collaborator

slouken commented Aug 29, 2024

How do you feel about size_t instead of Uint32 for byte sizes in API function signatures?

@flibitijibibo
Copy link
Collaborator Author

Will defer to @thatcosmonaut for the backend details but I think we decided against it for most cases, which eventually became all - one that comes to mind is buffers, which could be size_t but then that would probably make simultaneous 32/64-bit compatibility hard if the buffers start to get huge. For places where size_t could apply I could maybe see Uint64 instead...?

@icculus
Copy link
Collaborator

icculus commented Aug 29, 2024

Leave them as Uint32 in the GPU API.

@sezero
Copy link
Contributor

sezero commented Aug 29, 2024

In the config files, i.e. include/build_config/SDL_build_config_???.h, things like #define SDL_GPU_VULKAN SDL_VIDEO_VULKAN or #define SDL_GPU_METAL SDL_VIDEO_METAL look like they rely on the right side being defined either as 0 or 1. It will be problem if the right-side macro, e.g. SDL_VIDEO_METAL or SDL_VIDEO_VULKAN is not defined at all.

@slouken
Copy link
Collaborator

slouken commented Aug 30, 2024

Here are some tweaks for review, they're all up for discussion by the GPU folks:
#10622

@sezero
Copy link
Contributor

sezero commented Aug 30, 2024

P.S.: Is UTF-8 BOM in gpu src files really necessary?

$ find src/gpu | xargs file | grep BOM
src/gpu/d3d11/SDL_gpu_d3d11.c:           UTF-8 Unicode (with BOM) C program text
src/gpu/SDL_sysgpu.h:                    UTF-8 Unicode (with BOM) C program text
src/gpu/d3d12/SDL_gpu_d3d12.c:           UTF-8 Unicode (with BOM) C program text
src/gpu/SDL_gpu.c:                       UTF-8 Unicode (with BOM) C program text

@slouken
Copy link
Collaborator

slouken commented Aug 30, 2024

In the config files, i.e. include/build_config/SDL_build_config_???.h, things like #define SDL_GPU_VULKAN SDL_VIDEO_VULKAN or #define SDL_GPU_METAL SDL_VIDEO_METAL look like they rely on the right side being defined either as 0 or 1. It will be problem if the right-side macro, e.g. SDL_VIDEO_METAL or SDL_VIDEO_VULKAN is not defined at all.

Fixed in #10622

@slouken
Copy link
Collaborator

slouken commented Aug 30, 2024

P.S.: Is UTF-8 BOM in gpu src files really necessary?

$ find src/gpu | xargs file | grep BOM
src/gpu/d3d11/SDL_gpu_d3d11.c:           UTF-8 Unicode (with BOM) C program text
src/gpu/SDL_sysgpu.h:                    UTF-8 Unicode (with BOM) C program text
src/gpu/d3d12/SDL_gpu_d3d12.c:           UTF-8 Unicode (with BOM) C program text
src/gpu/SDL_gpu.c:                       UTF-8 Unicode (with BOM) C program text

Fixed in #10622

@slouken
Copy link
Collaborator

slouken commented Aug 30, 2024

I'm going to go ahead and merge my tweaks so people trying out the beta get the new function names. Please let me know if you disagree with any of the changes.

@slouken
Copy link
Collaborator

slouken commented Aug 30, 2024

FYI, D3D12_ClaimWindow() always sets up the swap chain with vsync, so things like testsprite are unexpectedly running at 60 FPS.

@sezero
Copy link
Contributor

sezero commented Aug 30, 2024

P.S.: Is UTF-8 BOM in gpu src files really necessary?

Fixed in #10622

include/SDL3/SDL_gpu.h has BOM too (sorry, I seem to have missed it)

@thatcosmonaut
Copy link
Collaborator

FYI, D3D12_ClaimWindow() always sets up the swap chain with vsync, so things like testsprite are unexpectedly running at 60 FPS.

This is intentional - swapchain queries on most backends require a pre-existing surface to be initialized, so the intended workflow is to claim a window, which sets up a swapchain with the universally supported parameters (SDR and VSYNC) and then query for support and call SetSwapchainParameters if you want something different.

@Akaricchi
Copy link
Contributor

I'm pretty sure the render driver is calling SetSwapchainParameters after claiming the window… at least it should be. testsprite is definitely not running with vsync for me on Vulkan, for what it's worth.

@slouken
Copy link
Collaborator

slouken commented Aug 30, 2024

Yep, I confirmed that it is, but something is still limiting the framerate to 60 FPS in the D3D12 driver.

@thatcosmonaut
Copy link
Collaborator

Got it, will investigate.

@slouken
Copy link
Collaborator

slouken commented Aug 30, 2024

Okay, everything is merged and I'm done partying on your code. Feel free to start merging changes. Please let me know who you'd like to have commit permissions, and I'll set them up.

@flibitijibibo
Copy link
Collaborator Author

Let's add @thatcosmonaut, since chances are good he'll need to review incoming changes anyhow.

@slouken
Copy link
Collaborator

slouken commented Aug 30, 2024

Let's add @thatcosmonaut, since chances are good he'll need to review incoming changes anyhow.

Added!

sulix added a commit to sulix/omnispeak that referenced this pull request Sep 5, 2024
This is a very early proof-of-concept for SDL3 GPU support, for the API
mentioned in libsdl-org/SDL#9312

It's currently lacking:
- A decent cleanup and error handling.
- Proper separation from the vulkan backend (I broke the vulkan shaders
  to implement this)
- A Makefile implementation (CMake only for now)
- Proper clearing of letterboxes/pillarboxes.
 - It'd be really nice to be able to clear, then blit without needing a
   separate render pass.
- Some strange framebuffer bugs on hasvk/wayland
- This version is crashing renderdoc at the moment, which is probably
  bad.
- Not once tested with anything other than the Vulkan backend, which has
  a habit of allowing a lot of things other backends don't.
sulix added a commit to sulix/omnispeak that referenced this pull request Sep 9, 2024
This is a very early proof-of-concept for SDL3 GPU support, for the API
mentioned in libsdl-org/SDL#9312

It's currently lacking:
- A decent cleanup and error handling.
- Proper separation from the vulkan backend (I broke the vulkan shaders
  to implement this)
- A Makefile implementation (CMake only for now)
- Proper clearing of letterboxes/pillarboxes.
 - It'd be really nice to be able to clear, then blit without needing a
   separate render pass.
- Some strange framebuffer bugs on hasvk/wayland
- This version is crashing renderdoc at the moment, which is probably
  bad.
- Not once tested with anything other than the Vulkan backend, which has
  a habit of allowing a lot of things other backends don't.
sulix added a commit to sulix/omnispeak that referenced this pull request Sep 13, 2024
This is a very early proof-of-concept for SDL3 GPU support, for the API
mentioned in libsdl-org/SDL#9312

It's currently lacking:
- A decent cleanup and error handling.
- Proper separation from the vulkan backend (I broke the vulkan shaders
  to implement this)
- A Makefile implementation (CMake only for now)
- Some strange framebuffer bugs on hasvk/wayland/HSW -- probably a
  driver bug
- Not once tested with anything other than the Vulkan backend, which has
  a habit of allowing a lot of things other backends don't.
sulix added a commit to sulix/omnispeak that referenced this pull request Sep 27, 2024
This is a very early proof-of-concept for SDL3 GPU support, for the API
mentioned in libsdl-org/SDL#9312

It's currently lacking:
- A decent cleanup and error handling.
- Proper separation from the vulkan backend (I broke the vulkan shaders
  to implement this)
- A Makefile implementation (CMake only for now)
- Some strange framebuffer bugs on hasvk/wayland/HSW -- probably a
  driver bug
- Not once tested with anything other than the Vulkan backend, which has
  a habit of allowing a lot of things other backends don't.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.