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

Fix build.

Browse Source
This commit is contained in:
castano
2010-05-28 07:45:11 +00:00
parent 3956d8a0c2
commit 1454cbac14
17 changed files with 347 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvcore/FileSystem.cpp
View File

@ -7,12 +7,12 @@
//#include <shlwapi.h> // PathFileExists
#include <windows.h> // GetFileAttributes
#include <direct.h> // _mkdir
#include <stdio.h> // remove, unlink
#else
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#endif
#include <stdio.h> // remove, unlink
using namespace nv;

11
src/nvcore/Ptr.h
View File

@ -5,13 +5,12 @@
#include "nvcore.h"
#include "Debug.h"
#include "RefCounted.h" // WeakProxy
namespace nv
{
class WeakProxy;
/** Simple auto pointer template class.
*
* This is very similar to the standard auto_ptr class, but with some
@ -274,10 +273,10 @@ namespace nv
void operator=(T * p)
{
if (p) {
if (p != NULL) {
m_proxy = p->getWeakProxy();
assert(m_proxy != NULL);
assert(m_proxy->ptr() == p);
nvDebugCheck(m_proxy != NULL);
nvDebugCheck(m_proxy->ptr() == p);
}
else {
m_proxy = NULL;
@ -298,7 +297,7 @@ namespace nv
T * operator->() const
{
T * p = ptr();
assert(p != NULL);
nvDebugCheck(p != NULL);
return p;
}

6
src/nvcore/nvcore.h
View File

@ -132,7 +132,8 @@
#define NV_STRING2(x) #x
#define NV_STRING(x) NV_STRING2(x)
#if NV_CC_GNUC
#define NV_FILE_LINE __FILE__ ":" NV_STRING(__LINE__) ": "
//#define NV_FILE_LINE __FILE__ ":" NV_STRING(__LINE__) ": "
#define NV_FILE_LINE
#else
#define NV_FILE_LINE __FILE__ "(" NV_STRING(__LINE__) ") : "
#endif
@ -153,6 +154,9 @@
/// Null index. @@ Move this somewhere else... This could have collisions with other definitions!
#define NIL uint(~0)
// @@ Move this to DefsGnuc?
#include <cstddef> // size_t, NULL
/// Null pointer.
#ifndef NULL
#define NULL 0

2
src/nvmath/CMakeLists.txt
View File

@ -5,7 +5,7 @@ SET(MATH_SRCS
Vector.h
Matrix.h
Plane.h Plane.cpp
Box.h Box.cpp
Box.h
Color.h
Half.h Half.cpp
Fitting.h Fitting.cpp)

8
src/nvtt/CompressorDXT.cpp
View File

@ -213,7 +213,7 @@ void FastCompressorBC5::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMo
void NormalCompressorDXT1::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
{
nvsquish::WeightedClusterFit fit;
fit.SetMetric(compressionOptions.colorWeight.x(), compressionOptions.colorWeight.y(), compressionOptions.colorWeight.z());
fit.SetMetric(compressionOptions.colorWeight.x, compressionOptions.colorWeight.y, compressionOptions.colorWeight.z);
if (rgba.isSingleColor())
{
@ -250,7 +250,7 @@ void NormalCompressorDXT1a::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alp
else
{
nvsquish::WeightedClusterFit fit;
fit.SetMetric(compressionOptions.colorWeight.x(), compressionOptions.colorWeight.y(), compressionOptions.colorWeight.z());
fit.SetMetric(compressionOptions.colorWeight.x, compressionOptions.colorWeight.y, compressionOptions.colorWeight.z);
int flags = nvsquish::kDxt1;
if (alphaMode == nvtt::AlphaMode_Transparency) flags |= nvsquish::kWeightColourByAlpha;
@ -278,7 +278,7 @@ void NormalCompressorDXT3::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alph
else
{
nvsquish::WeightedClusterFit fit;
fit.SetMetric(compressionOptions.colorWeight.x(), compressionOptions.colorWeight.y(), compressionOptions.colorWeight.z());
fit.SetMetric(compressionOptions.colorWeight.x, compressionOptions.colorWeight.y, compressionOptions.colorWeight.z);
int flags = 0;
if (alphaMode == nvtt::AlphaMode_Transparency) flags |= nvsquish::kWeightColourByAlpha;
@ -312,7 +312,7 @@ void NormalCompressorDXT5::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alph
else
{
nvsquish::WeightedClusterFit fit;
fit.SetMetric(compressionOptions.colorWeight.x(), compressionOptions.colorWeight.y(), compressionOptions.colorWeight.z());
fit.SetMetric(compressionOptions.colorWeight.x, compressionOptions.colorWeight.y, compressionOptions.colorWeight.z);
int flags = 0;
if (alphaMode == nvtt::AlphaMode_Transparency) flags |= nvsquish::kWeightColourByAlpha;

2
src/nvtt/InputOptions.cpp
View File

@ -23,7 +23,7 @@
#include <string.h> // memcpy
#include <nvcore/Containers.h> // nextPowerOfTwo
#include <nvcore/Utils.h> // nextPowerOfTwo
#include <nvcore/Memory.h>
#include <nvmath/Color.h>

2
src/nvtt/OptimalCompressDXT.cpp
View File

@ -29,7 +29,7 @@
#include <nvmath/Color.h>
#include <nvcore/Containers.h> // swap
#include <nvcore/Utils.h> // swap
#include <limits.h>

26
src/nvtt/QuickCompressDXT.cpp
View File

@ -21,7 +21,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
#include <nvcore/Containers.h> // swap
#include <nvcore/Utils.h> // swap
#include <nvmath/Color.h>
#include <nvmath/Fitting.h>
@ -86,23 +86,23 @@ inline static void selectDiagonal(const Vector3 * block, uint num, Vector3 * res
for (uint i = 0; i < num; i++)
{
Vector3 t = block[i] - center;
covariance += t.xy() * t.z();
covariance += t.xy() * t.z;
}
float x0 = maxColor->x();
float y0 = maxColor->y();
float x1 = minColor->x();
float y1 = minColor->y();
float x0 = maxColor->x;
float y0 = maxColor->y;
float x1 = minColor->x;
float y1 = minColor->y;
if (covariance.x() < 0) {
if (covariance.x < 0) {
swap(x0, x1);
}
if (covariance.y() < 0) {
if (covariance.y < 0) {
swap(y0, y1);
}
maxColor->set(x0, y0, maxColor->z());
minColor->set(x1, y1, minColor->z());
maxColor->set(x0, y0, maxColor->z);
minColor->set(x1, y1, minColor->z);
}
inline static void insetBBox(Vector3 * restrict maxColor, Vector3 * restrict minColor)
@ -114,9 +114,9 @@ inline static void insetBBox(Vector3 * restrict maxColor, Vector3 * restrict min
inline static uint16 roundAndExpand(Vector3 * restrict v)
{
uint r = uint(clamp(v->x() * (31.0f / 255.0f), 0.0f, 31.0f) + 0.5f);
uint g = uint(clamp(v->y() * (63.0f / 255.0f), 0.0f, 63.0f) + 0.5f);
uint b = uint(clamp(v->z() * (31.0f / 255.0f), 0.0f, 31.0f) + 0.5f);
uint r = uint(clamp(v->x * (31.0f / 255.0f), 0.0f, 31.0f) + 0.5f);
uint g = uint(clamp(v->y * (63.0f / 255.0f), 0.0f, 63.0f) + 0.5f);
uint b = uint(clamp(v->z * (31.0f / 255.0f), 0.0f, 31.0f) + 0.5f);
uint16 w = (r << 11) | (g << 5) | b;

40
src/nvtt/TexImage.cpp
View File

@ -501,10 +501,10 @@ bool TexImage::setImage2D(Format format, Decoder decoder, int w, int h, int idx,
if (x * 4 + xx < w && y * 4 + yy < h)
{
img->setPixel(float(c.r) * 1.0f/255.0f, x*4 + xx, y*4 + yy, 0);
img->setPixel(float(c.g) * 1.0f/255.0f, x*4 + xx, y*4 + yy, 1);
img->setPixel(float(c.b) * 1.0f/255.0f, x*4 + xx, y*4 + yy, 2);
img->setPixel(float(c.a) * 1.0f/255.0f, x*4 + xx, y*4 + yy, 3);
img->pixel(x*4 + xx, y*4 + yy, 0) = float(c.r) * 1.0f/255.0f;
img->pixel(x*4 + xx, y*4 + yy, 1) = float(c.g) * 1.0f/255.0f;
img->pixel(x*4 + xx, y*4 + yy, 2) = float(c.b) * 1.0f/255.0f;
img->pixel(x*4 + xx, y*4 + yy, 3) = float(c.a) * 1.0f/255.0f;
}
}
}
@ -908,28 +908,28 @@ void TexImage::setBorder(float r, float g, float b, float a)
for (int i = 0; i < w; i++)
{
img->setPixel(r, i, 0, 0);
img->setPixel(g, i, 0, 1);
img->setPixel(b, i, 0, 2);
img->setPixel(a, i, 0, 3);
img->pixel(i, 0, 0) = r;
img->pixel(i, 0, 1) = g;
img->pixel(i, 0, 2) = b;
img->pixel(i, 0, 3) = a;
img->setPixel(r, i, h-1, 0);
img->setPixel(g, i, h-1, 1);
img->setPixel(b, i, h-1, 2);
img->setPixel(a, i, h-1, 3);
img->pixel(i, h-1, 0) = r;
img->pixel(i, h-1, 1) = g;
img->pixel(i, h-1, 2) = b;
img->pixel(i, h-1, 3) = a;
}
for (int i = 0; i < h; i++)
{
img->setPixel(r, 0, i, 0);
img->setPixel(g, 0, i, 1);
img->setPixel(b, 0, i, 2);
img->setPixel(a, 0, i, 3);
img->pixel(0, i, 0) = r;
img->pixel(0, i, 1) = g;
img->pixel(0, i, 2) = b;
img->pixel(0, i, 3) = a;
img->setPixel(r, w-1, i, 0);
img->setPixel(g, w-1, i, 1);
img->setPixel(b, w-1, i, 2);
img->setPixel(a, w-1, i, 3);
img->pixel(w-1, i, 0) = r;
img->pixel(w-1, i, 1) = g;
img->pixel(w-1, i, 2) = b;
img->pixel(w-1, i, 3) = a;
}
}
}

2
src/nvtt/TexImage.h
View File

@ -26,7 +26,7 @@
#include "nvtt.h"
#include <nvcore/Containers.h>
#include <nvcore/Array.h>
#include <nvcore/RefCounted.h>
#include <nvcore/Ptr.h>

9
src/nvtt/cuda/CudaCompressorDXT.cpp
View File

@ -21,8 +21,11 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
#include "CudaCompressorDXT.h"
#include "CudaUtils.h"
#include <nvcore/Debug.h>
#include <nvcore/Containers.h>
#include <nvcore/Utils.h>
#include <nvmath/Color.h>
#include <nvimage/Image.h>
#include <nvimage/ColorBlock.h>
@ -32,10 +35,6 @@
#include <nvtt/QuickCompressDXT.h>
#include <nvtt/OptimalCompressDXT.h>
#include "CudaCompressorDXT.h"
#include "CudaUtils.h"
#if defined HAVE_CUDA
#include <cuda_runtime_api.h>
#endif

2
src/nvtt/tools/cmdline.h
View File

@ -57,7 +57,7 @@ struct MyAssertHandler : public nv::AssertHandler {
}
// Handler method, note that func might be NULL!
virtual int assert( const char *exp, const char *file, int line, const char *func ) {
virtual int assertion( const char *exp, const char *file, int line, const char *func ) {
fprintf(stderr, "Assertion failed: %s\nIn %s:%d\n", exp, file, line);
nv::debug::dumpInfo();
exit(1);

2
src/nvtt/tools/ddsview.cpp
View File

@ -172,7 +172,7 @@ int main(int argc, char *argv[])
uint w = dds.width();
uint h = dds.height();
// @@ Clamp window size is texture larger than desktop?
// @@ Clamp window size if texture larger than desktop?
glutInit(&argc, argv);

3
src/nvtt/tools/imgdiff.cpp
View File

@ -23,7 +23,6 @@
#include <nvcore/StrLib.h>
#include <nvcore/StdStream.h>
#include <nvcore/Containers.h>
#include <nvimage/Image.h>
#include <nvimage/DirectDrawSurface.h>
@ -123,7 +122,7 @@ struct NormalError
vc = nv::normalize(2.0f * (vc / 255.0f) - 1.0f);
ade += acosf(nv::clamp(dot(vo, vc), -1.0f, 1.0f));
mse += length_squared((vo - vc) * (255 / 2.0f));
mse += lengthSquared((vo - vc) * (255 / 2.0f));
samples++;
}

1
src/nvtt/tools/resize.cpp
View File

@ -24,7 +24,6 @@
#include <nvcore/Ptr.h>
#include <nvcore/StrLib.h>
#include <nvcore/StdStream.h>
#include <nvcore/Containers.h>
#include <nvimage/Image.h>
#include <nvimage/ImageIO.h>

1
src/nvtt/tools/thumbnailer.cpp
View File

@ -24,7 +24,6 @@
#include <nvcore/Ptr.h>
#include <nvcore/StrLib.h>
#include <nvcore/StdStream.h>
#include <nvcore/Containers.h>
#include <nvimage/Image.h>
#include <nvimage/ImageIO.h>

91
src/nvtt/tools/ui/configdialog.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ConfigDialog</class>
<widget class="QDialog" name="ConfigDialog">
@ -72,7 +73,8 @@
<string>Preview</string>
</property>
<property name="icon">
<iconset>../../../../../../castano-stuff/qshaderedit/src/images/colorpicker.png</iconset>
<iconset>
<normaloff>../../../../../../castano-stuff/qshaderedit/src/images/colorpicker.png</normaloff>../../../../../../castano-stuff/qshaderedit/src/images/colorpicker.png</iconset>
</property>
</item>
</widget>
@ -82,29 +84,20 @@
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="sizePolicy">
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>3</number>
<number>2</number>
</property>
<widget class="QWidget" name="inputPage">
<layout class="QVBoxLayout">
<property name="spacing">
<number>-1</number>
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<property name="margin">
<number>0</number>
</property>
<item>
@ -131,7 +124,7 @@
<item>
<widget class="QPushButton" name="openButton">
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -158,7 +151,7 @@
<item>
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -196,7 +189,7 @@
<item>
<widget class="QGroupBox" name="alphaModeGroupBox">
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -251,7 +244,7 @@
<item>
<widget class="QLabel" name="wrapModeLabel">
<property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -296,7 +289,7 @@
<item>
<widget class="QLabel" name="inputGammaLabel">
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -312,7 +305,7 @@
<item>
<widget class="QDoubleSpinBox" name="inputGammaSpinBox">
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -341,7 +334,7 @@
<item>
<widget class="QLabel" name="outputGammaLabel">
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -357,7 +350,7 @@
<item>
<widget class="QDoubleSpinBox" name="outputGammaSpinBox">
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -386,7 +379,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>433</width>
<height>16</height>
@ -403,6 +396,12 @@
<layout class="QVBoxLayout">
<item>
<widget class="QCheckBox" name="generateMipmapsCheckBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Generate mipmaps</string>
</property>
@ -419,7 +418,7 @@
<item>
<widget class="QLabel" name="mipmapFilterLabel">
<property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -463,7 +462,7 @@
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -492,7 +491,7 @@
<item>
<widget class="QCheckBox" name="limitMipmapsCheckBox">
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -508,7 +507,7 @@
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -524,7 +523,7 @@
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -544,7 +543,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>204</width>
<height>71</height>
@ -565,16 +564,7 @@
</widget>
<widget class="QWidget" name="compressionPage">
<layout class="QVBoxLayout">
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<property name="margin">
<number>0</number>
</property>
<item>
@ -582,7 +572,7 @@
<item>
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -647,7 +637,7 @@
<item>
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -702,7 +692,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -713,7 +703,7 @@
<item>
<widget class="QGroupBox" name="groupBox_6">
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -853,7 +843,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -868,7 +858,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>484</width>
<height>31</height>
@ -881,16 +871,7 @@
<widget class="QWidget" name="outputPage"/>
<widget class="QWidget" name="previewPage">
<layout class="QVBoxLayout">
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<property name="margin">
<number>0</number>
</property>
<item>