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

Don't enumerate available GPUs when running in renderdoccmd

Browse Source
This commit is contained in:
baldurk
2019-11-26 10:44:08 +00:00
parent 9b4a1c900f
commit e6627542cf
6 changed files with 112 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/api/replay/renderdoc_replay.h
+6
View File
@@ -608,6 +608,12 @@ struct GlobalEnvironment
DOCUMENT(
"The handle to the X display to use internally. If left ``NULL``, wayland cannot be used.");
wl_display *waylandDisplay = NULL;
DOCUMENT(R"(Whether to enumerate available GPUs. If the replay program is only being used for
internal operation where enumerating GPUs would be too expensive or problematic, it can be disabled
here.
)");
bool enumerateGPUs = true;
};
DOCUMENT("The result of executing or injecting into a program.")
renderdoc/core/core.cpp
+92 -89
View File
@@ -509,111 +509,114 @@ void RenderDoc::ProcessGlobalEnvironment(GlobalEnvironment env, const std::vecto
RDCDEBUG("[%u]: %s", (uint32_t)i, args[i].c_str());
}
m_AvailableGPUThread = Threading::CreateThread([this]() {
for(GraphicsAPI api : {GraphicsAPI::D3D11, GraphicsAPI::D3D12, GraphicsAPI::Vulkan})
{
RDCDriver driverType = RDCDriver::Unknown;
switch(api)
if(env.enumerateGPUs)
{
m_AvailableGPUThread = Threading::CreateThread([this]() {
for(GraphicsAPI api : {GraphicsAPI::D3D11, GraphicsAPI::D3D12, GraphicsAPI::Vulkan})
{
case GraphicsAPI::D3D11: driverType = RDCDriver::D3D11; break;
case GraphicsAPI::D3D12: driverType = RDCDriver::D3D12; break;
case GraphicsAPI::OpenGL: break;
case GraphicsAPI::Vulkan: driverType = RDCDriver::Vulkan; break;
}
RDCDriver driverType = RDCDriver::Unknown;
if(driverType == RDCDriver::Unknown || !HasReplayDriver(driverType))
continue;
IReplayDriver *driver = NULL;
ReplayStatus status = m_ReplayDriverProviders[driverType](NULL, ReplayOptions(), &driver);
if(status == ReplayStatus::Succeeded)
{
rdcarray<GPUDevice> gpus = driver->GetAvailableGPUs();
for(const GPUDevice &newgpu : gpus)
switch(api)
{
bool addnew = true;
for(GPUDevice &oldgpu : m_AvailableGPUs)
{
// if we have this GPU listed already, just add its API to the previous list
if(oldgpu == newgpu)
{
oldgpu.apis.push_back(api);
addnew = false;
}
}
if(addnew)
m_AvailableGPUs.push_back(newgpu);
case GraphicsAPI::D3D11: driverType = RDCDriver::D3D11; break;
case GraphicsAPI::D3D12: driverType = RDCDriver::D3D12; break;
case GraphicsAPI::OpenGL: break;
case GraphicsAPI::Vulkan: driverType = RDCDriver::Vulkan; break;
}
}
else
{
RDCWARN("Couldn't create proxy replay driver for %s: %s", ToStr(driverType).c_str(),
ToStr(status).c_str());
}
if(driver)
driver->Shutdown();
}
// we now have a list of GPUs, however we might have some duplicates if some APIs have
// multiple drivers for a single device. To compact this list, for each GPU with no driver
// we find all matching multi-drive GPUs and merge it into all matching copies.
bool hasDriverNames = false;
for(size_t i = 0; i < m_AvailableGPUs.size(); i++)
hasDriverNames |= !m_AvailableGPUs[i].driver.empty();
if(hasDriverNames)
{
for(size_t i = 0; i < m_AvailableGPUs.size();)
{
bool applied = false;
if(!m_AvailableGPUs[i].driver.empty())
{
i++;
if(driverType == RDCDriver::Unknown || !HasReplayDriver(driverType))
continue;
}
// scan all subsequent GPUs, if we find a duplicate, merge the APIs
for(size_t j = i + 1; j < m_AvailableGPUs.size(); j++)
IReplayDriver *driver = NULL;
ReplayStatus status = m_ReplayDriverProviders[driverType](NULL, ReplayOptions(), &driver);
if(status == ReplayStatus::Succeeded)
{
if(m_AvailableGPUs[i].vendor == m_AvailableGPUs[j].vendor &&
m_AvailableGPUs[i].deviceID == m_AvailableGPUs[j].deviceID)
rdcarray<GPUDevice> gpus = driver->GetAvailableGPUs();
for(const GPUDevice &newgpu : gpus)
{
RDCASSERT(!m_AvailableGPUs[j].driver.empty());
for(GraphicsAPI a : m_AvailableGPUs[i].apis)
{
if(m_AvailableGPUs[j].apis.indexOf(a) == -1)
m_AvailableGPUs[j].apis.push_back(a);
}
applied = true;
}
}
bool addnew = true;
// we "applied" this GPU to all its driver-based duplicates, so we can remove it now
if(applied)
{
m_AvailableGPUs.erase(i);
for(GPUDevice &oldgpu : m_AvailableGPUs)
{
// if we have this GPU listed already, just add its API to the previous list
if(oldgpu == newgpu)
{
oldgpu.apis.push_back(api);
addnew = false;
}
}
if(addnew)
m_AvailableGPUs.push_back(newgpu);
}
}
else
{
i++;
RDCWARN("Couldn't create proxy replay driver for %s: %s", ToStr(driverType).c_str(),
ToStr(status).c_str());
}
if(driver)
driver->Shutdown();
}
// we now have a list of GPUs, however we might have some duplicates if some APIs have
// multiple drivers for a single device. To compact this list, for each GPU with no driver
// we find all matching multi-drive GPUs and merge it into all matching copies.
bool hasDriverNames = false;
for(size_t i = 0; i < m_AvailableGPUs.size(); i++)
hasDriverNames |= !m_AvailableGPUs[i].driver.empty();
if(hasDriverNames)
{
for(size_t i = 0; i < m_AvailableGPUs.size();)
{
bool applied = false;
if(!m_AvailableGPUs[i].driver.empty())
{
i++;
continue;
}
// scan all subsequent GPUs, if we find a duplicate, merge the APIs
for(size_t j = i + 1; j < m_AvailableGPUs.size(); j++)
{
if(m_AvailableGPUs[i].vendor == m_AvailableGPUs[j].vendor &&
m_AvailableGPUs[i].deviceID == m_AvailableGPUs[j].deviceID)
{
RDCASSERT(!m_AvailableGPUs[j].driver.empty());
for(GraphicsAPI a : m_AvailableGPUs[i].apis)
{
if(m_AvailableGPUs[j].apis.indexOf(a) == -1)
m_AvailableGPUs[j].apis.push_back(a);
}
applied = true;
}
}
// we "applied" this GPU to all its driver-based duplicates, so we can remove it now
if(applied)
{
m_AvailableGPUs.erase(i);
}
else
{
i++;
}
}
}
}
// sort the APIs list in each GPU, and sort the GPUs
std::sort(m_AvailableGPUs.begin(), m_AvailableGPUs.end());
for(GPUDevice &dev : m_AvailableGPUs)
{
std::sort(dev.apis.begin(), dev.apis.end());
}
});
// sort the APIs list in each GPU, and sort the GPUs
std::sort(m_AvailableGPUs.begin(), m_AvailableGPUs.end());
for(GPUDevice &dev : m_AvailableGPUs)
{
std::sort(dev.apis.begin(), dev.apis.end());
}
});
}
}
bool RenderDoc::MatchClosestWindow(void *&dev, void *&wnd)
renderdoccmd/renderdoccmd.cpp
+7 -2
View File
@@ -473,6 +473,8 @@ struct RemoteServerCommand : public Command
{
std::string host = parser.get<std::string>("host");
m_Env.enumerateGPUs = true;
RENDERDOC_InitGlobalEnv(m_Env, convertArgs(parser.rest()));
std::cerr << "Spawning a replay host listening on " << (host.empty() ? "*" : host) << "..."
@@ -1169,8 +1171,11 @@ struct EmbeddedSectionCommand : public Command
REPLAY_PROGRAM_MARKER()
int renderdoccmd(const GlobalEnvironment &env, std::vector<std::string> &argv)
int renderdoccmd(GlobalEnvironment &env, std::vector<std::string> &argv)
{
// we don't need this in renderdoccmd.
env.enumerateGPUs = false;
try
{
// add basic commands, and common aliases
@@ -1330,7 +1335,7 @@ int renderdoccmd(const GlobalEnvironment &env, std::vector<std::string> &argv)
}
}
int renderdoccmd(const GlobalEnvironment &env, int argc, char **c_argv)
int renderdoccmd(GlobalEnvironment &env, int argc, char **c_argv)
{
std::vector<std::string> argv;
argv.resize(argc);
renderdoccmd/renderdoccmd.h
+2 -2
View File
@@ -50,8 +50,8 @@ void add_version_line(const std::string &str);
void add_command(const std::string &name, Command *cmd);
void add_alias(const std::string &alias, const std::string &command);
int renderdoccmd(const GlobalEnvironment &env, int argc, char **argv);
int renderdoccmd(const GlobalEnvironment &env, std::vector<std::string> &argv);
int renderdoccmd(GlobalEnvironment &env, int argc, char **argv);
int renderdoccmd(GlobalEnvironment &env, std::vector<std::string> &argv);
void readCapOpts(const std::string &str, CaptureOptions *opts);
renderdoccmd/renderdoccmd_android.cpp
+2 -1
View File
@@ -417,7 +417,8 @@ void *cmdthread(void *)
{
ANDROID_LOG("Entering cmd thread");
m_CmdLock.lock();
renderdoccmd(GlobalEnvironment(), args);
GlobalEnvironment env;
renderdoccmd(env, args);
m_CmdLock.unlock();
ANDROID_LOG("Exiting cmd thread");
}
renderdoccmd/renderdoccmd_apple.cpp
+3 -1
View File
@@ -51,5 +51,7 @@ int main(int argc, char *argv[])
// process any apple-specific arguments here
return renderdoccmd(GlobalEnvironment(), argc, argv);
GlobalEnvironment env;
return renderdoccmd(env, argc, argv);
}