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

[Markus Mohrhard]

 chart2/source/view/inc/GL3DRenderer.hxx |   22 +++++++++++-----------
 vcl/source/opengl/OpenGLContext.cxx     |   20 ++++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 13236d5af1fdd4449ff0e9379f1baa5e67c063b1
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri May 9 05:31:42 2014 +0200

    avoid temporary copy
    
    Change-Id: Ica949141c58d7ebb85f246dee4109c39ee8f889e

diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 339114e..6c00422 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -141,7 +141,7 @@ struct RoundBarMesh
 struct PackedVertex{
     glm::vec3 position;
     glm::vec3 normal;
-    bool operator<(const PackedVertex that) const{
+    bool operator<(const PackedVertex& that) const{
         return memcmp((void*)this, (void*)&that, sizeof(PackedVertex))>0;
     };
 };
commit cf99ca8c8a7764b84a4431398400f9a6a55fd8f8
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri May 9 05:30:46 2014 +0200

    remove these unnecessary typedefs
    
    Change-Id: Iae2dc2d9bcc40bf7b45cd319a8be46b040d9ec23

diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index a67c625..339114e 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -111,24 +111,24 @@ typedef struct Extrude3DInfo
 }Extrude3DInfo;
 
 
-typedef struct CameraInfo
+struct CameraInfo
 {
     bool useDefault;
     glm::vec3 cameraPos;
     glm::vec3 cameraOrg;
     glm::vec3 cameraUp;
-}CameraInfo;
+};
 
-typedef struct CoordinateAxisInfo
+struct CoordinateAxisInfo
 {
     int pickingFlg;
     int reverse;
     glm::vec4 color;
     PosVecf3 trans;
     PosVecf3 scale;
-}CoordinateAxisInfo;
+};
 
-typedef struct RoundBarMesh
+struct RoundBarMesh
 {
     float topThreshold;
     float bottomThreshold;
@@ -136,7 +136,7 @@ typedef struct RoundBarMesh
     int iMeshSizes;
     int iElementStartIndices[5];
     int iElementSizes[5];
-}RoundBarMesh;
+};
 
 struct PackedVertex{
     glm::vec3 position;
@@ -146,14 +146,14 @@ struct PackedVertex{
     };
 };
 
-typedef struct TextInfo
+struct TextInfo
 {
     GLuint texture;
     float vertex[12];
-}TextInfo;
+};
 
 
-typedef struct SceneBox
+struct SceneBox
 {
     float maxXCoord;
     float minXCoord;
@@ -161,7 +161,7 @@ typedef struct SceneBox
     float minYCoord;
     float maxZCoord;
     float minZCoord;
-}SceneBox;
+};
 
 
 class OpenGL3DRenderer
commit 64729597b7dfb97f12b61c38bcf2f6410ddaca36
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri May 9 05:23:12 2014 +0200

    we need glew initalized before testing through it for features
    
    Change-Id: I4999de29b2a12888129ab291344b239b8def373c

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 8ad2d7a..58202fb 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -509,16 +509,6 @@ bool OpenGLContext::ImplInit()
 
     //rGLRender.InitOpenGL(m_aGLWin);
 
-#ifdef DBG_UTIL
-    // only enable debug output in dbgutil build
-    if( GLEW_ARB_debug_output )
-    {
-        glEnable(GL_DEBUG_OUTPUT);
-        glDebugMessageCallback(&debug_callback, NULL);
-    }
-
-#endif
-
     static bool bGlewInit = false;
     if(!bGlewInit)
     {
@@ -533,6 +523,16 @@ bool OpenGLContext::ImplInit()
             bGlewInit = true;
     }
 
+#ifdef DBG_UTIL
+    // only enable debug output in dbgutil build
+    if( GLEW_ARB_debug_output )
+    {
+        glEnable(GL_DEBUG_OUTPUT);
+        glDebugMessageCallback(&debug_callback, NULL);
+    }
+
+#endif
+
     SAL_INFO("vcl.opengl", "OpenGLContext::ImplInit----end");
     mbInitialized = true;
     return true;