LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 11:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into SDL3

Browse Source
This commit is contained in:
Sasha Szpakowski
2024-03-24 18:53:08 -03:00
parent 62ac858f30 21b71d02b5
commit 2bdadf51d4
616 changed files with 4577 additions and 4003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/window/sdl/Window.cpp
+5 -15
View File
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2006-2023 LOVE Development Team
* Copyright (c) 2006-2024 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
@@ -90,7 +90,8 @@ namespace sdl
{
Window::Window()
: open(false)
: love::window::Window("love.window.sdl")
, open(false)
, mouseGrabbed(false)
, window(nullptr)
, glcontext(nullptr)
@@ -1271,17 +1272,11 @@ bool Window::setIcon(love::image::ImageData *imgd)
int bytesperpixel = (int) getPixelFormatBlockSize(imgd->getFormat());
int pitch = w * bytesperpixel;
SDL_Surface *sdlicon = nullptr;
{
// We don't want another thread modifying the ImageData mid-copy.
love::thread::Lock lock(imgd->getMutex());
#if SDL_VERSION_ATLEAST(3, 0, 0)
sdlicon = SDL_CreateSurfaceFrom(imgd->getData(), w, h, pitch, SDL_PIXELFORMAT_RGBA8888);
SDL_Surface *sdlicon = SDL_CreateSurfaceFrom(imgd->getData(), w, h, pitch, SDL_PIXELFORMAT_RGBA8888);
#else
sdlicon = SDL_CreateRGBSurfaceFrom(imgd->getData(), w, h, bytesperpixel * 8, pitch, rmask, gmask, bmask, amask);
SDL_Surface *sdlicon = SDL_CreateRGBSurfaceFrom(imgd->getData(), w, h, bytesperpixel * 8, pitch, rmask, gmask, bmask, amask);
#endif
}
if (!sdlicon)
return false;
@@ -1749,11 +1744,6 @@ void Window::requestAttention(bool continuous)
// TODO: Linux?
}
const char *Window::getName() const
{
return "love.window.sdl";
}
} // sdl
} // window
} // love
src/modules/window/sdl/Window.h
+1 -3
View File
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2006-2023 LOVE Development Team
* Copyright (c) 2006-2024 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
@@ -130,8 +130,6 @@ public:
void requestAttention(bool continuous) override;
const char *getName() const override;
private:
struct ContextAttribs