mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-10-31 09:20:23 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Whitespace fixes

Browse Source
This commit is contained in:
Simon Detheridge
2015-02-25 13:20:03 +00:00
parent 045d6ac6e0
commit 022ccf1472
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/EmberCL/OpenCLWrapper.cpp
View File

@ -1246,10 +1246,10 @@ bool OpenCLWrapper::CreateSPK(const string& name, const string& program, const s
if (CheckCL(err, "cl::Kernel()")) if (CheckCL(err, "cl::Kernel()"))
return true;//Everything is ok. return true;//Everything is ok.
} else { } else {
for (std::vector<cl::Device>::iterator i = m_DeviceVec.begin(); i != m_DeviceVec.end(); ++ i ) for (std::vector<cl::Device>::iterator i = m_DeviceVec.begin(); i != m_DeviceVec.end(); ++ i )
m_programBuildErrors.push_back(spk.m_Program.getBuildInfo<CL_PROGRAM_BUILD_LOG>(*i)); m_programBuildErrors.push_back(spk.m_Program.getBuildInfo<CL_PROGRAM_BUILD_LOG>(*i));
} }
} }
return false; return false;

4
Source/EmberCL/OpenCLWrapper.h
View File

@ -192,7 +192,7 @@ public:
uint LocalMemSize() const; uint LocalMemSize() const;
size_t GlobalMemSize() const; size_t GlobalMemSize() const;
size_t MaxAllocSize() const; size_t MaxAllocSize() const;
std::vector<std::string> ProgramBuildErrors() const; std::vector<std::string> ProgramBuildErrors() const;
static void MakeEvenGridDims(uint blockW, uint blockH, uint& gridW, uint& gridH); static void MakeEvenGridDims(uint blockW, uint blockH, uint& gridW, uint& gridH);
@ -218,6 +218,6 @@ private:
std::vector<NamedBuffer> m_Buffers; std::vector<NamedBuffer> m_Buffers;
std::vector<NamedImage2D> m_Images; std::vector<NamedImage2D> m_Images;
std::vector<NamedImage2DGL> m_GLImages; std::vector<NamedImage2DGL> m_GLImages;
std::vector<std::string> m_programBuildErrors; std::vector<std::string> m_programBuildErrors;
}; };
} }

18
Source/EmberCL/RendererCL.cpp
View File

@ -742,12 +742,12 @@ bool RendererCL<T>::BuildIterProgramForEmber(bool doAccum)
m_LastBuiltEmber = m_Ember; m_LastBuiltEmber = m_Ember;
} }
else 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<std::string> errors = m_Wrapper.ProgramBuildErrors(); std::vector<std::string> errors = m_Wrapper.ProgramBuildErrors();
m_ErrorReport.insert(m_ErrorReport.end(), errors.begin(), errors.end()); m_ErrorReport.insert(m_ErrorReport.end(), errors.begin(), errors.end());
m_ErrorReport.push_back(loc); m_ErrorReport.push_back(loc);
return false; return false;
} }
@ -1281,11 +1281,11 @@ int RendererCL<T>::MakeAndGetFinalAccumProgram(T& alphaBase, T& alphaScale)
if (b) if (b)
kernelIndex = m_Wrapper.FindKernelIndex(finalAccumEntryPoint);//Try to find it again, it will be present if successfully built. kernelIndex = m_Wrapper.FindKernelIndex(finalAccumEntryPoint);//Try to find it again, it will be present if successfully built.
else else
{ {
std::vector<std::string> errors = m_Wrapper.ProgramBuildErrors(); std::vector<std::string> errors = m_Wrapper.ProgramBuildErrors();
m_ErrorReport.insert(m_ErrorReport.end(), errors.begin(), errors.end()); m_ErrorReport.insert(m_ErrorReport.end(), errors.begin(), errors.end());
m_ErrorReport.push_back(loc); m_ErrorReport.push_back(loc);
} }
} }
return kernelIndex; return kernelIndex;