mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-12-01 07:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

DRY shader creation via helper lambda

Browse Source
This commit is contained in:
vittorioromeo 2024-09-26 12:01:19 +02:00 committed by Chris Thrasher
parent a9c56da99e
commit 7cec342b2b
1 changed files with 23 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/SFML/Graphics/Shader.cpp
View File

@ -868,89 +868,50 @@ bool Shader::compile(std::string_view vertexShaderCode, std::string_view geometr
// Create the program // Create the program
const GLEXT_GLhandle shaderProgram = glCheck(GLEXT_glCreateProgramObject()); const GLEXT_GLhandle shaderProgram = glCheck(GLEXT_glCreateProgramObject());
// Create the vertex shader if needed // Helper function for shader creation
if (!vertexShaderCode.empty()) const auto createAndAttachShader =
[shaderProgram](GLenum shaderType, const char* shaderTypeStr, std::string_view shaderCode)
{ {
// Create and compile the shader // Create and compile the shader
const GLEXT_GLhandle vertexShader = glCheck(GLEXT_glCreateShaderObject(GLEXT_GL_VERTEX_SHADER)); const GLEXT_GLhandle shader = glCheck(GLEXT_glCreateShaderObject(shaderType));
const GLcharARB* sourceCode = vertexShaderCode.data(); const GLcharARB* sourceCode = shaderCode.data();
const auto sourceCodeLength = static_cast<GLint>(vertexShaderCode.length()); const auto sourceCodeLength = static_cast<GLint>(shaderCode.length());
glCheck(GLEXT_glShaderSource(vertexShader, 1, &sourceCode, &sourceCodeLength)); glCheck(GLEXT_glShaderSource(shader, 1, &sourceCode, &sourceCodeLength));
glCheck(GLEXT_glCompileShader(vertexShader)); glCheck(GLEXT_glCompileShader(shader));
// Check the compile log // Check the compile log
GLint success = 0; GLint success = 0;
glCheck(GLEXT_glGetObjectParameteriv(vertexShader, GLEXT_GL_OBJECT_COMPILE_STATUS, &success)); glCheck(GLEXT_glGetObjectParameteriv(shader, GLEXT_GL_OBJECT_COMPILE_STATUS, &success));
if (success == GL_FALSE) if (success == GL_FALSE)
{ {
std::array<char, 1024> log{}; std::array<char, 1024> log{};
glCheck(GLEXT_glGetInfoLog(vertexShader, sizeof(log), nullptr, log.data())); glCheck(GLEXT_glGetInfoLog(shader, sizeof(log), nullptr, log.data()));
err() << "Failed to compile vertex shader:" << '\n' << log.data() << std::endl; err() << "Failed to compile " << shaderTypeStr << " shader:" << '\n' << log.data() << std::endl;
glCheck(GLEXT_glDeleteObject(vertexShader)); glCheck(GLEXT_glDeleteObject(shader));
glCheck(GLEXT_glDeleteObject(shaderProgram)); glCheck(GLEXT_glDeleteObject(shaderProgram));
return false; return false;
} }
// Attach the shader to the program, and delete it (not needed anymore) // Attach the shader to the program, and delete it (not needed anymore)
glCheck(GLEXT_glAttachObject(shaderProgram, vertexShader)); glCheck(GLEXT_glAttachObject(shaderProgram, shader));
glCheck(GLEXT_glDeleteObject(vertexShader)); glCheck(GLEXT_glDeleteObject(shader));
} return true;
};
// Create the vertex shader if needed
if (!vertexShaderCode.empty())
if (!createAndAttachShader(GLEXT_GL_VERTEX_SHADER, "vertex", vertexShaderCode))
return false;
// Create the geometry shader if needed // Create the geometry shader if needed
if (!geometryShaderCode.empty()) if (!geometryShaderCode.empty())
{ if (!createAndAttachShader(GLEXT_GL_GEOMETRY_SHADER, "geometry", geometryShaderCode))
// Create and compile the shader
const GLEXT_GLhandle geometryShader = GLEXT_glCreateShaderObject(GLEXT_GL_GEOMETRY_SHADER);
const GLcharARB* sourceCode = geometryShaderCode.data();
const auto sourceCodeLength = static_cast<GLint>(geometryShaderCode.length());
glCheck(GLEXT_glShaderSource(geometryShader, 1, &sourceCode, &sourceCodeLength));
glCheck(GLEXT_glCompileShader(geometryShader));
// Check the compile log
GLint success = 0;
glCheck(GLEXT_glGetObjectParameteriv(geometryShader, GLEXT_GL_OBJECT_COMPILE_STATUS, &success));
if (success == GL_FALSE)
{
std::array<char, 1024> log{};
glCheck(GLEXT_glGetInfoLog(geometryShader, sizeof(log), nullptr, log.data()));
err() << "Failed to compile geometry shader:" << '\n' << log.data() << std::endl;
glCheck(GLEXT_glDeleteObject(geometryShader));
glCheck(GLEXT_glDeleteObject(shaderProgram));
return false; return false;
}
// Attach the shader to the program, and delete it (not needed anymore)
glCheck(GLEXT_glAttachObject(shaderProgram, geometryShader));
glCheck(GLEXT_glDeleteObject(geometryShader));
}
// Create the fragment shader if needed // Create the fragment shader if needed
if (!fragmentShaderCode.empty()) if (!fragmentShaderCode.empty())
{ if (!createAndAttachShader(GLEXT_GL_FRAGMENT_SHADER, "fragment", fragmentShaderCode))
// Create and compile the shader
const GLEXT_GLhandle fragmentShader = glCheck(GLEXT_glCreateShaderObject(GLEXT_GL_FRAGMENT_SHADER));
const GLcharARB* sourceCode = fragmentShaderCode.data();
const auto sourceCodeLength = static_cast<GLint>(fragmentShaderCode.length());
glCheck(GLEXT_glShaderSource(fragmentShader, 1, &sourceCode, &sourceCodeLength));
glCheck(GLEXT_glCompileShader(fragmentShader));
// Check the compile log
GLint success = 0;
glCheck(GLEXT_glGetObjectParameteriv(fragmentShader, GLEXT_GL_OBJECT_COMPILE_STATUS, &success));
if (success == GL_FALSE)
{
std::array<char, 1024> log{};
glCheck(GLEXT_glGetInfoLog(fragmentShader, sizeof(log), nullptr, log.data()));
err() << "Failed to compile fragment shader:" << '\n' << log.data() << std::endl;
glCheck(GLEXT_glDeleteObject(fragmentShader));
glCheck(GLEXT_glDeleteObject(shaderProgram));
return false; return false;
}
// Attach the shader to the program, and delete it (not needed anymore)
glCheck(GLEXT_glAttachObject(shaderProgram, fragmentShader));
glCheck(GLEXT_glDeleteObject(fragmentShader));
}
// Link the program // Link the program
glCheck(GLEXT_glLinkProgram(shaderProgram)); glCheck(GLEXT_glLinkProgram(shaderProgram));