Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Floating point image support. #9

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Floating point image support. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed9d777
inital Float support: 32fp read/write, fp16 read. needs cleaning.
Trico-Everfire Apr 8, 2023
8e83fac
Float Support: complete support, does need extensive testing.
Trico-Everfire Apr 11, 2023
79904bb
feat: Gamma correction for floating points
Trico-Everfire Apr 12, 2023
6aab315
Fix: fix issue with conversion to FP formats due to missing conversions.
Trico-Everfire Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 59 additions & 59 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ option(VTFLIB_SHARED "If enabled, builds VTFLIB as a shared library" ON)

set(CMAKE_CXX_STANDARD 17)

include_directories(thirdparty/include thirdparty/miniz)
include_directories(thirdparty/include thirdparty/half/include thirdparty/miniz)

if (UNIX)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
endif()
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
endif ()

# MT/MTd specification for Windows
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
Expand All @@ -23,69 +23,69 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
# VTFLIB
#
set(VTFLIB_SRCS
VTFLib/Resource.rc

VTFLib/Error.cpp
VTFLib/FileReader.cpp
VTFLib/FileWriter.cpp
VTFLib/Float16.cpp
VTFLib/MemoryReader.cpp
VTFLib/MemoryWriter.cpp
VTFLib/Proc.cpp
VTFLib/ProcReader.cpp
VTFLib/ProcWriter.cpp
VTFLib/VMTFile.cpp
VTFLib/VMTGroupNode.cpp
VTFLib/VMTIntegerNode.cpp
VTFLib/VMTNode.cpp
VTFLib/VMTSingleNode.cpp
VTFLib/VMTStringNode.cpp
VTFLib/VMTValueNode.cpp
VTFLib/VMTWrapper.cpp
VTFLib/VTFFile.cpp
VTFLib/VTFLib.cpp
VTFLib/VTFMathlib.cpp
VTFLib/VTFWrapper.cpp
VTFLib/Resource.rc

# Miniz sources
thirdparty/miniz/miniz.c)
VTFLib/Error.cpp
VTFLib/FileReader.cpp
VTFLib/FileWriter.cpp
VTFLib/Float16.cpp
VTFLib/MemoryReader.cpp
VTFLib/MemoryWriter.cpp
VTFLib/Proc.cpp
VTFLib/ProcReader.cpp
VTFLib/ProcWriter.cpp
VTFLib/VMTFile.cpp
VTFLib/VMTGroupNode.cpp
VTFLib/VMTIntegerNode.cpp
VTFLib/VMTNode.cpp
VTFLib/VMTSingleNode.cpp
VTFLib/VMTStringNode.cpp
VTFLib/VMTValueNode.cpp
VTFLib/VMTWrapper.cpp
VTFLib/VTFFile.cpp
VTFLib/VTFLib.cpp
VTFLib/VTFMathlib.cpp
VTFLib/VTFWrapper.cpp

# Miniz sources
thirdparty/miniz/miniz.c)

if (VTFLIB_STATIC)
add_library(vtflib_static STATIC ${VTFLIB_SRCS})
target_compile_definitions(vtflib_static PUBLIC VTFLIB_STATIC)
endif()
add_library(vtflib_static STATIC ${VTFLIB_SRCS})
target_compile_definitions(vtflib_static PUBLIC VTFLIB_STATIC)
endif ()
if (VTFLIB_SHARED)
add_library(vtflib SHARED ${VTFLIB_SRCS})
endif()
add_library(vtflib SHARED ${VTFLIB_SRCS})
endif ()

# Link against compressonator libs & set runtime lib
if (UNIX)
if (VTFLIB_SHARED)
target_link_directories(vtflib PUBLIC thirdparty/lib/x64)
target_link_libraries(vtflib PUBLIC CMP_Compressonator pthread)
endif()
if (VTFLIB_STATIC)
target_link_directories(vtflib_static PUBLIC thirdparty/lib/x64)
target_link_libraries(vtflib_static PUBLIC CMP_Compressonator pthread)
endif()
else()
if (VTFLIB_SHARED)
target_link_directories(vtflib PUBLIC thirdparty/lib)
target_link_libraries(vtflib PUBLIC "Compressonator_MT$<$<CONFIG:Debug>:d>")
endif()
if (VTFLIB_STATIC)
target_link_libraries(vtflib_static PUBLIC "Compressonator_MT$<$<CONFIG:Debug>:d>")
target_link_directories(vtflib_static PUBLIC thirdparty/lib)
endif()
endif()
if (VTFLIB_SHARED)
target_link_directories(vtflib PUBLIC thirdparty/lib/x64)
target_link_libraries(vtflib PUBLIC CMP_Compressonator pthread)
endif ()
if (VTFLIB_STATIC)
target_link_directories(vtflib_static PUBLIC thirdparty/lib/x64)
target_link_libraries(vtflib_static PUBLIC CMP_Compressonator pthread)
endif ()
else ()
if (VTFLIB_SHARED)
target_link_directories(vtflib PUBLIC thirdparty/lib)
target_link_libraries(vtflib PUBLIC "Compressonator_MT$<$<CONFIG:Debug>:d>")
endif ()
if (VTFLIB_STATIC)
target_link_libraries(vtflib_static PUBLIC "Compressonator_MT$<$<CONFIG:Debug>:d>")
target_link_directories(vtflib_static PUBLIC thirdparty/lib)
endif ()
endif ()

if (VTFLIB_SHARED)
target_compile_definitions(vtflib PRIVATE VTFLIB_EXPORTS)
target_precompile_headers(vtflib PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/VTFLib/stdafx.h>")
target_include_directories(vtflib PUBLIC lib)
endif()
target_compile_definitions(vtflib PRIVATE VTFLIB_EXPORTS)
target_precompile_headers(vtflib PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/VTFLib/stdafx.h>")
target_include_directories(vtflib PUBLIC lib)
endif ()
if (VTFLIB_STATIC)
target_compile_definitions(vtflib_static PRIVATE VTFLIB_EXPORTS)
target_precompile_headers(vtflib_static PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/VTFLib/stdafx.h>")
target_include_directories(vtflib_static PUBLIC lib)
endif()
target_compile_definitions(vtflib_static PRIVATE VTFLIB_EXPORTS)
target_precompile_headers(vtflib_static PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/VTFLib/stdafx.h>")
target_include_directories(vtflib_static PUBLIC lib)
endif ()
Loading