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

Add GGP files to VS project, fix compilation with removal of 'using std'

Browse Source
This commit is contained in:
baldurk
2019-05-21 12:11:00 +01:00
parent 622291fde9
commit 8ab8f42daf
4 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/os/posix/ggp/ggp_callstack.cpp
+4 -3
View File
@@ -151,7 +151,7 @@ struct LookupModule
class GgpResolver : public Callstack::StackResolver
{
public:
GgpResolver(vector<LookupModule> modules) { m_Modules = modules; }
GgpResolver(std::vector<LookupModule> modules) { m_Modules = modules; }
Callstack::AddressDetails GetAddr(uint64_t addr)
{
EnsureCached(addr);
@@ -178,7 +178,8 @@ private:
if(addr >= m_Modules[i].base && addr < m_Modules[i].end)
{
uint64_t relative = addr - m_Modules[i].base + m_Modules[i].offset;
string cmd = StringFormat::Fmt("addr2line -fCe \"%s\" 0x%llx", m_Modules[i].path, relative);
std::string cmd =
StringFormat::Fmt("addr2line -fCe \"%s\" 0x%llx", m_Modules[i].path, relative);
FILE *f = ::popen(cmd.c_str(), "r");
@@ -246,7 +247,7 @@ StackResolver *MakeResolver(byte *moduleDB, size_t DBSize, RENDERDOC_ProgressCal
char *search = start;
char *dbend = (char *)(moduleDB + DBSize);
vector<LookupModule> modules;
std::vector<LookupModule> modules;
while(search && search < dbend)
{
renderdoc/os/posix/ggp/ggp_process.cpp
+3 -3
View File
@@ -41,14 +41,14 @@ char **GetCurrentEnvironment()
std::vector<int> getSockets(pid_t childPid)
{
std::vector<int> sockets;
string dirPath = StringFormat::Fmt("/proc/%d/fd", (int)childPid);
std::string dirPath = StringFormat::Fmt("/proc/%d/fd", (int)childPid);
std::vector<PathEntry> files = FileIO::GetFilesInDirectory(dirPath.c_str());
if(files.empty())
return sockets;
for(const PathEntry &file : files)
{
string target = StringFormat::Fmt("%s/%s", dirPath.c_str(), file.filename.c_str());
std::string target = StringFormat::Fmt("%s/%s", dirPath.c_str(), file.filename.c_str());
char linkname[1024];
ssize_t length = readlink(target.c_str(), linkname, 1023);
if(length == -1)
@@ -67,7 +67,7 @@ int GetIdentPort(pid_t childPid)
{
int ret = 0;
string procfile = StringFormat::Fmt("/proc/%d/net/tcp", (int)childPid);
std::string procfile = StringFormat::Fmt("/proc/%d/net/tcp", (int)childPid);
int waitTime = INITIAL_WAIT_TIME;
renderdoc/renderdoc.vcxproj
+18
View File
@@ -463,6 +463,24 @@
<ClCompile Include="os\posix\apple\apple_threading.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="os\posix\ggp\ggp_callstack.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="os\posix\ggp\ggp_hook.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="os\posix\ggp\ggp_network.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="os\posix\ggp\ggp_process.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="os\posix\ggp\ggp_stringio.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="os\posix\ggp\ggp_threading.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="os\posix\linux\linux_callstack.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
renderdoc/renderdoc.vcxproj.filters
+21
View File
@@ -136,6 +136,9 @@
<Filter Include="Common\Serialise\Codecs\cpp_codec\vulkan">
<UniqueIdentifier>{ee6a7f7e-becf-43f0-8c7f-e0109a364ebb}</UniqueIdentifier>
</Filter>
<Filter Include="OS\Posix\GGP">
<UniqueIdentifier>{b76c42f4-d523-4417-a474-56d278d35a36}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="maths\camera.h">
@@ -836,6 +839,24 @@
<ClCompile Include="core\intervals_tests.cpp">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="os\posix\ggp\ggp_callstack.cpp">
<Filter>OS\Posix\GGP</Filter>
</ClCompile>
<ClCompile Include="os\posix\ggp\ggp_hook.cpp">
<Filter>OS\Posix\GGP</Filter>
</ClCompile>
<ClCompile Include="os\posix\ggp\ggp_network.cpp">
<Filter>OS\Posix\GGP</Filter>
</ClCompile>
<ClCompile Include="os\posix\ggp\ggp_process.cpp">
<Filter>OS\Posix\GGP</Filter>
</ClCompile>
<ClCompile Include="os\posix\ggp\ggp_stringio.cpp">
<Filter>OS\Posix\GGP</Filter>
</ClCompile>
<ClCompile Include="os\posix\ggp\ggp_threading.cpp">
<Filter>OS\Posix\GGP</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="os\win32\comexport.def">