From f90e4545c27fa92cc6ba835f80551556929df43d Mon Sep 17 00:00:00 2001 From: Marcus Comstedt Date: Sun, 1 Feb 2009 14:56:19 +0000 Subject: [PATCH] Merged r36175 from branch-0-13-0: Fixed alpha blending in the UI dialogs by adding alpha computation to the blendPixelPtr() function. To minimize impact, pre-multiplied alpha is assumed, meaning that the blending of the R, G and B components is the same both with and without hardware alpha. svn-id: r36177 --- backends/platform/dc/display.cpp | 2 +- graphics/VectorRendererSpec.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp index 9ff692f3fa7..c6c8594aeec 100644 --- a/backends/platform/dc/display.cpp +++ b/backends/platform/dc/display.cpp @@ -390,7 +390,7 @@ void OSystem_Dreamcast::updateScreen(void) TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|TA_CMD_POLYGON_TEXTURED; mypoly.mode1 = TA_POLYMODE1_Z_ALWAYS|TA_POLYMODE1_NO_Z_UPDATE; mypoly.mode2 = - TA_POLYMODE2_BLEND_SRC_ALPHA|TA_POLYMODE2_BLEND_DST_INVALPHA| + TA_POLYMODE2_BLEND_SRC/*_ALPHA*/|TA_POLYMODE2_BLEND_DST_INVALPHA| TA_POLYMODE2_ENABLE_ALPHA| TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_TEXTURE_MODULATE_ALPHA| TA_POLYMODE2_U_SIZE_512|TA_POLYMODE2_V_SIZE_512; diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp index 37281839cb2..ac21203da1d 100644 --- a/graphics/VectorRendererSpec.cpp +++ b/graphics/VectorRendererSpec.cpp @@ -403,7 +403,10 @@ blendPixelPtr(PixelType *ptr, PixelType color, uint8 alpha) { (int)(idst & PixelFormat::kGreenMask)) * alpha) >> 8))) | (PixelFormat::kBlueMask & ((idst & PixelFormat::kBlueMask) + ((int)(((int)(isrc & PixelFormat::kBlueMask) - - (int)(idst & PixelFormat::kBlueMask)) * alpha) >> 8))) ); + (int)(idst & PixelFormat::kBlueMask)) * alpha) >> 8))) | + (PixelFormat::kAlphaMask & ((idst & PixelFormat::kAlphaMask) + + ((alpha >> (8 - PixelFormat::kAlphaBits)) << PixelFormat::kAlphaShift) - + (((int)(idst & PixelFormat::kAlphaMask) * alpha) >> 8)))); } template