ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1580 from MaddTheSane/patch-2 

Update shadergen.cpp
This commit is contained in:
Connor McLaughlin 2021-02-05 11:45:43 +10:00 committed by GitHub
parent 05545566e7 2c2af6c751
commit 8b79e2c006
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/shadergen.cpp
View File

@ -340,7 +340,7 @@ void ShaderGen::DeclareVertexEntryPoint(
for (u32 i = 0; i < num_texcoord_outputs; i++) for (u32 i = 0; i < num_texcoord_outputs; i++)
ss << " " << qualifier << "float2 v_tex" << i << ";\n"; ss << " " << qualifier << "float2 v_tex" << i << ";\n";
for (const auto [qualifiers, name] : additional_outputs) for (const auto &[qualifiers, name] : additional_outputs)
{ {
const char* qualifier_to_use = (std::strlen(qualifiers) > 0) ? qualifiers : qualifier; const char* qualifier_to_use = (std::strlen(qualifiers) > 0) ? qualifiers : qualifier;
ss << " " << qualifier_to_use << " " << name << ";\n"; ss << " " << qualifier_to_use << " " << name << ";\n";
@ -357,7 +357,7 @@ void ShaderGen::DeclareVertexEntryPoint(
for (u32 i = 0; i < num_texcoord_outputs; i++) for (u32 i = 0; i < num_texcoord_outputs; i++)
ss << qualifier << "out float2 v_tex" << i << ";\n"; ss << qualifier << "out float2 v_tex" << i << ";\n";
for (const auto [qualifiers, name] : additional_outputs) for (const auto &[qualifiers, name] : additional_outputs)
{ {
const char* qualifier_to_use = (std::strlen(qualifiers) > 0) ? qualifiers : qualifier; const char* qualifier_to_use = (std::strlen(qualifiers) > 0) ? qualifiers : qualifier;
ss << qualifier_to_use << " out " << name << ";\n"; ss << qualifier_to_use << " out " << name << ";\n";
@ -399,7 +399,7 @@ void ShaderGen::DeclareVertexEntryPoint(
ss << " " << qualifier << "out float2 v_tex" << i << " : TEXCOORD" << i << ",\n"; ss << " " << qualifier << "out float2 v_tex" << i << " : TEXCOORD" << i << ",\n";
u32 additional_counter = num_texcoord_outputs; u32 additional_counter = num_texcoord_outputs;
for (const auto [qualifiers, name] : additional_outputs) for (const auto &[qualifiers, name] : additional_outputs)
{ {
const char* qualifier_to_use = (std::strlen(qualifiers) > 0) ? qualifiers : qualifier; const char* qualifier_to_use = (std::strlen(qualifiers) > 0) ? qualifiers : qualifier;
ss << " " << qualifier_to_use << " out " << name << " : TEXCOORD" << additional_counter << ",\n"; ss << " " << qualifier_to_use << " out " << name << " : TEXCOORD" << additional_counter << ",\n";
@ -433,7 +433,7 @@ void ShaderGen::DeclareFragmentEntryPoint(
for (u32 i = 0; i < num_texcoord_inputs; i++) for (u32 i = 0; i < num_texcoord_inputs; i++)
ss << " " << qualifier << "float2 v_tex" << i << ";\n"; ss << " " << qualifier << "float2 v_tex" << i << ";\n";
for (const auto [qualifiers, name] : additional_inputs) for (const auto &[qualifiers, name] : additional_inputs)
{ {
const char* qualifier_to_use = (std::strlen(qualifiers) > 0) ? qualifiers : qualifier; const char* qualifier_to_use = (std::strlen(qualifiers) > 0) ? qualifiers : qualifier;
ss << " " << qualifier_to_use << " " << name << ";\n"; ss << " " << qualifier_to_use << " " << name << ";\n";
@ -450,7 +450,7 @@ void ShaderGen::DeclareFragmentEntryPoint(
for (u32 i = 0; i < num_texcoord_inputs; i++) for (u32 i = 0; i < num_texcoord_inputs; i++)
ss << qualifier << "in float2 v_tex" << i << ";\n"; ss << qualifier << "in float2 v_tex" << i << ";\n";
for (const auto [qualifiers, name] : additional_inputs) for (const auto &[qualifiers, name] : additional_inputs)
{ {
const char* qualifier_to_use = (std::strlen(qualifiers) > 0) ? qualifiers : qualifier; const char* qualifier_to_use = (std::strlen(qualifiers) > 0) ? qualifiers : qualifier;
ss << qualifier_to_use << " in " << name << ";\n"; ss << qualifier_to_use << " in " << name << ";\n";
@ -503,7 +503,7 @@ void ShaderGen::DeclareFragmentEntryPoint(
ss << " " << qualifier << "in float2 v_tex" << i << " : TEXCOORD" << i << ",\n"; ss << " " << qualifier << "in float2 v_tex" << i << " : TEXCOORD" << i << ",\n";
u32 additional_counter = num_texcoord_inputs; u32 additional_counter = num_texcoord_inputs;
for (const auto [qualifiers, name] : additional_inputs) for (const auto &[qualifiers, name] : additional_inputs)
{ {
const char* qualifier_to_use = (std::strlen(qualifiers) > 0) ? qualifiers : qualifier; const char* qualifier_to_use = (std::strlen(qualifiers) > 0) ? qualifiers : qualifier;
ss << " " << qualifier_to_use << " in " << name << " : TEXCOORD" << additional_counter << ",\n"; ss << " " << qualifier_to_use << " in " << name << " : TEXCOORD" << additional_counter << ",\n";