Przeglądaj źródła

Removed logic forcing vsync on if setting it off fails

The platforms that needed this (Windows Phone and Windows RT) are no longer supported, and if this is needed in the future it should be done at the renderer level, not here.

Fixes https://github.com/libsdl-org/SDL/issues/12475
Sam Lantinga 5 miesięcy temu
rodzic
commit
b99ff00a95
1 zmienionych plików z 3 dodań i 13 usunięć
  1. 3 13
      src/render/SDL_render.c

+ 3 - 13
src/render/SDL_render.c

@@ -1124,12 +1124,7 @@ SDL_Renderer *SDL_CreateRendererWithProperties(SDL_PropertiesID props)
     }
     }
 
 
     int vsync = (int)SDL_GetNumberProperty(props, SDL_PROP_RENDERER_CREATE_PRESENT_VSYNC_NUMBER, 0);
     int vsync = (int)SDL_GetNumberProperty(props, SDL_PROP_RENDERER_CREATE_PRESENT_VSYNC_NUMBER, 0);
-    if (!SDL_SetRenderVSync(renderer, vsync)) {
-        if (vsync == 0) {
-            // Some renderers require vsync enabled
-            SDL_SetRenderVSync(renderer, 1);
-        }
-    }
+    SDL_SetRenderVSync(renderer, vsync);
     SDL_CalculateSimulatedVSyncInterval(renderer, window);
     SDL_CalculateSimulatedVSyncInterval(renderer, window);
 
 
     SDL_LogInfo(SDL_LOG_CATEGORY_RENDER,
     SDL_LogInfo(SDL_LOG_CATEGORY_RENDER,
@@ -5626,7 +5621,8 @@ bool SDL_SetRenderVSync(SDL_Renderer *renderer, int vsync)
     }
     }
 #endif
 #endif
 
 
-    if (!renderer->SetVSync) {
+    if (!renderer->SetVSync ||
+        !renderer->SetVSync(renderer, vsync)) {
         switch (vsync) {
         switch (vsync) {
         case 0:
         case 0:
             renderer->simulate_vsync = false;
             renderer->simulate_vsync = false;
@@ -5637,12 +5633,6 @@ bool SDL_SetRenderVSync(SDL_Renderer *renderer, int vsync)
         default:
         default:
             return SDL_Unsupported();
             return SDL_Unsupported();
         }
         }
-    } else if (!renderer->SetVSync(renderer, vsync)) {
-        if (vsync == 1) {
-            renderer->simulate_vsync = true;
-        } else {
-            return false;
-        }
     }
     }
     SDL_SetNumberProperty(SDL_GetRendererProperties(renderer), SDL_PROP_RENDERER_VSYNC_NUMBER, vsync);
     SDL_SetNumberProperty(SDL_GetRendererProperties(renderer), SDL_PROP_RENDERER_VSYNC_NUMBER, vsync);
     return true;
     return true;