lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-09 00:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove 'using std::map'

Browse Source 
* This will make it easier to replace std::map in future
This commit is contained in:
baldurk
2019-05-15 14:12:17 +01:00
parent 95e63cb965
commit fb333ebc9b
45 changed files with 140 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/core/core.cpp
+4 -4
View File
@@ -1222,17 +1222,17 @@ std::map<RDCDriver, bool> RenderDoc::GetActiveDrivers()
return ret;
}
map<RDCDriver, string> RenderDoc::GetReplayDrivers()
std::map<RDCDriver, string> RenderDoc::GetReplayDrivers()
{
map<RDCDriver, string> ret;
std::map<RDCDriver, string> ret;
for(auto it = m_ReplayDriverProviders.begin(); it != m_ReplayDriverProviders.end(); ++it)
ret[it->first] = ToStr(it->first);
return ret;
}
map<RDCDriver, string> RenderDoc::GetRemoteDrivers()
std::map<RDCDriver, string> RenderDoc::GetRemoteDrivers()
{
map<RDCDriver, string> ret;
std::map<RDCDriver, string> ret;
for(auto it = m_RemoteDriverProviders.begin(); it != m_RemoteDriverProviders.end(); ++it)
ret[it->first] = ToStr(it->first);
renderdoc/core/core.h
+7 -8
View File
@@ -40,7 +40,6 @@
using std::string;
using std::vector;
using std::map;
using std::pair;
using std::set;
@@ -508,8 +507,8 @@ public:
bool HasReplaySupport(RDCDriver driverType);
map<RDCDriver, string> GetReplayDrivers();
map<RDCDriver, string> GetRemoteDrivers();
std::map<RDCDriver, string> GetReplayDrivers();
std::map<RDCDriver, string> GetRemoteDrivers();
bool HasReplayDriver(RDCDriver driver) const;
bool HasRemoteDriver(RDCDriver driver) const;
@@ -623,10 +622,10 @@ private:
Threading::CriticalSection m_ChildLock;
vector<pair<uint32_t, uint32_t> > m_Children;
map<string, string> m_ConfigSettings;
std::map<string, string> m_ConfigSettings;
map<RDCDriver, ReplayDriverProvider> m_ReplayDriverProviders;
map<RDCDriver, RemoteDriverProvider> m_RemoteDriverProviders;
std::map<RDCDriver, ReplayDriverProvider> m_ReplayDriverProviders;
std::map<RDCDriver, RemoteDriverProvider> m_RemoteDriverProviders;
std::map<RDCDriver, StructuredProcessor> m_StructProcesssors;
@@ -679,9 +678,9 @@ private:
int m_CapturesActive;
map<DeviceWnd, FrameCap> m_WindowFrameCapturers;
std::map<DeviceWnd, FrameCap> m_WindowFrameCapturers;
DeviceWnd m_ActiveWindow;
map<void *, IFrameCapturer *> m_DeviceFrameCapturers;
std::map<void *, IFrameCapturer *> m_DeviceFrameCapturers;
IFrameCapturer *MatchFrameCapturer(void *dev, void *wnd);
renderdoc/core/replay_proxy.h
+3 -3
View File
@@ -610,8 +610,8 @@ private:
};
// this cache only exists on the client side, with the proxy renderer. It contains the created
// proxy textures to stand-in for remote real textures.
map<ResourceId, ProxyTextureProperties> m_ProxyTextures;
map<ResourceId, ResourceId> m_ProxyBufferIds;
std::map<ResourceId, ProxyTextureProperties> m_ProxyTextures;
std::map<ResourceId, ResourceId> m_ProxyBufferIds;
// this cache exists on *both* sides of the proxy connection, and must be kept in sync. It is used
// on the remote side to determine which deltas are necessary, and then each time on the client
@@ -623,7 +623,7 @@ private:
// should not be treated as proxied.
std::set<ResourceId> m_LocalTextures;
map<ResourceId, ResourceId> m_LiveIDs;
std::map<ResourceId, ResourceId> m_LiveIDs;
struct ShaderReflKey
{
renderdoc/core/resource_manager.h
+11 -12
View File
@@ -34,7 +34,6 @@
#include "serialise/serialiser.h"
using std::set;
using std::map;
// In what way (read, write, etc) was a resource referenced in a frame -
// used to determine if initial contents are needed and to what degree.
@@ -261,7 +260,7 @@ struct ResourceRecord
}
void MarkDataUnwritten() { DataWritten = false; }
void Insert(map<int32_t, Chunk *> &recordlist)
void Insert(std::map<int32_t, Chunk *> &recordlist)
{
bool dataWritten = DataWritten;
@@ -423,7 +422,7 @@ protected:
std::vector<std::pair<int32_t, Chunk *>> m_Chunks;
Threading::CriticalSection *m_ChunkLock;
map<ResourceId, FrameRefType> m_FrameRefs;
std::map<ResourceId, FrameRefType> m_FrameRefs;
};
template <typename Compose>
@@ -586,10 +585,10 @@ protected:
// used during capture - map from real resource to its wrapper (other way can be done just with an
// Unwrap)
map<RealResourceType, WrappedResourceType> m_WrapperMap;
std::map<RealResourceType, WrappedResourceType> m_WrapperMap;
// used during capture - holds resources referenced in current frame (and how they're referenced)
map<ResourceId, FrameRefType> m_FrameReferencedResources;
std::map<ResourceId, FrameRefType> m_FrameReferencedResources;
// used during capture - holds resources marked as dirty, needing initial contents
set<ResourceId> m_DirtyResources;
@@ -612,23 +611,23 @@ protected:
};
// used during capture or replay - holds initial contents
map<ResourceId, InitialContentDataOrChunk> m_InitialContents;
std::map<ResourceId, InitialContentDataOrChunk> m_InitialContents;
// used during capture or replay - map of resources currently alive with their real IDs, used in
// capture and replay.
map<ResourceId, WrappedResourceType> m_CurrentResourceMap;
std::map<ResourceId, WrappedResourceType> m_CurrentResourceMap;
// used during replay - maps back and forth from original id to live id and vice-versa
map<ResourceId, ResourceId> m_OriginalIDs, m_LiveIDs;
std::map<ResourceId, ResourceId> m_OriginalIDs, m_LiveIDs;
// used during replay - holds resources allocated and the original id that they represent
map<ResourceId, WrappedResourceType> m_LiveResourceMap;
std::map<ResourceId, WrappedResourceType> m_LiveResourceMap;
// used during capture - holds resource records by id.
map<ResourceId, RecordType *> m_ResourceRecords;
std::map<ResourceId, RecordType *> m_ResourceRecords;
// used during replay - holds current resource replacements
map<ResourceId, ResourceId> m_Replacements;
std::map<ResourceId, ResourceId> m_Replacements;
};
template <typename Configuration>
@@ -920,7 +919,7 @@ void ResourceManager<Configuration>::MarkUnwrittenResources()
template <typename Configuration>
void ResourceManager<Configuration>::InsertReferencedChunks(WriteSerialiser &ser)
{
map<int32_t, Chunk *> sortedChunks;
std::map<int32_t, Chunk *> sortedChunks;
SCOPED_LOCK(m_Lock);
renderdoc/driver/d3d11/d3d11_context.h
+5 -6
View File
@@ -33,7 +33,6 @@
#include "d3d11_manager.h"
#include "d3d11_video.h"
using std::map;
using std::list;
struct MapIntercept
@@ -125,7 +124,7 @@ private:
set<ResourceId> m_DeferredReferences;
set<ResourceId> m_HighTrafficResources;
map<MappedResource, MapIntercept> m_OpenMaps;
std::map<MappedResource, MapIntercept> m_OpenMaps;
struct StreamOutData
{
@@ -135,9 +134,9 @@ private:
uint64_t numPrims;
};
map<ResourceId, StreamOutData> m_StreamOutCounters;
std::map<ResourceId, StreamOutData> m_StreamOutCounters;
map<ResourceId, vector<EventUsage> > m_ResourceUses;
std::map<ResourceId, vector<EventUsage> > m_ResourceUses;
WrappedID3D11Device *m_pDevice;
ID3D11DeviceContext *m_pRealContext;
@@ -159,7 +158,7 @@ private:
StreamReader *m_FrameReader = NULL;
map<ResourceId, size_t> m_MapResourceRecordAllocs;
std::map<ResourceId, size_t> m_MapResourceRecordAllocs;
ResourceId m_ResourceID;
D3D11ResourceRecord *m_ContextRecord;
@@ -219,7 +218,7 @@ private:
ReplayStatus m_FailedReplayStatus = ReplayStatus::APIReplayFailed;
DrawcallDescription m_ParentDrawcall;
map<ResourceId, DrawcallDescription> m_CmdLists;
std::map<ResourceId, DrawcallDescription> m_CmdLists;
list<DrawcallDescription *> m_DrawcallStack;
renderdoc/driver/d3d11/d3d11_debug.h
-1
View File
@@ -33,7 +33,6 @@
#include "driver/shaders/dxbc/dxbc_debug.h"
#include "replay/replay_driver.h"
using std::map;
using std::pair;
class Camera;
renderdoc/driver/d3d11/d3d11_device.h
+3 -5
View File
@@ -44,8 +44,6 @@ class D3D11ShaderCache;
#define D3D11_1_UAV_SLOT_COUNT 64
#endif
using std::map;
enum TextureDisplayType
{
TEXDISPLAY_UNKNOWN = 0,
@@ -368,12 +366,12 @@ private:
void CachedObjectsGarbageCollect();
set<WrappedID3D11DeviceContext *> m_DeferredContexts;
map<ID3D11InputLayout *, vector<D3D11_INPUT_ELEMENT_DESC> > m_LayoutDescs;
map<ID3D11InputLayout *, WrappedShader *> m_LayoutShaders;
std::map<ID3D11InputLayout *, vector<D3D11_INPUT_ELEMENT_DESC> > m_LayoutDescs;
std::map<ID3D11InputLayout *, WrappedShader *> m_LayoutShaders;
static WrappedID3D11Device *m_pCurrentWrappedDevice;
map<WrappedIDXGISwapChain4 *, ID3D11RenderTargetView *> m_SwapChains;
std::map<WrappedIDXGISwapChain4 *, ID3D11RenderTargetView *> m_SwapChains;
uint32_t m_FrameCounter;
uint32_t m_FailedFrame;
renderdoc/driver/d3d11/d3d11_manager.h
+1 -1
View File
@@ -158,7 +158,7 @@ struct D3D11ResourceRecord : public ResourceRecord
SubResources[i]->SetDataPtr(ptr);
}
void Insert(map<int32_t, Chunk *> &recordlist)
void Insert(std::map<int32_t, Chunk *> &recordlist)
{
bool dataWritten = DataWritten;
renderdoc/driver/d3d11/d3d11_postvs.cpp
+1 -1
View File
@@ -408,7 +408,7 @@ void D3D11Replay::InitPostVSBuffers(uint32_t eventId)
// we use a map here since the indices may be sparse. Especially considering if an index
// is 'invalid' like 0xcccccccc then we don't want an array of 3.4 billion entries.
map<uint32_t, size_t> indexRemap;
std::map<uint32_t, size_t> indexRemap;
for(size_t i = 0; i < indices.size(); i++)
{
// by definition, this index will only appear once in indices[]
renderdoc/driver/d3d11/d3d11_resources.cpp
+5 -5
View File
@@ -58,14 +58,14 @@ WRAPPED_POOL_INST(WrappedID3D11ClassLinkage);
WRAPPED_POOL_INST(WrappedID3DDeviceContextState);
WRAPPED_POOL_INST(WrappedID3D11Fence);
map<ResourceId, WrappedID3D11Texture1D::TextureEntry>
std::map<ResourceId, WrappedID3D11Texture1D::TextureEntry>
WrappedTexture<ID3D11Texture1D, D3D11_TEXTURE1D_DESC, ID3D11Texture1D>::m_TextureList;
map<ResourceId, WrappedID3D11Texture2D1::TextureEntry>
std::map<ResourceId, WrappedID3D11Texture2D1::TextureEntry>
WrappedTexture<ID3D11Texture2D, D3D11_TEXTURE2D_DESC, ID3D11Texture2D1>::m_TextureList;
map<ResourceId, WrappedID3D11Texture3D1::TextureEntry>
std::map<ResourceId, WrappedID3D11Texture3D1::TextureEntry>
WrappedTexture<ID3D11Texture3D, D3D11_TEXTURE3D_DESC, ID3D11Texture3D1>::m_TextureList;
map<ResourceId, WrappedID3D11Buffer::BufferEntry> WrappedID3D11Buffer::m_BufferList;
map<ResourceId, WrappedShader::ShaderEntry *> WrappedShader::m_ShaderList;
std::map<ResourceId, WrappedID3D11Buffer::BufferEntry> WrappedID3D11Buffer::m_BufferList;
std::map<ResourceId, WrappedShader::ShaderEntry *> WrappedShader::m_ShaderList;
Threading::CriticalSection WrappedShader::m_ShaderListLock;
std::vector<WrappedID3DDeviceContextState *> WrappedID3DDeviceContextState::m_List;
Threading::CriticalSection WrappedID3DDeviceContextState::m_Lock;
renderdoc/driver/d3d11/d3d11_resources.h
+3 -3
View File
@@ -432,7 +432,7 @@ public:
uint32_t length;
};
static map<ResourceId, BufferEntry> m_BufferList;
static std::map<ResourceId, BufferEntry> m_BufferList;
static const int AllocPoolCount = 128 * 1024;
static const int AllocPoolMaxByteSize = 13 * 1024 * 1024;
@@ -478,7 +478,7 @@ public:
TextureDisplayType m_Type;
};
static map<ResourceId, TextureEntry> m_TextureList;
static std::map<ResourceId, TextureEntry> m_TextureList;
WrappedTexture(NestedType *real, WrappedID3D11Device *device, TextureDisplayType type)
: WrappedResource11(real, device)
@@ -948,7 +948,7 @@ public:
ShaderBindpointMapping m_Mapping;
};
static map<ResourceId, ShaderEntry *> m_ShaderList;
static std::map<ResourceId, ShaderEntry *> m_ShaderList;
static Threading::CriticalSection m_ShaderListLock;
WrappedShader(WrappedID3D11Device *device, ResourceId origId, ResourceId liveId, const byte *code,
renderdoc/driver/d3d12/d3d12_commands.h
+3 -3
View File
@@ -235,13 +235,13 @@ struct D3D12CommandData
ResourceId m_LastCmdListID;
map<ResourceId, ID3D12CommandAllocator *> m_CrackedAllocators;
std::map<ResourceId, ID3D12CommandAllocator *> m_CrackedAllocators;
vector<ID3D12Resource *> m_IndirectBuffers;
static const uint64_t m_IndirectSize = 4 * 1024 * 1024;
uint64_t m_IndirectOffset;
map<ResourceId, BakedCmdListInfo> m_BakedCmdListInfo;
std::map<ResourceId, BakedCmdListInfo> m_BakedCmdListInfo;
D3D12RenderState m_RenderState;
@@ -340,7 +340,7 @@ struct D3D12CommandData
SDFile *m_StructuredFile;
map<ResourceId, vector<EventUsage> > m_ResourceUses;
std::map<ResourceId, vector<EventUsage> > m_ResourceUses;
D3D12DrawcallTreeNode m_ParentDrawcall;
renderdoc/driver/d3d12/d3d12_device.cpp
+1 -1
View File
@@ -1798,7 +1798,7 @@ bool WrappedID3D12Device::EndFrameCapture(void *dev, void *wnd)
// in capframe (the transition is thread-protected) so nothing will be
// pushed to the vector
map<int32_t, Chunk *> recordlist;
std::map<int32_t, Chunk *> recordlist;
for(auto it = queues.begin(); it != queues.end(); ++it)
{
renderdoc/driver/d3d12/d3d12_device.h
+10 -7
View File
@@ -322,7 +322,7 @@ private:
D3D12TextRenderer *m_TextRenderer = NULL;
set<ResourceId> m_UploadResourceIds;
map<uint64_t, ID3D12Resource *> m_UploadBuffers;
std::map<uint64_t, ID3D12Resource *> m_UploadBuffers;
Threading::CriticalSection m_MapsLock;
vector<MapState> m_Maps;
@@ -391,12 +391,12 @@ private:
// used both on capture and replay side to track resource states. Only locked
// in capture
map<ResourceId, SubresourceStateVector> m_ResourceStates;
std::map<ResourceId, SubresourceStateVector> m_ResourceStates;
Threading::CriticalSection m_ResourceStatesLock;
set<ResourceId> m_Cubemaps;
map<ResourceId, string> m_ResourceNames;
std::map<ResourceId, string> m_ResourceNames;
struct SwapPresentInfo
{
@@ -407,8 +407,8 @@ private:
int32_t lastPresentedBuffer;
};
map<WrappedIDXGISwapChain4 *, SwapPresentInfo> m_SwapChains;
map<ResourceId, DXGI_FORMAT> m_BackbufferFormat;
std::map<WrappedIDXGISwapChain4 *, SwapPresentInfo> m_SwapChains;
std::map<ResourceId, DXGI_FORMAT> m_BackbufferFormat;
WrappedIDXGISwapChain4 *m_LastSwap;
@@ -478,8 +478,11 @@ public:
{
return m_ResourceStates[id];
}
const map<ResourceId, SubresourceStateVector> &GetSubresourceStates() { return m_ResourceStates; }
const map<ResourceId, DXGI_FORMAT> &GetBackbufferFormats() { return m_BackbufferFormat; }
const std::map<ResourceId, SubresourceStateVector> &GetSubresourceStates()
{
return m_ResourceStates;
}
const std::map<ResourceId, DXGI_FORMAT> &GetBackbufferFormats() { return m_BackbufferFormat; }
void SetLogFile(const char *logfile);
void SetInitParams(const D3D12InitParams &params, uint64_t sectionVersion)
{
renderdoc/driver/d3d12/d3d12_manager.cpp
+7 -7
View File
@@ -165,7 +165,7 @@ void D3D12Descriptor::Create(D3D12_DESCRIPTOR_HEAP_TYPE heapType, WrappedID3D12D
{
desc = res ? NULL : defaultSRV();
const map<ResourceId, DXGI_FORMAT> &bbs = dev->GetBackbufferFormats();
const std::map<ResourceId, DXGI_FORMAT> &bbs = dev->GetBackbufferFormats();
auto it = bbs.find(GetResID(res));
@@ -189,7 +189,7 @@ void D3D12Descriptor::Create(D3D12_DESCRIPTOR_HEAP_TYPE heapType, WrappedID3D12D
}
else if(desc->Format == DXGI_FORMAT_UNKNOWN)
{
const map<ResourceId, DXGI_FORMAT> &bbs = dev->GetBackbufferFormats();
const std::map<ResourceId, DXGI_FORMAT> &bbs = dev->GetBackbufferFormats();
auto it = bbs.find(GetResID(res));
@@ -257,7 +257,7 @@ void D3D12Descriptor::Create(D3D12_DESCRIPTOR_HEAP_TYPE heapType, WrappedID3D12D
{
desc = res ? NULL : defaultRTV();
const map<ResourceId, DXGI_FORMAT> &bbs = dev->GetBackbufferFormats();
const std::map<ResourceId, DXGI_FORMAT> &bbs = dev->GetBackbufferFormats();
auto it = bbs.find(GetResID(res));
@@ -279,7 +279,7 @@ void D3D12Descriptor::Create(D3D12_DESCRIPTOR_HEAP_TYPE heapType, WrappedID3D12D
}
else if(desc->Format == DXGI_FORMAT_UNKNOWN)
{
const map<ResourceId, DXGI_FORMAT> &bbs = dev->GetBackbufferFormats();
const std::map<ResourceId, DXGI_FORMAT> &bbs = dev->GetBackbufferFormats();
auto it = bbs.find(GetResID(res));
@@ -366,7 +366,7 @@ void D3D12Descriptor::Create(D3D12_DESCRIPTOR_HEAP_TYPE heapType, WrappedID3D12D
{
desc = res ? NULL : defaultUAV();
const map<ResourceId, DXGI_FORMAT> &bbs = dev->GetBackbufferFormats();
const std::map<ResourceId, DXGI_FORMAT> &bbs = dev->GetBackbufferFormats();
auto it = bbs.find(GetResID(res));
@@ -388,7 +388,7 @@ void D3D12Descriptor::Create(D3D12_DESCRIPTOR_HEAP_TYPE heapType, WrappedID3D12D
}
else if(desc->Format == DXGI_FORMAT_UNKNOWN)
{
const map<ResourceId, DXGI_FORMAT> &bbs = dev->GetBackbufferFormats();
const std::map<ResourceId, DXGI_FORMAT> &bbs = dev->GetBackbufferFormats();
auto it = bbs.find(GetResID(res));
@@ -651,7 +651,7 @@ D3D12Descriptor *DescriptorFromPortableHandle(D3D12ResourceManager *manager, Por
#endif
void D3D12ResourceManager::ApplyBarriers(vector<D3D12_RESOURCE_BARRIER> &barriers,
map<ResourceId, SubresourceStateVector> &states)
std::map<ResourceId, SubresourceStateVector> &states)
{
for(size_t b = 0; b < barriers.size(); b++)
{
renderdoc/driver/d3d12/d3d12_manager.h
+2 -2
View File
@@ -563,7 +563,7 @@ struct D3D12ResourceRecord : public ResourceRecord
cmdInfo->bundles.swap(bakedCommands->cmdInfo->bundles);
}
void Insert(map<int32_t, Chunk *> &recordlist)
void Insert(std::map<int32_t, Chunk *> &recordlist)
{
bool dataWritten = DataWritten;
@@ -713,7 +713,7 @@ public:
}
void ApplyBarriers(vector<D3D12_RESOURCE_BARRIER> &barriers,
map<ResourceId, SubresourceStateVector> &states);
std::map<ResourceId, SubresourceStateVector> &states);
template <typename SerialiserType>
void SerialiseResourceStates(SerialiserType &ser, std::vector<D3D12_RESOURCE_BARRIER> &barriers,
renderdoc/driver/d3d12/d3d12_overlay.cpp
+1 -1
View File
@@ -262,7 +262,7 @@ struct D3D12QuadOverdrawCallback : public D3D12DrawcallCallback
uint32_t sigElem;
ID3D12PipelineState *pipe;
};
map<ResourceId, CachedPipeline> m_PipelineCache;
std::map<ResourceId, CachedPipeline> m_PipelineCache;
std::set<ResourceId> m_CopiedHeaps;
D3D12RenderState m_PrevState;
};
renderdoc/driver/d3d12/d3d12_postvs.cpp
+1 -1
View File
@@ -433,7 +433,7 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId)
// we use a map here since the indices may be sparse. Especially considering if an index
// is 'invalid' like 0xcccccccc then we don't want an array of 3.4 billion entries.
map<uint32_t, size_t> indexRemap;
std::map<uint32_t, size_t> indexRemap;
for(size_t i = 0; i < indices.size(); i++)
{
// by definition, this index will only appear once in indices[]
renderdoc/driver/d3d12/d3d12_resources.h
+1 -1
View File
@@ -767,7 +767,7 @@ public:
ShaderReflection m_Details;
ShaderBindpointMapping m_Mapping;
static map<DXBCKey, ShaderEntry *> m_Shaders;
static std::map<DXBCKey, ShaderEntry *> m_Shaders;
};
enum
renderdoc/driver/d3d8/d3d8_resources.cpp
+2 -2
View File
@@ -29,9 +29,9 @@
ALL_D3D8_TYPES;
map<ResourceId, WrappedIDirect3DVertexBuffer8::BufferEntry>
std::map<ResourceId, WrappedIDirect3DVertexBuffer8::BufferEntry>
WrappedD3DBuffer8<IDirect3DVertexBuffer8, D3DVERTEXBUFFER_DESC>::m_BufferList;
map<ResourceId, WrappedIDirect3DIndexBuffer8::BufferEntry>
std::map<ResourceId, WrappedIDirect3DIndexBuffer8::BufferEntry>
WrappedD3DBuffer8<IDirect3DIndexBuffer8, D3DINDEXBUFFER_DESC>::m_BufferList;
D3D8ResourceType IdentifyTypeByPtr(IUnknown *ptr)
renderdoc/driver/d3d8/d3d8_resources.h
+1 -1
View File
@@ -171,7 +171,7 @@ public:
uint32_t length;
};
static map<ResourceId, BufferEntry> m_BufferList;
static std::map<ResourceId, BufferEntry> m_BufferList;
WrappedD3DBuffer8(NestedType *real, uint32_t byteLength, WrappedD3DDevice8 *device)
: WrappedIDirect3DResource8(real, device)
renderdoc/driver/gl/gl_common.h
+1 -1
View File
@@ -843,7 +843,7 @@ struct ShaderReflection;
void CopyProgramUniforms(GLuint progSrc, GLuint progDst);
template <typename SerialiserType>
void SerialiseProgramUniforms(SerialiserType &ser, CaptureState state, GLuint prog,
map<GLint, GLint> *locTranslate);
std::map<GLint, GLint> *locTranslate);
void CopyProgramAttribBindings(GLuint progsrc, GLuint progdst, ShaderReflection *refl);
void CopyProgramFragDataBindings(GLuint progsrc, GLuint progdst, ShaderReflection *refl);
template <typename SerialiserType>
renderdoc/driver/gl/gl_driver.cpp
+1 -1
View File
@@ -2020,7 +2020,7 @@ bool WrappedOpenGL::EndFrameCapture(void *dev, void *wnd)
{
RDCDEBUG("Accumulating context resource list");
map<int32_t, Chunk *> recordlist;
std::map<int32_t, Chunk *> recordlist;
m_ContextRecord->Insert(recordlist);
for(auto it = m_ContextData.begin(); it != m_ContextData.end(); ++it)
renderdoc/driver/gl/gl_driver.h
+5 -5
View File
@@ -240,7 +240,7 @@ private:
list<DrawcallDescription *> m_DrawcallStack;
map<ResourceId, vector<EventUsage>> m_ResourceUses;
std::map<ResourceId, vector<EventUsage>> m_ResourceUses;
bool m_FetchCounters;
@@ -255,7 +255,7 @@ private:
uint64_t size;
};
map<ResourceId, BufferData> m_Buffers;
std::map<ResourceId, BufferData> m_Buffers;
vector<pair<ResourceId, Replacement>> m_DependentReplacements;
@@ -356,7 +356,7 @@ private:
// the last time a window was seen/associated with this context.
// Decays after a few seconds since there's no good explicit
// 'remove' type call for GL, only wglCreateContext/wglMakeCurrent
map<void *, uint64_t> windows;
std::map<void *, uint64_t> windows;
// a window is only associated with one context at once, so any
// time we associate a window, it broadcasts to all other
@@ -500,7 +500,7 @@ private:
std::string bbname);
RenderDoc::FramePixels *SaveBackbufferImage();
map<void *, RenderDoc::FramePixels *> m_BackbufferImages;
std::map<void *, RenderDoc::FramePixels *> m_BackbufferImages;
void BuildGLExtensions();
void BuildGLESExtensions();
@@ -637,7 +637,7 @@ public:
ProgramData() : linked(false) { RDCEraseEl(stageShaders); }
vector<ResourceId> shaders;
map<GLint, GLint> locationTranslate;
std::map<GLint, GLint> locationTranslate;
// this flag indicates the program was created with glCreateShaderProgram and cannot be relinked
// again (because that function implicitly detaches and destroys the shader). However we only
renderdoc/driver/gl/gl_manager.h
+5 -5
View File
@@ -267,15 +267,15 @@ private:
void Create_InitialState(ResourceId id, GLResource live, bool hasData);
void Apply_InitialState(GLResource live, const GLInitialContents &initial);
map<GLResource, GLResourceRecord *> m_GLResourceRecords;
std::map<GLResource, GLResourceRecord *> m_GLResourceRecords;
map<GLResource, ResourceId> m_CurrentResourceIds;
std::map<GLResource, ResourceId> m_CurrentResourceIds;
// sync objects must be treated differently as they're not GLuint names, but pointer sized.
// We manually give them GLuint names so they're otherwise namespaced as (eResSync, GLuint)
map<GLsync, ResourceId> m_SyncIDs;
map<GLuint, GLsync> m_CurrentSyncs;
map<ResourceId, std::string> m_Names;
std::map<GLsync, ResourceId> m_SyncIDs;
std::map<GLuint, GLsync> m_CurrentSyncs;
std::map<ResourceId, std::string> m_Names;
volatile int64_t m_SyncName;
CaptureState m_State;
renderdoc/driver/gl/gl_postvs.cpp
+1 -1
View File
@@ -572,7 +572,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId)
// we use a map here since the indices may be sparse. Especially considering if an index
// is 'invalid' like 0xcccccccc then we don't want an array of 3.4 billion entries.
map<uint32_t, size_t> indexRemap;
std::map<uint32_t, size_t> indexRemap;
for(size_t i = 0; i < indices.size(); i++)
{
// by definition, this index will only appear once in indices[]
renderdoc/driver/gl/gl_program_iterate.cpp
+4 -4
View File
@@ -296,7 +296,7 @@ void DoSerialise(SerialiserType &ser, ProgramUniforms &el)
template <const bool CopyUniforms, const bool SerialiseUniforms, typename SerialiserType>
static void ForAllProgramUniforms(SerialiserType *ser, CaptureState state, GLuint progSrc,
GLuint progDst, map<GLint, GLint> *locTranslate)
GLuint progDst, std::map<GLint, GLint> *locTranslate)
{
const bool ReadSourceProgram = CopyUniforms || (SerialiseUniforms && ser && ser->IsWriting());
const bool WriteDestProgram = CopyUniforms || (SerialiseUniforms && ser && ser->IsReading());
@@ -798,7 +798,7 @@ void CopyProgramUniforms(GLuint progSrc, GLuint progDst)
template <typename SerialiserType>
void SerialiseProgramUniforms(SerialiserType &ser, CaptureState state, GLuint prog,
map<GLint, GLint> *locTranslate)
std::map<GLint, GLint> *locTranslate)
{
const bool CopyUniforms = false;
const bool SerialiseUniforms = true;
@@ -806,9 +806,9 @@ void SerialiseProgramUniforms(SerialiserType &ser, CaptureState state, GLuint pr
}
template void SerialiseProgramUniforms(ReadSerialiser &ser, CaptureState state, GLuint prog,
map<GLint, GLint> *locTranslate);
std::map<GLint, GLint> *locTranslate);
template void SerialiseProgramUniforms(WriteSerialiser &ser, CaptureState state, GLuint prog,
map<GLint, GLint> *locTranslate);
std::map<GLint, GLint> *locTranslate);
void CopyProgramAttribBindings(GLuint progsrc, GLuint progdst, ShaderReflection *refl)
{
renderdoc/driver/gl/gl_replay.h
+3 -4
View File
@@ -30,7 +30,6 @@
#include "replay/replay_driver.h"
#include "gl_common.h"
using std::map;
using std::pair;
class AMDCounters;
@@ -387,7 +386,7 @@ private:
HighlightCache m_HighlightCache;
// eventId -> data
map<uint32_t, GLPostVSData> m_PostVSData;
std::map<uint32_t, GLPostVSData> m_PostVSData;
void ClearPostVSCache();
@@ -425,13 +424,13 @@ private:
void CloseReplayContext();
uint64_t m_OutputWindowID;
map<uint64_t, OutputWindow> m_OutputWindows;
std::map<uint64_t, OutputWindow> m_OutputWindows;
bool m_Proxy;
void CacheTexture(ResourceId id);
map<ResourceId, TextureDescription> m_CachedTextures;
std::map<ResourceId, TextureDescription> m_CachedTextures;
WrappedOpenGL *m_pDriver;
renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp
+1 -1
View File
@@ -612,7 +612,7 @@ DXBCFile::DXBCFile(const void *ByteCode, size_t ByteCodeLength)
uint32_t reg, space, bindCount;
};
map<string, CBufferBind> cbufferbinds;
std::map<string, CBufferBind> cbufferbinds;
uint32_t resourceStride = sizeof(RDEFResource);
renderdoc/driver/shaders/dxbc/dxbc_inspect.h
+2 -3
View File
@@ -36,7 +36,6 @@
using std::vector;
using std::pair;
using std::string;
using std::map;
// matches D3D11_SHADER_VERSION_TYPE from d3d11shader.h
enum D3D11_ShaderType
@@ -369,7 +368,7 @@ public:
CBuffer m_Interfaces;
map<string, CBufferVariableType> m_ResourceBinds;
std::map<string, CBufferVariableType> m_ResourceBinds;
vector<SigParameter> m_InputSig;
vector<SigParameter> m_OutputSig;
@@ -418,7 +417,7 @@ private:
bool IsDeclaration(OpcodeType op);
CBufferVariableType ParseRDEFType(RDEFHeader *h, char *chunk, uint32_t offset);
map<uint32_t, CBufferVariableType> m_Variables;
std::map<uint32_t, CBufferVariableType> m_Variables;
bool m_Disassembled;
renderdoc/driver/shaders/dxbc/dxbc_sdbg.h
-1
View File
@@ -30,7 +30,6 @@
using std::vector;
using std::pair;
using std::string;
using std::map;
#pragma once
renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp
+3 -3
View File
@@ -132,7 +132,7 @@ SPDBChunk::SPDBChunk(DXBCFile *dxbc, void *chunk)
RDCASSERT(hashtable[0] == 0);
hashtable++;
map<string, uint32_t> StreamNames;
std::map<string, uint32_t> StreamNames;
uint32_t numset = 0;
for(uint32_t i = 0; i < maxBit; i++)
@@ -675,7 +675,7 @@ SPDBChunk::SPDBChunk(DXBCFile *dxbc, void *chunk)
m_Functions[0] = mainFunc;
}
map<uint32_t, string> Names;
std::map<uint32_t, string> Names;
if(StreamNames.find("/names") != StreamNames.end())
{
@@ -756,7 +756,7 @@ SPDBChunk::SPDBChunk(DXBCFile *dxbc, void *chunk)
PROCSYM32 main = {};
map<uint32_t, int32_t> FileMapping; // mapping from hash chunk to index in Files[], or -1
std::map<uint32_t, int32_t> FileMapping; // mapping from hash chunk to index in Files[], or -1
for(size_t m = 0; m < modules.size(); m++)
{
renderdoc/driver/shaders/dxbc/dxbc_spdb.h
-1
View File
@@ -35,7 +35,6 @@
using std::vector;
using std::pair;
using std::string;
using std::map;
namespace DXBC
{
renderdoc/driver/vulkan/vk_core.h
+5 -5
View File
@@ -742,23 +742,23 @@ private:
// used both on capture and replay side to track image layouts. Only locked
// in capture
map<ResourceId, ImageLayouts> m_ImageLayouts;
std::map<ResourceId, ImageLayouts> m_ImageLayouts;
Threading::CriticalSection m_ImageLayoutsLock;
// find swapchain for an image
map<RENDERDOC_WindowHandle, VkSwapchainKHR> m_SwapLookup;
std::map<RENDERDOC_WindowHandle, VkSwapchainKHR> m_SwapLookup;
Threading::CriticalSection m_SwapLookupLock;
// below are replay-side data only, doesn't have to be thread protected
// current descriptor set contents
map<ResourceId, DescriptorSetInfo> m_DescriptorSetState;
std::map<ResourceId, DescriptorSetInfo> m_DescriptorSetState;
// data for a baked command buffer - its drawcalls and events, ready to submit
map<ResourceId, BakedCmdBufferInfo> m_BakedCmdBufferInfo;
std::map<ResourceId, BakedCmdBufferInfo> m_BakedCmdBufferInfo;
// immutable creation data
VulkanCreationInfo m_CreationInfo;
map<ResourceId, vector<EventUsage>> m_ResourceUses;
std::map<ResourceId, vector<EventUsage>> m_ResourceUses;
// returns thread-local temporary memory
byte *GetTempMemory(size_t s);
renderdoc/driver/vulkan/vk_info.h
+19 -19
View File
@@ -278,7 +278,7 @@ struct VulkanCreationInfo
std::vector<VkRect2D> discardRectangles;
VkDiscardRectangleModeEXT discardMode;
};
map<ResourceId, Pipeline> m_Pipeline;
std::map<ResourceId, Pipeline> m_Pipeline;
struct PipelineLayout
{
@@ -288,7 +288,7 @@ struct VulkanCreationInfo
vector<VkPushConstantRange> pushRanges;
vector<ResourceId> descSetLayouts;
};
map<ResourceId, PipelineLayout> m_PipelineLayout;
std::map<ResourceId, PipelineLayout> m_PipelineLayout;
struct RenderPass
{
@@ -335,7 +335,7 @@ struct VulkanCreationInfo
// in the layout that the subpass uses
vector<VkRenderPass> loadRPs;
};
map<ResourceId, RenderPass> m_RenderPass;
std::map<ResourceId, RenderPass> m_RenderPass;
struct Framebuffer
{
@@ -354,7 +354,7 @@ struct VulkanCreationInfo
// See above in loadRPs - we need to duplicate and make framebuffer equivalents for each
vector<VkFramebuffer> loadFBs;
};
map<ResourceId, Framebuffer> m_Framebuffer;
std::map<ResourceId, Framebuffer> m_Framebuffer;
struct Memory
{
@@ -366,7 +366,7 @@ struct VulkanCreationInfo
VkBuffer wholeMemBuf;
};
map<ResourceId, Memory> m_Memory;
std::map<ResourceId, Memory> m_Memory;
struct Buffer
{
@@ -376,7 +376,7 @@ struct VulkanCreationInfo
VkBufferUsageFlags usage;
uint64_t size;
};
map<ResourceId, Buffer> m_Buffer;
std::map<ResourceId, Buffer> m_Buffer;
struct BufferView
{
@@ -388,7 +388,7 @@ struct VulkanCreationInfo
uint64_t offset;
uint64_t size;
};
map<ResourceId, BufferView> m_BufferView;
std::map<ResourceId, BufferView> m_BufferView;
struct Image
{
@@ -404,7 +404,7 @@ struct VulkanCreationInfo
bool cube;
TextureCategory creationFlags;
};
map<ResourceId, Image> m_Image;
std::map<ResourceId, Image> m_Image;
struct Sampler
{
@@ -427,7 +427,7 @@ struct VulkanCreationInfo
ResourceId ycbcr;
};
map<ResourceId, Sampler> m_Sampler;
std::map<ResourceId, Sampler> m_Sampler;
struct YCbCrSampler
{
@@ -442,7 +442,7 @@ struct VulkanCreationInfo
FilterMode chromaFilter;
bool forceExplicitReconstruction;
};
map<ResourceId, YCbCrSampler> m_YCbCrSampler;
std::map<ResourceId, YCbCrSampler> m_YCbCrSampler;
struct ImageView
{
@@ -454,7 +454,7 @@ struct VulkanCreationInfo
VkImageSubresourceRange range;
TextureSwizzle swizzle[4];
};
map<ResourceId, ImageView> m_ImageView;
std::map<ResourceId, ImageView> m_ImageView;
struct ShaderModule
{
@@ -477,9 +477,9 @@ struct VulkanCreationInfo
void Init(VulkanResourceManager *resourceMan, ResourceId id, const SPVModule &spv,
const std::string &entry, VkShaderStageFlagBits stage);
};
map<string, Reflection> m_Reflections;
std::map<string, Reflection> m_Reflections;
};
map<ResourceId, ShaderModule> m_ShaderModule;
std::map<ResourceId, ShaderModule> m_ShaderModule;
struct DescSetPool
{
@@ -493,13 +493,13 @@ struct VulkanCreationInfo
std::vector<VkDescriptorPool> overflow;
};
map<ResourceId, DescSetPool> m_DescSetPool;
std::map<ResourceId, DescSetPool> m_DescSetPool;
map<ResourceId, string> m_Names;
map<ResourceId, SwapchainInfo> m_SwapChain;
map<ResourceId, DescSetLayout> m_DescSetLayout;
map<ResourceId, DescUpdateTemplate> m_DescUpdateTemplate;
std::map<ResourceId, string> m_Names;
std::map<ResourceId, SwapchainInfo> m_SwapChain;
std::map<ResourceId, DescSetLayout> m_DescSetLayout;
std::map<ResourceId, DescUpdateTemplate> m_DescUpdateTemplate;
// just contains the queueFamilyIndex (after remapping)
map<ResourceId, uint32_t> m_Queue;
std::map<ResourceId, uint32_t> m_Queue;
};
renderdoc/driver/vulkan/vk_manager.cpp
+2 -2
View File
@@ -185,7 +185,7 @@ void VulkanResourceManager::RecordSingleBarrier(vector<pair<ResourceId, ImageReg
}
void VulkanResourceManager::RecordBarriers(vector<pair<ResourceId, ImageRegionState> > &states,
const map<ResourceId, ImageLayouts> &layouts,
const std::map<ResourceId, ImageLayouts> &layouts,
uint32_t numBarriers, const VkImageMemoryBarrier *barriers)
{
TRDBG("Recording %u barriers", numBarriers);
@@ -467,7 +467,7 @@ void VulkanResourceManager::SetInternalResource(ResourceId id)
void VulkanResourceManager::ApplyBarriers(uint32_t queueFamilyIndex,
vector<pair<ResourceId, ImageRegionState> > &states,
map<ResourceId, ImageLayouts> &layouts)
std::map<ResourceId, ImageLayouts> &layouts)
{
TRDBG("Applying %u barriers", (uint32_t)states.size());
renderdoc/driver/vulkan/vk_manager.h
+2 -2
View File
@@ -258,14 +258,14 @@ public:
const SrcBarrierType &t, uint32_t nummips, uint32_t numslices);
void RecordBarriers(vector<pair<ResourceId, ImageRegionState> > &states,
const map<ResourceId, ImageLayouts> &layouts, uint32_t numBarriers,
const std::map<ResourceId, ImageLayouts> &layouts, uint32_t numBarriers,
const VkImageMemoryBarrier *barriers);
void MergeBarriers(vector<pair<ResourceId, ImageRegionState> > &dststates,
vector<pair<ResourceId, ImageRegionState> > &srcstates);
void ApplyBarriers(uint32_t queueFamilyIndex, vector<pair<ResourceId, ImageRegionState> > &states,
map<ResourceId, ImageLayouts> &layouts);
std::map<ResourceId, ImageLayouts> &layouts);
template <typename SerialiserType>
void SerialiseImageStates(SerialiserType &ser, std::map<ResourceId, ImageLayouts> &states,
renderdoc/driver/vulkan/vk_overlay.cpp
+2 -2
View File
@@ -266,7 +266,7 @@ struct VulkanQuadOverdrawCallback : public VulkanDrawcallCallback
const vector<uint32_t> &m_Events;
// cache modified pipelines
map<ResourceId, pair<uint32_t, VkPipeline> > m_PipelineCache;
std::map<ResourceId, pair<uint32_t, VkPipeline> > m_PipelineCache;
VulkanRenderState m_PrevState;
};
@@ -2146,7 +2146,7 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, CompType typeHint, Debu
typedef std::pair<uint32_t, Topology> PipeKey;
map<PipeKey, VkPipeline> pipes;
std::map<PipeKey, VkPipeline> pipes;
cmd = m_pDriver->GetNextCmd();
renderdoc/driver/vulkan/vk_postvs.cpp
+1 -1
View File
@@ -1847,7 +1847,7 @@ void VulkanReplay::FetchVSOut(uint32_t eventId)
// we use a map here since the indices may be sparse. Especially considering if an index
// is 'invalid' like 0xcccccccc then we don't want an array of 3.4 billion entries.
map<uint32_t, size_t> indexRemap;
std::map<uint32_t, size_t> indexRemap;
for(size_t i = 0; i < indices.size(); i++)
{
// by definition, this index will only appear once in indices[]
renderdoc/driver/vulkan/vk_replay.h
+1 -2
View File
@@ -99,7 +99,6 @@
#endif
#include <map>
using std::map;
// similar to RDCUNIMPLEMENTED but for things that are hit often so we don't want to fire the
// debugbreak.
@@ -451,7 +450,7 @@ private:
VulkanResourceManager *m_ResourceManager;
};
map<uint64_t, OutputWindow> m_OutputWindows;
std::map<uint64_t, OutputWindow> m_OutputWindows;
uint64_t m_OutputWinID;
uint64_t m_ActiveWinID;
bool m_BindDepth;
renderdoc/driver/vulkan/vk_resources.h
+2 -2
View File
@@ -966,8 +966,8 @@ struct DescriptorSetData
// the refcount has the high-bit set if this resource has sparse
// mapping information
static const uint32_t SPARSE_REF_BIT = 0x80000000;
map<ResourceId, pair<uint32_t, FrameRefType> > bindFrameRefs;
map<ResourceId, MemRefs> bindMemRefs;
std::map<ResourceId, pair<uint32_t, FrameRefType> > bindFrameRefs;
std::map<ResourceId, MemRefs> bindMemRefs;
};
struct PipelineLayoutData
renderdoc/driver/vulkan/vk_sparse_initstate.cpp
+2 -2
View File
@@ -79,7 +79,7 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkBuffer *buf)
// VKTODOLOW this is a bit conservative, as we save the whole memory object rather than just the
// bound range.
map<VkDeviceMemory, VkDeviceSize> boundMems;
std::map<VkDeviceMemory, VkDeviceSize> boundMems;
// value will be filled out later once all memories are added
for(size_t i = 0; i < buf->record->resInfo->opaquemappings.size(); i++)
@@ -205,7 +205,7 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkImage *im)
// VKTODOLOW this is a bit conservative, as we save the whole memory object rather than just the
// bound range.
map<VkDeviceMemory, VkDeviceSize> boundMems;
std::map<VkDeviceMemory, VkDeviceSize> boundMems;
// value will be filled out later once all memories are added
for(size_t i = 0; i < sparse->opaquemappings.size(); i++)
renderdoc/os/os_specific.h
-1
View File
@@ -43,7 +43,6 @@
using std::string;
using std::vector;
using std::map;
struct CaptureOptions;
renderdoc/os/posix/posix_process.cpp
+4 -4
View File
@@ -253,9 +253,9 @@ static vector<EnvironmentModification> &GetEnvModifications()
return envCallbacks;
}
static map<string, string> EnvStringToEnvMap(const char **envstring)
static std::map<string, string> EnvStringToEnvMap(const char **envstring)
{
map<string, string> ret;
std::map<string, string> ret;
const char **e = envstring;
@@ -346,7 +346,7 @@ void Process::ApplyEnvironmentModification()
{
// turn environment string to a UTF-8 map
char **currentEnvironment = GetCurrentEnvironment();
map<string, string> currentEnv = EnvStringToEnvMap((const char **)currentEnvironment);
std::map<string, string> currentEnv = EnvStringToEnvMap((const char **)currentEnvironment);
vector<EnvironmentModification> &modifications = GetEnvModifications();
for(size_t i = 0; i < modifications.size(); i++)
@@ -706,7 +706,7 @@ ExecuteResult Process::LaunchAndInjectIntoProcess(const char *app, const char *w
// turn environment string to a UTF-8 map
char **currentEnvironment = GetCurrentEnvironment();
map<string, string> env = EnvStringToEnvMap((const char **)currentEnvironment);
std::map<string, string> env = EnvStringToEnvMap((const char **)currentEnvironment);
vector<EnvironmentModification> modifications = GetEnvModifications();
for(const EnvironmentModification &e : envList)
renderdoc/os/win32/win32_hook.cpp
+2 -3
View File
@@ -40,10 +40,9 @@
#define VERBOSE_DEBUG_HOOK OPTION_OFF
using std::vector;
using std::map;
// map from address of IAT entry, to original contents
map<void **, void *> s_InstalledHooks;
std::map<void **, void *> s_InstalledHooks;
Threading::CriticalSection installedLock;
bool ApplyHook(FunctionHook &hook, void **IATentry, bool &already)
@@ -160,7 +159,7 @@ struct CachedHookData
RDCEraseEl(lowername);
}
map<string, DllHookset> DllHooks;
std::map<string, DllHookset> DllHooks;
HMODULE ownmodule;
Threading::CriticalSection lock;
char lowername[512];