mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-13 02:47:48 +00:00
8ab5c31e75
The GL backend is gone (task #53). The wgpu/non-wgpu folder split and the Wgpu* class prefix were both disambiguation artefacts from the overlap period — now pure dead weight. ## Folder + library merge * `src/ifcviewer-wgpu/` → folded into `src/ifcviewer/` (git mv tracks every file as a rename so blame/log history survives). * `src/ifcviewer-wgpu-minimal/` → `src/ifcviewer-minimal/` (the exe was already named `IfcViewerMinimal`; this just brings the folder + CMake target name into line). * `src/ifcviewer-wgpu/tests/test_wgpu_{selection,visibility}.cpp` → `src/ifcviewer/tests/test_{selection,visibility}.cpp`, folded into the existing `add_ifcviewer_unit_test(...)` helper. * The `IfcViewerWgpu` static library is dissolved — its sources become part of the unified `IfcViewer` static library, which now bundles scene/loader + renderer in one target. The pre-merge circular dependency (IfcViewer linking IfcViewerWgpu just to get the ViewportWindow.h include path that SceneLoader.h needs) goes away. * The wgpu-native FetchContent block, the Cocoa/QuartzCore link on Apple, the OBJCXX-enabled `.mm` source, and the wgpu-native runtime install all move into `src/ifcviewer/CMakeLists.txt` unchanged. ## Type renames (Wgpu prefix dropped from every Wgpu* identifier) WgpuAreaMeasurement → AreaMeasurement WgpuBufferPool → BufferPool WgpuLengthMeasurement → LengthMeasurement WgpuMetalSurface → MetalSurface WgpuModelGpuData → ModelGpuData WgpuOverlayFrame → OverlayFrame WgpuOverlayRenderer → OverlayRenderer WgpuSectionPlane → SectionPlane WgpuSelectionState → SelectionState WgpuStreamingLoader → StreamingLoader WgpuStreamingThread → StreamingThread WgpuViewportWindow → ViewportWindow WgpuVisibilityState → VisibilityState CMake target IfcViewerWgpuMinimal → IfcViewerMinimal (exe name was already this since wgpu shipped as default). Deliberately kept: `onWgpuLog` (wgpu-native log callback — names a binding to an external API, not one of *our* types), and the WGPU* enum/struct prefixes from wgpu-native's own headers. `WgpuMemProbe` lives in the separate `src/wgpu-mem-probe/` standalone diagnostic project and isn't touched. ## Include-path updates Every `#include "../ifcviewer-wgpu/Wgpu<X>.h"` → `"../ifcviewer/<X>.h"`, every in-directory `#include "Wgpu<X>.h"` → `"<X>.h"`. Includes from sibling subdirectories (modules/, etc.) are updated to point at `../../../ifcviewer/` instead of `../../../ifcviewer-wgpu/`. ## cmake/CMakeLists.txt simplification The redundant `add_subdirectory(ifcviewer-wgpu)` blocks (one inside the BUILD_BONSAIVIEWER fan-in, one in the BONSAIVIEWER-less standalone block) collapse into a single unconditional `add_subdirectory(../src/ifcviewer ifcviewer)`. The standalone block keeps only `wgpu-mem-probe` (the diagnostic tool, unrelated to the viewer lib). ## Verification * Full build green: `IfcViewer` static lib, `IfcViewerMinimal` exe, `BonsaiViewer` exe, all four pre-existing ifcviewer unit tests, and the two new-location tests (`test_selection`, `test_visibility`). * No stray `Wgpu<X>` identifier remains across `src/ifcviewer/`, `src/bonsaiviewer/`, `src/ifcviewer-minimal/` (verified by grep). * Renames tracked by git as `R` entries — `git log --follow` on ViewportWindow.cpp etc. continues to show history through the move. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
101 lines
4.4 KiB
C++
101 lines
4.4 KiB
C++
/********************************************************************************
|
|
* *
|
|
* This file is part of IfcOpenShell. *
|
|
* *
|
|
* IfcOpenShell is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the Lesser GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3.0 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* IfcOpenShell is distributed in the hope that it will be useful, *
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
|
* Lesser GNU General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the Lesser GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
* *
|
|
********************************************************************************/
|
|
|
|
#ifndef WGPUSTREAMINGTHREAD_H
|
|
#define WGPUSTREAMINGTHREAD_H
|
|
|
|
#include <condition_variable>
|
|
#include <cstdint>
|
|
#include <deque>
|
|
#include <mutex>
|
|
#include <string>
|
|
#include <thread>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
// Worker thread for scatter-gather chunk reads. Decouples disk I/O
|
|
// (~tens of ms per chunk on SSD, hundreds on slower media) from the
|
|
// render thread. The viewport's per-frame driveStreamingLoads enqueues
|
|
// requests for non-resident-frustum-visible chunks, drains any
|
|
// completed Results on subsequent frames, and only performs the
|
|
// GPU-side (pool.alloc + queueWriteBuffer + bind-group build) work
|
|
// on the main thread — wgpu queue ops aren't thread-safe.
|
|
//
|
|
// Lifetime: start() spawns the worker; stop() signals shutdown and
|
|
// joins. The Result destructor releases its byte vectors back to the
|
|
// heap, so dropping unclaimed Results (e.g. when their model was
|
|
// unloaded mid-flight) is a free operation.
|
|
class StreamingThread {
|
|
public:
|
|
struct Request {
|
|
uint32_t model_id;
|
|
std::size_t chunk_idx;
|
|
std::string file_path;
|
|
uint64_t vertex_section_offset;
|
|
uint64_t index_section_offset;
|
|
// (section-relative byte_offset, byte_size)
|
|
std::vector<std::pair<uint64_t, uint64_t>> v_ranges;
|
|
// (first_u32, count_u32)
|
|
std::vector<std::pair<uint64_t, uint64_t>> i_ranges;
|
|
};
|
|
|
|
struct Result {
|
|
uint32_t model_id;
|
|
std::size_t chunk_idx;
|
|
bool success;
|
|
std::vector<uint8_t> vbytes;
|
|
std::vector<uint32_t> idx;
|
|
};
|
|
|
|
~StreamingThread();
|
|
|
|
// Spawn the worker thread. Safe to call once; subsequent calls are
|
|
// no-ops while the worker is alive.
|
|
void start();
|
|
// Signal shutdown, wake the worker, join. Idempotent. Must be
|
|
// called before the BufferPool the results would upload into
|
|
// is destroyed.
|
|
void stop();
|
|
|
|
// Enqueue a request. Returns false if the worker has stopped.
|
|
bool enqueue(Request req);
|
|
// Move all completed results out of the result queue. Always
|
|
// non-blocking; if nothing is ready, returns an empty vector.
|
|
std::vector<Result> drainResults();
|
|
|
|
// Approximate count of requests still in flight (in queue or
|
|
// currently being processed). Useful for the bench warm gate to
|
|
// know when streaming has truly settled.
|
|
std::size_t inFlightApprox() const;
|
|
|
|
private:
|
|
void workerLoop();
|
|
|
|
std::thread worker_;
|
|
mutable std::mutex mu_;
|
|
std::condition_variable cv_;
|
|
std::deque<Request> requests_;
|
|
std::deque<Result> results_;
|
|
bool in_progress_ = false;
|
|
bool shutdown_ = false;
|
|
bool running_ = false;
|
|
};
|
|
|
|
#endif // WGPUSTREAMINGTHREAD_H
|