Merge branch 'master' into taichi-ggui_unit_test

Author: Morcki

CMakeLists.txt

@@ -103,12 +103,15 @@ if (TI_BUILD_TESTS)
 endif()
 
 option(TI_BUILD_EXAMPLES "Build the CPP examples" ON)
-option(TI_BUILD_RHI_EXAMPLES "Build the Unified Device API examples" OFF)
 
 if(NOT TI_WITH_LLVM OR NOT TI_WITH_METAL)
     set(TI_BUILD_EXAMPLES OFF)
 endif()
 
+if (TI_BUILD_EXAMPLES)
+  include(cmake/TaichiExamples.cmake)
+endif()
+
 message("C++ Flags: ${CMAKE_CXX_FLAGS}")
 message("Build type: ${CMAKE_BUILD_TYPE}")
 
@@ -198,11 +201,3 @@ if (TI_WITH_C_API)
     include(cmake/TaichiCAPITests.cmake)
   endif()
 endif()
-
-if (TI_BUILD_EXAMPLES)
-  include(cmake/TaichiExamples.cmake)
-endif()
-
-if (TI_BUILD_RHI_EXAMPLES)
-  add_subdirectory(cpp_examples/rhi_examples)
-endif()

c_api/src/taichi_core_impl.cpp

@@ -244,7 +244,7 @@ TiTexture ti_allocate_texture(TiRuntime runtime,
 
   switch ((taichi::lang::ImageDimension)allocate_info->dimension) {
 #define PER_IMAGE_DIMENSION(x) case taichi::lang::ImageDimension::x:
-#include "taichi/inc/rhi_constants.inc.h"
+#include "taichi/inc/image_dimension.inc.h"
 #undef PER_IMAGE_DIMENSION
     break;
     default: {
@@ -256,7 +256,7 @@ TiTexture ti_allocate_texture(TiRuntime runtime,
 
   switch ((taichi::lang::BufferFormat)allocate_info->format) {
 #define PER_BUFFER_FORMAT(x) case taichi::lang::BufferFormat::x:
-#include "taichi/inc/rhi_constants.inc.h"
+#include "taichi/inc/buffer_format.inc.h"
 #undef PER_BUFFER_FORMAT
     break;
     default: {
@@ -357,7 +357,7 @@ void ti_transition_texture(TiRuntime runtime,
 
   switch ((taichi::lang::ImageLayout)layout) {
 #define PER_IMAGE_LAYOUT(x) case taichi::lang::ImageLayout::x:
-#include "taichi/inc/rhi_constants.inc.h"
+#include "taichi/inc/image_layout.inc.h"
 #undef PER_IMAGE_LAYOUT
     break;
     default: {

cmake/TaichiCXXFlags.cmake

@@ -25,26 +25,24 @@ if (WIN32)
     endif()
 endif()
 
-set(CMAKE_CXX_STANDARD 17)
-
 if (WIN32)
     link_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/lib)
     if (MSVC)
         set(CMAKE_CXX_FLAGS
-            "${CMAKE_CXX_FLAGS} /Zc:__cplusplus /bigobj /wd4244 /wd4267 /nologo /Zi /D \"_CRT_SECURE_NO_WARNINGS\" /D \"_ENABLE_EXTENDED_ALIGNED_STORAGE\"")
+            "${CMAKE_CXX_FLAGS} /Zc:__cplusplus /std:c++17 /bigobj /wd4244 /wd4267 /nologo /Zi /D \"_CRT_SECURE_NO_WARNINGS\" /D \"_ENABLE_EXTENDED_ALIGNED_STORAGE\"")
     else()
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsized-deallocation -target x86_64-pc-windows-msvc")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fsized-deallocation -target x86_64-pc-windows-msvc")
         set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gcodeview")
         set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -gcodeview")
     endif()
 else()
     if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
         message("Clang compiler detected. Using std=c++17.")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsized-deallocation -Wno-deprecated-declarations")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fsized-deallocation -Wno-deprecated-declarations")
     elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
         message("GNU compiler detected. Using std=c++17.")
         message(WARNING "It is detected that you are using gcc as the compiler. This is an experimental feature. Consider adding -DCMAKE_CXX_COMPILER=clang argument to CMake to switch to clang (or MSVC on Windows).")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsized-deallocation -Wno-class-memaccess -Wno-comment -Wno-sign-compare")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fsized-deallocation -Wno-class-memaccess -Wno-comment -Wno-sign-compare")
     else()
         message("Invalid compiler ${CMAKE_CXX_COMPILER_ID} detected.")
         message(FATAL_ERROR "clang and MSVC are the only supported compilers for Taichi compiler development. Consider using 'cmake -DCMAKE_CXX_COMPILER=clang' if you are on Linux.")