More Refactoring

src/Engine/Material/Material.cpp

@@ -2,6 +2,7 @@
 #include "Window/WindowManager.h"
 #include "MaterialInstance.h"
 #include "Graphics/Graphics.h"
+#include "Graphics/Shader.h"
 
 using namespace Seele;
 

src/Engine/Material/ShaderExpression.cpp

@@ -223,7 +223,7 @@ void SamplerParameter::save(ArchiveBuffer& buffer) const
 void SamplerParameter::load(ArchiveBuffer& buffer)
 {
     ShaderParameter::load(buffer);
-    data = buffer.getGraphics()->createSamplerState({});
+    data = buffer.getGraphics()->createSampler({});
 }
 
 CombinedTextureParameter::CombinedTextureParameter(std::string name, uint32 byteOffset, uint32 binding) 
@@ -260,7 +260,7 @@ void CombinedTextureParameter::load(ArchiveBuffer& buffer)
     std::string filename;
     Serialization::load(buffer, filename);
     data = AssetRegistry::findTexture(filename);
-    sampler = buffer.getGraphics()->createSamplerState({});
+    sampler = buffer.getGraphics()->createSampler({});
 }
 
 ConstantExpression::ConstantExpression()

src/Engine/Material/ShaderExpression.h

@@ -105,11 +105,11 @@ struct TextureParameter : public ShaderParameter
     virtual void load(ArchiveBuffer& buffer) override;
 };
 DEFINE_REF(TextureParameter)
-DECLARE_NAME_REF(Gfx, SamplerState)
+DECLARE_NAME_REF(Gfx, Sampler)
 struct SamplerParameter : public ShaderParameter
 {
     static constexpr uint64 IDENTIFIER = 0x08;
-    Gfx::OSamplerState data;
+    Gfx::OSampler data;
     SamplerParameter() {}
     SamplerParameter(std::string name, uint32 byteOffset, uint32 binding);
     virtual ~SamplerParameter();
@@ -124,7 +124,7 @@ struct CombinedTextureParameter : public ShaderParameter
 {
     static constexpr uint64 IDENTIFIER = 0x10;
     PTextureAsset data;
-    Gfx::PSamplerState sampler;
+    Gfx::PSampler sampler;
     CombinedTextureParameter() {}
     CombinedTextureParameter(std::string name, uint32 byteOffset, uint32 binding);
     virtual ~CombinedTextureParameter();