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

Fix types

This commit is contained in:
Magnus Norddahl 2016-12-05 12:01:03 +01:00
parent 3b2d4fcff2
commit b755f489a3
1 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/r_draw_pal.cpp
View File

@ -606,9 +606,9 @@ namespace swrenderer
dsfixed_t yfrac; dsfixed_t yfrac;
dsfixed_t xstep; dsfixed_t xstep;
dsfixed_t ystep; dsfixed_t ystep;
BYTE *dest; uint8_t *dest;
const BYTE *source = _source; const uint8_t *source = _source;
const BYTE *colormap = _colormap; const uint8_t *colormap = _colormap;
int count; int count;
int spot; int spot;
@ -642,8 +642,8 @@ namespace swrenderer
} }
else else
{ {
BYTE yshift = 32 - _ybits; uint8_t yshift = 32 - _ybits;
BYTE xshift = yshift - _xbits; uint8_t xshift = yshift - _xbits;
int xmask = ((1 << _xbits) - 1) << _ybits; int xmask = ((1 << _xbits) - 1) << _ybits;
do do
{ {
@ -668,13 +668,13 @@ namespace swrenderer
dsfixed_t yfrac; dsfixed_t yfrac;
dsfixed_t xstep; dsfixed_t xstep;
dsfixed_t ystep; dsfixed_t ystep;
BYTE *dest; uint8_t *dest;
const BYTE *source = _source; const uint8_t *source = _source;
const BYTE *colormap = _colormap; const uint8_t *colormap = _colormap;
int count; int count;
int spot; int spot;
DWORD *fg2rgb = _srcblend; uint32_t *fg2rgb = _srcblend;
DWORD *bg2rgb = _destblend; uint32_t *bg2rgb = _destblend;
xfrac = _xfrac; xfrac = _xfrac;
yfrac = _yfrac; yfrac = _yfrac;
@ -692,8 +692,8 @@ namespace swrenderer
do do
{ {
spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6)); spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6));
DWORD fg = colormap[source[spot]]; uint32_t fg = colormap[source[spot]];
DWORD bg = *dest; uint32_t bg = *dest;
fg = fg2rgb[fg]; fg = fg2rgb[fg];
bg = bg2rgb[bg]; bg = bg2rgb[bg];
fg = (fg + bg) | 0x1f07c1f; fg = (fg + bg) | 0x1f07c1f;
@ -704,14 +704,14 @@ namespace swrenderer
} }
else else
{ {
BYTE yshift = 32 - _ybits; uint8_t yshift = 32 - _ybits;
BYTE xshift = yshift - _xbits; uint8_t xshift = yshift - _xbits;
int xmask = ((1 << _xbits) - 1) << _ybits; int xmask = ((1 << _xbits) - 1) << _ybits;
do do
{ {
spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift); spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift);
DWORD fg = colormap[source[spot]]; uint32_t fg = colormap[source[spot]];
DWORD bg = *dest; uint32_t bg = *dest;
fg = fg2rgb[fg]; fg = fg2rgb[fg];
bg = bg2rgb[bg]; bg = bg2rgb[bg];
fg = (fg + bg) | 0x1f07c1f; fg = (fg + bg) | 0x1f07c1f;
@ -728,13 +728,13 @@ namespace swrenderer
dsfixed_t yfrac; dsfixed_t yfrac;
dsfixed_t xstep; dsfixed_t xstep;
dsfixed_t ystep; dsfixed_t ystep;
BYTE *dest; uint8_t *dest;
const BYTE *source = _source; const uint8_t *source = _source;
const BYTE *colormap = _colormap; const uint8_t *colormap = _colormap;
int count; int count;
int spot; int spot;
DWORD *fg2rgb = _srcblend; uint32_t *fg2rgb = _srcblend;
DWORD *bg2rgb = _destblend; uint32_t *bg2rgb = _destblend;
xfrac = _xfrac; xfrac = _xfrac;
yfrac = _yfrac; yfrac = _yfrac;
@ -751,14 +751,14 @@ namespace swrenderer
// 64x64 is the most common case by far, so special case it. // 64x64 is the most common case by far, so special case it.
do do
{ {
BYTE texdata; uint8_t texdata;
spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6)); spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6));
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
DWORD fg = colormap[texdata]; uint32_t fg = colormap[texdata];
DWORD bg = *dest; uint32_t bg = *dest;
fg = fg2rgb[fg]; fg = fg2rgb[fg];
bg = bg2rgb[bg]; bg = bg2rgb[bg];
fg = (fg + bg) | 0x1f07c1f; fg = (fg + bg) | 0x1f07c1f;
@ -771,19 +771,19 @@ namespace swrenderer
} }
else else
{ {
BYTE yshift = 32 - _ybits; uint8_t yshift = 32 - _ybits;
BYTE xshift = yshift - _xbits; uint8_t xshift = yshift - _xbits;
int xmask = ((1 << _xbits) - 1) << _ybits; int xmask = ((1 << _xbits) - 1) << _ybits;
do do
{ {
BYTE texdata; uint8_t texdata;
spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift); spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift);
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
DWORD fg = colormap[texdata]; uint32_t fg = colormap[texdata];
DWORD bg = *dest; uint32_t bg = *dest;
fg = fg2rgb[fg]; fg = fg2rgb[fg];
bg = bg2rgb[bg]; bg = bg2rgb[bg];
fg = (fg + bg) | 0x1f07c1f; fg = (fg + bg) | 0x1f07c1f;
@ -802,13 +802,13 @@ namespace swrenderer
dsfixed_t yfrac; dsfixed_t yfrac;
dsfixed_t xstep; dsfixed_t xstep;
dsfixed_t ystep; dsfixed_t ystep;
BYTE *dest; uint8_t *dest;
const BYTE *source = _source; const uint8_t *source = _source;
const BYTE *colormap = _colormap; const uint8_t *colormap = _colormap;
int count; int count;
int spot; int spot;
DWORD *fg2rgb = _srcblend; uint32_t *fg2rgb = _srcblend;
DWORD *bg2rgb = _destblend; uint32_t *bg2rgb = _destblend;
xfrac = _xfrac; xfrac = _xfrac;
yfrac = _yfrac; yfrac = _yfrac;
@ -826,8 +826,8 @@ namespace swrenderer
do do
{ {
spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6)); spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6));
DWORD a = fg2rgb[colormap[source[spot]]] + bg2rgb[*dest]; uint32_t a = fg2rgb[colormap[source[spot]]] + bg2rgb[*dest];
DWORD b = a; uint32_t b = a;
a |= 0x01f07c1f; a |= 0x01f07c1f;
b &= 0x40100400; b &= 0x40100400;
@ -841,14 +841,14 @@ namespace swrenderer
} }
else else
{ {
BYTE yshift = 32 - _ybits; uint8_t yshift = 32 - _ybits;
BYTE xshift = yshift - _xbits; uint8_t xshift = yshift - _xbits;
int xmask = ((1 << _xbits) - 1) << _ybits; int xmask = ((1 << _xbits) - 1) << _ybits;
do do
{ {
spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift); spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift);
DWORD a = fg2rgb[colormap[source[spot]]] + bg2rgb[*dest]; uint32_t a = fg2rgb[colormap[source[spot]]] + bg2rgb[*dest];
DWORD b = a; uint32_t b = a;
a |= 0x01f07c1f; a |= 0x01f07c1f;
b &= 0x40100400; b &= 0x40100400;
@ -868,13 +868,13 @@ namespace swrenderer
dsfixed_t yfrac; dsfixed_t yfrac;
dsfixed_t xstep; dsfixed_t xstep;
dsfixed_t ystep; dsfixed_t ystep;
BYTE *dest; uint8_t *dest;
const BYTE *source = _source; const uint8_t *source = _source;
const BYTE *colormap = _colormap; const uint8_t *colormap = _colormap;
int count; int count;
int spot; int spot;
DWORD *fg2rgb = _srcblend; uint32_t *fg2rgb = _srcblend;
DWORD *bg2rgb = _destblend; uint32_t *bg2rgb = _destblend;
xfrac = _xfrac; xfrac = _xfrac;
yfrac = _yfrac; yfrac = _yfrac;
@ -891,14 +891,14 @@ namespace swrenderer
// 64x64 is the most common case by far, so special case it. // 64x64 is the most common case by far, so special case it.
do do
{ {
BYTE texdata; uint8_t texdata;
spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6)); spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6));
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
DWORD a = fg2rgb[colormap[texdata]] + bg2rgb[*dest]; uint32_t a = fg2rgb[colormap[texdata]] + bg2rgb[*dest];
DWORD b = a; uint32_t b = a;
a |= 0x01f07c1f; a |= 0x01f07c1f;
b &= 0x40100400; b &= 0x40100400;
@ -914,19 +914,19 @@ namespace swrenderer
} }
else else
{ {
BYTE yshift = 32 - _ybits; uint8_t yshift = 32 - _ybits;
BYTE xshift = yshift - _xbits; uint8_t xshift = yshift - _xbits;
int xmask = ((1 << _xbits) - 1) << _ybits; int xmask = ((1 << _xbits) - 1) << _ybits;
do do
{ {
BYTE texdata; uint8_t texdata;
spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift); spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift);
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
DWORD a = fg2rgb[colormap[texdata]] + bg2rgb[*dest]; uint32_t a = fg2rgb[colormap[texdata]] + bg2rgb[*dest];
DWORD b = a; uint32_t b = a;
a |= 0x01f07c1f; a |= 0x01f07c1f;
b &= 0x40100400; b &= 0x40100400;