notsoyuzu
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: Remove output generic indexing for geometry stage

This commit is contained in:
ameerj 2021-06-07 18:28:42 -04:00
parent 258106038e
commit fb839061fb
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp
View File

@ -30,10 +30,8 @@ std::string InputVertexIndex(EmitContext& ctx, std::string_view vertex) {
return IsInputArray(ctx.stage) ? fmt::format("[{}]", vertex) : ""; return IsInputArray(ctx.stage) ? fmt::format("[{}]", vertex) : "";
} }
std::string OutputVertexIndex(EmitContext& ctx, std::string_view vertex) { std::string OutputVertexIndex(EmitContext& ctx) {
switch (ctx.stage) { switch (ctx.stage) {
case Stage::Geometry:
return fmt::format("[{}]", vertex);
case Stage::TessellationControl: case Stage::TessellationControl:
return "[gl_InvocationID]"; return "[gl_InvocationID]";
default: default:
@ -252,12 +250,12 @@ void EmitGetAttribute(EmitContext& ctx, IR::Inst& inst, IR::Attribute attr,
} }
void EmitSetAttribute(EmitContext& ctx, IR::Attribute attr, std::string_view value, void EmitSetAttribute(EmitContext& ctx, IR::Attribute attr, std::string_view value,
std::string_view vertex) { [[maybe_unused]] std::string_view vertex) {
if (IR::IsGeneric(attr)) { if (IR::IsGeneric(attr)) {
const u32 index{IR::GenericAttributeIndex(attr)}; const u32 index{IR::GenericAttributeIndex(attr)};
const u32 element{IR::GenericAttributeElement(attr)}; const u32 element{IR::GenericAttributeElement(attr)};
const GenericElementInfo& info{ctx.output_generics.at(index).at(element)}; const GenericElementInfo& info{ctx.output_generics.at(index).at(element)};
const auto output_decorator{OutputVertexIndex(ctx, vertex)}; const auto output_decorator{OutputVertexIndex(ctx)};
if (info.num_components == 1) { if (info.num_components == 1) {
ctx.Add("{}{}={};", info.name, output_decorator, value); ctx.Add("{}{}={};", info.name, output_decorator, value);
} else { } else {