Merge #3566

3566: Fixed incorrect depth format conversions in GL backend r=kvark a=ElArtista Changed icorrect format parameters from glow::DEPTH to glow::DEPTH_FORMAT Co-authored-by: TheArtist <[email protected]>
gfx-rs · Jan 7, 2021 · 83a437d · 83a437d
2 parents 0de7534 + 29c4847
commit 83a437d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/backend/gl/src/conv.rs b/src/backend/gl/src/conv.rs
@@ -219,7 +219,7 @@ pub fn describe_format(format: Format) -> Option<FormatDescription> {
         S8Uint => FormatDescription::new(glow::R8, glow::RED, glow::UNSIGNED_BYTE, 1, Integer),
         D16Unorm => FormatDescription::new(
             glow::DEPTH_COMPONENT16,
-            glow::DEPTH,
+            glow::DEPTH_COMPONENT,
             glow::UNSIGNED_NORMALIZED,
             1,
             Float,
@@ -231,9 +231,13 @@ pub fn describe_format(format: Format) -> Option<FormatDescription> {
             2,
             Float,
         ),
-        D32Sfloat => {
-            FormatDescription::new(glow::DEPTH_COMPONENT32F, glow::DEPTH, glow::FLOAT, 1, Float)
-        }
+        D32Sfloat => FormatDescription::new(
+            glow::DEPTH_COMPONENT32F,
+            glow::DEPTH_COMPONENT,
+            glow::FLOAT,
+            1,
+            Float,
+        ),
         D32SfloatS8Uint => FormatDescription::new(
             glow::DEPTH32F_STENCIL8,
             glow::DEPTH_STENCIL,