mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-12-01 15:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

GL states are no longer polluted by SFML's ones when mixing with custom OpenGL code

Browse Source
This commit is contained in:
Laurent Gomila 2012-03-27 17:09:19 +02:00
parent 24f8c3535d
commit ac45dc9cba
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/SFML/Graphics/RenderTarget.hpp
View File

@ -354,6 +354,7 @@ private :
{ {
enum {VertexCacheSize = 4}; enum {VertexCacheSize = 4};
bool glStatesSet; ///< Are our internal GL states set yet?
bool viewChanged; ///< Has the current view changed since last draw? bool viewChanged; ///< Has the current view changed since last draw?
BlendMode lastBlendMode; ///< Cached blending mode BlendMode lastBlendMode; ///< Cached blending mode
Uint64 lastTextureId; ///< Cached texture Uint64 lastTextureId; ///< Cached texture

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

@ -42,6 +42,7 @@ m_defaultView(),
m_view (), m_view (),
m_cache () m_cache ()
{ {
m_cache.glStatesSet = false;
} }
@ -136,6 +137,10 @@ void RenderTarget::draw(const Vertex* vertices, unsigned int vertexCount,
if (activate(true)) if (activate(true))
{ {
// First set the persistent OpenGL states if it's the very first call
if (!m_cache.glStatesSet)
resetGLStates();
// Check if the vertex count is low enough so that we can pre-transform them // Check if the vertex count is low enough so that we can pre-transform them
bool useVertexCache = (vertexCount <= StatesCache::VertexCacheSize); bool useVertexCache = (vertexCount <= StatesCache::VertexCacheSize);
if (useVertexCache) if (useVertexCache)
@ -217,6 +222,7 @@ void RenderTarget::pushGLStates()
{ {
if (activate(true)) if (activate(true))
{ {
glCheck(glPushClientAttrib(GL_CLIENT_ALL_ATTRIB_BITS));
glCheck(glPushAttrib(GL_ALL_ATTRIB_BITS)); glCheck(glPushAttrib(GL_ALL_ATTRIB_BITS));
glCheck(glMatrixMode(GL_MODELVIEW)); glCheck(glMatrixMode(GL_MODELVIEW));
glCheck(glPushMatrix()); glCheck(glPushMatrix());
@ -235,6 +241,7 @@ void RenderTarget::popGLStates()
{ {
if (activate(true)) if (activate(true))
{ {
glCheck(glPopClientAttrib());
glCheck(glPopAttrib()); glCheck(glPopAttrib());
glCheck(glMatrixMode(GL_PROJECTION)); glCheck(glMatrixMode(GL_PROJECTION));
glCheck(glPopMatrix()); glCheck(glPopMatrix());
@ -264,6 +271,7 @@ 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));
m_cache.glStatesSet = true;
// Apply the default SFML states // Apply the default SFML states
applyBlendMode(BlendAlpha); applyBlendMode(BlendAlpha);
@ -286,8 +294,8 @@ void RenderTarget::initialize()
m_defaultView.reset(FloatRect(0, 0, static_cast<float>(getSize().x), static_cast<float>(getSize().y))); m_defaultView.reset(FloatRect(0, 0, static_cast<float>(getSize().x), static_cast<float>(getSize().y)));
m_view = m_defaultView; m_view = m_defaultView;
// Initialize the default OpenGL render-states // Set GL states only on first draw, so that we don't pollute user's states
resetGLStates(); m_cache.glStatesSet = false;
} }