Merged in mmastriani/fractorium_michel (pull request #43)

Fixed cubic3D and cubicLattice_3D variations for AMD GPUs
This commit is contained in:
Michel Mastriani 2020-04-10 18:22:22 +00:00 committed by Matt Feemster
commit 8da0774652

View File

@ -737,42 +737,43 @@ public:
"\n"
"\t\tswitch (useNode)\n"
"\t\t{\n"
"\t\t case 0 :\n"
"\t\t case 0:\n"
"\t\t vOut.x = val1 + " << halfweight << ";\n"
"\t\t vOut.y = val2 + " << halfweight << ";\n"
"\t\t vOut.z = val3 + " << halfweight << ";\n"
"\t\t break;\n"
"\t\t case 1 :\n"
"\t\t case 1:\n"
"\t\t vOut.x = val1 + " << halfweight << ";\n"
"\t\t vOut.y = val2 - " << halfweight << ";\n"
"\t\t vOut.z = val3 + " << halfweight << ";\n"
"\t\t break;\n"
"\t\t case 2 :\n"
"\t\t case 2:\n"
"\t\t vOut.x = val1 + " << halfweight << ";\n"
"\t\t vOut.y = val2 + " << halfweight << ";\n"
"\t\t vOut.z = val3 - " << halfweight << ";\n"
"\t\t break;\n"
"\t\t case 3 :\n"
"\t\t case 3:\n"
"\t\t vOut.x = val1 + " << halfweight << ";\n"
"\t\t vOut.y = val2 - " << halfweight << ";\n"
"\t\t vOut.z = val3 - " << halfweight << ";\n"
"\t\t break;\n"
"\t\t case 4 :\n"
"\t\t case 4:\n"
"\t\t vOut.x = val1 - " << halfweight << ";\n"
"\t\t vOut.y = val2 + " << halfweight << ";\n"
"\t\t vOut.z = val3 + " << halfweight << ";\n"
"\t\t break;\n"
"\t\t case 5 :\n"
"\t\t case 5:\n"
"\t\t vOut.x = val1 - " << halfweight << ";\n"
"\t\t vOut.y = val2 - " << halfweight << ";\n"
"\t\t vOut.z = val3 + " << halfweight << ";\n"
"\t\t break;\n"
"\t\t case 6 :\n"
"\t\t case 6:\n"
"\t\t vOut.x = val1 - " << halfweight << ";\n"
"\t\t vOut.y = val2 + " << halfweight << ";\n"
"\t\t vOut.z = val3 - " << halfweight << ";\n"
"\t\t break;\n"
"\t\t case 7 :\n"
"\t\t case 7:\n"
"\t\t default:\n"
"\t\t vOut.x = val1 - " << halfweight << ";\n"
"\t\t vOut.y = val2 - " << halfweight << ";\n"
"\t\t vOut.z = val3 - " << halfweight << ";\n"
@ -987,42 +988,43 @@ public:
<< "\n"
<< "\t\tswitch (useNode)\n"
<< "\t\t{\n"
<< "\t\t case 0 :\n"
<< "\t\t case 0:\n"
<< "\t\t vOut.x = pxtx + " << weight << ";\n"
<< "\t\t vOut.y = pyty + " << weight << ";\n"
<< "\t\t vOut.z = pztz + " << weight << ";\n"
<< "\t\t break;\n"
<< "\t\t case 1 :\n"
<< "\t\t case 1:\n"
<< "\t\t vOut.x = pxtx + " << weight << ";\n"
<< "\t\t vOut.y = pyty - " << weight << ";\n"
<< "\t\t vOut.z = pztz + " << weight << ";\n"
<< "\t\t break;\n"
<< "\t\t case 2 :\n"
<< "\t\t case 2:\n"
<< "\t\t vOut.x = pxtx + " << weight << ";\n"
<< "\t\t vOut.y = pyty + " << weight << ";\n"
<< "\t\t vOut.z = pztz - " << weight << ";\n"
<< "\t\t break;\n"
<< "\t\t case 3 :\n"
<< "\t\t case 3:\n"
<< "\t\t vOut.x = pxtx + " << weight << ";\n"
<< "\t\t vOut.y = pyty - " << weight << ";\n"
<< "\t\t vOut.z = pztz - " << weight << ";\n"
<< "\t\t break;\n"
<< "\t\t case 4 :\n"
<< "\t\t case 4:\n"
<< "\t\t vOut.x = pxtx - " << weight << ";\n"
<< "\t\t vOut.y = pyty + " << weight << ";\n"
<< "\t\t vOut.z = pztz + " << weight << ";\n"
<< "\t\t break;\n"
<< "\t\t case 5 :\n"
<< "\t\t case 5:\n"
<< "\t\t vOut.x = pxtx - " << weight << ";\n"
<< "\t\t vOut.y = pyty - " << weight << ";\n"
<< "\t\t vOut.z = pztz + " << weight << ";\n"
<< "\t\t break;\n"
<< "\t\t case 6 :\n"
<< "\t\t case 6:\n"
<< "\t\t vOut.x = pxtx - " << weight << ";\n"
<< "\t\t vOut.y = pyty + " << weight << ";\n"
<< "\t\t vOut.z = pztz - " << weight << ";\n"
<< "\t\t break;\n"
<< "\t\t case 7 :\n"
<< "\t\t case 7:\n"
<< "\t\t default:\n"
<< "\t\t vOut.x = pxtx - " << weight << ";\n"
<< "\t\t vOut.y = pyty - " << weight << ";\n"
<< "\t\t vOut.z = pztz - " << weight << ";\n"