[Scummvm-git-logs] scummvm master -> 957488f28caba629bcf3f0ece511076594056fa8
klusark
noreply at scummvm.org
Tue Nov 10 15:05:54 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
957488f28c GRIM: Fix dimming
Commit: 957488f28caba629bcf3f0ece511076594056fa8
https://github.com/scummvm/scummvm/commit/957488f28caba629bcf3f0ece511076594056fa8
Author: Joel Teichroeb (joel at teichroeb.net)
Date: 2026-11-10T10:05:39-05:00
Commit Message:
GRIM: Fix dimming
Match the original's DimScreen and DimRegion in all renderers.
DimScreen turns the stored background into dim grey, keeping the
undimmed copy for the savegame thumbnail. DimRegion scales what is
already on the screen by the level with a blended black quad, instead
of reading back the frame buffer.
Assisted-by: Claude:claude-opus-5-5
Changed paths:
engines/grim/gfx_base.cpp
engines/grim/gfx_base.h
engines/grim/gfx_opengl.cpp
engines/grim/gfx_opengl.h
engines/grim/gfx_opengl_shaders.cpp
engines/grim/gfx_tinygl.cpp
engines/grim/gfx_tinygl.h
engines/grim/shaders/grim_dim.fragment
diff --git a/engines/grim/gfx_base.cpp b/engines/grim/gfx_base.cpp
index 7528b7a1487..4f13b831f66 100644
--- a/engines/grim/gfx_base.cpp
+++ b/engines/grim/gfx_base.cpp
@@ -181,6 +181,10 @@ void GfxBase::createSpecialtyTexture(uint id, const uint8 *data, int width, int
createTexture(&_specialtyTextures[id], data, nullptr, true);
}
+uint8 GfxBase::dimScreenRGB(uint8 r, uint8 g, uint8 b) {
+ return MAX(MAX(r, g), (uint8)(b >> 3)) >> 2;
+}
+
Bitmap *GfxBase::createScreenshotBitmap(Graphics::Surface *src, int w, int h, bool flipOrientation) {
Graphics::Surface buffer;
buffer.create(w, h, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
diff --git a/engines/grim/gfx_base.h b/engines/grim/gfx_base.h
index f0fb30bf374..a9173febc99 100644
--- a/engines/grim/gfx_base.h
+++ b/engines/grim/gfx_base.h
@@ -267,6 +267,9 @@ public:
static Math::Matrix4 makeLookMatrix(const Math::Vector3d& pos, const Math::Vector3d& interest, const Math::Vector3d& up);
static Math::Matrix4 makeProjMatrix(float fov, float nclip, float fclip);
+
+ static uint8 dimScreenRGB(uint8 r, uint8 g, uint8 b);
+
Texture *getSpecialtyTexturePtr(uint id) { if (id >= _numSpecialtyTextures) return nullptr; return &_specialtyTextures[id]; };
Texture *getSpecialtyTexturePtr(Common::String name);
diff --git a/engines/grim/gfx_opengl.cpp b/engines/grim/gfx_opengl.cpp
index 52334ad0c77..9ba6ef8010c 100644
--- a/engines/grim/gfx_opengl.cpp
+++ b/engines/grim/gfx_opengl.cpp
@@ -59,31 +59,14 @@ static char fragSrc[] =
TEX d, fragment.texcoord[0], texture[0], 2D;\n\
MOV result.depth, d.r;\n\
END\n";
-
-static char dimFragSrc[] =
- "!!ARBfp1.0\n\
- PARAM level = program.local[0];\n\
- TEMP color;\n\
- TEMP d;\n\
- TEX d, fragment.texcoord[0], texture[0], 2D;\n\
- TEMP sum;\n\
- MOV sum, d.r;\n\
- ADD sum, sum, d.g;\n\
- ADD sum, sum, d.b;\n\
- MUL sum, sum, 0.33;\n\
- MUL sum, sum, level.x;\n\
- MOV result.color.r, sum;\n\
- MOV result.color.g, sum;\n\
- MOV result.color.b, sum;\n\
- END\n";
#endif
GfxOpenGL::GfxOpenGL() : _smushNumTex(0),
_smushTexIds(nullptr), _smushWidth(0), _smushHeight(0),
- _useDepthShader(false), _useDimShader(0),
- _storedDisplay(nullptr),
+ _useDepthShader(false),
+ _storedDisplay(nullptr), _dimmedDisplay(nullptr), _storedDimmed(false),
#ifdef GL_ARB_fragment_program
- _fragmentProgram(0), _dimFragProgram(0),
+ _fragmentProgram(0),
#endif
_emergFont(0), _alpha(1.f) {
type = Graphics::RendererType::kRendererTypeOpenGL;
@@ -98,6 +81,7 @@ GfxOpenGL::GfxOpenGL() : _smushNumTex(0),
GfxOpenGL::~GfxOpenGL() {
releaseMovieFrame();
delete[] _storedDisplay;
+ delete[] _dimmedDisplay;
if (_emergFont && glIsList(_emergFont))
glDeleteLists(_emergFont, 128);
@@ -105,9 +89,6 @@ GfxOpenGL::~GfxOpenGL() {
#ifdef GL_ARB_fragment_program
if (_useDepthShader)
glDeleteProgramsARB(1, &_fragmentProgram);
-
- if (_useDimShader)
- glDeleteProgramsARB(1, &_dimFragProgram);
#endif
for (unsigned int i = 0; i < _numSpecialtyTextures; i++) {
destroyTexture(&_specialtyTextures[i]);
@@ -124,12 +105,15 @@ void GfxOpenGL::setupScreen(int screenW, int screenH) {
_globalScaleH = _screenHeight / (float)_globalHeight;
_useDepthShader = false;
- _useDimShader = false;
CursorMan.showMouse(false);
int screenSize = _screenWidth * _screenHeight * 4;
+ delete[] _storedDisplay;
_storedDisplay = new byte[screenSize]();
+ delete[] _dimmedDisplay;
+ _dimmedDisplay = nullptr;
+ _storedDimmed = false;
_smushNumTex = 0;
_currentShadowArray = nullptr;
@@ -159,7 +143,6 @@ void GfxOpenGL::initExtensions() {
const char *extensions = (const char *)glGetString(GL_EXTENSIONS);
if (extensions && strstr(extensions, "ARB_fragment_program")) {
_useDepthShader = true;
- _useDimShader = true;
}
if (_useDepthShader) {
@@ -174,19 +157,6 @@ void GfxOpenGL::initExtensions() {
_useDepthShader = false;
}
}
-
- if (_useDimShader) {
- glGenProgramsARB(1, &_dimFragProgram);
- glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, _dimFragProgram);
-
- GLint errorPos;
- glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(dimFragSrc), dimFragSrc);
- glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errorPos);
- if (errorPos != -1) {
- warning("Error compiling dim fragment program:\n%s", glGetString(GL_PROGRAM_ERROR_STRING_ARB));
- _useDimShader = false;
- }
- }
#endif
}
@@ -1882,6 +1852,7 @@ Bitmap *GfxOpenGL::getScreenshot(int w, int h, bool useStored) {
void GfxOpenGL::storeDisplay() {
g_system->presentBuffer();
glReadPixels(0, 0, _screenWidth, _screenHeight, GL_RGBA, GL_UNSIGNED_BYTE, _storedDisplay);
+ _storedDimmed = false;
}
void GfxOpenGL::copyStoredToDisplay() {
@@ -1897,7 +1868,14 @@ void GfxOpenGL::copyStoredToDisplay() {
glRasterPos2i(0, _screenHeight - 1);
glBitmap(0, 0, 0, 0, 0, -1, nullptr);
- glDrawPixels(_screenWidth, _screenHeight, GL_RGBA, GL_UNSIGNED_BYTE, _storedDisplay);
+ if (_storedDimmed) {
+ // One grey byte a pixel; GL expands it to (v, v, v, 1)
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+ glDrawPixels(_screenWidth, _screenHeight, GL_LUMINANCE, GL_UNSIGNED_BYTE, _dimmedDisplay);
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
+ } else {
+ glDrawPixels(_screenWidth, _screenHeight, GL_RGBA, GL_UNSIGNED_BYTE, _storedDisplay);
+ }
glDepthMask(GL_TRUE);
glEnable(GL_DEPTH_TEST);
@@ -1905,117 +1883,46 @@ void GfxOpenGL::copyStoredToDisplay() {
}
void GfxOpenGL::dimScreen() {
- uint32 *data = (uint32 *)_storedDisplay;
- for (int l = 0; l < _screenWidth * _screenHeight; l++) {
- uint32 pixel = data[l];
- uint8 r = (pixel & 0xFF0000) >> 16;
- uint8 g = (pixel & 0x00FF00) >> 8;
- uint8 b = (pixel & 0x0000FF);
- uint32 color = (r + g + b) / 10;
- data[l] = ((color & 0xFF) << 16) | ((color & 0xFF) << 8) | (color & 0xFF);
- }
+ int pixels = _screenWidth * _screenHeight;
+ if (!_dimmedDisplay)
+ _dimmedDisplay = new byte[pixels];
+ const byte *src = _storedDisplay;
+ for (int i = 0; i < pixels; i++, src += 4)
+ _dimmedDisplay[i] = dimScreenRGB(src[0], src[1], src[2]);
+ _storedDimmed = true;
}
-void GfxOpenGL::dimRegion(int x, int yReal, int w, int h, float level) {
- x = (int)(x * _scaleW);
- yReal = (int)(yReal * _scaleH);
- w = (int)(w * _scaleW);
- h = (int)(h * _scaleH);
- int y = _screenHeight - yReal - h;
-
-#ifdef GL_ARB_fragment_program
- if (_useDimShader) {
- GLuint texture;
- glGenTextures(1, &texture);
- glBindTexture(GL_TEXTURE_2D, texture);
-
- glTexImage2D(GL_TEXTURE_2D, 0, 3, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
- glViewport(0, 0, _screenWidth, _screenHeight);
-
- // copy the data over to the texture
- g_system->presentBuffer();
- glBindTexture(GL_TEXTURE_2D, texture);
- glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, x, y, w, h, 0);
-
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- glOrtho(0, _screenWidth, 0, _screenHeight, 0, 1);
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
- glMatrixMode(GL_TEXTURE);
- glLoadIdentity();
-
- glDisable(GL_LIGHTING);
- glDisable(GL_DEPTH_TEST);
- glDisable(GL_ALPHA_TEST);
- glDepthMask(GL_FALSE);
- glEnable(GL_SCISSOR_TEST);
-
- glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, _dimFragProgram);
- glEnable(GL_FRAGMENT_PROGRAM_ARB);
- glProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, 0, level, 0, 0, 0);
-
- glEnable(GL_TEXTURE_2D);
- glBindTexture(GL_TEXTURE_2D, texture);
-
- glBegin(GL_QUADS);
- glTexCoord2f(0, 0);
- glVertex2f(x, y);
- glTexCoord2f(1.0f, 0.0f);
- glVertex2f(x + w, y);
- glTexCoord2f(1.0f, 1.0f);
- glVertex2f(x + w, y + h);
- glTexCoord2f(0.0f, 1.0f);
- glVertex2f(x, y + h);
- glEnd();
-
- glDisable(GL_FRAGMENT_PROGRAM_ARB);
-
- glDeleteTextures(1, &texture);
-
- return;
- }
-#endif
-
- uint32 *data = new uint32[w * h];
- y = _screenHeight - yReal;
-
- // collect the requested area and generate the dimmed version
- g_system->presentBuffer();
- glReadPixels(x, y - h, w, h, GL_RGBA, GL_UNSIGNED_BYTE, data);
- for (int ly = 0; ly < h; ly++) {
- for (int lx = 0; lx < w; lx++) {
- uint32 pixel = data[ly * w + lx];
- uint8 r = (pixel & 0xFF0000) >> 16;
- uint8 g = (pixel & 0x00FF00) >> 8;
- uint8 b = (pixel & 0x0000FF);
- uint32 color = (uint32)(((r + g + b) / 3) * level);
- data[ly * w + lx] = ((color & 0xFF) << 16) | ((color & 0xFF) << 8) | (color & 0xFF);
- }
- }
+void GfxOpenGL::dimRegion(int x, int y, int w, int h, float level) {
+ level = CLIP(level, 0.0f, 1.0f);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
- glOrtho(0, _screenWidth, _screenHeight, 0, 0, 1);
+ glOrtho(0, _gameWidth, _gameHeight, 0, 0, 1);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glDisable(GL_LIGHTING);
glDisable(GL_DEPTH_TEST);
+ glDisable(GL_TEXTURE_2D);
glDepthMask(GL_FALSE);
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- // Set the raster position and draw the bitmap
- glRasterPos2i(x, yReal + h);
- glDrawPixels(w, h, GL_RGBA, GL_UNSIGNED_BYTE, data);
+ glColor4f(0.0f, 0.0f, 0.0f, 1.0f - level);
+ glBegin(GL_QUADS);
+ glVertex2f(x, y);
+ glVertex2f(x + w, y);
+ glVertex2f(x + w, y + h);
+ glVertex2f(x, y + h);
+ glEnd();
+
+ glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+
+ glDisable(GL_BLEND);
glDepthMask(GL_TRUE);
glEnable(GL_DEPTH_TEST);
glEnable(GL_LIGHTING);
-
- delete[] data;
}
void GfxOpenGL::irisAroundRegion(int x1, int y1, int x2, int y2) {
diff --git a/engines/grim/gfx_opengl.h b/engines/grim/gfx_opengl.h
index 6102535035b..35b0dc01fa7 100644
--- a/engines/grim/gfx_opengl.h
+++ b/engines/grim/gfx_opengl.h
@@ -138,12 +138,12 @@ private:
int _smushWidth;
int _smushHeight;
byte *_storedDisplay;
+ byte *_dimmedDisplay;
+ bool _storedDimmed;
bool _useDepthShader;
#ifdef GL_ARB_fragment_program
GLuint _fragmentProgram;
- GLuint _dimFragProgram;
#endif
- bool _useDimShader;
float _alpha;
const Actor *_currentActor;
GLenum _depthFunc;
diff --git a/engines/grim/gfx_opengl_shaders.cpp b/engines/grim/gfx_opengl_shaders.cpp
index b4213699ec6..959b51aa6c2 100644
--- a/engines/grim/gfx_opengl_shaders.cpp
+++ b/engines/grim/gfx_opengl_shaders.cpp
@@ -1768,6 +1768,8 @@ void GfxOpenGLS::copyStoredToDisplay() {
_dimProgram->use();
_dimProgram->setUniform("scaleWH", Math::Vector2d(1.f, 1.f));
_dimProgram->setUniform("tex", 0);
+ _dimProgram->setUniform1f("colorScale", 1.f);
+ _dimProgram->setUniform1f("alpha", 1.f);
glBindTexture(GL_TEXTURE_2D, _storedDisplay);
@@ -1790,17 +1792,6 @@ void GfxOpenGLS::dimRegion(int xin, int yReal, int w, int h, float level) {
h = (int)(h * _scaleH);
int yin = _screenHeight - yReal - h;
- GLuint texture;
- glGenTextures(1, &texture);
- glBindTexture(GL_TEXTURE_2D, texture);
-
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
- g_system->presentBuffer();
- glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, xin, yin, w, h, 0);
-
glBindBuffer(GL_ARRAY_BUFFER, _dimRegionVBO);
float width = w;
@@ -1821,16 +1812,19 @@ void GfxOpenGLS::dimRegion(int xin, int yReal, int w, int h, float level) {
_dimRegionProgram->use();
_dimRegionProgram->setUniform("scaleWH", Math::Vector2d(1.f / _screenWidth, 1.f / _screenHeight));
_dimRegionProgram->setUniform("tex", 0);
+ _dimRegionProgram->setUniform1f("colorScale", 0.f);
+ _dimRegionProgram->setUniform1f("alpha", 1.f - CLIP(level, 0.f, 1.f));
glDisable(GL_DEPTH_TEST);
glDepthMask(GL_FALSE);
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glDrawArrays(GL_TRIANGLES, 0, 6);
+ glDisable(GL_BLEND);
glEnable(GL_DEPTH_TEST);
glDepthMask(GL_TRUE);
-
- glDeleteTextures(1, &texture);
}
void GfxOpenGLS::irisAroundRegion(int x1, int y1, int x2, int y2) {
diff --git a/engines/grim/gfx_tinygl.cpp b/engines/grim/gfx_tinygl.cpp
index a48618a5c2c..ce1717031c5 100644
--- a/engines/grim/gfx_tinygl.cpp
+++ b/engines/grim/gfx_tinygl.cpp
@@ -49,7 +49,7 @@ GfxBase *CreateGfxTinyGL() {
GfxTinyGL::GfxTinyGL() :
_alpha(1.f),
- _currentActor(nullptr), _smushImage(nullptr),
+ _currentActor(nullptr), _smushImage(nullptr), _storedImage(nullptr), _storedImageDirty(false),
_storedDisplay(nullptr) {
type = Graphics::RendererType::kRendererTypeTinyGL;
// TGL_LEQUAL as tglDepthFunc ensures that subsequent drawing attempts for
@@ -67,6 +67,7 @@ GfxTinyGL::~GfxTinyGL() {
_storedDisplay->free();
delete _storedDisplay;
releaseMovieFrame();
+ tglDeleteBlitImage(_storedImage);
for (unsigned int i = 0; i < _numSpecialtyTextures; i++) {
destroyTexture(&_specialtyTextures[i]);
}
@@ -1215,6 +1216,7 @@ Bitmap *GfxTinyGL::getScreenshot(int w, int h, bool useStored) {
if (useStored) {
bmp = createScreenshotBitmap(_storedDisplay, w, h, true);
} else {
+ TinyGL::presentBuffer();
Graphics::Surface *src = TinyGL::copyFromFrameBuffer(_pixelFormat);
bmp = createScreenshotBitmap(src, w, h, true);
src->free();
@@ -1233,19 +1235,45 @@ void GfxTinyGL::storeDisplay() {
_storedDisplay->free();
delete _storedDisplay;
_storedDisplay = TinyGL::copyFromFrameBuffer(_pixelFormat);
+ _storedImageDirty = true;
}
void GfxTinyGL::copyStoredToDisplay() {
- Bitmap *bitmap = getScreenshot(_gameWidth, _gameHeight, true);
- drawBitmap(bitmap, 0, 0, 0);
- delete bitmap;
+ if (_storedImageDirty && _storedDisplay) {
+ if (_storedImage == nullptr)
+ _storedImage = tglGenBlitImage();
+ tglUploadBlitImage(_storedImage, *_storedDisplay, 0, false);
+ _storedImageDirty = false;
+ }
+ if (_storedImage)
+ tglBlitFast(_storedImage, 0, 0);
}
void GfxTinyGL::dimScreen() {
- dimRegion(0, 0, _gameWidth, _gameHeight, 0.2f);
+ if (!_storedDisplay)
+ return;
+
+ Graphics::Surface dimmed;
+ dimmed.create(_storedDisplay->w, _storedDisplay->h, _storedDisplay->format);
+ for (int y = 0; y < dimmed.h; y++) {
+ for (int x = 0; x < dimmed.w; x++) {
+ uint8 r, g, b;
+ _storedDisplay->format.colorToRGB(_storedDisplay->getPixel(x, y), r, g, b);
+ uint8 v = dimScreenRGB(r, g, b);
+ dimmed.setPixel(x, y, dimmed.format.RGBToColor(v, v, v));
+ }
+ }
+
+ if (_storedImage == nullptr)
+ _storedImage = tglGenBlitImage();
+ tglUploadBlitImage(_storedImage, dimmed, 0, false);
+ _storedImageDirty = false;
+ dimmed.free();
}
void GfxTinyGL::dimRegion(int x, int y, int w, int h, float level) {
+ level = CLIP(level, 0.0f, 1.0f);
+
tglMatrixMode(TGL_PROJECTION);
tglLoadIdentity();
tglOrthof(0, _gameWidth, _gameHeight, 0, 0, 1);
@@ -1254,11 +1282,12 @@ void GfxTinyGL::dimRegion(int x, int y, int w, int h, float level) {
tglDisable(TGL_LIGHTING);
tglDisable(TGL_DEPTH_TEST);
+ tglDisable(TGL_TEXTURE_2D);
tglDepthMask(TGL_FALSE);
tglEnable(TGL_BLEND);
tglBlendFunc(TGL_SRC_ALPHA, TGL_ONE_MINUS_SRC_ALPHA);
- tglColor4f(0, 0, 0, 1 - level);
+ tglColor4f(0.0f, 0.0f, 0.0f, 1.0f - level);
tglBegin(TGL_QUADS);
tglVertex2f(x, y);
diff --git a/engines/grim/gfx_tinygl.h b/engines/grim/gfx_tinygl.h
index 73e358e83a8..730b25747c2 100644
--- a/engines/grim/gfx_tinygl.h
+++ b/engines/grim/gfx_tinygl.h
@@ -134,6 +134,9 @@ private:
Graphics::PixelFormat _pixelFormat;
TinyGL::BlitImage *_emergFont[96];
TinyGL::BlitImage *_smushImage;
+ TinyGL::BlitImage *_storedImage;
+ // _storedDisplay changed after _storedImage was uploaded
+ bool _storedImageDirty;
Graphics::Surface *_storedDisplay;
float _alpha;
const Actor *_currentActor;
diff --git a/engines/grim/shaders/grim_dim.fragment b/engines/grim/shaders/grim_dim.fragment
index 9a0f318a136..617aa9872d0 100644
--- a/engines/grim/shaders/grim_dim.fragment
+++ b/engines/grim/shaders/grim_dim.fragment
@@ -3,11 +3,12 @@ in vec2 Texcoord;
OUTPUT
uniform sampler2D tex;
+// DimScreen: 1, 1. DimRegion (blended): 0, 1 - level
+uniform float colorScale;
+uniform float alpha;
void main() {
vec4 c = texture(tex, Texcoord);
-
- float val = (c.r + c.g + c.b) / 10.0;
-
- outColor = vec4(val, val, val, 1);
+ float grey = max(max(c.r, c.g), c.b / 8.0) / 4.0;
+ outColor = vec4(vec3(grey * colorScale), alpha);
}
More information about the Scummvm-git-logs
mailing list