Skip to content

Commit f9e7dbd

Browse files
authored
[build] [refactor] Move shaders source files to runtime (#5247)
* Move shaders to runtime * Update path * Add dep for gl
1 parent 65f8e36 commit f9e7dbd

17 files changed

+12
-10
lines changed

taichi/codegen/metal/codegen_metal.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ namespace {
2121

2222
namespace shaders {
2323
#define TI_INSIDE_METAL_CODEGEN
24-
#include "taichi/codegen/metal/shaders/ad_stack.metal.h"
25-
#include "taichi/codegen/metal/shaders/helpers.metal.h"
26-
#include "taichi/codegen/metal/shaders/init_randseeds.metal.h"
24+
#include "taichi/runtime/metal/shaders/ad_stack.metal.h"
25+
#include "taichi/runtime/metal/shaders/helpers.metal.h"
26+
#include "taichi/runtime/metal/shaders/init_randseeds.metal.h"
2727
#include "taichi/runtime/metal/shaders/print.metal.h"
2828
#include "taichi/runtime/metal/shaders/runtime_kernels.metal.h"
2929
#undef TI_INSIDE_METAL_CODEGEN

taichi/codegen/metal/struct_metal.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace shaders {
2222
#define TI_INSIDE_METAL_CODEGEN
2323
#include "taichi/runtime/metal/shaders/runtime_structs.metal.h"
2424
#include "taichi/runtime/metal/shaders/runtime_utils.metal.h"
25-
#include "taichi/codegen/metal/shaders/snode_bit_pointer.metal.h"
25+
#include "taichi/runtime/metal/shaders/snode_bit_pointer.metal.h"
2626
#undef TI_INSIDE_METAL_CODEGEN
2727

2828
#include "taichi/runtime/metal/shaders/runtime_structs.metal.h"

taichi/codegen/opengl/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ target_include_directories(opengl_codegen
1414
${PROJECT_SOURCE_DIR}/external/eigen
1515
${LLVM_INCLUDE_DIRS}
1616
)
17+
18+
target_link_libraries(opengl_codegen PRIVATE opengl_runtime)

taichi/codegen/opengl/codegen_opengl.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ namespace shaders {
3030
_(arr7)
3131

3232
#define TI_INSIDE_OPENGL_CODEGEN
33-
#include "taichi/codegen/opengl/shaders/atomics_macro_f32.glsl.h"
33+
#include "taichi/runtime/opengl/shaders/atomics_macro_f32.glsl.h"
3434
#include "taichi/runtime/opengl/shaders/runtime.h"
35-
#include "taichi/codegen/opengl/shaders/random.glsl.h"
36-
#include "taichi/codegen/opengl/shaders/fast_pow.glsl.h"
37-
#include "taichi/codegen/opengl/shaders/print.glsl.h"
38-
#include "taichi/codegen/opengl/shaders/reduction.glsl.h"
35+
#include "taichi/runtime/opengl/shaders/random.glsl.h"
36+
#include "taichi/runtime/opengl/shaders/fast_pow.glsl.h"
37+
#include "taichi/runtime/opengl/shaders/print.glsl.h"
38+
#include "taichi/runtime/opengl/shaders/reduction.glsl.h"
3939

4040
GENERATE_OPENGL_ATOMIC_F32(data);
4141
GENERATE_OPENGL_ATOMIC_F32(gtmp);

taichi/runtime/metal/shaders/prolog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424

2525
using byte = char;
2626

27-
#include "taichi/codegen/metal/shaders/atomic_stubs.h"
27+
#include "taichi/runtime/metal/shaders/atomic_stubs.h"
2828

2929
#endif // TI_INSIDE_METAL_CODEGEN

0 commit comments

Comments
 (0)