games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

Quick fix for xbrz scaling artifacts on window borders

Browse Source
This commit is contained in:
Ivan Savenko
2024-12-10 14:20:55 +00:00
parent d7d60bf61b
commit 0842ada1c7
8 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/render/IImage.h
View File

@@ -115,7 +115,7 @@ public:
virtual std::shared_ptr<const ISharedImage> horizontalFlip() const = 0; virtual std::shared_ptr<const ISharedImage> horizontalFlip() const = 0;
virtual std::shared_ptr<const ISharedImage> verticalFlip() const = 0; virtual std::shared_ptr<const ISharedImage> verticalFlip() const = 0;
virtual std::shared_ptr<const ISharedImage> scaleInteger(int factor, SDL_Palette * palette) const = 0; virtual std::shared_ptr<const ISharedImage> scaleInteger(int factor, SDL_Palette * palette, EImageBlitMode blitMode) const = 0;
virtual std::shared_ptr<const ISharedImage> scaleTo(const Point & size, SDL_Palette * palette) const = 0; virtual std::shared_ptr<const ISharedImage> scaleTo(const Point & size, SDL_Palette * palette) const = 0;

2
client/renderSDL/CBitmapFont.cpp
View File

@@ -201,7 +201,7 @@ CBitmapFont::CBitmapFont(const std::string & filename):
static const std::map<std::string, EScalingAlgorithm> filterNameToEnum = { static const std::map<std::string, EScalingAlgorithm> filterNameToEnum = {
{ "nearest", EScalingAlgorithm::NEAREST}, { "nearest", EScalingAlgorithm::NEAREST},
{ "bilinear", EScalingAlgorithm::BILINEAR}, { "bilinear", EScalingAlgorithm::BILINEAR},
{ "xbrz", EScalingAlgorithm::XBRZ} { "xbrz", EScalingAlgorithm::XBRZ_ALPHA}
}; };
auto filterName = settings["video"]["fontUpscalingFilter"].String(); auto filterName = settings["video"]["fontUpscalingFilter"].String();

14
client/renderSDL/SDLImage.cpp
View File

@@ -278,7 +278,7 @@ void SDLImageShared::optimizeSurface()
} }
} }
std::shared_ptr<const ISharedImage> SDLImageShared::scaleInteger(int factor, SDL_Palette * palette) const std::shared_ptr<const ISharedImage> SDLImageShared::scaleInteger(int factor, SDL_Palette * palette, EImageBlitMode mode) const
{ {
if (factor <= 0) if (factor <= 0)
throw std::runtime_error("Unable to scale by integer value of " + std::to_string(factor)); throw std::runtime_error("Unable to scale by integer value of " + std::to_string(factor));
@@ -293,7 +293,13 @@ std::shared_ptr<const ISharedImage> SDLImageShared::scaleInteger(int factor, SDL
if(preScaleFactor == factor) if(preScaleFactor == factor)
return shared_from_this(); return shared_from_this();
else if(preScaleFactor == 1) else if(preScaleFactor == 1)
scaled = CSDL_Ext::scaleSurfaceIntegerFactor(surf, factor, EScalingAlgorithm::XBRZ); {
// dump heuristics to differentiate tileable UI elements from map object / combat assets
if (mode == EImageBlitMode::OPAQUE || mode == EImageBlitMode::COLORKEY || mode == EImageBlitMode::SIMPLE)
scaled = CSDL_Ext::scaleSurfaceIntegerFactor(surf, factor, EScalingAlgorithm::XBRZ_OPAQUE);
else
scaled = CSDL_Ext::scaleSurfaceIntegerFactor(surf, factor, EScalingAlgorithm::XBRZ_ALPHA);
}
else else
scaled = CSDL_Ext::scaleSurface(surf, (surf->w / preScaleFactor) * factor, (surf->h / preScaleFactor) * factor); scaled = CSDL_Ext::scaleSurface(surf, (surf->w / preScaleFactor) * factor, (surf->h / preScaleFactor) * factor);
@@ -589,12 +595,12 @@ void SDLImageRGB::scaleTo(const Point & size)
void SDLImageIndexed::scaleInteger(int factor) void SDLImageIndexed::scaleInteger(int factor)
{ {
image = image->scaleInteger(factor, currentPalette); image = image->scaleInteger(factor, currentPalette, blitMode);
} }
void SDLImageRGB::scaleInteger(int factor) void SDLImageRGB::scaleInteger(int factor)
{ {
image = image->scaleInteger(factor, nullptr); image = image->scaleInteger(factor, nullptr, blitMode);
} }
void SDLImageRGB::exportBitmap(const boost::filesystem::path & path) const void SDLImageRGB::exportBitmap(const boost::filesystem::path & path) const

2
client/renderSDL/SDLImage.h
View File

@@ -60,7 +60,7 @@ public:
std::shared_ptr<IImage> createImageReference(EImageBlitMode mode) const override; std::shared_ptr<IImage> createImageReference(EImageBlitMode mode) const override;
std::shared_ptr<const ISharedImage> horizontalFlip() const override; std::shared_ptr<const ISharedImage> horizontalFlip() const override;
std::shared_ptr<const ISharedImage> verticalFlip() const override; std::shared_ptr<const ISharedImage> verticalFlip() const override;
std::shared_ptr<const ISharedImage> scaleInteger(int factor, SDL_Palette * palette) const override; std::shared_ptr<const ISharedImage> scaleInteger(int factor, SDL_Palette * palette, EImageBlitMode blitMode) const override;
std::shared_ptr<const ISharedImage> scaleTo(const Point & size, SDL_Palette * palette) const override; std::shared_ptr<const ISharedImage> scaleTo(const Point & size, SDL_Palette * palette) const override;
friend class SDLImageLoader; friend class SDLImageLoader;

11
client/renderSDL/SDL_Extensions.cpp
View File

@@ -683,12 +683,17 @@ SDL_Surface * CSDL_Ext::scaleSurfaceIntegerFactor(SDL_Surface * surf, int factor
case EScalingAlgorithm::BILINEAR: case EScalingAlgorithm::BILINEAR:
xbrz::bilinearScale(srcPixels, intermediate->w, intermediate->h, dstPixels, ret->w, ret->h); xbrz::bilinearScale(srcPixels, intermediate->w, intermediate->h, dstPixels, ret->w, ret->h);
break; break;
case EScalingAlgorithm::XBRZ: case EScalingAlgorithm::XBRZ_ALPHA:
tbb::parallel_for(tbb::blocked_range<size_t>(0, intermediate->h, granulation), [factor, srcPixels, dstPixels, intermediate](const tbb::blocked_range<size_t> & r) case EScalingAlgorithm::XBRZ_OPAQUE:
{
auto format = algorithm == EScalingAlgorithm::XBRZ_OPAQUE ? xbrz::ColorFormat::ARGB_CLAMPED : xbrz::ColorFormat::ARGB;
tbb::parallel_for(tbb::blocked_range<size_t>(0, intermediate->h, granulation), [factor, srcPixels, dstPixels, intermediate, format](const tbb::blocked_range<size_t> & r)
{ {
xbrz::scale(factor, srcPixels, dstPixels, intermediate->w, intermediate->h, xbrz::ColorFormat::ARGB, {}, r.begin(), r.end());
xbrz::scale(factor, srcPixels, dstPixels, intermediate->w, intermediate->h, format, {}, r.begin(), r.end());
}); });
break; break;
}
default: default:
throw std::runtime_error("invalid scaling algorithm!"); throw std::runtime_error("invalid scaling algorithm!");
} }

3
client/renderSDL/SDL_Extensions.h
View File

@@ -31,7 +31,8 @@ enum class EScalingAlgorithm : int8_t
{ {
NEAREST, NEAREST,
BILINEAR, BILINEAR,
XBRZ XBRZ_OPAQUE, // xbrz, image edges are considered to have same color as pixel inside image
XBRZ_ALPHA // xbrz, image edges are considered to be transparent
}; };
namespace CSDL_Ext namespace CSDL_Ext

17
client/xBRZ/xbrz.cpp
View File

@@ -1195,6 +1195,22 @@ void xbrz::scale(size_t factor, const uint32_t* src, uint32_t* trg, int srcWidth
} }
break; break;
case ColorFormat::ARGB_CLAMPED:
switch (factor)
{
case 2:
return scaleImage<Scaler2x<ColorGradientARGB>, ColorDistanceARGB, OobReaderDuplicate>(src, trg, srcWidth, srcHeight, cfg, yFirst, yLast);
case 3:
return scaleImage<Scaler3x<ColorGradientARGB>, ColorDistanceARGB, OobReaderDuplicate>(src, trg, srcWidth, srcHeight, cfg, yFirst, yLast);
case 4:
return scaleImage<Scaler4x<ColorGradientARGB>, ColorDistanceARGB, OobReaderDuplicate>(src, trg, srcWidth, srcHeight, cfg, yFirst, yLast);
case 5:
return scaleImage<Scaler5x<ColorGradientARGB>, ColorDistanceARGB, OobReaderDuplicate>(src, trg, srcWidth, srcHeight, cfg, yFirst, yLast);
case 6:
return scaleImage<Scaler6x<ColorGradientARGB>, ColorDistanceARGB, OobReaderDuplicate>(src, trg, srcWidth, srcHeight, cfg, yFirst, yLast);
}
break;
case ColorFormat::ARGB: case ColorFormat::ARGB:
switch (factor) switch (factor)
{ {
@@ -1238,6 +1254,7 @@ bool xbrz::equalColorTest(uint32_t col1, uint32_t col2, ColorFormat colFmt, doub
case ColorFormat::RGB: case ColorFormat::RGB:
return ColorDistanceRGB::dist(col1, col2, luminanceWeight) < equalColorTolerance; return ColorDistanceRGB::dist(col1, col2, luminanceWeight) < equalColorTolerance;
case ColorFormat::ARGB: case ColorFormat::ARGB:
case ColorFormat::ARGB_CLAMPED:
return ColorDistanceARGB::dist(col1, col2, luminanceWeight) < equalColorTolerance; return ColorDistanceARGB::dist(col1, col2, luminanceWeight) < equalColorTolerance;
case ColorFormat::ARGB_UNBUFFERED: case ColorFormat::ARGB_UNBUFFERED:
return ColorDistanceUnbufferedARGB::dist(col1, col2, luminanceWeight) < equalColorTolerance; return ColorDistanceUnbufferedARGB::dist(col1, col2, luminanceWeight) < equalColorTolerance;

1
client/xBRZ/xbrz.h
View File

@@ -44,6 +44,7 @@ enum class ColorFormat //from high bits -> low bits, 8 bit per channel
{ {
RGB, //8 bit for each red, green, blue, upper 8 bits unused RGB, //8 bit for each red, green, blue, upper 8 bits unused
ARGB, //including alpha channel, BGRA byte order on little-endian machines ARGB, //including alpha channel, BGRA byte order on little-endian machines
ARGB_CLAMPED, // like ARGB, but edges are treated as opaque, with same color as edge
ARGB_UNBUFFERED, //like ARGB, but without the one-time buffer creation overhead (ca. 100 - 300 ms) at the expense of a slightly slower scaling time ARGB_UNBUFFERED, //like ARGB, but without the one-time buffer creation overhead (ca. 100 - 300 ms) at the expense of a slightly slower scaling time
}; };