From e4132ab7d178a8d9adb28d1c9b984f396a856557 Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@viroteck.net>
Date: Sat, 17 Jan 2015 02:00:26 +0100
Subject: QQuickParticleData: Reorganise fields to drop size from 208 to 200
 bytes on x86_64.

Change-Id: Ide7a70baecf6d1ff3ec8160a2cb47f0bd9955e45
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
---
 src/particles/qquickparticlesystem.cpp |  4 ++--
 src/particles/qquickparticlesystem_p.h | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/particles')

diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp
index 0b69edfe6a..affd19d981 100644
--- a/src/particles/qquickparticlesystem.cpp
+++ b/src/particles/qquickparticlesystem.cpp
@@ -427,11 +427,11 @@ void QQuickParticleGroupData::prepareRecycler(QQuickParticleData* d)
 }
 
 QQuickParticleData::QQuickParticleData(QQuickParticleSystem* sys)
-    : group(0)
-    , e(0)
+    : e(0)
     , system(sys)
     , index(0)
     , systemIndex(-1)
+    , group(0)
     , colorOwner(0)
     , rotationOwner(0)
     , deformationOwner(0)
diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h
index 6f4f1f6ebc..c8061916b5 100644
--- a/src/particles/qquickparticlesystem_p.h
+++ b/src/particles/qquickparticlesystem_p.h
@@ -164,7 +164,6 @@ public:
     qreal curVY() const;
     qreal curAY() const { return ay; }
 
-    int group;
     QQuickParticleEmitter* e;//### Needed?
     QQuickParticleSystem* system;
     int index;
@@ -203,18 +202,24 @@ public:
     float animY;
     float animWidth;
     float animHeight;
+
+    int group;
+
     //Used by ImageParticle data shadowing
     QQuickImageParticle* colorOwner;
     QQuickImageParticle* rotationOwner;
     QQuickImageParticle* deformationOwner;
     QQuickImageParticle* animationOwner;
-    //Used by CustomParticle
-    float r;
+
     //Used by ItemParticle
     QQuickItem* delegate;
     int modelIndex;
     //Used by custom affectors
     float update;
+    //Used by CustomParticle
+    float r;
+
+    // 4 bytes wasted
 
 
     void debugDump();
-- 
cgit v1.2.3