Fixes:

* Merge PPLL buffer/image memory allocation if possible. * Merge thickness, index and triangle index memory allocation. * Use provided color/depth stencil format for renderpasses. * Remove fullscreen quad. * Various code rewriting. * Add debug marker. * Stylistic styles.
GPUOpen-Effects · Jan 12, 2017 · 84ff715 · 84ff715
1 parent 0b7fd81
commit 84ff715
Show file tree

Hide file tree

Showing 22 changed files with 10,563 additions and 10,129 deletions.
diff --git a/amd_lib/shared/common/inc/AMD_Types.h b/amd_lib/shared/common/inc/AMD_Types.h
@@ -156,11 +156,7 @@ namespace AMD
 #define AMD_SAFE_DELETE_ARRAY(p)  { delete [] (p);   (p) = nullptr; }
 #endif
 #ifndef AMD_SAFE_RELEASE
-#ifndef VULKAN
 #define AMD_SAFE_RELEASE(p)       { if (p) { (p)->Release(); } (p) = nullptr; }
-#else
-#define AMD_SAFE_RELEASE(object, releaseFunction, device) if (object != nullptr) releaseFunction(device, object, nullptr);
-#endif
 #endif
 
 #define AMD_FUNCTION_WIDEN2(x)    L ## x

diff --git a/amd_tressfx/inc/AMD_TressFX.h b/amd_tressfx/inc/AMD_TressFX.h
@@ -24,8 +24,12 @@
 #define AMD_TRESSFX_H
 
 #include <d3d11.h>
-#ifdef VULKAN
+#if AMD_TRESSFX_VULKAN
 #include <vulkan\vulkan.h>
+#elif AMD_TRESSFX_DIRECT3D11
+#include <d3d11.h>
+#else
+#error
 #endif
 
 #include <DirectXMath.h>
@@ -184,18 +188,17 @@ struct TressFX_HairBlob
 
 struct TressFX_SceneMesh
 {
-#ifndef VULKAN
+#if AMD_TRESSFX_VULKAN
+    VkBufferView                pMeshVertices;     // untransformed vertices
+    VkBufferView                pTransformedVerts; // untransformed vertices
+#elif AMD_TRESSFX_DIRECT3D11
     ID3D11ShaderResourceView*   pMeshVertices;     // untransformed vertices
+    ID3D11ShaderResourceView*   pTransformedVerts; // transformed vertices
 #else
-    VkBufferView                pMeshVertices;     // untransformed vertices
+#error
 #endif
     unsigned                    numMeshes;         // number of meshes
     unsigned*                   meshOffsets;       // offset to the start of each mesh
-#ifndef VULKAN
-    ID3D11ShaderResourceView*   pTransformedVerts; // transformed vertices
-#else
-    VkBufferView                pTransformedVerts; // untransformed vertices
-#endif
 };
 
 struct TressFX_HairTransform
@@ -252,52 +255,42 @@ struct TressFX_Desc
     // Buffer of transformations (one transform per strand) for hair skinning
     // This UAV is used as a structured buffer where each element is a TressFX_HairTransform.
     // The number of elements in the buffer is numTotalHairStrands.
-#ifndef VULKAN
-    ID3D11UnorderedAccessView*      pSkinningTransformationsUAV;
-#else
+#if AMD_TRESSFX_VULKAN
     VkBufferView                    pSkinningTransformationsUAV;
-#endif
-
     // hair shadow map
-#ifndef VULKAN
-    ID3D11ShaderResourceView*       pHairShadowMapSRV;
-#else
     VkImageView                     pHairShadowMapSRV;
-#endif
-
-#ifndef VULKAN
+    VkDevice                        pvkDevice;
+    VkPhysicalDeviceMemoryProperties memoryProperties;
+    VkImageView                     pvkDepthSRV;
+    uint32_t                        maxConstantBuffers;
+    VkFormat                        depthStencilFormat;
+    VkFormat                        colorFormat;
+#elif AMD_TRESSFX_DIRECT3D11
+    ID3D11UnorderedAccessView*      pSkinningTransformationsUAV;
+    // hair shadow map
+    ID3D11ShaderResourceView*       pHairShadowMapSRV;
     ID3D11Device*                   pd3dDevice;
     ID3D11DeviceContext*            pd3dDeviceContext;
     ID3D11ShaderResourceView*       pd3dDepthSRV;
     ID3D11RenderTargetView*         pd3dOutputRTV;
 #else
-    VkDevice                        pvkDevice;
-    uint32_t                        memoryIndexDeviceLocal;
-	uint32_t                        memoryIndexHostVisible;
-    VkImageView                     pvkDepthSRV;
-	uint32_t                        maxConstantBuffers;
-	VkFormat                        depthStencilFormat;
-	VkFormat                        colorFormat;
-#endif // !VULKAN
+#error
+#endif
 };
 
 extern "C"
 {
     AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_GetVersion(uint* major, uint* minor, uint* patch);
-#ifdef VULKAN
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadRawAsset(TressFX_Desc & desc,   const TressFX_GuideFollowParams& guideFollowParams, TressFX_HairBlob *pRawHairBlob);
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_End(TressFX_Desc & desc);
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_GenerateTransforms(TressFX_Desc & desc, TressFX_SceneMesh &sceneMesh);
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_ApplyRigidTransforms(TressFX_Desc & desc);
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Release(TressFX_Desc & desc);
+#if AMD_TRESSFX_VULKAN
     AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Initialize(
         TressFX_Desc &desc, VkImageView depthTexture, VkImageView colorTexture,
         VkCommandBuffer commandBuffer, VkDeviceMemory scratchMemory,
         VkBuffer scratchBuffer, size_t &offsetInScratchBuffer);
-#else
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Initialize(TressFX_Desc &desc);
-#endif
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadRawAsset(TressFX_Desc & desc,   const TressFX_GuideFollowParams& guideFollowParams, TressFX_HairBlob *pRawHairBlob);
-#ifndef VULKAN
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadProcessedAsset(TressFX_Desc & desc, TressFX_HairBlob *pHairBlob, TressFX_SceneMesh *sceneMesh, ID3D11ShaderResourceView *pTextureSRV);
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_CreateProcessedAsset(TressFX_Desc & desc, TressFX_HairBlob **ppHairBlob, TressFX_SceneMesh *sceneMesh, ID3D11ShaderResourceView *pTextureSRV);
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Begin(TressFX_Desc & desc);
-#else
     AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadProcessedAsset(
         TressFX_Desc &desc, TressFX_HairBlob *pHairBlob,
         TressFX_SceneMesh *sceneMesh, VkImageView pTextureSRV,
@@ -309,24 +302,24 @@ extern "C"
         VkCommandBuffer uploadCmdBuffer,
         VkBuffer scratchBuffer, VkDeviceMemory scratchMemory);
     AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Begin(TressFX_Desc & desc, uint32_t uniformBufferIndex);
-#endif
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_End(TressFX_Desc & desc);
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_GenerateTransforms(TressFX_Desc & desc, TressFX_SceneMesh &sceneMesh);
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_ApplyRigidTransforms(TressFX_Desc & desc);
-#ifndef VULKAN
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Simulate(TressFX_Desc & desc, float elapsedTime);
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_RenderShadowMap(TressFX_Desc & desc);
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Render(TressFX_Desc & desc);
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Resize(TressFX_Desc &desc);
-#else
     AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Simulate(TressFX_Desc & desc, VkCommandBuffer commandBuffer, float elapsedTime, uint32_t uniformBufferIndex);
     AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_RenderShadowMap(TressFX_Desc & desc, VkCommandBuffer commandBuffer, uint32_t uniformBufferIndex);
     AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE
         TressFX_Render(TressFX_Desc &desc, VkCommandBuffer commandBuffer, uint32_t uniformBufferIndex);
     AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE
-        TressFX_Resize(TressFX_Desc &desc, uint32_t texture_memory_index);
+        TressFX_Resize(TressFX_Desc &desc, VkPhysicalDeviceMemoryProperties memProperties);
+#elif AMD_TRESSFX_DIRECT3D11
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Initialize(TressFX_Desc &desc);
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadProcessedAsset(TressFX_Desc & desc, TressFX_HairBlob *pHairBlob, TressFX_SceneMesh *sceneMesh, ID3D11ShaderResourceView *pTextureSRV);
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_CreateProcessedAsset(TressFX_Desc & desc, TressFX_HairBlob **ppHairBlob, TressFX_SceneMesh *sceneMesh, ID3D11ShaderResourceView *pTextureSRV);
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Begin(TressFX_Desc & desc);
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Render(TressFX_Desc & desc);
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Resize(TressFX_Desc &desc);
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_RenderShadowMap(TressFX_Desc & desc);
+    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Simulate(TressFX_Desc & desc, float elapsedTime);
+#else
+#error
 #endif
-    AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Release(TressFX_Desc & desc);
 }
 
 } // namespace AMD

diff --git a/amd_tressfx_vulkan/build/AMD_TressFX_Vulkan_2012.vcxproj b/amd_tressfx_vulkan/build/AMD_TressFX_Vulkan_2012.vcxproj
@@ -224,7 +224,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>VULKAN;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
@@ -252,7 +252,7 @@ xcopy "..\lib\VS2012\Win32\DLL_Debug\$(TargetName).lib"  "..\lib" /H /R /Y &gt;
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>VULKAN;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
@@ -280,7 +280,7 @@ xcopy "..\lib\VS2012\x64\DLL_Debug\$(TargetName).lib"  "..\lib" /H /R /Y &gt; nu
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>VULKAN;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -313,7 +313,7 @@ xcopy "..\lib\VS2012\Win32\DLL_Release\$(TargetName).lib"  "..\lib" /H /R /Y &gt
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>VULKAN;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -346,7 +346,7 @@ xcopy "..\lib\VS2012\x64\DLL_Release\$(TargetName).lib"  "..\lib" /H /R /Y &gt;
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>VULKAN;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
@@ -367,7 +367,7 @@ xcopy "..\lib\VS2012\x64\DLL_Release\$(TargetName).lib"  "..\lib" /H /R /Y &gt;
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>VULKAN;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
@@ -388,7 +388,7 @@ xcopy "..\lib\VS2012\x64\DLL_Release\$(TargetName).lib"  "..\lib" /H /R /Y &gt;
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>VULKAN;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -414,7 +414,7 @@ xcopy "..\lib\VS2012\x64\DLL_Release\$(TargetName).lib"  "..\lib" /H /R /Y &gt;
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>VULKAN;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -440,7 +440,7 @@ xcopy "..\lib\VS2012\x64\DLL_Release\$(TargetName).lib"  "..\lib" /H /R /Y &gt;
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>VULKAN;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -474,7 +474,7 @@ xcopy "..\lib\VS2012\Win32\DLL_Release_MT\$(TargetName).lib"  "..\lib" /H /R /Y
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>VULKAN;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>