Menu
▾
▴
[openMSX-commits] SF.net SVN: openmsx: [5956] openmsx/trunk
|
From: <m97...@us...> - 2006-12-22 08:53:43
|
Revision: 5956
http://svn.sourceforge.net/openmsx/?rev=5956&view=rev
Author: m9710797
Date: 2006-12-22 00:53:37 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
removed charDisplayCache and bitmapDisplayCache from SDLRasterizer
Modified Paths:
--------------
openmsx/trunk/ChangeLog
openmsx/trunk/src/video/SDLRasterizer.cc
openmsx/trunk/src/video/SDLRasterizer.hh
Modified: openmsx/trunk/ChangeLog
===================================================================
--- openmsx/trunk/ChangeLog 2006-12-22 08:28:06 UTC (rev 5955)
+++ openmsx/trunk/ChangeLog 2006-12-22 08:53:37 UTC (rev 5956)
@@ -1,5 +1,10 @@
$Id$
+2006-12-22 Wouter Vermaelen <wou...@sc...>
+ * Removed charDisplayCache and bitmapDisplayCache from SDLRasterizer:
+ - I measured around 5% speedup in screen5,
+ around 20%(!) in screen0/80
+
2006-12-18 Wouter Vermaelen <wou...@sc...>
* The -Wparentheses warning is now also enabled in c++ mode in recent
gcc versions (4.3 SVN version). This for example warns when
Modified: openmsx/trunk/src/video/SDLRasterizer.cc
===================================================================
--- openmsx/trunk/src/video/SDLRasterizer.cc 2006-12-22 08:28:06 UTC (rev 5955)
+++ openmsx/trunk/src/video/SDLRasterizer.cc 2006-12-22 08:53:37 UTC (rev 5956)
@@ -50,90 +50,22 @@
}
template <class Pixel>
-inline void SDLRasterizer<Pixel>::renderBitmapLine(
- byte mode, int vramLine)
+inline void SDLRasterizer<Pixel>::renderBitmapLine(Pixel* buf, unsigned vramLine)
{
- if (lineValidInMode[vramLine] != mode) {
- const byte* vramPtr =
- vram.bitmapCacheWindow.getReadArea(vramLine * 128, 128);
- bitmapConverter->convertLine(
- bitmapDisplayCache->getLinePtr(vramLine, (Pixel*)0),
- vramPtr);
- lineValidInMode[vramLine] = mode;
- }
-}
-
-template <class Pixel>
-inline void SDLRasterizer<Pixel>::renderBitmapLines(
- byte line, int count)
-{
- byte mode = vdp.getDisplayMode().getByte();
- // Which bits in the name mask determine the page?
- int pageMask = 0x200 | vdp.getEvenOddMask();
- int nameMask = vram.nameTable.getMask() >> 7;
-
- while (count--) {
- // TODO: Optimise addr and line; too many conversions right now.
- int vramLine = nameMask & (pageMask | line);
- renderBitmapLine(mode, vramLine);
- if (vdp.isMultiPageScrolling()) {
- vramLine &= ~0x100;
- renderBitmapLine(mode, vramLine);
- }
- line++; // is a byte, so wraps at 256
- }
-}
-
-template <class Pixel>
-inline void SDLRasterizer<Pixel>::renderPlanarBitmapLine(
- byte mode, int vramLine)
-{
- if ((lineValidInMode[vramLine | 0] != mode) ||
- (lineValidInMode[vramLine | 512] != mode)) {
+ if (vdp.getDisplayMode().isPlanar()) {
const byte* vramPtr0;
const byte* vramPtr1;
vram.bitmapCacheWindow.getReadAreaPlanar(
vramLine * 256, 256, vramPtr0, vramPtr1);
- bitmapConverter->convertLinePlanar(
- bitmapDisplayCache->getLinePtr(vramLine, (Pixel*)0),
- vramPtr0, vramPtr1);
- lineValidInMode[vramLine | 0] = mode;
- lineValidInMode[vramLine | 512] = mode;
+ bitmapConverter->convertLinePlanar(buf, vramPtr0, vramPtr1);
+ } else {
+ const byte* vramPtr =
+ vram.bitmapCacheWindow.getReadArea(vramLine * 128, 128);
+ bitmapConverter->convertLine(buf, vramPtr);
}
}
template <class Pixel>
-inline void SDLRasterizer<Pixel>::renderPlanarBitmapLines(
- byte line, int count)
-{
- byte mode = vdp.getDisplayMode().getByte();
- // Which bits in the name mask determine the page?
- int pageMask = vdp.getEvenOddMask();
- while (count--) {
- // TODO: Optimise addr and line; too many conversions right now.
- int vramLine = (vram.nameTable.getMask() >> 7) & (pageMask | line);
- renderPlanarBitmapLine(mode, vramLine);
- if (vdp.isMultiPageScrolling()) {
- vramLine &= ~0x100;
- renderPlanarBitmapLine(mode, vramLine);
- }
- line++; // is a byte, so wraps at 256
- }
-}
-
-template <class Pixel>
-inline void SDLRasterizer<Pixel>::renderCharacterLines(
- byte line, int count)
-{
- while (count--) {
- // Render this line.
- characterConverter->convertLine(
- charDisplayCache->getLinePtr(line, (Pixel*)0), line);
- line++; // is a byte, so wraps at 256
- }
-}
-
-template <class Pixel>
SDLRasterizer<Pixel>::SDLRasterizer(
VDP& vdp_, Display& display, VisibleSurface& screen_,
std::auto_ptr<PostProcessor> postProcessor_
@@ -149,14 +81,6 @@
{
workFrame = new RawFrame(screen.getFormat(), 640, 240);
- // Create display caches.
- charDisplayCache = new RawFrame(
- screen.getFormat(), 512, vdp.isMSX1VDP() ? 192 : 256
- );
- bitmapDisplayCache = vdp.isMSX1VDP()
- ? NULL
- : new RawFrame(screen.getFormat(), 512, 256 * 4);
-
// Init the palette.
precalcPalette();
@@ -182,8 +106,6 @@
renderSettings.getBrightness() .detach(*this);
renderSettings.getContrast() .detach(*this);
- delete bitmapDisplayCache;
- delete charDisplayCache;
delete workFrame;
}
@@ -200,9 +122,6 @@
setDisplayMode(vdp.getDisplayMode());
spriteConverter->setTransparency(vdp.getTransparency());
- // Invalidate bitmap cache.
- memset(lineValidInMode, 0xFF, sizeof(lineValidInMode));
-
resetPalette();
}
@@ -255,22 +174,13 @@
}
template <class Pixel>
-void SDLRasterizer<Pixel>::setPalette(
- int index, int grb)
+void SDLRasterizer<Pixel>::setPalette(int index, int grb)
{
// Update SDL colours in palette.
Pixel newColor = V9938_COLOURS[(grb >> 4) & 7][grb >> 8][grb & 7];
- if ((palFg[index ] != newColor) ||
- (palFg[index + 16] != newColor) ||
- (palBg[index ] != newColor)) {
- palFg[index ] = newColor;
- palFg[index + 16] = newColor;
- palBg[index ] = newColor;
- // Any line containing pixels of this colour must be repainted.
- // We don't know which lines contain which colours,
- // so we have to repaint them all.
- memset(lineValidInMode, 0xFF, sizeof(lineValidInMode));
- }
+ palFg[index ] = newColor;
+ palFg[index + 16] = newColor;
+ palBg[index ] = newColor;
precalcColourIndex0(vdp.getDisplayMode(), vdp.getTransparency(),
vdp.getBackgroundColour());
@@ -359,32 +269,17 @@
int tpIndex = transparency ? bgcolorIndex : 0;
if (mode.getBase() != DisplayMode::GRAPHIC5) {
- if (palFg[0] != palBg[tpIndex]) {
- palFg[0] = palBg[tpIndex];
-
- // Any line containing pixels of colour 0 must be repainted.
- // We don't know which lines contain such pixels,
- // so we have to repaint them all.
- memset(lineValidInMode, 0xFF, sizeof(lineValidInMode));
- }
+ palFg[0] = palBg[tpIndex];
} else {
- if ((palFg[ 0] != palBg[tpIndex >> 2]) ||
- (palFg[16] != palBg[tpIndex & 3])) {
- palFg[ 0] = palBg[tpIndex >> 2];
- palFg[16] = palBg[tpIndex & 3];
-
- // Any line containing pixels of colour 0 must be repainted.
- // We don't know which lines contain such pixels,
- // so we have to repaint them all.
- memset(lineValidInMode, 0xFF, sizeof(lineValidInMode));
- }
+ palFg[ 0] = palBg[tpIndex >> 2];
+ palFg[16] = palBg[tpIndex & 3];
}
}
template <class Pixel>
-void SDLRasterizer<Pixel>::updateVRAMCache(int address)
+void SDLRasterizer<Pixel>::updateVRAMCache(int /*address*/)
{
- lineValidInMode[address >> 7] = 0xFF;
+ // TODO can we get rid of this method? GLRasterizer still needs it
}
template <class Pixel>
@@ -432,8 +327,8 @@
void SDLRasterizer<Pixel>::drawDisplay(
int /*fromX*/, int fromY,
int displayX, int displayY,
- int displayWidth, int displayHeight
-) {
+ int displayWidth, int displayHeight)
+{
DisplayMode mode = vdp.getDisplayMode();
unsigned lineWidth = mode.getLineWidth();
if (lineWidth == 256) {
@@ -445,8 +340,7 @@
// Clip to screen area.
int screenLimitY = std::min(
fromY + displayHeight - lineRenderTop,
- 240
- );
+ 240);
int screenY = fromY - lineRenderTop;
if (screenY < 0) {
displayY -= screenY;
@@ -487,13 +381,6 @@
}
if (mode.isBitmapMode()) {
- // Bring bitmap cache up to date.
- if (mode.isPlanar()) {
- renderPlanarBitmapLines(displayY, displayHeight);
- } else {
- renderBitmapLines(displayY, displayHeight);
- }
-
// Which bits in the name mask determine the page?
int pageMaskOdd = (mode.isPlanar() ? 0x000 : 0x200) |
vdp.getEvenOddMask();
@@ -501,18 +388,17 @@
? (pageMaskOdd & ~0x100)
: pageMaskOdd;
- // Copy from cache to screen.
for (int y = screenY; y < screenLimitY; y++) {
const int vramLine[2] = {
(vram.nameTable.getMask() >> 7) & (pageMaskEven | displayY),
(vram.nameTable.getMask() >> 7) & (pageMaskOdd | displayY)
- };
+ };
int firstPageWidth = pageBorder - displayX;
if (firstPageWidth > 0) {
- const Pixel* src = bitmapDisplayCache->getLinePtr(
- vramLine[scrollPage1], (Pixel*)0) +
- displayX + hScroll;
+ Pixel buf[512];
+ renderBitmapLine(buf, vramLine[scrollPage1]);
+ const Pixel* src = buf + displayX + hScroll;
Pixel* dst = workFrame->getLinePtr(y, (Pixel*)0)
+ leftBackground + displayX;
MemoryOps::stream_memcpy(dst, src, firstPageWidth);
@@ -523,8 +409,9 @@
unsigned x = displayX < pageBorder
? 0 : displayX + hScroll - lineWidth;
unsigned num = displayWidth - firstPageWidth;
- const Pixel* src = bitmapDisplayCache->getLinePtr(
- vramLine[scrollPage2], (Pixel*)0) + x;
+ Pixel buf[512];
+ renderBitmapLine(buf, vramLine[scrollPage2]);
+ const Pixel* src = buf + x;
Pixel* dst = workFrame->getLinePtr(y, (Pixel*)0)
+ leftBackground + displayX
+ firstPageWidth;
@@ -535,14 +422,13 @@
displayY = (displayY + 1) & 255;
}
} else {
- renderCharacterLines(displayY, displayHeight);
-
- // TODO: Implement horizontal scroll high.
+ // horizontal scroll (high) is implemented in CharacterConverter
for (int y = screenY; y < screenLimitY; y++) {
assert(!vdp.isMSX1VDP() || displayY < 192);
- const Pixel* src = charDisplayCache->getLinePtr(
- displayY, (Pixel*)0) + displayX;
+ Pixel buf[512];
+ characterConverter->convertLine(buf, displayY);
+ const Pixel* src = buf + displayX;
Pixel* dst = workFrame->getLinePtr(y, (Pixel*)0)
+ leftBackground + displayX;
MemoryOps::stream_memcpy(dst, src, displayWidth);
@@ -557,14 +443,13 @@
void SDLRasterizer<Pixel>::drawSprites(
int /*fromX*/, int fromY,
int displayX, int displayY,
- int displayWidth, int displayHeight
-) {
+ int displayWidth, int displayHeight)
+{
// Clip to screen area.
// TODO: Code duplicated from drawDisplay.
int screenLimitY = std::min(
fromY + displayHeight - lineRenderTop,
- 240
- );
+ 240);
int screenY = fromY - lineRenderTop;
if (screenY < 0) {
displayY -= screenY;
@@ -582,8 +467,7 @@
int limitY = fromY + displayHeight;
int screenX = translateX(
vdp.getLeftSprites(),
- vdp.getDisplayMode().getLineWidth() == 512
- );
+ vdp.getDisplayMode().getLineWidth() == 512);
for (int y = fromY; y < limitY; y++, screenY++) {
Pixel* pixelPtr = workFrame->getLinePtr(screenY, (Pixel*)0) + screenX;
if (spriteMode == 1) {
@@ -603,9 +487,6 @@
(&setting == &renderSettings.getColorMatrix())) {
precalcPalette();
resetPalette();
-
- // Invalidate bitmap cache (still needed for non-palette modes)
- memset(lineValidInMode, 0xFF, sizeof(lineValidInMode));
}
}
Modified: openmsx/trunk/src/video/SDLRasterizer.hh
===================================================================
--- openmsx/trunk/src/video/SDLRasterizer.hh 2006-12-22 08:28:06 UTC (rev 5955)
+++ openmsx/trunk/src/video/SDLRasterizer.hh 2006-12-22 08:53:37 UTC (rev 5956)
@@ -66,11 +66,7 @@
*/
inline static int translateX(int absoluteX, bool narrow);
- inline void renderBitmapLine(byte mode, int vramLine);
- inline void renderBitmapLines(byte line, int count);
- inline void renderPlanarBitmapLine(byte mode, int vramLine);
- inline void renderPlanarBitmapLines(byte line, int count);
- inline void renderCharacterLines(byte line, int count);
+ inline void renderBitmapLine(Pixel* buf, unsigned vramLine);
/** Get the pixel colour of a graphics 7 colour index.
*/
@@ -149,28 +145,10 @@
*/
RawFrame* workFrame;
- /** Cache for rendered VRAM in character modes.
- * Cache line (N + scroll) corresponds to display line N.
- * It holds a single page of 256 lines.
- */
- RawFrame* charDisplayCache;
-
- /** Cache for rendered VRAM in bitmap modes.
- * Cache line N corresponds to VRAM at N * 128.
- * It holds up to 4 pages of 256 lines each.
- * In Graphics6/7 the lower two pages are used.
- */
- RawFrame* bitmapDisplayCache;
-
/** The current renderer settings (gamma, brightness, contrast)
*/
RenderSettings& renderSettings;
- /** Display mode the line is valid in.
- * 0xFF means invalid in every mode.
- */
- byte lineValidInMode[256 * 4];
-
/** VRAM to pixels converter for character display modes.
*/
std::auto_ptr<CharacterConverter<Pixel> > characterConverter;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|