summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWieland Hagen <wieland.hagen@kdab.com>2016-04-15 13:39:09 +0200
committerWieland Hagen <wieland.hagen@kdab.com>2016-04-15 14:59:02 +0000
commit72b886ddf80593a831207991c53fb508bfaa6f8e (patch)
tree359867c9ec064b46e6344cd672ccb44b3ee3d061
parentc8405e12903e621f0ba516a614d101fa8ed56f6d (diff)
GraphicsContext: remove cullFace()
is covered by OpenGL standard functions Change-Id: Ia7f32ec27c1725247a2c1f2bce4fba4433857932 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/render/graphicshelpers/graphicscontext.cpp5
-rw-r--r--src/render/graphicshelpers/graphicscontext_p.h1
-rw-r--r--src/render/graphicshelpers/graphicshelperes2.cpp6
-rw-r--r--src/render/graphicshelpers/graphicshelperes2_p.h1
-rw-r--r--src/render/graphicshelpers/graphicshelpergl2.cpp6
-rw-r--r--src/render/graphicshelpers/graphicshelpergl2_p.h1
-rw-r--r--src/render/graphicshelpers/graphicshelpergl3.cpp6
-rw-r--r--src/render/graphicshelpers/graphicshelpergl3_3.cpp6
-rw-r--r--src/render/graphicshelpers/graphicshelpergl3_3_p.h1
-rw-r--r--src/render/graphicshelpers/graphicshelpergl3_p.h1
-rw-r--r--src/render/graphicshelpers/graphicshelpergl4.cpp6
-rw-r--r--src/render/graphicshelpers/graphicshelpergl4_p.h1
-rw-r--r--src/render/graphicshelpers/graphicshelperinterface_p.h1
13 files changed, 0 insertions, 42 deletions
diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/graphicshelpers/graphicscontext.cpp
index 1600f24e6..80ca4d658 100644
--- a/src/render/graphicshelpers/graphicscontext.cpp
+++ b/src/render/graphicshelpers/graphicscontext.cpp
@@ -790,11 +790,6 @@ void GraphicsContext::depthMask(GLenum mode)
m_glHelper->depthMask(mode);
}
-void GraphicsContext::cullFace(GLenum mode)
-{
- m_glHelper->cullFace(mode);
-}
-
void GraphicsContext::frontFace(GLenum mode)
{
m_glHelper->frontFace(mode);
diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h
index d00292cb4..b21c94e20 100644
--- a/src/render/graphicshelpers/graphicscontext_p.h
+++ b/src/render/graphicshelpers/graphicscontext_p.h
@@ -189,7 +189,6 @@ public:
void clearColor(const QColor &color);
void clearDepthValue(float depth);
void clearStencilValue(int stencil);
- void cullFace(GLenum mode);
void depthMask(GLenum mode);
void depthTest(GLenum mode);
void disableClipPlane(int clipPlane);
diff --git a/src/render/graphicshelpers/graphicshelperes2.cpp b/src/render/graphicshelpers/graphicshelperes2.cpp
index cc8de52ed..5a9714b12 100644
--- a/src/render/graphicshelpers/graphicshelperes2.cpp
+++ b/src/render/graphicshelpers/graphicshelperes2.cpp
@@ -266,12 +266,6 @@ void GraphicsHelperES2::depthMask(GLenum mode)
m_funcs->glDepthMask(mode);
}
-void GraphicsHelperES2::cullFace(GLenum mode)
-{
- m_funcs->glEnable(GL_CULL_FACE);
- m_funcs->glCullFace(mode);
-}
-
void GraphicsHelperES2::frontFace(GLenum mode)
{
m_funcs->glFrontFace(mode);
diff --git a/src/render/graphicshelpers/graphicshelperes2_p.h b/src/render/graphicshelpers/graphicshelperes2_p.h
index f5273a25a..cf3e46a81 100644
--- a/src/render/graphicshelpers/graphicshelperes2_p.h
+++ b/src/render/graphicshelpers/graphicshelperes2_p.h
@@ -82,7 +82,6 @@ public:
void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
- void cullFace(GLenum mode) Q_DECL_OVERRIDE;
void depthMask(GLenum mode) Q_DECL_OVERRIDE;
void depthTest(GLenum mode) Q_DECL_OVERRIDE;
void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
diff --git a/src/render/graphicshelpers/graphicshelpergl2.cpp b/src/render/graphicshelpers/graphicshelpergl2.cpp
index 2a77982d9..a7d35a6ed 100644
--- a/src/render/graphicshelpers/graphicshelpergl2.cpp
+++ b/src/render/graphicshelpers/graphicshelpergl2.cpp
@@ -249,12 +249,6 @@ void GraphicsHelperGL2::depthMask(GLenum mode)
m_funcs->glDepthMask(mode);
}
-void GraphicsHelperGL2::cullFace(GLenum mode)
-{
- m_funcs->glEnable(GL_CULL_FACE);
- m_funcs->glCullFace(mode);
-}
-
void GraphicsHelperGL2::frontFace(GLenum mode)
{
m_funcs->glFrontFace(mode);
diff --git a/src/render/graphicshelpers/graphicshelpergl2_p.h b/src/render/graphicshelpers/graphicshelpergl2_p.h
index a928f3be7..01f1399de 100644
--- a/src/render/graphicshelpers/graphicshelpergl2_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl2_p.h
@@ -84,7 +84,6 @@ public:
void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
- void cullFace(GLenum mode) Q_DECL_OVERRIDE;
void depthMask(GLenum mode) Q_DECL_OVERRIDE;
void depthTest(GLenum mode) Q_DECL_OVERRIDE;
void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
diff --git a/src/render/graphicshelpers/graphicshelpergl3.cpp b/src/render/graphicshelpers/graphicshelpergl3.cpp
index 2b44bc3da..ad8db389e 100644
--- a/src/render/graphicshelpers/graphicshelpergl3.cpp
+++ b/src/render/graphicshelpers/graphicshelpergl3.cpp
@@ -296,12 +296,6 @@ void GraphicsHelperGL3::depthMask(GLenum mode)
m_funcs->glDepthMask(mode);
}
-void GraphicsHelperGL3::cullFace(GLenum mode)
-{
- m_funcs->glEnable(GL_CULL_FACE);
- m_funcs->glCullFace(mode);
-}
-
void GraphicsHelperGL3::frontFace(GLenum mode)
{
m_funcs->glFrontFace(mode);
diff --git a/src/render/graphicshelpers/graphicshelpergl3_3.cpp b/src/render/graphicshelpers/graphicshelpergl3_3.cpp
index 70c7cf53e..5d45501cc 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_3.cpp
+++ b/src/render/graphicshelpers/graphicshelpergl3_3.cpp
@@ -293,12 +293,6 @@ void GraphicsHelperGL3_3::depthMask(GLenum mode)
m_funcs->glDepthMask(mode);
}
-void GraphicsHelperGL3_3::cullFace(GLenum mode)
-{
- m_funcs->glEnable(GL_CULL_FACE);
- m_funcs->glCullFace(mode);
-}
-
void GraphicsHelperGL3_3::frontFace(GLenum mode)
{
m_funcs->glFrontFace(mode);
diff --git a/src/render/graphicshelpers/graphicshelpergl3_3_p.h b/src/render/graphicshelpers/graphicshelpergl3_3_p.h
index d84a9ed72..f90e92d73 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_3_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl3_3_p.h
@@ -85,7 +85,6 @@ public:
void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
- void cullFace(GLenum mode) Q_DECL_OVERRIDE;
void depthMask(GLenum mode) Q_DECL_OVERRIDE;
void depthTest(GLenum mode) Q_DECL_OVERRIDE;
void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
diff --git a/src/render/graphicshelpers/graphicshelpergl3_p.h b/src/render/graphicshelpers/graphicshelpergl3_p.h
index 49843055e..f67c22049 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl3_p.h
@@ -85,7 +85,6 @@ public:
void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
- void cullFace(GLenum mode) Q_DECL_OVERRIDE;
void depthMask(GLenum mode) Q_DECL_OVERRIDE;
void depthTest(GLenum mode) Q_DECL_OVERRIDE;
void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
diff --git a/src/render/graphicshelpers/graphicshelpergl4.cpp b/src/render/graphicshelpers/graphicshelpergl4.cpp
index 7e04d7a6c..7493db2e1 100644
--- a/src/render/graphicshelpers/graphicshelpergl4.cpp
+++ b/src/render/graphicshelpers/graphicshelpergl4.cpp
@@ -286,12 +286,6 @@ void GraphicsHelperGL4::depthMask(GLenum mode)
m_funcs->glDepthMask(mode);
}
-void GraphicsHelperGL4::cullFace(GLenum mode)
-{
- m_funcs->glEnable(GL_CULL_FACE);
- m_funcs->glCullFace(mode);
-}
-
void GraphicsHelperGL4::frontFace(GLenum mode)
{
m_funcs->glFrontFace(mode);
diff --git a/src/render/graphicshelpers/graphicshelpergl4_p.h b/src/render/graphicshelpers/graphicshelpergl4_p.h
index 81553abc3..e3404d838 100644
--- a/src/render/graphicshelpers/graphicshelpergl4_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl4_p.h
@@ -84,7 +84,6 @@ public:
void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
- void cullFace(GLenum mode) Q_DECL_OVERRIDE;
void depthMask(GLenum mode) Q_DECL_OVERRIDE;
void depthTest(GLenum mode) Q_DECL_OVERRIDE;
void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
diff --git a/src/render/graphicshelpers/graphicshelperinterface_p.h b/src/render/graphicshelpers/graphicshelperinterface_p.h
index 9f508876a..84c70a417 100644
--- a/src/render/graphicshelpers/graphicshelperinterface_p.h
+++ b/src/render/graphicshelpers/graphicshelperinterface_p.h
@@ -95,7 +95,6 @@ public:
virtual void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) = 0;
virtual bool checkFrameBufferComplete() = 0;
virtual GLuint createFrameBufferObject() = 0;
- virtual void cullFace(GLenum mode) = 0;
virtual void depthMask(GLenum mode) = 0;
virtual void depthTest(GLenum mode) = 0;
virtual void disableClipPlane(int clipPlane) = 0;