diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2023-12-06 10:28:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-05 18:28:23 -0800 |
| commit | fa6d8717d02912697c09f2d7de802723ac6d6e47 (patch) | |
| tree | 65c3662b6cd47ffd56cc0b5727df31daf46f8c0e /tools/gfx | |
| parent | 1050e0eb96d6c8e7a6cfb253458155e1014625c3 (diff) | |
squash warnings (#3378)
Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'tools/gfx')
| -rw-r--r-- | tools/gfx/cpu/cpu-shader-object.h | 2 | ||||
| -rw-r--r-- | tools/gfx/renderer-shared.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/gfx/cpu/cpu-shader-object.h b/tools/gfx/cpu/cpu-shader-object.h index 5d0b5c366..2be703dc5 100644 --- a/tools/gfx/cpu/cpu-shader-object.h +++ b/tools/gfx/cpu/cpu-shader-object.h @@ -81,7 +81,9 @@ public: virtual SLANG_NO_THROW uint32_t SLANG_MCALL addRef() override; virtual SLANG_NO_THROW uint32_t SLANG_MCALL release() override; + // An overload for the `init` virtual function, with a more specific type Result init(IDevice* device, RootShaderObjectLayoutImpl* programLayout); + using ShaderObjectImpl::init; RootShaderObjectLayoutImpl* getLayout(); diff --git a/tools/gfx/renderer-shared.h b/tools/gfx/renderer-shared.h index 9e208c34c..d39b64873 100644 --- a/tools/gfx/renderer-shared.h +++ b/tools/gfx/renderer-shared.h @@ -342,7 +342,7 @@ struct ExtendedShaderObjectTypeList void add(const ExtendedShaderObjectType& component) { componentIDs.add(component.componentID); - components.add(slang::SpecializationArg{ slang::SpecializationArg::Kind::Type, component.slangType }); + components.add(slang::SpecializationArg{ slang::SpecializationArg::Kind::Type, {component.slangType} }); } void addRange(const ExtendedShaderObjectTypeList& list) { |