diff --git a/src/tz/imgui.vertex.tzsl b/src/tz/imgui.vertex.tzsl index 3454d3f0b7..5d9d2641b5 100644 --- a/src/tz/imgui.vertex.tzsl +++ b/src/tz/imgui.vertex.tzsl @@ -7,17 +7,17 @@ struct ImGuiVertex uint col; }; -resource(id = 0) const buffer vertex +buffer(id = 0) const vertex { ImGuiVertex data[]; }; -resource(id = 1) const buffer index +buffer(id = 1) const index { uint data[]; }; -resource(id = 2) const buffer render +buffer(id = 2) const render { mat4 vp; uint index_offset; diff --git a/src/tz/ren/quad.vertex.tzsl b/src/tz/ren/quad.vertex.tzsl index e0e239a49a..73a603a16e 100644 --- a/src/tz/ren/quad.vertex.tzsl +++ b/src/tz/ren/quad.vertex.tzsl @@ -7,17 +7,17 @@ struct quad_data uint texture_id; }; -resource(id = 0) const buffer quad +buffer(id = 0) const quad { quad_data data[]; }; -resource(id = 1) const buffer camera +buffer(id = 1) const camera { mat4 projection; }; -resource(id = 2) const buffer settings +buffer(id = 2) const settings { uint value; }; diff --git a/tools/tzslc/tzsl.cpp b/tools/tzslc/tzsl.cpp index ff87144011..cf76e7a6af 100644 --- a/tools/tzslc/tzsl.cpp +++ b/tools/tzslc/tzsl.cpp @@ -310,7 +310,7 @@ namespace tzslc // Finally, resources. // Start with buffer resources. - constexpr char buffer_resource_regex[] = "resource\\(id ?= ?([0-9]+)\\) ?([a-zA-Z]*) ?buffer ([a-zA-Z_]+)"; + constexpr char buffer_resource_regex[] = "buffer\\(id ?= ?([0-9]+)\\) ?([a-zA-Z]*) ?([a-zA-Z_]+)"; tzslc::transform(shader_source, std::regex{buffer_resource_regex}, [](auto beg, auto end) {