Renamed static sampler to immutable sampler (API240076)

5 files changed, 32 insertions, 32 deletions

diff --git a/Graphics/GraphicsEngineOpenGL/include/GLPipelineResourceLayout.hpp b/Graphics/GraphicsEngineOpenGL/include/GLPipelineResourceLayout.hpp
index 80f622c9..24e88004 100644
--- a/Graphics/GraphicsEngineOpenGL/include/GLPipelineResourceLayout.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/GLPipelineResourceLayout.hpp
@@ -118,15 +118,15 @@ public:
         GLVariableBase(const GLProgramResources::GLResourceAttribs& ResourceAttribs,
                        GLPipelineResourceLayout&                    ParentLayout,
                        SHADER_RESOURCE_VARIABLE_TYPE                VariableType,
-                       Int32                                        StaticSamplerIdx) :
+                       Int32                                        ImtblSamplerIdx) :
             // clang-format off
             TBase             {ParentLayout},
             m_Attribs         {ResourceAttribs },
             m_VariableType    {VariableType    },
-            m_StaticSamplerIdx{StaticSamplerIdx}
+            m_ImtblSamplerIdx {ImtblSamplerIdx}
         // clang-format on
         {
-            VERIFY_EXPR(StaticSamplerIdx < 0 || ResourceAttribs.ResourceType == SHADER_RESOURCE_TYPE_TEXTURE_SRV);
+            VERIFY_EXPR(ImtblSamplerIdx < 0 || ResourceAttribs.ResourceType == SHADER_RESOURCE_TYPE_TEXTURE_SRV);
         }
 
         virtual SHADER_RESOURCE_VARIABLE_TYPE DILIGENT_CALL_TYPE GetType() const override final
@@ -146,7 +146,7 @@ public:
 
         const GLProgramResources::GLResourceAttribs& m_Attribs;
         const SHADER_RESOURCE_VARIABLE_TYPE          m_VariableType;
-        const Int32                                  m_StaticSamplerIdx;
+        const Int32                                  m_ImtblSamplerIdx;
     };
 
 
@@ -188,8 +188,8 @@ public:
         SamplerBindInfo(const GLProgramResources::GLResourceAttribs& ResourceAttribs,
                         GLPipelineResourceLayout&                    ParentResLayout,
                         SHADER_RESOURCE_VARIABLE_TYPE                VariableType,
-                        Int32                                        StaticSamplerIdx) :
-            GLVariableBase{ResourceAttribs, ParentResLayout, VariableType, StaticSamplerIdx}
+                        Int32                                        ImtblSamplerIdx) :
+            GLVariableBase{ResourceAttribs, ParentResLayout, VariableType, ImtblSamplerIdx}
         {}
 
         // Non-virtual function
diff --git a/Graphics/GraphicsEngineOpenGL/include/GLProgramResourceCache.hpp b/Graphics/GraphicsEngineOpenGL/include/GLProgramResourceCache.hpp
index 3fbc550e..eab96f6a 100644
--- a/Graphics/GraphicsEngineOpenGL/include/GLProgramResourceCache.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/GLProgramResourceCache.hpp
@@ -128,9 +128,9 @@ public:
         GetSampler(Binding).Set(std::move(pTexView), SetSampler);
     }
 
-    void SetStaticSampler(Uint32 Binding, ISampler* pStaticSampler)
+    void SetImmutableSampler(Uint32 Binding, ISampler* pImtblSampler)
     {
-        GetSampler(Binding).pSampler = ValidatedCast<SamplerGLImpl>(pStaticSampler);
+        GetSampler(Binding).pSampler = ValidatedCast<SamplerGLImpl>(pImtblSampler);
     }
 
     void CopySampler(Uint32 Binding, const CachedResourceView& SrcSam)
diff --git a/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp
index 83f8bdad..0c5692d0 100644
--- a/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp
@@ -95,7 +95,7 @@ public:
 private:
     GLObjectWrappers::GLPipelineObj& GetGLProgramPipeline(GLContext::NativeGLContextType Context);
 
-    void InitStaticSamplersInResourceCache(const GLPipelineResourceLayout& ResourceLayout, GLProgramResourceCache& Cache) const;
+    void InitImmutableSamplersInResourceCache(const GLPipelineResourceLayout& ResourceLayout, GLProgramResourceCache& Cache) const;
 
     struct GLPipelineShaderStageInfo
     {
@@ -143,8 +143,8 @@ private:
     Uint32 m_TotalImageBindings         = 0;
     Uint32 m_TotalStorageBufferBindings = 0;
 
-    using SamplerPtr             = RefCntAutoPtr<ISampler>;
-    SamplerPtr* m_StaticSamplers = nullptr; // [m_Desc.ResourceLayout.NumStaticSamplers]
+    using SamplerPtr                = RefCntAutoPtr<ISampler>;
+    SamplerPtr* m_ImmutableSamplers = nullptr; // [m_Desc.ResourceLayout.NumImmutableSamplers]
 };
 
 } // namespace Diligent
diff --git a/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp b/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp
index 04a08af1..d2f9cddc 100644
--- a/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp
@@ -147,11 +147,11 @@ void GLPipelineResourceLayout::Initialize(GLProgramResources*                  P
             {
                 auto VarType = GetShaderVariableType(ShaderStages, Sam.Name, ResourceLayout);
                 VERIFY_EXPR(IsAllowedType(VarType, DbgAllowedTypeBits));
-                Int32 StaticSamplerIdx = -1;
+                Int32 ImtblSamplerIdx = -1;
                 if (Sam.ResourceType == SHADER_RESOURCE_TYPE_TEXTURE_SRV)
                 {
-                    StaticSamplerIdx = FindStaticSampler(ResourceLayout.StaticSamplers, ResourceLayout.NumStaticSamplers, ShaderStages,
-                                                         Sam.Name, nullptr);
+                    ImtblSamplerIdx = FindImmutableSampler(ResourceLayout.ImmutableSamplers, ResourceLayout.NumImmutableSamplers, ShaderStages,
+                                                           Sam.Name, nullptr);
                 }
                 auto* pSamVar = new (&GetResource<SamplerBindInfo>(VarCounters.NumSamplers++))
                     SamplerBindInfo //
@@ -159,7 +159,7 @@ void GLPipelineResourceLayout::Initialize(GLProgramResources*                  P
                         Sam,
                         *this,
                         VarType,
-                        StaticSamplerIdx //
+                        ImtblSamplerIdx //
                     };
                 SamplerBindingSlots = std::max(SamplerBindingSlots, pSamVar->m_Attribs.Binding + pSamVar->m_Attribs.ArraySize);
             },
@@ -290,13 +290,13 @@ void GLPipelineResourceLayout::SamplerBindInfo::BindResource(IDeviceObject* pVie
         {
             auto& CachedTexSampler = ResourceCache.GetConstSampler(m_Attribs.Binding + ArrayIndex);
             VerifyResourceViewBinding(m_Attribs, GetType(), ArrayIndex, pView, pViewGL.RawPtr(), {TEXTURE_VIEW_SHADER_RESOURCE}, CachedTexSampler.pView.RawPtr());
-            if (m_StaticSamplerIdx >= 0)
+            if (m_ImtblSamplerIdx >= 0)
             {
-                VERIFY(CachedTexSampler.pSampler != nullptr, "Static samplers must be initialized by PipelineStateGLImpl::InitializeSRBResourceCache!");
+                VERIFY(CachedTexSampler.pSampler != nullptr, "Immutable samplers must be initialized by PipelineStateGLImpl::InitializeSRBResourceCache!");
             }
         }
 #endif
-        ResourceCache.SetTexSampler(m_Attribs.Binding + ArrayIndex, std::move(pViewGL), m_StaticSamplerIdx < 0);
+        ResourceCache.SetTexSampler(m_Attribs.Binding + ArrayIndex, std::move(pViewGL), m_ImtblSamplerIdx < 0);
     }
     else if (m_Attribs.ResourceType == SHADER_RESOURCE_TYPE_BUFFER_SRV)
     {
@@ -794,9 +794,9 @@ bool GLPipelineResourceLayout::dvpVerifyBindings(const GLProgramResourceCache& R
                 else
                 {
                     const auto& CachedSampler = ResourceCache.GetConstSampler(BindPoint);
-                    if (sam.m_StaticSamplerIdx >= 0 && CachedSampler.pSampler == nullptr)
+                    if (sam.m_ImtblSamplerIdx >= 0 && CachedSampler.pSampler == nullptr)
                     {
-                        LOG_ERROR_MESSAGE("Static sampler is not initialized for texture '", sam.m_Attribs.Name, "'");
+                        LOG_ERROR_MESSAGE("Immutable sampler is not initialized for texture '", sam.m_Attribs.Name, "'");
                         BindingsOK = false;
                     }
                 }
diff --git a/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp
index 7b7d4e21..8bc3802e 100644
--- a/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp
@@ -45,7 +45,7 @@ void PipelineStateGLImpl::Initialize(const PSOCreateInfoType& CreateInfo, const
 
     MemPool.AddSpace<GLProgramObj>(GetNumShaderStages());
     MemPool.AddSpace<GLProgramResources>(GetNumShaderStages());
-    MemPool.AddSpace<SamplerPtr>(m_Desc.ResourceLayout.NumStaticSamplers);
+    MemPool.AddSpace<SamplerPtr>(m_Desc.ResourceLayout.NumImmutableSamplers);
 
     ReserveSpaceForPipelineDesc(CreateInfo, MemPool);
 
@@ -129,9 +129,9 @@ PipelineStateGLImpl::~PipelineStateGLImpl()
         m_GLPrograms[i].~GLProgramObj();
         m_ProgramResources[i].~GLProgramResources();
     }
-    for (Uint32 i = 0; i < m_Desc.ResourceLayout.NumStaticSamplers; ++i)
+    for (Uint32 i = 0; i < m_Desc.ResourceLayout.NumImmutableSamplers; ++i)
     {
-        m_StaticSamplers[i].~SamplerPtr();
+        m_ImmutableSamplers[i].~SamplerPtr();
     }
 
     void* pRawMem = m_GLPrograms;
@@ -207,17 +207,17 @@ void PipelineStateGLImpl::InitResourceLayouts(const std::vector<GLPipelineShader
         m_ResourceLayout.Initialize(m_ProgramResources, static_cast<Uint32>(ShaderStages.size()), m_Desc.PipelineType, m_Desc.ResourceLayout, nullptr, 0, nullptr);
     }
 
-    m_StaticSamplers = MemPool.ConstructArray<SamplerPtr>(m_Desc.ResourceLayout.NumStaticSamplers);
-    for (Uint32 s = 0; s < m_Desc.ResourceLayout.NumStaticSamplers; ++s)
+    m_ImmutableSamplers = MemPool.ConstructArray<SamplerPtr>(m_Desc.ResourceLayout.NumImmutableSamplers);
+    for (Uint32 s = 0; s < m_Desc.ResourceLayout.NumImmutableSamplers; ++s)
     {
-        pDeviceGL->CreateSampler(m_Desc.ResourceLayout.StaticSamplers[s].Desc, &m_StaticSamplers[s]);
+        pDeviceGL->CreateSampler(m_Desc.ResourceLayout.ImmutableSamplers[s].Desc, &m_ImmutableSamplers[s]);
     }
 
     {
         // Clone only static variables into static resource layout, assign and initialize static resource cache
         const SHADER_RESOURCE_VARIABLE_TYPE StaticVars[] = {SHADER_RESOURCE_VARIABLE_TYPE_STATIC};
         m_StaticResourceLayout.Initialize(m_ProgramResources, static_cast<Uint32>(ShaderStages.size()), m_Desc.PipelineType, m_Desc.ResourceLayout, StaticVars, _countof(StaticVars), &m_StaticResourceCache);
-        InitStaticSamplersInResourceCache(m_StaticResourceLayout, m_StaticResourceCache);
+        InitImmutableSamplersInResourceCache(m_StaticResourceLayout, m_StaticResourceCache);
     }
 }
 
@@ -303,19 +303,19 @@ GLObjectWrappers::GLPipelineObj& PipelineStateGLImpl::GetGLProgramPipeline(GLCon
 void PipelineStateGLImpl::InitializeSRBResourceCache(GLProgramResourceCache& ResourceCache) const
 {
     ResourceCache.Initialize(m_TotalUniformBufferBindings, m_TotalSamplerBindings, m_TotalImageBindings, m_TotalStorageBufferBindings, GetRawAllocator());
-    InitStaticSamplersInResourceCache(m_ResourceLayout, ResourceCache);
+    InitImmutableSamplersInResourceCache(m_ResourceLayout, ResourceCache);
 }
 
-void PipelineStateGLImpl::InitStaticSamplersInResourceCache(const GLPipelineResourceLayout& ResourceLayout, GLProgramResourceCache& Cache) const
+void PipelineStateGLImpl::InitImmutableSamplersInResourceCache(const GLPipelineResourceLayout& ResourceLayout, GLProgramResourceCache& Cache) const
 {
     for (Uint32 s = 0; s < ResourceLayout.GetNumResources<GLPipelineResourceLayout::SamplerBindInfo>(); ++s)
     {
         const auto& Sam = ResourceLayout.GetConstResource<GLPipelineResourceLayout::SamplerBindInfo>(s);
-        if (Sam.m_StaticSamplerIdx >= 0)
+        if (Sam.m_ImtblSamplerIdx >= 0)
         {
-            ISampler* pSampler = m_StaticSamplers[Sam.m_StaticSamplerIdx].RawPtr<ISampler>();
+            ISampler* pSampler = m_ImmutableSamplers[Sam.m_ImtblSamplerIdx].RawPtr<ISampler>();
             for (Uint32 binding = Sam.m_Attribs.Binding; binding < Sam.m_Attribs.Binding + Sam.m_Attribs.ArraySize; ++binding)
-                Cache.SetStaticSampler(binding, pSampler);
+                Cache.SetImmutableSampler(binding, pSampler);
         }
     }
 }