summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-02-26 14:40:23 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-26 14:34:11 +0000
commitbbf86a751a4cc235ef0fb97bfde4af487ab9a40f (patch)
treee1d3a07ee223e71fdb843ef6888aa68d51db4eae /src
parent04601f27b25e36ffd7de7d307382fcae2250ba9f (diff)
Fix build with gcc 4.4
Change-Id: I30a9ce2955a5e0d80ca8f592fe6fb750f0efbb07 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/render/backend/states/blendstate.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/render/backend/states/blendstate.cpp b/src/render/backend/states/blendstate.cpp
index 44a7260e0..b9d9ab398 100644
--- a/src/render/backend/states/blendstate.cpp
+++ b/src/render/backend/states/blendstate.cpp
@@ -78,7 +78,7 @@ BlendState *BlendState::getOrCreate(GLenum src, GLenum dst)
}
BlendState::BlendState(GLenum src, GLenum dst) :
- GenericState2(src, dst)
+ GenericState2<BlendState, GLenum, GLenum>(src, dst)
{
}
@@ -93,7 +93,7 @@ BlendEquation *BlendEquation::getOrCreate(GLenum func)
}
BlendEquation::BlendEquation(GLenum func) :
- GenericState1(func)
+ GenericState1<BlendEquation, GLenum>(func)
{
}
@@ -110,7 +110,7 @@ AlphaFunc *AlphaFunc::getOrCreate(GLenum func, GLclampf value)
}
AlphaFunc::AlphaFunc(GLenum func, GLclampf value) :
- GenericState2(func, value)
+ GenericState2<AlphaFunc, GLenum, GLclampf>(func, value)
{
}
@@ -126,7 +126,7 @@ DepthTest *DepthTest::getOrCreate(GLenum func)
}
DepthTest::DepthTest(GLenum func) :
- GenericState1(func)
+ GenericState1<DepthTest, GLenum>(func)
{
}
@@ -141,7 +141,7 @@ CullFace *CullFace::getOrCreate(GLenum func)
}
CullFace::CullFace(GLenum func) :
- GenericState1(func)
+ GenericState1<CullFace, GLenum>(func)
{
}
@@ -156,7 +156,7 @@ FrontFace *FrontFace::getOrCreate(GLenum func)
}
FrontFace::FrontFace(GLenum func) :
- GenericState1(func)
+ GenericState1<FrontFace, GLenum>(func)
{
}
@@ -171,7 +171,7 @@ DepthMask *DepthMask::getOrCreate(GLboolean flag)
}
DepthMask::DepthMask(GLboolean flag) :
- GenericState1(flag)
+ GenericState1<DepthMask, GLboolean>(flag)
{
}
@@ -191,7 +191,7 @@ Dithering *Dithering::getOrCreate()
}
ScissorTest::ScissorTest(int left, int bottom, int width, int height)
- : GenericState4(left, bottom, width, height)
+ : GenericState4<ScissorTest, int, int, int, int>(left, bottom, width, height)
{
}
@@ -212,7 +212,7 @@ StencilTest *StencilTest::getOrCreate(uint mask, GLenum func, GLenum faceMode)
}
StencilTest::StencilTest(uint mask, GLenum func, GLenum faceMode)
- : GenericState3(mask, func, faceMode)
+ : GenericState3<StencilTest, uint, GLenum, GLenum>(mask, func, faceMode)
{
}
@@ -249,7 +249,7 @@ PolygonOffset *PolygonOffset::getOrCreate(GLfloat factor, GLfloat units)
}
PolygonOffset::PolygonOffset(GLfloat factor, GLfloat units)
- : GenericState2(factor, units)
+ : GenericState2<PolygonOffset, GLfloat, GLfloat>(factor, units)
{
}
@@ -259,7 +259,7 @@ void ColorMask::apply(QGraphicsContext *gc) const
}
ColorMask::ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
- : GenericState4(red, green, blue, alpha)
+ : GenericState4<ColorMask, GLboolean, GLboolean, GLboolean, GLboolean>(red, green, blue, alpha)
{
}