[Libreoffice-commits] core.git: chart2/source

[Noel Grandin]

 chart2/source/view/inc/GL3DRenderer.hxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 3bf5bc2e19167dfa0eb72ceaf98ae621f998f549
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Nov 15 15:46:31 2016 +0200

    Revert some chart2 shader-affecting changes
    
    from
    
        commit 8d4a306eb04742f499ab693e7f8ebd3ae3c01415
        Author: Noel Grandin <noel.grandin at collabora.co.uk>
        Date:   Tue Nov 15 11:26:59 2016 +0200
        loplugin:unusedfields
    
    and
    
        commit c79b7fd8d4e6e029cf8e6bfb2c7e10b52a4d5781
        Author: Noel Grandin <noel at peralex.com>
        Date: 2015-11-20 10:41:00 (GMT)
        loplugin:unusedfields in chart2
    
    Change-Id: I6b61aa9c6abb1d51e96d5eb6c623d86fd6fd5b82

diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index ca99ec2..240fb95 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -41,6 +41,7 @@ struct PosVecf3
 typedef std::vector <glm::vec3> Vertices3D;
 typedef std::vector <glm::vec3> Normals3D;
 
+// fields must match definition in GLSL shader file
 struct MaterialParameters
 {
     glm::vec4 ambient;
@@ -48,15 +49,21 @@ struct MaterialParameters
     glm::vec4 specular;
     glm::vec4 materialColor;
 
-    bool twoSidesLighting;
+    bool  twoSidesLighting;
     float shininess;
+    float pad;
+    float pad1;
 };
 
+// fields must match definition in GLSL shader file
 struct LightSource
 {
     glm::vec4   lightColor;
     glm::vec4   positionWorldspace;
     float  lightPower;
+    float  pad1;
+    float  pad2;
+    float  pad3;
 };
 
 struct GlobalLights