zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fix missing pixels on walls in palette mode for npot2 textures

This commit is contained in:
Magnus Norddahl 2017-07-21 22:48:44 +02:00
parent b1d1ac13b6
commit 5be74890b7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/swrenderer/line/r_walldraw.cpp
View File

@ -75,7 +75,7 @@ namespace swrenderer
v *= height; v *= height;
v *= (1 << uv_fracbits); v *= (1 << uv_fracbits);
uv_pos = (uint32_t)v; uv_pos = (uint32_t)(int64_t)v;
uv_step = xs_ToFixed(uv_fracbits, uv_stepd); uv_step = xs_ToFixed(uv_fracbits, uv_stepd);
if (uv_step == 0) // To prevent divide by zero elsewhere if (uv_step == 0) // To prevent divide by zero elsewhere
uv_step = 1; uv_step = 1;
@ -117,8 +117,8 @@ namespace swrenderer
} }
// Convert to uint32_t: // Convert to uint32_t:
uv_pos = (uint32_t)(v * 0x100000000LL); uv_pos = (uint32_t)(int64_t)(v * 0x100000000LL);
uv_step = (uint32_t)(v_step * 0x100000000LL); uv_step = (uint32_t)(int64_t)(v_step * 0x100000000LL);
uv_max = 0; uv_max = 0;
// Texture mipmap and filter selection: // Texture mipmap and filter selection:
@ -288,6 +288,7 @@ namespace swrenderer
uint32_t uv_pos = sampler.uv_pos; uint32_t uv_pos = sampler.uv_pos;
uint32_t left = y2 - y1; uint32_t left = y2 - y1;
int y = y1;
while (left > 0) while (left > 0)
{ {
uint32_t available = sampler.uv_max - uv_pos; uint32_t available = sampler.uv_max - uv_pos;
@ -298,12 +299,13 @@ namespace swrenderer
drawerargs.SetTexture(sampler.source, sampler.source2, sampler.height); drawerargs.SetTexture(sampler.source, sampler.source2, sampler.height);
drawerargs.SetTextureUPos(sampler.texturefracx); drawerargs.SetTextureUPos(sampler.texturefracx);
drawerargs.SetDest(Thread->Viewport.get(), x, y1); drawerargs.SetDest(Thread->Viewport.get(), x, y);
drawerargs.SetCount(count); drawerargs.SetCount(count);
drawerargs.SetTextureVStep(sampler.uv_step); drawerargs.SetTextureVStep(sampler.uv_step);
drawerargs.SetTextureVPos(uv_pos); drawerargs.SetTextureVPos(uv_pos);
drawerargs.DrawColumn(Thread); drawerargs.DrawColumn(Thread);
y += count;
left -= count; left -= count;
uv_pos += sampler.uv_step * count; uv_pos += sampler.uv_step * count;
if (uv_pos >= sampler.uv_max) if (uv_pos >= sampler.uv_max)