Conversation
- Introduced a new CMake option `USE_FLUX` to enable FLUX.2 image generation. - Updated `CMakeLists.txt` to conditionally include the cflux2 library based on the new option. - Added FLUX-related cvars and commands in `cl_main.c` for image generation control. - Implemented `R_ReloadTexture` function in both OpenGL and Vulkan renderers to reload textures from disk. - Enhanced documentation in `README.md` to include details about FLUX.2 image generation features and usage. - Updated renderer initialization to support texture reload functionality across both OpenGL and Vulkan backends.
- Enhanced README.md to clarify FLUX.2 and FLUX.1 image generation options, including support for different model variants. - Modified cl_main.c to implement separate directories for FLUX model variants, improving organization and clarity in model path handling. - Updated default FLUX model variant to "flux1-schnell" for better user experience.
- Introduced a helper function `CL_FluxFileExists` to verify the existence of model files, enhancing error handling for model loading. - Updated the logic in `CL_FluxGetModelPath` to check for the presence of the "flux2-dev" directory before falling back to the default "flux" directory, improving user experience and clarity. - Enhanced asynchronous job initialization in `CL_FluxGenerate_f` to ensure all parameters are set before marking the job as running, preventing potential race conditions. - Added warnings for missing FLUX.1 model files, guiding users to download them manually or switch to FLUX.2 if necessary.
- Implemented logic in `compile_engine.sh` to copy the `flux_cli` executable from the build directory to the release directory, improving deployment ease. - Introduced new cvars in `cl_main.c` for external FLUX generation, allowing users to choose between in-process and external CLI execution, enhancing stability. - Added helper functions for shell argument escaping and CLI path finding, improving command execution reliability. - Enhanced error handling in the FLUX generation process to provide clearer feedback on failures, improving user experience.
- Introduced a new step in the GitHub Actions workflow to ensure the cflux2 sources are available by cloning the repository if the directory does not exist. - This addition enhances the build process by automating the retrieval of necessary external dependencies, improving build reliability and consistency.
- Eliminated redundant steps in the GitHub Actions workflow that ensured the availability of cflux2 sources by cloning the repository. This streamlines the build process and reduces unnecessary checks, as the sources are now assumed to be managed externally.
- Introduced cflux2 as a new subproject, allowing for better management of external dependencies within the build system. This addition enhances the overall structure and maintainability of the project.
- Eliminated redundant `submodules: recursive` options from the `actions/checkout@v4` steps in the build workflow. This streamlines the workflow by assuming that submodules are managed externally, improving build efficiency.
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
- Updated the GitHub Actions build workflow to include SDL2 include and library paths, enhancing the configuration for projects that depend on SDL2. This change improves build accuracy and ensures that the necessary SDL2 resources are correctly referenced during the build process.
…ensors - Added Windows-specific file handling and memory mapping functions in `flux_safetensors.c` to support proper file operations on Windows systems. - Introduced a new `safetensors_get_file_size` function for improved file size retrieval. - Updated `safetensors_open` to handle file opening and memory mapping differently based on the platform, enhancing cross-platform compatibility. - Modified `safetensors_file_t` structure to include handles for Windows-specific file management.
- Updated the CMake configuration to always include the cflux2 subdirectory when USE_FLUX is enabled, removing the previous Windows-specific skip condition. - Adjusted the linking of the cflux2 library to ensure it is only linked if the target exists, improving build robustness.
- Changed the linking of libraries in the CMake configuration to use PRIVATE visibility for qcommon, botlib, client, q3ui, OpenAL, and Vulkan/OpenGL. This improves encapsulation and ensures that these dependencies are not exposed to other targets, enhancing build integrity.
…ries - Modified the CMake configuration to apply PRIVATE visibility for libraries linked to both the dedicated server and client executables, including qcommon, botlib, winmm, comctl32, ws2_32, and m. This change enhances encapsulation and ensures that these dependencies are not exposed to other targets, improving build integrity.
- Renamed the memory mapping function to `safetensors_mmap_fd` for clarity and updated the handling of file size to use a 64-bit integer for compatibility. - Introduced a new `safetensors_unmap` function to centralize unmapping and resource cleanup, improving code maintainability. - Updated `safetensors_open` and `safetensors_close` to utilize the new unmap function, ensuring proper resource management across platforms.
- Updated the GitHub Actions build workflow to include the `-DCI_BUILD=OFF` flag for all CMake build commands, ensuring consistent behavior across different build types. - Improved type safety in Vulkan renderer by casting size comparisons to `size_t` in `vk_vbo.c`, preventing potential overflow issues. - Added clang diagnostic pragmas in `vm_aarch64.c` to suppress specific warnings, enhancing code clarity and maintainability. - Refined conditional checks in `tr_world.c` to ensure proper type comparison for node contents, improving code robustness.
- Added SDL2::Core linkage and include directories for the client target in CMake, improving dependency management. - Updated error messages in `flux.c` to limit the length of file paths displayed, enhancing clarity and preventing potential overflow issues. - Improved file handling in `terminals.c` for Windows compatibility by conditionally using `mkstemp`, ensuring consistent behavior across platforms. - Refactored type handling in `tr_surface.c`, `tr_vbo.c`, and `tr_world.c` to improve code safety and maintainability by using appropriate type casts and const qualifiers.
- Enhanced CMakeLists.txt to conditionally include SDL2 directories based on availability, improving flexibility in build configurations. - Added a static variable in cl_curl.c to prevent unused variable warnings when CURL is not used. - Initialized jpeg_decompress_struct in cl_jpeg.c to zero for better safety. - Updated cl_main.c to handle SDL thread management conditionally, ensuring proper cleanup and error handling in flux operations.
- Updated error messages in `flux.c` to shorten file path displays, enhancing clarity and preventing overflow issues. - Changed static variable declaration to an enum in `cl_curl.c` for better type safety when CURL is not used. - Added MSVC-specific pragmas in `psy.c` and `vorbisfile.c` to suppress warnings, improving code maintainability. - Marked several functions in `vm_x86.c` as unused to prevent compiler warnings, enhancing code cleanliness.
- Added conditional compilation for SDL support in `cl_main.c`, improving thread management for flux generation. - Updated parameter logging in `CL_FluxGenerationThread` to use `long long` for seed values, enhancing precision. - Modified CMakeLists.txt to improve shader header generation command and suppress specific compiler warnings for better compatibility across compilers. - Added unused parameter suppression in JPEG handling files to clean up warnings and improve code quality.
- Changed the static variable declaration in `snd_codec_ogg.c` to an enum for better type safety. - Updated `CMakeLists.txt` for `flux_cli` to conditionally include `linenoise.c` based on the platform, improving compatibility. - Added custom `linenoise` implementation in `flux_cli.c` when `FLUX_CLI_NO_LINENOISE` is defined, enhancing flexibility in command line input handling. - Improved type safety in `win_syscon.c` by casting buffer lengths to `size_t`, preventing potential overflow issues.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.