Skip to content

Improvements (no breaking changes): #20

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
apanteleev merged 1 commit into from
Jul 16, 2025
Merged

Improvements (no breaking changes): #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 6 additions & 44 deletions ShaderMake/ShaderMake.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,11 +416,11 @@ class DataOutputContext
fprintf(stream, "%u,", value);

if (value < 10)
m_lineLength += 3;
m_lineLength += 2;
else if (value < 100)
m_lineLength += 4;
m_lineLength += 3;
else
m_lineLength += 5;
m_lineLength += 4;
}

return true;
Expand Down Expand Up @@ -454,32 +454,6 @@ class DataOutputContext
uint32_t m_lineLength = 129;
};

void DumpShader(const TaskData& taskData, const uint8_t* data, size_t dataSize)
{
string file = taskData.outputFileWithoutExt + g_OutputExt;

if (g_Options.binary || g_Options.binaryBlob || (g_Options.headerBlob && !taskData.combinedDefines.empty()))
{
DataOutputContext context(file.c_str(), false);
if (!context.stream)
return;

context.WriteDataAsBinary(data, dataSize);
}

if (g_Options.header || (g_Options.headerBlob && taskData.combinedDefines.empty()))
{
DataOutputContext context((file + ".h").c_str(), true);
if (!context.stream)
return;

string shaderName = GetShaderName(taskData.outputFileWithoutExt);
context.WriteTextPreamble(shaderName.c_str(), taskData.combinedDefines);
context.WriteDataAsText(data, dataSize);
context.WriteTextEpilog();
}
}

void UpdateProgress(const TaskData& taskData, bool isSucceeded, bool willRetry, const char* message)
{
// IMPORTANT: do not split into several "Printf" calls because multi-threading access to the console can mess up the order
Expand Down Expand Up @@ -931,7 +905,6 @@ void ExeCompile()
g_TaskData.pop_back();
}

bool convertBinaryOutputToHeader = false;
string outputFile = taskData.outputFileWithoutExt + g_OutputExt;

// Building command line
Expand All @@ -945,9 +918,6 @@ void ExeCompile()

if (g_Options.slang)
{
if (g_Options.header || (g_Options.headerBlob && taskData.combinedDefines.empty()))
convertBinaryOutputToHeader = true;

// Slang defaults to slang language mode unless -lang <other language> sets something else.
// For HLSL compatibility mode:
// - use -lang hlsl to set language mode to HLSL
Expand Down Expand Up @@ -1047,15 +1017,7 @@ void ExeCompile()
cmd << " -nologo";

// Output file
if (g_Options.binary || g_Options.binaryBlob || (g_Options.headerBlob && !taskData.combinedDefines.empty()))
cmd << " -Fo " << EscapePath(outputFile);
if (g_Options.header || (g_Options.headerBlob && taskData.combinedDefines.empty()))
{
string name = GetShaderName(taskData.outputFileWithoutExt);

cmd << " -Fh " << EscapePath(outputFile) << ".h";
cmd << " -Vn " << name;
}
cmd << " -Fo " << EscapePath(outputFile);

// Profile
string profile = taskData.profile + "_";
Expand Down Expand Up @@ -1202,8 +1164,8 @@ void ExeCompile()
willRetry = true;
}

// Slang cannot produce .h files directly, so we convert its binary output to .h here if needed
if (isSucceeded && convertBinaryOutputToHeader)
// Convert to headers if needed
if (isSucceeded && (g_Options.header || (g_Options.headerBlob && taskData.combinedDefines.empty())))
{
vector<uint8_t> buffer;
if (ReadBinaryFile(outputFile.c_str(), buffer))
Expand Down