Skip to content

Commit

Permalink
Add cmake configs for TI_WITH_OPENGL
Browse files Browse the repository at this point in the history
  • Loading branch information
archibate committed Feb 25, 2020
1 parent f18db4e commit f5b173e
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 4 deletions.
23 changes: 20 additions & 3 deletions cmake/TaichiCore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ endif()

option(USE_STDCPP "Use -stdlib=libc++" OFF)
option(TI_WITH_CUDA "Build with CUDA support" OFF)
option(TI_WITH_OPENGL "Build with OpenGL backend" ON)

include_directories(${CMAKE_SOURCE_DIR})
include_directories(external/xxhash)
Expand Down Expand Up @@ -53,6 +54,25 @@ if (TI_WITH_CUDA)
endif()
endif()

if (TI_WITH_OPENGL)
if(NOT GLEW_VERSION)
set(GLEW_VERSION 2.0.0)
endif()
find_package(GLEW ${GLEW_VERSION})
if (GLEW_FOUND)
message("Building with GLEW ${GLEW_VERSION}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTI_WITH_OPENGL")
#if (MSVC)
# TODO(archibate): figure out how GL is installed on Windows...
#else()
target_link_libraries(${LIBRARY_NAME} /usr/lib/libGLEW.so GLEW)
target_link_libraries(${LIBRARY_NAME} /usr/lib/libglfw.so glfw)
#endif()
else()
message(WARNING "GLEW not found, ignoring TI_WITH_OPENGL.")
endif()
endif()

# http://llvm.org/docs/CMake.html#embedding-llvm-in-your-project
find_package(LLVM REQUIRED CONFIG 8.0)
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
Expand Down Expand Up @@ -88,9 +108,6 @@ if (TI_WITH_CUDA)
target_link_libraries(${LIBRARY_NAME} ${llvm_ptx_libs})
endif()

target_link_libraries(${LIBRARY_NAME} /usr/lib/libGLEW.so GLEW)
target_link_libraries(${LIBRARY_NAME} /usr/lib/libglfw.so glfw)

# add_executable(runtime runtime/runtime.cpp)

# Optional dependencies
Expand Down
18 changes: 17 additions & 1 deletion taichi/platform/opengl/opengl_api.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include "opengl_api.h"
#if TI_OPENGL
#define USE_GLEW
#ifdef USE_GLEW
#define GLEW_STATIC
Expand All @@ -6,7 +8,6 @@
#include <GLES3/gl32.h>
#endif
#include <GLFW/glfw3.h>
#include "opengl_api.h"
#include <taichi/perf.h>

TLANG_NAMESPACE_BEGIN
Expand Down Expand Up @@ -324,3 +325,18 @@ bool is_opengl_api_available()

}
TLANG_NAMESPACE_END

#else

TLANG_NAMESPACE_BEGIN
namespace opengl {

bool is_opengl_api_available()
{
return false;
}

}
TLANG_NAMESPACE_END

#endif

0 comments on commit f5b173e

Please sign in to comment.