Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the call to glPolygonMode, unavailable in OpenGL ES.

Browse Source
This commit is contained in:
Laurent Gomila 2013-10-30 23:04:01 +01:00 committed by Jonathan De Wachter
parent de791c05dc
commit d908ffa498
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SFML/Graphics/RenderTarget.cpp
View File

@ -321,7 +321,6 @@ void RenderTarget::resetGLStates()
glCheck(glEnableClientState(GL_VERTEX_ARRAY)); glCheck(glEnableClientState(GL_VERTEX_ARRAY));
glCheck(glEnableClientState(GL_COLOR_ARRAY)); glCheck(glEnableClientState(GL_COLOR_ARRAY));
glCheck(glEnableClientState(GL_TEXTURE_COORD_ARRAY)); glCheck(glEnableClientState(GL_TEXTURE_COORD_ARRAY));
glCheck(glPolygonMode(GL_FRONT_AND_BACK, GL_FILL));
m_cache.glStatesSet = true; m_cache.glStatesSet = true;
// Apply the default SFML states // Apply the default SFML states
@ -379,11 +378,11 @@ void RenderTarget::applyBlendMode(BlendMode mode)
// Alpha blending // Alpha blending
default : default :
case BlendAlpha : case BlendAlpha :
if (GL_blend_func_separate) if (GL_blend_func_separate)
{ {
glCheck(glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA)); glCheck(glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA));
} }
else else
{ {
glCheck(glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)); glCheck(glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
@ -392,11 +391,11 @@ void RenderTarget::applyBlendMode(BlendMode mode)
break; break;
// Additive blending // Additive blending
case BlendAdd : case BlendAdd :
if (GL_blend_func_separate) if (GL_blend_func_separate)
{ {
glCheck(glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE, GL_ONE, GL_ONE)); glCheck(glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE, GL_ONE, GL_ONE));
} }
else else
{ {
glCheck(glBlendFunc(GL_SRC_ALPHA, GL_ONE)); glCheck(glBlendFunc(GL_SRC_ALPHA, GL_ONE));