Skip to content

bugfix: remove extra include for string table #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fs-eire merged 2 commits into from
Jun 22, 2025
Merged

bugfix: remove extra include for string table #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d853870
bugfix: remove extra include for string table
fs-eire Jun 22, 2025
b0357c5
fix test
fs-eire Jun 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/code-generator-static-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,14 @@ export class StaticCodeGenerator implements CodeGenerator, SourceBuilder {
return code.join("");
}

#buildGenerateIndex(repo: TemplateRepository<TemplatePass2>, includePathPrefix: string): string {
#buildGenerateIndex(repo: TemplateRepository<TemplatePass2>): string {
const indexContent = [];
indexContent.push("// This file is auto-generated by wgsl-gen. Do not edit manually.");
indexContent.push("");
//indexContent.push("#pragma once");
indexContent.push("#ifndef INCLUDED_BY_WGSL_GEN_HEADER");
indexContent.push('#error "This file is expected to be included by wgsl-gen header. Do not include it directly."');
indexContent.push("#endif");
if (this.#stringTable) {
indexContent.push(`#include "${includePathPrefix}wgsl_gen/string_table.h"`);
}
indexContent.push("");
for (const [name, template] of repo.templates) {
indexContent.push(`//`);
Expand Down Expand Up @@ -308,7 +305,7 @@ std::string pass_as_string(T&& v) {
const result = new Map<string, TemplateBuildResult>();

// STEP.1. Generate the index.h
result.set("index.h", this.#buildGenerateIndex(repo, options.includePathPrefix ?? ""));
result.set("index.h", this.#buildGenerateIndex(repo));

// STEP.2. Generate the string table if needed
if (this.#stringTable) {
Expand Down
1 change: 0 additions & 1 deletion test/testcases/build-basic/expected/static-cpp/index.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#ifndef INCLUDED_BY_WGSL_GEN_HEADER
#error "This file is expected to be included by wgsl-gen header. Do not include it directly."
#endif
#include "wgsl_gen/string_table.h"

//
// Template: shader/triangle.wgsl.template
Expand Down