Cosmetic changes to engine detection

pull/556/head
Alessandro Toia 3 years ago
parent 5330573c8c
commit 570bef468b

@ -76,14 +76,15 @@ void imgui_init()
for (auto& item : params.blacklist) {
add_blacklist(item);
}
if (engine != EngineTypes::ZINK){
auto pid = getpid();
string find_wined3d = "lsof -w -lnPX -L -p " + to_string(pid) + " | grep -oh wined3d";
string ret_wined3d = exec(find_wined3d);
if (ret_wined3d == "wined3d\n" )
engine = EngineTypes::WINED3D;
engine = WINED3D;
else
engine = EngineTypes::OpenGL;
engine = OpenGL;
}
is_blacklisted(true);
notifier.params = &params;

@ -20,7 +20,7 @@ struct fps_limit fps_limit_stats {};
ImVec2 real_font_size;
std::vector<logData> graph_data;
const char* engines[] = {"OpenGL", "VULKAN", "DXVK", "VKD3D", "DAMAVAND", "ZINK", "WINED3D", "Feral3D"};
int engine;
EngineTypes engine;
void update_hw_info(struct swapchain_stats& sw_stats, struct overlay_params& params, uint32_t vendorID)
{
@ -88,7 +88,7 @@ void update_hud_info(struct swapchain_stats& sw_stats, struct overlay_params& pa
sw_stats.frames_stats[f_idx].stats[OVERLAY_PLOTS_frame_timing] =
now - sw_stats.last_present_time;
}
frametime = (now - sw_stats.last_present_time) / 1000;
if (elapsed >= params.fps_sampling_period) {
std::thread(update_hw_info, std::ref(sw_stats), std::ref(params), vendorID).detach();

@ -93,7 +93,7 @@ enum EngineTypes
};
extern const char* engines[];
extern int engine;
extern enum EngineTypes engine;
extern struct fps_limit fps_limit_stats;
extern int32_t deviceID;

@ -2148,25 +2148,24 @@ static VkResult overlay_CreateInstance(
int engineVer = pCreateInfo->pApplicationInfo->engineVersion;
engineVersion = to_string(VK_VERSION_MAJOR(engineVer)) + "." + to_string(VK_VERSION_MINOR(engineVer)) + "." + to_string(VK_VERSION_PATCH(engineVer));
}
if (engineName != "DXVK" && engineName != "vkd3d" && engineName != "Feral3D" && engineName != "Damavand" && engineName != "mesa zink")
engine = EngineTypes::Vulkan;
if (engineName == "DXVK")
engine = EngineTypes::DXVK;
if (engineName == "vkd3d")
engine = EngineTypes::VKD3D;
if (engineName == "mesa zink")
engine = EngineTypes::ZINK;
if (engineName == "Damavand")
engine = EngineTypes::DAMAVAND;
if (engineName == "Feral3D")
engine = EngineTypes::Feral3D;
engine = DXVK;
else if (engineName == "vkd3d")
engine = VKD3D;
else if(engineName == "mesa zink")
engine = ZINK;
else if (engineName == "Damavand")
engine = DAMAVAND;
else if (engineName == "Feral3D")
engine = Feral3D;
else
engine = Vulkan;
}
assert(chain_info->u.pLayerInfo);

Loading…
Cancel
Save