Further state cleanup calls.

codereader · Aug 13, 2017 · 1703022 · 1703022
1 parent 10fec4e
commit 1703022
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/libs/render/RenderablePivot.h b/libs/render/RenderablePivot.h
@@ -90,6 +90,8 @@ class RenderablePivot :
 		glVertexPointer(3, GL_DOUBLE, sizeof(VertexCb), &_vertices.data()->vertex);
 		glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(VertexCb), &_vertices.data()->colour);
 		glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(_vertices.size()));
+
+		glDisableClientState(GL_COLOR_ARRAY);
 	}
 
 	void render(RenderableCollector& collector, const VolumeTest& volume, const Matrix4& localToWorld) const

diff --git a/plugins/dm.gui/gui/RenderableCharacterBatch.cpp b/plugins/dm.gui/gui/RenderableCharacterBatch.cpp
@@ -81,6 +81,8 @@ void RenderableCharacterBatch::render() const
 
 	glDrawArrays(GL_QUADS, 0, static_cast<GLsizei>(_verts.size()));
 
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
 	GlobalOpenGL().assertNoErrors();
 #endif
 }

diff --git a/plugins/entity/curve/RenderableCurve.h b/plugins/entity/curve/RenderableCurve.h
@@ -1,11 +1,11 @@
-#ifndef RENDERABLECURVE_H_
-#define RENDERABLECURVE_H_
+#pragma once
 
 #include <vector>
 #include "irenderable.h"
 #include "render.h"
 
-namespace entity {
+namespace entity 
+{
 
 class RenderableCurve :
 	public OpenGLRenderable
@@ -21,9 +21,12 @@ class RenderableCurve :
         }
 		pointvertex_gl_array(&m_vertices.front());
 		glDrawArrays(GL_LINE_STRIP, 0, GLsizei(m_vertices.size()));
+
+		if (info.checkFlag(RENDER_VERTEX_COLOUR))
+		{
+			glDisableClientState(GL_COLOR_ARRAY);
+		}
 	}
 };
 
 } // namespace entity
-
-#endif /*RENDERABLECURVE_H_*/
diff --git a/plugins/particles/RenderableParticleBunch.cpp b/plugins/particles/RenderableParticleBunch.cpp
@@ -164,6 +164,9 @@ void RenderableParticleBunch::render(const RenderInfo& info) const
     glColorPointer(4, GL_DOUBLE, sizeof(ParticleQuad::Vertex), &(_quads.front().verts[0].colour));
 
     glDrawArrays(GL_QUADS, 0, static_cast<GLsizei>(_quads.size())*4);
+
+	glDisableClientState(GL_COLOR_ARRAY);
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 }
 
 const AABB& RenderableParticleBunch::getBounds()

diff --git a/radiant/brush/RenderableWireFrame.h b/radiant/brush/RenderableWireFrame.h
@@ -35,6 +35,11 @@ class RenderableWireframe :
 
 		glVertexPointer(3, GL_DOUBLE, sizeof(VertexCb), &m_vertices->vertex);
 		glDrawElements(GL_LINES, GLsizei(m_size<<1), RenderIndexTypeID, &m_faceVertex.front());
+
+		if (info.checkFlag(RENDER_VERTEX_COLOUR))
+		{
+			glDisableClientState(GL_COLOR_ARRAY);
+		}
 	}
 
 	std::vector<EdgeRenderIndices> m_faceVertex;

diff --git a/radiant/brush/Winding.cpp b/radiant/brush/Winding.cpp
@@ -133,6 +133,8 @@ void Winding::render(const RenderInfo& info) const
 
     // Submit all data to OpenGL
 	glDrawArrays(GL_POLYGON, 0, GLsizei(size()));
+
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 }
 
 void Winding::testSelect(SelectionTest& test, SelectionIntersection& best)