added barriers, started working on libraries
This commit is contained in:
@@ -8,24 +8,24 @@
|
||||
|
||||
void build_shader( const char *szName )
|
||||
{
|
||||
filesystem2->MakeDirectory(CUtlString("build/funnygame/metal/gfx"));
|
||||
filesystem2->MakeDirectory(CUtlString("build/funnygame/vulkan/gfx"));
|
||||
filesystem2->MakeDirectory(CUtlString("build/funnygame/metal/shaders"));
|
||||
filesystem2->MakeDirectory(CUtlString("build/funnygame/vulkan/shaders"));
|
||||
|
||||
CUtlVector<CUtlString> slang_args = {
|
||||
CUtlString("funnyassets/gfx_shaders/%s.slang", szName),
|
||||
CUtlString("funnyassets/shaders/%s.slang", szName),
|
||||
"-g",
|
||||
"-target",
|
||||
"spirv",
|
||||
"-D",
|
||||
"__SPIRV__=1",
|
||||
"-o",
|
||||
CUtlString("build/funnygame/vulkan/gfx/%s.shader", szName),
|
||||
CUtlString("build/funnygame/vulkan/shaders/%s.spv", szName),
|
||||
};
|
||||
|
||||
runner->Run("slangc", slang_args);
|
||||
slang_args[3] = "metal";
|
||||
slang_args[5] = "__METAL__=1";
|
||||
slang_args[7] = CUtlString("build/funnygame/metal/gfx/%s.shader", szName);
|
||||
slang_args[7] = CUtlString("build/funnygame/metal/shaders/%s.spv", szName);
|
||||
runner->Run("slangc", slang_args);
|
||||
runner->Wait();
|
||||
};
|
||||
@@ -37,16 +37,19 @@ DECLARE_BUILD_STAGE(assets)
|
||||
filesystem2->CopyDirectory("build", "tools");
|
||||
|
||||
filesystem2->CopyDirectory(CUtlString("build/funnygame/assets"), "funnyassets/maps");
|
||||
filesystem2->CopyDirectory(CUtlString("build/funnygame/assets"), "funnyassets/gfx");
|
||||
filesystem2->CopyDirectory(CUtlString("build/funnygame/assets"), "funnyassets/shaders");
|
||||
filesystem2->CopyDirectory(CUtlString("build/funnygame/assets"), "funnyassets/fonts");
|
||||
filesystem2->CopyDirectory(CUtlString("build/funnygame/assets"), "funnyassets/textures");
|
||||
filesystem2->CopyDirectory(CUtlString("build/funnygame/assets"), "funnyassets/materials");
|
||||
/*
|
||||
build_shader("mesh_frag");
|
||||
build_shader("mesh_vert");
|
||||
build_shader("fgui_rect_frag");
|
||||
build_shader("fgui_rect_vert");
|
||||
build_shader("fgui_text_frag");
|
||||
build_shader("fgui_text_vert");
|
||||
*/
|
||||
build_shader("flat");
|
||||
CUtlVector<CUtlString> python_args = {
|
||||
"build/tools/makepak64.py",
|
||||
CUtlString("build/funnygame/assets"),
|
||||
@@ -62,12 +65,15 @@ DECLARE_BUILD_STAGE(assets)
|
||||
};
|
||||
runner->Run("python3", python_args);
|
||||
} else {
|
||||
filesystem2->CopyDirectory(CUtlString("%s/funnygame", szOutputDir.GetString()),"build/funnygame/vulkan/shaders");
|
||||
/*
|
||||
python_args = {
|
||||
"build/tools/makepak64.py",
|
||||
CUtlString("build/funnygame/vulkan"),
|
||||
bStaticBuild ? CUtlString("%s/bin/%s.pak", szOutputDir.GetString(), "vulkan") : CUtlString("%s/funnygame/%s.pak", szOutputDir.GetString(), "vulkan"),
|
||||
};
|
||||
runner->Run("python3", python_args);
|
||||
*/
|
||||
}
|
||||
runner->Wait();
|
||||
|
||||
|
||||
23
funnyassets/shaders/flat.slang
Normal file
23
funnyassets/shaders/flat.slang
Normal file
@@ -0,0 +1,23 @@
|
||||
struct VS_INPUT
|
||||
{
|
||||
float3 m_vPosition;
|
||||
}
|
||||
|
||||
struct PS_INPUT
|
||||
{
|
||||
float4 m_vPosition;
|
||||
}
|
||||
|
||||
[shader("vertex")]
|
||||
PS_INPUT vsMain( VS_INPUT i )
|
||||
{
|
||||
PS_INPUT o;
|
||||
o.m_vPosition = { i.m_vPosition, 1 };
|
||||
return o;
|
||||
}
|
||||
|
||||
[shader("pixel")]
|
||||
float4 psMain( PS_INPUT i )
|
||||
{
|
||||
return float4(1);
|
||||
}
|
||||
Reference in New Issue
Block a user