Skip to content

Commit 7624fa0

Browse files
Updated documentation for IShader and related structs
ShaderBase: don't use auto where unnecessary
1 parent d4e821f commit 7624fa0

File tree

3 files changed

+110
-86
lines changed

3 files changed

+110
-86
lines changed

Graphics/GraphicsEngine/include/ShaderBase.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2024 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -51,7 +51,7 @@ class ShaderCreateInfoWrapper
5151
public:
5252
ShaderCreateInfoWrapper() = default;
5353

54-
ShaderCreateInfoWrapper(const ShaderCreateInfoWrapper&) = delete;
54+
ShaderCreateInfoWrapper(const ShaderCreateInfoWrapper&) = delete;
5555
ShaderCreateInfoWrapper& operator=(const ShaderCreateInfoWrapper&) = delete;
5656

5757
ShaderCreateInfoWrapper(ShaderCreateInfoWrapper&& rhs) noexcept :
@@ -124,7 +124,7 @@ class ShaderBase : public DeviceObjectBase<typename EngineImplTraits::ShaderInte
124124
{
125125
this->m_Desc.CombinedSamplerSuffix = m_CombinedSamplerSuffix.c_str();
126126

127-
const auto& deviceFeatures = DeviceInfo.Features;
127+
const DeviceFeatures& deviceFeatures = DeviceInfo.Features;
128128
if (Desc.ShaderType == SHADER_TYPE_GEOMETRY && !deviceFeatures.GeometryShaders)
129129
LOG_ERROR_AND_THROW("Geometry shaders are not supported by this device.");
130130

@@ -139,7 +139,7 @@ class ShaderBase : public DeviceObjectBase<typename EngineImplTraits::ShaderInte
139139

140140
if ((Desc.ShaderType & SHADER_TYPE_ALL_RAY_TRACING) != 0)
141141
{
142-
const auto RTCaps = AdapterInfo.RayTracing.CapFlags;
142+
const RAY_TRACING_CAP_FLAGS RTCaps = AdapterInfo.RayTracing.CapFlags;
143143
if (!deviceFeatures.RayTracing || (RTCaps & RAY_TRACING_CAP_FLAG_STANDALONE_SHADERS) == 0)
144144
LOG_ERROR_AND_THROW("Standalone ray tracing shaders are not supported by this device.");
145145
}

0 commit comments

Comments
 (0)