[Scummvm-git-logs] scummvm master -> ea8b6e9ae2630676accec30d71ce701dd56a6f0d

aquadran aquadran at gmail.com
Mon Nov 1 11:16:25 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:
ea8b6e9ae2 AMIGAOS: Replace query with correct one


Commit: ea8b6e9ae2630676accec30d71ce701dd56a6f0d
    https://github.com/scummvm/scummvm/commit/ea8b6e9ae2630676accec30d71ce701dd56a6f0d
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2021-11-01T12:16:23+01:00

Commit Message:
AMIGAOS: Replace query with correct one

Changed paths:
    backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp


diff --git a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
index 1a2d5232c6..03b589b6ac 100644
--- a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
+++ b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
@@ -304,7 +304,7 @@ void OpenGLSdlGraphics3dManager::createOrUpdateScreen() {
 
 	_screenChangeCount++;
 
-#if !defined(AMIGAOS) && !defined(__MORPHOS__)
+#if !defined(__amigaos4__) && !defined(__MORPHOS__)
 	if (renderToFrameBuffer) {
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 		_frameBuffer = createFramebuffer(_engineRequestedWidth, _engineRequestedHeight);
@@ -549,7 +549,7 @@ void OpenGLSdlGraphics3dManager::drawOverlay() {
 	_surfaceRenderer->restorePreviousState();
 }
 
-#if !defined(AMIGAOS) && !defined(__MORPHOS__)
+#if !defined(__amigaos4__) && !defined(__MORPHOS__)
 OpenGL::FrameBuffer *OpenGLSdlGraphics3dManager::createFramebuffer(uint width, uint height) {
 #if !defined(USE_GLES2)
 	if (_antialiasing && OpenGLContext.framebufferObjectMultisampleSupported) {
@@ -560,7 +560,7 @@ OpenGL::FrameBuffer *OpenGLSdlGraphics3dManager::createFramebuffer(uint width, u
 		return new OpenGL::FrameBuffer(width, height);
 	}
 }
-#endif // AMIGAOS
+#endif
 
 void OpenGLSdlGraphics3dManager::updateScreen() {
 	if (_frameBuffer) {




More information about the Scummvm-git-logs mailing list