From 77ffde4beba90b7bc2f3b6edccb1ab3d85decc72 Mon Sep 17 00:00:00 2001 From: Rasmus Christian Pedersen Date: Thu, 8 May 2014 11:01:42 +0200 Subject: [PATCH] core: const correctness This commit chanages several functions in renderdoc/core to const functions. --- renderdoc/core/core.cpp | 4 ++-- renderdoc/core/core.h | 16 ++++++++-------- renderdoc/core/resource_manager.h | 10 +++++----- renderdoc/os/linux/linux_network.cpp | 2 +- renderdoc/os/os_specific.h | 2 +- renderdoc/os/win32/win32_network.cpp | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/renderdoc/core/core.cpp b/renderdoc/core/core.cpp index 8d765259b..b59ebc129 100644 --- a/renderdoc/core/core.cpp +++ b/renderdoc/core/core.cpp @@ -372,12 +372,12 @@ ReplayCreateStatus RenderDoc::FillInitParams(const wchar_t *logFile, RDCDriver & return eReplayCreate_Success; } -bool RenderDoc::HasReplayDriver(RDCDriver driver) +bool RenderDoc::HasReplayDriver(RDCDriver driver) const { return m_ReplayDriverProviders.find(driver) != m_ReplayDriverProviders.end(); } -bool RenderDoc::HasRemoteDriver(RDCDriver driver) +bool RenderDoc::HasRemoteDriver(RDCDriver driver) const { if(m_RemoteDriverProviders.find(driver) != m_RemoteDriverProviders.end()) return true; diff --git a/renderdoc/core/core.h b/renderdoc/core/core.h index e6a6b7de6..66578e08f 100644 --- a/renderdoc/core/core.h +++ b/renderdoc/core/core.h @@ -145,22 +145,22 @@ class RenderDoc // set from outside of the device creation interface void SetLogFile(const wchar_t *logFile); - const wchar_t *GetLogFile() { return m_LogFile.c_str(); } + const wchar_t *GetLogFile() const { return m_LogFile.c_str(); } - const wchar_t *GetCurrentTarget() { return m_Target.c_str(); } + const wchar_t *GetCurrentTarget() const { return m_Target.c_str(); } void Initialise(); void SetReplayApp(bool replay) { m_Replay = replay; } - bool IsReplayApp() { return m_Replay; } + bool IsReplayApp() const { return m_Replay; } void BecomeReplayHost(volatile bool &killReplay); void SetCaptureOptions(const CaptureOptions *opts); - const CaptureOptions &GetCaptureOptions() { return m_Options; } + const CaptureOptions &GetCaptureOptions() const { return m_Options; } void RecreateCrashHandler(); - ICrashHandler *GetCrashHandler() { return m_ExHandler; } + ICrashHandler *GetCrashHandler() const { return m_ExHandler; } Serialiser *OpenWriteSerialiser(uint32_t frameNum, RDCInitParams *params, void *thpixels, size_t thlen, uint32_t thwidth, uint32_t thheight); void SuccessfullyWrittenLog(); @@ -191,13 +191,13 @@ class RenderDoc map GetReplayDrivers(); map GetRemoteDrivers(); - bool HasReplayDriver(RDCDriver driver); - bool HasRemoteDriver(RDCDriver driver); + bool HasReplayDriver(RDCDriver driver) const; + bool HasRemoteDriver(RDCDriver driver) const; void SetCurrentDriver(RDCDriver driver); void GetCurrentDriver(RDCDriver &driver, wstring &name); - uint32_t GetRemoteAccessIdent() { return m_RemoteIdent; } + uint32_t GetRemoteAccessIdent() const { return m_RemoteIdent; } void Tick(); diff --git a/renderdoc/core/resource_manager.h b/renderdoc/core/resource_manager.h index 568eca2e0..b6c1f38a8 100644 --- a/renderdoc/core/resource_manager.h +++ b/renderdoc/core/resource_manager.h @@ -134,10 +134,10 @@ struct ResourceRecord } void AddRef() { RefCount++; } - int GetRefCount() { return RefCount; } + int GetRefCount() const { return RefCount; } void Delete(ResourceRecordHandler *mgr); - ResourceId GetResourceID() { return ResID; } + ResourceId GetResourceID() const { return ResID; } void AddChunk(Chunk *chunk, int32_t ID = 0) { @@ -150,12 +150,12 @@ struct ResourceRecord void LockChunks() { if(m_ChunkLock) m_ChunkLock->Lock(); } void UnlockChunks() { if(m_ChunkLock) m_ChunkLock->Unlock(); } - bool HasChunks() + bool HasChunks() const { return !m_Chunks.empty(); } - size_t NumChunks() + size_t NumChunks() const { return m_Chunks.size(); } @@ -170,7 +170,7 @@ struct ResourceRecord UnlockChunks(); } - Chunk *GetLastChunk() + Chunk *GetLastChunk() const { RDCASSERT(HasChunks()); return m_Chunks.rbegin()->second; diff --git a/renderdoc/os/linux/linux_network.cpp b/renderdoc/os/linux/linux_network.cpp index 6eaa7fb2b..315df7200 100644 --- a/renderdoc/os/linux/linux_network.cpp +++ b/renderdoc/os/linux/linux_network.cpp @@ -68,7 +68,7 @@ void Socket::Shutdown() } } -bool Socket::Connected() +bool Socket::Connected() const { return (int)socket != -1; } diff --git a/renderdoc/os/os_specific.h b/renderdoc/os/os_specific.h index 5778add4d..02f008e19 100644 --- a/renderdoc/os/os_specific.h +++ b/renderdoc/os/os_specific.h @@ -98,7 +98,7 @@ namespace Network ~Socket(); void Shutdown(); - bool Connected(); + bool Connected() const; Socket *AcceptClient(bool wait); diff --git a/renderdoc/os/win32/win32_network.cpp b/renderdoc/os/win32/win32_network.cpp index 6646ae321..0afe203d6 100644 --- a/renderdoc/os/win32/win32_network.cpp +++ b/renderdoc/os/win32/win32_network.cpp @@ -57,7 +57,7 @@ void Socket::Shutdown() } } -bool Socket::Connected() +bool Socket::Connected() const { return (SOCKET)socket != INVALID_SOCKET; }