LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 02:58:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate some internal graphics state definitions into a new renderstate file.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2019-12-26 23:07:51 -05:00
parent f3b52f66fe
commit efa2bd7837
16 changed files with 577 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Canvas.cpp
+1 -1
View File
@@ -407,7 +407,7 @@ void Canvas::setDepthSampleMode(Optional<CompareMode> mode)
gl.bindTextureToUnit(texType, texture, 0, false);
GLenum gltextype = OpenGL::getGLTextureType(texType);
// See the comment in depthstencil.h
// See the comment in renderstate.h
GLenum glmode = OpenGL::getGLCompareMode(getReversedCompareMode(mode.value));
glTexParameteri(gltextype, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
src/modules/graphics/opengl/Graphics.cpp
+44 -47
View File
@@ -54,6 +54,40 @@ namespace graphics
namespace opengl
{
static GLenum getGLBlendOperation(BlendOperation op)
{
switch (op)
{
case BLENDOP_ADD: return GL_FUNC_ADD;
case BLENDOP_SUBTRACT: return GL_FUNC_SUBTRACT;
case BLENDOP_REVERSE_SUBTRACT: return GL_FUNC_REVERSE_SUBTRACT;
case BLENDOP_MIN: return GL_MIN;
case BLENDOP_MAX: return GL_MAX;
case BLENDOP_MAX_ENUM: return 0;
}
return 0;
}
static GLenum getGLBlendFactor(BlendFactor factor)
{
switch (factor)
{
case BLENDFACTOR_ZERO: return GL_ZERO;
case BLENDFACTOR_ONE: return GL_ONE;
case BLENDFACTOR_SRC_COLOR: return GL_SRC_COLOR;
case BLENDFACTOR_ONE_MINUS_SRC_COLOR: return GL_ONE_MINUS_SRC_COLOR;
case BLENDFACTOR_SRC_ALPHA: return GL_SRC_ALPHA;
case BLENDFACTOR_ONE_MINUS_SRC_ALPHA: return GL_ONE_MINUS_SRC_ALPHA;
case BLENDFACTOR_DST_COLOR: return GL_DST_COLOR;
case BLENDFACTOR_ONE_MINUS_DST_COLOR: return GL_ONE_MINUS_DST_COLOR;
case BLENDFACTOR_DST_ALPHA: return GL_DST_ALPHA;
case BLENDFACTOR_ONE_MINUS_DST_ALPHA: return GL_ONE_MINUS_DST_ALPHA;
case BLENDFACTOR_SRC_ALPHA_SATURATED: return GL_SRC_ALPHA_SATURATE;
case BLENDFACTOR_MAX_ENUM: return 0;
}
return 0;
}
Graphics::Graphics()
: windowHasStencil(false)
, mainVAO(0)
@@ -1226,7 +1260,7 @@ void Graphics::setColor(Colorf c)
states.back().color = c;
}
void Graphics::setColorMask(ColorMask mask)
void Graphics::setColorMask(ColorChannelMask mask)
{
flushStreamDraws();
@@ -1253,7 +1287,7 @@ void Graphics::setBlendMode(BlendMode mode, BlendAlpha alphamode)
case BLEND_LIGHTEN:
case BLEND_DARKEN:
case BLEND_MULTIPLY:
getConstant(mode, modestr);
love::graphics::getConstant(mode, modestr);
throw love::Exception("The '%s' blend mode must be used with premultiplied alpha.", modestr);
break;
default:
@@ -1261,52 +1295,15 @@ void Graphics::setBlendMode(BlendMode mode, BlendAlpha alphamode)
}
}
GLenum func = GL_FUNC_ADD;
GLenum srcRGB = GL_ONE;
GLenum srcA = GL_ONE;
GLenum dstRGB = GL_ZERO;
GLenum dstA = GL_ZERO;
BlendState state = getBlendState(mode, alphamode);
GLenum opRGB = getGLBlendOperation(state.operationRGB);
GLenum opA = getGLBlendOperation(state.operationA);
GLenum srcRGB = getGLBlendFactor(state.srcFactorRGB);
GLenum srcA = getGLBlendFactor(state.srcFactorA);
GLenum dstRGB = getGLBlendFactor(state.dstFactorRGB);
GLenum dstA = getGLBlendFactor(state.dstFactorA);
switch (mode)
{
case BLEND_ALPHA:
srcRGB = srcA = GL_ONE;
dstRGB = dstA = GL_ONE_MINUS_SRC_ALPHA;
break;
case BLEND_MULTIPLY:
srcRGB = srcA = GL_DST_COLOR;
dstRGB = dstA = GL_ZERO;
break;
case BLEND_SUBTRACT:
func = GL_FUNC_REVERSE_SUBTRACT;
case BLEND_ADD:
srcRGB = GL_ONE;
srcA = GL_ZERO;
dstRGB = dstA = GL_ONE;
break;
case BLEND_LIGHTEN:
func = GL_MAX;
break;
case BLEND_DARKEN:
func = GL_MIN;
break;
case BLEND_SCREEN:
srcRGB = srcA = GL_ONE;
dstRGB = dstA = GL_ONE_MINUS_SRC_COLOR;
break;
case BLEND_REPLACE:
case BLEND_NONE:
default:
srcRGB = srcA = GL_ONE;
dstRGB = dstA = GL_ZERO;
break;
}
// We can only do alpha-multiplication when srcRGB would have been unmodified.
if (srcRGB == GL_ONE && alphamode == BLENDALPHA_MULTIPLY && mode != BLEND_NONE)
srcRGB = GL_SRC_ALPHA;
glBlendEquation(func);
glBlendEquationSeparate(opRGB, opA);
glBlendFuncSeparate(srcRGB, dstRGB, srcA, dstA);
states.back().blendMode = mode;
src/modules/graphics/opengl/Graphics.h
+1 -1
View File
@@ -96,7 +96,7 @@ public:
void setFrontFaceWinding(vertex::Winding winding) override;
void setColorMask(ColorMask mask) override;
void setColorMask(ColorChannelMask mask) override;
void setBlendMode(BlendMode mode, BlendAlpha alphamode) override;
src/modules/graphics/opengl/OpenGL.h
+1 -1
View File
@@ -28,7 +28,7 @@
#include "common/Color.h"
#include "graphics/Texture.h"
#include "graphics/vertex.h"
#include "graphics/depthstencil.h"
#include "graphics/renderstate.h"
#include "common/Matrix.h"
// GLAD