From 591bc091da57bc2cbed399ef1122d23cb6ad7822 Mon Sep 17 00:00:00 2001 From: Wunkolo Date: Sun, 3 Mar 2024 14:03:40 -0800 Subject: [PATCH] spv_shader_gen: Refactor `EmitterIDs` to `ModuleIds` --- src/video_core/shader/generator/spv_shader_gen.cpp | 4 ++-- src/video_core/shader/generator/spv_shader_gen.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/video_core/shader/generator/spv_shader_gen.cpp b/src/video_core/shader/generator/spv_shader_gen.cpp index 048eaad34..f78215056 100644 --- a/src/video_core/shader/generator/spv_shader_gen.cpp +++ b/src/video_core/shader/generator/spv_shader_gen.cpp @@ -192,7 +192,7 @@ Id VertexModule::WriteFuncSanitizeVertex() { return func; } -void VertexModule::Generate(Common::UniqueFunction proc) { +void VertexModule::Generate(Common::UniqueFunction proc) { AddLabel(OpLabel()); ids.ptr_enable_clip1 = OpAccessChain(TypePointer(spv::StorageClass::Uniform, ids.u32), @@ -209,7 +209,7 @@ void VertexModule::Generate(Common::UniqueFunction GenerateTrivialVertexShader(bool use_clip_planes) { VertexModule module; module.Generate([use_clip_planes](Sirit::Module& spv, - const VertexModule::EmitterIDs& ids) -> void { + const VertexModule::ModuleIds& ids) -> void { const Id pos_sanitized = spv.OpFunctionCall( ids.vec.Get(4), ids.sanitize_vertex, spv.OpLoad(ids.vec.Get(4), ids.vert_in_position)); diff --git a/src/video_core/shader/generator/spv_shader_gen.h b/src/video_core/shader/generator/spv_shader_gen.h index df98c3cb8..4f52d52d0 100644 --- a/src/video_core/shader/generator/spv_shader_gen.h +++ b/src/video_core/shader/generator/spv_shader_gen.h @@ -73,7 +73,7 @@ private: [[nodiscard]] Id WriteFuncSanitizeVertex(); public: - struct EmitterIDs { + struct ModuleIds { /// Types Id void_{}; Id bool_{}; @@ -121,7 +121,7 @@ public: } ids; /// Generate code using the provided SPIRV emitter context - void Generate(Common::UniqueFunction proc); + void Generate(Common::UniqueFunction proc); }; /**