[editorconfig] Apply whitespace rules

pull/197/head
jackun 4 years ago
parent 1cf090c292
commit 768297b430
No known key found for this signature in database
GPG Key ID: 119DB3F1D05A9ED3

@ -51,7 +51,7 @@ dependencies() {
set -e
}
echo "# Checking Dependencies"
case $DISTRO in
"Arch Linux"|"Manjaro Linux")
MANAGER_QUERY="pacman -Q"
@ -74,7 +74,7 @@ dependencies() {
MANAGER_INSTALL="apt install"
DEPS="{gcc,g++,gcc-multilib,g++-multilib,ninja-build,python3-pip,python3-setuptools,python3-wheel,pkg-config,mesa-common-dev,libx11-dev,libxnvctrl-dev,libdbus-1-dev}"
install
if [[ $($SU_CMD pip3 show meson; echo $?) == 1 || $($SU_CMD pip3 show mako; echo $?) == 1 ]]; then
$SU_CMD pip3 install 'meson>=0.54' mako
fi

@ -1,2 +1,2 @@
#include "overlay_params.h"
void parseConfigFile(overlay_params& p);
void parseConfigFile(overlay_params& p);

@ -266,4 +266,4 @@ bool CPUStats::GetCpuFile() {
return true;
}
CPUStats cpuStats;
CPUStats cpuStats;

@ -67,4 +67,4 @@ private:
FILE *m_cpuTempFile = nullptr;
};
extern CPUStats cpuStats;
extern CPUStats cpuStats;

@ -752,4 +752,4 @@ void dbus_manager::dbus_thread(dbus_manager *pmgr)
}
dbus_manager dbus_mgr;
}
}

@ -11,4 +11,4 @@ const char* GetDefaultCompressedFontDataTTFBase85(void);
}
#endif
#endif
#endif

@ -296,4 +296,4 @@ static const char ttf_compressed_data_base85[178490+1] =
const char* GetDefaultCompressedFontDataTTFBase85(void)
{
return ttf_compressed_data_base85;
}
}

@ -83,4 +83,4 @@ void getAmdGpuUsage(){
amdgpu.MemClock = value / 1000000;
gpu_info.MemClock = amdgpu.MemClock;
}
}
}

@ -30,4 +30,4 @@ extern struct amdGpu amdgpu;
extern struct gpuInfo gpu_info;
void getNvidiaGpuInfo(void);
void getAmdGpuUsage(void);
void getAmdGpuUsage(void);

@ -21,4 +21,4 @@ bool key_is_pressed(KeySym ks) {
bool isPressed = !!(keys_return[kc2 >> 3] & (1 << (kc2 & 7)));
return isPressed;
}
#endif
#endif

@ -60,7 +60,7 @@ bool libnvctrl_loader::Load(const std::string& library_name) {
CleanUp(true);
return false;
}
XNVCTRLQueryTargetAttribute64 =
reinterpret_cast<decltype(this->XNVCTRLQueryTargetAttribute64)>(
dlsym(library_, "XNVCTRLQueryTargetAttribute64"));

@ -91,9 +91,9 @@ void update_meminfo(void) {
mem_info.mem = curmem;
mem_info.bufmem = curbufmem;
mem_info.memeasyfree = cureasyfree;
memused = (float(mem_info.memmax) - float(mem_info.memeasyfree)) / (1024 * 1024);
memmax = float(mem_info.memmax) / (1024 * 1024);
fclose(meminfo_fp);
}
}

@ -12,4 +12,4 @@ struct memory_information {
};
void update_meminfo(void);
FILE *open_file(const char *file, int *reported);
FILE *open_file(const char *file, int *reported);

@ -98,18 +98,18 @@ vklayer_mesa_overlay = shared_library(
overlay_spv,
c_args : [
pre_args,
c_vis_args,
no_override_init_args,
c_vis_args,
no_override_init_args,
vulkan_wsi_args
],
cpp_args : [
pre_args,
cpp_vis_args,
cpp_vis_args,
cpp_nvml_args,
vulkan_wsi_args
],
dependencies : [
vulkan_wsi_deps,
vulkan_wsi_deps,
libimgui_core_dep,
dbus_dep,
dep_dl,

@ -11,4 +11,4 @@ extern struct nvctrlInfo nvctrl_info;
extern bool nvctrlSuccess;
bool checkXNVCtrl(void);
void getNvctrlInfo(void);
char *get_attr_target_string(int attr, int target_type, int target_id);
char *get_attr_target_string(int attr, int target_type, int target_id);

@ -38,7 +38,7 @@ bool checkNVML(const char* pciBusId){
std::cerr << "MANGOHUD: Failed to load NVML\n";
}
return false;
}
}
bool getNVMLInfo(){
nvmlReturn_t response;
@ -49,8 +49,8 @@ bool getNVMLInfo(){
nvml.nvmlDeviceGetClockInfo(nvidiaDevice, NVML_CLOCK_MEM, &nvidiaMemClock);
nvml.nvmlDeviceGetPciInfo_v3(nvidiaDevice, &nvidiaPciInfo);
deviceID = nvidiaPciInfo.pciDeviceId >> 16;
if (response == NVML_ERROR_NOT_SUPPORTED)
nvmlSuccess = false;
return nvmlSuccess;
}
}

@ -880,7 +880,7 @@ void check_keybinds(struct overlay_params& params){
elapsedF2 = (double)(now - last_f2_press);
elapsedF12 = (double)(now - last_f12_press);
elapsedReloadCfg = (double)(now - reload_cfg_press);
if (elapsedF2 >= 500000 && !params.output_file.empty()){
#ifdef HAVE_X11
pressed = key_is_pressed(params.toggle_logging);
@ -961,7 +961,7 @@ void update_hud_info(struct swapchain_stats& sw_stats, struct overlay_params& pa
std::thread(update_meminfo).detach();
if (params.enabled[OVERLAY_PARAM_ENABLED_io_read] || params.enabled[OVERLAY_PARAM_ENABLED_io_write])
std::thread(getIoStats, &sw_stats.io).detach();
gpuLoadLog = gpu_info.load;
cpuLoadLog = sw_stats.total_cpu;
sw_stats.fps = fps;
@ -1149,7 +1149,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2&
window_size = ImVec2(params.width, params.height);
unsigned width = ImGui::GetIO().DisplaySize.x;
unsigned height = ImGui::GetIO().DisplaySize.y;
if (!params.no_display){
ImGui::Begin("Main", &open, ImGuiWindowFlags_NoDecoration);
if (params.enabled[OVERLAY_PARAM_ENABLED_version]){
@ -1193,7 +1193,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2&
ImGui::Text("%%");
// ImGui::SameLine(150);
// ImGui::Text("%s", "%");
if (params.enabled[OVERLAY_PARAM_ENABLED_cpu_temp]){
ImGui::TableNextCell();
right_aligned_text(char_width * 4, "%i", cpuStats.GetCPUDataTotal().temp);
@ -1201,7 +1201,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2&
ImGui::Text("°C");
}
}
if (params.enabled[OVERLAY_PARAM_ENABLED_core_load]){
int i = 0;
for (const CPUData &cpuData : cpuStats.GetCPUData())
@ -1234,7 +1234,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2&
ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(params.io_color), "IO RW");
if (params.enabled[OVERLAY_PARAM_ENABLED_io_read] && params.enabled[OVERLAY_PARAM_ENABLED_io_write])
ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(params.io_color), "IO RD/RW");
if (params.enabled[OVERLAY_PARAM_ENABLED_io_read]){
ImGui::TableNextCell();
float val = data.io.diff.read * 1000000 / sampling;
@ -2361,7 +2361,7 @@ static VkResult overlay_CreateSwapchainKHR(
// ss << ")";
std::string deviceName = prop.deviceName;
get_device_name(prop.vendorID, prop.deviceID, swapchain_data->sw_stats);
if(driverProps.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY){
if(driverProps.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY){
ss << "NVIDIA";
ss << " (" << ((prop.driverVersion >> 22) & 0x3ff);
ss << "." << ((prop.driverVersion >> 14) & 0x0ff);
@ -2459,7 +2459,7 @@ static VkResult overlay_QueuePresentKHR(
FpsLimiter(fps_limit_stats);
fps_limit_stats.frameEnd = os_time_get_nano();
}
return result;
}
@ -2675,7 +2675,7 @@ static VkResult overlay_CreateInstance(
{
VkLayerInstanceCreateInfo *chain_info =
get_instance_chain_info(pCreateInfo, VK_LAYER_LINK_INFO);
std::string engineName, engineVersion;
if (!is_blacklisted()) {

@ -60,4 +60,4 @@ void check_keybinds(struct overlay_params& params);
void init_system_info(void);
void FpsLimiter(struct fps_limit& stats);
void imgui_custom_style(struct overlay_params& params);
void get_device_name(int32_t vendorID, int32_t deviceID, struct swapchain_stats& sw_stats);
void get_device_name(int32_t vendorID, int32_t deviceID, struct swapchain_stats& sw_stats);

@ -422,7 +422,7 @@ parse_overlay_config(struct overlay_params *params,
}
params->tableCols = 3;
if (!params->font_size) {
params->font_size = 24;
} else {
@ -437,7 +437,7 @@ parse_overlay_config(struct overlay_params *params,
params->tableCols = 4;
params->width = 20 * params->font_size;
}
// set frametime limit
if (params->fps_limit >= 0)
fps_limit_stats.targetFrameTime = int64_t(1000000000.0 / params->fps_limit);

@ -35,7 +35,7 @@ void parse_pciids()
ss.str(""); ss.clear();
ss << line;
switch(tabs)
{
case 0:
@ -67,4 +67,4 @@ void parse_pciids()
break;
}
}
}
}

@ -16,4 +16,4 @@ struct device
extern std::map<uint32_t /*vendor id*/, std::pair<std::string /*vendor desc*/, std::map<uint32_t /*device id*/, device>>> pci_ids;
void parse_pciids(void);
void parse_pciids(void);

Loading…
Cancel
Save