Skip to content

Commit

Permalink
Merge branch 'next' of github.com:LuisaGroup/LuisaCompute into next
Browse files Browse the repository at this point in the history
  • Loading branch information
shiinamiyuki committed Jul 26, 2023
2 parents 252815b + 9d2245a commit e87fa87
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 5 deletions.
2 changes: 2 additions & 0 deletions src/backends/cuda/default_binary_io.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#include "pch.h"
#include "../common/default_binary_io.cpp"
2 changes: 2 additions & 0 deletions src/backends/cuda/string_scratch.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#include "pch.h"
#include "../common/string_scratch.cpp"
2 changes: 1 addition & 1 deletion src/backends/cuda/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if get_config("enable_ir") then
end
set_pcxxheader("pch.h")
add_headerfiles("**.h", "../common/default_binary_io.h", "../common/string_scratch.h")
add_files("**.cpp", "../common/default_binary_io.cpp", "../common/string_scratch.cpp")
add_files("**.cpp")
on_load(function(target)
import("detect.sdks.find_cuda")
local cuda = find_cuda()
Expand Down
2 changes: 2 additions & 0 deletions src/backends/dx/default_binary_io.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#include "pch.h"
#include "../common/default_binary_io.cpp"
9 changes: 9 additions & 0 deletions src/backends/dx/hlsl.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#include "pch.h"
#include "../common/hlsl/hlsl_codegen_util.cpp"
#include "../common/hlsl/hlsl_codegen.cpp"
#include "../common/hlsl/codegen_stack_data.cpp"
#include "../common/hlsl/access_chain.cpp"
#include "../common/hlsl/binding_to_arg.cpp"
#include "../common/hlsl/struct_generator.cpp"
#include "../common/hlsl/shader_compiler.cpp"
#include "../common/hlsl/string_builder.cpp"
5 changes: 2 additions & 3 deletions src/backends/dx/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ _config_project({
batch_size = 8
})
add_deps("lc-runtime", "lc-vstl")
add_files("DXApi/**.cpp", "DXRuntime/**.cpp", "Resource/**.cpp", "Shader/**.cpp", "../common/default_binary_io.cpp",
"../common/hlsl/*.cpp")
add_headerfiles("DXApi/**.h", "DXRuntime/**.h", "Resource/**.h", "Shader/**.h", "../common/default_binary_io.h",
add_files("**.cpp")
add_headerfiles("**.h", "../common/default_binary_io.h",
"../common/hlsl/*.h")
add_includedirs("./")
add_syslinks("D3D12", "dxgi")
Expand Down
2 changes: 1 addition & 1 deletion xmake.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set_xmakever("2.7.9")
set_xmakever("2.8.1")
add_rules("mode.release", "mode.debug", "mode.releasedbg")
-- pre-defined options
-- enable mimalloc as default allocator: https://github.com/LuisaGroup/mimalloc
Expand Down

0 comments on commit e87fa87

Please sign in to comment.