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

Merge remote-tracking branch 'upstream/12.0-development' into 12.0-development

Browse Source
This commit is contained in:
niki
2022-10-25 13:52:35 +02:00
parent f4bdc57fb3 4862d95687
commit e95319873c
4 changed files with 106 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/wrap_Graphics.cpp
+2
View File
@@ -2335,6 +2335,8 @@ int w_getBackgroundColor(lua_State *L)
int w_setNewFont(lua_State *L)
{
luax_markdeprecated(L, 1, "love.graphics.setNewFont", API_FUNCTION, DEPRECATED_NO_REPLACEMENT, nullptr);
int ret = w_newFont(L);
Font *font = luax_checktype<Font>(L, -1);
instance()->setFont(font);
src/modules/window/sdl/Window.cpp
+2 -4
View File
@@ -262,11 +262,9 @@ std::vector<Window::ContextAttribs> Window::getContextAttribsList() const
}
}
if (!preferGLES)
{
const char *gleshint = SDL_GetHint("LOVE_GRAPHICS_USE_OPENGLES");
const char *gleshint = SDL_GetHint("LOVE_GRAPHICS_USE_OPENGLES");
if (gleshint != nullptr)
preferGLES = (gleshint != nullptr && gleshint[0] != '0');
}
// Do we want a debug context?
bool debug = love::graphics::isDebugEnabled();