224c224
< int cnt, LdsChunk *ldsChunk, NDRange *ndr)
---
> int waveId, LdsChunk *ldsChunk, NDRange *ndr)
235c235
< if (k + cnt * wfSize() < trueWgSizeTotal)
---
> if (k + waveId * wfSize() < trueWgSizeTotal)
240c240
< w->dynWaveId = cnt;
---
> w->wfId = waveId;
244c244
< w->workItemId[0][k] = (k+cnt*wfSize()) % trueWgSize[0];
---
> w->workItemId[0][k] = (k + waveId * wfSize()) % trueWgSize[0];
246c246
< ((k + cnt * wfSize()) / trueWgSize[0]) % trueWgSize[1];
---
> ((k + waveId * wfSize()) / trueWgSize[0]) % trueWgSize[1];
248c248
< (k + cnt * wfSize()) / (trueWgSize[0] * trueWgSize[1]);
---
> (k + waveId * wfSize()) / (trueWgSize[0] * trueWgSize[1]);
297,298c297,298
< if ((cnt + 1) * wfSize() >= trueWgSizeTotal) {
< w->spillWidth = trueWgSizeTotal - (cnt * wfSize());
---
> if ((waveId + 1) * wfSize() >= trueWgSizeTotal) {
> w->spillWidth = trueWgSizeTotal - (waveId * wfSize());
344c344
< int cnt = 0;
---
> int wave_id = 0;
355c355
< if (cnt * wfSize() >= trueWgSizeTotal)
---
> if (wave_id * wfSize() >= trueWgSizeTotal)
368,369c368,369
< StartWF(w, trueWgSize, trueWgSizeTotal, cnt, ldsChunk, ndr);
< ++cnt;
---
> StartWF(w, trueWgSize, trueWgSizeTotal, wave_id, ldsChunk, ndr);
> ++wave_id;