[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/OpenGLRender.cxx |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit dd1a1e1ddf3cf61e6019399fc39c0981ad7f9fc6
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Jan 10 11:16:47 2014 +0100

    more clean-up
    
    Change-Id: I63ddc71825ce8127c764c57d5435c3b5bcee6725

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index cf2a0fc..a097aec 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -9,7 +9,6 @@
 
 #include <GL/glew.h>
 #include <vector>
-#include <iostream>
 #include "OpenGLRender.hxx"
 #include <vcl/bitmapex.hxx>
 #include <vcl/bmpacc.hxx>
@@ -35,15 +34,14 @@
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <editeng/unoprnms.hxx>
-#include <boost/scoped_array.hpp>
 #include <vcl/virdev.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/bmpacc.hxx>
 
-using namespace com::sun::star;
-
 #include <boost/scoped_array.hpp>
 
+using namespace com::sun::star;
+
 using namespace std;
 
 #define RENDER_TO_FILE 0
@@ -58,6 +56,8 @@ using namespace std;
 #define WGL_SAMPLES_ARB          0x2042
 #endif
 
+//begin shaders
+
 const char *CommonFragmemtShader = OPENGL_SHADER (
 
 varying vec4 fragmentColor;
@@ -162,7 +162,7 @@ void main()
 
 );
 
-
+// end shaders
 
 static GLfloat squareVertices[] = {
     -1.0f, -1.0f, -1.0,
@@ -184,6 +184,7 @@ static GLfloat square2DVertices[] = {
     1.0f,  1.0f,
     -1.0f,  1.0f
 };
+
 #if 0
 static const GLfloat g_vertex_buffer_data[] = {
     -1.0f,-1.0f,-1.0f,
@@ -264,6 +265,7 @@ static const GLfloat g_color_buffer_data[] = {
     0.982f,  0.099f,  0.879f
 };
 #endif
+
 int static checkGLError(const char *file, int line)
 {
     GLenum glErr;