ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pre-calculate phosphor colours, and remove redundant shift parameter. 

This leads to nice speedups in the TIASurface::render() method.
This commit is contained in:
Stephen Anthony 2017-08-07 18:39:30 -02:30
parent 322af0fb38
commit 1dc78a9b5b
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/emucore/TIASurface.cxx
View File

@ -55,6 +55,11 @@ TIASurface::TIASurface(OSystem& system)
myBaseTiaSurface = myFB.allocateSurface(kTIAW*2, kTIAH); myBaseTiaSurface = myFB.allocateSurface(kTIAW*2, kTIAH);
memset(myRGBFramebuffer, 0, AtariNTSC::outWidth(kTIAW) * kTIAH); memset(myRGBFramebuffer, 0, AtariNTSC::outWidth(kTIAW) * kTIAH);
// Precalculate the average colors for the 'phosphor' effect
for(Int16 c = 255; c >= 0; c--)
for(Int16 p = 255; p >= 0; p--)
myPhosphorPalette[c][p] = getPhosphor(c, p);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -139,7 +144,7 @@ uInt32 TIASurface::pixel(uInt32 idx, uInt8 shift)
const uInt32 p = myRGBFramebuffer[idx]; const uInt32 p = myRGBFramebuffer[idx];
// Mix current calculated frame with previous displayed frame // Mix current calculated frame with previous displayed frame
const uInt32 retVal = getRGBPhosphor(myPalette[c], p, shift); const uInt32 retVal = getRGBPhosphor(myPalette[c], p);
// Store back into displayed frame buffer (for next frame) // Store back into displayed frame buffer (for next frame)
myRGBFramebuffer[idx] = retVal; myRGBFramebuffer[idx] = retVal;
@ -237,7 +242,7 @@ void TIASurface::enablePhosphor(bool enable, int blend)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
inline uInt32 TIASurface::getRGBPhosphor(uInt32 c, uInt32 p, uInt8 shift) const inline uInt32 TIASurface::getRGBPhosphor(uInt32 c, uInt32 p) const
{ {
#define TO_RGB(color, red, green, blue) \ #define TO_RGB(color, red, green, blue) \
red = color >> 16; green = color >> 8; blue = color; red = color >> 16; green = color >> 8; blue = color;
@ -248,15 +253,9 @@ inline uInt32 TIASurface::getRGBPhosphor(uInt32 c, uInt32 p, uInt8 shift) const
TO_RGB(p, rp, gp, bp); TO_RGB(p, rp, gp, bp);
// Mix current calculated frame with previous displayed frame // Mix current calculated frame with previous displayed frame
uInt8 rn = getPhosphor(rc, rp); uInt8 rn = myPhosphorPalette[rc][rp];
uInt8 gn = getPhosphor(gc, gp); uInt8 gn = myPhosphorPalette[gc][gp];
uInt8 bn = getPhosphor(bc, bp); uInt8 bn = myPhosphorPalette[bc][bp];
if(shift)
{
// Convert RGB to grayscale
rn = gn = bn = uInt8(0.2126*rn + 0.7152*gn + 0.0722*bn);
}
return (rn << 16) | (gn << 8) | bn; return (rn << 16) | (gn << 8) | bn;
} }

7
src/emucore/TIASurface.hxx
View File

@ -119,7 +119,7 @@ class TIASurface
@return Averaged value of the two colors @return Averaged value of the two colors
*/ */
inline uInt8 getPhosphor(uInt8 c1, uInt8 c2) const { inline uInt8 getPhosphor(const uInt8 c1, uInt8 c2) const {
// Use maximum of current and decayed previous values // Use maximum of current and decayed previous values
c2 = uInt8(c2 * myPhosphorPercent); c2 = uInt8(c2 * myPhosphorPercent);
if(c1 > c2) return c1; // raise (assumed immediate) if(c1 > c2) return c1; // raise (assumed immediate)
@ -134,7 +134,7 @@ class TIASurface
@return Averaged value of the two RGB colors @return Averaged value of the two RGB colors
*/ */
uInt32 getRGBPhosphor(uInt32 c, uInt32 cp, uInt8 shift = 0) const; uInt32 getRGBPhosphor(uInt32 c, uInt32 cp) const;
/** /**
Enable/disable/query NTSC filtering effects. Enable/disable/query NTSC filtering effects.
@ -184,6 +184,9 @@ class TIASurface
// Amount to blend when using phosphor effect // Amount to blend when using phosphor effect
float myPhosphorPercent; float myPhosphorPercent;
// Precalculated averaged phosphor colors
uInt8 myPhosphorPalette[256][256];
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////
// Use scanlines in TIA rendering mode // Use scanlines in TIA rendering mode