kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed KRDatablock::Append where the data was not expanded correctly to concatenate a std::String. Converted sprite shader. Adjusted Spirv compile logging.

Browse Source
This commit is contained in:
Kearwood Gilbert
2020-12-30 18:24:36 -08:00
parent 75d3f019ae
commit 76b7e64ae6
8 changed files with 57 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kraken/KRDataBlock.cpp
View File

@@ -329,7 +329,7 @@ void KRDataBlock::append(const std::string &s)
append((void*)szText, text_length + 1);
} else {
// prev_size includes a null terminating character, don't need to add two.
expand(prev_size + text_length);
expand(text_length);
lock();
// Copy new string, overwriting prior null terminating character and
// including new terminating character

19
kraken/KRShaderManager.cpp
View File

@@ -288,8 +288,10 @@ bool KRShaderManager::compileAll(KRBundle* outputBundle, KRUnknown* logResource)
program.addShader(&shader);
} else {
const char* log = shader.getInfoLog();
logResource->getData()->append(log);
logResource->getData()->append("\n");
if (log[0] != '\0') {
logResource->getData()->append(log);
logResource->getData()->append("\n");
}
success = false;
}
};
@@ -299,8 +301,10 @@ bool KRShaderManager::compileAll(KRBundle* outputBundle, KRUnknown* logResource)
if (!program.link(messages)) {
const char* log = program.getInfoLog();
logResource->getData()->append(log);
logResource->getData()->append("\n");
if (log[0] != '\0') {
logResource->getData()->append(log);
logResource->getData()->append("\n");
}
success = false;
}
@@ -312,8 +316,11 @@ bool KRShaderManager::compileAll(KRBundle* outputBundle, KRUnknown* logResource)
spv::SpvBuildLogger logger;
glslang::SpvOptions spvOptions;
glslang::GlslangToSpv(*program.getIntermediate((EShLanguage)stage), spirv, &logger, &spvOptions);
logResource->getData()->append(logger.getAllMessages().c_str());
logResource->getData()->append("\n");
std::string messages = logger.getAllMessages();
if (!messages.empty()) {
logResource->getData()->append(messages.c_str());
logResource->getData()->append("\n");
}
std::string shader_name;
switch (stage)