index bfb76fb5bae1f5a69f01ff3f575ade72c80c2810..29a81b01e0a38102289a515cf5500aa2156530ef 100644 (file)
begin
gWinSizeX := w;
gWinSizeY := h;
begin
gWinSizeX := w;
gWinSizeY := h;
- gScreenWidth := w;
- gScreenHeight := h;
gRC_Width := w;
gRC_Height := h;
gRC_Width := w;
gRC_Height := h;
+ if glRenderToFBO then
+ begin
+ // store real window size in gWinSize, downscale resolution now
+ w := round(w / r_pixel_scale);
+ h := round(h / r_pixel_scale);
+ e_ResizeFramebuffer(w, h);
+ end;
+ gScreenWidth := w;
+ gScreenHeight := h;
{$IFDEF ENABLE_HOLMES}
fuiScrWdt := w;
fuiScrHgt := h;
{$IFDEF ENABLE_HOLMES}
fuiScrWdt := w;
fuiScrHgt := h;
if context <> nil then
begin
{$IFDEF NOGL_INIT}
if context <> nil then
begin
{$IFDEF NOGL_INIT}
- nogl_Init;
+ nogl_Init;
+ if glRenderToFBO and (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) then
+ {$ELSE}
+ if glRenderToFBO and (not Load_GL_ARB_framebuffer_object()) then
{$ENDIF}
{$ENDIF}
+ begin
+ e_LogWriteln('SDL: no framebuffer object support detected');
+ glRenderToFBO := False
+ end;
if (fullscreen = false) and (maximized = false) and (wc = false) then
begin
SDL_GetWindowPosition(window, @x, @y);
if (fullscreen = false) and (maximized = false) and (wc = false) then
begin
SDL_GetWindowPosition(window, @x, @y);
end
else
begin
end
else
begin
+ if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0;
+ SDL_SetWindowFullscreen(window, flags);
SDL_SetWindowSize(window, w, h);
SDL_SetWindowSize(window, w, h);
- if wc then
+ if maximized then SDL_MaximizeWindow(window);
+ // always reset to center when changing fullscreen->windowed for safety purposes
+ if wc or (gFullscreen and not fullscreen) or (gWinMaximized and not maximized) then
begin
x := SDL_WINDOWPOS_CENTERED;
y := SDL_WINDOWPOS_CENTERED
begin
x := SDL_WINDOWPOS_CENTERED;
y := SDL_WINDOWPOS_CENTERED
SDL_GetWindowPosition(window, @x, @y);
wx := x; wy := y
end;
SDL_GetWindowPosition(window, @x, @y);
wx := x; wy := y
end;
- if maximized then
- SDL_MaximizeWindow(window);
- if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0;
- SDL_SetWindowFullscreen(window, flags);
gFullScreen := fullscreen;
gWinMaximized := maximized;
gRC_FullScreen := fullscreen;
gFullScreen := fullscreen;
gWinMaximized := maximized;
gRC_FullScreen := fullscreen;
procedure sys_Repaint;
begin
procedure sys_Repaint;
begin
+ if glRenderToFBO then
+ e_BlitFramebuffer(gWinSizeX, gWinSizeY);
SDL_GL_SwapWindow(window)
end;
SDL_GL_SwapWindow(window)
end;
flags := SDL_INIT_TIMER or $00004000;
{$ENDIF}
{$ELSE}
flags := SDL_INIT_TIMER or $00004000;
{$ENDIF}
{$ELSE}
- flags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO;
+ flags := SDL_INIT_TIMER or SDL_INIT_VIDEO;
{$ENDIF}
SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, '0');
if SDL_Init(flags) <> 0 then
raise Exception.Create('SDL: Init failed: ' + SDL_GetError);
{$ENDIF}
SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, '0');
if SDL_Init(flags) <> 0 then
raise Exception.Create('SDL: Init failed: ' + SDL_GetError);
+ {$IFNDEF HEADLESS}
+ if SDL_InitSubSystem(SDL_INIT_JOYSTICK) <> 0 then
+ e_LogWritefln('SDL: Init subsystem failed: %s', [SDL_GetError()]);
+ {$ENDIF}
SDL_ShowCursor(SDL_DISABLE);
end;
SDL_ShowCursor(SDL_DISABLE);
end;