zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 23:32:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed multithreaded rendering issue with the fuzz effect

Browse source
This commit is contained in:
Magnus Norddahl 2016-06-17 14:45:52 +02:00
parent 822bbd5b9a
commit 4ef2fb3cdb
1 changed files with 55 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/r_draw_rgba.cpp
View file

@ -604,26 +604,48 @@ public:
int count; int count;
uint32_t *dest; uint32_t *dest;
// Adjust borders. Low... int yl = MAX(_yl, 1);
if (_yl == 0) int yh = MIN(_yh, _fuzzviewheight);
_yl = 1;
// .. and high. count = thread->count_for_thread(yl, yh - yl + 1);
if (_yh > _fuzzviewheight)
_yh = _fuzzviewheight;
count = thread->count_for_thread(_yl, _yh - _yl + 1);
// Zero length. // Zero length.
if (count <= 0) if (count <= 0)
return; return;
dest = thread->dest_for_thread(_yl, _pitch, ylookup[_yl] + _x + (uint32_t*)_destorg); dest = thread->dest_for_thread(yl, _pitch, ylookup[yl] + _x + (uint32_t*)_destorg);
int pitch = _pitch * thread->num_cores; int pitch = _pitch * thread->num_cores;
int fuzzstep = thread->num_cores; int fuzzstep = thread->num_cores;
int fuzz = (_fuzzpos + thread->skipped_by_thread(_yl)) % FUZZTABLE; int fuzz = (_fuzzpos + thread->skipped_by_thread(yl)) % FUZZTABLE;
yl += thread->skipped_by_thread(yl);
// Handle the case where we would go out of bounds at the top:
if (yl < fuzzstep)
{
count--;
uint32_t bg = dest[fuzzoffset[fuzz] * fuzzstep + pitch];
uint32_t bg_red = (bg >> 16) & 0xff;
uint32_t bg_green = (bg >> 8) & 0xff;
uint32_t bg_blue = (bg) & 0xff;
uint32_t red = bg_red * 3 / 4;
uint32_t green = bg_green * 3 / 4;
uint32_t blue = bg_blue * 3 / 4;
*dest = 0xff000000 | (red << 16) | (green << 8) | blue;
dest += pitch;
fuzz += fuzzstep;
fuzz %= FUZZTABLE;
}
bool lowerbounds = (yl + count * fuzzstep > _fuzzviewheight);
if (lowerbounds)
count--;
// Fuzz where fuzzoffset stays within bounds
while (count > 0) while (count > 0)
{ {
int available = (FUZZTABLE - fuzz); int available = (FUZZTABLE - fuzz);
@ -635,14 +657,14 @@ public:
count -= cnt; count -= cnt;
do do
{ {
uint32_t bg = dest[fuzzoffset[fuzz]]; uint32_t bg = dest[fuzzoffset[fuzz] * fuzzstep];
uint32_t bg_red = (bg >> 16) & 0xff; uint32_t bg_red = (bg >> 16) & 0xff;
uint32_t bg_green = (bg >> 8) & 0xff; uint32_t bg_green = (bg >> 8) & 0xff;
uint32_t bg_blue = (bg) & 0xff; uint32_t bg_blue = (bg) & 0xff;
uint32_t red = bg_red * 7 / 8; uint32_t red = bg_red * 3 / 4;
uint32_t green = bg_green * 7 / 8; uint32_t green = bg_green * 3 / 4;
uint32_t blue = bg_blue * 7 / 8; uint32_t blue = bg_blue * 3 / 4;
*dest = 0xff000000 | (red << 16) | (green << 8) | blue; *dest = 0xff000000 | (red << 16) | (green << 8) | blue;
dest += pitch; dest += pitch;
@ -651,6 +673,21 @@ public:
fuzz %= FUZZTABLE; fuzz %= FUZZTABLE;
} }
// Handle the case where we would go out of bounds at the bottom
if (lowerbounds)
{
uint32_t bg = dest[fuzzoffset[fuzz] * fuzzstep - pitch];
uint32_t bg_red = (bg >> 16) & 0xff;
uint32_t bg_green = (bg >> 8) & 0xff;
uint32_t bg_blue = (bg) & 0xff;
uint32_t red = bg_red * 3 / 4;
uint32_t green = bg_green * 3 / 4;
uint32_t blue = bg_blue * 3 / 4;
*dest = 0xff000000 | (red << 16) | (green << 8) | blue;
}
} }
}; };
@ -3897,11 +3934,9 @@ void R_DrawFuzzColumn_rgba()
{ {
DrawerCommandQueue::QueueCommand<DrawFuzzColumnRGBACommand>(); DrawerCommandQueue::QueueCommand<DrawFuzzColumnRGBACommand>();
if (dc_yl == 0) dc_yl = MAX(dc_yl, 1);
dc_yl = 1; dc_yh = MIN(dc_yh, fuzzviewheight);
if (dc_yh > fuzzviewheight) if (dc_yl <= dc_yh)
dc_yh = fuzzviewheight;
fuzzpos = (fuzzpos + dc_yh - dc_yl + 1) % FUZZTABLE; fuzzpos = (fuzzpos + dc_yh - dc_yl + 1) % FUZZTABLE;
} }