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

Fix errors in new cluster fit compressor.

Browse Source
This commit is contained in:
castano
2012-01-02 08:49:13 +00:00
parent 23bfc1b514
commit f2d90ee844
16 changed files with 677 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
Name="Debug-CUDA|Win32"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="2"
@ -101,7 +101,7 @@
/>
</Configuration>
<Configuration
Name="Debug|x64"
Name="Debug-CUDA|x64"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="2"
@ -181,7 +181,7 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
Name="Release-CUDA|Win32"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="2"
@ -270,7 +270,7 @@
/>
</Configuration>
<Configuration
Name="Release|x64"
Name="Release-CUDA|x64"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="2"
@ -355,7 +355,7 @@
/>
</Configuration>
<Configuration
Name="Debug (no cuda)|Win32"
Name="Debug|Win32"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="2"
@ -436,7 +436,7 @@
/>
</Configuration>
<Configuration
Name="Debug (no cuda)|x64"
Name="Debug|x64"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="2"
@ -512,7 +512,7 @@
/>
</Configuration>
<Configuration
Name="Release (no cuda)|Win32"
Name="Release|Win32"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="2"
@ -596,7 +596,7 @@
/>
</Configuration>
<Configuration
Name="Release (no cuda)|x64"
Name="Release|x64"
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
ConfigurationType="2"
@ -640,7 +640,7 @@
Name="VCLinkerTool"
OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(CUDA_LIB_PATH)\..\lib64&quot;"
AdditionalLibraryDirectories=""
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@ -697,7 +697,7 @@
RelativePath="..\..\..\src\nvtt\cuda\CompressKernel.cu"
>
<FileConfiguration
Name="Debug|Win32"
Name="Debug-CUDA|Win32"
>
<Tool
Name="VCCustomBuildTool"
@ -707,7 +707,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
Name="Debug-CUDA|x64"
>
<Tool
Name="VCCustomBuildTool"
@ -717,7 +717,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
Name="Release-CUDA|Win32"
>
<Tool
Name="VCCustomBuildTool"
@ -727,7 +727,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
Name="Release-CUDA|x64"
>
<Tool
Name="VCCustomBuildTool"
@ -737,7 +737,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Debug (no cuda)|Win32"
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
@ -748,7 +748,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Debug (no cuda)|x64"
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@ -756,7 +756,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release (no cuda)|Win32"
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@ -767,7 +767,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release (no cuda)|x64"
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
@ -778,6 +778,38 @@
<File
RelativePath="..\..\..\src\nvtt\cuda\ConvolveKernel.cu"
>
<FileConfiguration
Name="Debug-CUDA|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-CUDA|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release-CUDA|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release-CUDA|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
@ -810,38 +842,6 @@
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug (no cuda)|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug (no cuda)|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release (no cuda)|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release (no cuda)|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\nvtt\cuda\CudaCompressorDXT.cpp"
@ -895,6 +895,38 @@
<File
RelativePath="..\..\..\src\nvtt\CompressorDX11.cpp"
>
<FileConfiguration
Name="Debug-CUDA|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-CUDA|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release-CUDA|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release-CUDA|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
@ -927,42 +959,42 @@
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug (no cuda)|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug (no cuda)|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release (no cuda)|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release (no cuda)|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorDX11.h"
>
<FileConfiguration
Name="Debug-CUDA|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-CUDA|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release-CUDA|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release-CUDA|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
@ -995,38 +1027,6 @@
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug (no cuda)|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug (no cuda)|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release (no cuda)|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release (no cuda)|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorDX9.cpp"
@ -1120,10 +1120,6 @@
RelativePath="..\..\..\src\nvtt\SingleColorLookup.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\TaskDispatcher.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\Surface.cpp"
>
@ -1132,6 +1128,10 @@
RelativePath="..\..\..\src\nvtt\Surface.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\TaskDispatcher.h"
>
</File>
</Files>
<Globals>
</Globals>