drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge changes from The Witness.

Browse Source
This commit is contained in:
Ignacio
2015-03-24 12:14:49 -07:00
parent 7e2a9d1adb
commit a083337473
57 changed files with 2061 additions and 916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
project/vc9/bc6h/bc6h.vcproj
View File

@ -267,39 +267,39 @@
</References>
<Files>
<File
RelativePath="..\..\..\src\nvtt\bc6h\bits.h"
RelativePath="..\..\..\src\bc6h\bits.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc6h\shapes_two.h"
RelativePath="..\..\..\src\bc6h\shapes_two.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc6h\tile.h"
RelativePath="..\..\..\src\bc6h\tile.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc6h\utils.cpp"
RelativePath="..\..\..\src\bc6h\zoh.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc6h\utils.h"
RelativePath="..\..\..\src\bc6h\zoh.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc6h\zoh.cpp"
RelativePath="..\..\..\src\bc6h\zoh_utils.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc6h\zoh.h"
RelativePath="..\..\..\src\bc6h\zoh_utils.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc6h\zohone.cpp"
RelativePath="..\..\..\src\bc6h\zohone.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc6h\zohtwo.cpp"
RelativePath="..\..\..\src\bc6h\zohtwo.cpp"
>
</File>
</Files>

34
project/vc9/bc7/bc7.vcproj
View File

@ -267,71 +267,71 @@
</References>
<Files>
<File
RelativePath="..\..\..\src\nvtt\bc7\avpcl.cpp"
RelativePath="..\..\..\src\bc7\avpcl.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\avpcl.h"
RelativePath="..\..\..\src\bc7\avpcl.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\avpcl_mode0.cpp"
RelativePath="..\..\..\src\bc7\avpcl_mode0.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\avpcl_mode1.cpp"
RelativePath="..\..\..\src\bc7\avpcl_mode1.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\avpcl_mode2.cpp"
RelativePath="..\..\..\src\bc7\avpcl_mode2.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\avpcl_mode3.cpp"
RelativePath="..\..\..\src\bc7\avpcl_mode3.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\avpcl_mode4.cpp"
RelativePath="..\..\..\src\bc7\avpcl_mode4.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\avpcl_mode5.cpp"
RelativePath="..\..\..\src\bc7\avpcl_mode5.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\avpcl_mode6.cpp"
RelativePath="..\..\..\src\bc7\avpcl_mode6.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\avpcl_mode7.cpp"
RelativePath="..\..\..\src\bc7\avpcl_mode7.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\bits.h"
RelativePath="..\..\..\src\bc7\avpcl_utils.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\endpts.h"
RelativePath="..\..\..\src\bc7\avpcl_utils.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\shapes_three.h"
RelativePath="..\..\..\src\bc7\bits.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\shapes_two.h"
RelativePath="..\..\..\src\bc7\endpts.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\tile.h"
RelativePath="..\..\..\src\bc7\shapes_three.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\utils.cpp"
RelativePath="..\..\..\src\bc7\shapes_two.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\bc7\utils.h"
RelativePath="..\..\..\src\bc7\tile.h"
>
</File>
</Files>

8
project/vc9/nvmath/nvmath.vcproj
View File

@ -334,6 +334,14 @@
RelativePath="..\..\..\src\nvmath\nvmath.h"
>
</File>
<File
RelativePath="..\..\..\src\nvmath\PackedFloat.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvmath\PackedFloat.h"
>
</File>
<File
RelativePath="..\..\..\src\nvmath\Plane.cpp"
>

2
project/vc9/nvtt.sln
View File

@ -48,6 +48,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvdecompress", "nvdecompres
ProjectSection(ProjectDependencies) = postProject
{F974F34B-AF02-4C88-8E1E-85475094EA78} = {F974F34B-AF02-4C88-8E1E-85475094EA78}
{F143D180-D4C4-4037-B3DE-BE89A21C8D1D} = {F143D180-D4C4-4037-B3DE-BE89A21C8D1D}
{1AEB7681-57D8-48EE-813D-5C41CC38B647} = {1AEB7681-57D8-48EE-813D-5C41CC38B647}
{4046F392-A18B-4C66-9639-3EABFFF5D531} = {4046F392-A18B-4C66-9639-3EABFFF5D531}
{C33787E3-5564-4834-9FE3-A9020455A669} = {C33787E3-5564-4834-9FE3-A9020455A669}
{50C465FE-B308-42BC-894D-89484482AF06} = {50C465FE-B308-42BC-894D-89484482AF06}
@ -57,6 +58,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvimgdiff", "nvimgdiff\nvim
ProjectSection(ProjectDependencies) = postProject
{F974F34B-AF02-4C88-8E1E-85475094EA78} = {F974F34B-AF02-4C88-8E1E-85475094EA78}
{F143D180-D4C4-4037-B3DE-BE89A21C8D1D} = {F143D180-D4C4-4037-B3DE-BE89A21C8D1D}
{1AEB7681-57D8-48EE-813D-5C41CC38B647} = {1AEB7681-57D8-48EE-813D-5C41CC38B647}
{4046F392-A18B-4C66-9639-3EABFFF5D531} = {4046F392-A18B-4C66-9639-3EABFFF5D531}
{C33787E3-5564-4834-9FE3-A9020455A669} = {C33787E3-5564-4834-9FE3-A9020455A669}
{50C465FE-B308-42BC-894D-89484482AF06} = {50C465FE-B308-42BC-894D-89484482AF06}

16
project/vc9/nvtt/nvtt.vcproj
View File

@ -938,6 +938,22 @@
RelativePath="..\..\..\src\nvtt\CompressorDX9.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorDXT1.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorDXT1.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorDXT5_RGBM.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorDXT5_RGBM.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorRGB.cpp"
>

24
project/vc9/testsuite/testsuite.vcproj
View File

@ -99,8 +99,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops"
CharacterSet="1"
@ -257,8 +257,8 @@
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops"
CharacterSet="1"
@ -337,8 +337,8 @@
</Configuration>
<Configuration
Name="Debug-CUDA|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops"
CharacterSet="1"
@ -415,8 +415,8 @@
</Configuration>
<Configuration
Name="Debug-CUDA|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops"
CharacterSet="1"
@ -494,8 +494,8 @@
</Configuration>
<Configuration
Name="Release-CUDA|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops"
CharacterSet="1"
@ -573,8 +573,8 @@
</Configuration>
<Configuration
Name="Release-CUDA|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops"
CharacterSet="1"