Skip to content

Add a project for Vulkan port. #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add a project for Vulkan port. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b7fd81
Add a project for Vulkan port.
vlj May 20, 2016
83678bf
Fixes:
vlj Dec 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion amd_lib/shared/d3d11/build/AMD_LIB_2010.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h" />
<ClInclude Include="..\..\common\inc\AMD_Types.h" />
<ClInclude Include="..\inc\AMD_LIB.h" />
<ClInclude Include="..\src\AMD_Buffer.h" />
Expand Down
25 changes: 5 additions & 20 deletions amd_lib/shared/d3d11/build/AMD_LIB_2010.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="..">
<UniqueIdentifier>{61705900-4DFC-870B-B6AA-880BA255880B}</UniqueIdentifier>
<Filter Include="common">
<UniqueIdentifier>{AEFEE3F6-9AA0-0ECD-835B-22216F9C951D}</UniqueIdentifier>
</Filter>
<Filter Include="..\..">
<UniqueIdentifier>{CC6E590B-3883-81BC-0105-251C6DD87DED}</UniqueIdentifier>
</Filter>
<Filter Include="..\..\ags_lib">
<UniqueIdentifier>{4CE19223-B8A1-0E5A-81DC-57D7ED5B5336}</UniqueIdentifier>
</Filter>
<Filter Include="..\..\ags_lib\inc">
<UniqueIdentifier>{553A9689-C150-941F-0AC8-1F41761D65A7}</UniqueIdentifier>
</Filter>
<Filter Include="..\common">
<UniqueIdentifier>{993A4365-05A5-F7DB-4EE3-A881BA8CD530}</UniqueIdentifier>
</Filter>
<Filter Include="..\common\inc">
<UniqueIdentifier>{22723C73-8E32-B8A9-576D-0127C3ECFC85}</UniqueIdentifier>
<Filter Include="common\inc">
<UniqueIdentifier>{B7381BB1-A3F0-5CFE-0CF8-355AF8CEF7EE}</UniqueIdentifier>
</Filter>
<Filter Include="inc">
<UniqueIdentifier>{1F80880B-8B89-887C-1405-9F7C800D947C}</UniqueIdentifier>
Expand Down Expand Up @@ -59,11 +47,8 @@
</None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h">
<Filter>..\..\ags_lib\inc</Filter>
</ClInclude>
<ClInclude Include="..\..\common\inc\AMD_Types.h">
<Filter>..\common\inc</Filter>
<Filter>common\inc</Filter>
</ClInclude>
<ClInclude Include="..\inc\AMD_LIB.h">
<Filter>inc</Filter>
Expand Down
1 change: 0 additions & 1 deletion amd_lib/shared/d3d11/build/AMD_LIB_2012.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h" />
<ClInclude Include="..\..\common\inc\AMD_Types.h" />
<ClInclude Include="..\inc\AMD_LIB.h" />
<ClInclude Include="..\src\AMD_Buffer.h" />
Expand Down
25 changes: 5 additions & 20 deletions amd_lib/shared/d3d11/build/AMD_LIB_2012.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="..">
<UniqueIdentifier>{61705900-4DFC-870B-B6AA-880BA255880B}</UniqueIdentifier>
<Filter Include="common">
<UniqueIdentifier>{AEFEE3F6-9AA0-0ECD-835B-22216F9C951D}</UniqueIdentifier>
</Filter>
<Filter Include="..\..">
<UniqueIdentifier>{CC6E590B-3883-81BC-0105-251C6DD87DED}</UniqueIdentifier>
</Filter>
<Filter Include="..\..\ags_lib">
<UniqueIdentifier>{4CE19223-B8A1-0E5A-81DC-57D7ED5B5336}</UniqueIdentifier>
</Filter>
<Filter Include="..\..\ags_lib\inc">
<UniqueIdentifier>{553A9689-C150-941F-0AC8-1F41761D65A7}</UniqueIdentifier>
</Filter>
<Filter Include="..\common">
<UniqueIdentifier>{993A4365-05A5-F7DB-4EE3-A881BA8CD530}</UniqueIdentifier>
</Filter>
<Filter Include="..\common\inc">
<UniqueIdentifier>{22723C73-8E32-B8A9-576D-0127C3ECFC85}</UniqueIdentifier>
<Filter Include="common\inc">
<UniqueIdentifier>{B7381BB1-A3F0-5CFE-0CF8-355AF8CEF7EE}</UniqueIdentifier>
</Filter>
<Filter Include="inc">
<UniqueIdentifier>{1F80880B-8B89-887C-1405-9F7C800D947C}</UniqueIdentifier>
Expand Down Expand Up @@ -59,11 +47,8 @@
</None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h">
<Filter>..\..\ags_lib\inc</Filter>
</ClInclude>
<ClInclude Include="..\..\common\inc\AMD_Types.h">
<Filter>..\common\inc</Filter>
<Filter>common\inc</Filter>
</ClInclude>
<ClInclude Include="..\inc\AMD_LIB.h">
<Filter>inc</Filter>
Expand Down
1 change: 0 additions & 1 deletion amd_lib/shared/d3d11/build/AMD_LIB_2013.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h" />
<ClInclude Include="..\..\common\inc\AMD_Types.h" />
<ClInclude Include="..\inc\AMD_LIB.h" />
<ClInclude Include="..\src\AMD_Buffer.h" />
Expand Down
25 changes: 5 additions & 20 deletions amd_lib/shared/d3d11/build/AMD_LIB_2013.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="..">
<UniqueIdentifier>{61705900-4DFC-870B-B6AA-880BA255880B}</UniqueIdentifier>
<Filter Include="common">
<UniqueIdentifier>{AEFEE3F6-9AA0-0ECD-835B-22216F9C951D}</UniqueIdentifier>
</Filter>
<Filter Include="..\..">
<UniqueIdentifier>{CC6E590B-3883-81BC-0105-251C6DD87DED}</UniqueIdentifier>
</Filter>
<Filter Include="..\..\ags_lib">
<UniqueIdentifier>{4CE19223-B8A1-0E5A-81DC-57D7ED5B5336}</UniqueIdentifier>
</Filter>
<Filter Include="..\..\ags_lib\inc">
<UniqueIdentifier>{553A9689-C150-941F-0AC8-1F41761D65A7}</UniqueIdentifier>
</Filter>
<Filter Include="..\common">
<UniqueIdentifier>{993A4365-05A5-F7DB-4EE3-A881BA8CD530}</UniqueIdentifier>
</Filter>
<Filter Include="..\common\inc">
<UniqueIdentifier>{22723C73-8E32-B8A9-576D-0127C3ECFC85}</UniqueIdentifier>
<Filter Include="common\inc">
<UniqueIdentifier>{B7381BB1-A3F0-5CFE-0CF8-355AF8CEF7EE}</UniqueIdentifier>
</Filter>
<Filter Include="inc">
<UniqueIdentifier>{1F80880B-8B89-887C-1405-9F7C800D947C}</UniqueIdentifier>
Expand Down Expand Up @@ -59,11 +47,8 @@
</None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h">
<Filter>..\..\ags_lib\inc</Filter>
</ClInclude>
<ClInclude Include="..\..\common\inc\AMD_Types.h">
<Filter>..\common\inc</Filter>
<Filter>common\inc</Filter>
</ClInclude>
<ClInclude Include="..\inc\AMD_LIB.h">
<Filter>inc</Filter>
Expand Down
1 change: 0 additions & 1 deletion amd_lib/shared/d3d11/build/AMD_LIB_2015.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h" />
<ClInclude Include="..\..\common\inc\AMD_Types.h" />
<ClInclude Include="..\inc\AMD_LIB.h" />
<ClInclude Include="..\src\AMD_Buffer.h" />
Expand Down
25 changes: 5 additions & 20 deletions amd_lib/shared/d3d11/build/AMD_LIB_2015.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="..">
<UniqueIdentifier>{61705900-4DFC-870B-B6AA-880BA255880B}</UniqueIdentifier>
<Filter Include="common">
<UniqueIdentifier>{AEFEE3F6-9AA0-0ECD-835B-22216F9C951D}</UniqueIdentifier>
</Filter>
<Filter Include="..\..">
<UniqueIdentifier>{CC6E590B-3883-81BC-0105-251C6DD87DED}</UniqueIdentifier>
</Filter>
<Filter Include="..\..\ags_lib">
<UniqueIdentifier>{4CE19223-B8A1-0E5A-81DC-57D7ED5B5336}</UniqueIdentifier>
</Filter>
<Filter Include="..\..\ags_lib\inc">
<UniqueIdentifier>{553A9689-C150-941F-0AC8-1F41761D65A7}</UniqueIdentifier>
</Filter>
<Filter Include="..\common">
<UniqueIdentifier>{993A4365-05A5-F7DB-4EE3-A881BA8CD530}</UniqueIdentifier>
</Filter>
<Filter Include="..\common\inc">
<UniqueIdentifier>{22723C73-8E32-B8A9-576D-0127C3ECFC85}</UniqueIdentifier>
<Filter Include="common\inc">
<UniqueIdentifier>{B7381BB1-A3F0-5CFE-0CF8-355AF8CEF7EE}</UniqueIdentifier>
</Filter>
<Filter Include="inc">
<UniqueIdentifier>{1F80880B-8B89-887C-1405-9F7C800D947C}</UniqueIdentifier>
Expand Down Expand Up @@ -59,11 +47,8 @@
</None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\ags_lib\inc\amd_ags.h">
<Filter>..\..\ags_lib\inc</Filter>
</ClInclude>
<ClInclude Include="..\..\common\inc\AMD_Types.h">
<Filter>..\common\inc</Filter>
<Filter>common\inc</Filter>
</ClInclude>
<ClInclude Include="..\inc\AMD_LIB.h">
<Filter>inc</Filter>
Expand Down
88 changes: 77 additions & 11 deletions amd_tressfx/inc/AMD_TressFX.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
#define AMD_TRESSFX_H

#include <d3d11.h>
#if AMD_TRESSFX_VULKAN
#include <vulkan\vulkan.h>
#elif AMD_TRESSFX_DIRECT3D11
#include <d3d11.h>
#else
#error
#endif

#include <DirectXMath.h>

#define AMD_TRESSFX_VERSION_MAJOR 3
Expand Down Expand Up @@ -75,6 +83,19 @@
#define IDSRV_HAIR_FRAGMENT_COLORS 14
#define IDSRV_HAIR_ACCUM_INV_ALPHA 15

#define IDSRV_CONSTANTS_BUFFER 16
#define IDSRV_ATOMIC_COUNTER_BUFFER 17
#define IDSRV_NOISE_SAMPLER 18
#define IDSRV_SHADOW_SAMPLER 19

#define IDSRV_HAIR_PREVIOUS_VERTEX_POSITIONS 20
#define IDSRV_HAIR_VERTEX_INITIAL_POSITIONS 21
#define IDSRV_HAIR_STRAND_TYPE 22
#define IDSRV_HAIR_GLOBAL_ROTATION 23
#define IDSRV_HAIR_LOCAL_REF_VEC 24
#define IDSRV_HAIR_ROOT_OFFSET 25
#define IDSRV_HAIR_LENGTH 26
#define IDSRV_HEAD_TRANSFORM 27

#if defined(DEBUG) || defined(_DEBUG)
#define AMD_TRESSFX_DEBUG 1
Expand Down Expand Up @@ -167,10 +188,17 @@ struct TressFX_HairBlob

struct TressFX_SceneMesh
{
#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
#error
#endif
unsigned numMeshes; // number of meshes
unsigned* meshOffsets; // offset to the start of each mesh
ID3D11ShaderResourceView* pTransformedVerts; // transformed vertices
};

struct TressFX_HairTransform
Expand Down Expand Up @@ -227,33 +255,71 @@ 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.
#if AMD_TRESSFX_VULKAN
VkBufferView pSkinningTransformationsUAV;
// hair shadow map
VkImageView pHairShadowMapSRV;
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
#error
#endif
};

extern "C"
{
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_GetVersion(uint* major, uint* minor, uint* patch);
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Initialize(TressFX_Desc & desc);
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_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_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_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);
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);
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_LoadProcessedAsset(
TressFX_Desc &desc, TressFX_HairBlob *pHairBlob,
TressFX_SceneMesh *sceneMesh, VkImageView pTextureSRV,
VkCommandBuffer uploadCmdBuffer,
VkBuffer scratchBuffer, VkDeviceMemory scratchMemory);
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_CreateProcessedAsset(
TressFX_Desc &desc, TressFX_HairBlob **ppHairBlob,
TressFX_SceneMesh *sceneMesh, VkImageView pTextureSRV,
VkCommandBuffer uploadCmdBuffer,
VkBuffer scratchBuffer, VkDeviceMemory scratchMemory);
AMD_TRESSFX_DLL_API TRESSFX_RETURN_CODE TressFX_Begin(TressFX_Desc & desc, uint32_t uniformBufferIndex);
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, 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
}

} // namespace AMD
Expand Down
6 changes: 6 additions & 0 deletions amd_tressfx_viewer/build/TressFX_Viewer_2012.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_SDK_Minimal", "..\..\fr
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_TressFX", "..\..\AMD_TressFX\build\AMD_TressFX_2012.vcxproj", "{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_TressFX_Vulkan", "..\..\AMD_TressFX_Vulkan\build\AMD_TressFX_Vulkan_2012.vcxproj", "{9B729252-7D58-4B28-882F-DFB4EF44A485}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DXUT", "..\..\framework\d3d11\dxut\Core\DXUT_2012.vcxproj", "{85344B7F-5AA0-4E12-A065-D1333D11F6CA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DXUTOpt", "..\..\framework\d3d11\dxut\Optional\DXUTOpt_2012.vcxproj", "{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}"
Expand All @@ -35,6 +37,10 @@ Global
{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Debug|x64.Build.0 = DLL_Debug|x64
{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Release|x64.ActiveCfg = DLL_Release|x64
{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Release|x64.Build.0 = DLL_Release|x64
{9B729252-7D58-4B28-882F-DFB4EF44A485}.Debug|x64.ActiveCfg = DLL_Debug|x64
{9B729252-7D58-4B28-882F-DFB4EF44A485}.Debug|x64.Build.0 = DLL_Debug|x64
{9B729252-7D58-4B28-882F-DFB4EF44A485}.Release|x64.ActiveCfg = DLL_Release|x64
{9B729252-7D58-4B28-882F-DFB4EF44A485}.Release|x64.Build.0 = DLL_Release|x64
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Debug|x64.ActiveCfg = Debug|x64
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Debug|x64.Build.0 = Debug|x64
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Release|x64.ActiveCfg = Release|x64
Expand Down
6 changes: 6 additions & 0 deletions amd_tressfx_viewer/build/TressFX_Viewer_2013.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_SDK_Minimal", "..\..\fr
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_TressFX", "..\..\AMD_TressFX\build\AMD_TressFX_2013.vcxproj", "{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_TressFX_Vulkan", "..\..\AMD_TressFX_Vulkan\build\AMD_TressFX_Vulkan_2013.vcxproj", "{9B729252-7D58-4B28-882F-DFB4EF44A485}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DXUT", "..\..\framework\d3d11\dxut\Core\DXUT_2013.vcxproj", "{85344B7F-5AA0-4E12-A065-D1333D11F6CA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DXUTOpt", "..\..\framework\d3d11\dxut\Optional\DXUTOpt_2013.vcxproj", "{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}"
Expand All @@ -35,6 +37,10 @@ Global
{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Debug|x64.Build.0 = DLL_Debug|x64
{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Release|x64.ActiveCfg = DLL_Release|x64
{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Release|x64.Build.0 = DLL_Release|x64
{9B729252-7D58-4B28-882F-DFB4EF44A485}.Debug|x64.ActiveCfg = DLL_Debug|x64
{9B729252-7D58-4B28-882F-DFB4EF44A485}.Debug|x64.Build.0 = DLL_Debug|x64
{9B729252-7D58-4B28-882F-DFB4EF44A485}.Release|x64.ActiveCfg = DLL_Release|x64
{9B729252-7D58-4B28-882F-DFB4EF44A485}.Release|x64.Build.0 = DLL_Release|x64
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Debug|x64.ActiveCfg = Debug|x64
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Debug|x64.Build.0 = Debug|x64
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Release|x64.ActiveCfg = Release|x64
Expand Down
6 changes: 6 additions & 0 deletions amd_tressfx_viewer/build/TressFX_Viewer_2015.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_SDK_Minimal", "..\..\fr
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_TressFX", "..\..\AMD_TressFX\build\AMD_TressFX_2015.vcxproj", "{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_TressFX_Vulkan", "..\..\AMD_TressFX_Vulkan\build\AMD_TressFX_Vulkan_2015.vcxproj", "{9B729252-7D58-4B28-882F-DFB4EF44A485}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DXUT", "..\..\framework\d3d11\dxut\Core\DXUT_2015.vcxproj", "{85344B7F-5AA0-4E12-A065-D1333D11F6CA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DXUTOpt", "..\..\framework\d3d11\dxut\Optional\DXUTOpt_2015.vcxproj", "{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}"
Expand All @@ -35,6 +37,10 @@ Global
{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Debug|x64.Build.0 = DLL_Debug|x64
{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Release|x64.ActiveCfg = DLL_Release|x64
{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Release|x64.Build.0 = DLL_Release|x64
{9B729252-7D58-4B28-882F-DFB4EF44A485}.Debug|x64.ActiveCfg = DLL_Debug|x64
{9B729252-7D58-4B28-882F-DFB4EF44A485}.Debug|x64.Build.0 = DLL_Debug|x64
{9B729252-7D58-4B28-882F-DFB4EF44A485}.Release|x64.ActiveCfg = DLL_Release|x64
{9B729252-7D58-4B28-882F-DFB4EF44A485}.Release|x64.Build.0 = DLL_Release|x64
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Debug|x64.ActiveCfg = Debug|x64
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Debug|x64.Build.0 = Debug|x64
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Release|x64.ActiveCfg = Release|x64
Expand Down
Loading