From 43d0c2100ef1a5df4b54525e50eb29fe7c39ec16 Mon Sep 17 00:00:00 2001 From: Gangzheng Tong Date: Tue, 8 Jul 2025 23:44:56 -0700 Subject: Convert gfx unit tests and examples to use slang-rhi (#7577) * Port first gfx unit test to slang-rhi * port triangle example to use slang-rhi * port platform-test to slang-rhi * Update platform-test to throttle mouse move events * port gpu-printing example to use slang-rhi * port model-viewer example to use slang-rhi * port ray-tracing example to use slang-rhi * port ray-tracing pipeline example to use slang-rhi * port reflection parameter blocks example to use slang-rhi * port shader-object example to use slang-rhi * port shader-toy example to use slang-rhi * Port most of tests to slang-rhi * port link-time-constant-array-size to use slang-rhi * Fix tests and find matching tests in slang-rhi * port autodiff-texture * remove gfx target; port nv-aftermath-example * update include path for shader-cursor.h * Disabled 2 more ported tests * fix build error * remove gfx test * put slang-rhi (static-lib) before slang (shared) * format code (#7621) Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> * add debug callback * format code (#7649) Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> * Address review comments; revert back to use SLANG_CHECK_MSG --------- Co-authored-by: slangbot Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- examples/example-base/example-base.h | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) (limited to 'examples/example-base/example-base.h') diff --git a/examples/example-base/example-base.h b/examples/example-base/example-base.h index 9aabac8d4..06970aaba 100644 --- a/examples/example-base/example-base.h +++ b/examples/example-base/example-base.h @@ -3,7 +3,7 @@ #include "core/slang-basic.h" #include "core/slang-io.h" #include "platform/window.h" -#include "slang-gfx.h" +#include "slang-rhi.h" #include "test-base.h" #ifdef _WIN32 @@ -23,6 +23,8 @@ void _Win32OutputDebugString(const char* str); #define EXAMPLE_MAIN(innerMain) PLATFORM_UI_MAIN(innerMain) #endif // _WIN32 +static const float kIdentity[] = {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1}; + struct WindowedAppBase : public TestBase { protected: @@ -32,39 +34,31 @@ protected: uint32_t windowWidth; uint32_t windowHeight; - Slang::ComPtr gDevice; + Slang::ComPtr gDevice; + Slang::ComPtr gQueue; + Slang::ComPtr gSurface; - Slang::ComPtr gSwapchain; - Slang::ComPtr gFramebufferLayout; - Slang::List> gFramebuffers; - Slang::List> gTransientHeaps; - Slang::ComPtr gRenderPass; - Slang::ComPtr gQueue; + Slang::List> gOfflineTextures; Slang::Result initializeBase( const char* title, int width, int height, - gfx::DeviceType deviceType = gfx::DeviceType::Default); - - void createFramebuffers( - uint32_t width, - uint32_t height, - gfx::Format colorFormat, - uint32_t frameBufferCount); - void createSwapchainFramebuffers(); - void createOfflineFramebuffers(); + rhi::DeviceType deviceType = rhi::DeviceType::Default); void mainLoop(); - Slang::ComPtr createTextureFromFile( + Slang::ComPtr createTextureFromFile( Slang::String fileName, int& textureWidth, int& textureHeight); + + void createOfflineTextures(); + virtual void windowSizeChanged(); protected: - virtual void renderFrame(int framebufferIndex) = 0; + virtual void renderFrame(rhi::ITexture* texture) = 0; public: platform::Window* getWindow() { return gWindow.Ptr(); } @@ -136,13 +130,9 @@ inline void diagnoseIfNeeded(slang::IBlob* diagnosticsBlob) } } -void initDebugCallback(); - template int innerMain(int argc, char** argv) { - initDebugCallback(); - TApp app; app.parseOption(argc, argv); -- cgit v1.2.3