commit 837f995a42fb281483697472206b17c25d2b0d34
author Chia-I Wu <olv@lunarg.com> Mon Dec 15 23:29:34 2014 +0800
committer Chia-I Wu <olv@lunarg.com> Tue Dec 16 10:33:49 2014 +0800
tree 3996cc890eb7d2beaf684831c92dcc8fa7635f93
parent 998c2acfdbf319a8879fc5e3f8d38350fd5b9937

intel, tests: fix -Wreorder warnings

tests/xgldevice.cpp

diff --git a/tests/xgldevice.cpp b/tests/xgldevice.cpp
index 2777987..35c3d7b 100644
--- a/tests/xgldevice.cpp
+++ b/tests/xgldevice.cpp
@@ -4,8 +4,7 @@
 #include "xglimage.h"
 
 XglDevice::XglDevice(XGL_UINT id, XGL_PHYSICAL_GPU obj) :
-    m_flags(0),
-    XglGpu(id, obj)
+    XglGpu(id, obj), m_flags(0)
 {
     init_device();
     init_formats();

tests/xglimage.cpp

diff --git a/tests/xglimage.cpp b/tests/xglimage.cpp
index 55edcf8..481c0e8 100644
--- a/tests/xglimage.cpp
+++ b/tests/xglimage.cpp
@@ -35,9 +35,9 @@
     m_targetView( XGL_NULL_HANDLE ),
     m_memory( XGL_NULL_HANDLE ),
     m_offset( 0 ),
-    m_mipCount( 0 ),
     m_width( 0 ),
-    m_height( 0 )
+    m_height( 0 ),
+    m_mipCount( 0 )
 {
     m_device = dev;
     m_format.channelFormat = XGL_CH_FMT_UNDEFINED;

tests/xglrenderframework.cpp

diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index e98a0a2..a037f77 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -28,12 +28,12 @@
 #include "xglrenderframework.h"
 
 XglRenderFramework::XglRenderFramework() :
-    m_colorBlend( XGL_NULL_HANDLE ),
-    m_stateMsaa( XGL_NULL_HANDLE ),
-    m_stateDepthStencil( XGL_NULL_HANDLE ),
-    m_stateRaster( XGL_NULL_HANDLE ),
     m_cmdBuffer( XGL_NULL_HANDLE ),
+    m_stateRaster( XGL_NULL_HANDLE ),
+    m_colorBlend( XGL_NULL_HANDLE ),
     m_stateViewport( XGL_NULL_HANDLE ),
+    m_stateDepthStencil( XGL_NULL_HANDLE ),
+    m_stateMsaa( XGL_NULL_HANDLE ),
     m_width( 256.0 ),                   // default window width
     m_height( 256.0 )                   // default window height
 {

tests/xgltestframework.cpp

diff --git a/tests/xgltestframework.cpp b/tests/xgltestframework.cpp
index 0a27845..9c36343 100644
--- a/tests/xgltestframework.cpp
+++ b/tests/xgltestframework.cpp
@@ -1047,9 +1047,9 @@
 XglTestImageRecord::XglTestImageRecord() : // Constructor
     m_width( 0 ),
     m_height( 0 ),
-    m_data( NULL )
+    m_data( NULL ),
+    m_data_size( 0 )
 {
-    m_data_size = 0;
 }
 
 XglTestImageRecord::~XglTestImageRecord()

tests/xgltestframework.h

diff --git a/tests/xgltestframework.h b/tests/xgltestframework.h
index 28180d2..9a33b74 100644
--- a/tests/xgltestframework.h
+++ b/tests/xgltestframework.h
@@ -53,10 +53,10 @@
     int operator<(const XglTestImageRecord &rhs) const;
 
     string      m_title;
-    void       *m_data;
-    unsigned    m_data_size;
     int         m_width;
     int         m_height;
+    void       *m_data;
+    unsigned    m_data_size;
 };
 
 class XglTestFramework : public ::testing::Test