Changeset 27134

Timestamp:

Oct 8, 2022, 11:40:06 AM (22 months ago)

Author:

Vladislav Belov

Message:

Replaces border color of sampler by enum.

Location:

ps/trunk/source/renderer/backend

Files:

• Sampler.cpp (modified) (1 diff)
• Sampler.h (modified) (2 diffs)
• gl/Texture.cpp (modified) (1 diff)

ps/trunk/source/renderer/backend/Sampler.cpp

@@ -40 +40 @@
     desc.anisotropyEnabled = false;
     desc.mipLODBias = 0.0f;
-    desc.borderColor = CColor(0.0f, 0.0f, 0.0f, 0.0f);
+    desc.borderColor = ;
     desc.compareEnabled = false;
     return desc;

ps/trunk/source/renderer/backend/Sampler.h

@@ -47 +47 @@
 };
 
+
+
+
+
+
+
+
 struct Desc
 {
@@ -59 +66 @@
     float maxAnisotropy;
     // When some filter is CLAMP_TO_BORDER.
-    CColor borderColor;
+    Color borderColor;
     bool compareEnabled;
     CompareOp compareOp;

ps/trunk/source/renderer/backend/gl/Texture.cpp

@@ -153 +153 @@
         defaultSamplerDesc.addressModeW == Sampler::AddressMode::CLAMP_TO_BORDER)
     {
-        glTexParameterfv(target, GL_TEXTURE_BORDER_COLOR, defaultSamplerDesc.borderColor.AsFloatArray().data());
+        CColor borderColor(0.0f, 0.0f, 0.0f, 0.0f);
+        switch (defaultSamplerDesc.borderColor)
+        {
+        case Sampler::BorderColor::TRANSPARENT_BLACK:
+            break;
+        case Sampler::BorderColor::OPAQUE_BLACK:
+            borderColor = CColor(0.0f, 0.0f, 0.0f, 1.0f);
+            break;
+        case Sampler::BorderColor::OPAQUE_WHITE:
+            borderColor = CColor(1.0f, 1.0f, 1.0f, 1.0f);
+            break;
+        }
+        glTexParameterfv(target, GL_TEXTURE_BORDER_COLOR, borderColor.AsFloatArray().data());
     }