Skip to content
This repository was archived by the owner on Sep 27, 2023. It is now read-only.

Integrate any one of the various GLSL / shader optimizers #167

Draft
lf94 wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Integrate any one of the various GLSL / shader optimizers #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e976f11
Integrate shaderc
lf94 Feb 1, 2023
e6c9967
ok
lf94 Feb 3, 2023
1a7e2ad
WIP
lf94 Feb 4, 2023
bedfbe2
Merge branch 'master' of https://github.com/curv3d/curv into glsl-opt…
doug-moen Feb 5, 2023
6e132fe
change .gitmodules to use https: URLs so I don't get scary error message
doug-moen Feb 5, 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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@
[submodule "extern/libfive"]
path = extern/libfive
url = https://github.com/curv3d/libfive
[submodule "extern/shaderc"]
path = extern/shaderc
url = https://github.com/google/shaderc.git
18 changes: 13 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ include_directories(.
extern/stb
extern/glfw/include
extern/glm
extern/glad)
extern/glad/include)
if (MSYS)
# On MSYS we use MinGW packages for OpenVDB and GoogleTest
else ()
include_directories(
extern/googletest/googletest/include
#extern/googletest/googletest/include
extern/openvdb/openvdb)
endif ()

Expand Down Expand Up @@ -104,9 +104,16 @@ file(GLOB DoubleConversionSrc "extern/double-conversion/double-conversion/*.cc")
add_library(double-conversion ${DoubleConversionSrc})
set_property(TARGET double-conversion PROPERTY CXX_STANDARD 17)

# shaderc library
set(SHADERC_SKIP_INSTALL true)
set(SHADERC_SKIP_TESTS true)
set(SHADERC_SKIP_EXAMPLES true)
set(SHADERC_SKIP_COPYRIGHT_CHECK true)
add_subdirectory(extern/shaderc/)

# glad library, an OpenGL loader
add_library(glad
extern/glad/glad/glad.c)
extern/glad/src/gl.c)
set_property(TARGET glad PROPERTY CXX_STANDARD 17)

# Dear IMGUI library
Expand Down Expand Up @@ -190,7 +197,8 @@ set(Libs
libcurv_io libcurv imgui glfw glad ${LibOpenGL} replxx double-conversion
tmc ${FatLibraries}
Boost::iostreams Boost::system
pthread ${LibDl})
pthread ${LibDl}
shaderc)

target_link_libraries(curv PUBLIC ${Libs})

Expand Down Expand Up @@ -268,7 +276,7 @@ if (NOT DEFINED MSYS)
add_subdirectory(extern/openvdb/openvdb/openvdb EXCLUDE_FROM_ALL)
set_property(TARGET openvdb_static PROPERTY CXX_STANDARD 17)
endif()
add_subdirectory(extern/googletest/googletest EXCLUDE_FROM_ALL)
#add_subdirectory(extern/googletest/googletest EXCLUDE_FROM_ALL)
endif ()

add_subdirectory(extern/glfw EXCLUDE_FROM_ALL)
Loading