From d908ffa49864286350901c23754d3ddf8702647a Mon Sep 17 00:00:00 2001 From: Laurent Gomila Date: Wed, 30 Oct 2013 23:04:01 +0100 Subject: [PATCH] Removed the call to glPolygonMode, unavailable in OpenGL ES. --- src/SFML/Graphics/RenderTarget.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/SFML/Graphics/RenderTarget.cpp b/src/SFML/Graphics/RenderTarget.cpp index 3c0b15a5e..22e17c321 100644 --- a/src/SFML/Graphics/RenderTarget.cpp +++ b/src/SFML/Graphics/RenderTarget.cpp @@ -321,7 +321,6 @@ void RenderTarget::resetGLStates() glCheck(glEnableClientState(GL_VERTEX_ARRAY)); glCheck(glEnableClientState(GL_COLOR_ARRAY)); glCheck(glEnableClientState(GL_TEXTURE_COORD_ARRAY)); - glCheck(glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)); m_cache.glStatesSet = true; // Apply the default SFML states @@ -379,11 +378,11 @@ void RenderTarget::applyBlendMode(BlendMode mode) // Alpha blending default : - case BlendAlpha : + case BlendAlpha : if (GL_blend_func_separate) { glCheck(glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA)); - } + } else { glCheck(glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)); @@ -392,11 +391,11 @@ void RenderTarget::applyBlendMode(BlendMode mode) break; // Additive blending - case BlendAdd : + case BlendAdd : if (GL_blend_func_separate) { glCheck(glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE, GL_ONE, GL_ONE)); - } + } else { glCheck(glBlendFunc(GL_SRC_ALPHA, GL_ONE));