rename 2.0 tag to 2.0.0
castano
16 years ago
parent
7933aeea09
commit
a1b655d0d5
Binary file not shown.
Binary file not shown.
@ -1,201 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252"?>
|
|
||||||
<VisualStudioProject
|
|
||||||
ProjectType="Visual C++"
|
|
||||||
Version="8.00"
|
|
||||||
Name="stress"
|
|
||||||
ProjectGUID="{317B694E-B5C1-42A6-956F-FC12B69175A6}"
|
|
||||||
RootNamespace="stress"
|
|
||||||
Keyword="Win32Proj"
|
|
||||||
>
|
|
||||||
<Platforms>
|
|
||||||
<Platform
|
|
||||||
Name="Win32"
|
|
||||||
/>
|
|
||||||
</Platforms>
|
|
||||||
<ToolFiles>
|
|
||||||
</ToolFiles>
|
|
||||||
<Configurations>
|
|
||||||
<Configuration
|
|
||||||
Name="Debug|Win32"
|
|
||||||
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
|
|
||||||
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
|
|
||||||
ConfigurationType="1"
|
|
||||||
CharacterSet="1"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCPreBuildEventTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCCustomBuildTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCXMLDataGeneratorTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCWebServiceProxyGeneratorTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCMIDLTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
Optimization="0"
|
|
||||||
AdditionalIncludeDirectories="..;..\..\..\src"
|
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
|
||||||
MinimalRebuild="true"
|
|
||||||
BasicRuntimeChecks="3"
|
|
||||||
RuntimeLibrary="3"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
WarningLevel="3"
|
|
||||||
Detect64BitPortabilityProblems="true"
|
|
||||||
DebugInformationFormat="4"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCManagedResourceCompilerTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCResourceCompilerTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCPreLinkEventTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCLinkerTool"
|
|
||||||
OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).exe"
|
|
||||||
LinkIncremental="2"
|
|
||||||
GenerateDebugInformation="true"
|
|
||||||
SubSystem="1"
|
|
||||||
TargetMachine="1"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCALinkTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCManifestTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCXDCMakeTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCBscMakeTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCFxCopTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCAppVerifierTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCWebDeploymentTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCPostBuildEventTool"
|
|
||||||
/>
|
|
||||||
</Configuration>
|
|
||||||
<Configuration
|
|
||||||
Name="Release|Win32"
|
|
||||||
OutputDirectory="$(ConfigurationName)\$(PlatformName)"
|
|
||||||
IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
|
|
||||||
ConfigurationType="1"
|
|
||||||
CharacterSet="1"
|
|
||||||
WholeProgramOptimization="1"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCPreBuildEventTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCCustomBuildTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCXMLDataGeneratorTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCWebServiceProxyGeneratorTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCMIDLTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
AdditionalIncludeDirectories="..;..\..\..\src"
|
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
|
|
||||||
RuntimeLibrary="2"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
WarningLevel="3"
|
|
||||||
Detect64BitPortabilityProblems="true"
|
|
||||||
DebugInformationFormat="3"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCManagedResourceCompilerTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCResourceCompilerTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCPreLinkEventTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCLinkerTool"
|
|
||||||
OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).exe"
|
|
||||||
LinkIncremental="1"
|
|
||||||
GenerateDebugInformation="true"
|
|
||||||
SubSystem="1"
|
|
||||||
OptimizeReferences="2"
|
|
||||||
EnableCOMDATFolding="2"
|
|
||||||
TargetMachine="1"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCALinkTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCManifestTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCXDCMakeTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCBscMakeTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCFxCopTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCAppVerifierTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCWebDeploymentTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCPostBuildEventTool"
|
|
||||||
/>
|
|
||||||
</Configuration>
|
|
||||||
</Configurations>
|
|
||||||
<References>
|
|
||||||
</References>
|
|
||||||
<Files>
|
|
||||||
<Filter
|
|
||||||
Name="Source Files"
|
|
||||||
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
|
||||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
|
||||||
>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\..\src\nvtt\tests\stress.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
<Filter
|
|
||||||
Name="Header Files"
|
|
||||||
Filter="h;hpp;hxx;hm;inl;inc;xsd"
|
|
||||||
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
|
|
||||||
>
|
|
||||||
</Filter>
|
|
||||||
<Filter
|
|
||||||
Name="Resource Files"
|
|
||||||
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
|
|
||||||
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
|
|
||||||
>
|
|
||||||
</Filter>
|
|
||||||
</Files>
|
|
||||||
<Globals>
|
|
||||||
</Globals>
|
|
||||||
</VisualStudioProject>
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,389 +1,221 @@
|
|||||||
// Copyright NVIDIA Corporation 2007 -- Ignacio Castano <icastano@nvidia.com>
|
// Copyright NVIDIA Corporation 2007 -- Ignacio Castano <icastano@nvidia.com>
|
||||||
//
|
//
|
||||||
// Permission is hereby granted, free of charge, to any person
|
// Permission is hereby granted, free of charge, to any person
|
||||||
// obtaining a copy of this software and associated documentation
|
// obtaining a copy of this software and associated documentation
|
||||||
// files (the "Software"), to deal in the Software without
|
// files (the "Software"), to deal in the Software without
|
||||||
// restriction, including without limitation the rights to use,
|
// restriction, including without limitation the rights to use,
|
||||||
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
// copies of the Software, and to permit persons to whom the
|
// copies of the Software, and to permit persons to whom the
|
||||||
// Software is furnished to do so, subject to the following
|
// Software is furnished to do so, subject to the following
|
||||||
// conditions:
|
// conditions:
|
||||||
//
|
//
|
||||||
// The above copyright notice and this permission notice shall be
|
// The above copyright notice and this permission notice shall be
|
||||||
// included in all copies or substantial portions of the Software.
|
// included in all copies or substantial portions of the Software.
|
||||||
//
|
//
|
||||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
// OTHER DEALINGS IN THE SOFTWARE.
|
// OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// Math functions and operators to be used with vector types.
|
// Math functions and operators to be used with vector types.
|
||||||
|
|
||||||
#ifndef CUDAMATH_H
|
#ifndef CUDAMATH_H
|
||||||
#define CUDAMATH_H
|
#define CUDAMATH_H
|
||||||
|
|
||||||
#include <float.h>
|
#include <float.h>
|
||||||
|
|
||||||
|
|
||||||
inline __device__ __host__ float3 operator *(float3 a, float3 b)
|
inline __device__ __host__ float3 operator *(float3 a, float3 b)
|
||||||
{
|
{
|
||||||
return make_float3(a.x*b.x, a.y*b.y, a.z*b.z);
|
return make_float3(a.x*b.x, a.y*b.y, a.z*b.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline __device__ __host__ float3 operator *(float f, float3 v)
|
inline __device__ __host__ float3 operator *(float f, float3 v)
|
||||||
{
|
{
|
||||||
return make_float3(v.x*f, v.y*f, v.z*f);
|
return make_float3(v.x*f, v.y*f, v.z*f);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline __device__ __host__ float3 operator *(float3 v, float f)
|
inline __device__ __host__ float3 operator *(float3 v, float f)
|
||||||
{
|
{
|
||||||
return make_float3(v.x*f, v.y*f, v.z*f);
|
return make_float3(v.x*f, v.y*f, v.z*f);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline __device__ __host__ float3 operator +(float3 a, float3 b)
|
inline __device__ __host__ float3 operator +(float3 a, float3 b)
|
||||||
{
|
{
|
||||||
return make_float3(a.x+b.x, a.y+b.y, a.z+b.z);
|
return make_float3(a.x+b.x, a.y+b.y, a.z+b.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline __device__ __host__ void operator +=(float3 & b, float3 a)
|
inline __device__ __host__ void operator +=(float3 & b, float3 a)
|
||||||
{
|
{
|
||||||
b.x += a.x;
|
b.x += a.x;
|
||||||
b.y += a.y;
|
b.y += a.y;
|
||||||
b.z += a.z;
|
b.z += a.z;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline __device__ __host__ float3 operator -(float3 a, float3 b)
|
inline __device__ __host__ float3 operator -(float3 a, float3 b)
|
||||||
{
|
{
|
||||||
return make_float3(a.x-b.x, a.y-b.y, a.z-b.z);
|
return make_float3(a.x-b.x, a.y-b.y, a.z-b.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline __device__ __host__ void operator -=(float3 & b, float3 a)
|
inline __device__ __host__ void operator -=(float3 & b, float3 a)
|
||||||
{
|
{
|
||||||
b.x -= a.x;
|
b.x -= a.x;
|
||||||
b.y -= a.y;
|
b.y -= a.y;
|
||||||
b.z -= a.z;
|
b.z -= a.z;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline __device__ __host__ float3 operator /(float3 v, float f)
|
inline __device__ __host__ float3 operator /(float3 v, float f)
|
||||||
{
|
{
|
||||||
float inv = 1.0f / f;
|
float inv = 1.0f / f;
|
||||||
return v * inv;
|
return v * inv;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline __device__ __host__ void operator /=(float3 & b, float f)
|
inline __device__ __host__ void operator /=(float3 & b, float f)
|
||||||
{
|
{
|
||||||
float inv = 1.0f / f;
|
float inv = 1.0f / f;
|
||||||
b.x *= inv;
|
b.x *= inv;
|
||||||
b.y *= inv;
|
b.y *= inv;
|
||||||
b.z *= inv;
|
b.z *= inv;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline __device__ __host__ bool operator ==(float3 a, float3 b)
|
|
||||||
{
|
inline __device__ __host__ float dot(float3 a, float3 b)
|
||||||
return a.x == b.x && a.y == b.y && a.z == b.z;
|
{
|
||||||
}
|
return a.x * b.x + a.y * b.y + a.z * b.z;
|
||||||
|
}
|
||||||
|
|
||||||
// float2 operators
|
inline __device__ __host__ float dot(float4 a, float4 b)
|
||||||
inline __device__ __host__ float2 operator *(float2 a, float2 b)
|
{
|
||||||
{
|
return a.x * b.x + a.y * b.y + a.z * b.z + a.w * b.w;
|
||||||
return make_float2(a.x*b.x, a.y*b.y);
|
}
|
||||||
}
|
|
||||||
|
inline __device__ __host__ float clamp(float f, float a, float b)
|
||||||
inline __device__ __host__ float2 operator *(float f, float2 v)
|
{
|
||||||
{
|
return max(a, min(f, b));
|
||||||
return make_float2(v.x*f, v.y*f);
|
}
|
||||||
}
|
|
||||||
|
inline __device__ __host__ float3 clamp(float3 v, float a, float b)
|
||||||
inline __device__ __host__ float2 operator *(float2 v, float f)
|
{
|
||||||
{
|
return make_float3(clamp(v.x, a, b), clamp(v.y, a, b), clamp(v.z, a, b));
|
||||||
return make_float2(v.x*f, v.y*f);
|
}
|
||||||
}
|
|
||||||
|
inline __device__ __host__ float3 clamp(float3 v, float3 a, float3 b)
|
||||||
inline __device__ __host__ float2 operator +(float2 a, float2 b)
|
{
|
||||||
{
|
return make_float3(clamp(v.x, a.x, b.x), clamp(v.y, a.y, b.y), clamp(v.z, a.z, b.z));
|
||||||
return make_float2(a.x+b.x, a.y+b.y);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
inline __device__ __host__ void operator +=(float2 & b, float2 a)
|
inline __device__ __host__ float3 normalize(float3 v)
|
||||||
{
|
{
|
||||||
b.x += a.x;
|
float len = 1.0f / sqrtf(dot(v, v));
|
||||||
b.y += a.y;
|
return make_float3(v.x * len, v.y * len, v.z * len);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline __device__ __host__ float2 operator -(float2 a, float2 b)
|
|
||||||
{
|
|
||||||
return make_float2(a.x-b.x, a.y-b.y);
|
|
||||||
}
|
// Use power method to find the first eigenvector.
|
||||||
|
// http://www.miislita.com/information-retrieval-tutorial/matrix-tutorial-3-eigenvalues-eigenvectors.html
|
||||||
inline __device__ __host__ void operator -=(float2 & b, float2 a)
|
inline __device__ __host__ float3 firstEigenVector( float matrix[6] )
|
||||||
{
|
{
|
||||||
b.x -= a.x;
|
// 8 iterations seems to be more than enough.
|
||||||
b.y -= a.y;
|
|
||||||
}
|
float3 v = make_float3(1.0f, 1.0f, 1.0f);
|
||||||
|
for(int i = 0; i < 8; i++) {
|
||||||
inline __device__ __host__ float2 operator /(float2 v, float f)
|
float x = v.x * matrix[0] + v.y * matrix[1] + v.z * matrix[2];
|
||||||
{
|
float y = v.x * matrix[1] + v.y * matrix[3] + v.z * matrix[4];
|
||||||
float inv = 1.0f / f;
|
float z = v.x * matrix[2] + v.y * matrix[4] + v.z * matrix[5];
|
||||||
return v * inv;
|
float m = max(max(x, y), z);
|
||||||
}
|
float iv = 1.0f / m;
|
||||||
|
#if __DEVICE_EMULATION__
|
||||||
inline __device__ __host__ void operator /=(float2 & b, float f)
|
if (m == 0.0f) iv = 0.0f;
|
||||||
{
|
#endif
|
||||||
float inv = 1.0f / f;
|
v = make_float3(x*iv, y*iv, z*iv);
|
||||||
b.x *= inv;
|
}
|
||||||
b.y *= inv;
|
|
||||||
}
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
inline __device__ __host__ float dot(float2 a, float2 b)
|
inline __device__ void colorSums(const float3 * colors, float3 * sums)
|
||||||
{
|
{
|
||||||
return a.x * b.x + a.y * b.y;
|
#if __DEVICE_EMULATION__
|
||||||
}
|
float3 color_sum = make_float3(0.0f, 0.0f, 0.0f);
|
||||||
|
for (int i = 0; i < 16; i++)
|
||||||
inline __device__ __host__ float dot(float3 a, float3 b)
|
{
|
||||||
{
|
color_sum += colors[i];
|
||||||
return a.x * b.x + a.y * b.y + a.z * b.z;
|
}
|
||||||
}
|
|
||||||
|
for (int i = 0; i < 16; i++)
|
||||||
inline __device__ __host__ float dot(float4 a, float4 b)
|
{
|
||||||
{
|
sums[i] = color_sum;
|
||||||
return a.x * b.x + a.y * b.y + a.z * b.z + a.w * b.w;
|
}
|
||||||
}
|
#else
|
||||||
|
|
||||||
inline __device__ __host__ float clamp(float f, float a, float b)
|
const int idx = threadIdx.x;
|
||||||
{
|
|
||||||
return max(a, min(f, b));
|
|
||||||
}
|
|
||||||
|
|
||||||
inline __device__ __host__ float3 clamp(float3 v, float a, float b)
|
|
||||||
{
|
|
||||||
return make_float3(clamp(v.x, a, b), clamp(v.y, a, b), clamp(v.z, a, b));
|
|
||||||
}
|
|
||||||
|
|
||||||
inline __device__ __host__ float3 clamp(float3 v, float3 a, float3 b)
|
|
||||||
{
|
|
||||||
return make_float3(clamp(v.x, a.x, b.x), clamp(v.y, a.y, b.y), clamp(v.z, a.z, b.z));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
inline __device__ __host__ float3 normalize(float3 v)
|
|
||||||
{
|
|
||||||
float len = 1.0f / sqrtf(dot(v, v));
|
|
||||||
return make_float3(v.x * len, v.y * len, v.z * len);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Use power method to find the first eigenvector.
|
|
||||||
// http://www.miislita.com/information-retrieval-tutorial/matrix-tutorial-3-eigenvalues-eigenvectors.html
|
|
||||||
inline __device__ __host__ float3 firstEigenVector( float matrix[6] )
|
|
||||||
{
|
|
||||||
// 8 iterations seems to be more than enough.
|
|
||||||
|
|
||||||
float3 v = make_float3(1.0f, 1.0f, 1.0f);
|
|
||||||
for(int i = 0; i < 8; i++) {
|
|
||||||
float x = v.x * matrix[0] + v.y * matrix[1] + v.z * matrix[2];
|
|
||||||
float y = v.x * matrix[1] + v.y * matrix[3] + v.z * matrix[4];
|
|
||||||
float z = v.x * matrix[2] + v.y * matrix[4] + v.z * matrix[5];
|
|
||||||
float m = max(max(x, y), z);
|
|
||||||
float iv = 1.0f / m;
|
|
||||||
if (m == 0.0f) iv = 0.0f;
|
|
||||||
v = make_float3(x*iv, y*iv, z*iv);
|
|
||||||
}
|
|
||||||
|
|
||||||
return v;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline __device__ bool singleColor(const float3 * colors)
|
|
||||||
{
|
|
||||||
#if __DEVICE_EMULATION__
|
|
||||||
bool sameColor = false;
|
|
||||||
for (int i = 0; i < 16; i++)
|
|
||||||
{
|
|
||||||
sameColor &= (colors[idx] == colors[0]);
|
|
||||||
}
|
|
||||||
return sameColor;
|
|
||||||
#else
|
|
||||||
__shared__ int sameColor[16];
|
|
||||||
|
|
||||||
const int idx = threadIdx.x;
|
|
||||||
|
|
||||||
sameColor[idx] = (colors[idx] == colors[0]);
|
|
||||||
sameColor[idx] &= sameColor[idx^8];
|
|
||||||
sameColor[idx] &= sameColor[idx^4];
|
|
||||||
sameColor[idx] &= sameColor[idx^2];
|
|
||||||
sameColor[idx] &= sameColor[idx^1];
|
|
||||||
|
|
||||||
return sameColor[0];
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
inline __device__ void colorSums(const float3 * colors, float3 * sums)
|
|
||||||
{
|
|
||||||
#if __DEVICE_EMULATION__
|
|
||||||
float3 color_sum = make_float3(0.0f, 0.0f, 0.0f);
|
|
||||||
for (int i = 0; i < 16; i++)
|
|
||||||
{
|
|
||||||
color_sum += colors[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i < 16; i++)
|
|
||||||
{
|
|
||||||
sums[i] = color_sum;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
|
|
||||||
const int idx = threadIdx.x;
|
|
||||||
|
|
||||||
sums[idx] = colors[idx];
|
sums[idx] = colors[idx];
|
||||||
sums[idx] += sums[idx^8];
|
sums[idx] += sums[idx^8];
|
||||||
sums[idx] += sums[idx^4];
|
sums[idx] += sums[idx^4];
|
||||||
sums[idx] += sums[idx^2];
|
sums[idx] += sums[idx^2];
|
||||||
sums[idx] += sums[idx^1];
|
sums[idx] += sums[idx^1];
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
inline __device__ float3 bestFitLine(const float3 * colors, float3 color_sum, float3 colorMetric)
|
inline __device__ float3 bestFitLine(const float3 * colors, float3 color_sum, float3 colorMetric)
|
||||||
{
|
{
|
||||||
// Compute covariance matrix of the given colors.
|
// Compute covariance matrix of the given colors.
|
||||||
#if __DEVICE_EMULATION__
|
#if __DEVICE_EMULATION__
|
||||||
float covariance[6] = {0, 0, 0, 0, 0, 0};
|
float covariance[6] = {0, 0, 0, 0, 0, 0};
|
||||||
for (int i = 0; i < 16; i++)
|
for (int i = 0; i < 16; i++)
|
||||||
{
|
{
|
||||||
float3 a = (colors[i] - color_sum * (1.0f / 16.0f)) * colorMetric;
|
float3 a = (colors[i] - color_sum * (1.0f / 16.0f)) * colorMetric;
|
||||||
covariance[0] += a.x * a.x;
|
covariance[0] += a.x * a.x;
|
||||||
covariance[1] += a.x * a.y;
|
covariance[1] += a.x * a.y;
|
||||||
covariance[2] += a.x * a.z;
|
covariance[2] += a.x * a.z;
|
||||||
covariance[3] += a.y * a.y;
|
covariance[3] += a.y * a.y;
|
||||||
covariance[4] += a.y * a.z;
|
covariance[4] += a.y * a.z;
|
||||||
covariance[5] += a.z * a.z;
|
covariance[5] += a.z * a.z;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
|
||||||
const int idx = threadIdx.x;
|
const int idx = threadIdx.x;
|
||||||
|
|
||||||
float3 diff = (colors[idx] - color_sum * (1.0f / 16.0f)) * colorMetric;
|
float3 diff = (colors[idx] - color_sum * (1.0f / 16.0f)) * colorMetric;
|
||||||
|
|
||||||
// @@ Eliminate two-way bank conflicts here.
|
// @@ Eliminate two-way bank conflicts here.
|
||||||
// @@ It seems that doing that and unrolling the reduction doesn't help...
|
// @@ It seems that doing that and unrolling the reduction doesn't help...
|
||||||
__shared__ float covariance[16*6];
|
__shared__ float covariance[16*6];
|
||||||
|
|
||||||
covariance[6 * idx + 0] = diff.x * diff.x; // 0, 6, 12, 2, 8, 14, 4, 10, 0
|
covariance[6 * idx + 0] = diff.x * diff.x; // 0, 6, 12, 2, 8, 14, 4, 10, 0
|
||||||
covariance[6 * idx + 1] = diff.x * diff.y;
|
covariance[6 * idx + 1] = diff.x * diff.y;
|
||||||
covariance[6 * idx + 2] = diff.x * diff.z;
|
covariance[6 * idx + 2] = diff.x * diff.z;
|
||||||
covariance[6 * idx + 3] = diff.y * diff.y;
|
covariance[6 * idx + 3] = diff.y * diff.y;
|
||||||
covariance[6 * idx + 4] = diff.y * diff.z;
|
covariance[6 * idx + 4] = diff.y * diff.z;
|
||||||
covariance[6 * idx + 5] = diff.z * diff.z;
|
covariance[6 * idx + 5] = diff.z * diff.z;
|
||||||
|
|
||||||
for(int d = 8; d > 0; d >>= 1)
|
for(int d = 8; d > 0; d >>= 1)
|
||||||
{
|
{
|
||||||
if (idx < d)
|
if (idx < d)
|
||||||
{
|
{
|
||||||
covariance[6 * idx + 0] += covariance[6 * (idx+d) + 0];
|
covariance[6 * idx + 0] += covariance[6 * (idx+d) + 0];
|
||||||
covariance[6 * idx + 1] += covariance[6 * (idx+d) + 1];
|
covariance[6 * idx + 1] += covariance[6 * (idx+d) + 1];
|
||||||
covariance[6 * idx + 2] += covariance[6 * (idx+d) + 2];
|
covariance[6 * idx + 2] += covariance[6 * (idx+d) + 2];
|
||||||
covariance[6 * idx + 3] += covariance[6 * (idx+d) + 3];
|
covariance[6 * idx + 3] += covariance[6 * (idx+d) + 3];
|
||||||
covariance[6 * idx + 4] += covariance[6 * (idx+d) + 4];
|
covariance[6 * idx + 4] += covariance[6 * (idx+d) + 4];
|
||||||
covariance[6 * idx + 5] += covariance[6 * (idx+d) + 5];
|
covariance[6 * idx + 5] += covariance[6 * (idx+d) + 5];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Compute first eigen vector.
|
// Compute first eigen vector.
|
||||||
return firstEigenVector(covariance);
|
return firstEigenVector(covariance);
|
||||||
}
|
}
|
||||||
|
|
||||||
// @@ For 2D this may not be the most efficient method. It's a quadratic equation, right?
|
|
||||||
inline __device__ __host__ float2 firstEigenVector2D( float matrix[3] )
|
#endif // CUDAMATH_H
|
||||||
{
|
|
||||||
// @@ 8 iterations is probably more than enough.
|
|
||||||
|
|
||||||
float2 v = make_float2(1.0f, 1.0f);
|
|
||||||
for(int i = 0; i < 8; i++) {
|
|
||||||
float x = v.x * matrix[0] + v.y * matrix[1];
|
|
||||||
float y = v.x * matrix[1] + v.y * matrix[2];
|
|
||||||
float m = max(x, y);
|
|
||||||
float iv = 1.0f / m;
|
|
||||||
if (m == 0.0f) iv = 0.0f;
|
|
||||||
v = make_float2(x*iv, y*iv);
|
|
||||||
}
|
|
||||||
|
|
||||||
return v;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline __device__ void colorSums(const float2 * colors, float2 * sums)
|
|
||||||
{
|
|
||||||
#if __DEVICE_EMULATION__
|
|
||||||
float2 color_sum = make_float2(0.0f, 0.0f, 0.0f);
|
|
||||||
for (int i = 0; i < 16; i++)
|
|
||||||
{
|
|
||||||
color_sum += colors[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i < 16; i++)
|
|
||||||
{
|
|
||||||
sums[i] = color_sum;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
|
|
||||||
const int idx = threadIdx.x;
|
|
||||||
|
|
||||||
sums[idx] = colors[idx];
|
|
||||||
sums[idx] += sums[idx^8];
|
|
||||||
sums[idx] += sums[idx^4];
|
|
||||||
sums[idx] += sums[idx^2];
|
|
||||||
sums[idx] += sums[idx^1];
|
|
||||||
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
inline __device__ float2 bestFitLine(const float2 * colors, float2 color_sum)
|
|
||||||
{
|
|
||||||
// Compute covariance matrix of the given colors.
|
|
||||||
#if __DEVICE_EMULATION__
|
|
||||||
float covariance[3] = {0, 0, 0};
|
|
||||||
for (int i = 0; i < 16; i++)
|
|
||||||
{
|
|
||||||
float2 a = (colors[i] - color_sum * (1.0f / 16.0f));
|
|
||||||
covariance[0] += a.x * a.x;
|
|
||||||
covariance[1] += a.x * a.y;
|
|
||||||
covariance[3] += a.y * a.y;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
|
|
||||||
const int idx = threadIdx.x;
|
|
||||||
|
|
||||||
float2 diff = (colors[idx] - color_sum * (1.0f / 16.0f));
|
|
||||||
|
|
||||||
__shared__ float covariance[16*3];
|
|
||||||
|
|
||||||
covariance[3 * idx + 0] = diff.x * diff.x;
|
|
||||||
covariance[3 * idx + 1] = diff.x * diff.y;
|
|
||||||
covariance[3 * idx + 2] = diff.y * diff.y;
|
|
||||||
|
|
||||||
for(int d = 8; d > 0; d >>= 1)
|
|
||||||
{
|
|
||||||
if (idx < d)
|
|
||||||
{
|
|
||||||
covariance[3 * idx + 0] += covariance[3 * (idx+d) + 0];
|
|
||||||
covariance[3 * idx + 1] += covariance[3 * (idx+d) + 1];
|
|
||||||
covariance[3 * idx + 2] += covariance[3 * (idx+d) + 2];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Compute first eigen vector.
|
|
||||||
return firstEigenVector2D(covariance);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#endif // CUDAMATH_H
|
|
||||||
|
|||||||
@ -1,221 +0,0 @@
|
|||||||
// Copyright NVIDIA Corporation 2007 -- Ignacio Castano <icastano@nvidia.com>
|
|
||||||
//
|
|
||||||
// Permission is hereby granted, free of charge, to any person
|
|
||||||
// obtaining a copy of this software and associated documentation
|
|
||||||
// files (the "Software"), to deal in the Software without
|
|
||||||
// restriction, including without limitation the rights to use,
|
|
||||||
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
// copies of the Software, and to permit persons to whom the
|
|
||||||
// Software is furnished to do so, subject to the following
|
|
||||||
// conditions:
|
|
||||||
//
|
|
||||||
// The above copyright notice and this permission notice shall be
|
|
||||||
// included in all copies or substantial portions of the Software.
|
|
||||||
//
|
|
||||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
||||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
||||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
||||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
||||||
// OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
|
|
||||||
#include <nvtt/nvtt.h>
|
|
||||||
|
|
||||||
#include <stdio.h> // printf
|
|
||||||
#include <stdlib.h> // rand
|
|
||||||
#include <time.h> // clock
|
|
||||||
#include <string.h> // memcpy, memcmp
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
#define FRAME_COUNT 1000
|
|
||||||
|
|
||||||
#define WIDTH 2048
|
|
||||||
#define HEIGHT 2048
|
|
||||||
#define INPUT_SIZE (WIDTH*HEIGHT)
|
|
||||||
#define OUTPUT_SIZE (WIDTH*HEIGHT/16*2)
|
|
||||||
|
|
||||||
static int s_input[INPUT_SIZE];
|
|
||||||
static int s_reference[OUTPUT_SIZE];
|
|
||||||
static int s_output[OUTPUT_SIZE];
|
|
||||||
static int s_frame = 0;
|
|
||||||
|
|
||||||
struct MyOutputHandler : public nvtt::OutputHandler
|
|
||||||
{
|
|
||||||
MyOutputHandler() : m_ptr(NULL) {}
|
|
||||||
|
|
||||||
virtual void beginImage(int size, int width, int height, int depth, int face, int miplevel)
|
|
||||||
{
|
|
||||||
assert(size == sizeof(int) * OUTPUT_SIZE);
|
|
||||||
assert(width == WIDTH);
|
|
||||||
assert(height == HEIGHT);
|
|
||||||
assert(depth == 1);
|
|
||||||
assert(face == 0);
|
|
||||||
assert(miplevel == 0);
|
|
||||||
|
|
||||||
m_ptr = (unsigned char *)s_output;
|
|
||||||
|
|
||||||
if (s_frame == 1)
|
|
||||||
{
|
|
||||||
// Save first result as reference.
|
|
||||||
memcpy(s_reference, s_output, sizeof(int) * OUTPUT_SIZE);
|
|
||||||
}
|
|
||||||
else if (s_frame > 1)
|
|
||||||
{
|
|
||||||
// Compare against reference.
|
|
||||||
if (memcmp(s_output, s_reference, sizeof(int) * OUTPUT_SIZE) != 0)
|
|
||||||
{
|
|
||||||
printf("Compressed image different to original.\n");
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual bool writeData(const void * data, int size)
|
|
||||||
{
|
|
||||||
memcpy(m_ptr, data, size);
|
|
||||||
m_ptr += size;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned char * m_ptr;
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
void precomp()
|
|
||||||
{
|
|
||||||
unsigned int bitmaps[1024];
|
|
||||||
|
|
||||||
int num = 0;
|
|
||||||
|
|
||||||
printf("{\n");
|
|
||||||
printf("\t%8X,\n", 0);
|
|
||||||
|
|
||||||
bitmaps[0] = 0;
|
|
||||||
|
|
||||||
num = 1;
|
|
||||||
for (int a = 1; a <= 15; a++)
|
|
||||||
{
|
|
||||||
for (int b = a; b <= 15; b++)
|
|
||||||
{
|
|
||||||
for (int c = b; c <= 15; c++)
|
|
||||||
{
|
|
||||||
int indices[16];
|
|
||||||
|
|
||||||
int i = 0;
|
|
||||||
for(; i < a; i++) {
|
|
||||||
indices[i] = 0;
|
|
||||||
}
|
|
||||||
for(; i < a+b; i++) {
|
|
||||||
indices[i] = 2;
|
|
||||||
}
|
|
||||||
for(; i < a+b+c; i++) {
|
|
||||||
indices[i] = 3;
|
|
||||||
}
|
|
||||||
for(; i < 16; i++) {
|
|
||||||
indices[i] = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int bm = 0;
|
|
||||||
for(i = 0; i < 16; i++) {
|
|
||||||
bm |= indices[i] << (i * 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
printf("\t0x%8X, // %d %d %d %d\n", bm, a-0, b-a, c-b, 16-c);
|
|
||||||
|
|
||||||
bitmaps[num] = bm;
|
|
||||||
num++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
printf("}\n");
|
|
||||||
|
|
||||||
printf("// num = %d\n", num);
|
|
||||||
|
|
||||||
/*
|
|
||||||
for( int i = imax; i >= 0; --i )
|
|
||||||
{
|
|
||||||
// second cluster [i,j) is one third along
|
|
||||||
for( int m = i; m < 16; ++m )
|
|
||||||
{
|
|
||||||
indices[m] = 2;
|
|
||||||
}
|
|
||||||
const int jmax = ( i == 0 ) ? 15 : 16;
|
|
||||||
for( int j = jmax; j >= i; --j )
|
|
||||||
{
|
|
||||||
// third cluster [j,k) is two thirds along
|
|
||||||
for( int m = j; m < 16; ++m )
|
|
||||||
{
|
|
||||||
indices[m] = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
int kmax = ( j == 0 ) ? 15 : 16;
|
|
||||||
for( int k = kmax; k >= j; --k )
|
|
||||||
{
|
|
||||||
// last cluster [k,n) is at the end
|
|
||||||
if( k < 16 )
|
|
||||||
{
|
|
||||||
indices[k] = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint bitmap = 0;
|
|
||||||
|
|
||||||
bool hasThree = false;
|
|
||||||
for(int p = 0; p < 16; p++) {
|
|
||||||
bitmap |= indices[p] << (p * 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
bitmaps[num] = bitmap;
|
|
||||||
num++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
//precomp();
|
|
||||||
|
|
||||||
nvtt::InputOptions inputOptions;
|
|
||||||
inputOptions.setTextureLayout(nvtt::TextureType_2D, WIDTH, HEIGHT);
|
|
||||||
|
|
||||||
for (int i = 0; i < INPUT_SIZE; i++)
|
|
||||||
{
|
|
||||||
s_input[i] = rand();
|
|
||||||
}
|
|
||||||
|
|
||||||
inputOptions.setMipmapData(s_input, WIDTH, HEIGHT);
|
|
||||||
inputOptions.setMipmapGeneration(false);
|
|
||||||
|
|
||||||
nvtt::CompressionOptions compressionOptions;
|
|
||||||
compressionOptions.setFormat(nvtt::Format_DXT1);
|
|
||||||
// compressionOptions.setFormat(nvtt::Format_DXT1n);
|
|
||||||
// compressionOptions.setFormat(nvtt::Format_CTX1);
|
|
||||||
|
|
||||||
nvtt::OutputOptions outputOptions;
|
|
||||||
outputOptions.setOutputHeader(false);
|
|
||||||
|
|
||||||
MyOutputHandler outputHandler;
|
|
||||||
outputOptions.setOutputHandler(&outputHandler);
|
|
||||||
|
|
||||||
|
|
||||||
nvtt::Compressor compressor;
|
|
||||||
|
|
||||||
for (s_frame = 0; s_frame < FRAME_COUNT; s_frame++)
|
|
||||||
{
|
|
||||||
clock_t start = clock();
|
|
||||||
|
|
||||||
printf("compressing frame %d:\n", s_frame);
|
|
||||||
|
|
||||||
compressor.process(inputOptions, compressionOptions, outputOptions);
|
|
||||||
|
|
||||||
clock_t end = clock();
|
|
||||||
printf("time taken: %.3f seconds\n", float(end-start) / CLOCKS_PER_SEC);
|
|
||||||
}
|
|
||||||
|
|
||||||
return EXIT_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue