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

Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium

Browse Source
This commit is contained in:
Person 2022-03-15 17:50:01 -06:00
commit a2a5479c81
3 changed files with 39 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Data/BuildGuideQtCreator.md
View File

@ -74,12 +74,6 @@ This will download and build `glm libopenexr libpng libxml tbb zlib`. You will h
│
├─Deps
│
├─Include
│
├─OpenEXR
│
├─*.h
│
├─libjpeg.lib
├─libpng.lib
├─libxml2.lib

8
Source/EmberCL/EmberCLFunctions.h
View File

@ -249,10 +249,7 @@ static constexpr char CarToRasFunctionString[] =
"}\n"
"\n";
static string AtomicString()
{
ostringstream os;
os <<
static constexpr char AtomicString[] =
"void AtomicAdd(volatile __global real_bucket_t* source, const real_bucket_t operand)\n"
"{\n"
" union\n"
@ -273,6 +270,5 @@ static string AtomicString()
" newVal.realVal = prevVal.realVal + operand;\n"
" } while (atomic_cmpxchg((volatile __global atomi*)source, prevVal.intVal, newVal.intVal) != prevVal.intVal);\n"
"}\n";
return os.str();
}
}

2
Source/EmberCL/IterOpenCLKernelCreator.cpp
View File

@ -334,7 +334,7 @@ string IterOpenCLKernelCreator<T>::CreateIterKernelString(const Ember<T>& ember,
CarToRasFunctionString;
if (lockAccum)
os << AtomicString();
os << AtomicString;
os <<
xformFuncs.str() <<