Browse Source

Fix text object drawing and a bug in stream buffers used in autobatching

--HG--
branch : minor
Alex Szpakowski 8 years ago
parent
commit
f2597168a2

+ 1 - 0
src/modules/graphics/opengl/StreamBuffer.cpp

@@ -111,6 +111,7 @@ public:
 		if (offset + minsize > bufferSize)
 		{
 			offset = 0;
+			gl.bindBuffer(mode, vbo);
 			glBufferData(glMode, bufferSize, nullptr, GL_STREAM_DRAW);
 		}
 

+ 1 - 1
src/modules/graphics/opengl/Text.cpp

@@ -65,7 +65,7 @@ void Text::draw(Graphics *gfx, const Matrix4 &m)
 	const size_t color_offset = offsetof(Font::GlyphVertex, color.r);
 	const size_t stride = sizeof(Font::GlyphVertex);
 
-	const GLenum gltype = quadIndices.getType();
+	const GLenum gltype = OpenGL::getGLIndexDataType(quadIndices.getType());
 	const size_t elemsize = quadIndices.getElementSize();
 
 	Graphics::TempTransform transform(gfx, m);