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

Some bug fixes and more progress toward BC6-7 support.

Browse Source
This commit is contained in:
castano
2010-06-03 07:58:03 +00:00
parent 68cbe543b0
commit 322dcd72c1
5 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvimage/DirectDrawSurface.cpp
View File

@ -246,6 +246,20 @@ namespace
DXGI_FORMAT_B5G5R5A1_UNORM = 86,
DXGI_FORMAT_B8G8R8A8_UNORM = 87,
DXGI_FORMAT_B8G8R8X8_UNORM = 88,
DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 89,
DXGI_FORMAT_B8G8R8A8_TYPELESS = 90,
DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
DXGI_FORMAT_BC6H_TYPELESS = 94,
DXGI_FORMAT_BC6H_UF16 = 95,
DXGI_FORMAT_BC6H_SF16 = 96,
DXGI_FORMAT_BC7_TYPELESS = 97,
DXGI_FORMAT_BC7_UNORM = 98,
DXGI_FORMAT_BC7_UNORM_SRGB = 99,
};
enum D3D10_RESOURCE_DIMENSION

2
src/nvimage/FloatImage.cpp
View File

@ -148,7 +148,7 @@ void FloatImage::free()
void FloatImage::resizeChannelCount(uint c)
{
if (m_componentNum != c) {
uint count = w * h * c;
uint count = m_width * m_height * c;
nv::mem::realloc(m_mem, count * sizeof(float));
if (c > m_componentNum) {