Falcor 3.2.2 (#197)

NVIDIAGameWorks · May 18, 2019 · f2b53b1 · f2b53b1
1 parent 7c1c329
commit f2b53b1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+v3.2.2
+------
+Bug Fixes:
+- Fixed referencing a temporary variable in Vulkan MSAA state creation that causes it to not work on some systems
+- Fixed unreachable code when reflecting sample shading configuration
+- Fixed comment in Material.h incorrectly describing material channel layout
+
+Dependencies:
+- Updates Slang to 0.12.5
+
 v3.2.1
 ------
 - `Ctrl+Pause` freezes/unfreezes the renderer. This if useful in low framerates situations when the user wants to change an attribute using the GUI

diff --git a/Framework/Source/API/Vulkan/VKGraphicsStateObject.cpp b/Framework/Source/API/Vulkan/VKGraphicsStateObject.cpp
@@ -62,7 +62,8 @@ namespace Falcor
         // Multisample State
         VkPipelineMultisampleStateCreateInfo multisampleInfo = {};
         bool enableSampleFrequency = mDesc.getProgramVersion() ? mDesc.getProgramVersion()->getReflector()->isSampleFrequency() : false;
-        initVkMultiSampleInfo(mDesc.getBlendState().get(), mDesc.getFboDesc(), mDesc.getSampleMask(), multisampleInfo, enableSampleFrequency);
+        uint32_t sampleMask = mDesc.getSampleMask(); // getSampleMask returns a temp value but needs to be referenced in VkPipelineMultisampleStateCreateInfo by address
+        initVkMultiSampleInfo(mDesc.getBlendState().get(), mDesc.getFboDesc(), sampleMask, multisampleInfo, enableSampleFrequency);
 
         // Depth Stencil State
         VkPipelineDepthStencilStateCreateInfo depthStencilInfo = {};
@@ -106,4 +107,4 @@ namespace Falcor
 
         return true;
     }
-}
+}
diff --git a/Framework/Source/Graphics/Material/Material.h b/Framework/Source/Graphics/Material/Material.h
@@ -53,8 +53,8 @@ namespace Falcor
                 - A   - Transparency
             Specular
                 - R - Occlusion
-                - G - Metalness
-                - B - Roughness
+                - G - Roughness
+                - B - Metalness
                 - A - Reserved
 
         ShadingModelSpecGloss

diff --git a/Framework/Source/Graphics/Program/ProgramReflection.cpp b/Framework/Source/Graphics/Program/ProgramReflection.cpp
@@ -789,15 +789,11 @@ namespace Falcor
             break;
             case SLANG_STAGE_FRAGMENT:
                 reflectShaderIO(pEntryPoint, SLANG_PARAMETER_CATEGORY_FRAGMENT_OUTPUT, mPsOut);
+                mIsSampleFrequency = pEntryPoint->usesAnySampleRateInput();
                 break;
             case SLANG_STAGE_VERTEX:
                 reflectShaderIO(pEntryPoint, SLANG_PARAMETER_CATEGORY_VERTEX_INPUT, mVertAttr, &mVertAttrBySemantic);
                 break;
-#ifdef FALCOR_VK
-                mIsSampleFrequency = pEntryPoint->usesAnySampleRateInput();
-#else
-                mIsSampleFrequency = true; // #SLANG Slang reports false for DX shaders. There's an open issue, once it's fixed we should remove that
-#endif
             default:
                 break;
             }

diff --git a/dependencies.xml b/dependencies.xml
@@ -29,8 +29,8 @@
         <package name="rapidjson" version="1.1.0" />
     </dependency>
     <dependency name="slang" linkPath="Framework/Externals/Slang">
-        <package name="slang" version="0.11.21" remotes="github-slang" />
-        <package name="slang" version="0.11.21" remotes="github-slang-linux" platforms="linux" />
+        <package name="slang" version="0.12.5" remotes="github-slang" />
+        <package name="slang" version="0.12.5" remotes="github-slang-linux" platforms="linux" />
     </dependency>
     <dependency name="glfw" linkPath="Framework/Externals/GLFW">
         <package name="glfw" version="3.2.1" platforms="win" />