Skip to content

Commit 68d9d2d

Browse files
vljvlj
committed
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.
1 parent 0b7fd81 commit 68d9d2d

22 files changed

+10521
-10109
lines changed

‎amd_lib/shared/common/inc/AMD_Types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,7 @@ namespace AMD
156156
#define AMD_SAFE_DELETE_ARRAY(p) { delete [] (p); (p) = nullptr; }
157157
#endif
158158
#ifndef AMD_SAFE_RELEASE
159-
#ifndef VULKAN
160159
#define AMD_SAFE_RELEASE(p) { if (p) { (p)->Release(); } (p) = nullptr; }
161-
#else
162-
#define AMD_SAFE_RELEASE(object, releaseFunction, device) if (object != nullptr) releaseFunction(device, object, nullptr);
163-
#endif
164160
#endif
165161

166162
#define AMD_FUNCTION_WIDEN2(x) L ## x

‎amd_tressfx/inc/AMD_TressFX.h

Lines changed: 42 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@
2424
#define AMD_TRESSFX_H
2525

2626
#include <d3d11.h>
27-
#ifdef VULKAN
27+
#if AMD_TRESSFX_VULKAN
2828
#include <vulkan\vulkan.h>
29+
#elif AMD_TRESSFX_DIRECT3D11
30+
#include <d3d11.h>
31+
#else
32+
#error
2933
#endif
3034

3135
#include <DirectXMath.h>
@@ -184,18 +188,17 @@ struct TressFX_HairBlob
184188

185189
struct TressFX_SceneMesh
186190
{
187-
#ifndef VULKAN
191+
#if AMD_TRESSFX_VULKAN
192+
VkBufferView pMeshVertices; // untransformed vertices
193+
VkBufferView pTransformedVerts; // untransformed vertices
194+
#elif AMD_TRESSFX_DIRECT3D11
188195
ID3D11ShaderResourceView* pMeshVertices; // untransformed vertices
196+
ID3D11ShaderResourceView* pTransformedVerts; // transformed vertices
189197
#else
190-
VkBufferView pMeshVertices; // untransformed vertices
198+
#error
191199
#endif
192200
unsigned numMeshes; // number of meshes
193201
unsigned* meshOffsets; // offset to the start of each mesh
194-
#ifndef VULKAN
195-
ID3D11ShaderResourceView* pTransformedVerts; // transformed vertices
196-
#else
197-
VkBufferView pTransformedVerts; // untransformed vertices
198-
#endif
199202
};
200203

201204
struct TressFX_HairTransform
@@ -252,52 +255,42 @@ struct TressFX_Desc
252255
// Buffer of transformations (one transform per strand) for hair skinning
253256
// This UAV is used as a structured buffer where each element is a TressFX_HairTransform.
254257
// The number of elements in the buffer is numTotalHairStrands.
255-
#ifndef VULKAN
256-
ID3D11UnorderedAccessView* pSkinningTransformationsUAV;
257-
#else
258+
#if AMD_TRESSFX_VULKAN
258259
VkBufferView pSkinningTransformationsUAV;
259-
#endif
260-
261260
// hair shadow map
262-
#ifndef VULKAN
263-
ID3D11ShaderResourceView* pHairShadowMapSRV;
264-
#else
265261
VkImageView pHairShadowMapSRV;
266-
#endif
267-
268-
#ifndef VULKAN
262+
VkDevice pvkDevice;
263+
VkPhysicalDeviceMemoryProperties memoryProperties;
264+
VkImageView pvkDepthSRV;
265+
uint32_t maxConstantBuffers;
266+
VkFormat depthStencilFormat;
267+
VkFormat colorFormat;
268+
#elif AMD_TRESSFX_DIRECT3D11
269+
ID3D11UnorderedAccessView* pSkinningTransformationsUAV;
270+
// hair shadow map
271+
ID3D11ShaderResourceView* pHairShadowMapSRV;
269272
ID3D11Device* pd3dDevice;
270273
ID3D11DeviceContext* pd3dDeviceContext;
271274
ID3D11ShaderResourceView* pd3dDepthSRV;
272275
ID3D11RenderTargetView* pd3dOutputRTV;
273276
#else
274-
VkDevice pvkDevice;
275-
uint32_t memoryIndexDeviceLocal;
276-
uint32_t memoryIndexHostVisible;
277-
VkImageView pvkDepthSRV;
278-
uint32_t maxConstantBuffers;
279-
VkFormat depthStencilFormat;
280-
VkFormat colorFormat;
281-
#endif // !VULKAN
277+
#error
278+
#endif
282279
};
283280

284281
extern "C"
285282
{
286283
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_GetVersion(uint* major, uint* minor, uint* patch);
287-
#ifdef VULKAN
284+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadRawAsset(TressFX_Desc & desc, const TressFX_GuideFollowParams& guideFollowParams, TressFX_HairBlob *pRawHairBlob);
285+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_End(TressFX_Desc & desc);
286+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_GenerateTransforms(TressFX_Desc & desc, TressFX_SceneMesh &sceneMesh);
287+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_ApplyRigidTransforms(TressFX_Desc & desc);
288+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Release(TressFX_Desc & desc);
289+
#if AMD_TRESSFX_VULKAN
288290
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Initialize(
289291
TressFX_Desc &desc, VkImageView depthTexture, VkImageView colorTexture,
290292
VkCommandBuffer commandBuffer, VkDeviceMemory scratchMemory,
291293
VkBuffer scratchBuffer, size_t &offsetInScratchBuffer);
292-
#else
293-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Initialize(TressFX_Desc &desc);
294-
#endif
295-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadRawAsset(TressFX_Desc & desc, const TressFX_GuideFollowParams& guideFollowParams, TressFX_HairBlob *pRawHairBlob);
296-
#ifndef VULKAN
297-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadProcessedAsset(TressFX_Desc & desc, TressFX_HairBlob *pHairBlob, TressFX_SceneMesh *sceneMesh, ID3D11ShaderResourceView *pTextureSRV);
298-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_CreateProcessedAsset(TressFX_Desc & desc, TressFX_HairBlob **ppHairBlob, TressFX_SceneMesh *sceneMesh, ID3D11ShaderResourceView *pTextureSRV);
299-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Begin(TressFX_Desc & desc);
300-
#else
301294
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadProcessedAsset(
302295
TressFX_Desc &desc, TressFX_HairBlob *pHairBlob,
303296
TressFX_SceneMesh *sceneMesh, VkImageView pTextureSRV,
@@ -309,24 +302,24 @@ extern "C"
309302
VkCommandBuffer uploadCmdBuffer,
310303
VkBuffer scratchBuffer, VkDeviceMemory scratchMemory);
311304
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Begin(TressFX_Desc & desc, uint32_t uniformBufferIndex);
312-
#endif
313-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_End(TressFX_Desc & desc);
314-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_GenerateTransforms(TressFX_Desc & desc, TressFX_SceneMesh &sceneMesh);
315-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_ApplyRigidTransforms(TressFX_Desc & desc);
316-
#ifndef VULKAN
317-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Simulate(TressFX_Desc & desc, float elapsedTime);
318-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_RenderShadowMap(TressFX_Desc & desc);
319-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Render(TressFX_Desc & desc);
320-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Resize(TressFX_Desc &desc);
321-
#else
322305
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Simulate(TressFX_Desc & desc, VkCommandBuffer commandBuffer, float elapsedTime, uint32_t uniformBufferIndex);
323306
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_RenderShadowMap(TressFX_Desc & desc, VkCommandBuffer commandBuffer, uint32_t uniformBufferIndex);
324307
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE
325308
TressFX_Render(TressFX_Desc &desc, VkCommandBuffer commandBuffer, uint32_t uniformBufferIndex);
326309
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE
327-
TressFX_Resize(TressFX_Desc &desc, uint32_t texture_memory_index);
310+
TressFX_Resize(TressFX_Desc &desc, VkPhysicalDeviceMemoryProperties memProperties);
311+
#elif AMD_TRESSFX_DIRECT3D11
312+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Initialize(TressFX_Desc &desc);
313+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadProcessedAsset(TressFX_Desc & desc, TressFX_HairBlob *pHairBlob, TressFX_SceneMesh *sceneMesh, ID3D11ShaderResourceView *pTextureSRV);
314+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_CreateProcessedAsset(TressFX_Desc & desc, TressFX_HairBlob **ppHairBlob, TressFX_SceneMesh *sceneMesh, ID3D11ShaderResourceView *pTextureSRV);
315+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Begin(TressFX_Desc & desc);
316+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Render(TressFX_Desc & desc);
317+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Resize(TressFX_Desc &desc);
318+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_RenderShadowMap(TressFX_Desc & desc);
319+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Simulate(TressFX_Desc & desc, float elapsedTime);
320+
#else
321+
#error
328322
#endif
329-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Release(TressFX_Desc & desc);
330323
}
331324

332325
} // namespace AMD

‎amd_tressfx_vulkan/build/AMD_TressFX_Vulkan_2012.vcxproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
<PrecompiledHeader>NotUsing</PrecompiledHeader>
225225
<WarningLevel>Level4</WarningLevel>
226226
<TreatWarningAsError>true</TreatWarningAsError>
227-
<PreprocessorDefinitions>VULKAN;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
227+
<PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
228228
<AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
229229
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
230230
<Optimization>Disabled</Optimization>
@@ -252,7 +252,7 @@ xcopy "..\lib\VS2012\Win32\DLL_Debug\$(TargetName).lib" "..\lib" /H /R /Y &gt;
252252
<PrecompiledHeader>NotUsing</PrecompiledHeader>
253253
<WarningLevel>Level4</WarningLevel>
254254
<TreatWarningAsError>true</TreatWarningAsError>
255-
<PreprocessorDefinitions>VULKAN;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
255+
<PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
256256
<AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
257257
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
258258
<Optimization>Disabled</Optimization>
@@ -280,7 +280,7 @@ xcopy "..\lib\VS2012\x64\DLL_Debug\$(TargetName).lib" "..\lib" /H /R /Y &gt; nu
280280
<PrecompiledHeader>NotUsing</PrecompiledHeader>
281281
<WarningLevel>Level4</WarningLevel>
282282
<TreatWarningAsError>true</TreatWarningAsError>
283-
<PreprocessorDefinitions>VULKAN;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
283+
<PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
284284
<AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
285285
<Optimization>Full</Optimization>
286286
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -313,7 +313,7 @@ xcopy "..\lib\VS2012\Win32\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y &gt
313313
<PrecompiledHeader>NotUsing</PrecompiledHeader>
314314
<WarningLevel>Level4</WarningLevel>
315315
<TreatWarningAsError>true</TreatWarningAsError>
316-
<PreprocessorDefinitions>VULKAN;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
316+
<PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
317317
<AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
318318
<Optimization>Full</Optimization>
319319
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -346,7 +346,7 @@ xcopy "..\lib\VS2012\x64\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y &gt;
346346
<PrecompiledHeader>NotUsing</PrecompiledHeader>
347347
<WarningLevel>Level4</WarningLevel>
348348
<TreatWarningAsError>true</TreatWarningAsError>
349-
<PreprocessorDefinitions>VULKAN;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
349+
<PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
350350
<AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
351351
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
352352
<Optimization>Disabled</Optimization>
@@ -367,7 +367,7 @@ xcopy "..\lib\VS2012\x64\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y &gt;
367367
<PrecompiledHeader>NotUsing</PrecompiledHeader>
368368
<WarningLevel>Level4</WarningLevel>
369369
<TreatWarningAsError>true</TreatWarningAsError>
370-
<PreprocessorDefinitions>VULKAN;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
370+
<PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
371371
<AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
372372
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
373373
<Optimization>Disabled</Optimization>
@@ -388,7 +388,7 @@ xcopy "..\lib\VS2012\x64\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y &gt;
388388
<PrecompiledHeader>NotUsing</PrecompiledHeader>
389389
<WarningLevel>Level4</WarningLevel>
390390
<TreatWarningAsError>true</TreatWarningAsError>
391-
<PreprocessorDefinitions>VULKAN;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
391+
<PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
392392
<AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
393393
<Optimization>Full</Optimization>
394394
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -414,7 +414,7 @@ xcopy "..\lib\VS2012\x64\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y &gt;
414414
<PrecompiledHeader>NotUsing</PrecompiledHeader>
415415
<WarningLevel>Level4</WarningLevel>
416416
<TreatWarningAsError>true</TreatWarningAsError>
417-
<PreprocessorDefinitions>VULKAN;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
417+
<PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
418418
<AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
419419
<Optimization>Full</Optimization>
420420
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -440,7 +440,7 @@ xcopy "..\lib\VS2012\x64\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y &gt;
440440
<PrecompiledHeader>NotUsing</PrecompiledHeader>
441441
<WarningLevel>Level4</WarningLevel>
442442
<TreatWarningAsError>true</TreatWarningAsError>
443-
<PreprocessorDefinitions>VULKAN;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
443+
<PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
444444
<AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
445445
<Optimization>Full</Optimization>
446446
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -474,7 +474,7 @@ xcopy "..\lib\VS2012\Win32\DLL_Release_MT\$(TargetName).lib" "..\lib" /H /R /Y
474474
<PrecompiledHeader>NotUsing</PrecompiledHeader>
475475
<WarningLevel>Level4</WarningLevel>
476476
<TreatWarningAsError>true</TreatWarningAsError>
477-
<PreprocessorDefinitions>VULKAN;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
477+
<PreprocessorDefinitions>AMD_TRESSFX_VULKAN=1;_USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
478478
<AdditionalIncludeDirectories>..\inc;..\..\amd_lib\shared\common\inc;..\..\amd_tressfx\inc;..\..\amd_tressfx\src;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
479479
<Optimization>Full</Optimization>
480480
<FunctionLevelLinking>true</FunctionLevelLinking>

0 commit comments

Comments
 (0)