From 022ccf1472ab4481034b11423130883cd7a1d870 Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Wed, 25 Feb 2015 13:20:03 +0000 Subject: [PATCH] Whitespace fixes --- Source/EmberCL/OpenCLWrapper.cpp | 8 ++++---- Source/EmberCL/OpenCLWrapper.h | 4 ++-- Source/EmberCL/RendererCL.cpp | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Source/EmberCL/OpenCLWrapper.cpp b/Source/EmberCL/OpenCLWrapper.cpp index e1cf8ce..a669eac 100644 --- a/Source/EmberCL/OpenCLWrapper.cpp +++ b/Source/EmberCL/OpenCLWrapper.cpp @@ -1246,10 +1246,10 @@ bool OpenCLWrapper::CreateSPK(const string& name, const string& program, const s if (CheckCL(err, "cl::Kernel()")) return true;//Everything is ok. - } else { - for (std::vector::iterator i = m_DeviceVec.begin(); i != m_DeviceVec.end(); ++ i ) - m_programBuildErrors.push_back(spk.m_Program.getBuildInfo(*i)); - } + } else { + for (std::vector::iterator i = m_DeviceVec.begin(); i != m_DeviceVec.end(); ++ i ) + m_programBuildErrors.push_back(spk.m_Program.getBuildInfo(*i)); + } } return false; diff --git a/Source/EmberCL/OpenCLWrapper.h b/Source/EmberCL/OpenCLWrapper.h index ae9060c..d7049fc 100644 --- a/Source/EmberCL/OpenCLWrapper.h +++ b/Source/EmberCL/OpenCLWrapper.h @@ -192,7 +192,7 @@ public: uint LocalMemSize() const; size_t GlobalMemSize() const; size_t MaxAllocSize() const; - std::vector ProgramBuildErrors() const; + std::vector ProgramBuildErrors() const; static void MakeEvenGridDims(uint blockW, uint blockH, uint& gridW, uint& gridH); @@ -218,6 +218,6 @@ private: std::vector m_Buffers; std::vector m_Images; std::vector m_GLImages; - std::vector m_programBuildErrors; + std::vector m_programBuildErrors; }; } diff --git a/Source/EmberCL/RendererCL.cpp b/Source/EmberCL/RendererCL.cpp index 65b3181..5f80155 100644 --- a/Source/EmberCL/RendererCL.cpp +++ b/Source/EmberCL/RendererCL.cpp @@ -742,12 +742,12 @@ bool RendererCL::BuildIterProgramForEmber(bool doAccum) m_LastBuiltEmber = m_Ember; } else - { - //m_ErrorReport.push_back(string(loc) + "():\nBuilding the following program failed: \n" + m_IterKernel + "\n"); + { + //m_ErrorReport.push_back(string(loc) + "():\nBuilding the following program failed: \n" + m_IterKernel + "\n"); - std::vector errors = m_Wrapper.ProgramBuildErrors(); - m_ErrorReport.insert(m_ErrorReport.end(), errors.begin(), errors.end()); - m_ErrorReport.push_back(loc); + std::vector errors = m_Wrapper.ProgramBuildErrors(); + m_ErrorReport.insert(m_ErrorReport.end(), errors.begin(), errors.end()); + m_ErrorReport.push_back(loc); return false; } @@ -1281,11 +1281,11 @@ int RendererCL::MakeAndGetFinalAccumProgram(T& alphaBase, T& alphaScale) if (b) kernelIndex = m_Wrapper.FindKernelIndex(finalAccumEntryPoint);//Try to find it again, it will be present if successfully built. else - { - std::vector errors = m_Wrapper.ProgramBuildErrors(); - m_ErrorReport.insert(m_ErrorReport.end(), errors.begin(), errors.end()); + { + std::vector errors = m_Wrapper.ProgramBuildErrors(); + m_ErrorReport.insert(m_ErrorReport.end(), errors.begin(), errors.end()); m_ErrorReport.push_back(loc); - } + } } return kernelIndex;