Add BC7 support. It's incredibly slow - ~60 seconds to compress a 512x512 image, on a Core i7 - but it works.

- Added AVPCL compressor to projects and got it building with VC9 and VC10. - Removed unused command line interface & file read/write code from AVPCL. - Convert AVPCL to use NV vector math lib, asserts, etc. - Convert AVPCL to use double instead of float. - Added 4x4 symmetric eigensolver, for AVPCL; it's based on the existing 3x3 one, but I had to rewrite the Householder reduction stage. As with ZOH, using the eigensolver (instead of SVD) gives a ~25% speedup without significantly affecting RMSE. - Encapsulate ZOH and AVPCL stuff into their own namespaces to keep everything separate. - Added some missing vector operators to the nvmath lib.
2013-12-07 02:17:08 +00:00
parent f2fa0517b5
commit ab316deeaa
86 changed files with 2944 additions and 11081 deletions
--- a/project/vc10/bc7/bc7.vcxproj
+++ b/project/vc10/bc7/bc7.vcxproj
@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F974F34B-AF02-4C88-8E1E-85475094EA78}</ProjectGuid>
+    <RootNamespace>bc7</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)\nvtt.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)\nvtt.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)\nvtt.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)\nvtt.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(Platform)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(Platform)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\$(Platform)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\$(Platform)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(Platform)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(Platform)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\$(Platform)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\$(Platform)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\..\..\src;$(SolutionDir)\..\..\extern\poshlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\..\..\src;$(SolutionDir)\..\..\extern\poshlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\..\..\src;$(SolutionDir)\..\..\extern\poshlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\..\..\src;$(SolutionDir)\..\..\extern\poshlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\nvtt\bc7\avpcl.h" />
+    <ClInclude Include="..\..\..\src\nvtt\bc7\bits.h" />
+    <ClInclude Include="..\..\..\src\nvtt\bc7\endpts.h" />
+    <ClInclude Include="..\..\..\src\nvtt\bc7\shapes_two.h" />
+    <ClInclude Include="..\..\..\src\nvtt\bc7\shapes_three.h" />
+    <ClInclude Include="..\..\..\src\nvtt\bc7\tile.h" />
+    <ClInclude Include="..\..\..\src\nvtt\bc7\utils.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode0.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode1.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode2.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode3.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode4.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode5.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode6.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode7.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\bc7\utils.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/project/vc10/nvassemble/nvassemble.vcxproj
+++ b/project/vc10/nvassemble/nvassemble.vcxproj
@ -181,6 +181,9 @@
    <ProjectReference Include="..\bc6h\bc6h.vcxproj">
      <Project>{c33787e3-5564-4834-9fe3-a9020455a669}</Project>
    </ProjectReference>
+    <ProjectReference Include="..\bc7\bc7.vcxproj">
+      <Project>{f974f34b-af02-4c88-8e1e-85475094ea78}</Project>
+    </ProjectReference>
    <ProjectReference Include="..\nvcore\nvcore.vcxproj">
      <Project>{f143d180-d4c4-4037-b3de-be89a21c8d1d}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
--- a/project/vc10/nvcompress/nvcompress.vcxproj
+++ b/project/vc10/nvcompress/nvcompress.vcxproj
@ -355,6 +355,9 @@
    <ProjectReference Include="..\bc6h\bc6h.vcxproj">
      <Project>{c33787e3-5564-4834-9fe3-a9020455a669}</Project>
    </ProjectReference>
+    <ProjectReference Include="..\bc7\bc7.vcxproj">
+      <Project>{f974f34b-af02-4c88-8e1e-85475094ea78}</Project>
+    </ProjectReference>
    <ProjectReference Include="..\nvcore\nvcore.vcxproj">
      <Project>{f143d180-d4c4-4037-b3de-be89a21c8d1d}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
--- a/project/vc10/nvddsinfo/nvddsinfo.vcxproj
+++ b/project/vc10/nvddsinfo/nvddsinfo.vcxproj
@ -181,6 +181,9 @@
    <ProjectReference Include="..\bc6h\bc6h.vcxproj">
      <Project>{c33787e3-5564-4834-9fe3-a9020455a669}</Project>
    </ProjectReference>
+    <ProjectReference Include="..\bc7\bc7.vcxproj">
+      <Project>{f974f34b-af02-4c88-8e1e-85475094ea78}</Project>
+    </ProjectReference>
    <ProjectReference Include="..\nvcore\nvcore.vcxproj">
      <Project>{f143d180-d4c4-4037-b3de-be89a21c8d1d}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
--- a/project/vc10/nvdecompress/nvdecompress.vcxproj
+++ b/project/vc10/nvdecompress/nvdecompress.vcxproj
@ -207,6 +207,9 @@
    <ProjectReference Include="..\bc6h\bc6h.vcxproj">
      <Project>{c33787e3-5564-4834-9fe3-a9020455a669}</Project>
    </ProjectReference>
+    <ProjectReference Include="..\bc7\bc7.vcxproj">
+      <Project>{f974f34b-af02-4c88-8e1e-85475094ea78}</Project>
+    </ProjectReference>
    <ProjectReference Include="..\nvcore\nvcore.vcxproj">
      <Project>{f143d180-d4c4-4037-b3de-be89a21c8d1d}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
--- a/project/vc10/nvimgdiff/nvimgdiff.vcxproj
+++ b/project/vc10/nvimgdiff/nvimgdiff.vcxproj
@ -209,6 +209,9 @@
    <ProjectReference Include="..\bc6h\bc6h.vcxproj">
      <Project>{c33787e3-5564-4834-9fe3-a9020455a669}</Project>
    </ProjectReference>
+    <ProjectReference Include="..\bc7\bc7.vcxproj">
+      <Project>{f974f34b-af02-4c88-8e1e-85475094ea78}</Project>
+    </ProjectReference>
    <ProjectReference Include="..\nvcore\nvcore.vcxproj">
      <Project>{f143d180-d4c4-4037-b3de-be89a21c8d1d}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
--- a/project/vc10/nvtt.sln
+++ b/project/vc10/nvtt.sln
@ -45,6 +45,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bc6h", "bc6h\bc6h.vcxproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvthread", "nvthread\nvthread.vcxproj", "{4CFD4876-A026-46C2-AFCF-FB11346E815D}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bc7", "bc7\bc7.vcxproj", "{F974F34B-AF02-4C88-8E1E-85475094EA78}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@ -313,6 +315,22 @@ Global
 		{4CFD4876-A026-46C2-AFCF-FB11346E815D}.Release-CUDA|Win32.Build.0 = Release|Win32
 		{4CFD4876-A026-46C2-AFCF-FB11346E815D}.Release-CUDA|x64.ActiveCfg = Release|x64
 		{4CFD4876-A026-46C2-AFCF-FB11346E815D}.Release-CUDA|x64.Build.0 = Release|x64
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Debug|Win32.Build.0 = Debug|Win32
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Debug|x64.ActiveCfg = Debug|x64
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Debug|x64.Build.0 = Debug|x64
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Debug-CUDA|Win32.ActiveCfg = Debug|Win32
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Debug-CUDA|Win32.Build.0 = Debug|Win32
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Debug-CUDA|x64.ActiveCfg = Debug|x64
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Debug-CUDA|x64.Build.0 = Debug|x64
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Release|Win32.ActiveCfg = Release|Win32
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Release|Win32.Build.0 = Release|Win32
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Release|x64.ActiveCfg = Release|x64
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Release|x64.Build.0 = Release|x64
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Release-CUDA|Win32.ActiveCfg = Release|Win32
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Release-CUDA|Win32.Build.0 = Release|Win32
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Release-CUDA|x64.ActiveCfg = Release|x64
+		{F974F34B-AF02-4C88-8E1E-85475094EA78}.Release-CUDA|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/project/vc10/nvtt/nvtt.vcxproj
+++ b/project/vc10/nvtt/nvtt.vcxproj
@ -471,6 +471,9 @@
      <Project>{c33787e3-5564-4834-9fe3-a9020455a669}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
+    <ProjectReference Include="..\bc7\bc7.vcxproj">
+      <Project>{f974f34b-af02-4c88-8e1e-85475094ea78}</Project>
+    </ProjectReference>
    <ProjectReference Include="..\nvcore\nvcore.vcxproj">
      <Project>{f143d180-d4c4-4037-b3de-be89a21c8d1d}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
--- a/project/vc10/nvzoom/nvzoom.vcxproj
+++ b/project/vc10/nvzoom/nvzoom.vcxproj
@ -200,6 +200,9 @@
    <ProjectReference Include="..\bc6h\bc6h.vcxproj">
      <Project>{c33787e3-5564-4834-9fe3-a9020455a669}</Project>
    </ProjectReference>
+    <ProjectReference Include="..\bc7\bc7.vcxproj">
+      <Project>{f974f34b-af02-4c88-8e1e-85475094ea78}</Project>
+    </ProjectReference>
    <ProjectReference Include="..\nvcore\nvcore.vcxproj">
      <Project>{f143d180-d4c4-4037-b3de-be89a21c8d1d}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>