From 6738ca000444c9a76f0e70ffa7cd50d2d6bb5638 Mon Sep 17 00:00:00 2001 From: Chugunov Roman Date: Wed, 22 Nov 2023 17:17:10 +0300 Subject: [PATCH 1/4] module: update xrLuaFix ref --- Externals/xrLuaFix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals/xrLuaFix b/Externals/xrLuaFix index 933cdaed31e..f4b37416713 160000 --- a/Externals/xrLuaFix +++ b/Externals/xrLuaFix @@ -1 +1 @@ -Subproject commit 933cdaed31e06407cadd4ef09e3837b6d8816111 +Subproject commit f4b374167139531f9120074f346effa282c53555 From b927b505dcd51574f1f410782e9aaeff05fd4cfc Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Tue, 21 Nov 2023 22:37:56 +0500 Subject: [PATCH 2/4] xrServerEntities/xml_str_id_loader.h: disabled gameplay xmls debug logging --- src/xrServerEntities/xml_str_id_loader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xrServerEntities/xml_str_id_loader.h b/src/xrServerEntities/xml_str_id_loader.h index cbe628801ff..eef3ca2561a 100644 --- a/src/xrServerEntities/xml_str_id_loader.h +++ b/src/xrServerEntities/xml_str_id_loader.h @@ -90,7 +90,7 @@ const ITEM_DATA* CSXML_IdToIndex::GetById(const shared_str& str_id, bool no_asse if (it == m_pItemDataVector->end()) { -#ifndef MASTER_GOLD +#if 0 // ndef MASTER_GOLD int i = 0; for (it = m_pItemDataVector->begin(); m_pItemDataVector->end() != it; ++it, i++) Msg("[%d]=[%s]", i, *(*it).id); From 3f980b03f981c7b6c5eaff3b2753cd829e3920ca Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Wed, 22 Nov 2023 19:09:59 +0500 Subject: [PATCH 3/4] Layers/xrRenderPC_GL/r2_test_hw.cpp: cosmetic refactoring and code formatting --- src/Layers/xrRenderPC_GL/r2_test_hw.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/Layers/xrRenderPC_GL/r2_test_hw.cpp b/src/Layers/xrRenderPC_GL/r2_test_hw.cpp index 14485f49733..cf8e9b4b46b 100644 --- a/src/Layers/xrRenderPC_GL/r2_test_hw.cpp +++ b/src/Layers/xrRenderPC_GL/r2_test_hw.cpp @@ -2,8 +2,8 @@ class sdl_window_test_helper { - SDL_Window* m_window = nullptr; - SDL_GLContext m_context = nullptr; + SDL_Window* m_window{}; + SDL_GLContext m_context{}; public: sdl_window_test_helper() @@ -25,6 +25,7 @@ class sdl_window_test_helper } } + [[nodiscard]] bool successful() const { return m_window && m_context; @@ -37,24 +38,19 @@ class sdl_window_test_helper } }; -bool TestOpenGLSupport() +BOOL xrRender_test_hw() { // Check if minimal required OpenGL features are available const sdl_window_test_helper windowTest; if (!windowTest.successful()) - return false; + return FALSE; GLenum err = glewInit(); if (GLEW_OK != err) { - Log("~ Could not initialize glew:", (pcstr)glewGetErrorString(err)); - return false; + Log("~ Could not initialize glew:", (pcstr)glewGetErrorString(err)); + return FALSE; } - return true; -} - -BOOL xrRender_test_hw() -{ - return TestOpenGLSupport() ? TRUE : FALSE; + return TRUE; } From 679e6a19d4c2b9d501c10c7971bf9d440af3cfdb Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Wed, 22 Nov 2023 19:31:52 +0500 Subject: [PATCH 4/4] Report RGL as unavailable if GLEW_ARB_framebuffer_object unsupported (#1528) --- src/Layers/xrRenderPC_GL/r2_test_hw.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Layers/xrRenderPC_GL/r2_test_hw.cpp b/src/Layers/xrRenderPC_GL/r2_test_hw.cpp index cf8e9b4b46b..d0d6a6d54c0 100644 --- a/src/Layers/xrRenderPC_GL/r2_test_hw.cpp +++ b/src/Layers/xrRenderPC_GL/r2_test_hw.cpp @@ -52,5 +52,8 @@ BOOL xrRender_test_hw() return FALSE; } + if (!GLEW_ARB_framebuffer_object) + return FALSE; + return TRUE; }