Skip to content

Commit

Permalink
libgui|GLTexture: Added texture comparison property
Browse files Browse the repository at this point in the history
  • Loading branch information
@skyjake
skyjake committed Sep 1, 2019
1 parent 2e1291d commit a38390d
Show file tree
Hide file tree
Showing 3 changed files with 186 additions and 166 deletions.
6 changes: 6 additions & 0 deletions doomsday/libs/gui/include/de/graphics/gltexture.h
View file
Expand Up @@ -27,6 +27,7 @@
#include "opengl.h"
#include "../Image"
#include "../GLPixelFormat"
#include "../GLState"

namespace de {

Expand Down Expand Up @@ -54,6 +55,10 @@ namespace gl {
PositiveZ,
NegativeZ,
};
enum ComparisonMode {
CompareNone,
CompareRefToTexture,
};
}

/**
Expand Down Expand Up @@ -116,6 +121,7 @@ class LIBGUI_PUBLIC GLTexture : public Asset
void setMaxAnisotropy(dfloat maxAnisotropy);
void setMaxLevel(dfloat maxLevel);
void setBorderColor(const Vec4f &color);
void setComparisonMode(gl::ComparisonMode mode, gl::Comparison func = gl::Always);

gl::Filter minFilter() const;
gl::Filter magFilter() const;
Expand Down
257 changes: 129 additions & 128 deletions doomsday/libs/gui/src/graphics/glstate.cpp
View file
Expand Up @@ -34,128 +34,145 @@ namespace de {
extern int GLDrawQueue_queuedElems;
#endif

namespace internal
{
enum Property {
CullFace,
DepthTest,
DepthFunc,
DepthWrite,
AlphaTest,
AlphaLimit,
Blend,
BlendFuncSrc,
BlendFuncDest,
BlendOp,
ColorMask,
StencilTest,
StencilFrontMask,
StencilFrontOp,
StencilFrontFunc,
StencilBackMask,
StencilBackOp,
StencilBackFunc,
Scissor,
ScissorX,
ScissorY,
ScissorWidth,
ScissorHeight,
ViewportX,
ViewportY,
ViewportWidth,
ViewportHeight,
MAX_PROPERTIES
};

static BitField::Spec const propSpecs[MAX_PROPERTIES] = {
{ CullFace, 2 },
{ DepthTest, 1 },
{ DepthFunc, 3 },
{ DepthWrite, 1 },
{ AlphaTest, 1 },
{ AlphaLimit, 8 },
{ Blend, 1 },
{ BlendFuncSrc, 4 },
{ BlendFuncDest, 4 },
{ BlendOp, 2 },
{ ColorMask, 4 },
{ StencilTest, 1 },
{ StencilFrontMask, 8 },
{ StencilBackMask, 8 },
{ StencilFrontOp, 9 },
{ StencilBackOp, 9 },
{ StencilFrontFunc, 19 },
{ StencilBackFunc, 19 },
{ Scissor, 1 },
{ ScissorX, 13 }, // 13 bits == 8192 max
{ ScissorY, 13 },
{ ScissorWidth, 13 },
{ ScissorHeight, 13 },
{ ViewportX, 13 },
{ ViewportY, 13 },
{ ViewportWidth, 13 },
{ ViewportHeight, 13 }
};
static BitField::Elements const glStateProperties(propSpecs, MAX_PROPERTIES);
namespace internal {

/// The GL state stack.
struct GLStateStack : public QList<GLState *> {
GLStateStack()
{
// Initialize with a default state.
append(new GLState);
}
~GLStateStack() { qDeleteAll(*this); }
};
static GLStateStack stack;
GLenum glComp(gl::Comparison comp)
{
switch (comp)
{
case gl::Never: return GL_NEVER;
case gl::Always: return GL_ALWAYS;
case gl::Equal: return GL_EQUAL;
case gl::NotEqual: return GL_NOTEQUAL;
case gl::Less: return GL_LESS;
case gl::Greater: return GL_GREATER;
case gl::LessOrEqual: return GL_LEQUAL;
case gl::GreaterOrEqual: return GL_GEQUAL;
}
return GL_NEVER;
}

enum Property {
CullFace,
DepthTest,
DepthFunc,
DepthWrite,
AlphaTest,
AlphaLimit,
Blend,
BlendFuncSrc,
BlendFuncDest,
BlendOp,
ColorMask,
StencilTest,
StencilFrontMask,
StencilFrontOp,
StencilFrontFunc,
StencilBackMask,
StencilBackOp,
StencilBackFunc,
Scissor,
ScissorX,
ScissorY,
ScissorWidth,
ScissorHeight,
ViewportX,
ViewportY,
ViewportWidth,
ViewportHeight,
MAX_PROPERTIES
};

/// Currently applied GL state properties.
static BitField currentProps;
static BitField::Spec const propSpecs[MAX_PROPERTIES] = {
{ CullFace, 2 },
{ DepthTest, 1 },
{ DepthFunc, 3 },
{ DepthWrite, 1 },
{ AlphaTest, 1 },
{ AlphaLimit, 8 },
{ Blend, 1 },
{ BlendFuncSrc, 4 },
{ BlendFuncDest, 4 },
{ BlendOp, 2 },
{ ColorMask, 4 },
{ StencilTest, 1 },
{ StencilFrontMask, 8 },
{ StencilBackMask, 8 },
{ StencilFrontOp, 9 },
{ StencilBackOp, 9 },
{ StencilFrontFunc, 19 },
{ StencilBackFunc, 19 },
{ Scissor, 1 },
{ ScissorX, 13 }, // 13 bits == 8192 max
{ ScissorY, 13 },
{ ScissorWidth, 13 },
{ ScissorHeight, 13 },
{ ViewportX, 13 },
{ ViewportY, 13 },
{ ViewportWidth, 13 },
{ ViewportHeight, 13 }
};
static BitField::Elements const glStateProperties(propSpecs, MAX_PROPERTIES);

/// Observes the current target and clears the pointer if it happens to get
/// deleted.
class CurrentTarget : DENG2_OBSERVES(Asset, Deletion)
/// The GL state stack.
struct GLStateStack : public QList<GLState *> {
GLStateStack()
{
GLFramebuffer *_target;
// Initialize with a default state.
append(new GLState);
}
~GLStateStack() { qDeleteAll(*this); }
};
static GLStateStack stack;

void assetBeingDeleted(Asset &asset)
/// Currently applied GL state properties.
static BitField currentProps;

/// Observes the current target and clears the pointer if it happens to get
/// deleted.
class CurrentTarget : DENG2_OBSERVES(Asset, Deletion)
{
GLFramebuffer *_target;

void assetBeingDeleted(Asset &asset)
{
if (&asset == _target)
{
if (&asset == _target)
{
LOG_AS("GLState");
LOGDEV_GL_NOTE("Current target destroyed, clearing pointer");
_target = 0;
}
LOG_AS("GLState");
LOGDEV_GL_NOTE("Current target destroyed, clearing pointer");
_target = 0;
}
}

public:
CurrentTarget()
: _target(0)
{}
~CurrentTarget() { set(0); }
void set(GLFramebuffer *trg)
public:
CurrentTarget()
: _target(0)
{}
~CurrentTarget() { set(0); }
void set(GLFramebuffer *trg)
{
if (_target)
{
if (_target)
{
_target->audienceForDeletion() -= this;
}
_target = trg;
if (_target)
{
_target->audienceForDeletion() += this;
}
_target->audienceForDeletion() -= this;
}
GLFramebuffer *get() const { return _target; }
CurrentTarget &operator=(GLFramebuffer *trg)
_target = trg;
if (_target)
{
set(trg);
return *this;
_target->audienceForDeletion() += this;
}
bool operator!=(GLFramebuffer *trg) const { return _target != trg; }
operator GLFramebuffer *() const { return _target; }
};
static CurrentTarget currentTarget;
}
}
GLFramebuffer *get() const { return _target; }
CurrentTarget &operator=(GLFramebuffer *trg)
{
set(trg);
return *this;
}
bool operator!=(GLFramebuffer *trg) const { return _target != trg; }
operator GLFramebuffer *() const { return _target; }
};
static CurrentTarget currentTarget;

} // namespace internal

DENG2_PIMPL(GLState)
{
Expand Down Expand Up @@ -186,22 +203,6 @@ DENG2_PIMPL(GLState)
return GL_NONE;
}

static GLenum glComp(gl::Comparison comp)
{
switch (comp)
{
case gl::Never: return GL_NEVER;
case gl::Always: return GL_ALWAYS;
case gl::Equal: return GL_EQUAL;
case gl::NotEqual: return GL_NOTEQUAL;
case gl::Less: return GL_LESS;
case gl::Greater: return GL_GREATER;
case gl::LessOrEqual: return GL_LEQUAL;
case gl::GreaterOrEqual: return GL_GEQUAL;
}
return GL_NEVER;
}

static GLenum glStencilOp(gl::StencilOp op)
{
switch (op)
Expand Down Expand Up @@ -282,7 +283,7 @@ DENG2_PIMPL(GLState)
break;

case internal::DepthFunc:
GL.glDepthFunc(glComp(self().depthFunc()));
GL.glDepthFunc(internal::glComp(self().depthFunc()));
break;

case internal::DepthWrite:
Expand Down Expand Up @@ -368,7 +369,7 @@ DENG2_PIMPL(GLState)
{
const gl::Face face = (prop == internal::StencilFrontFunc? gl::Front : gl::Back);
const auto stf = self().stencilFunc(face);
GL.glStencilFuncSeparate(glFace(face), glComp(stf.func), stf.ref, stf.mask);
GL.glStencilFuncSeparate(glFace(face), internal::glComp(stf.func), stf.ref, stf.mask);
break;
}

Expand Down

0 comments on commit a38390d

Please sign in to comment.