Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[Impeller] Always convert std::filesystem paths in ImpellerC to UTF-8 strings #36158

Merged
merged 1 commit into from
Sep 15, 2022
Merged

[Impeller] Always convert std::filesystem paths in ImpellerC to UTF-8 strings #36158

Show file tree
Hide file tree
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
18 changes: 9 additions & 9 deletions impeller/compiler/impellerc_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ bool Main(const fml::CommandLine& command_line) {
auto spriv_file_name = std::filesystem::absolute(
std::filesystem::current_path() / switches.spirv_file_name);
if (!fml::WriteAtomically(*switches.working_directory,
spriv_file_name.string().c_str(),
spriv_file_name.u8string().c_str(),
*compiler.GetSPIRVAssembly())) {
std::cerr << "Could not write file to " << switches.spirv_file_name
<< std::endl;
Expand All @@ -118,9 +118,9 @@ bool Main(const fml::CommandLine& command_line) {
std::cerr << "Runtime stage data could not be created." << std::endl;
return false;
}
if (!fml::WriteAtomically(*switches.working_directory, //
sl_file_name.string().c_str(), //
*stage_data_mapping //
if (!fml::WriteAtomically(*switches.working_directory, //
sl_file_name.u8string().c_str(), //
*stage_data_mapping //
)) {
std::cerr << "Could not write file to " << switches.sl_file_name
<< std::endl;
Expand All @@ -133,7 +133,7 @@ bool Main(const fml::CommandLine& command_line) {
}
} else {
if (!fml::WriteAtomically(*switches.working_directory,
sl_file_name.string().c_str(),
sl_file_name.u8string().c_str(),
*compiler.GetSLShaderSource())) {
std::cerr << "Could not write file to " << switches.sl_file_name
<< std::endl;
Expand All @@ -148,7 +148,7 @@ bool Main(const fml::CommandLine& command_line) {
std::filesystem::current_path() / switches.reflection_json_name);
if (!fml::WriteAtomically(
*switches.working_directory,
reflection_json_name.string().c_str(),
reflection_json_name.u8string().c_str(),
*compiler.GetReflector()->GetReflectionJSON())) {
std::cerr << "Could not write reflection json to "
<< switches.reflection_json_name << std::endl;
Expand All @@ -162,7 +162,7 @@ bool Main(const fml::CommandLine& command_line) {
switches.reflection_header_name.c_str());
if (!fml::WriteAtomically(
*switches.working_directory,
reflection_header_name.string().c_str(),
reflection_header_name.u8string().c_str(),
*compiler.GetReflector()->GetReflectionHeader())) {
std::cerr << "Could not write reflection header to "
<< switches.reflection_header_name << std::endl;
Expand All @@ -175,7 +175,7 @@ bool Main(const fml::CommandLine& command_line) {
std::filesystem::absolute(std::filesystem::current_path() /
switches.reflection_cc_name.c_str());
if (!fml::WriteAtomically(*switches.working_directory,
reflection_cc_name.string().c_str(),
reflection_cc_name.u8string().c_str(),
*compiler.GetReflector()->GetReflectionCC())) {
std::cerr << "Could not write reflection CC to "
<< switches.reflection_cc_name << std::endl;
Expand Down Expand Up @@ -205,7 +205,7 @@ bool Main(const fml::CommandLine& command_line) {
auto depfile_path = std::filesystem::absolute(
std::filesystem::current_path() / switches.depfile_path.c_str());
if (!fml::WriteAtomically(*switches.working_directory,
depfile_path.string().c_str(),
depfile_path.u8string().c_str(),
*compiler.CreateDepfileContents({result_file}))) {
std::cerr << "Could not write depfile to " << switches.depfile_path
<< std::endl;
Expand Down
2 changes: 1 addition & 1 deletion impeller/compiler/utilities.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace impeller {
namespace compiler {

std::string InferShaderNameFromPath(std::string_view path) {
return std::filesystem::path{path}.stem().string();
return std::filesystem::path{path}.stem().u8string();
}

std::string ConvertToCamelCase(std::string_view string) {
Expand Down