thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

JANITORIAL: Fix code formatting

Browse source
This commit is contained in:
Eugene Sandulenko 2021-08-20 21:17:03 +02:00
parent d69cfbee44
commit 797ca3568d
No known key found for this signature in database
GPG key ID: 014D387312D34F08
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/grim/grim.cpp
View file

@ -1116,12 +1116,12 @@ void GrimEngine::mainLoop() {
g_imuseState = -1;
}
#if defined(__EMSCRIPTEN__)
// If SDL_HINT_EMSCRIPTEN_ASYNCIFY is enabled, SDL pauses the application and gives
// back control to the browser automatically by calling emscripten_sleep via SDL_Delay.
// Without this the page would completely lock up.
#if defined(__EMSCRIPTEN__)
// If SDL_HINT_EMSCRIPTEN_ASYNCIFY is enabled, SDL pauses the application and gives
// back control to the browser automatically by calling emscripten_sleep via SDL_Delay.
// Without this the page would completely lock up.
g_system->delayMillis(0);
#endif
#endif
uint32 endTime = g_system->getMillis();
if (startTime > endTime)

16
graphics/opengl/framebuffer.cpp
View file

@ -160,17 +160,17 @@ void FrameBuffer::init() {
glBindRenderbuffer(GL_RENDERBUFFER, _renderBuffers[0]);
const char *glVersion = (const char *)glGetString(GL_VERSION);
if (strstr(glVersion,"WebGL 1.0") != NULL) {
if (strstr(glVersion, "WebGL 1.0") != NULL) {
// See https://www.khronos.org/registry/webgl/specs/latest/1.0/#FBO_ATTACHMENTS
// and https://github.com/emscripten-core/emscripten/issues/4832
#ifndef GL_DEPTH_STENCIL
#define GL_DEPTH_STENCIL 0x84F9
#endif
#ifndef GL_DEPTH_STENCIL
#define GL_DEPTH_STENCIL 0x84F9
#endif
glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_STENCIL, _texWidth, _texHeight);
#ifndef GL_DEPTH_STENCIL_ATTACHMENT
#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
#endif
#ifndef GL_DEPTH_STENCIL_ATTACHMENT
#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
#endif
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _renderBuffers[0]);
} else {
glRenderbufferStorage(GL_RENDERBUFFER, useDepthComponent24() ? GL_DEPTH_COMPONENT24 : GL_DEPTH_COMPONENT16, _texWidth, _texHeight);