[Scummvm-git-logs] scummvm branch-2-5 -> 81bbb7be0edae9a2adbca4071419a565ea9710f3

aquadran aquadran at gmail.com
Fri Oct 1 20:33:36 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
81bbb7be0e GRAPHICS: Do not clear frame buffer. Let engine only do that. Fixes #12936


Commit: 81bbb7be0edae9a2adbca4071419a565ea9710f3
    https://github.com/scummvm/scummvm/commit/81bbb7be0edae9a2adbca4071419a565ea9710f3
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-10-01T22:33:32+02:00

Commit Message:
GRAPHICS: Do not clear frame buffer. Let engine only do that. Fixes #12936

Changed paths:
    NEWS.md
    graphics/opengl/framebuffer.cpp


diff --git a/NEWS.md b/NEWS.md
index 36f1220a3c..9ce5f81b16 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -5,6 +5,7 @@ For a more comprehensive changelog of the latest experimental code, see:
 
  Grim:
    - Fixed default "Talk Speed" option value.
+   - Fixed black screen while entering save game name.
 
 #### 2.5.0 "Twenty years ago today..." (2021-10-09)
 
diff --git a/graphics/opengl/framebuffer.cpp b/graphics/opengl/framebuffer.cpp
index d03722ec4f..dd938c613a 100644
--- a/graphics/opengl/framebuffer.cpp
+++ b/graphics/opengl/framebuffer.cpp
@@ -195,9 +195,6 @@ void FrameBuffer::init() {
 void FrameBuffer::attach() {
 	glBindFramebuffer(GL_FRAMEBUFFER, _frameBuffer);
 	glViewport(0,0, _width, _height);
-
-	glClearColor(0, 0, 0, 1.0f);
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 }
 
 void FrameBuffer::detach() {
@@ -255,9 +252,6 @@ void MultiSampleFrameBuffer::attach() {
 	glBindFramebuffer(GL_READ_FRAMEBUFFER, getFrameBufferName());
 	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _msFrameBufferId);
 	glViewport(0,0, getWidth(), getHeight());
-
-	glClearColor(0, 0, 0, 1.0f);
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 }
 
 void MultiSampleFrameBuffer::detach() {




More information about the Scummvm-git-logs mailing list