Skip to content

Commit 0b7fd81

Browse files
vljvlj
committed
Add a project for Vulkan port.
1 parent 20a2395 commit 0b7fd81

66 files changed

Lines changed: 60267 additions & 86 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,11 @@ namespace AMD
156156
#define AMD_SAFE_DELETE_ARRAY(p) { delete [] (p); (p) = nullptr; }
157157
#endif
158158
#ifndef AMD_SAFE_RELEASE
159+
#ifndef VULKAN
159160
#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
160164
#endif
161165

162166
#define AMD_FUNCTION_WIDEN2(x) L ## x

‎amd_lib/shared/d3d11/build/AMD_LIB_2010.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@
288288
</Lib>
289289
</ItemDefinitionGroup>
290290
<ItemGroup>
291-
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h" />
292291
<ClInclude Include="..\..\common\inc\AMD_Types.h" />
293292
<ClInclude Include="..\inc\AMD_LIB.h" />
294293
<ClInclude Include="..\src\AMD_Buffer.h" />

‎amd_lib/shared/d3d11/build/AMD_LIB_2010.vcxproj.filters‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<Filter Include="..">
5-
<UniqueIdentifier>{61705900-4DFC-870B-B6AA-880BA255880B}</UniqueIdentifier>
4+
<Filter Include="common">
5+
<UniqueIdentifier>{AEFEE3F6-9AA0-0ECD-835B-22216F9C951D}</UniqueIdentifier>
66
</Filter>
7-
<Filter Include="..\..">
8-
<UniqueIdentifier>{CC6E590B-3883-81BC-0105-251C6DD87DED}</UniqueIdentifier>
9-
</Filter>
10-
<Filter Include="..\..\ags_lib">
11-
<UniqueIdentifier>{4CE19223-B8A1-0E5A-81DC-57D7ED5B5336}</UniqueIdentifier>
12-
</Filter>
13-
<Filter Include="..\..\ags_lib\inc">
14-
<UniqueIdentifier>{553A9689-C150-941F-0AC8-1F41761D65A7}</UniqueIdentifier>
15-
</Filter>
16-
<Filter Include="..\common">
17-
<UniqueIdentifier>{993A4365-05A5-F7DB-4EE3-A881BA8CD530}</UniqueIdentifier>
18-
</Filter>
19-
<Filter Include="..\common\inc">
20-
<UniqueIdentifier>{22723C73-8E32-B8A9-576D-0127C3ECFC85}</UniqueIdentifier>
7+
<Filter Include="common\inc">
8+
<UniqueIdentifier>{B7381BB1-A3F0-5CFE-0CF8-355AF8CEF7EE}</UniqueIdentifier>
219
</Filter>
2210
<Filter Include="inc">
2311
<UniqueIdentifier>{1F80880B-8B89-887C-1405-9F7C800D947C}</UniqueIdentifier>
@@ -59,11 +47,8 @@
5947
</None>
6048
</ItemGroup>
6149
<ItemGroup>
62-
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h">
63-
<Filter>..\..\ags_lib\inc</Filter>
64-
</ClInclude>
6550
<ClInclude Include="..\..\common\inc\AMD_Types.h">
66-
<Filter>..\common\inc</Filter>
51+
<Filter>common\inc</Filter>
6752
</ClInclude>
6853
<ClInclude Include="..\inc\AMD_LIB.h">
6954
<Filter>inc</Filter>

‎amd_lib/shared/d3d11/build/AMD_LIB_2012.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@
288288
</Lib>
289289
</ItemDefinitionGroup>
290290
<ItemGroup>
291-
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h" />
292291
<ClInclude Include="..\..\common\inc\AMD_Types.h" />
293292
<ClInclude Include="..\inc\AMD_LIB.h" />
294293
<ClInclude Include="..\src\AMD_Buffer.h" />

‎amd_lib/shared/d3d11/build/AMD_LIB_2012.vcxproj.filters‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<Filter Include="..">
5-
<UniqueIdentifier>{61705900-4DFC-870B-B6AA-880BA255880B}</UniqueIdentifier>
4+
<Filter Include="common">
5+
<UniqueIdentifier>{AEFEE3F6-9AA0-0ECD-835B-22216F9C951D}</UniqueIdentifier>
66
</Filter>
7-
<Filter Include="..\..">
8-
<UniqueIdentifier>{CC6E590B-3883-81BC-0105-251C6DD87DED}</UniqueIdentifier>
9-
</Filter>
10-
<Filter Include="..\..\ags_lib">
11-
<UniqueIdentifier>{4CE19223-B8A1-0E5A-81DC-57D7ED5B5336}</UniqueIdentifier>
12-
</Filter>
13-
<Filter Include="..\..\ags_lib\inc">
14-
<UniqueIdentifier>{553A9689-C150-941F-0AC8-1F41761D65A7}</UniqueIdentifier>
15-
</Filter>
16-
<Filter Include="..\common">
17-
<UniqueIdentifier>{993A4365-05A5-F7DB-4EE3-A881BA8CD530}</UniqueIdentifier>
18-
</Filter>
19-
<Filter Include="..\common\inc">
20-
<UniqueIdentifier>{22723C73-8E32-B8A9-576D-0127C3ECFC85}</UniqueIdentifier>
7+
<Filter Include="common\inc">
8+
<UniqueIdentifier>{B7381BB1-A3F0-5CFE-0CF8-355AF8CEF7EE}</UniqueIdentifier>
219
</Filter>
2210
<Filter Include="inc">
2311
<UniqueIdentifier>{1F80880B-8B89-887C-1405-9F7C800D947C}</UniqueIdentifier>
@@ -59,11 +47,8 @@
5947
</None>
6048
</ItemGroup>
6149
<ItemGroup>
62-
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h">
63-
<Filter>..\..\ags_lib\inc</Filter>
64-
</ClInclude>
6550
<ClInclude Include="..\..\common\inc\AMD_Types.h">
66-
<Filter>..\common\inc</Filter>
51+
<Filter>common\inc</Filter>
6752
</ClInclude>
6853
<ClInclude Include="..\inc\AMD_LIB.h">
6954
<Filter>inc</Filter>

‎amd_lib/shared/d3d11/build/AMD_LIB_2013.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@
289289
</Lib>
290290
</ItemDefinitionGroup>
291291
<ItemGroup>
292-
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h" />
293292
<ClInclude Include="..\..\common\inc\AMD_Types.h" />
294293
<ClInclude Include="..\inc\AMD_LIB.h" />
295294
<ClInclude Include="..\src\AMD_Buffer.h" />

‎amd_lib/shared/d3d11/build/AMD_LIB_2013.vcxproj.filters‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<Filter Include="..">
5-
<UniqueIdentifier>{61705900-4DFC-870B-B6AA-880BA255880B}</UniqueIdentifier>
4+
<Filter Include="common">
5+
<UniqueIdentifier>{AEFEE3F6-9AA0-0ECD-835B-22216F9C951D}</UniqueIdentifier>
66
</Filter>
7-
<Filter Include="..\..">
8-
<UniqueIdentifier>{CC6E590B-3883-81BC-0105-251C6DD87DED}</UniqueIdentifier>
9-
</Filter>
10-
<Filter Include="..\..\ags_lib">
11-
<UniqueIdentifier>{4CE19223-B8A1-0E5A-81DC-57D7ED5B5336}</UniqueIdentifier>
12-
</Filter>
13-
<Filter Include="..\..\ags_lib\inc">
14-
<UniqueIdentifier>{553A9689-C150-941F-0AC8-1F41761D65A7}</UniqueIdentifier>
15-
</Filter>
16-
<Filter Include="..\common">
17-
<UniqueIdentifier>{993A4365-05A5-F7DB-4EE3-A881BA8CD530}</UniqueIdentifier>
18-
</Filter>
19-
<Filter Include="..\common\inc">
20-
<UniqueIdentifier>{22723C73-8E32-B8A9-576D-0127C3ECFC85}</UniqueIdentifier>
7+
<Filter Include="common\inc">
8+
<UniqueIdentifier>{B7381BB1-A3F0-5CFE-0CF8-355AF8CEF7EE}</UniqueIdentifier>
219
</Filter>
2210
<Filter Include="inc">
2311
<UniqueIdentifier>{1F80880B-8B89-887C-1405-9F7C800D947C}</UniqueIdentifier>
@@ -59,11 +47,8 @@
5947
</None>
6048
</ItemGroup>
6149
<ItemGroup>
62-
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h">
63-
<Filter>..\..\ags_lib\inc</Filter>
64-
</ClInclude>
6550
<ClInclude Include="..\..\common\inc\AMD_Types.h">
66-
<Filter>..\common\inc</Filter>
51+
<Filter>common\inc</Filter>
6752
</ClInclude>
6853
<ClInclude Include="..\inc\AMD_LIB.h">
6954
<Filter>inc</Filter>

‎amd_lib/shared/d3d11/build/AMD_LIB_2015.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@
284284
</Lib>
285285
</ItemDefinitionGroup>
286286
<ItemGroup>
287-
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h" />
288287
<ClInclude Include="..\..\common\inc\AMD_Types.h" />
289288
<ClInclude Include="..\inc\AMD_LIB.h" />
290289
<ClInclude Include="..\src\AMD_Buffer.h" />

‎amd_lib/shared/d3d11/build/AMD_LIB_2015.vcxproj.filters‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<Filter Include="..">
5-
<UniqueIdentifier>{61705900-4DFC-870B-B6AA-880BA255880B}</UniqueIdentifier>
4+
<Filter Include="common">
5+
<UniqueIdentifier>{AEFEE3F6-9AA0-0ECD-835B-22216F9C951D}</UniqueIdentifier>
66
</Filter>
7-
<Filter Include="..\..">
8-
<UniqueIdentifier>{CC6E590B-3883-81BC-0105-251C6DD87DED}</UniqueIdentifier>
9-
</Filter>
10-
<Filter Include="..\..\ags_lib">
11-
<UniqueIdentifier>{4CE19223-B8A1-0E5A-81DC-57D7ED5B5336}</UniqueIdentifier>
12-
</Filter>
13-
<Filter Include="..\..\ags_lib\inc">
14-
<UniqueIdentifier>{553A9689-C150-941F-0AC8-1F41761D65A7}</UniqueIdentifier>
15-
</Filter>
16-
<Filter Include="..\common">
17-
<UniqueIdentifier>{993A4365-05A5-F7DB-4EE3-A881BA8CD530}</UniqueIdentifier>
18-
</Filter>
19-
<Filter Include="..\common\inc">
20-
<UniqueIdentifier>{22723C73-8E32-B8A9-576D-0127C3ECFC85}</UniqueIdentifier>
7+
<Filter Include="common\inc">
8+
<UniqueIdentifier>{B7381BB1-A3F0-5CFE-0CF8-355AF8CEF7EE}</UniqueIdentifier>
219
</Filter>
2210
<Filter Include="inc">
2311
<UniqueIdentifier>{1F80880B-8B89-887C-1405-9F7C800D947C}</UniqueIdentifier>
@@ -59,11 +47,8 @@
5947
</None>
6048
</ItemGroup>
6149
<ItemGroup>
62-
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h">
63-
<Filter>..\..\ags_lib\inc</Filter>
64-
</ClInclude>
6550
<ClInclude Include="..\..\common\inc\AMD_Types.h">
66-
<Filter>..\common\inc</Filter>
51+
<Filter>common\inc</Filter>
6752
</ClInclude>
6853
<ClInclude Include="..\inc\AMD_LIB.h">
6954
<Filter>inc</Filter>

‎amd_tressfx/inc/AMD_TressFX.h‎

Lines changed: 75 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
#define AMD_TRESSFX_H
2525

2626
#include <d3d11.h>
27+
#ifdef VULKAN
28+
#include <vulkan\vulkan.h>
29+
#endif
30+
2731
#include <DirectXMath.h>
2832

2933
#define AMD_TRESSFX_VERSION_MAJOR 3
@@ -75,6 +79,19 @@
7579
#define IDSRV_HAIR_FRAGMENT_COLORS 14
7680
#define IDSRV_HAIR_ACCUM_INV_ALPHA 15
7781

82+
#define IDSRV_CONSTANTS_BUFFER 16
83+
#define IDSRV_ATOMIC_COUNTER_BUFFER 17
84+
#define IDSRV_NOISE_SAMPLER 18
85+
#define IDSRV_SHADOW_SAMPLER 19
86+
87+
#define IDSRV_HAIR_PREVIOUS_VERTEX_POSITIONS 20
88+
#define IDSRV_HAIR_VERTEX_INITIAL_POSITIONS 21
89+
#define IDSRV_HAIR_STRAND_TYPE 22
90+
#define IDSRV_HAIR_GLOBAL_ROTATION 23
91+
#define IDSRV_HAIR_LOCAL_REF_VEC 24
92+
#define IDSRV_HAIR_ROOT_OFFSET 25
93+
#define IDSRV_HAIR_LENGTH 26
94+
#define IDSRV_HEAD_TRANSFORM 27
7895

7996
#if defined(DEBUG) || defined(_DEBUG)
8097
#define AMD_TRESSFX_DEBUG 1
@@ -167,10 +184,18 @@ struct TressFX_HairBlob
167184

168185
struct TressFX_SceneMesh
169186
{
187+
#ifndef VULKAN
170188
ID3D11ShaderResourceView* pMeshVertices; // untransformed vertices
189+
#else
190+
VkBufferView pMeshVertices; // untransformed vertices
191+
#endif
171192
unsigned numMeshes; // number of meshes
172193
unsigned* meshOffsets; // offset to the start of each mesh
194+
#ifndef VULKAN
173195
ID3D11ShaderResourceView* pTransformedVerts; // transformed vertices
196+
#else
197+
VkBufferView pTransformedVerts; // untransformed vertices
198+
#endif
174199
};
175200

176201
struct TressFX_HairTransform
@@ -227,32 +252,80 @@ struct TressFX_Desc
227252
// Buffer of transformations (one transform per strand) for hair skinning
228253
// This UAV is used as a structured buffer where each element is a TressFX_HairTransform.
229254
// The number of elements in the buffer is numTotalHairStrands.
255+
#ifndef VULKAN
230256
ID3D11UnorderedAccessView* pSkinningTransformationsUAV;
257+
#else
258+
VkBufferView pSkinningTransformationsUAV;
259+
#endif
231260

232261
// hair shadow map
262+
#ifndef VULKAN
233263
ID3D11ShaderResourceView* pHairShadowMapSRV;
264+
#else
265+
VkImageView pHairShadowMapSRV;
266+
#endif
234267

268+
#ifndef VULKAN
235269
ID3D11Device* pd3dDevice;
236270
ID3D11DeviceContext* pd3dDeviceContext;
237271
ID3D11ShaderResourceView* pd3dDepthSRV;
238272
ID3D11RenderTargetView* pd3dOutputRTV;
273+
#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
239282
};
240283

241284
extern "C"
242285
{
243286
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_GetVersion(uint* major, uint* minor, uint* patch);
244-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Initialize(TressFX_Desc & desc);
287+
#ifdef VULKAN
288+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Initialize(
289+
TressFX_Desc &desc, VkImageView depthTexture, VkImageView colorTexture,
290+
VkCommandBuffer commandBuffer, VkDeviceMemory scratchMemory,
291+
VkBuffer scratchBuffer, size_t &offsetInScratchBuffer);
292+
#else
293+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Initialize(TressFX_Desc &desc);
294+
#endif
245295
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadRawAsset(TressFX_Desc & desc, const TressFX_GuideFollowParams& guideFollowParams, TressFX_HairBlob *pRawHairBlob);
296+
#ifndef VULKAN
246297
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadProcessedAsset(TressFX_Desc & desc, TressFX_HairBlob *pHairBlob, TressFX_SceneMesh *sceneMesh, ID3D11ShaderResourceView *pTextureSRV);
247298
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_CreateProcessedAsset(TressFX_Desc & desc, TressFX_HairBlob **ppHairBlob, TressFX_SceneMesh *sceneMesh, ID3D11ShaderResourceView *pTextureSRV);
248299
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Begin(TressFX_Desc & desc);
300+
#else
301+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadProcessedAsset(
302+
TressFX_Desc &desc, TressFX_HairBlob *pHairBlob,
303+
TressFX_SceneMesh *sceneMesh, VkImageView pTextureSRV,
304+
VkCommandBuffer uploadCmdBuffer,
305+
VkBuffer scratchBuffer, VkDeviceMemory scratchMemory);
306+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_CreateProcessedAsset(
307+
TressFX_Desc &desc, TressFX_HairBlob **ppHairBlob,
308+
TressFX_SceneMesh *sceneMesh, VkImageView pTextureSRV,
309+
VkCommandBuffer uploadCmdBuffer,
310+
VkBuffer scratchBuffer, VkDeviceMemory scratchMemory);
311+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Begin(TressFX_Desc & desc, uint32_t uniformBufferIndex);
312+
#endif
249313
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_End(TressFX_Desc & desc);
250314
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_GenerateTransforms(TressFX_Desc & desc, TressFX_SceneMesh &sceneMesh);
251315
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_ApplyRigidTransforms(TressFX_Desc & desc);
316+
#ifndef VULKAN
252317
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Simulate(TressFX_Desc & desc, float elapsedTime);
253318
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_RenderShadowMap(TressFX_Desc & desc);
254319
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Render(TressFX_Desc & desc);
255-
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Resize(TressFX_Desc & desc);
320+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Resize(TressFX_Desc &desc);
321+
#else
322+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Simulate(TressFX_Desc & desc, VkCommandBuffer commandBuffer, float elapsedTime, uint32_t uniformBufferIndex);
323+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_RenderShadowMap(TressFX_Desc & desc, VkCommandBuffer commandBuffer, uint32_t uniformBufferIndex);
324+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE
325+
TressFX_Render(TressFX_Desc &desc, VkCommandBuffer commandBuffer, uint32_t uniformBufferIndex);
326+
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE
327+
TressFX_Resize(TressFX_Desc &desc, uint32_t texture_memory_index);
328+
#endif
256329
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Release(TressFX_Desc & desc);
257330
}
258331

0 commit comments

Comments
 (0)