swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-12 22:28:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Chore] (MG_State/Program): remove shaderTypes from ProgramAttrib

Browse Source
This commit is contained in:
swung0x48
2025-08-18 09:50:30 +08:00
parent f6a0042356
commit 2036caa4a0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MobileGL/MG_State/GLState/ProgramState/ProgramObject.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ namespace MobileGL {
} }
MG_Util::ShaderTranspiler::ProgramAttrib attrib{ MG_Util::ShaderTranspiler::ProgramAttrib attrib{
.shaderTypes = Move(shaderTypes), // .shaderTypes = Move(shaderTypes),
.shaders = Move(shaders), .shaders = Move(shaders),
}; };
MobileGL/MG_Test/Program/ProgramUtilTest.cpp
+5 -5
View File
@@ -133,7 +133,7 @@ TEST_F(ProgramUtilTest, CompileFragmentShaderWithDiscard) {
} }
ProgramAttrib programAttrib { ProgramAttrib programAttrib {
.shaderTypes = { GL_FRAGMENT_SHADER }, // .shaderTypes = { GL_FRAGMENT_SHADER },
.shaders = { res.value() } .shaders = { res.value() }
}; };
@@ -159,7 +159,7 @@ TEST_F(ProgramUtilTest, CompileFragmentShaderWithDiscard) {
} }
for (SizeT i = 0; i < spirvs.size(); ++i) { 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]); auto src = ShaderCompiler::DecompileShader(sessions[i]);
if (!src) { if (!src) {
ASSERT_NE(src.error().errc, 0); ASSERT_NE(src.error().errc, 0);
@@ -245,7 +245,7 @@ TEST_F(ProgramUtilTest, CompileAndLinkProgram) {
} }
ProgramAttrib programAttrib { ProgramAttrib programAttrib {
.shaderTypes = { GL_VERTEX_SHADER, GL_FRAGMENT_SHADER }, // .shaderTypes = { GL_VERTEX_SHADER, GL_FRAGMENT_SHADER },
.shaders = { vs_res.value(), fs_res.value() } .shaders = { vs_res.value(), fs_res.value() }
}; };
@@ -279,7 +279,7 @@ TEST_F(ProgramUtilTest, DecompProgram) {
} }
ProgramAttrib programAttrib { ProgramAttrib programAttrib {
.shaderTypes = { GL_VERTEX_SHADER, GL_FRAGMENT_SHADER }, // .shaderTypes = { GL_VERTEX_SHADER, GL_FRAGMENT_SHADER },
.shaders = { vs_res.value(), fs_res.value() } .shaders = { vs_res.value(), fs_res.value() }
}; };
@@ -303,7 +303,7 @@ TEST_F(ProgramUtilTest, DecompProgram) {
} }
for (SizeT i = 0; i < spirvs.size(); ++i) { 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]); auto src = ShaderCompiler::DecompileShader(sessions[i]);
if (!src) { if (!src) {
ASSERT_NE(src.error().errc, 0); ASSERT_NE(src.error().errc, 0);
MobileGL/MG_Util/ShaderTranspiler/Types.h
+1 -1
View File
@@ -20,7 +20,7 @@ namespace MobileGL {
}; };
struct ProgramAttrib { struct ProgramAttrib {
Vector<GLenum> shaderTypes; // Vector<GLenum> shaderTypes;
Vector<SharedPtr<glslang::TShader>> shaders; Vector<SharedPtr<glslang::TShader>> shaders;
}; };