Change intializer list order to match field order.

src/compiler/translator/OutputHLSL.cpp

@@ -115,8 +115,8 @@ OutputHLSL::OutputHLSL(sh::GLenum shaderType, int shaderVersion,
       mExtensionBehavior(extensionBehavior),
       mSourcePath(sourcePath),
       mOutputType(outputType),
-      mNumRenderTargets(numRenderTargets),
       mCompileOptions(compileOptions),
+      mNumRenderTargets(numRenderTargets),
       mCurrentFunctionMetadata(nullptr)
 {
     mInsideFunction = false;

src/libANGLE/renderer/d3d/FramebufferD3D.cpp

@@ -86,9 +86,9 @@ ClearParameters GetClearParameters(const gl::State &state, GLbitfield mask)
 
 FramebufferD3D::FramebufferD3D(const gl::Framebuffer::Data &data, RendererD3D *renderer)
     : FramebufferImpl(data),
-      mRenderer(renderer),
       mColorAttachmentsForRender(mData.getColorAttachments().size(), nullptr),
-      mInvalidateColorAttachmentCache(true)
+      mInvalidateColorAttachmentCache(true),
+      mRenderer(renderer)
 {
     ASSERT(mRenderer != nullptr);
 }

src/libANGLE/renderer/d3d/ImageD3D.cpp

@@ -23,8 +23,8 @@ ImageD3D::ImageD3D()
       mHeight(0),
       mDepth(0),
       mInternalFormat(GL_NONE),
-      mTarget(GL_NONE),
       mRenderable(false),
+      mTarget(GL_NONE),
       mDirty(false)
 {
 }

src/libANGLE/renderer/d3d/RendererD3D.cpp

@@ -38,8 +38,8 @@ const uintptr_t RendererD3D::DirtyPointer = std::numeric_limits<uintptr_t>::max(
 RendererD3D::RendererD3D(egl::Display *display)
     : mDisplay(display),
       mDeviceLost(false),
-      mScratchMemoryBufferResetCounter(0),
-      mAnnotator(nullptr)
+      mAnnotator(nullptr),
+      mScratchMemoryBufferResetCounter(0)
 {
 }
 

src/libANGLE/renderer/d3d/SwapChainD3D.h

@@ -31,7 +31,7 @@ class SwapChainD3D : angle::NonCopyable
 {
   public:
     SwapChainD3D(rx::NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat)
-        : mNativeWindow(nativeWindow), mShareHandle(shareHandle), mBackBufferFormat(backBufferFormat), mDepthBufferFormat(depthBufferFormat)
+        : mNativeWindow(nativeWindow), mBackBufferFormat(backBufferFormat), mDepthBufferFormat(depthBufferFormat), mShareHandle(shareHandle)
     {
     }
 

src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp

@@ -758,8 +758,8 @@ bool Buffer11::supportsDirectBinding() const
 
 Buffer11::BufferStorage::BufferStorage(Renderer11 *renderer, BufferUsage usage)
     : mRenderer(renderer),
-      mUsage(usage),
       mRevision(0),
+      mUsage(usage),
       mBufferSize(0)
 {
 }

src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp

@@ -42,12 +42,12 @@ const unsigned int RenderStateCache::kMaxSamplerStates = 4096;
 
 RenderStateCache::RenderStateCache(Renderer11 *renderer)
     : mRenderer(renderer),
-      mDevice(NULL),
       mCounter(0),
       mBlendStateCache(kMaxBlendStates, hashBlendState, compareBlendStates),
       mRasterizerStateCache(kMaxRasterizerStates, hashRasterizerState, compareRasterizerStates),
       mDepthStencilStateCache(kMaxDepthStencilStates, hashDepthStencilState, compareDepthStencilStates),
-      mSamplerStateCache(kMaxSamplerStates, hashSamplerState, compareSamplerStates)
+      mSamplerStateCache(kMaxSamplerStates, hashSamplerState, compareSamplerStates),
+      mDevice(NULL)
 {
 }
 

src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp

@@ -24,8 +24,8 @@ namespace rx
 
 SwapChain11::SwapChain11(Renderer11 *renderer, NativeWindow nativeWindow, HANDLE shareHandle,
                          GLenum backBufferFormat, GLenum depthBufferFormat)
-    : mRenderer(renderer),
-      SwapChainD3D(nativeWindow, shareHandle, backBufferFormat, depthBufferFormat),
+    : SwapChainD3D(nativeWindow, shareHandle, backBufferFormat, depthBufferFormat),
+      mRenderer(renderer),
       mColorRenderTarget(this, renderer, false),
       mDepthStencilRenderTarget(this, renderer, true)
 {

src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp

@@ -62,8 +62,6 @@ bool TextureStorage11::SRVKey::operator<(const SRVKey &rhs) const
 
 TextureStorage11::TextureStorage11(Renderer11 *renderer, UINT bindFlags, UINT miscFlags)
     : mRenderer(renderer),
-      mBindFlags(bindFlags),
-      mMiscFlags(miscFlags),
       mTopLevel(0),
       mMipLevels(0),
       mInternalFormat(GL_NONE),
@@ -73,7 +71,9 @@ TextureStorage11::TextureStorage11(Renderer11 *renderer, UINT bindFlags, UINT mi
       mDepthStencilFormat(DXGI_FORMAT_UNKNOWN),
       mTextureWidth(0),
       mTextureHeight(0),
-      mTextureDepth(0)
+      mTextureDepth(0),
+      mBindFlags(bindFlags),
+      mMiscFlags(miscFlags)
 {
     for (unsigned int i = 0; i < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; i++)
     {
@@ -676,10 +676,10 @@ gl::Error TextureStorage11::setData(const gl::ImageIndex &index, ImageD3D *image
 TextureStorage11_2D::TextureStorage11_2D(Renderer11 *renderer, SwapChain11 *swapchain)
     : TextureStorage11(renderer, D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE, 0),
       mTexture(swapchain->getOffscreenTexture()),
-      mSwizzleTexture(NULL),
       mLevelZeroTexture(NULL),
       mLevelZeroRenderTarget(NULL),
-      mUseLevelZeroTexture(false)
+      mUseLevelZeroTexture(false),
+      mSwizzleTexture(NULL)
 {
     mTexture->AddRef();
 
@@ -726,10 +726,10 @@ TextureStorage11_2D::TextureStorage11_2D(Renderer11 *renderer, GLenum internalfo
                        GetTextureBindFlags(internalformat, renderer->getRenderer11DeviceCaps(), renderTarget),
                        GetTextureMiscFlags(internalformat, renderer->getRenderer11DeviceCaps(), renderTarget, levels)),
       mTexture(NULL),
-      mSwizzleTexture(NULL),
       mLevelZeroTexture(NULL),
       mLevelZeroRenderTarget(NULL),
-      mUseLevelZeroTexture(false)
+      mUseLevelZeroTexture(false),
+      mSwizzleTexture(NULL)
 {
     for (unsigned int i = 0; i < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; i++)
     {

src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp

@@ -17,8 +17,8 @@ namespace rx
 
 SwapChain9::SwapChain9(Renderer9 *renderer, NativeWindow nativeWindow, HANDLE shareHandle,
                        GLenum backBufferFormat, GLenum depthBufferFormat)
-    : mRenderer(renderer),
-      SwapChainD3D(nativeWindow, shareHandle, backBufferFormat, depthBufferFormat),
+    : SwapChainD3D(nativeWindow, shareHandle, backBufferFormat, depthBufferFormat),
+      mRenderer(renderer),
       mColorRenderTarget(this, false),
       mDepthStencilRenderTarget(this, true)
 {

src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp

@@ -25,8 +25,8 @@ PbufferSurfaceWGL::PbufferSurfaceWGL(EGLint width, EGLint height, EGLenum textur
       mTextureFormat(textureFormat),
       mTextureTarget(textureTarget),
       mPixelFormat(pixelFormat),
-      mParentDeviceContext(deviceContext),
       mShareWGLContext(wglContext),
+      mParentDeviceContext(deviceContext),
       mPbuffer(nullptr),
       mPbufferDeviceContext(nullptr),
       mFunctionsWGL(functions)

src/tests/perf_tests/EGLInitializePerf.cpp

@@ -23,10 +23,10 @@ class CapturePlatform : public angle::Platform
 {
   public:
     CapturePlatform()
-        : mLoadDLLsMS(0),
+        : mTimer(CreateTimer()),
+          mLoadDLLsMS(0),
           mCreateDeviceMS(0),
-          mInitResourcesMS(0),
-          mTimer(CreateTimer())
+          mInitResourcesMS(0)
     {
         mTimer->start();
     }