Add support for input rescaling:
- round extents to power of two. - clamp max extents. Add output options pimpl. Other misc API changes.
This commit is contained in:
@ -15,13 +15,17 @@ SET(NVTT_SRCS
|
||||
FastCompressDXT.cpp
|
||||
QuickCompressDXT.h
|
||||
QuickCompressDXT.cpp
|
||||
SingleColorLookup.h
|
||||
CompressionOptions.h
|
||||
CompressionOptions.cpp
|
||||
InputOptions.h
|
||||
InputOptions.cpp
|
||||
OutputOptions.h
|
||||
OutputOptions.cpp
|
||||
cuda/CudaUtils.h
|
||||
cuda/CudaUtils.cpp
|
||||
cuda/CudaMath.h
|
||||
cuda/Bitmaps.h
|
||||
cuda/CudaCompressDXT.h
|
||||
cuda/CudaCompressDXT.cpp)
|
||||
|
||||
@ -45,23 +49,62 @@ ENDIF(NVTT_SHARED)
|
||||
|
||||
TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvmath nvimage squish)
|
||||
|
||||
INSTALL(TARGETS nvtt
|
||||
RUNTIME DESTINATION bin
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib/static)
|
||||
|
||||
INSTALL(FILES nvtt.h DESTINATION include/nvtt)
|
||||
|
||||
|
||||
|
||||
# test executables
|
||||
ADD_EXECUTABLE(nvcompress tools/compress.cpp)
|
||||
ADD_EXECUTABLE(nvcompress tools/compress.cpp tools/cmdline.h)
|
||||
TARGET_LINK_LIBRARIES(nvcompress nvcore nvmath nvimage nvtt)
|
||||
|
||||
ADD_EXECUTABLE(nvdecompress tools/decompress.cpp)
|
||||
ADD_EXECUTABLE(nvdecompress tools/decompress.cpp tools/cmdline.h)
|
||||
TARGET_LINK_LIBRARIES(nvdecompress nvcore nvmath nvimage)
|
||||
|
||||
ADD_EXECUTABLE(nvddsinfo tools/ddsinfo.cpp)
|
||||
ADD_EXECUTABLE(nvddsinfo tools/ddsinfo.cpp tools/cmdline.h)
|
||||
TARGET_LINK_LIBRARIES(nvddsinfo nvcore nvmath nvimage)
|
||||
|
||||
ADD_EXECUTABLE(nvimgdiff tools/imgdiff.cpp)
|
||||
ADD_EXECUTABLE(nvimgdiff tools/imgdiff.cpp tools/cmdline.h)
|
||||
TARGET_LINK_LIBRARIES(nvimgdiff nvcore nvmath nvimage)
|
||||
|
||||
ADD_EXECUTABLE(nvassemble tools/assemble.cpp)
|
||||
ADD_EXECUTABLE(nvassemble tools/assemble.cpp tools/cmdline.h)
|
||||
TARGET_LINK_LIBRARIES(nvassemble nvcore nvmath nvimage)
|
||||
|
||||
INSTALL(TARGETS nvcompress nvdecompress nvddsinfo nvimgdiff nvassemble DESTINATION bin)
|
||||
ADD_EXECUTABLE(filtertest tests/filtertest.cpp tools/cmdline.h)
|
||||
TARGET_LINK_LIBRARIES(filtertest nvcore nvmath nvimage)
|
||||
|
||||
ADD_EXECUTABLE(nvzoom tools/resize.cpp tools/cmdline.h)
|
||||
TARGET_LINK_LIBRARIES(nvzoom nvcore nvmath nvimage)
|
||||
|
||||
INSTALL(TARGETS nvcompress nvdecompress nvddsinfo nvimgdiff nvassemble nvzoom DESTINATION bin)
|
||||
|
||||
# UI tools
|
||||
IF(QT4_FOUND)
|
||||
SET(QT_USE_QTOPENGL TRUE)
|
||||
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
SET(SRCS
|
||||
tools/main.cpp
|
||||
tools/configdialog.h
|
||||
tools/configdialog.cpp)
|
||||
|
||||
SET(LIBS
|
||||
nvtt
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
${QT_QTOPENGL_LIBRARY})
|
||||
|
||||
QT4_WRAP_UI(UICS tools/configdialog.ui)
|
||||
QT4_WRAP_CPP(MOCS tools/configdialog.h)
|
||||
#QT4_ADD_RESOURCES(RCCS tools/configdialog.rc)
|
||||
|
||||
ADD_EXECUTABLE(nvcompressui MACOSX_BUNDLE ${SRCS} ${UICS} ${MOCS})
|
||||
TARGET_LINK_LIBRARIES(nvcompressui ${LIBS})
|
||||
|
||||
ENDIF(QT4_FOUND)
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user