merge with fixWarnings branch

1 files changed, 5 insertions, 7 deletions

diff --git a/source/slang/type-layout.cpp b/source/slang/type-layout.cpp
index 0825da6b4..822311f60 100644
--- a/source/slang/type-layout.cpp
+++ b/source/slang/type-layout.cpp
@@ -51,7 +51,7 @@ struct DefaultLayoutRulesImpl : SimpleLayoutRulesImpl
 
         default:
             SLANG_UNEXPECTED("uhandled scalar type");
-            return SimpleLayoutInfo( LayoutResourceKind::Uniform, 0, 1 );
+            UNREACHABLE_RETURN(SimpleLayoutInfo( LayoutResourceKind::Uniform, 0, 1 ));
         }
     }
 
@@ -76,7 +76,7 @@ struct DefaultLayoutRulesImpl : SimpleLayoutRulesImpl
 
         default:
             SLANG_UNEXPECTED("unhandled scalar type");
-            return SimpleLayoutInfo();
+            UNREACHABLE_RETURN(SimpleLayoutInfo());
         }
     }
 
@@ -359,13 +359,11 @@ GLSLObjectLayoutRulesImpl kGLSLObjectLayoutRulesImpl;
 
 struct GLSLPushConstantBufferObjectLayoutRulesImpl : GLSLObjectLayoutRulesImpl
 {
-    virtual SimpleLayoutInfo GetObjectLayout(ShaderParameterKind kind) override
+    virtual SimpleLayoutInfo GetObjectLayout(ShaderParameterKind /*kind*/) override
     {
         // Special-case the layout for a constant-buffer, because we don't
         // want it to allocate a descriptor-table slot
         return SimpleLayoutInfo(LayoutResourceKind::PushConstantBuffer, 1);
-
-        return GLSLObjectLayoutRulesImpl::GetObjectLayout(kind);
     }
 };
 GLSLPushConstantBufferObjectLayoutRulesImpl kGLSLPushConstantBufferObjectLayoutRulesImpl_;
@@ -401,7 +399,7 @@ struct HLSLObjectLayoutRulesImpl : ObjectLayoutRulesImpl
             // TODO: how to handle these?
         default:
             SLANG_UNEXPECTED("unhandled shader parameter kind");
-            return SimpleLayoutInfo();
+            UNREACHABLE_RETURN(SimpleLayoutInfo());
         }
     }
 };
@@ -717,7 +715,7 @@ static SimpleLayoutInfo getParameterBlockLayoutInfo(
     else
     {
         SLANG_UNEXPECTED("unhandled parameter block type");
-        return SimpleLayoutInfo();
+        UNREACHABLE_RETURN(SimpleLayoutInfo());
     }
 }