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

Fixes issue 204.

Browse Source
This commit is contained in:
castano
2014-05-21 17:47:06 +00:00
parent 57298c71c8
commit 7e74261f92
17 changed files with 42 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvtt/CMakeLists.txt
View File

@ -1,8 +1,8 @@
PROJECT(nvtt)
ADD_SUBDIRECTORY(squish)
#ADD_SUBDIRECTORY(bc6h)
#ADD_SUBDIRECTORY(bc7)
ADD_SUBDIRECTORY(bc6h)
ADD_SUBDIRECTORY(bc7)
SET(NVTT_SRCS
nvtt.h nvtt.cpp
@ -12,7 +12,7 @@ SET(NVTT_SRCS
BlockCompressor.h BlockCompressor.cpp
CompressorDX9.h CompressorDX9.cpp
CompressorDX10.h CompressorDX10.cpp
# CompressorDX11.h CompressorDX11.cpp
CompressorDX11.h CompressorDX11.cpp
CompressorRGB.h CompressorRGB.cpp
Context.h Context.cpp
QuickCompressDXT.h QuickCompressDXT.cpp
@ -47,7 +47,7 @@ ELSE(NVTT_SHARED)
ADD_LIBRARY(nvtt ${NVTT_SRCS})
ENDIF(NVTT_SHARED)
TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvmath nvimage nvthread squish)
TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvmath nvimage nvthread squish bc6h bc7)
INSTALL(TARGETS nvtt
RUNTIME DESTINATION bin

1
src/nvtt/bc7/avpcl.cpp
View File

@ -17,6 +17,7 @@ See the License for the specific language governing permissions and limitations
#include "nvcore/Debug.h"
#include "nvmath/Vector.inl"
#include <cstring>
#include <float.h>
using namespace nv;
using namespace AVPCL;

1
src/nvtt/bc7/avpcl_mode0.cpp
View File

@ -24,6 +24,7 @@ See the License for the specific language governing permissions and limitations
#include "utils.h"
#include "endpts.h"
#include <cstring>
#include <float.h>
#include "shapes_three.h"

1
src/nvtt/bc7/avpcl_mode1.cpp
View File

@ -24,6 +24,7 @@ See the License for the specific language governing permissions and limitations
#include "utils.h"
#include "endpts.h"
#include <cstring>
#include <float.h>
#include "shapes_two.h"

1
src/nvtt/bc7/avpcl_mode2.cpp
View File

@ -24,6 +24,7 @@ See the License for the specific language governing permissions and limitations
#include "utils.h"
#include "endpts.h"
#include <cstring>
#include <float.h>
#include "shapes_three.h"

1
src/nvtt/bc7/avpcl_mode3.cpp
View File

@ -24,6 +24,7 @@ See the License for the specific language governing permissions and limitations
#include "utils.h"
#include "endpts.h"
#include <cstring>
#include <float.h>
#include "shapes_two.h"

1
src/nvtt/bc7/avpcl_mode4.cpp
View File

@ -24,6 +24,7 @@ See the License for the specific language governing permissions and limitations
#include "utils.h"
#include "endpts.h"
#include <cstring>
#include <float.h>
using namespace nv;
using namespace AVPCL;

1
src/nvtt/bc7/avpcl_mode5.cpp
View File

@ -24,6 +24,7 @@ See the License for the specific language governing permissions and limitations
#include "utils.h"
#include "endpts.h"
#include <cstring>
#include <float.h>
using namespace nv;
using namespace AVPCL;

2
src/nvtt/bc7/avpcl_mode6.cpp
View File

@ -24,7 +24,7 @@ See the License for the specific language governing permissions and limitations
#include "utils.h"
#include "endpts.h"
#include <cstring>
#include <float.h>
using namespace nv;
using namespace AVPCL;

1
src/nvtt/bc7/avpcl_mode7.cpp
View File

@ -24,6 +24,7 @@ See the License for the specific language governing permissions and limitations
#include "utils.h"
#include "endpts.h"
#include <cstring>
#include <float.h>
#include "shapes_two.h"

2
src/nvtt/bc7/utils.h
View File

@ -45,7 +45,7 @@ public:
static float metric3premult_alphain(nv::Vector3::Arg rgb0, nv::Vector3::Arg rgb1, int rotatemode);
static float metric1premult(float rgb0, float a0, float rgb1, float a1, int rotatemode);
static float Utils::premult(float r, float a);
static float premult(float r, float a);
// quantization and unquantization
static int unquantize(int q, int prec);

4
src/nvtt/tests/CMakeLists.txt
View File

@ -1,6 +1,6 @@
ADD_EXECUTABLE(filtertest filtertest.cpp ../tools/cmdline.h)
TARGET_LINK_LIBRARIES(filtertest nvcore nvmath nvimage)
TARGET_LINK_LIBRARIES(filtertest nvcore nvmath nvimage nvtt)
ADD_EXECUTABLE(nvtestsuite testsuite.cpp)
TARGET_LINK_LIBRARIES(nvtestsuite nvcore nvmath nvimage nvtt)
@ -13,7 +13,7 @@ ADD_TEST(NVTT.TestSuite.Epic.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/test
IF (CUDA_FOUND)
ADD_EXECUTABLE(driverapitest driverapi.cpp)
TARGET_LINK_LIBRARIES(driverapitest nvcore nvmath nvimage)
TARGET_LINK_LIBRARIES(driverapitest nvcore nvmath nvimage nvtt)
ENDIF (CUDA_FOUND)
ADD_EXECUTABLE(imperativeapi imperativeapi.cpp)

12
src/nvtt/tools/CMakeLists.txt
View File

@ -3,19 +3,19 @@ ADD_EXECUTABLE(nvcompress compress.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvcompress nvcore nvmath nvimage nvtt)
ADD_EXECUTABLE(nvdecompress decompress.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvdecompress nvcore nvmath nvimage)
TARGET_LINK_LIBRARIES(nvdecompress nvcore nvmath nvimage nvtt)
ADD_EXECUTABLE(nvddsinfo ddsinfo.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvddsinfo nvcore nvmath nvimage)
TARGET_LINK_LIBRARIES(nvddsinfo nvcore nvmath nvimage nvtt)
ADD_EXECUTABLE(nvimgdiff imgdiff.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvimgdiff nvcore nvmath nvimage)
TARGET_LINK_LIBRARIES(nvimgdiff nvcore nvmath nvimage nvtt)
ADD_EXECUTABLE(nvassemble assemble.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvassemble nvcore nvmath nvimage)
TARGET_LINK_LIBRARIES(nvassemble nvcore nvmath nvimage nvtt)
ADD_EXECUTABLE(nvzoom resize.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvzoom nvcore nvmath nvimage)
TARGET_LINK_LIBRARIES(nvzoom nvcore nvmath nvimage nvtt)
SET(TOOLS nvcompress nvdecompress nvddsinfo nvassemble nvzoom)
@ -28,7 +28,7 @@ ENDIF(GLEW_FOUND AND GLUT_FOUND AND OPENGL_FOUND)
ADD_EXECUTABLE(nv-gnome-thumbnailer thumbnailer.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nv-gnome-thumbnailer nvcore nvmath nvimage)
TARGET_LINK_LIBRARIES(nv-gnome-thumbnailer nvcore nvmath nvimage nvtt)
SET(TOOLS ${TOOLS} nv-gnome-thumbnailer)