mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-09-10 21:11:11 -04:00
Replace StringUtils::format in components/shader
This commit is contained in:
parent
ecbc3a7b9e
commit
9cce6bad68
@ -4,6 +4,7 @@
|
|||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
|
#include <format>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <regex>
|
#include <regex>
|
||||||
#include <set>
|
#include <set>
|
||||||
@ -18,7 +19,6 @@
|
|||||||
#include <components/misc/pathhelpers.hpp>
|
#include <components/misc/pathhelpers.hpp>
|
||||||
#include <components/misc/strings/algorithm.hpp>
|
#include <components/misc/strings/algorithm.hpp>
|
||||||
#include <components/misc/strings/conversion.hpp>
|
#include <components/misc/strings/conversion.hpp>
|
||||||
#include <components/misc/strings/format.hpp>
|
|
||||||
#include <components/settings/settings.hpp>
|
#include <components/settings/settings.hpp>
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
@ -108,7 +108,7 @@ namespace Shader
|
|||||||
|
|
||||||
int lineNumber = getLineNumber(source, foundPos, 1, -1);
|
int lineNumber = getLineNumber(source, foundPos, 1, -1);
|
||||||
|
|
||||||
source.replace(foundPos, 0, "#line " + std::to_string(lineNumber) + "\n");
|
source.replace(foundPos, 0, std::format("#line {}\n", lineNumber));
|
||||||
|
|
||||||
position = foundPos;
|
position = foundPos;
|
||||||
}
|
}
|
||||||
@ -554,7 +554,7 @@ namespace Shader
|
|||||||
// Assign a unique prefix to allow the SharedStateManager to compare shaders efficiently.
|
// Assign a unique prefix to allow the SharedStateManager to compare shaders efficiently.
|
||||||
// Append shader source filename for debugging.
|
// Append shader source filename for debugging.
|
||||||
static unsigned int counter = 0;
|
static unsigned int counter = 0;
|
||||||
shader->setName(Misc::StringUtils::format("%u %s", counter++, templateName));
|
shader->setName(std::format("{} {}", counter++, templateName));
|
||||||
|
|
||||||
mHotReloadManager->addShaderFiles(templateName, defines);
|
mHotReloadManager->addShaderFiles(templateName, defines);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user