From b5ac09bdb43e0f2506d9229e0070c5e8b8792b17 Mon Sep 17 00:00:00 2001 From: mobserveur Date: Sun, 14 Jul 2024 23:49:59 +0200 Subject: Performance and tuning Performance and tuning floater updated including fixes --- indra/newview/CMakeLists.txt | 22 ++--- indra/newview/llviewerfloaterreg.cpp | 6 +- indra/newview/mpfloatertuning.cpp | 97 +++++++++++++++++++ indra/newview/mpfloatertuning.h | 48 ++++++++++ indra/newview/mpvfloatertuning.cpp | 90 ------------------ indra/newview/mpvfloatertuning.h | 48 ---------- .../default/xui/en/floater_mp_performance.xml | 99 ++++++++++++++++++++ .../default/xui/en/floater_mpv_performance.xml | 104 --------------------- .../skins/default/xui/en/panel_status_bar.xml | 3 +- 9 files changed, 259 insertions(+), 258 deletions(-) create mode 100644 indra/newview/mpfloatertuning.cpp create mode 100644 indra/newview/mpfloatertuning.h delete mode 100644 indra/newview/mpvfloatertuning.cpp delete mode 100644 indra/newview/mpvfloatertuning.h create mode 100644 indra/newview/skins/default/xui/en/floater_mp_performance.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_mpv_performance.xml (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 3076724a05..1821e12e09 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -250,7 +250,7 @@ set(viewer_SOURCE_FILES llfloaterhandler.cpp llfloaterhelpbrowser.cpp llfloaterhoverheight.cpp - mpvfloatertuning.cpp + mpfloatertuning.cpp llfloaterhowto.cpp llfloaterhud.cpp llfloaterimagepreview.cpp @@ -913,7 +913,7 @@ set(viewer_HEADER_FILES llfloaterhandler.h llfloaterhelpbrowser.h llfloaterhoverheight.h - mpvfloatertuning.h + mpfloatertuning.h llfloaterhowto.h llfloaterhud.h llfloaterimagepreview.h @@ -1417,7 +1417,7 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt" "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\n") set_source_files_properties( - llversioninfo.cpp tests/llversioninfo_test.cpp + llversioninfo.cpp tests/llversioninfo_test.cpp PROPERTIES COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" # see BuildVersion.cmake ) @@ -1624,7 +1624,7 @@ endif (WINDOWS) file(GLOB_RECURSE viewer_XUI_FILES LIST_DIRECTORIES FALSE ${CMAKE_CURRENT_SOURCE_DIR}/skins/*.xml) source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/skins PREFIX "XUI Files" FILES ${viewer_XUI_FILES}) -set_source_files_properties(${viewer_XUI_FILES} +set_source_files_properties(${viewer_XUI_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES}) @@ -1632,7 +1632,7 @@ list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES}) file(GLOB_RECURSE viewer_SHADER_FILES LIST_DIRECTORIES FALSE ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/shaders/*.glsl) source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/shaders PREFIX "Shaders" FILES ${viewer_SHADER_FILES}) -set_source_files_properties(${viewer_SHADER_FILES} +set_source_files_properties(${viewer_SHADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) list(APPEND viewer_SOURCE_FILES ${viewer_SHADER_FILES}) @@ -1924,7 +1924,7 @@ endif (WINDOWS) # one of these being libz where you can find four or more versions in play # at once. On Linux, libz can be found at link and run time via a number # of paths: -# +# # => -lfreetype # => libz.so.1 (on install machine, not build) # => -lSDL @@ -2041,7 +2041,7 @@ foreach(elem ${country_codes}) set(emoji_mapping_src_file "${emoji_mapping_src_folder}/${elem}/emoji_characters.xml") set(emoji_mapping_dst_file - "${emoji_mapping_dst_folder}/${elem}/emoji_characters.xml") + "${emoji_mapping_dst_folder}/${elem}/emoji_characters.xml") configure_file(${emoji_mapping_src_file} ${emoji_mapping_dst_file} COPYONLY) endforeach() @@ -2145,7 +2145,7 @@ if (DARWIN) # https://blog.kitware.com/upcoming-in-cmake-2-8-12-osx-rpath-support/ set(CMAKE_MACOSX_RPATH 1) - + set_target_properties( ${VIEWER_BINARY_NAME} PROPERTIES @@ -2352,7 +2352,7 @@ if (LL_TESTS) # llremoteparcelrequest.cpp llviewerhelputil.cpp llversioninfo.cpp -# llvocache.cpp +# llvocache.cpp llworldmap.cpp llworldmipmap.cpp ) @@ -2361,7 +2361,7 @@ if (LL_TESTS) llworldmap.cpp llworldmipmap.cpp PROPERTIES - LL_TEST_ADDITIONAL_SOURCE_FILES + LL_TEST_ADDITIONAL_SOURCE_FILES tests/llviewertexture_stub.cpp #llviewertexturelist.cpp ) @@ -2395,7 +2395,7 @@ if (LL_TESTS) llworldmap.cpp llworldmipmap.cpp PROPERTIES - LL_TEST_ADDITIONAL_SOURCE_FILES + LL_TEST_ADDITIONAL_SOURCE_FILES tests/llviewertexture_stub.cpp ) diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 9ec5f4f122..38fde25ebb 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -81,7 +81,7 @@ #include "llfloatergroups.h" #include "llfloaterhelpbrowser.h" #include "llfloaterhoverheight.h" -#include "mpvfloatertuning.h" +#include "mpfloatertuning.h" #include "llfloaterhowto.h" #include "llfloaterhud.h" #include "llfloaterimagepreview.h" @@ -381,8 +381,8 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("edit_hover_height", "floater_edit_hover_height.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("hud", "floater_hud.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); - LLFloaterReg::add("mpv_performance", "floater_mpv_performance.xml", (LLFloaterBuildFunc)& - LLFloaterReg::build); + LLFloaterReg::add("mpv_performance", "floater_mp_performance.xml", (LLFloaterBuildFunc)& + LLFloaterReg::build); LLFloaterReg::add("impanel", "floater_im_session.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("im_container", "floater_im_container.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); diff --git a/indra/newview/mpfloatertuning.cpp b/indra/newview/mpfloatertuning.cpp new file mode 100644 index 0000000000..938299cacf --- /dev/null +++ b/indra/newview/mpfloatertuning.cpp @@ -0,0 +1,97 @@ +/** +* @file mpfloatertuning.cpp +* @brief Controller for viewer tuning +* @author observeur@megapahit.net +* +* $LicenseInfo:firstyear=2014&license=viewerlgpl$ +* Second Life Viewer Source Code +* Copyright (C) 2014, Linden Research, Inc. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; +* version 2.1 of the License only. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* +* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA +* $/LicenseInfo$ +*/ + +#include "llviewerprecompiledheaders.h" + +#include "mpfloatertuning.h" +#include "llsliderctrl.h" +#include "llcheckboxctrl.h" +#include "llcombobox.h" +#include "llviewercontrol.h" +#include "llsdserialize.h" + +#include "../llrender/llvertexbuffer.cpp" + +MPFloaterTuning::MPFloaterTuning(const LLSD& key) : LLFloater(key) +{ +} + +void MPFloaterTuning::syncFromPreferenceSetting(void *user_data) +{ + MPFloaterTuning *self = static_cast(user_data); + + U32 fps = gSavedSettings.getU32("MaxFPS"); + LLSliderCtrl* fpsSliderCtrl = self->getChild("fpsSlider"); + fpsSliderCtrl->setValue(fps,FALSE); + + U32 optBuf = gSavedSettings.getU32("MPVBufferOptiMode"); + + if(optBuf == 0) + { + if(gGLManager.mIsApple) optBuf = 2; + else optBuf = 1; + } + + LLComboBox * optBufCtrl = self->getChild("MPVBuffModeComboBox"); + optBufCtrl->setCurrentByIndex(optBuf-1); + + LL_INFOS() << "syncFromPreferenceSetting optBuf=" << optBuf << LL_ENDL; +} + +BOOL MPFloaterTuning::postBuild() +{ + LLSliderCtrl* fpsSliderCtrl = getChild("fpsSlider"); + fpsSliderCtrl->setMinValue(0); + fpsSliderCtrl->setMaxValue(165); + fpsSliderCtrl->setSliderMouseUpCallback(boost::bind(&MPFloaterTuning::onFinalCommit,this)); + + LLComboBox* optBufCtrl = getChild("MPVBuffModeComboBox"); + optBufCtrl->setCommitCallback(boost::bind(&MPFloaterTuning::onFinalCommit,this)); + + syncFromPreferenceSetting(this); + + return TRUE; +} + +// Do send-to-the-server work when slider drag completes, or new +// value entered as text. +void MPFloaterTuning::onFinalCommit() +{ + LLSliderCtrl* fpsSliderCtrl = getChild("fpsSlider"); + U32 fps = (U32)fpsSliderCtrl->getValueF32(); + gSavedSettings.setU32("MaxFPS",fps); + + LLComboBox* optBufCtrl = getChild("MPVBuffModeComboBox"); + S16 optBuf = optBufCtrl->getCurrentIndex() + 1; + gSavedSettings.setU32("MPVBufferOptiMode",optBuf); + + LLVertexBuffer::sMappingMode = optBuf; +} + +void MPFloaterTuning::onClose(bool app_quitting) +{ +} \ No newline at end of file diff --git a/indra/newview/mpfloatertuning.h b/indra/newview/mpfloatertuning.h new file mode 100644 index 0000000000..8812395ef3 --- /dev/null +++ b/indra/newview/mpfloatertuning.h @@ -0,0 +1,48 @@ +/** +* @file mpfloatertuning.h +* @brief Controller for viewer tuning +* @author observeur@megapahit.net +* +* $LicenseInfo:firstyear=2014&license=viewerlgpl$ +* Second Life Viewer Source Code +* Copyright (C) 2014, Linden Research, Inc. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; +* version 2.1 of the License only. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* +* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA +* $/LicenseInfo$ +*/ +#ifndef LL_MPFLOATERTUNING_H +#define LL_MPFLOATERTUNING_H + +#include "llfloater.h" + +class MPFloaterTuning: public LLFloater +{ +public: + MPFloaterTuning(const LLSD& key); + + BOOL postBuild(); + + void onFinalCommit(); + + static void syncFromPreferenceSetting(void *user_data); + + //void updateEditEnabled(); + + /*virtual*/ void onClose(bool app_quitting); +}; + +#endif diff --git a/indra/newview/mpvfloatertuning.cpp b/indra/newview/mpvfloatertuning.cpp deleted file mode 100644 index 177bd3caa7..0000000000 --- a/indra/newview/mpvfloatertuning.cpp +++ /dev/null @@ -1,90 +0,0 @@ -/** -* @file mpvfloatertuning.cpp -* @brief Controller for viewer tuning -* @author observeur@megapahit.net -* -* $LicenseInfo:firstyear=2014&license=viewerlgpl$ -* Second Life Viewer Source Code -* Copyright (C) 2014, Linden Research, Inc. -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; -* version 2.1 of the License only. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -* -* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA -* $/LicenseInfo$ -*/ - -#include "llviewerprecompiledheaders.h" - -#include "mpvfloatertuning.h" -#include "llsliderctrl.h" -#include "llcheckboxctrl.h" -#include "llcombobox.h" -#include "llviewercontrol.h" -#include "llsdserialize.h" - -#include "../llrender/llvertexbuffer.cpp" - -MPVFloaterTuning::MPVFloaterTuning(const LLSD& key) : LLFloater(key) -{ -} - -void MPVFloaterTuning::syncFromPreferenceSetting(void *user_data) -{ - MPVFloaterTuning *self = static_cast(user_data); - - U32 fps = gSavedSettings.getU32("MaxFPS"); - LLSliderCtrl* fpsSliderCtrl = self->getChild("fpsSlider"); - fpsSliderCtrl->setValue(fps,FALSE); - - U32 optBuf = gSavedSettings.getU32("MPVBufferOptiMode"); - LLComboBox * optBufCtrl = self->getChild("MPVBuffModeComboBox"); - optBufCtrl->setCurrentByIndex(optBuf); - - LL_INFOS() << "syncFromPreferenceSetting optBuf=" << optBuf << LL_ENDL; -} - -BOOL MPVFloaterTuning::postBuild() -{ - LLSliderCtrl* fpsSliderCtrl = getChild("fpsSlider"); - fpsSliderCtrl->setMinValue(0); - fpsSliderCtrl->setMaxValue(165); - fpsSliderCtrl->setSliderMouseUpCallback(boost::bind(&MPVFloaterTuning::onFinalCommit,this)); - - LLComboBox* optBufCtrl = getChild("MPVBuffModeComboBox"); - optBufCtrl->setCommitCallback(boost::bind(&MPVFloaterTuning::onFinalCommit,this)); - - syncFromPreferenceSetting(this); - - return TRUE; -} - -// Do send-to-the-server work when slider drag completes, or new -// value entered as text. -void MPVFloaterTuning::onFinalCommit() -{ - LLSliderCtrl* fpsSliderCtrl = getChild("fpsSlider"); - U32 fps = (U32)fpsSliderCtrl->getValueF32(); - gSavedSettings.setU32("MaxFPS",fps); - - LLComboBox* optBufCtrl = getChild("MPVBuffModeComboBox"); - S16 optBuf = optBufCtrl->getCurrentIndex(); - gSavedSettings.setU32("MPVBufferOptiMode",optBuf); - - LLVertexBuffer::sMappingMode = optBuf; -} - -void MPVFloaterTuning::onClose(bool app_quitting) -{ -} \ No newline at end of file diff --git a/indra/newview/mpvfloatertuning.h b/indra/newview/mpvfloatertuning.h deleted file mode 100644 index ed91317eab..0000000000 --- a/indra/newview/mpvfloatertuning.h +++ /dev/null @@ -1,48 +0,0 @@ -/** -* @file mpvfloatertuning.h -* @brief Controller for viewer tuning -* @author observeur@megapahit.net -* -* $LicenseInfo:firstyear=2014&license=viewerlgpl$ -* Second Life Viewer Source Code -* Copyright (C) 2014, Linden Research, Inc. -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; -* version 2.1 of the License only. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -* -* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA -* $/LicenseInfo$ -*/ -#ifndef LL_MPVFLOATERTUNING_H -#define LL_MPVFLOATERTUNING_H - -#include "llfloater.h" - -class MPVFloaterTuning: public LLFloater -{ -public: - MPVFloaterTuning(const LLSD& key); - - BOOL postBuild(); - - void onFinalCommit(); - - static void syncFromPreferenceSetting(void *user_data); - - //void updateEditEnabled(); - - /*virtual*/ void onClose(bool app_quitting); -}; - -#endif diff --git a/indra/newview/skins/default/xui/en/floater_mp_performance.xml b/indra/newview/skins/default/xui/en/floater_mp_performance.xml new file mode 100644 index 0000000000..865ffe82cf --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_mp_performance.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + Buffer mapping: + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/floater_mpv_performance.xml b/indra/newview/skins/default/xui/en/floater_mpv_performance.xml deleted file mode 100644 index 5c54d366f2..0000000000 --- a/indra/newview/skins/default/xui/en/floater_mpv_performance.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - Buffer mapping: - - - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index f337ad9038..80fa230bba 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -188,13 +188,12 @@ + max_val="1" + > + + width="124"> @@ -259,7 +280,7 @@ top="135" width="400" height="150" - border="true" + border="false" visible="false" background_visible="true"/> -- cgit v1.2.3 From 16f232bb509dae0d7570d9b815e86f120e596dc0 Mon Sep 17 00:00:00 2001 From: mobserveur Date: Sun, 14 Jul 2024 23:52:55 +0200 Subject: Vsync fix for Linux Vsync was activated when the viewer is launched. This should fix the issue. --- indra/newview/llviewerwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index a19d9a3567..e7caf777f5 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2010,6 +2010,8 @@ LLViewerWindow::LLViewerWindow(const Params& p) mDebugText = new LLDebugText(this); mWorldViewRectScaled = calcScaledRect(mWorldViewRectRaw, mDisplayScale); + + mWindow->toggleVSync(gSavedSettings.getBOOL("RenderVSyncEnabled")); } std::string LLViewerWindow::getLastSnapshotDir() -- cgit v1.2.3 From 92dafc85c6fefd32ba8bad918173dd57a3df2213 Mon Sep 17 00:00:00 2001 From: mobserveur Date: Sun, 14 Jul 2024 23:54:02 +0200 Subject: Script dialog position This commit allows the script dialog position to be remembered --- indra/newview/skins/default/xui/en/floater_script.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml index ae6e68de17..900319620d 100644 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -7,7 +7,8 @@ name="script_floater" can_dock="true" can_minimize="true" - visible="false" + save_rect="true" + visible="false" width="350" can_resize="false" min_width="350" -- cgit v1.2.3 From 54ef82dae2005d2340ea39208f262c564642f98f Mon Sep 17 00:00:00 2001 From: mobserveur Date: Sun, 14 Jul 2024 23:55:07 +0200 Subject: Eliminates the fatal warning in llprogressview.cpp The unused variables are commented --- indra/newview/llprogressview.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 664860db30..0a2debc7c6 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -379,17 +379,17 @@ void LLProgressView::initLogos() { mLogosList.clear(); - const U8 image_codec = IMG_CODEC_PNG; - const LLRectf default_clip(0.f, 1.f, 1.f, 0.f); + //const U8 image_codec = IMG_CODEC_PNG; + //const LLRectf default_clip(0.f, 1.f, 1.f, 0.f); //const S32 default_height = 28; - const S32 default_pad = 15; + //const S32 default_pad = 15; - S32 icon_width, icon_height; + //S32 icon_width, icon_height; // We don't know final screen rect yet, so we can't precalculate position fully - LLTextBox *logos_label = getChild("logos_lbl"); - S32 texture_start_x = logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad; - S32 texture_start_y = -7; + //LLTextBox *logos_label = getChild("logos_lbl"); + //S32 texture_start_x = logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad; + //S32 texture_start_y = -7; // Normally we would just preload these textures from textures.xml, // and display them via icon control, but they are only needed on -- cgit v1.2.3