[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - canvas/source

[Michael Jaumann]

 canvas/source/opengl/ogl_renderHelper.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ef908a07c2edf558321966f00bba4eb6257d4323
Author: Michael Jaumann <meta_dev at yahoo.com>
Date:   Thu Nov 27 13:51:33 2014 +0000

    fill glbufferdata with the right verticecount
    
    Change-Id: I0efe1b6ec94daa3bac97d7e4f0768aea8d32d738

diff --git a/canvas/source/opengl/ogl_renderHelper.cxx b/canvas/source/opengl/ogl_renderHelper.cxx
index 70f1769..8d95f46 100644
--- a/canvas/source/opengl/ogl_renderHelper.cxx
+++ b/canvas/source/opengl/ogl_renderHelper.cxx
@@ -49,7 +49,7 @@ namespace oglcanvas
 
     void RenderHelper::SetVP(const float width, const float height)
     {
-        m_VP = glm::ortho(0.0f, width, 0.0f, height);
+        m_VP = glm::ortho(0.0f, width, height, 0.0f);
 
     }
 
@@ -62,10 +62,10 @@ namespace oglcanvas
     void RenderHelper::renderVertexConstColor(const std::vector<glm::vec2>& rVertices, glm::vec4 color, GLenum mode) const
     {
         glBindBuffer(GL_ARRAY_BUFFER, m_vertexBuffer);
-        glBufferData(GL_ARRAY_BUFFER, rVertices.size()*2, &rVertices[0].x, GL_STATIC_DRAW);
 
         glUseProgram(m_texProgID);
 
+        glBufferData(GL_ARRAY_BUFFER, sizeof(rVertices), &rVertices[0].x, GL_STATIC_DRAW);
         glUniform4fv(m_texColorUnf, 1, &color[0]);
         glUniformMatrix4fv(m_texMVPUnf, 1, GL_FALSE, &m_MVP[0][0]);
         glEnableVertexAttribArray(m_texPosAttrb); //vertices
@@ -91,10 +91,10 @@ namespace oglcanvas
     void RenderHelper::renderVertexUVTex(const std::vector<glm::vec2>& rVertices, const std::vector<glm::vec2>& rUVcoords, glm::vec4 color, GLenum mode) const
     {
         glBindBuffer(GL_ARRAY_BUFFER, m_vertexBuffer);
-        glBufferData(GL_ARRAY_BUFFER, rVertices.size()*2, &rVertices[0].x, GL_STATIC_DRAW);
+        glBufferData(GL_ARRAY_BUFFER, sizeof(rVertices), &rVertices[0].x, GL_STATIC_DRAW);
 
         glBindBuffer(GL_ARRAY_BUFFER, m_uvBuffer);
-        glBufferData(GL_ARRAY_BUFFER, rUVcoords.size()*2, &rUVcoords[0].x, GL_STATIC_DRAW);
+        glBufferData(GL_ARRAY_BUFFER, sizeof(rUVcoords), &rUVcoords[0].x, GL_STATIC_DRAW);
 
         glUseProgram(m_simpleProgID);
 
@@ -148,7 +148,7 @@ namespace oglcanvas
     void RenderHelper::renderVertexTex(const std::vector<glm::vec2>& rVertices, GLfloat fWidth, GLfloat fHeight, glm::vec4 color, GLenum mode) const
     {
         glBindBuffer(GL_ARRAY_BUFFER, m_vertexBuffer);
-        glBufferData(GL_ARRAY_BUFFER, rVertices.size()*2, &rVertices[0].x, GL_STATIC_DRAW);
+        glBufferData(GL_ARRAY_BUFFER, sizeof(rVertices), &rVertices[0].x, GL_STATIC_DRAW);
 
         glUseProgram(m_texManProgID);