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

Commodore64: Simplify g_Idle code, the document I was basing this information on was inconsistent with the circuitry (and this way makes more sense)

This commit is contained in:
saxxonpike 2013-08-31 23:10:02 +00:00
parent 58649b810e
commit 826ebba22f
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Graphics.cs
View File

@ -40,7 +40,10 @@ namespace BizHawk.Emulation.Computers.Commodore64.Experimental.Chips.Internals
{ {
if ((rasterX & 0x7) == g_FillRasterX) if ((rasterX & 0x7) == g_FillRasterX)
{ {
g_DataC = g_BufferC; if (g_Idle)
g_DataC = 0;
else
g_DataC = g_BufferC;
if (multiColorMode && (bitmapMode || (g_DataC & 0x8) != 0)) if (multiColorMode && (bitmapMode || (g_DataC & 0x8) != 0))
{ {
@ -95,28 +98,28 @@ namespace BizHawk.Emulation.Computers.Commodore64.Experimental.Chips.Internals
if (g_OutData == GRAPHICS_DATA_00) if (g_OutData == GRAPHICS_DATA_00)
g_OutPixel = backgroundColor[0]; g_OutPixel = backgroundColor[0];
else if (g_OutData == GRAPHICS_DATA_11) else if (g_OutData == GRAPHICS_DATA_11)
g_OutPixel = g_Idle ? 0 : ((g_DataC >> 8) & 0x7); g_OutPixel = ((g_DataC >> 8) & 0x7);
else if (g_OutData == GRAPHICS_DATA_01) else if (g_OutData == GRAPHICS_DATA_01)
g_OutPixel = g_Idle ? 0 : backgroundColor[1]; g_OutPixel = backgroundColor[1];
else else
g_OutPixel = g_Idle ? 0 : backgroundColor[2]; g_OutPixel = backgroundColor[2];
break; break;
case GraphicsMode.Mode010: case GraphicsMode.Mode010:
case GraphicsMode.Mode011: case GraphicsMode.Mode011:
if (g_OutData == GRAPHICS_DATA_00) if (g_OutData == GRAPHICS_DATA_00)
g_OutPixel = (g_Idle && !multiColorMode) ? 0 : backgroundColor[0]; g_OutPixel = backgroundColor[0];
else if (g_OutData == GRAPHICS_DATA_01) else if (g_OutData == GRAPHICS_DATA_01)
g_OutPixel = g_Idle ? 0 : ((g_DataC >> 4) & 0xF); g_OutPixel = ((g_DataC >> 4) & 0xF);
else if (g_OutData == GRAPHICS_DATA_10) else if (g_OutData == GRAPHICS_DATA_10)
g_OutPixel = g_Idle ? 0 : (g_DataC & 0xF); g_OutPixel = (g_DataC & 0xF);
else else
g_OutPixel = g_Idle ? 0 : (g_DataC >> 8); g_OutPixel = (g_DataC >> 8);
break; break;
case GraphicsMode.Mode100: case GraphicsMode.Mode100:
if (g_OutData == GRAPHICS_DATA_00) if (g_OutData == GRAPHICS_DATA_00)
g_OutPixel = g_Idle ? backgroundColor[0] : backgroundColor[(g_DataC >> 6) & 0x3]; g_OutPixel = backgroundColor[(g_DataC >> 6) & 0x3];
else else
g_OutPixel = g_Idle ? 0 : (g_DataC >> 8); g_OutPixel = (g_DataC >> 8);
break; break;
default: default:
g_OutPixel = 0; g_OutPixel = 0;