From f2c5923f005a3e22ddc12a4bb700d838f470bb1d Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 15 Nov 2022 17:47:56 +0000 Subject: Shaders can be deleted once attached to a program --- gfx/gl/shader.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gfx/gl/shader.cpp') diff --git a/gfx/gl/shader.cpp b/gfx/gl/shader.cpp index 8b0f614..5f83b83 100644 --- a/gfx/gl/shader.cpp +++ b/gfx/gl/shader.cpp @@ -3,16 +3,15 @@ #include #include -Shader::operator GLuint() const +Shader::ShaderRef +Shader::compile() const { - if (!shader) { - shader.emplace(type); - glShaderSource(*shader, 1, &text, &len); - glCompileShader(*shader); + ShaderRef shader {type}; + glShaderSource(shader, 1, &text, &len); + glCompileShader(shader); - CheckShaderError(*shader, GL_COMPILE_STATUS, false, "Error compiling shader!"); - } - return *shader; + CheckShaderError(shader, GL_COMPILE_STATUS, false, "Error compiling shader!"); + return shader; } void -- cgit v1.2.3