diff --git a/LICENSE b/LICENSE index 08cd0c4..07d960c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ MIT License - Copyright (c) 2022-2024 kbz_8 + Copyright (c) 2022-2026 kbz_8 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile index 1770e0b..6e5033f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ MAKE = make --no-print-directory OS ?= $(shell uname -s) DEBUG ?= false TOOLCHAIN ?= clang -FORCE_INTEGRATED_GPU ?= false GRAPHICS_MEMORY_DUMP ?= false PROFILER ?= false FORCE_WAYLAND ?= false @@ -64,10 +63,6 @@ else CXXFLAGS += -O3 endif -ifeq ($(FORCE_INTEGRATED_GPU), true) - _ENABLEDFLAGS += FORCE_INTEGRATED_GPU -endif - ifeq ($(GRAPHICS_MEMORY_DUMP), true) _ENABLEDFLAGS += GRAPHICS_MEMORY_DUMP endif diff --git a/README.md b/README.md index 4c9cd71..83bbaa7 100644 --- a/README.md +++ b/README.md @@ -103,9 +103,6 @@ MacroLibX has a strong safety support, mainly by checking every pointer that you ### 🛠️ Set the toolchain If you want to use `GCC` to build the mlx you can use `make TOOLCHAIN=gcc` -### 🖥️ Force the integrated GPU (not recommended) -You can force the mlx to use your integrated GPU by using `make FORCE_INTEGRATED_GPU=true`. Note that there are a lot of chances that your application crashes by using that. - ### 💽 Dump the graphics memory The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `make GRAPHICS_MEMORY_DUMP=true`. diff --git a/XMAKE_BUILD.md b/XMAKE_BUILD.md index 0bfd5a6..c687d53 100644 --- a/XMAKE_BUILD.md +++ b/XMAKE_BUILD.md @@ -16,9 +16,6 @@ MacroLibX has a strong safety support, mainly by checking every pointer that you ### 🛠️ Set the toolchain To change the compilation toolchain you can use `xmake config --toolchain=[gcc|clang|...]` -### 🖥️ Force the integrated GPU (not recommended) -You can force the mlx to use your integrated GPU using `xmake config --force_integrated_gpu=y`. Note that there are a lot of chances that your application crashes by using that. - ### 💽 Dump the graphics memory The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `xmake config --graphics_memory_dump=y`. diff --git a/includes/mlx_profile.h b/includes/mlx_profile.h index e150e4d..eb61453 100644 --- a/includes/mlx_profile.h +++ b/includes/mlx_profile.h @@ -206,7 +206,7 @@ typedef void (*mlx_function)(void); -#define MLX_VERSION MLX_MAKE_VERSION(2, 2, 0) +#define MLX_VERSION MLX_MAKE_VERSION(2, 2, 3) #define MLX_TARGET_VULKAN_API_VERSION MLX_MAKE_VERSION(1, 0, 0) // Checking common assumptions diff --git a/meson.build b/meson.build index a8e6aa7..a1a6f0d 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('MacroLibX', ['c', 'cpp'], - version : '2.2.2', + version : '2.2.3', license : 'MIT', meson_version : '>= 1.9.0', default_options : ['warning_level=2', 'optimization=3', 'cpp_std=c++20']) @@ -9,10 +9,6 @@ add_project_arguments('-Wno-error=', language : 'c') add_project_arguments('-fPIC', language : 'c') add_project_arguments('-DSDL_MAIN_HANDLED', language : 'c') -if get_option('force_integrated_gpu') - add_project_arguments('-DFORCE_INTEGRATED_GPU', language : 'c') -endif - if get_option('graphics_memory_dump') add_project_arguments('-DGRAPHICS_MEMORY_DUMP', language : 'c') endif diff --git a/meson_options.txt b/meson_options.txt index c943a18..7327869 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,9 +1,3 @@ -option('force_integrated_gpu', - type : 'boolean', - value : false, - description : 'Force the application to use the integrated GPU if available.' -) - option('graphics_memory_dump', type : 'boolean', value : false, diff --git a/scripts/fetch_dependencies.sh b/scripts/fetch_dependencies.sh index ba8a0aa..d046787 100755 --- a/scripts/fetch_dependencies.sh +++ b/scripts/fetch_dependencies.sh @@ -21,6 +21,6 @@ rm vulkan-headers.zip # Update KVF rm -f ../third_party/kvf.h -git clone https://github.com/Kbz-8/KVF.git ../third_party/KVF/ +git clone https://git.kbz8.me/kbz_8/KVF.git ../third_party/KVF/ mv ../third_party/KVF/kvf.h ../third_party/kvf.h rm -rf ../third_party/KVF diff --git a/xmake.lua b/xmake.lua index b56789e..7f18f0a 100644 --- a/xmake.lua +++ b/xmake.lua @@ -11,11 +11,6 @@ set_targetdir("./") set_optimize("fastest") -- Options -option("force_integrated_gpu") - set_default(false) - add_defines("FORCE_INTEGRATED_GPU") -option_end() - option("graphics_memory_dump") set_default(false) add_defines("GRAPHICS_MEMORY_DUMP") @@ -42,7 +37,6 @@ target("mlx") set_default(true) set_license("MIT") set_kind("shared") - add_options("force_integrated_gpu") add_options("graphics_memory_dump") add_options("profiler") add_options("force_wayland")