diff options
| author | Gangzheng Tong <tonggangzheng@gmail.com> | 2025-07-08 23:44:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-09 06:44:56 +0000 |
| commit | 43d0c2100ef1a5df4b54525e50eb29fe7c39ec16 (patch) | |
| tree | 25ec4fb9c726115f90bdaa9878f2f4ca372ad0a6 /tools/platform/model.h | |
| parent | 00746bf09047cdf01c19dac513a532bcf3ed3ea3 (diff) | |
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 <ellieh+slangbot@nvidia.com>
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Diffstat (limited to 'tools/platform/model.h')
| -rw-r--r-- | tools/platform/model.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/platform/model.h b/tools/platform/model.h index b0c625ec9..6289c3739 100644 --- a/tools/platform/model.h +++ b/tools/platform/model.h @@ -3,7 +3,7 @@ #include "platform-api.h" #include "slang-com-ptr.h" -#include "slang-gfx.h" +#include "slang-rhi.h" #include "vector-math.h" #include <string> @@ -20,7 +20,7 @@ struct ModelLoader glm::vec3 specularColor; float specularity; - Slang::ComPtr<gfx::ITextureResource> diffuseMap; + Slang::ComPtr<rhi::ITexture> diffuseMap; }; struct Vertex @@ -42,9 +42,9 @@ struct ModelLoader struct ModelData { - Slang::ComPtr<gfx::IBufferResource> vertexBuffer; - Slang::ComPtr<gfx::IBufferResource> indexBuffer; - gfx::PrimitiveTopology primitiveTopology; + Slang::ComPtr<rhi::IBuffer> vertexBuffer; + Slang::ComPtr<rhi::IBuffer> indexBuffer; + rhi::PrimitiveTopology primitiveTopology; int vertexCount; int indexCount; int meshCount; @@ -69,7 +69,7 @@ struct ModelLoader }; ICallbacks* callbacks = nullptr; - gfx::IDevice* device; + rhi::IDevice* device; LoadFlags loadFlags = 0; float scale = 1.0f; |
