Merge branch 'benchmark-percentages'
FlightlessMango
4 years ago
commit
27df2ef24b
@ -1,3 +0,0 @@
|
||||
[submodule "modules/ImGui/src"]
|
||||
path = modules/ImGui/src
|
||||
url = https://github.com/flightlessmango/imgui.git
|
||||
@ -0,0 +1,185 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
|
||||
# Specialized build script for Steam Runtime SDK docker
|
||||
|
||||
OS_RELEASE_FILES=("/etc/os-release" "/usr/lib/os-release")
|
||||
XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
|
||||
XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
|
||||
DATA_DIR="$XDG_DATA_HOME/MangoHud"
|
||||
CONFIG_DIR="$XDG_CONFIG_HOME/MangoHud"
|
||||
LAYER="build/release/usr/share/vulkan/implicit_layer.d/mangohud.json"
|
||||
INSTALL_DIR="build/package/"
|
||||
IMPLICIT_LAYER_DIR="$XDG_DATA_HOME/vulkan/implicit_layer.d"
|
||||
VERSION=$(git describe --long --tags --always | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//')
|
||||
|
||||
dependencies() {
|
||||
|
||||
if [[ ! -f build/release/usr/lib64/libMangoHud.so ]]; then
|
||||
install() {
|
||||
set +e
|
||||
for i in $(eval echo $DEPS); do
|
||||
dpkg-query -s "$i" &> /dev/null
|
||||
if [[ $? == 1 ]]; then
|
||||
INSTALL="$INSTALL""$i "
|
||||
fi
|
||||
done
|
||||
if [[ ! -z "$INSTALL" ]]; then
|
||||
apt-get update
|
||||
apt-get -y install $INSTALL
|
||||
fi
|
||||
set -e
|
||||
}
|
||||
|
||||
echo "# Checking Dependencies"
|
||||
DEPS="{gcc-5-multilib,g++-5-multilib,unzip}"
|
||||
install
|
||||
|
||||
# py3.2 is weird
|
||||
ln -sf python3.5 /usr/bin/python3
|
||||
|
||||
if [[ ! -f ./bin/get-pip.py ]]; then
|
||||
curl https://bootstrap.pypa.io/get-pip.py -o bin/get-pip.py
|
||||
python3.5 ./bin/get-pip.py
|
||||
fi
|
||||
|
||||
if [[ $(pip3.5 show meson; echo $?) == 1 || $(pip3.5 show mako; echo $?) == 1 ]]; then
|
||||
pip3.5 install meson mako
|
||||
fi
|
||||
|
||||
if [[ ! -f /usr/include/NVCtrl/NVCtrl.h ]]; then
|
||||
curl -LO http://mirrors.kernel.org/ubuntu/pool/main/n/nvidia-settings/libxnvctrl0_440.64-0ubuntu1_amd64.deb
|
||||
curl -LO http://mirrors.kernel.org/ubuntu/pool/main/n/nvidia-settings/libxnvctrl-dev_440.64-0ubuntu1_amd64.deb
|
||||
dpkg -i libxnvctrl0_440.64-0ubuntu1_amd64.deb libxnvctrl-dev_440.64-0ubuntu1_amd64.deb
|
||||
fi
|
||||
|
||||
# preinstalled 7.10.xxxx
|
||||
#if [[ ! -f /usr/local/bin/glslangValidator ]]; then
|
||||
# curl -LO https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip
|
||||
# unzip glslang-master-linux-Release.zip bin/glslangValidator
|
||||
# /usr/bin/install -m755 bin/glslangValidator /usr/local/bin/
|
||||
# rm bin/glslangValidator glslang-master-linux-Release.zip
|
||||
#fi
|
||||
fi
|
||||
}
|
||||
|
||||
configure() {
|
||||
dependencies
|
||||
git submodule update --init
|
||||
if [[ ! -f "build/meson64/build.ninja" ]]; then
|
||||
export CC="gcc-5"
|
||||
export CXX="g++-5"
|
||||
meson build/meson64 --libdir lib/mangohud/lib64 --prefix /usr -Dappend_libdir_mangohud=false ${CONFIGURE_OPTS}
|
||||
fi
|
||||
if [[ ! -f "build/meson32/build.ninja" ]]; then
|
||||
export CC="gcc-5 -m32"
|
||||
export CXX="g++-5 -m32"
|
||||
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig:${PKG_CONFIG_PATH_32}"
|
||||
export LLVM_CONFIG="/usr/bin/llvm-config32"
|
||||
meson build/meson32 --libdir lib/mangohud/lib32 --prefix /usr -Dappend_libdir_mangohud=false ${CONFIGURE_OPTS}
|
||||
fi
|
||||
}
|
||||
|
||||
build() {
|
||||
if [[ ! -f "build/meson64/build.ninja" || ! -f "build/meson32/build.ninja" ]]; then
|
||||
configure
|
||||
fi
|
||||
DESTDIR="$PWD/build/release" ninja -C build/meson32 install
|
||||
DESTDIR="$PWD/build/release" ninja -C build/meson64 install
|
||||
}
|
||||
|
||||
package() {
|
||||
LIB="build/release/usr/lib/mangohud/lib64/libMangoHud.so"
|
||||
LIB32="build/release/usr/lib/mangohud/lib32/libMangoHud.so"
|
||||
if [[ ! -f "$LIB" || "$LIB" -ot "build/meson64/src/libMangoHud.so" ]]; then
|
||||
build
|
||||
fi
|
||||
tar --numeric-owner --owner=0 --group=0 \
|
||||
-C build/release -cvf "build/MangoHud-package.tar" .
|
||||
}
|
||||
|
||||
release() {
|
||||
rm build/MangoHud-package.tar
|
||||
mkdir -p build/MangoHud
|
||||
package
|
||||
cp --preserve=mode bin/mangohud-setup.sh build/MangoHud/mangohud-setup.sh
|
||||
cp build/MangoHud-package.tar build/MangoHud/MangoHud-package.tar
|
||||
tar --numeric-owner --owner=0 --group=0 \
|
||||
-C build -czvf build/MangoHud-$VERSION.tar.gz MangoHud
|
||||
}
|
||||
|
||||
install() {
|
||||
rm -rf "$HOME/.local/share/MangoHud/"
|
||||
rm -f "$HOME/.local/share/vulkan/implicit_layer.d/"{mangohud32.json,mangohud64.json}
|
||||
|
||||
[ "$UID" -eq 0 ] || mkdir -pv "${CONFIG_DIR}"
|
||||
[ "$UID" -eq 0 ] || exec sudo bash "$0" install
|
||||
|
||||
/usr/bin/install -vm644 -D ./build/release/usr/lib/mangohud/lib32/libMangoHud.so /usr/lib/mangohud/lib32/libMangoHud.so
|
||||
/usr/bin/install -vm644 -D ./build/release/usr/lib/mangohud/lib64/libMangoHud.so /usr/lib/mangohud/lib64/libMangoHud.so
|
||||
/usr/bin/install -vm644 -D ./build/release/usr/lib/mangohud/lib32/libMangoHud_dlsym.so /usr/lib/mangohud/lib32/libMangoHud_dlsym.so
|
||||
/usr/bin/install -vm644 -D ./build/release/usr/lib/mangohud/lib64/libMangoHud_dlsym.so /usr/lib/mangohud/lib64/libMangoHud_dlsym.so
|
||||
/usr/bin/install -vm644 -D ./build/release/usr/share/vulkan/implicit_layer.d/MangoHud.x86.json /usr/share/vulkan/implicit_layer.d/MangoHud.x86.json
|
||||
/usr/bin/install -vm644 -D ./build/release/usr/share/vulkan/implicit_layer.d/MangoHud.x86_64.json /usr/share/vulkan/implicit_layer.d/MangoHud.x86_64.json
|
||||
/usr/bin/install -vm644 -D ./build/release/usr/share/doc/mangohud/MangoHud.conf.example /usr/share/doc/mangohud/MangoHud.conf.example
|
||||
|
||||
/usr/bin/install -vm755 ./build/release/usr/bin/mangohud.x86 /usr/bin/mangohud.x86
|
||||
/usr/bin/install -vm755 ./build/release/usr/bin/mangohud /usr/bin/mangohud
|
||||
|
||||
echo "MangoHud Installed"
|
||||
}
|
||||
|
||||
clean() {
|
||||
rm -rf "build"
|
||||
}
|
||||
|
||||
uninstall() {
|
||||
[ "$UID" -eq 0 ] || exec sudo bash "$0" uninstall
|
||||
rm -rfv "/usr/lib/mangohud"
|
||||
rm -rfv "/usr/share/doc/mangohud"
|
||||
rm -fv "/usr/share/vulkan/implicit_layer.d/mangohud.json"
|
||||
rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.json"
|
||||
rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.x86.json"
|
||||
rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.x86_64.json"
|
||||
rm -fv "/usr/bin/mangohud"
|
||||
rm -fv "/usr/bin/mangohud.x86"
|
||||
}
|
||||
|
||||
usage() {
|
||||
if test -z $1; then
|
||||
echo "Unrecognized command argument: $a"
|
||||
else
|
||||
echo "$0 requires one argument"
|
||||
fi
|
||||
echo -e "\nUsage: $0 <command>\n"
|
||||
echo "Available commands:"
|
||||
echo -e "\tpull\t\tPull latest commits (code) from Git"
|
||||
echo -e "\tconfigure\tEnsures that dependencies are installed, updates git submodules, and generates files needed for building MangoHud. This is automatically run by the build command"
|
||||
echo -e "\tbuild\t\tIf needed runs configure and then builds (compiles) MangoHud"
|
||||
echo -e "\tpackage\t\tRuns build if needed and then builds a tar package from MangoHud"
|
||||
echo -e "\tinstall\t\tInstall MangoHud onto your system"
|
||||
echo -e "\tclean\t\tRemoves build directory"
|
||||
echo -e "\tuninstall\tRemoves installed MangoHud files from your system"
|
||||
echo -e "\trelease\t\tBuilds a MangoHud release tar package"
|
||||
}
|
||||
|
||||
for a in $@; do
|
||||
case $a in
|
||||
"") build;;
|
||||
"pull") git pull;;
|
||||
"configure") configure;;
|
||||
"build") build;;
|
||||
"package") package;;
|
||||
"install") install;;
|
||||
"clean") clean;;
|
||||
"uninstall") uninstall;;
|
||||
"release") release;;
|
||||
*)
|
||||
usage
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -z $@ ]]; then
|
||||
usage no-args
|
||||
fi
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
# ignore this folder
|
||||
root = true
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
libimgui_core = static_library(
|
||||
'imgui_core',
|
||||
files('src/imgui.cpp', 'src/imgui_draw.cpp', 'src/imgui_widgets.cpp'),
|
||||
cpp_args : ['-w'],
|
||||
install : false
|
||||
)
|
||||
|
||||
libimgui_core_dep = declare_dependency(
|
||||
link_with : libimgui_core,
|
||||
include_directories : include_directories('src')
|
||||
)
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 1f02d240b38f445abb0381ade0867752d5d2bc7b
|
||||
@ -1,3 +1,7 @@
|
||||
#pragma once
|
||||
#ifndef MANGOHUD_BLACKLIST_H
|
||||
#define MANGOHUD_BLACKLIST_H
|
||||
|
||||
bool is_blacklisted();
|
||||
bool is_blacklisted(bool force_recheck = false);
|
||||
|
||||
#endif //MANGOHUD_BLACKLIST_H
|
||||
|
||||
@ -1,2 +1,8 @@
|
||||
#pragma once
|
||||
#ifndef MANGOHUD_CONFIG_H
|
||||
#define MANGOHUD_CONFIG_H
|
||||
|
||||
#include "overlay_params.h"
|
||||
void parseConfigFile(overlay_params& p);
|
||||
|
||||
#endif //MANGOHUD_CONFIG_H
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,363 @@
|
||||
#pragma once
|
||||
#ifndef MANGOHUD_DBUS_HELPERS
|
||||
#define MANGOHUD_DBUS_HELPERS
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "loaders/loader_dbus.h"
|
||||
|
||||
namespace DBus_helpers {
|
||||
namespace detail {
|
||||
// clang-format off
|
||||
template<class T> struct dbus_type_traits{};
|
||||
template<> struct dbus_type_traits<bool> { const int value = DBUS_TYPE_BOOLEAN; const bool is_fixed = true; };
|
||||
template<> struct dbus_type_traits<uint8_t> { const int value = DBUS_TYPE_BYTE; const bool is_fixed = true; };
|
||||
template<> struct dbus_type_traits<uint16_t> { const int value = DBUS_TYPE_UINT16; const bool is_fixed = true; };
|
||||
template<> struct dbus_type_traits<uint32_t> { const int value = DBUS_TYPE_UINT32; const bool is_fixed = true; };
|
||||
template<> struct dbus_type_traits<uint64_t> { const int value = DBUS_TYPE_UINT64; const bool is_fixed = true; };
|
||||
template<> struct dbus_type_traits<int16_t> { const int value = DBUS_TYPE_INT16; const bool is_fixed = true; };
|
||||
template<> struct dbus_type_traits<int32_t> { const int value = DBUS_TYPE_INT32; const bool is_fixed = true; };
|
||||
template<> struct dbus_type_traits<int64_t> { const int value = DBUS_TYPE_INT64; const bool is_fixed = true; };
|
||||
template<> struct dbus_type_traits<double> { const int value = DBUS_TYPE_DOUBLE; const bool is_fixed = true; };
|
||||
template<> struct dbus_type_traits<const char*> { const int value = DBUS_TYPE_STRING; const bool is_fixed = false; };
|
||||
// clang-format on
|
||||
|
||||
template <class T>
|
||||
const int dbus_type_identifier = dbus_type_traits<T>().value;
|
||||
|
||||
template <class T>
|
||||
const bool is_fixed = dbus_type_traits<T>().is_fiexd;
|
||||
} // namespace detail
|
||||
|
||||
class DBusMessageIter_wrap {
|
||||
public:
|
||||
DBusMessageIter_wrap(DBusMessage* msg, libdbus_loader* loader);
|
||||
DBusMessageIter_wrap(DBusMessageIter iter, libdbus_loader* loader);
|
||||
|
||||
// Type accessors
|
||||
int type() const noexcept { return m_type; }
|
||||
bool is_unsigned() const noexcept;
|
||||
bool is_signed() const noexcept;
|
||||
bool is_string() const noexcept;
|
||||
bool is_double() const noexcept;
|
||||
bool is_primitive() const noexcept;
|
||||
bool is_array() const noexcept;
|
||||
operator bool() const noexcept { return type() != DBUS_TYPE_INVALID; }
|
||||
|
||||
// Value accessors
|
||||
// Primitives
|
||||
template <class T>
|
||||
auto get_primitive() -> T;
|
||||
auto get_unsigned() -> uint64_t;
|
||||
auto get_signed() -> int64_t;
|
||||
auto get_stringified() -> std::string;
|
||||
// Composites
|
||||
auto get_array_iter() -> DBusMessageIter_wrap;
|
||||
auto get_dict_entry_iter() -> DBusMessageIter_wrap;
|
||||
|
||||
// Looping
|
||||
template <class Callable>
|
||||
void array_for_each(Callable);
|
||||
template <class Callable>
|
||||
void array_for_each_stringify(Callable);
|
||||
template <class T, class Callable>
|
||||
void array_for_each_value(Callable);
|
||||
|
||||
template <class Callable>
|
||||
void string_map_for_each(Callable);
|
||||
template <class Callable>
|
||||
void string_multimap_for_each_stringify(Callable);
|
||||
|
||||
auto next() -> DBusMessageIter_wrap&;
|
||||
|
||||
private:
|
||||
DBusMessageIter resolve_variants() {
|
||||
auto iter = m_Iter;
|
||||
auto field_type = m_DBus->message_iter_get_arg_type(&m_Iter);
|
||||
while (field_type == DBUS_TYPE_VARIANT) {
|
||||
m_DBus->message_iter_recurse(&iter, &iter);
|
||||
field_type = m_DBus->message_iter_get_arg_type(&iter);
|
||||
}
|
||||
return iter;
|
||||
}
|
||||
|
||||
DBusMessageIter m_Iter;
|
||||
DBusMessageIter m_resolved_iter;
|
||||
int m_type;
|
||||
libdbus_loader* m_DBus;
|
||||
};
|
||||
|
||||
DBusMessageIter_wrap::DBusMessageIter_wrap(DBusMessage* msg,
|
||||
libdbus_loader* loader) {
|
||||
m_DBus = loader;
|
||||
if (msg) {
|
||||
m_DBus->message_iter_init(msg, &m_Iter);
|
||||
m_resolved_iter = resolve_variants();
|
||||
m_type = m_DBus->message_iter_get_arg_type(&m_resolved_iter);
|
||||
} else {
|
||||
m_type = DBUS_TYPE_INVALID;
|
||||
}
|
||||
}
|
||||
|
||||
DBusMessageIter_wrap::DBusMessageIter_wrap(DBusMessageIter iter,
|
||||
libdbus_loader* loader)
|
||||
: m_Iter(iter), m_DBus(loader) {
|
||||
m_resolved_iter = resolve_variants();
|
||||
m_type = m_DBus->message_iter_get_arg_type(&m_resolved_iter);
|
||||
}
|
||||
|
||||
bool DBusMessageIter_wrap::is_unsigned() const noexcept {
|
||||
return ((type() == DBUS_TYPE_BYTE) || (type() == DBUS_TYPE_INT16) ||
|
||||
(type() == DBUS_TYPE_INT32) || (type() == DBUS_TYPE_INT64));
|
||||
}
|
||||
|
||||
bool DBusMessageIter_wrap::is_signed() const noexcept {
|
||||
return ((type() == DBUS_TYPE_INT16) || (type() == DBUS_TYPE_INT32) ||
|
||||
(type() == DBUS_TYPE_INT64));
|
||||
}
|
||||
|
||||
bool DBusMessageIter_wrap::is_string() const noexcept {
|
||||
return (type() == DBUS_TYPE_STRING);
|
||||
}
|
||||
|
||||
bool DBusMessageIter_wrap::is_double() const noexcept {
|
||||
return (type() == DBUS_TYPE_DOUBLE);
|
||||
}
|
||||
|
||||
bool DBusMessageIter_wrap::is_primitive() const noexcept {
|
||||
return (is_double() || is_signed() || is_unsigned() || is_string());
|
||||
}
|
||||
|
||||
bool DBusMessageIter_wrap::is_array() const noexcept {
|
||||
return (type() == DBUS_TYPE_ARRAY);
|
||||
}
|
||||
|
||||
template <class T>
|
||||
auto DBusMessageIter_wrap::get_primitive() -> T {
|
||||
auto requested_type = detail::dbus_type_identifier<T>;
|
||||
if (requested_type != type()) {
|
||||
std::cerr << "Type mismatch: '" << ((char)requested_type) << "' vs '"
|
||||
<< (char)type() << "'\n";
|
||||
#ifndef NDEBUG
|
||||
exit(-1);
|
||||
#else
|
||||
return T();
|
||||
#endif
|
||||
}
|
||||
|
||||
T ret;
|
||||
m_DBus->message_iter_get_basic(&m_resolved_iter, &ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
template <>
|
||||
auto DBusMessageIter_wrap::get_primitive<std::string>() -> std::string {
|
||||
return std::string(get_primitive<const char*>());
|
||||
}
|
||||
|
||||
uint64_t DBusMessageIter_wrap::get_unsigned() {
|
||||
auto t = type();
|
||||
switch (t) {
|
||||
case DBUS_TYPE_BYTE:
|
||||
return get_primitive<uint8_t>();
|
||||
case DBUS_TYPE_UINT16:
|
||||
return get_primitive<uint16_t>();
|
||||
case DBUS_TYPE_UINT32:
|
||||
return get_primitive<uint32_t>();
|
||||
case DBUS_TYPE_UINT64:
|
||||
return get_primitive<uint64_t>();
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
int64_t DBusMessageIter_wrap::get_signed() {
|
||||
auto t = type();
|
||||
switch (t) {
|
||||
case DBUS_TYPE_INT16:
|
||||
return get_primitive<int16_t>();
|
||||
case DBUS_TYPE_INT32:
|
||||
return get_primitive<int32_t>();
|
||||
case DBUS_TYPE_INT64:
|
||||
return get_primitive<int64_t>();
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
auto DBusMessageIter_wrap::get_stringified() -> std::string {
|
||||
if (is_string()) return get_primitive<std::string>();
|
||||
if (is_unsigned()) return std::to_string(get_unsigned());
|
||||
if (is_signed()) return std::to_string(get_signed());
|
||||
if (is_double()) return std::to_string(get_primitive<double>());
|
||||
std::cerr << "stringify failed\n";
|
||||
return std::string();
|
||||
}
|
||||
|
||||
auto DBusMessageIter_wrap::get_array_iter() -> DBusMessageIter_wrap {
|
||||
if (not is_array()) {
|
||||
std::cerr << "Not an array; " << (char)type() << "\n";
|
||||
return DBusMessageIter_wrap(DBusMessageIter{}, m_DBus);
|
||||
}
|
||||
|
||||
DBusMessageIter ret;
|
||||
m_DBus->message_iter_recurse(&m_resolved_iter, &ret);
|
||||
return DBusMessageIter_wrap(ret, m_DBus);
|
||||
}
|
||||
|
||||
auto DBusMessageIter_wrap::get_dict_entry_iter() -> DBusMessageIter_wrap {
|
||||
if (type() != DBUS_TYPE_DICT_ENTRY) {
|
||||
std::cerr << "Not a dict entry" << (char)type() << "\n";
|
||||
return DBusMessageIter_wrap(DBusMessageIter{}, m_DBus);
|
||||
}
|
||||
|
||||
DBusMessageIter ret;
|
||||
m_DBus->message_iter_recurse(&m_resolved_iter, &ret);
|
||||
return DBusMessageIter_wrap(ret, m_DBus);
|
||||
}
|
||||
|
||||
template <class T, class Callable>
|
||||
void DBusMessageIter_wrap::array_for_each_value(Callable action) {
|
||||
auto iter = get_array_iter();
|
||||
for (; iter; iter.next()) {
|
||||
action(iter.get_primitive<T>());
|
||||
}
|
||||
}
|
||||
|
||||
template <class Callable>
|
||||
void DBusMessageIter_wrap::array_for_each(Callable action) {
|
||||
auto iter = get_array_iter();
|
||||
for (; iter; iter.next()) {
|
||||
action(iter);
|
||||
}
|
||||
}
|
||||
|
||||
template <class Callable>
|
||||
void DBusMessageIter_wrap::array_for_each_stringify(Callable action) {
|
||||
auto iter = get_array_iter();
|
||||
for (; iter; iter.next()) {
|
||||
action(iter.get_stringified());
|
||||
}
|
||||
}
|
||||
|
||||
template <class T>
|
||||
void DBusMessageIter_wrap::string_map_for_each(T action) {
|
||||
auto iter = get_array_iter();
|
||||
for (; iter; iter.next()) {
|
||||
auto it = iter.get_dict_entry_iter();
|
||||
auto key = it.get_primitive<std::string>();
|
||||
|
||||
it.next();
|
||||
action(key, it);
|
||||
}
|
||||
}
|
||||
|
||||
template <class T>
|
||||
void DBusMessageIter_wrap::string_multimap_for_each_stringify(T action) {
|
||||
string_map_for_each([&action](const std::string& key, DBusMessageIter_wrap it) {
|
||||
if (it.is_array()) {
|
||||
it.array_for_each_stringify(
|
||||
[&](const std::string& val) { action(key, val); });
|
||||
} else if (it.is_primitive()) {
|
||||
action(key, it.get_stringified());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
auto DBusMessageIter_wrap::next() -> DBusMessageIter_wrap& {
|
||||
if (not *this) return *this;
|
||||
m_DBus->message_iter_next(&m_Iter);
|
||||
// Resolve any variants
|
||||
m_resolved_iter = resolve_variants();
|
||||
m_type = m_DBus->message_iter_get_arg_type(&m_resolved_iter);
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
||||
class DBusMessage_wrap {
|
||||
public:
|
||||
DBusMessage_wrap(DBusMessage* msg, libdbus_loader* ldr, bool owning = false)
|
||||
: m_owning(owning), m_msg(msg), m_DBus(ldr) {}
|
||||
|
||||
~DBusMessage_wrap() { free_if_owning(); }
|
||||
|
||||
DBusMessage_wrap(const DBusMessage_wrap&) = delete;
|
||||
DBusMessage_wrap(DBusMessage_wrap&&) = default;
|
||||
|
||||
operator bool() const noexcept { return m_msg != nullptr; }
|
||||
|
||||
template <class T>
|
||||
DBusMessage_wrap& argument(T arg);
|
||||
|
||||
DBusMessage_wrap send_with_reply_and_block(DBusConnection* conn,
|
||||
int timeout);
|
||||
|
||||
DBusMessageIter_wrap iter() { return DBusMessageIter_wrap(m_msg, m_DBus); }
|
||||
|
||||
static DBusMessage_wrap new_method_call(const std::string& bus_name,
|
||||
const std::string& path,
|
||||
const std::string& iface,
|
||||
const std::string& method,
|
||||
libdbus_loader* loader);
|
||||
|
||||
private:
|
||||
void free_if_owning();
|
||||
bool m_owning;
|
||||
DBusMessage* m_msg;
|
||||
libdbus_loader* m_DBus;
|
||||
std::vector<std::string> m_args;
|
||||
};
|
||||
|
||||
template <class T>
|
||||
DBusMessage_wrap& DBusMessage_wrap::argument(T arg) {
|
||||
if (not m_msg) return *this;
|
||||
if (not m_DBus->message_append_args(m_msg, detail::dbus_type_identifier<T>,
|
||||
&arg, DBUS_TYPE_INVALID)) {
|
||||
free_if_owning();
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
template <>
|
||||
DBusMessage_wrap& DBusMessage_wrap::argument<const std::string&>(
|
||||
const std::string& str) {
|
||||
return argument<const char*>(str.c_str());
|
||||
}
|
||||
|
||||
DBusMessage_wrap DBusMessage_wrap::send_with_reply_and_block(
|
||||
DBusConnection* conn, int timeout) {
|
||||
if (not m_msg) {
|
||||
return DBusMessage_wrap(nullptr, m_DBus);
|
||||
}
|
||||
DBusError err;
|
||||
m_DBus->error_init(&err);
|
||||
auto reply = m_DBus->connection_send_with_reply_and_block(conn, m_msg,
|
||||
timeout, &err);
|
||||
if (reply == nullptr) {
|
||||
std::cerr << "MangoHud[" << __func__ << "]: " << err.message << "\n";
|
||||
free_if_owning();
|
||||
m_DBus->error_free(&err);
|
||||
}
|
||||
return DBusMessage_wrap(reply, m_DBus, true);
|
||||
}
|
||||
|
||||
DBusMessage_wrap DBusMessage_wrap::new_method_call(const std::string& bus_name,
|
||||
const std::string& path,
|
||||
const std::string& iface,
|
||||
const std::string& method,
|
||||
libdbus_loader* loader) {
|
||||
auto msg = loader->message_new_method_call(
|
||||
(bus_name.empty()) ? nullptr : bus_name.c_str(), path.c_str(),
|
||||
(iface.empty()) ? nullptr : iface.c_str(), method.c_str());
|
||||
return DBusMessage_wrap(msg, loader, true);
|
||||
}
|
||||
|
||||
void DBusMessage_wrap::free_if_owning() {
|
||||
if (m_msg and m_owning) {
|
||||
m_DBus->message_unref(m_msg);
|
||||
}
|
||||
m_msg = nullptr;
|
||||
}
|
||||
} // namespace DBus_helpers
|
||||
|
||||
#endif // MANGOHUD_DBUS_HELPERS
|
||||
@ -1,137 +1,129 @@
|
||||
#pragma once
|
||||
#ifndef MANGOHUD_DBUS_INFO_H
|
||||
#define MANGOHUD_DBUS_INFO_H
|
||||
|
||||
#include <array>
|
||||
#include <stdexcept>
|
||||
#include <thread>
|
||||
#include <functional>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <map>
|
||||
#include <unordered_map>
|
||||
#include <mutex>
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
#include <thread>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include "loaders/loader_dbus.h"
|
||||
|
||||
struct metadata {
|
||||
//std::vector<std::string> artists;
|
||||
std::string artists; // pre-concatenate
|
||||
// std::vector<std::string> artists;
|
||||
std::string artists; // pre-concatenate
|
||||
std::string title;
|
||||
std::string album;
|
||||
std::string something;
|
||||
std::string artUrl;
|
||||
bool playing = false;
|
||||
struct {
|
||||
float pos;
|
||||
float longest;
|
||||
int dir = -1;
|
||||
bool needs_recalc;
|
||||
|
||||
float tw0;
|
||||
float tw1;
|
||||
float tw2;
|
||||
} ticker;
|
||||
|
||||
bool valid = false;
|
||||
std::mutex mutex;
|
||||
bool got_song_data = false;
|
||||
bool got_playback_data = false;
|
||||
|
||||
void clear()
|
||||
{
|
||||
void clear() {
|
||||
artists.clear();
|
||||
title.clear();
|
||||
album.clear();
|
||||
artUrl.clear();
|
||||
ticker = {};
|
||||
ticker.dir = -1;
|
||||
valid = false;
|
||||
}
|
||||
};
|
||||
|
||||
enum SignalType
|
||||
{
|
||||
ST_NAMEOWNERCHANGED,
|
||||
ST_PROPERTIESCHANGED,
|
||||
struct mutexed_metadata {
|
||||
std::mutex mtx;
|
||||
metadata meta;
|
||||
struct {
|
||||
float pos;
|
||||
float longest;
|
||||
int dir = -1;
|
||||
bool needs_recalc = true;
|
||||
|
||||
float tw0;
|
||||
float tw1;
|
||||
float tw2;
|
||||
} ticker;
|
||||
};
|
||||
|
||||
struct DBusSignal
|
||||
{
|
||||
const char * intf;
|
||||
const char * signal;
|
||||
SignalType type;
|
||||
enum SignalType {
|
||||
ST_NAMEOWNERCHANGED,
|
||||
ST_PROPERTIESCHANGED,
|
||||
};
|
||||
|
||||
extern struct metadata main_metadata;
|
||||
extern struct metadata generic_mpris;
|
||||
extern struct mutexed_metadata main_metadata;
|
||||
|
||||
namespace dbusmgr {
|
||||
using callback_func = std::function<void(/*metadata*/)>;
|
||||
|
||||
enum CBENUM {
|
||||
CB_CONNECTED,
|
||||
CB_DISCONNECTED,
|
||||
CB_NEW_METADATA,
|
||||
};
|
||||
|
||||
/* class dbus_error : public std::runtime_error
|
||||
{
|
||||
public:
|
||||
dbus_error(libdbus_loader& dbus_, DBusError *src) : std::runtime_error(src->message)
|
||||
{
|
||||
dbus = &dbus_;
|
||||
dbus->error_init(&error);
|
||||
dbus->move_error (src, &error);
|
||||
}
|
||||
virtual ~dbus_error() { dbus->error_free (&error); }
|
||||
private:
|
||||
DBusError error;
|
||||
libdbus_loader *dbus;
|
||||
};*/
|
||||
|
||||
class dbus_manager
|
||||
{
|
||||
public:
|
||||
dbus_manager()
|
||||
{
|
||||
}
|
||||
|
||||
~dbus_manager();
|
||||
|
||||
bool init(const std::string& dest);
|
||||
void deinit();
|
||||
void add_callback(CBENUM type, callback_func func);
|
||||
void connect_to_signals();
|
||||
void disconnect_from_signals();
|
||||
DBusConnection* get_conn() const {
|
||||
return m_dbus_conn;
|
||||
}
|
||||
|
||||
libdbus_loader& dbus() {
|
||||
return m_dbus_ldr;
|
||||
}
|
||||
|
||||
|
||||
protected:
|
||||
void stop_thread();
|
||||
void start_thread();
|
||||
static void dbus_thread(dbus_manager *pmgr);
|
||||
|
||||
DBusError m_error;
|
||||
DBusConnection * m_dbus_conn = nullptr;
|
||||
DBusMessage * m_dbus_msg = nullptr;
|
||||
DBusMessage * m_dbus_reply = nullptr;
|
||||
bool m_quit = false;
|
||||
bool m_inited = false;
|
||||
std::thread m_thread;
|
||||
std::map<CBENUM, callback_func> m_callbacks;
|
||||
libdbus_loader m_dbus_ldr;
|
||||
std::unordered_map<std::string, std::string> m_name_owners;
|
||||
std::string m_dest;
|
||||
|
||||
const std::array<DBusSignal, 2> m_signals {{
|
||||
{ "org.freedesktop.DBus", "NameOwnerChanged", ST_NAMEOWNERCHANGED },
|
||||
{ "org.freedesktop.DBus.Properties", "PropertiesChanged", ST_PROPERTIESCHANGED },
|
||||
}};
|
||||
|
||||
};
|
||||
|
||||
extern dbus_manager dbus_mgr;
|
||||
}
|
||||
|
||||
class dbus_manager;
|
||||
using signal_handler_func = bool (dbus_manager::*)(DBusMessage*, const char*);
|
||||
|
||||
struct DBusSignal {
|
||||
const char* intf;
|
||||
const char* signal;
|
||||
signal_handler_func handler;
|
||||
};
|
||||
|
||||
class dbus_manager {
|
||||
public:
|
||||
dbus_manager() {}
|
||||
|
||||
~dbus_manager();
|
||||
|
||||
bool init(const std::string& requested_player);
|
||||
void deinit();
|
||||
bool get_media_player_metadata(metadata& meta, std::string name = "");
|
||||
void connect_to_signals();
|
||||
void disconnect_from_signals();
|
||||
DBusConnection* get_conn() const { return m_dbus_conn; }
|
||||
|
||||
libdbus_loader& dbus() { return m_dbus_ldr; }
|
||||
|
||||
protected:
|
||||
void stop_thread();
|
||||
void start_thread();
|
||||
void dbus_thread();
|
||||
|
||||
bool dbus_list_name_to_owner();
|
||||
bool select_active_player();
|
||||
|
||||
static DBusHandlerResult filter_signals(DBusConnection*, DBusMessage*,
|
||||
void*);
|
||||
|
||||
bool handle_properties_changed(DBusMessage*, const char*);
|
||||
bool handle_name_owner_changed(DBusMessage*, const char*);
|
||||
|
||||
void onNewPlayer(
|
||||
metadata& meta); // A different player has become the active player
|
||||
void onNoPlayer(); // There is no longer any player active
|
||||
void onPlayerUpdate(
|
||||
metadata& meta); // The active player has sent an update
|
||||
|
||||
DBusError m_error;
|
||||
DBusConnection* m_dbus_conn = nullptr;
|
||||
bool m_quit = false;
|
||||
bool m_inited = false;
|
||||
std::thread m_thread;
|
||||
libdbus_loader m_dbus_ldr;
|
||||
std::unordered_map<std::string, std::string> m_name_owners;
|
||||
std::string m_requested_player;
|
||||
std::string m_active_player;
|
||||
|
||||
const std::array<DBusSignal, 2> m_signals{{
|
||||
{"org.freedesktop.DBus", "NameOwnerChanged",
|
||||
&dbus_manager::handle_name_owner_changed},
|
||||
{"org.freedesktop.DBus.Properties", "PropertiesChanged",
|
||||
&dbus_manager::handle_properties_changed},
|
||||
}};
|
||||
};
|
||||
|
||||
extern dbus_manager dbus_mgr;
|
||||
} // namespace dbusmgr
|
||||
bool get_media_player_metadata(dbusmgr::dbus_manager& dbus, const std::string& name, metadata& meta);
|
||||
|
||||
#endif //MANGOHUD_DBUS_INFO_H
|
||||
|
||||
@ -0,0 +1,159 @@
|
||||
#include "logging.h"
|
||||
#include "overlay.h"
|
||||
#include <sstream>
|
||||
#include <iomanip>
|
||||
|
||||
string os, cpu, gpu, ram, kernel, driver;
|
||||
bool sysInfoFetched = false;
|
||||
double fps;
|
||||
logData currentLogData = {};
|
||||
|
||||
std::unique_ptr<Logger> logger;
|
||||
|
||||
string exec(string command) {
|
||||
char buffer[128];
|
||||
string result = "";
|
||||
|
||||
// Open pipe to file
|
||||
FILE* pipe = popen(command.c_str(), "r");
|
||||
if (!pipe) {
|
||||
return "popen failed!";
|
||||
}
|
||||
|
||||
// read till end of process:
|
||||
while (!feof(pipe)) {
|
||||
|
||||
// use buffer to read and add to result
|
||||
if (fgets(buffer, 128, pipe) != NULL)
|
||||
result += buffer;
|
||||
}
|
||||
|
||||
pclose(pipe);
|
||||
return result;
|
||||
}
|
||||
|
||||
void upload_file(std::string logFile){
|
||||
std::string command = "curl --include --request POST https://flightlessmango.com/logs -F 'log[game_id]=26506' -F 'log[user_id]=176' -F 'attachment=true' -A 'mangohud' ";
|
||||
command += " -F 'log[uploads][]=@" + logFile + "'";
|
||||
|
||||
command += " | grep Location | cut -c11-";
|
||||
std::string url = exec(command);
|
||||
exec("xdg-open " + url);
|
||||
}
|
||||
|
||||
void upload_files(const std::vector<std::string>& logFiles){
|
||||
std::string command = "curl --include --request POST https://flightlessmango.com/logs -F 'log[game_id]=26506' -F 'log[user_id]=176' -F 'attachment=true' -A 'mangohud' ";
|
||||
for (auto& file : logFiles)
|
||||
command += " -F 'log[uploads][]=@" + file + "'";
|
||||
|
||||
command += " | grep Location | cut -c11-";
|
||||
std::string url = exec(command);
|
||||
exec("xdg-open " + url);
|
||||
}
|
||||
|
||||
void writeFile(string filename){
|
||||
auto& logArray = logger->get_log_data();
|
||||
#ifndef NDEBUG
|
||||
std::cerr << "Writing log file [" << filename << "], " << logArray.size() << " entries\n";
|
||||
#endif
|
||||
std::ofstream out(filename, ios::out | ios::app);
|
||||
out << "os," << "cpu," << "gpu," << "ram," << "kernel," << "driver" << endl;
|
||||
out << os << "," << cpu << "," << gpu << "," << ram << "," << kernel << "," << driver << endl;
|
||||
out << "fps," << "cpu_load," << "gpu_load," << "cpu_temp," << "gpu_temp," << "gpu_core_clock," << "gpu_mem_clock," << "gpu_vram_used," << "ram_used," << "elapsed" << endl;
|
||||
|
||||
for (size_t i = 0; i < logArray.size(); i++){
|
||||
out << logArray[i].fps << ",";
|
||||
out << logArray[i].cpu_load << ",";
|
||||
out << logArray[i].gpu_load << ",";
|
||||
out << logArray[i].cpu_temp << ",";
|
||||
out << logArray[i].gpu_temp << ",";
|
||||
out << logArray[i].gpu_core_clock << ",";
|
||||
out << logArray[i].gpu_mem_clock << ",";
|
||||
out << logArray[i].gpu_vram_used << ",";
|
||||
out << logArray[i].ram_used << ",";
|
||||
out << std::chrono::duration_cast<std::chrono::microseconds>(logArray[i].previous).count() << "\n";
|
||||
}
|
||||
logger->clear_log_data();
|
||||
}
|
||||
|
||||
string get_log_suffix(){
|
||||
time_t now_log = time(0);
|
||||
tm *log_time = localtime(&now_log);
|
||||
std::ostringstream buffer;
|
||||
buffer << std::put_time(log_time, "%Y-%m-%d_%H-%M-%S") << ".csv";
|
||||
string log_name = buffer.str();
|
||||
return log_name;
|
||||
}
|
||||
|
||||
void logging(void *params_void){
|
||||
overlay_params *params = reinterpret_cast<overlay_params *>(params_void);
|
||||
logger->wait_until_data_valid();
|
||||
while (logger->is_active()){
|
||||
logger->try_log();
|
||||
this_thread::sleep_for(chrono::milliseconds(params->log_interval));
|
||||
}
|
||||
}
|
||||
|
||||
Logger::Logger(overlay_params* in_params)
|
||||
: m_logging_on(false),
|
||||
m_values_valid(false),
|
||||
m_params(in_params)
|
||||
{
|
||||
#ifndef NDEBUG
|
||||
std::cerr << "Logger constructed!\n";
|
||||
#endif
|
||||
}
|
||||
|
||||
void Logger::start_logging() {
|
||||
if(m_logging_on) return;
|
||||
m_values_valid = false;
|
||||
m_logging_on = true;
|
||||
m_log_start = Clock::now();
|
||||
if((not m_params->output_file.empty()) and (m_params->log_interval != 0)){
|
||||
std::thread(logging, m_params).detach();
|
||||
}
|
||||
}
|
||||
|
||||
void Logger::stop_logging() {
|
||||
if(not m_logging_on) return;
|
||||
m_logging_on = false;
|
||||
m_log_end = Clock::now();
|
||||
|
||||
std::thread(calculate_benchmark_data, m_params).detach();
|
||||
|
||||
if(not m_params->output_file.empty()) {
|
||||
m_log_files.emplace_back(m_params->output_file + get_log_suffix());
|
||||
std::thread(writeFile, m_log_files.back()).detach();
|
||||
}
|
||||
}
|
||||
|
||||
void Logger::try_log() {
|
||||
if(not is_active()) return;
|
||||
if(not m_values_valid) return;
|
||||
auto now = Clock::now();
|
||||
auto elapsedLog = now - m_log_start;
|
||||
|
||||
currentLogData.previous = elapsedLog;
|
||||
currentLogData.fps = fps;
|
||||
m_log_array.push_back(currentLogData);
|
||||
|
||||
if(m_params->log_duration and (elapsedLog >= std::chrono::seconds(m_params->log_duration))){
|
||||
stop_logging();
|
||||
}
|
||||
}
|
||||
|
||||
void Logger::wait_until_data_valid() {
|
||||
std::unique_lock<std::mutex> lck(m_values_valid_mtx);
|
||||
while(! m_values_valid) m_values_valid_cv.wait(lck);
|
||||
}
|
||||
|
||||
void Logger::notify_data_valid() {
|
||||
std::unique_lock<std::mutex> lck(m_values_valid_mtx);
|
||||
m_values_valid = true;
|
||||
m_values_valid_cv.notify_all();
|
||||
}
|
||||
|
||||
void Logger::upload_last_log() {
|
||||
if(m_log_files.empty()) return;
|
||||
std::thread(upload_file, m_log_files.back()).detach();
|
||||
}
|
||||
@ -1,65 +1,75 @@
|
||||
#pragma once
|
||||
#ifndef MANGOHUD_LOGGING_H
|
||||
#define MANGOHUD_LOGGING_H
|
||||
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
#include <fstream>
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
#include <condition_variable>
|
||||
|
||||
#include "mesa/util/os_time.h"
|
||||
|
||||
using namespace std;
|
||||
#include "timing.hpp"
|
||||
|
||||
string os, cpu, gpu, ram, kernel, driver;
|
||||
bool sysInfoFetched = false;
|
||||
int gpuLoadLog = 0, cpuLoadLog = 0;
|
||||
uint64_t elapsedLog;
|
||||
#include "overlay_params.h"
|
||||
|
||||
using namespace std;
|
||||
struct logData{
|
||||
double fps;
|
||||
int cpu;
|
||||
int gpu;
|
||||
uint64_t previous;
|
||||
int cpu_load;
|
||||
int gpu_load;
|
||||
int cpu_temp;
|
||||
int gpu_temp;
|
||||
int gpu_core_clock;
|
||||
int gpu_mem_clock;
|
||||
float gpu_vram_used;
|
||||
float ram_used;
|
||||
|
||||
Clock::duration previous;
|
||||
};
|
||||
|
||||
double fps;
|
||||
std::vector<logData> logArray;
|
||||
ofstream out;
|
||||
int num;
|
||||
bool loggingOn;
|
||||
uint64_t log_start, log_end;
|
||||
|
||||
void writeFile(string filename){
|
||||
out.open(filename, ios::out | ios::app);
|
||||
out << "os," << "cpu," << "gpu," << "ram," << "kernel," << "driver" << endl;
|
||||
out << os << "," << cpu << "," << gpu << "," << ram << "," << kernel << "," << driver << endl;
|
||||
|
||||
for (size_t i = 0; i < logArray.size(); i++)
|
||||
out << logArray[i].fps << "," << logArray[i].cpu << "," << logArray[i].gpu << "," << logArray[i].previous << endl;
|
||||
|
||||
out.close();
|
||||
logArray.clear();
|
||||
}
|
||||
|
||||
string get_current_time(){
|
||||
time_t now_log = time(0);
|
||||
tm *log_time = localtime(&now_log);
|
||||
std::ostringstream buffer;
|
||||
buffer << std::put_time(log_time, "%Y-%m-%d_%H-%M-%S");
|
||||
string date = buffer.str();
|
||||
return date;
|
||||
}
|
||||
|
||||
void logging(void *params_void){
|
||||
overlay_params *params = reinterpret_cast<overlay_params *>(params_void);
|
||||
while (loggingOn){
|
||||
uint64_t now = os_time_get();
|
||||
elapsedLog = now - log_start;
|
||||
logArray.push_back({fps, cpuLoadLog, gpuLoadLog, elapsedLog});
|
||||
|
||||
if (params->log_duration && (elapsedLog) >= params->log_duration * 1000000)
|
||||
loggingOn = false;
|
||||
else
|
||||
this_thread::sleep_for(chrono::milliseconds(params->log_interval));
|
||||
}
|
||||
|
||||
writeFile(params->output_file + get_current_time());
|
||||
}
|
||||
class Logger {
|
||||
public:
|
||||
Logger(overlay_params* in_params);
|
||||
|
||||
void start_logging();
|
||||
void stop_logging();
|
||||
|
||||
void try_log();
|
||||
|
||||
bool is_active() const { return m_logging_on; }
|
||||
|
||||
void wait_until_data_valid();
|
||||
void notify_data_valid();
|
||||
|
||||
auto last_log_end() const noexcept { return m_log_end; }
|
||||
auto last_log_begin() const noexcept { return m_log_start; }
|
||||
|
||||
const std::vector<logData>& get_log_data() const noexcept { return m_log_array; }
|
||||
void clear_log_data() noexcept { m_log_array.clear(); }
|
||||
|
||||
void upload_last_log();
|
||||
private:
|
||||
std::vector<logData> m_log_array;
|
||||
std::vector<std::string> m_log_files;
|
||||
Clock::time_point m_log_start;
|
||||
Clock::time_point m_log_end;
|
||||
bool m_logging_on;
|
||||
|
||||
std::mutex m_values_valid_mtx;
|
||||
std::condition_variable m_values_valid_cv;
|
||||
bool m_values_valid;
|
||||
|
||||
overlay_params* m_params;
|
||||
};
|
||||
|
||||
extern std::unique_ptr<Logger> logger;
|
||||
|
||||
extern string os, cpu, gpu, ram, kernel, driver;
|
||||
extern bool sysInfoFetched;
|
||||
extern double fps;
|
||||
extern logData currentLogData;
|
||||
|
||||
string exec(string command);
|
||||
|
||||
#endif //MANGOHUD_LOGGING_H
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
# in base
|
||||
{
|
||||
global:
|
||||
overlay_GetInstanceProcAddr;
|
||||
overlay_GetDeviceProcAddr;
|
||||
glX*;
|
||||
egl*;
|
||||
dlsym;
|
||||
mangohud_find_glx_ptr;
|
||||
mangohud_find_egl_ptr;
|
||||
local: *;
|
||||
};
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,11 @@
|
||||
#pragma once
|
||||
#ifndef MANGOHUD_REAL_DLSYM_H
|
||||
#define MANGOHUD_REAL_DLSYM_H
|
||||
|
||||
#define EXPORT_C_(type) extern "C" __attribute__((__visibility__("default"))) type
|
||||
|
||||
void *real_dlopen(const char *filename, int flag);
|
||||
void* real_dlsym( void*, const char* );
|
||||
void* get_proc_address(const char* name);
|
||||
|
||||
#endif //MANGOHUD_REAL_DLSYM_H
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
#pragma once
|
||||
#ifndef MANGOHUD_SHARED_X11_H
|
||||
#define MANGOHUD_SHARED_X11_H
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
Display* get_xdisplay();
|
||||
bool init_x11();
|
||||
|
||||
#endif //MANGOHUD_SHARED_X11_H
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
#pragma once
|
||||
#ifndef MANGOHUD_TIMING_HPP
|
||||
#define MANGOHUD_TIMING_HPP
|
||||
|
||||
#include <chrono>
|
||||
|
||||
#include "mesa/util/os_time.h"
|
||||
|
||||
class MesaClock {
|
||||
public:
|
||||
using rep = int64_t;
|
||||
using period = std::nano;
|
||||
using duration = std::chrono::duration<rep, period>;
|
||||
using time_point = std::chrono::time_point<MesaClock>;
|
||||
const static bool is_steady = true;
|
||||
static time_point now() noexcept {
|
||||
return time_point(duration(os_time_get_nano()));
|
||||
}
|
||||
};
|
||||
|
||||
using Clock = MesaClock;
|
||||
|
||||
#endif //MANGOHUD_TIMING_HPP
|
||||
@ -0,0 +1,108 @@
|
||||
//-----------------------------------------------------------------------------
|
||||
// COMPILE-TIME OPTIONS FOR DEAR IMGUI
|
||||
// Runtime options (clipboard callbacks, enabling various features, etc.) can generally be set via the ImGuiIO structure.
|
||||
// You can use ImGui::SetAllocatorFunctions() before calling ImGui::CreateContext() to rewire memory allocation functions.
|
||||
//-----------------------------------------------------------------------------
|
||||
// A) You may edit imconfig.h (and not overwrite it when updating Dear ImGui, or maintain a patch/branch with your modifications to imconfig.h)
|
||||
// B) or add configuration directives in your own file and compile with #define IMGUI_USER_CONFIG "myfilename.h"
|
||||
// If you do so you need to make sure that configuration settings are defined consistently _everywhere_ Dear ImGui is used, which include
|
||||
// the imgui*.cpp files but also _any_ of your code that uses Dear ImGui. This is because some compile-time options have an affect on data structures.
|
||||
// Defining those options in imconfig.h will ensure every compilation unit gets to see the same data structure layouts.
|
||||
// Call IMGUI_CHECKVERSION() from your .cpp files to verify that the data structures your files are using are matching the ones imgui.cpp is using.
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#pragma once
|
||||
|
||||
//---- Define assertion handler. Defaults to calling assert().
|
||||
// If your macro uses multiple statements, make sure is enclosed in a 'do { .. } while (0)' block so it can be used as a single statement.
|
||||
//#define IM_ASSERT(_EXPR) MyAssert(_EXPR)
|
||||
//#define IM_ASSERT(_EXPR) ((void)(_EXPR)) // Disable asserts
|
||||
|
||||
//---- Define attributes of all API symbols declarations, e.g. for DLL under Windows
|
||||
// Using dear imgui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility.
|
||||
//#define IMGUI_API __declspec( dllexport )
|
||||
//#define IMGUI_API __declspec( dllimport )
|
||||
|
||||
//---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to avoid using soon-to-be obsolete function/names.
|
||||
//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
||||
|
||||
//---- Disable all of Dear ImGui or don't implement standard windows.
|
||||
// It is very strongly recommended to NOT disable the demo windows during development. Please read comments in imgui_demo.cpp.
|
||||
//#define IMGUI_DISABLE // Disable everything: all headers and source files will be empty.
|
||||
//#define IMGUI_DISABLE_DEMO_WINDOWS // Disable demo windows: ShowDemoWindow()/ShowStyleEditor() will be empty. Not recommended.
|
||||
//#define IMGUI_DISABLE_METRICS_WINDOW // Disable debug/metrics window: ShowMetricsWindow() will be empty.
|
||||
|
||||
//---- Don't implement some functions to reduce linkage requirements.
|
||||
//#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS // [Win32] Don't implement default clipboard handler. Won't use and link with OpenClipboard/GetClipboardData/CloseClipboard etc.
|
||||
//#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS // [Win32] Don't implement default IME handler. Won't use and link with ImmGetContext/ImmSetCompositionWindow.
|
||||
//#define IMGUI_DISABLE_WIN32_FUNCTIONS // [Win32] Won't use and link with any Win32 function (clipboard, ime).
|
||||
//#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS // [OSX] Implement default OSX clipboard handler (need to link with '-framework ApplicationServices', this is why this is not the default).
|
||||
//#define IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS // Don't implement ImFormatString/ImFormatStringV so you can implement them yourself (e.g. if you don't want to link with vsnprintf)
|
||||
//#define IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS // Don't implement ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 so you can implement them yourself.
|
||||
//#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite so you can implement them yourself if you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function.
|
||||
//#define IMGUI_DISABLE_DEFAULT_ALLOCATORS // Don't implement default allocators calling malloc()/free() to avoid linking with them. You will need to call ImGui::SetAllocatorFunctions().
|
||||
|
||||
//---- Include imgui_user.h at the end of imgui.h as a convenience
|
||||
//#define IMGUI_INCLUDE_IMGUI_USER_H
|
||||
|
||||
//---- Pack colors to BGRA8 instead of RGBA8 (to avoid converting from one to another)
|
||||
//#define IMGUI_USE_BGRA_PACKED_COLOR
|
||||
|
||||
//---- Use 32-bit for ImWchar (default is 16-bit) to support full unicode code points.
|
||||
//#define IMGUI_USE_WCHAR32
|
||||
|
||||
//---- Avoid multiple STB libraries implementations, or redefine path/filenames to prioritize another version
|
||||
// By default the embedded implementations are declared static and not available outside of imgui cpp files.
|
||||
//#define IMGUI_STB_TRUETYPE_FILENAME "my_folder/stb_truetype.h"
|
||||
//#define IMGUI_STB_RECT_PACK_FILENAME "my_folder/stb_rect_pack.h"
|
||||
//#define IMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION
|
||||
//#define IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION
|
||||
|
||||
//---- Unless IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS is defined, use the much faster STB sprintf library implementation of vsnprintf instead of the one from the default C library.
|
||||
// Note that stb_sprintf.h is meant to be provided by the user and available in the include path at compile time. Also, the compatibility checks of the arguments and formats done by clang and GCC will be disabled in order to support the extra formats provided by STB sprintf.
|
||||
// #define IMGUI_USE_STB_SPRINTF
|
||||
|
||||
//---- Define constructor and implicit cast operators to convert back<>forth between your math types and ImVec2/ImVec4.
|
||||
// This will be inlined as part of ImVec2 and ImVec4 class declarations.
|
||||
/*
|
||||
#define IM_VEC2_CLASS_EXTRA \
|
||||
ImVec2(const MyVec2& f) { x = f.x; y = f.y; } \
|
||||
operator MyVec2() const { return MyVec2(x,y); }
|
||||
|
||||
#define IM_VEC4_CLASS_EXTRA \
|
||||
ImVec4(const MyVec4& f) { x = f.x; y = f.y; z = f.z; w = f.w; } \
|
||||
operator MyVec4() const { return MyVec4(x,y,z,w); }
|
||||
*/
|
||||
|
||||
//---- Use 32-bit vertex indices (default is 16-bit) is one way to allow large meshes with more than 64K vertices.
|
||||
// Your renderer back-end will need to support it (most example renderer back-ends support both 16/32-bit indices).
|
||||
// Another way to allow large meshes while keeping 16-bit indices is to handle ImDrawCmd::VtxOffset in your renderer.
|
||||
// Read about ImGuiBackendFlags_RendererHasVtxOffset for details.
|
||||
//#define ImDrawIdx unsigned int
|
||||
|
||||
//---- Override ImDrawCallback signature (will need to modify renderer back-ends accordingly)
|
||||
//struct ImDrawList;
|
||||
//struct ImDrawCmd;
|
||||
//typedef void (*MyImDrawCallback)(const ImDrawList* draw_list, const ImDrawCmd* cmd, void* my_renderer_user_data);
|
||||
//#define ImDrawCallback MyImDrawCallback
|
||||
|
||||
//---- Debug Tools: Macro to break in Debugger
|
||||
// (use 'Metrics->Tools->Item Picker' to pick widgets with the mouse and break into them for easy debugging.)
|
||||
//#define IM_DEBUG_BREAK IM_ASSERT(0)
|
||||
//#define IM_DEBUG_BREAK __debugbreak()
|
||||
|
||||
//---- Debug Tools: Have the Item Picker break in the ItemAdd() function instead of ItemHoverable(),
|
||||
// (which comes earlier in the code, will catch a few extra items, allow picking items other than Hovered one.)
|
||||
// This adds a small runtime cost which is why it is not enabled by default.
|
||||
//#define IMGUI_DEBUG_TOOL_ITEM_PICKER_EX
|
||||
|
||||
//---- Debug Tools: Enable slower asserts
|
||||
//#define IMGUI_DEBUG_PARANOID
|
||||
|
||||
//---- Tip: You can add extra functions within the ImGui:: namespace, here or in your own headers files.
|
||||
/*
|
||||
namespace ImGui
|
||||
{
|
||||
void MyFunction(const char* name, const MyMatrix44& v);
|
||||
}
|
||||
*/
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,639 @@
|
||||
// [DEAR IMGUI]
|
||||
// This is a slightly modified version of stb_rect_pack.h 1.00.
|
||||
// Those changes would need to be pushed into nothings/stb:
|
||||
// - Added STBRP__CDECL
|
||||
// Grep for [DEAR IMGUI] to find the changes.
|
||||
|
||||
// stb_rect_pack.h - v1.00 - public domain - rectangle packing
|
||||
// Sean Barrett 2014
|
||||
//
|
||||
// Useful for e.g. packing rectangular textures into an atlas.
|
||||
// Does not do rotation.
|
||||
//
|
||||
// Not necessarily the awesomest packing method, but better than
|
||||
// the totally naive one in stb_truetype (which is primarily what
|
||||
// this is meant to replace).
|
||||
//
|
||||
// Has only had a few tests run, may have issues.
|
||||
//
|
||||
// More docs to come.
|
||||
//
|
||||
// No memory allocations; uses qsort() and assert() from stdlib.
|
||||
// Can override those by defining STBRP_SORT and STBRP_ASSERT.
|
||||
//
|
||||
// This library currently uses the Skyline Bottom-Left algorithm.
|
||||
//
|
||||
// Please note: better rectangle packers are welcome! Please
|
||||
// implement them to the same API, but with a different init
|
||||
// function.
|
||||
//
|
||||
// Credits
|
||||
//
|
||||
// Library
|
||||
// Sean Barrett
|
||||
// Minor features
|
||||
// Martins Mozeiko
|
||||
// github:IntellectualKitty
|
||||
//
|
||||
// Bugfixes / warning fixes
|
||||
// Jeremy Jaussaud
|
||||
// Fabian Giesen
|
||||
//
|
||||
// Version history:
|
||||
//
|
||||
// 1.00 (2019-02-25) avoid small space waste; gracefully fail too-wide rectangles
|
||||
// 0.99 (2019-02-07) warning fixes
|
||||
// 0.11 (2017-03-03) return packing success/fail result
|
||||
// 0.10 (2016-10-25) remove cast-away-const to avoid warnings
|
||||
// 0.09 (2016-08-27) fix compiler warnings
|
||||
// 0.08 (2015-09-13) really fix bug with empty rects (w=0 or h=0)
|
||||
// 0.07 (2015-09-13) fix bug with empty rects (w=0 or h=0)
|
||||
// 0.06 (2015-04-15) added STBRP_SORT to allow replacing qsort
|
||||
// 0.05: added STBRP_ASSERT to allow replacing assert
|
||||
// 0.04: fixed minor bug in STBRP_LARGE_RECTS support
|
||||
// 0.01: initial release
|
||||
//
|
||||
// LICENSE
|
||||
//
|
||||
// See end of file for license information.
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// INCLUDE SECTION
|
||||
//
|
||||
|
||||
#ifndef STB_INCLUDE_STB_RECT_PACK_H
|
||||
#define STB_INCLUDE_STB_RECT_PACK_H
|
||||
|
||||
#define STB_RECT_PACK_VERSION 1
|
||||
|
||||
#ifdef STBRP_STATIC
|
||||
#define STBRP_DEF static
|
||||
#else
|
||||
#define STBRP_DEF extern
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct stbrp_context stbrp_context;
|
||||
typedef struct stbrp_node stbrp_node;
|
||||
typedef struct stbrp_rect stbrp_rect;
|
||||
|
||||
#ifdef STBRP_LARGE_RECTS
|
||||
typedef int stbrp_coord;
|
||||
#else
|
||||
typedef unsigned short stbrp_coord;
|
||||
#endif
|
||||
|
||||
STBRP_DEF int stbrp_pack_rects (stbrp_context *context, stbrp_rect *rects, int num_rects);
|
||||
// Assign packed locations to rectangles. The rectangles are of type
|
||||
// 'stbrp_rect' defined below, stored in the array 'rects', and there
|
||||
// are 'num_rects' many of them.
|
||||
//
|
||||
// Rectangles which are successfully packed have the 'was_packed' flag
|
||||
// set to a non-zero value and 'x' and 'y' store the minimum location
|
||||
// on each axis (i.e. bottom-left in cartesian coordinates, top-left
|
||||
// if you imagine y increasing downwards). Rectangles which do not fit
|
||||
// have the 'was_packed' flag set to 0.
|
||||
//
|
||||
// You should not try to access the 'rects' array from another thread
|
||||
// while this function is running, as the function temporarily reorders
|
||||
// the array while it executes.
|
||||
//
|
||||
// To pack into another rectangle, you need to call stbrp_init_target
|
||||
// again. To continue packing into the same rectangle, you can call
|
||||
// this function again. Calling this multiple times with multiple rect
|
||||
// arrays will probably produce worse packing results than calling it
|
||||
// a single time with the full rectangle array, but the option is
|
||||
// available.
|
||||
//
|
||||
// The function returns 1 if all of the rectangles were successfully
|
||||
// packed and 0 otherwise.
|
||||
|
||||
struct stbrp_rect
|
||||
{
|
||||
// reserved for your use:
|
||||
int id;
|
||||
|
||||
// input:
|
||||
stbrp_coord w, h;
|
||||
|
||||
// output:
|
||||
stbrp_coord x, y;
|
||||
int was_packed; // non-zero if valid packing
|
||||
|
||||
}; // 16 bytes, nominally
|
||||
|
||||
|
||||
STBRP_DEF void stbrp_init_target (stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes);
|
||||
// Initialize a rectangle packer to:
|
||||
// pack a rectangle that is 'width' by 'height' in dimensions
|
||||
// using temporary storage provided by the array 'nodes', which is 'num_nodes' long
|
||||
//
|
||||
// You must call this function every time you start packing into a new target.
|
||||
//
|
||||
// There is no "shutdown" function. The 'nodes' memory must stay valid for
|
||||
// the following stbrp_pack_rects() call (or calls), but can be freed after
|
||||
// the call (or calls) finish.
|
||||
//
|
||||
// Note: to guarantee best results, either:
|
||||
// 1. make sure 'num_nodes' >= 'width'
|
||||
// or 2. call stbrp_allow_out_of_mem() defined below with 'allow_out_of_mem = 1'
|
||||
//
|
||||
// If you don't do either of the above things, widths will be quantized to multiples
|
||||
// of small integers to guarantee the algorithm doesn't run out of temporary storage.
|
||||
//
|
||||
// If you do #2, then the non-quantized algorithm will be used, but the algorithm
|
||||
// may run out of temporary storage and be unable to pack some rectangles.
|
||||
|
||||
STBRP_DEF void stbrp_setup_allow_out_of_mem (stbrp_context *context, int allow_out_of_mem);
|
||||
// Optionally call this function after init but before doing any packing to
|
||||
// change the handling of the out-of-temp-memory scenario, described above.
|
||||
// If you call init again, this will be reset to the default (false).
|
||||
|
||||
|
||||
STBRP_DEF void stbrp_setup_heuristic (stbrp_context *context, int heuristic);
|
||||
// Optionally select which packing heuristic the library should use. Different
|
||||
// heuristics will produce better/worse results for different data sets.
|
||||
// If you call init again, this will be reset to the default.
|
||||
|
||||
enum
|
||||
{
|
||||
STBRP_HEURISTIC_Skyline_default=0,
|
||||
STBRP_HEURISTIC_Skyline_BL_sortHeight = STBRP_HEURISTIC_Skyline_default,
|
||||
STBRP_HEURISTIC_Skyline_BF_sortHeight
|
||||
};
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// the details of the following structures don't matter to you, but they must
|
||||
// be visible so you can handle the memory allocations for them
|
||||
|
||||
struct stbrp_node
|
||||
{
|
||||
stbrp_coord x,y;
|
||||
stbrp_node *next;
|
||||
};
|
||||
|
||||
struct stbrp_context
|
||||
{
|
||||
int width;
|
||||
int height;
|
||||
int align;
|
||||
int init_mode;
|
||||
int heuristic;
|
||||
int num_nodes;
|
||||
stbrp_node *active_head;
|
||||
stbrp_node *free_head;
|
||||
stbrp_node extra[2]; // we allocate two extra nodes so optimal user-node-count is 'width' not 'width+2'
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// IMPLEMENTATION SECTION
|
||||
//
|
||||
|
||||
#ifdef STB_RECT_PACK_IMPLEMENTATION
|
||||
#ifndef STBRP_SORT
|
||||
#include <stdlib.h>
|
||||
#define STBRP_SORT qsort
|
||||
#endif
|
||||
|
||||
#ifndef STBRP_ASSERT
|
||||
#include <assert.h>
|
||||
#define STBRP_ASSERT assert
|
||||
#endif
|
||||
|
||||
// [DEAR IMGUI] Added STBRP__CDECL
|
||||
#ifdef _MSC_VER
|
||||
#define STBRP__NOTUSED(v) (void)(v)
|
||||
#define STBRP__CDECL __cdecl
|
||||
#else
|
||||
#define STBRP__NOTUSED(v) (void)sizeof(v)
|
||||
#define STBRP__CDECL
|
||||
#endif
|
||||
|
||||
enum
|
||||
{
|
||||
STBRP__INIT_skyline = 1
|
||||
};
|
||||
|
||||
STBRP_DEF void stbrp_setup_heuristic(stbrp_context *context, int heuristic)
|
||||
{
|
||||
switch (context->init_mode) {
|
||||
case STBRP__INIT_skyline:
|
||||
STBRP_ASSERT(heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight || heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight);
|
||||
context->heuristic = heuristic;
|
||||
break;
|
||||
default:
|
||||
STBRP_ASSERT(0);
|
||||
}
|
||||
}
|
||||
|
||||
STBRP_DEF void stbrp_setup_allow_out_of_mem(stbrp_context *context, int allow_out_of_mem)
|
||||
{
|
||||
if (allow_out_of_mem)
|
||||
// if it's ok to run out of memory, then don't bother aligning them;
|
||||
// this gives better packing, but may fail due to OOM (even though
|
||||
// the rectangles easily fit). @TODO a smarter approach would be to only
|
||||
// quantize once we've hit OOM, then we could get rid of this parameter.
|
||||
context->align = 1;
|
||||
else {
|
||||
// if it's not ok to run out of memory, then quantize the widths
|
||||
// so that num_nodes is always enough nodes.
|
||||
//
|
||||
// I.e. num_nodes * align >= width
|
||||
// align >= width / num_nodes
|
||||
// align = ceil(width/num_nodes)
|
||||
|
||||
context->align = (context->width + context->num_nodes-1) / context->num_nodes;
|
||||
}
|
||||
}
|
||||
|
||||
STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes)
|
||||
{
|
||||
int i;
|
||||
#ifndef STBRP_LARGE_RECTS
|
||||
STBRP_ASSERT(width <= 0xffff && height <= 0xffff);
|
||||
#endif
|
||||
|
||||
for (i=0; i < num_nodes-1; ++i)
|
||||
nodes[i].next = &nodes[i+1];
|
||||
nodes[i].next = NULL;
|
||||
context->init_mode = STBRP__INIT_skyline;
|
||||
context->heuristic = STBRP_HEURISTIC_Skyline_default;
|
||||
context->free_head = &nodes[0];
|
||||
context->active_head = &context->extra[0];
|
||||
context->width = width;
|
||||
context->height = height;
|
||||
context->num_nodes = num_nodes;
|
||||
stbrp_setup_allow_out_of_mem(context, 0);
|
||||
|
||||
// node 0 is the full width, node 1 is the sentinel (lets us not store width explicitly)
|
||||
context->extra[0].x = 0;
|
||||
context->extra[0].y = 0;
|
||||
context->extra[0].next = &context->extra[1];
|
||||
context->extra[1].x = (stbrp_coord) width;
|
||||
#ifdef STBRP_LARGE_RECTS
|
||||
context->extra[1].y = (1<<30);
|
||||
#else
|
||||
context->extra[1].y = 65535;
|
||||
#endif
|
||||
context->extra[1].next = NULL;
|
||||
}
|
||||
|
||||
// find minimum y position if it starts at x1
|
||||
static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0, int width, int *pwaste)
|
||||
{
|
||||
stbrp_node *node = first;
|
||||
int x1 = x0 + width;
|
||||
int min_y, visited_width, waste_area;
|
||||
|
||||
STBRP__NOTUSED(c);
|
||||
|
||||
STBRP_ASSERT(first->x <= x0);
|
||||
|
||||
#if 0
|
||||
// skip in case we're past the node
|
||||
while (node->next->x <= x0)
|
||||
++node;
|
||||
#else
|
||||
STBRP_ASSERT(node->next->x > x0); // we ended up handling this in the caller for efficiency
|
||||
#endif
|
||||
|
||||
STBRP_ASSERT(node->x <= x0);
|
||||
|
||||
min_y = 0;
|
||||
waste_area = 0;
|
||||
visited_width = 0;
|
||||
while (node->x < x1) {
|
||||
if (node->y > min_y) {
|
||||
// raise min_y higher.
|
||||
// we've accounted for all waste up to min_y,
|
||||
// but we'll now add more waste for everything we've visted
|
||||
waste_area += visited_width * (node->y - min_y);
|
||||
min_y = node->y;
|
||||
// the first time through, visited_width might be reduced
|
||||
if (node->x < x0)
|
||||
visited_width += node->next->x - x0;
|
||||
else
|
||||
visited_width += node->next->x - node->x;
|
||||
} else {
|
||||
// add waste area
|
||||
int under_width = node->next->x - node->x;
|
||||
if (under_width + visited_width > width)
|
||||
under_width = width - visited_width;
|
||||
waste_area += under_width * (min_y - node->y);
|
||||
visited_width += under_width;
|
||||
}
|
||||
node = node->next;
|
||||
}
|
||||
|
||||
*pwaste = waste_area;
|
||||
return min_y;
|
||||
}
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int x,y;
|
||||
stbrp_node **prev_link;
|
||||
} stbrp__findresult;
|
||||
|
||||
static stbrp__findresult stbrp__skyline_find_best_pos(stbrp_context *c, int width, int height)
|
||||
{
|
||||
int best_waste = (1<<30), best_x, best_y = (1 << 30);
|
||||
stbrp__findresult fr;
|
||||
stbrp_node **prev, *node, *tail, **best = NULL;
|
||||
|
||||
// align to multiple of c->align
|
||||
width = (width + c->align - 1);
|
||||
width -= width % c->align;
|
||||
STBRP_ASSERT(width % c->align == 0);
|
||||
|
||||
// if it can't possibly fit, bail immediately
|
||||
if (width > c->width || height > c->height) {
|
||||
fr.prev_link = NULL;
|
||||
fr.x = fr.y = 0;
|
||||
return fr;
|
||||
}
|
||||
|
||||
node = c->active_head;
|
||||
prev = &c->active_head;
|
||||
while (node->x + width <= c->width) {
|
||||
int y,waste;
|
||||
y = stbrp__skyline_find_min_y(c, node, node->x, width, &waste);
|
||||
if (c->heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight) { // actually just want to test BL
|
||||
// bottom left
|
||||
if (y < best_y) {
|
||||
best_y = y;
|
||||
best = prev;
|
||||
}
|
||||
} else {
|
||||
// best-fit
|
||||
if (y + height <= c->height) {
|
||||
// can only use it if it first vertically
|
||||
if (y < best_y || (y == best_y && waste < best_waste)) {
|
||||
best_y = y;
|
||||
best_waste = waste;
|
||||
best = prev;
|
||||
}
|
||||
}
|
||||
}
|
||||
prev = &node->next;
|
||||
node = node->next;
|
||||
}
|
||||
|
||||
best_x = (best == NULL) ? 0 : (*best)->x;
|
||||
|
||||
// if doing best-fit (BF), we also have to try aligning right edge to each node position
|
||||
//
|
||||
// e.g, if fitting
|
||||
//
|
||||
// ____________________
|
||||
// |____________________|
|
||||
//
|
||||
// into
|
||||
//
|
||||
// | |
|
||||
// | ____________|
|
||||
// |____________|
|
||||
//
|
||||
// then right-aligned reduces waste, but bottom-left BL is always chooses left-aligned
|
||||
//
|
||||
// This makes BF take about 2x the time
|
||||
|
||||
if (c->heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight) {
|
||||
tail = c->active_head;
|
||||
node = c->active_head;
|
||||
prev = &c->active_head;
|
||||
// find first node that's admissible
|
||||
while (tail->x < width)
|
||||
tail = tail->next;
|
||||
while (tail) {
|
||||
int xpos = tail->x - width;
|
||||
int y,waste;
|
||||
STBRP_ASSERT(xpos >= 0);
|
||||
// find the left position that matches this
|
||||
while (node->next->x <= xpos) {
|
||||
prev = &node->next;
|
||||
node = node->next;
|
||||
}
|
||||
STBRP_ASSERT(node->next->x > xpos && node->x <= xpos);
|
||||
y = stbrp__skyline_find_min_y(c, node, xpos, width, &waste);
|
||||
if (y + height <= c->height) {
|
||||
if (y <= best_y) {
|
||||
if (y < best_y || waste < best_waste || (waste==best_waste && xpos < best_x)) {
|
||||
best_x = xpos;
|
||||
STBRP_ASSERT(y <= best_y);
|
||||
best_y = y;
|
||||
best_waste = waste;
|
||||
best = prev;
|
||||
}
|
||||
}
|
||||
}
|
||||
tail = tail->next;
|
||||
}
|
||||
}
|
||||
|
||||
fr.prev_link = best;
|
||||
fr.x = best_x;
|
||||
fr.y = best_y;
|
||||
return fr;
|
||||
}
|
||||
|
||||
static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, int width, int height)
|
||||
{
|
||||
// find best position according to heuristic
|
||||
stbrp__findresult res = stbrp__skyline_find_best_pos(context, width, height);
|
||||
stbrp_node *node, *cur;
|
||||
|
||||
// bail if:
|
||||
// 1. it failed
|
||||
// 2. the best node doesn't fit (we don't always check this)
|
||||
// 3. we're out of memory
|
||||
if (res.prev_link == NULL || res.y + height > context->height || context->free_head == NULL) {
|
||||
res.prev_link = NULL;
|
||||
return res;
|
||||
}
|
||||
|
||||
// on success, create new node
|
||||
node = context->free_head;
|
||||
node->x = (stbrp_coord) res.x;
|
||||
node->y = (stbrp_coord) (res.y + height);
|
||||
|
||||
context->free_head = node->next;
|
||||
|
||||
// insert the new node into the right starting point, and
|
||||
// let 'cur' point to the remaining nodes needing to be
|
||||
// stiched back in
|
||||
|
||||
cur = *res.prev_link;
|
||||
if (cur->x < res.x) {
|
||||
// preserve the existing one, so start testing with the next one
|
||||
stbrp_node *next = cur->next;
|
||||
cur->next = node;
|
||||
cur = next;
|
||||
} else {
|
||||
*res.prev_link = node;
|
||||
}
|
||||
|
||||
// from here, traverse cur and free the nodes, until we get to one
|
||||
// that shouldn't be freed
|
||||
while (cur->next && cur->next->x <= res.x + width) {
|
||||
stbrp_node *next = cur->next;
|
||||
// move the current node to the free list
|
||||
cur->next = context->free_head;
|
||||
context->free_head = cur;
|
||||
cur = next;
|
||||
}
|
||||
|
||||
// stitch the list back in
|
||||
node->next = cur;
|
||||
|
||||
if (cur->x < res.x + width)
|
||||
cur->x = (stbrp_coord) (res.x + width);
|
||||
|
||||
#ifdef _DEBUG
|
||||
cur = context->active_head;
|
||||
while (cur->x < context->width) {
|
||||
STBRP_ASSERT(cur->x < cur->next->x);
|
||||
cur = cur->next;
|
||||
}
|
||||
STBRP_ASSERT(cur->next == NULL);
|
||||
|
||||
{
|
||||
int count=0;
|
||||
cur = context->active_head;
|
||||
while (cur) {
|
||||
cur = cur->next;
|
||||
++count;
|
||||
}
|
||||
cur = context->free_head;
|
||||
while (cur) {
|
||||
cur = cur->next;
|
||||
++count;
|
||||
}
|
||||
STBRP_ASSERT(count == context->num_nodes+2);
|
||||
}
|
||||
#endif
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
// [DEAR IMGUI] Added STBRP__CDECL
|
||||
static int STBRP__CDECL rect_height_compare(const void *a, const void *b)
|
||||
{
|
||||
const stbrp_rect *p = (const stbrp_rect *) a;
|
||||
const stbrp_rect *q = (const stbrp_rect *) b;
|
||||
if (p->h > q->h)
|
||||
return -1;
|
||||
if (p->h < q->h)
|
||||
return 1;
|
||||
return (p->w > q->w) ? -1 : (p->w < q->w);
|
||||
}
|
||||
|
||||
// [DEAR IMGUI] Added STBRP__CDECL
|
||||
static int STBRP__CDECL rect_original_order(const void *a, const void *b)
|
||||
{
|
||||
const stbrp_rect *p = (const stbrp_rect *) a;
|
||||
const stbrp_rect *q = (const stbrp_rect *) b;
|
||||
return (p->was_packed < q->was_packed) ? -1 : (p->was_packed > q->was_packed);
|
||||
}
|
||||
|
||||
#ifdef STBRP_LARGE_RECTS
|
||||
#define STBRP__MAXVAL 0xffffffff
|
||||
#else
|
||||
#define STBRP__MAXVAL 0xffff
|
||||
#endif
|
||||
|
||||
STBRP_DEF int stbrp_pack_rects(stbrp_context *context, stbrp_rect *rects, int num_rects)
|
||||
{
|
||||
int i, all_rects_packed = 1;
|
||||
|
||||
// we use the 'was_packed' field internally to allow sorting/unsorting
|
||||
for (i=0; i < num_rects; ++i) {
|
||||
rects[i].was_packed = i;
|
||||
}
|
||||
|
||||
// sort according to heuristic
|
||||
STBRP_SORT(rects, num_rects, sizeof(rects[0]), rect_height_compare);
|
||||
|
||||
for (i=0; i < num_rects; ++i) {
|
||||
if (rects[i].w == 0 || rects[i].h == 0) {
|
||||
rects[i].x = rects[i].y = 0; // empty rect needs no space
|
||||
} else {
|
||||
stbrp__findresult fr = stbrp__skyline_pack_rectangle(context, rects[i].w, rects[i].h);
|
||||
if (fr.prev_link) {
|
||||
rects[i].x = (stbrp_coord) fr.x;
|
||||
rects[i].y = (stbrp_coord) fr.y;
|
||||
} else {
|
||||
rects[i].x = rects[i].y = STBRP__MAXVAL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// unsort
|
||||
STBRP_SORT(rects, num_rects, sizeof(rects[0]), rect_original_order);
|
||||
|
||||
// set was_packed flags and all_rects_packed status
|
||||
for (i=0; i < num_rects; ++i) {
|
||||
rects[i].was_packed = !(rects[i].x == STBRP__MAXVAL && rects[i].y == STBRP__MAXVAL);
|
||||
if (!rects[i].was_packed)
|
||||
all_rects_packed = 0;
|
||||
}
|
||||
|
||||
// return the all_rects_packed status
|
||||
return all_rects_packed;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
------------------------------------------------------------------------------
|
||||
This software is available under 2 licenses -- choose whichever you prefer.
|
||||
------------------------------------------------------------------------------
|
||||
ALTERNATIVE A - MIT License
|
||||
Copyright (c) 2017 Sean Barrett
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
this software and associated documentation files (the "Software"), to deal in
|
||||
the Software without restriction, including without limitation the rights to
|
||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
||||
of the Software, and to permit persons to whom the Software is furnished to do
|
||||
so, subject to the following conditions:
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
------------------------------------------------------------------------------
|
||||
ALTERNATIVE B - Public Domain (www.unlicense.org)
|
||||
This is free and unencumbered software released into the public domain.
|
||||
Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
|
||||
software, either in source code form or as a compiled binary, for any purpose,
|
||||
commercial or non-commercial, and by any means.
|
||||
In jurisdictions that recognize copyright laws, the author or authors of this
|
||||
software dedicate any and all copyright interest in the software to the public
|
||||
domain. We make this dedication for the benefit of the public at large and to
|
||||
the detriment of our heirs and successors. We intend this dedication to be an
|
||||
overt act of relinquishment in perpetuity of all present and future rights to
|
||||
this software under copyright law.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
------------------------------------------------------------------------------
|
||||
*/
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,24 @@
|
||||
project(
|
||||
'Dear ImGui core library',
|
||||
'cpp',
|
||||
license : 'MIT',
|
||||
version : '1.78-WIP-tables-fe3637fa607257ff83bf61092d2173f83b311527',
|
||||
)
|
||||
|
||||
dearimgui_inc = include_directories('.')
|
||||
dearimgui_src = files(
|
||||
'imgui.cpp',
|
||||
'imgui_draw.cpp',
|
||||
'imgui_widgets.cpp',
|
||||
)
|
||||
|
||||
dearimgui_lib = static_library(
|
||||
'dearimgui',
|
||||
dearimgui_src,
|
||||
include_directories : dearimgui_inc,
|
||||
)
|
||||
|
||||
dearimgui_dep = declare_dependency(
|
||||
link_with : dearimgui_lib,
|
||||
include_directories : dearimgui_inc,
|
||||
)
|
||||
Loading…
Reference in New Issue