From d1bdc9a7e260faa1765b403e4f4ad4647ce93a35 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 7 Sep 2014 13:19:27 -0300 Subject: [PATCH] Images and Canvases are now drawn using GL_TRIANGLE_FAN instead of GL_QUADS, for future compatibility with GLES and core GL3+. --HG-- branch : minor --- src/modules/graphics/opengl/Canvas.cpp | 2 +- src/modules/graphics/opengl/Image.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/graphics/opengl/Canvas.cpp b/src/modules/graphics/opengl/Canvas.cpp index 1e80b07c6..c61dae7f2 100644 --- a/src/modules/graphics/opengl/Canvas.cpp +++ b/src/modules/graphics/opengl/Canvas.cpp @@ -625,7 +625,7 @@ void Canvas::drawv(const Matrix &t, const Vertex *v) glVertexAttribPointer(ATTRIB_TEXCOORD, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), &v[0].s); gl.prepareDraw(); - gl.drawArrays(GL_QUADS, 0, 4); + gl.drawArrays(GL_TRIANGLE_FAN, 0, 4); glDisableVertexAttribArray(ATTRIB_TEXCOORD); glDisableVertexAttribArray(ATTRIB_POS); diff --git a/src/modules/graphics/opengl/Image.cpp b/src/modules/graphics/opengl/Image.cpp index d34edf559..7ca95c970 100644 --- a/src/modules/graphics/opengl/Image.cpp +++ b/src/modules/graphics/opengl/Image.cpp @@ -434,7 +434,7 @@ void Image::drawv(const Matrix &t, const Vertex *v) glVertexAttribPointer(ATTRIB_TEXCOORD, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), &v[0].s); gl.prepareDraw(); - gl.drawArrays(GL_QUADS, 0, 4); + gl.drawArrays(GL_TRIANGLE_FAN, 0, 4); glDisableVertexAttribArray(ATTRIB_TEXCOORD); glDisableVertexAttribArray(ATTRIB_POS);