diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-02-08 19:43:38 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-09 14:16:42 +0100 |
| commit | 33c8b164257a481875dee41be8177bd4cd744dd1 (patch) | |
| tree | 6d57775842a4a365a9f06251701e69917f54768e /chart2 | |
| parent | ec4b0ed8e070f2c0955c0a60194328d84490d1bb (diff) | |
add a few more debug statements
Change-Id: I9c9f4f216f1505d66911cfcf049eb991fbe59ccf
Diffstat (limited to 'chart2')
| -rwxr-xr-x | chart2/source/view/main/OpenGLRender.cxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 9de0571cd5c4..cc031f3004c6 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -1423,9 +1423,12 @@ int OpenGLRender::RenderTextShape() MoveModelf(trans, angle, scale); m_MVP = m_Projection * m_View * m_Model; glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer); + CHECK_GL_ERROR(); glBufferData(GL_ARRAY_BUFFER, sizeof(textInfo.vertex), textInfo.vertex, GL_STATIC_DRAW); + CHECK_GL_ERROR(); glUseProgram(m_TextProID); + CHECK_GL_ERROR(); glUniformMatrix4fv(m_TextMatrixID, 1, GL_FALSE, &m_MVP[0][0]); // 1rst attribute buffer : vertices glEnableVertexAttribArray(m_TextVertexID); @@ -1439,6 +1442,7 @@ int OpenGLRender::RenderTextShape() (void*)0 // array buffer offset ); //tex coord + CHECK_GL_ERROR(); glEnableVertexAttribArray(m_TextTexCoordID); glBindBuffer(GL_ARRAY_BUFFER, m_TextTexCoordBuf); glVertexAttribPointer( @@ -1450,15 +1454,22 @@ int OpenGLRender::RenderTextShape() (void*)0 // array buffer offset ); //texture + CHECK_GL_ERROR(); glBindTexture(GL_TEXTURE_2D, textInfo.texture); + CHECK_GL_ERROR(); glUniform1i(m_TextTexID, 0); + CHECK_GL_ERROR(); //TODO: moggi: get rid fo GL_QUADS - glDrawArrays(GL_QUADS, 0, 4); + glDrawArrays(GL_QUADS, 0, 3); + CHECK_GL_ERROR(); glDisableVertexAttribArray(m_TextTexCoordID); + CHECK_GL_ERROR(); glDisableVertexAttribArray(m_TextVertexID); + CHECK_GL_ERROR(); glBindTexture(GL_TEXTURE_2D, 0); glUseProgram(0); glDeleteTextures(1, &textInfo.texture); + CHECK_GL_ERROR(); m_TextInfoList.pop_front(); } CHECK_GL_ERROR(); |