From 4d70b01da5438e53bf7bc8c81198b3b79472bc80 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 8 Mar 2017 21:34:57 -0500 Subject: [PATCH] - followed through with GZDoom's SQWORD removals. --- src/swrenderer/drawers/r_draw_rgba.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/swrenderer/drawers/r_draw_rgba.cpp b/src/swrenderer/drawers/r_draw_rgba.cpp index d90c057a3..b4e3628c3 100644 --- a/src/swrenderer/drawers/r_draw_rgba.cpp +++ b/src/swrenderer/drawers/r_draw_rgba.cpp @@ -510,10 +510,10 @@ namespace swrenderer double endz = 1.f / iz; double endu = uz*endz; double endv = vz*endz; - uint32_t stepu = (uint32_t)(SQWORD((endu - startu) * INVSPAN)); - uint32_t stepv = (uint32_t)(SQWORD((endv - startv) * INVSPAN)); - uint32_t u = (uint32_t)(SQWORD(startu) + _pviewx); - uint32_t v = (uint32_t)(SQWORD(startv) + _pviewy); + uint32_t stepu = (uint32_t)(int64_t((endu - startu) * INVSPAN)); + uint32_t stepv = (uint32_t)(int64_t((endv - startv) * INVSPAN)); + uint32_t u = (uint32_t)(int64_t(startu) + _pviewx); + uint32_t v = (uint32_t)(int64_t(startv) + _pviewy); for (int i = 0; i < SPANSIZE; i++) { @@ -541,8 +541,8 @@ namespace swrenderer double endz = 1.f / iz; startu = uz*endz; startv = vz*endz; - uint32_t u = (uint32_t)(SQWORD(startu) + _pviewx); - uint32_t v = (uint32_t)(SQWORD(startv) + _pviewy); + uint32_t u = (uint32_t)(int64_t(startu) + _pviewx); + uint32_t v = (uint32_t)(int64_t(startv) + _pviewy); uint32_t sx = ((u >> 16) * source_width) >> 16; uint32_t sy = ((v >> 16) * source_height) >> 16;