Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r27796) -Fix [FS#6545]: 32bpp-anim blitters assumed that pitch and width of the screen were equal.

Browse Source
pull/16/head
frosch 7 years ago
parent 5c7f97aff2
commit 206a0838e9
3 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File

56
src/blitter/32bpp_anim.cpp
Unescape Escape View File

@ -39,13 +39,14 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
} }
Colour *dst = (Colour *)bp->dst + bp->top * bp->pitch + bp->left; Colour *dst = (Colour *)bp->dst + bp->top * bp->pitch + bp->left;
uint16 *anim = this->anim_buf + ((uint32 *)bp->dst - (uint32 *)_screen.dst_ptr) + bp->top * this->anim_buf_width + bp->left; assert(_screen.pitch == this->anim_buf_pitch); // precondition for translating 'bp->dst' into an 'anim_buf' offset below.
uint16 *anim = this->anim_buf + ((uint32 *)bp->dst - (uint32 *)_screen.dst_ptr) + bp->top * this->anim_buf_pitch + bp->left;
const byte *remap = bp->remap; // store so we don't have to access it via bp everytime const byte *remap = bp->remap; // store so we don't have to access it via bp everytime
for (int y = 0; y < bp->height; y++) { for (int y = 0; y < bp->height; y++) {
Colour *dst_ln = dst + bp->pitch; Colour *dst_ln = dst + bp->pitch;
uint16 *anim_ln = anim + this->anim_buf_width; uint16 *anim_ln = anim + this->anim_buf_pitch;
const Colour *src_px_ln = (const Colour *)((const byte *)src_px + *(const uint32 *)src_px); const Colour *src_px_ln = (const Colour *)((const byte *)src_px + *(const uint32 *)src_px);
src_px++; src_px++;
@ -279,9 +280,8 @@ void Blitter_32bppAnim::DrawColourMappingRect(void *dst, int width, int height,
} }
Colour *udst = (Colour *)dst; Colour *udst = (Colour *)dst;
uint16 *anim; assert(_screen.pitch == this->anim_buf_pitch); // precondition for translating 'dst' into an 'anim_buf' offset below.
uint16 *anim = this->anim_buf + ((uint32 *)dst - (uint32 *)_screen.dst_ptr);
anim = this->anim_buf + ((uint32 *)dst - (uint32 *)_screen.dst_ptr);
if (pal == PALETTE_TO_TRANSPARENT) { if (pal == PALETTE_TO_TRANSPARENT) {
do { do {
@ -292,7 +292,7 @@ void Blitter_32bppAnim::DrawColourMappingRect(void *dst, int width, int height,
anim++; anim++;
} }
udst = udst - width + _screen.pitch; udst = udst - width + _screen.pitch;
anim = anim - width + this->anim_buf_width; anim = anim - width + this->anim_buf_pitch;
} while (--height); } while (--height);
return; return;
} }
@ -305,7 +305,7 @@ void Blitter_32bppAnim::DrawColourMappingRect(void *dst, int width, int height,
anim++; anim++;
} }
udst = udst - width + _screen.pitch; udst = udst - width + _screen.pitch;
anim = anim - width + this->anim_buf_width; anim = anim - width + this->anim_buf_pitch;
} while (--height); } while (--height);
return; return;
} }
@ -319,7 +319,8 @@ void Blitter_32bppAnim::SetPixel(void *video, int x, int y, uint8 colour)
/* Set the colour in the anim-buffer too, if we are rendering to the screen */ /* Set the colour in the anim-buffer too, if we are rendering to the screen */
if (_screen_disable_anim) return; if (_screen_disable_anim) return;
this->anim_buf[((uint32 *)video - (uint32 *)_screen.dst_ptr) + x + y * this->anim_buf_width] = colour | (DEFAULT_BRIGHTNESS << 8); assert(_screen.pitch == this->anim_buf_pitch); // precondition for translating 'video' into an 'anim_buf' offset below.
this->anim_buf[((uint32 *)video - (uint32 *)_screen.dst_ptr) + x + y * this->anim_buf_pitch] = colour | (DEFAULT_BRIGHTNESS << 8);
} }
void Blitter_32bppAnim::DrawRect(void *video, int width, int height, uint8 colour) void Blitter_32bppAnim::DrawRect(void *video, int width, int height, uint8 colour)
@ -331,9 +332,8 @@ void Blitter_32bppAnim::DrawRect(void *video, int width, int height, uint8 colou
} }
Colour colour32 = LookupColourInPalette(colour); Colour colour32 = LookupColourInPalette(colour);
uint16 *anim_line; assert(_screen.pitch == this->anim_buf_pitch); // precondition for translating 'video' into an 'anim_buf' offset below.
uint16 *anim_line = ((uint32 *)video - (uint32 *)_screen.dst_ptr) + this->anim_buf;
anim_line = ((uint32 *)video - (uint32 *)_screen.dst_ptr) + this->anim_buf;
do { do {
Colour *dst = (Colour *)video; Colour *dst = (Colour *)video;
@ -347,7 +347,7 @@ void Blitter_32bppAnim::DrawRect(void *video, int width, int height, uint8 colou
anim++; anim++;
} }
video = (uint32 *)video + _screen.pitch; video = (uint32 *)video + _screen.pitch;
anim_line += this->anim_buf_width; anim_line += this->anim_buf_pitch;
} while (--height); } while (--height);
} }
@ -357,6 +357,7 @@ void Blitter_32bppAnim::CopyFromBuffer(void *video, const void *src, int width,
assert(video >= _screen.dst_ptr && video <= (uint32 *)_screen.dst_ptr + _screen.width + _screen.height * _screen.pitch); assert(video >= _screen.dst_ptr && video <= (uint32 *)_screen.dst_ptr + _screen.width + _screen.height * _screen.pitch);
Colour *dst = (Colour *)video; Colour *dst = (Colour *)video;
const uint32 *usrc = (const uint32 *)src; const uint32 *usrc = (const uint32 *)src;
assert(_screen.pitch == this->anim_buf_pitch); // precondition for translating 'video' into an 'anim_buf' offset below.
uint16 *anim_line = ((uint32 *)video - (uint32 *)_screen.dst_ptr) + this->anim_buf; uint16 *anim_line = ((uint32 *)video - (uint32 *)_screen.dst_ptr) + this->anim_buf;
for (; height > 0; height--) { for (; height > 0; height--) {
@ -370,7 +371,7 @@ void Blitter_32bppAnim::CopyFromBuffer(void *video, const void *src, int width,
/* Copy back the anim-buffer */ /* Copy back the anim-buffer */
memcpy(anim_line, usrc, width * sizeof(uint16)); memcpy(anim_line, usrc, width * sizeof(uint16));
usrc = (const uint32 *)((const uint16 *)usrc + width); usrc = (const uint32 *)((const uint16 *)usrc + width);
anim_line += this->anim_buf_width; anim_line += this->anim_buf_pitch;
/* Okay, it is *very* likely that the image we stored is using /* Okay, it is *very* likely that the image we stored is using
* the wrong palette animated colours. There are two things we * the wrong palette animated colours. There are two things we
@ -397,11 +398,11 @@ void Blitter_32bppAnim::CopyToBuffer(const void *video, void *dst, int width, in
assert(video >= _screen.dst_ptr && video <= (uint32 *)_screen.dst_ptr + _screen.width + _screen.height * _screen.pitch); assert(video >= _screen.dst_ptr && video <= (uint32 *)_screen.dst_ptr + _screen.width + _screen.height * _screen.pitch);
uint32 *udst = (uint32 *)dst; uint32 *udst = (uint32 *)dst;
const uint32 *src = (const uint32 *)video; const uint32 *src = (const uint32 *)video;
const uint16 *anim_line;
if (this->anim_buf == NULL) return; if (this->anim_buf == NULL) return;
anim_line = ((const uint32 *)video - (uint32 *)_screen.dst_ptr) + this->anim_buf; assert(_screen.pitch == this->anim_buf_pitch); // precondition for translating 'video' into an 'anim_buf' offset below.
const uint16 *anim_line = ((const uint32 *)video - (uint32 *)_screen.dst_ptr) + this->anim_buf;
for (; height > 0; height--) { for (; height > 0; height--) {
memcpy(udst, src, width * sizeof(uint32)); memcpy(udst, src, width * sizeof(uint32));
@ -410,7 +411,7 @@ void Blitter_32bppAnim::CopyToBuffer(const void *video, void *dst, int width, in
/* Copy the anim-buffer */ /* Copy the anim-buffer */
memcpy(udst, anim_line, width * sizeof(uint16)); memcpy(udst, anim_line, width * sizeof(uint16));
udst = (uint32 *)((uint16 *)udst + width); udst = (uint32 *)((uint16 *)udst + width);
anim_line += this->anim_buf_width; anim_line += this->anim_buf_pitch;
} }
} }
@ -422,8 +423,8 @@ void Blitter_32bppAnim::ScrollBuffer(void *video, int &left, int &top, int &widt
/* We need to scroll the anim-buffer too */ /* We need to scroll the anim-buffer too */
if (scroll_y > 0) { if (scroll_y > 0) {
dst = this->anim_buf + left + (top + height - 1) * this->anim_buf_width; dst = this->anim_buf + left + (top + height - 1) * this->anim_buf_pitch;
src = dst - scroll_y * this->anim_buf_width; src = dst - scroll_y * this->anim_buf_pitch;
/* Adjust left & width */ /* Adjust left & width */
if (scroll_x >= 0) { if (scroll_x >= 0) {
@ -436,13 +437,13 @@ void Blitter_32bppAnim::ScrollBuffer(void *video, int &left, int &top, int &widt
uint th = height - scroll_y; uint th = height - scroll_y;
for (; th > 0; th--) { for (; th > 0; th--) {
memcpy(dst, src, tw * sizeof(uint16)); memcpy(dst, src, tw * sizeof(uint16));
src -= this->anim_buf_width; src -= this->anim_buf_pitch;
dst -= this->anim_buf_width; dst -= this->anim_buf_pitch;
} }
} else { } else {
/* Calculate pointers */ /* Calculate pointers */
dst = this->anim_buf + left + top * this->anim_buf_width; dst = this->anim_buf + left + top * this->anim_buf_pitch;
src = dst - scroll_y * this->anim_buf_width; src = dst - scroll_y * this->anim_buf_pitch;
/* Adjust left & width */ /* Adjust left & width */
if (scroll_x >= 0) { if (scroll_x >= 0) {
@ -457,8 +458,8 @@ void Blitter_32bppAnim::ScrollBuffer(void *video, int &left, int &top, int &widt
uint th = height + scroll_y; uint th = height + scroll_y;
for (; th > 0; th--) { for (; th > 0; th--) {
memmove(dst, src, tw * sizeof(uint16)); memmove(dst, src, tw * sizeof(uint16));
src += this->anim_buf_width; src += this->anim_buf_pitch;
dst += this->anim_buf_width; dst += this->anim_buf_pitch;
} }
} }
@ -495,6 +496,7 @@ void Blitter_32bppAnim::PaletteAnimate(const Palette &palette)
anim++; anim++;
} }
dst += _screen.pitch - this->anim_buf_width; dst += _screen.pitch - this->anim_buf_width;
anim += this->anim_buf_pitch - this->anim_buf_width;
} }
/* Make sure the backend redraws the whole screen */ /* Make sure the backend redraws the whole screen */
@ -508,11 +510,13 @@ Blitter::PaletteAnimation Blitter_32bppAnim::UsePaletteAnimation()
void Blitter_32bppAnim::PostResize() void Blitter_32bppAnim::PostResize()
{ {
if (_screen.width != this->anim_buf_width || _screen.height != this->anim_buf_height) { if (_screen.width != this->anim_buf_width || _screen.height != this->anim_buf_height ||
_screen.pitch != this->anim_buf_pitch) {
/* The size of the screen changed; we can assume we can wipe all data from our buffer */ /* The size of the screen changed; we can assume we can wipe all data from our buffer */
free(this->anim_buf); free(this->anim_buf);
this->anim_buf = CallocT<uint16>(_screen.width * _screen.height);
this->anim_buf_width = _screen.width; this->anim_buf_width = _screen.width;
this->anim_buf_height = _screen.height; this->anim_buf_height = _screen.height;
this->anim_buf_pitch = _screen.pitch;
this->anim_buf = CallocT<uint16>(this->anim_buf_height * this->anim_buf_pitch);
} }
} }

4
src/blitter/32bpp_anim.hpp
Unescape Escape View File

@ -20,13 +20,15 @@ protected:
uint16 *anim_buf; ///< In this buffer we keep track of the 8bpp indexes so we can do palette animation uint16 *anim_buf; ///< In this buffer we keep track of the 8bpp indexes so we can do palette animation
int anim_buf_width; ///< The width of the animation buffer. int anim_buf_width; ///< The width of the animation buffer.
int anim_buf_height; ///< The height of the animation buffer. int anim_buf_height; ///< The height of the animation buffer.
int anim_buf_pitch; ///< The pitch of the animation buffer.
Palette palette; ///< The current palette. Palette palette; ///< The current palette.
public: public:
Blitter_32bppAnim() : Blitter_32bppAnim() :
anim_buf(NULL), anim_buf(NULL),
anim_buf_width(0), anim_buf_width(0),
anim_buf_height(0) anim_buf_height(0),
anim_buf_pitch(0)
{ {
this->palette = _cur_palette; this->palette = _cur_palette;
} }

5
src/blitter/32bpp_anim_sse4.cpp
Unescape Escape View File

@ -35,7 +35,8 @@ inline void Blitter_32bppSSE4_Anim::Draw(const Blitter::BlitterParams *bp, ZoomL
{ {
const byte * const remap = bp->remap; const byte * const remap = bp->remap;
Colour *dst_line = (Colour *) bp->dst + bp->top * bp->pitch + bp->left; Colour *dst_line = (Colour *) bp->dst + bp->top * bp->pitch + bp->left;
uint16 *anim_line = this->anim_buf + ((uint32 *)bp->dst - (uint32 *)_screen.dst_ptr) + bp->top * this->anim_buf_width + bp->left; assert(_screen.pitch == this->anim_buf_pitch); // precondition for translating 'bp->dst' into an 'anim_buf' offset below.
uint16 *anim_line = this->anim_buf + ((uint32 *)bp->dst - (uint32 *)_screen.dst_ptr) + bp->top * this->anim_buf_pitch + bp->left;
int effective_width = bp->width; int effective_width = bp->width;
/* Find where to start reading in the source sprite. */ /* Find where to start reading in the source sprite. */
@ -353,7 +354,7 @@ next_line:
if (mode != BM_TRANSPARENT) src_mv_line += si->sprite_width; if (mode != BM_TRANSPARENT) src_mv_line += si->sprite_width;
src_rgba_line = (const Colour*) ((const byte*) src_rgba_line + si->sprite_line_size); src_rgba_line = (const Colour*) ((const byte*) src_rgba_line + si->sprite_line_size);
dst_line += bp->pitch; dst_line += bp->pitch;
anim_line += this->anim_buf_width; anim_line += this->anim_buf_pitch;
} }
} }
IGNORE_UNINITIALIZED_WARNING_STOP IGNORE_UNINITIALIZED_WARNING_STOP

Write Preview
Loading…
Cancel
Save