From 817486538c6502a2df5689577bfeb77229d0d7ad Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 15 Nov 2015 13:29:34 +0100 Subject: [PATCH] Changed: Minor changes --HG-- branch : develop --- .../src/3d/driver/opengl/driver_opengl_extension.cpp | 11 +++++++++-- code/nel/tools/3d/ig_elevation/main.cpp | 2 +- code/ryzom/client/client_default.cfg.in | 2 +- code/ryzom/client/src/interface_v3/music_player.cpp | 2 +- .../ryzom/client/src/r2/dmc/client_edition_module.cpp | 2 +- .../server/src/frontend_service/client_id_lookup.h | 2 +- code/ryzom/server/src/frontend_service/fe_types.h | 2 +- .../server/src/gpm_service/world_position_manager.h | 2 +- code/ryzom/server/src/pd_lib/pd_utils.h | 2 +- 9 files changed, 17 insertions(+), 10 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp index a55b5d720..7342b3efc 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp @@ -1793,8 +1793,15 @@ void registerGlExtensions(CGlExtensions &ext) if (ext.NVXGPUMemoryInfo) { -// GPU_MEMORY_INFO_EVICTION_COUNT_NVX; -// GPU_MEMORY_INFO_EVICTED_MEMORY_NVX; + GLint nEvictionCount = 0; +#ifdef GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX + glGetIntegerv(GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX, &nEvictionCount); +#endif + + GLint nEvictionMemory = 0; +#ifdef GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX + glGetIntegerv(GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX, &nEvictionMemory); +#endif GLint nDedicatedMemoryInKB = 0; #ifdef GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX diff --git a/code/nel/tools/3d/ig_elevation/main.cpp b/code/nel/tools/3d/ig_elevation/main.cpp index 3983dc4ec..f44015873 100644 --- a/code/nel/tools/3d/ig_elevation/main.cpp +++ b/code/nel/tools/3d/ig_elevation/main.cpp @@ -53,7 +53,7 @@ using namespace NL3D; // --------------------------------------------------------------------------- // Out a string to the stdout and log.log -void outString (string &sText) +void outString (const string &sText) { createDebug (); InfoLog->displayRaw(sText.c_str()); diff --git a/code/ryzom/client/client_default.cfg.in b/code/ryzom/client/client_default.cfg.in index ec699fe14..8dbd2855d 100644 --- a/code/ryzom/client/client_default.cfg.in +++ b/code/ryzom/client/client_default.cfg.in @@ -483,7 +483,7 @@ XMLR2EDInterfaceFiles = { "r2ed.xml", "r2_triggers.xml", - "r2_logic_entities.xml", + "r2_logic_entities.xml", "r2ed_acts.xml", "r2ed_scenario.xml", "r2ed_connect.xml" diff --git a/code/ryzom/client/src/interface_v3/music_player.cpp b/code/ryzom/client/src/interface_v3/music_player.cpp index 64107a916..39aeea825 100644 --- a/code/ryzom/client/src/interface_v3/music_player.cpp +++ b/code/ryzom/client/src/interface_v3/music_player.cpp @@ -258,7 +258,7 @@ public: for(uint i = 0; i < filters.size(); ++i) { - strcpy(szFilters + offset, filters[i].c_str()); + strcpy(szFilter + offset, filters[i].c_str()); // move offset to string length + 1 for \0 offset += filters[i].length() + 1; diff --git a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp b/code/ryzom/client/src/r2/dmc/client_edition_module.cpp index 45916dd7d..8e2cb5695 100644 --- a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp +++ b/code/ryzom/client/src/r2/dmc/client_edition_module.cpp @@ -2475,7 +2475,7 @@ void CClientEditionModule::loadScenarioSucceded(const std::string& filename, con } if (CFile::fileExists(filename)) { - CFile::copyFile("save/r2_buffer.dat", filename.c_str()); + CFile::copyFile("save/r2_buffer.dat", filename); } } diff --git a/code/ryzom/server/src/frontend_service/client_id_lookup.h b/code/ryzom/server/src/frontend_service/client_id_lookup.h index 9c63a60a6..c08524c99 100644 --- a/code/ryzom/server/src/frontend_service/client_id_lookup.h +++ b/code/ryzom/server/src/frontend_service/client_id_lookup.h @@ -116,7 +116,7 @@ private: struct CIdHash { - enum { bucket_size = 4, min_buckets = 8, }; + enum { bucket_size = 4, min_buckets = 8 }; size_t operator () (NLMISC::CEntityId id) const { return (uint32)id.getShortId(); } bool operator() (const NLMISC::CEntityId& left, const NLMISC::CEntityId& right) { return left < right; } }; diff --git a/code/ryzom/server/src/frontend_service/fe_types.h b/code/ryzom/server/src/frontend_service/fe_types.h index d63ef1e42..b015a2d0e 100644 --- a/code/ryzom/server/src/frontend_service/fe_types.h +++ b/code/ryzom/server/src/frontend_service/fe_types.h @@ -71,7 +71,7 @@ typedef uint32 TUid; */ struct CInetAddressHashMapTraits { - enum { bucket_size = 4, min_buckets = 8, }; + enum { bucket_size = 4, min_buckets = 8 }; inline size_t operator() ( const NLNET::CInetAddress& x ) const { //return x.port(); diff --git a/code/ryzom/server/src/gpm_service/world_position_manager.h b/code/ryzom/server/src/gpm_service/world_position_manager.h index 81209357c..31030a582 100644 --- a/code/ryzom/server/src/gpm_service/world_position_manager.h +++ b/code/ryzom/server/src/gpm_service/world_position_manager.h @@ -139,7 +139,7 @@ public: struct CEntityIdHash { - enum { bucket_size = 4, min_buckets = 8, }; + enum { bucket_size = 4, min_buckets = 8 }; size_t operator () (const NLMISC::CEntityId &id) const { return (uint32)id.getShortId(); } size_t operator () (const NLMISC::CEntityId &left, const NLMISC::CEntityId &right) const { return left < right; } }; diff --git a/code/ryzom/server/src/pd_lib/pd_utils.h b/code/ryzom/server/src/pd_lib/pd_utils.h index 85a183753..45cf2025b 100644 --- a/code/ryzom/server/src/pd_lib/pd_utils.h +++ b/code/ryzom/server/src/pd_lib/pd_utils.h @@ -490,7 +490,7 @@ typedef std::vector TIndexList; struct CColumnIndexHashMapTraits { - enum { bucket_size = 4, min_buckets = 8, }; + enum { bucket_size = 4, min_buckets = 8 }; CColumnIndexHashMapTraits() { } size_t operator() (const CColumnIndex &id) const {