diff options
| author | chai <chaifix@163.com> | 2021-10-29 13:36:49 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2021-10-29 13:36:49 +0800 |
| commit | 91c32cb173201ac8803a1e4452e8342969b8e484 (patch) | |
| tree | 5e78c485b5fcfcf839a2348667597d7e10476214 /Runtime/Graphics/Shader.cpp | |
| parent | 1f92d4c389cceba6f90261d9cb29885c8a3ca24c (diff) | |
*GLSL test
Diffstat (limited to 'Runtime/Graphics/Shader.cpp')
| -rw-r--r-- | Runtime/Graphics/Shader.cpp | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/Runtime/Graphics/Shader.cpp b/Runtime/Graphics/Shader.cpp index bf7faf6..2c3d686 100644 --- a/Runtime/Graphics/Shader.cpp +++ b/Runtime/Graphics/Shader.cpp @@ -35,15 +35,13 @@ void checkCompileshaderErrorors(GLuint shader, std::string type) } } -Shader::Shader(LuaBind::VM*vm, bool keepSrc) +Shader::Shader(LuaBind::VM*vm) : NativeClass<Shader>(vm) - , m_KeepSrc(keepSrc) { } -Shader::Shader(LuaBind::VM*vm, std::string& glslShader, bool keepSrc) +Shader::Shader(LuaBind::VM*vm, std::string& glslShader) : NativeClass<Shader>(vm) - , m_KeepSrc(keepSrc) { // stl的string会在大小超过阈值的情况下在栈里分配，并用RAII保证释放 std::string vsh ; @@ -56,14 +54,13 @@ Shader::Shader(LuaBind::VM*vm, std::string& glslShader, bool keepSrc) { throw ShaderCompileExecption(e.what()); } - CompileProgram(vsh.c_str(), fsh.c_str(), keepSrc); + CompileProgram(vsh.c_str(), fsh.c_str()); } -Shader::Shader(LuaBind::VM* vm, const char* vert, const char* frag, bool keepSrc) +Shader::Shader(LuaBind::VM* vm, const char* vert, const char* frag) : NativeClass<Shader>(vm) - , m_KeepSrc(keepSrc) { - CompileProgram(vert, frag, keepSrc); + CompileProgram(vert, frag); } void Shader::CompileProgram(const char* vert, const char* frag, bool keepSrc) @@ -86,12 +83,6 @@ void Shader::CompileProgram(const char* vert, const char* frag, bool keepSrc) glAttachShader(m_ProgramID, m_FragID); glLinkProgram(m_ProgramID); checkCompileshaderErrorors(m_FragID, "PROGRAM"); - // keep src? - if (keepSrc) - { - m_VertSrc = vert; - m_FragSrc = frag; - } } Shader::~Shader() @@ -118,12 +109,6 @@ void Shader::ReCompile(std::string& vert, std::string frag) glAttachShader(m_ProgramID, m_FragID); glLinkProgram(m_ProgramID); checkCompileshaderErrorors(m_FragID, "PROGRAM"); - // - if (m_KeepSrc) - { - m_VertSrc = vert; - m_FragSrc = frag; - } } void Shader::ReCompileVert(std::string& vert) @@ -139,11 +124,6 @@ void Shader::ReCompileVert(std::string& vert) glAttachShader(m_ProgramID, m_FragID); glLinkProgram(m_ProgramID); checkCompileshaderErrorors(m_FragID, "PROGRAM"); - // - if (m_KeepSrc) - { - m_VertSrc = vert; - } } void Shader::ReCompileFrag(std::string frag) @@ -159,11 +139,6 @@ void Shader::ReCompileFrag(std::string frag) glAttachShader(m_ProgramID, m_FragID); glLinkProgram(m_ProgramID); checkCompileshaderErrorors(m_FragID, "PROGRAM"); - // - if (m_KeepSrc) - { - m_FragSrc = frag; - } } bool Shader::IsValid() |