remove all remaining references to SamplerGroup

google · Jan 16, 2025 · eac99e5 · eac99e5
1 parent 97e7058
commit eac99e5
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 184 deletions.
diff --git a/filament/backend/CMakeLists.txt b/filament/backend/CMakeLists.txt
@@ -42,7 +42,6 @@ set(SRCS
         src/Platform.cpp
         src/PlatformFactory.cpp
         src/Program.cpp
-        src/SamplerGroup.cpp
 )
 
 set(PRIVATE_HDRS
@@ -55,7 +54,6 @@ set(PRIVATE_HDRS
         include/private/backend/DriverAPI.inc
         include/private/backend/HandleAllocator.h
         include/private/backend/PlatformFactory.h
-        include/private/backend/SamplerGroup.h
         src/CallbackManager.h
         src/CommandStreamDispatcher.h
         src/CompilerThreadPool.h

diff --git a/filament/backend/include/backend/Handle.h b/filament/backend/include/backend/Handle.h
@@ -35,7 +35,6 @@ struct HwIndexBuffer;
 struct HwProgram;
 struct HwRenderPrimitive;
 struct HwRenderTarget;
-struct HwSamplerGroup;
 struct HwStream;
 struct HwSwapChain;
 struct HwTexture;
@@ -149,7 +148,6 @@ using IndexBufferHandle         = Handle<HwIndexBuffer>;
 using ProgramHandle             = Handle<HwProgram>;
 using RenderPrimitiveHandle     = Handle<HwRenderPrimitive>;
 using RenderTargetHandle        = Handle<HwRenderTarget>;
-using SamplerGroupHandle        = Handle<HwSamplerGroup>;
 using StreamHandle              = Handle<HwStream>;
 using SwapChainHandle           = Handle<HwSwapChain>;
 using TextureHandle             = Handle<HwTexture>;

diff --git a/filament/backend/include/private/backend/SamplerGroup.h b/filament/backend/include/private/backend/SamplerGroup.h
diff --git a/filament/backend/src/DriverBase.h b/filament/backend/src/DriverBase.h
@@ -109,10 +109,6 @@ struct HwDescriptorSet : public HwBase {
     HwDescriptorSet() noexcept = default;
 };
 
-struct HwSamplerGroup : public HwBase {
-    HwSamplerGroup() noexcept = default;
-};
-
 struct HwTexture : public HwBase {
     uint32_t width{};
     uint32_t height{};

diff --git a/filament/backend/src/Handle.cpp b/filament/backend/src/Handle.cpp
@@ -60,7 +60,6 @@ template io::ostream& operator<<(io::ostream& out, const Handle<HwVertexBuffer>&
 template io::ostream& operator<<(io::ostream& out, const Handle<HwIndexBuffer>& h) noexcept;
 template io::ostream& operator<<(io::ostream& out, const Handle<HwRenderPrimitive>& h) noexcept;
 template io::ostream& operator<<(io::ostream& out, const Handle<HwProgram>& h) noexcept;
-template io::ostream& operator<<(io::ostream& out, const Handle<HwSamplerGroup>& h) noexcept;
 template io::ostream& operator<<(io::ostream& out, const Handle<HwTexture>& h) noexcept;
 template io::ostream& operator<<(io::ostream& out, const Handle<HwRenderTarget>& h) noexcept;
 template io::ostream& operator<<(io::ostream& out, const Handle<HwFence>& h) noexcept;

diff --git a/filament/backend/src/SamplerGroup.cpp b/filament/backend/src/SamplerGroup.cpp
diff --git a/filament/backend/src/metal/MetalDriver.h b/filament/backend/src/metal/MetalDriver.h
@@ -41,7 +41,6 @@ class MetalPlatform;
 
 class MetalBuffer;
 class MetalProgram;
-class MetalSamplerGroup;
 class MetalTexture;
 struct MetalUniformBuffer;
 struct MetalContext;

diff --git a/filament/backend/src/metal/MetalHandles.h b/filament/backend/src/metal/MetalHandles.h
@@ -29,8 +29,6 @@
 #include "MetalExternalImage.h"
 #include "MetalState.h" // for MetalState::VertexDescription
 
-#include "private/backend/SamplerGroup.h"
-
 #include <backend/DriverEnums.h>
 
 #include <utils/bitset.h>

diff --git a/filament/backend/src/vulkan/VulkanDriver.cpp b/filament/backend/src/vulkan/VulkanDriver.cpp
@@ -248,7 +248,6 @@ Driver* VulkanDriver::create(VulkanPlatform* platform, VulkanContext const& cont
 #if 0
     // this is useful for development, but too verbose even for debug builds
     // For reference on a 64-bits machine in Release mode:
-    //    VulkanSamplerGroup            :  16       few
     //    HwStream                      :  24       few
     //    VulkanFence                   :  32       few
     //    VulkanProgram                 :  32       moderate
@@ -271,7 +270,6 @@ Driver* VulkanDriver::create(VulkanPlatform* platform, VulkanContext const& cont
            << "\nVulkanVertexBuffer: " << sizeof(VulkanVertexBuffer)
            << "\nVulkanVertexBufferInfo: " << sizeof(VulkanVertexBufferInfo)
            << "\nVulkanIndexBuffer: " << sizeof(VulkanIndexBuffer)
-           << "\nVulkanSamplerGroup: " << sizeof(VulkanSamplerGroup)
            << "\nVulkanRenderPrimitive: " << sizeof(VulkanRenderPrimitive)
            << "\nVulkanTexture: " << sizeof(VulkanTexture)
            << "\nVulkanTimerQuery: " << sizeof(VulkanTimerQuery)

diff --git a/filament/backend/src/vulkan/VulkanDriver.h b/filament/backend/src/vulkan/VulkanDriver.h
@@ -42,7 +42,6 @@
 namespace filament::backend {
 
 class VulkanPlatform;
-struct VulkanSamplerGroup;
 
 // The maximum number of attachments for any renderpass (color + resolve + depth)
 constexpr uint8_t MAX_RENDERTARGET_ATTACHMENT_TEXTURES =
@@ -135,7 +134,6 @@ class VulkanDriver final : public DriverBase {
     VulkanFboCache mFramebufferCache;
     VulkanSamplerCache mSamplerCache;
     VulkanBlitter mBlitter;
-    VulkanSamplerGroup* mSamplerBindings[MAX_SAMPLER_BINDING_COUNT] = {};
     VulkanReadPixels mReadPixels;
     VulkanDescriptorSetManager mDescriptorSetManager;
 

diff --git a/filament/backend/test/test_MipLevels.cpp b/filament/backend/test/test_MipLevels.cpp
@@ -217,7 +217,6 @@ TEST_F(BackendTest, TextureViewLod) {
         api.endRenderPass();
 
         // Adjust the base mip to 2.
-        // Note that this is done without another call to updateSamplerGroup.
         auto texture22 = api.createTextureView(texture, 2, 2);
 
         api.updateDescriptorSetTexture(descriptorSet[1], 0, texture22, {

diff --git a/filament/src/ds/ColorPassDescriptorSet.h b/filament/src/ds/ColorPassDescriptorSet.h
@@ -61,12 +61,6 @@ class FIndirectLight;
 class Froxelizer;
 class LightManager;
 
-/*
- * PerViewUniforms manages the UBO and samplers needed to render the color passes. Internally it
- * holds onto handles for the PER_VIEW UBO and SamplerGroup. This class maintains a shadow copy
- * of the UBO/sampler data, so it is possible to partially update it between commits.
- */
-
 class ColorPassDescriptorSet {
 
     using LightManagerInstance = utils::EntityInstance<LightManager>;