From 2036caa4a00159e4d465c3505b95099a7142b3c4 Mon Sep 17 00:00:00 2001 From: Swung0x48 Date: Mon, 18 Aug 2025 09:50:30 +0800 Subject: [PATCH] [Chore] (MG_State/Program): remove shaderTypes from ProgramAttrib --- .../MG_State/GLState/ProgramState/ProgramObject.cpp | 2 +- MobileGL/MG_Test/Program/ProgramUtilTest.cpp | 10 +++++----- MobileGL/MG_Util/ShaderTranspiler/Types.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MobileGL/MG_State/GLState/ProgramState/ProgramObject.cpp b/MobileGL/MG_State/GLState/ProgramState/ProgramObject.cpp index 669717a2..3e40609f 100644 --- a/MobileGL/MG_State/GLState/ProgramState/ProgramObject.cpp +++ b/MobileGL/MG_State/GLState/ProgramState/ProgramObject.cpp @@ -36,7 +36,7 @@ namespace MobileGL { } MG_Util::ShaderTranspiler::ProgramAttrib attrib{ - .shaderTypes = Move(shaderTypes), + // .shaderTypes = Move(shaderTypes), .shaders = Move(shaders), }; diff --git a/MobileGL/MG_Test/Program/ProgramUtilTest.cpp b/MobileGL/MG_Test/Program/ProgramUtilTest.cpp index da2d5506..6de004e3 100644 --- a/MobileGL/MG_Test/Program/ProgramUtilTest.cpp +++ b/MobileGL/MG_Test/Program/ProgramUtilTest.cpp @@ -133,7 +133,7 @@ TEST_F(ProgramUtilTest, CompileFragmentShaderWithDiscard) { } ProgramAttrib programAttrib { - .shaderTypes = { GL_FRAGMENT_SHADER }, + // .shaderTypes = { GL_FRAGMENT_SHADER }, .shaders = { res.value() } }; @@ -159,7 +159,7 @@ TEST_F(ProgramUtilTest, CompileFragmentShaderWithDiscard) { } for (SizeT i = 0; i < spirvs.size(); ++i) { - std::cout << "Decompiling " << MG_Util::ConvertGLEnumToString(programAttrib.shaderTypes[i]) << std::endl; + std::cout << "Decompiling " << MG_Util::ConvertGLEnumToString(binaryAttrib.shaderTypes[i]) << std::endl; auto src = ShaderCompiler::DecompileShader(sessions[i]); if (!src) { ASSERT_NE(src.error().errc, 0); @@ -245,7 +245,7 @@ TEST_F(ProgramUtilTest, CompileAndLinkProgram) { } ProgramAttrib programAttrib { - .shaderTypes = { GL_VERTEX_SHADER, GL_FRAGMENT_SHADER }, + // .shaderTypes = { GL_VERTEX_SHADER, GL_FRAGMENT_SHADER }, .shaders = { vs_res.value(), fs_res.value() } }; @@ -279,7 +279,7 @@ TEST_F(ProgramUtilTest, DecompProgram) { } ProgramAttrib programAttrib { - .shaderTypes = { GL_VERTEX_SHADER, GL_FRAGMENT_SHADER }, + // .shaderTypes = { GL_VERTEX_SHADER, GL_FRAGMENT_SHADER }, .shaders = { vs_res.value(), fs_res.value() } }; @@ -303,7 +303,7 @@ TEST_F(ProgramUtilTest, DecompProgram) { } for (SizeT i = 0; i < spirvs.size(); ++i) { - std::cout << "Decompiling " << MG_Util::ConvertGLEnumToString(programAttrib.shaderTypes[i]) << std::endl; + std::cout << "Decompiling " << MG_Util::ConvertGLEnumToString(binaryAttrib.shaderTypes[i]) << std::endl; auto src = ShaderCompiler::DecompileShader(sessions[i]); if (!src) { ASSERT_NE(src.error().errc, 0); diff --git a/MobileGL/MG_Util/ShaderTranspiler/Types.h b/MobileGL/MG_Util/ShaderTranspiler/Types.h index c4c90ef1..922fe59e 100644 --- a/MobileGL/MG_Util/ShaderTranspiler/Types.h +++ b/MobileGL/MG_Util/ShaderTranspiler/Types.h @@ -20,7 +20,7 @@ namespace MobileGL { }; struct ProgramAttrib { - Vector shaderTypes; + // Vector shaderTypes; Vector> shaders; };