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:
castano@gmail.com
2013-06-07 17:53:55 +00:00
parent 634229a842
commit 94d0635285
49 changed files with 1974 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvimage/DirectDrawSurface.cpp
View File

@ -343,6 +343,7 @@ namespace
case DXGI_FORMAT_B8G8R8X8_TYPELESS:
case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
return 8*4;
default:
return 0;
}
@ -452,8 +453,9 @@ namespace
{ D3DFMT_A2R10G10B10, 32, 0x3FF00000, 0xFFC00, 0x3FF, 0xC0000000 },
{ D3DFMT_A2B10G10R10, 32, 0x3FF, 0xFFC00, 0x3FF00000, 0xC0000000 },
{ D3DFMT_L8, 8, 8, 0, 0, 0 }, // DXGI_FORMAT_R8_UNORM
{ D3DFMT_L16, 16, 16, 0, 0, 0 }, // DXGI_FORMAT_R16_UNORM
{ D3DFMT_L8, 8, 0xFF, 0, 0, 0 }, // DXGI_FORMAT_R8_UNORM
{ D3DFMT_L16, 16, 0xFFFF, 0, 0, 0 }, // DXGI_FORMAT_R16_UNORM
{ D3DFMT_A8L8, 16, 0xFF, 0, 0, 0xFF00 }, // DXGI_FORMAT_R8G8_UNORM?
};
static const uint s_d3d9FormatCount = NV_ARRAY_SIZE(s_d3d9Formats);

2
src/nvimage/ErrorMetric.cpp
View File

@ -186,8 +186,6 @@ static float f(float t)
static float finv(float t)
{
const float epsilon = powf(6.0f/29.0f, 3);
if (t > 6.0f / 29.0f) {
return powf(t, 3.0f);
}

20
src/nvimage/FloatImage.cpp
View File

@ -344,15 +344,15 @@ float FloatImage::sampleLinear(uint c, float x, float y, float z, WrapMode wm) c
float FloatImage::sampleNearestClamp(uint c, float x, float y) const
{
int ix = ::clamp(iround(x * m_width), 0, m_width-1);
int iy = ::clamp(iround(y * m_height), 0, m_height-1);
int ix = wrapClamp(iround(x * m_width), m_width);
int iy = wrapClamp(iround(y * m_height), m_height);
return pixel(c, ix, iy, 0);
}
float FloatImage::sampleNearestRepeat(uint c, float x, float y) const
{
int ix = iround(frac(x) * m_width);
int iy = iround(frac(y) * m_height);
int ix = wrapRepeat(iround(x * m_width), m_width);
int iy = wrapRepeat(iround(y * m_height), m_height);
return pixel(c, ix, iy, 0);
}
@ -373,9 +373,9 @@ float FloatImage::sampleNearestClamp(uint c, float x, float y, float z) const
float FloatImage::sampleNearestRepeat(uint c, float x, float y, float z) const
{
int ix = iround(frac(x) * m_width); // wrapRepeat(iround(x * m_width), m_width)
int iy = iround(frac(y) * m_height); // wrapRepeat(iround(y * m_height), m_height)
int iz = iround(frac(z) * m_depth); // wrapRepeat(iround(z * m_depth), m_depth)
int ix = wrapRepeat(iround(x * m_width), m_width);
int iy = wrapRepeat(iround(y * m_height), m_height);
int iz = wrapRepeat(iround(z * m_depth), m_depth);
return pixel(c, ix, iy, iz);
}
@ -1326,7 +1326,7 @@ void FloatImage::flipZ()
const uint d2 = d / 2;
for (uint c = 0; c < m_componentCount; c++) {
for (uint z = 0; z < d/2; z++) {
for (uint z = 0; z < d2; z++) {
float * src = plane(c, z);
float * dst = plane(c, d - 1 - z);
for (uint i = 0; i < w*h; i++) {
@ -1345,9 +1345,9 @@ float FloatImage::alphaTestCoverage(float alphaRef, int alphaChannel, float alph
float coverage = 0.0f;
#if 0
const float * alpha = channel(alphaChannel);
#if 0
const uint count = m_pixelCount;
for (uint i = 0; i < count; i++) {
if (alpha[i] > alphaRef) coverage += 1.0f; // @@ gt or lt?
@ -1435,7 +1435,7 @@ void FloatImage::scaleAlphaToCoverage(float desiredCoverage, float alphaRef, int
clamp(alphaChannel, 1, 0.0f, 1.0f);
#endif
#if _DEBUG
float newCoverage = alphaTestCoverage(alphaRef, alphaChannel);
alphaTestCoverage(alphaRef, alphaChannel);
#endif
}

4
src/nvimage/NormalMap.cpp
View File

@ -199,10 +199,6 @@ void nv::normalizeNormalMap(FloatImage * img)
{
nvDebugCheck(img != NULL);
#pragma NV_MESSAGE("TODO: Pack and expand normals explicitly?")
img->expandNormals(0);
img->normalize(0);
img->packNormals(0);
}