Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SEGIVoxelizeScene_C interlockedAddFloat4 function causing crashes #17

Merged
merged 1 commit into from Sep 25, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 22 additions & 14 deletions Resources/SEGIVoxelizeScene_C.shader
Expand Up @@ -224,30 +224,38 @@

void interlockedAddFloat4(RWTexture3D<uint> destination, int3 coord, float4 value)
{
uint comp;
uint orig = destination[coord];
uint writeValue = EncodeRGBAuint(value);
uint compareValue = 0;
uint originalValue;

[allow_uav_condition]
do
while (true)
{
comp = orig;
InterlockedCompareExchange(destination[coord], comp, EncodeRGBAuint(max(DecodeRGBAuint(orig), value)), orig);
}
while (orig != comp);
InterlockedCompareExchange(destination[coord], compareValue, writeValue, originalValue);
if (compareValue == originalValue)
break;
compareValue = originalValue;
float4 originalValueFloats = DecodeRGBAuint(originalValue);
writeValue = EncodeRGBAuint(originalValueFloats + value);
}
}

void interlockedAddFloat4b(RWTexture3D<uint> destination, int3 coord, float4 value)
{
uint comp;
uint orig = destination[coord];
uint writeValue = EncodeRGBAuint(value);
uint compareValue = 0;
uint originalValue;

[allow_uav_condition]
do
while (true)
{
comp = orig;
InterlockedCompareExchange(destination[coord], comp, EncodeRGBAuint(max(DecodeRGBAuint(orig), value)), orig);
}
while (orig != comp);
InterlockedCompareExchange(destination[coord], compareValue, writeValue, originalValue);
if (compareValue == originalValue)
break;
compareValue = originalValue;
float4 originalValueFloats = DecodeRGBAuint(originalValue);
writeValue = EncodeRGBAuint(originalValueFloats + value);
}
}

float4x4 SEGIVoxelToGIProjection;
Expand Down