Skip to content

Simplify shader creation functions #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 24, 2024
Merged

Simplify shader creation functions #351

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
169 changes: 70 additions & 99 deletions src/CSFML/Graphics/Shader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,41 +37,28 @@ sfShader* sfShader_createFromFile(const char* vertexShaderFilename,
const char* geometryShaderFilename,
const char* fragmentShaderFilename)
{
// At least one shader must be provided
if (!(vertexShaderFilename || geometryShaderFilename || fragmentShaderFilename))
return nullptr;

bool success = false;
auto shader = std::make_unique<sfShader>();
if (vertexShaderFilename || geometryShaderFilename || fragmentShaderFilename)

if (!geometryShaderFilename)
{
if (!geometryShaderFilename)
{
if (!vertexShaderFilename)
{
// fragment shader only
success = shader->loadFromFile(fragmentShaderFilename, sf::Shader::Type::Fragment);
}
else if (!fragmentShaderFilename)
{
// vertex shader only
success = shader->loadFromFile(vertexShaderFilename, sf::Shader::Type::Vertex);
}
else
{
// vertex + fragment shaders
success = shader->loadFromFile(vertexShaderFilename, fragmentShaderFilename);
}
}
else
{
if (!vertexShaderFilename && !fragmentShaderFilename)
{
// geometry shader only
success = shader->loadFromFile(geometryShaderFilename, sf::Shader::Type::Geometry);
}
else
{
// vertex + geometry + fragment shaders
success = shader->loadFromFile(vertexShaderFilename, geometryShaderFilename, fragmentShaderFilename);
}
}
if (!vertexShaderFilename) // fragment shader only
success = shader->loadFromFile(fragmentShaderFilename, sf::Shader::Type::Fragment);
else if (!fragmentShaderFilename) // vertex shader only
success = shader->loadFromFile(vertexShaderFilename, sf::Shader::Type::Vertex);
else // vertex + fragment shaders
success = shader->loadFromFile(vertexShaderFilename, fragmentShaderFilename);
}
else
{
if (!vertexShaderFilename && !fragmentShaderFilename) // geometry shader only
success = shader->loadFromFile(geometryShaderFilename, sf::Shader::Type::Geometry);
else // vertex + geometry + fragment shaders
success = shader->loadFromFile(vertexShaderFilename, geometryShaderFilename, fragmentShaderFilename);
}

if (!success)
Expand All @@ -84,41 +71,28 @@ sfShader* sfShader_createFromFile(const char* vertexShaderFilename,
////////////////////////////////////////////////////////////
sfShader* sfShader_createFromMemory(const char* vertexShader, const char* geometryShader, const char* fragmentShader)
{
// At least one shader must be provided
if (!(vertexShader || geometryShader || fragmentShader))
return nullptr;

bool success = false;
auto shader = std::make_unique<sfShader>();
if (vertexShader || geometryShader || fragmentShader)

if (!geometryShader)
{
if (!geometryShader)
{
if (!vertexShader)
{
// fragment shader only
success = shader->loadFromMemory(fragmentShader, sf::Shader::Type::Fragment);
}
else if (!fragmentShader)
{
// vertex shader only
success = shader->loadFromMemory(vertexShader, sf::Shader::Type::Vertex);
}
else
{
// vertex + fragment shaders
success = shader->loadFromMemory(vertexShader, fragmentShader);
}
}
else
{
if (!vertexShader && !fragmentShader)
{
// geometry shader only
success = shader->loadFromMemory(geometryShader, sf::Shader::Type::Geometry);
}
else
{
// vertex + geometry + fragment shaders
success = shader->loadFromMemory(vertexShader, geometryShader, fragmentShader);
}
}
if (!vertexShader) // fragment shader only
success = shader->loadFromMemory(fragmentShader, sf::Shader::Type::Fragment);
else if (!fragmentShader) // vertex shader only
success = shader->loadFromMemory(vertexShader, sf::Shader::Type::Vertex);
else // vertex + fragment shaders
success = shader->loadFromMemory(vertexShader, fragmentShader);
}
else
{
if (!vertexShader && !fragmentShader) // geometry shader only
success = shader->loadFromMemory(geometryShader, sf::Shader::Type::Geometry);
else // vertex + geometry + fragment shaders
success = shader->loadFromMemory(vertexShader, geometryShader, fragmentShader);
}

if (!success)
Expand All @@ -133,47 +107,44 @@ sfShader* sfShader_createFromStream(sfInputStream* vertexShaderStream,
sfInputStream* geometryShaderStream,
sfInputStream* fragmentShaderStream)
{
// At least one shader must be provided
if (!(vertexShaderStream || geometryShaderStream || fragmentShaderStream))
return nullptr;

bool success = false;
auto shader = std::make_unique<sfShader>();
if (vertexShaderStream || geometryShaderStream || fragmentShaderStream)

if (!geometryShaderStream)
{
if (!vertexShaderStream) // fragment shader only
{
CallbackStream stream(fragmentShaderStream);
success = shader->loadFromStream(stream, sf::Shader::Type::Fragment);
}
else if (!fragmentShaderStream) // vertex shader only
{
CallbackStream stream(vertexShaderStream);
success = shader->loadFromStream(stream, sf::Shader::Type::Vertex);
}
else // vertex + fragment shaders
{
CallbackStream vertexStream(vertexShaderStream);
CallbackStream fragmentStream(fragmentShaderStream);
success = shader->loadFromStream(vertexStream, fragmentStream);
}
}
else
{
if (!geometryShaderStream)
CallbackStream geometryStream(geometryShaderStream);
if (!vertexShaderStream && !fragmentShaderStream) // geometry shader only
{
if (!vertexShaderStream)
{
// fragment shader only
CallbackStream stream(fragmentShaderStream);
success = shader->loadFromStream(stream, sf::Shader::Type::Fragment);
}
else if (!fragmentShaderStream)
{
// vertex shader only
CallbackStream stream(vertexShaderStream);
success = shader->loadFromStream(stream, sf::Shader::Type::Vertex);
}
else
{
// vertex + fragment shaders
CallbackStream vertexStream(vertexShaderStream);
CallbackStream fragmentStream(fragmentShaderStream);
success = shader->loadFromStream(vertexStream, fragmentStream);
}
success = shader->loadFromStream(geometryStream, sf::Shader::Type::Geometry);
}
else
else // vertex + geometry + fragment shaders
{
CallbackStream geometryStream(geometryShaderStream);
if (!vertexShaderStream && !fragmentShaderStream)
{
// geometry shader only
success = shader->loadFromStream(geometryStream, sf::Shader::Type::Geometry);
}
else
{
// vertex + geometry + fragment shaders
CallbackStream vertexStream(vertexShaderStream);
CallbackStream fragmentStream(fragmentShaderStream);
success = shader->loadFromStream(vertexStream, geometryStream, fragmentStream);
}
CallbackStream vertexStream(vertexShaderStream);
CallbackStream fragmentStream(fragmentShaderStream);
success = shader->loadFromStream(vertexStream, geometryStream, fragmentStream);
}
}

Expand Down