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

--Bug fixes

Browse Source 
-Available memory size checking in the final render dialog was accidentally removed during the multi-gpu work last year. Add it back in.
This commit is contained in:
mfeemster
2016-02-25 21:38:45 -08:00
parent 32d6982210
commit 6ff8aa0722
9 changed files with 100 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Source/Fractorium/FinalRenderDialog.cpp
View File

@ -748,62 +748,23 @@ bool FractoriumFinalRenderDialog::CreateControllerFromGUI(bool createRenderer)
/// assign the result to the table cell as text.
/// Report errors if not enough memory is available for any of the selected devices.
/// </summary>
/// <returns>True devices and a controller is present, else false.</returns>
/// <returns>True if devices and a controller is present, else false.</returns>
bool FractoriumFinalRenderDialog::SetMemory()
{
if (isVisible() && CreateControllerFromGUI(true))
{
bool error = false;
tuple<size_t, size_t, size_t> p = m_Controller->SyncAndComputeMemory();
QString s;
auto p = m_Controller->SyncAndComputeMemory();
ui.FinalRenderParamsTable->item(m_MemoryCellIndex, 1)->setText(ToString<qulonglong>(get<1>(p)));
ui.FinalRenderParamsTable->item(m_ItersCellIndex, 1)->setText(ToString<qulonglong>(get<2>(p)));
if (OpenCL() && !m_Wrappers.empty())
{
auto devices = Devices();
for (size_t i = 0; i < m_Wrappers.size(); i++)
{
if (devices.contains(int(i)))
{
size_t histSize = get<0>(p);
size_t totalSize = get<1>(p);
size_t maxAlloc = m_Wrappers[i].MaxAllocSize();
size_t totalAvail = m_Wrappers[i].GlobalMemSize();
QString temp;
if (histSize > maxAlloc)
{
temp = "Histogram/Accumulator memory size of " + ToString<qulonglong>(histSize) +
" is greater than the max OpenCL allocation size of " + ToString<qulonglong>(maxAlloc);
}
if (totalSize > totalAvail)
{
temp += "\n\nTotal required memory size of " + ToString<qulonglong>(totalSize) +
" is greater than the max OpenCL available memory of " + ToString<qulonglong>(totalAvail);
}
if (!temp.isEmpty())
{
error = true;
s += QString::fromStdString(m_Wrappers[i].DeviceName()) + ":\n" + temp + "\n\n";
}
}
}
if (!s.isEmpty())
s += "Rendering will most likely fail.";
ui.FinalRenderTextOutput->setText(s);
}
if (!error)
if (OpenCL())
ui.FinalRenderTextOutput->setText(m_Controller->CheckMemory(p));
else
ui.FinalRenderTextOutput->clear();
return true;
}
return false;
}
}