thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TINYGL: Removed unnecessary function arguments to tglBlitScale

Browse source
This commit is contained in:
Stefano Musumeci 2014-07-13 18:51:33 +02:00
parent d99aae5b64
commit ba202b497a
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
graphics/tinygl/zblit.cpp
View file

@ -167,8 +167,8 @@ void tglBlitRLE(BlitImage *blitImage, int dstX, int dstY, int srcX, int srcY, in
Graphics::PixelBuffer dstBuf(c->fb->cmode, c->fb->getPixelBuffer()); Graphics::PixelBuffer dstBuf(c->fb->cmode, c->fb->getPixelBuffer());
const int kBytesPerPixel = 2;
if (disableColoring) { if (disableColoring) {
const int kBytesPerPixel = 2;
int lineIndex = 0; int lineIndex = 0;
int maxY = srcY + clampHeight; int maxY = srcY + clampHeight;
int maxX = srcX + clampWidth; int maxX = srcX + clampWidth;
@ -189,7 +189,6 @@ void tglBlitRLE(BlitImage *blitImage, int dstX, int dstY, int srcX, int srcY, in
lineIndex++; lineIndex++;
} }
} else { } else {
const int kBytesPerPixel = 2;
int lineIndex = 0; int lineIndex = 0;
int maxY = srcY + clampHeight; int maxY = srcY + clampHeight;
int maxX = srcX + clampWidth; int maxX = srcX + clampWidth;
@ -267,8 +266,8 @@ void tglBlitSimple(BlitImage *blitImage, int dstX, int dstY, int srcX, int srcY,
} }
template <bool disableBlending, bool disableColoring, bool flipVertical, bool flipHorizontal> template <bool disableBlending, bool disableColoring, bool flipVertical, bool flipHorizontal>
void tglBlitScale(BlitImage *blitImage, int dstX, int dstY, int width, int height, int srcX, int srcY, int srcWidth, int srcHeight, int rotation, void tglBlitScale(BlitImage *blitImage, int dstX, int dstY, int width, int height, int srcX, int srcY, int srcWidth, int srcHeight,
int originX, int originY, float aTint, float rTint, float gTint, float bTint) { float aTint, float rTint, float gTint, float bTint) {
TinyGL::GLContext *c = TinyGL::gl_get_context(); TinyGL::GLContext *c = TinyGL::gl_get_context();
int clampWidth, clampHeight; int clampWidth, clampHeight;
@ -414,8 +413,7 @@ FORCEINLINE void tglBlitGeneric(BlitImage *blitImage, const BlitTransform &trans
} else { } else {
if (transform._rotation == 0) { if (transform._rotation == 0) {
tglBlitScale<disableBlending, disableColoring, flipVertical, flipHorizontal>(blitImage, transform._destinationRectangle.left, transform._destinationRectangle.top, tglBlitScale<disableBlending, disableColoring, flipVertical, flipHorizontal>(blitImage, transform._destinationRectangle.left, transform._destinationRectangle.top,
transform._destinationRectangle.width(), transform._destinationRectangle.height(), transform._sourceRectangle.left, transform._sourceRectangle.top, transform._sourceRectangle.width() , transform._sourceRectangle.height(), transform._rotation, transform._destinationRectangle.width(), transform._destinationRectangle.height(), transform._sourceRectangle.left, transform._sourceRectangle.top, transform._sourceRectangle.width() , transform._sourceRectangle.height(), transform._aTint, transform._rTint, transform._gTint, transform._bTint);
transform._originX, transform._originY, transform._aTint, transform._rTint, transform._gTint, transform._bTint);
} else } else
{ {
tglBlitRotoScale<disableBlending, disableColoring, flipVertical, flipHorizontal>(blitImage, transform._destinationRectangle.left, transform._destinationRectangle.top, tglBlitRotoScale<disableBlending, disableColoring, flipVertical, flipHorizontal>(blitImage, transform._destinationRectangle.left, transform._destinationRectangle.top,