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

Fix crash bug in 8 bit drawer

Browse source
This commit is contained in:
Magnus Norddahl 2016-11-09 00:35:41 +01:00
parent 968150ceff
commit 95df9bf48e
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/r_poly_triangle.cpp
View file

@ -369,7 +369,7 @@ void ScreenPolyTriangleDrawer::draw(const ScreenPolyTriangleDrawerArgs *args, Dr
for (int y = miny; y < maxy; y += q, dest += q * pitch) for (int y = miny; y < maxy; y += q, dest += q * pitch)
{ {
// Is this row of blocks done by this thread? // Is this row of blocks done by this thread?
if (thread->skipped_by_thread(y / q)) continue; if (thread && thread->skipped_by_thread(y / q)) continue;
for (int x = minx; x < maxx; x += q) for (int x = minx; x < maxx; x += q)
{ {
@ -436,7 +436,7 @@ void ScreenPolyTriangleDrawer::draw(const ScreenPolyTriangleDrawerArgs *args, Dr
for (int i = 0; i < TriVertex::NumVarying; i++) for (int i = 0; i < TriVertex::NumVarying; i++)
{ {
float pos = varyingTL[i] + varyingBL[i] * iy; float pos = varyingTL[i] + varyingBL[i] * iy;
float step = (varyingTR[i] + varyingBR[i] * iy - varying[i]) * (1.0f / q); float step = (varyingTR[i] + varyingBR[i] * iy - pos) * (1.0f / q);
varying[i] = (uint32_t)((pos - floor(pos)) * 0x100000000LL); varying[i] = (uint32_t)((pos - floor(pos)) * 0x100000000LL);
varyingStep[i] = (uint32_t)(step * 0x100000000LL); varyingStep[i] = (uint32_t)(step * 0x100000000LL);
@ -451,7 +451,8 @@ void ScreenPolyTriangleDrawer::draw(const ScreenPolyTriangleDrawerArgs *args, Dr
uint32_t vpos = ((vfrac >> 16) * textureHeight) >> 16; uint32_t vpos = ((vfrac >> 16) * textureHeight) >> 16;
uint32_t uvoffset = upos * textureHeight + vpos; uint32_t uvoffset = upos * textureHeight + vpos;
buffer[ix] = texturePixels[uvoffset]; if (texturePixels[uvoffset] != 0)
buffer[ix] = texturePixels[uvoffset];
for (int i = 0; i < TriVertex::NumVarying; i++) for (int i = 0; i < TriVertex::NumVarying; i++)
varying[i] += varyingStep[i]; varying[i] += varyingStep[i];
@ -495,7 +496,8 @@ void ScreenPolyTriangleDrawer::draw(const ScreenPolyTriangleDrawerArgs *args, Dr
uint32_t vpos = ((vfrac >> 16) * textureHeight) >> 16; uint32_t vpos = ((vfrac >> 16) * textureHeight) >> 16;
uint32_t uvoffset = upos * textureHeight + vpos; uint32_t uvoffset = upos * textureHeight + vpos;
buffer[ix] = texturePixels[uvoffset]; if (texturePixels[uvoffset] != 0)
buffer[ix] = texturePixels[uvoffset];
} }
for (int i = 0; i < TriVertex::NumVarying; i++) for (int i = 0; i < TriVertex::NumVarying; i++)
@ -588,7 +590,7 @@ void ScreenPolyTriangleDrawer::fill(const ScreenPolyTriangleDrawerArgs *args, Dr
for (int y = miny; y < maxy; y += q, dest += q * pitch) for (int y = miny; y < maxy; y += q, dest += q * pitch)
{ {
// Is this row of blocks done by this thread? // Is this row of blocks done by this thread?
if (thread->skipped_by_thread(y / q)) continue; if (thread && thread->skipped_by_thread(y / q)) continue;
for (int x = minx; x < maxx; x += q) for (int x = minx; x < maxx; x += q)
{ {