dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable threaded rendering when showing widget outlines

Browse Source 
Because these are drawn outside the window boundary, so it is not
technically thread-safe due to non-deterministic drawing order
This commit is contained in:
Jonathan G Rennison
2024-02-04 01:53:30 +00:00
parent 16589041f2
commit b2b96fff13
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/viewport.cpp
View File

@@ -3965,7 +3965,8 @@ void ViewportDoDraw(Viewport *vp, int left, int top, int right, int bottom, uint
} }
_viewport_drawer_jobs++; _viewport_drawer_jobs++;
if (unlikely(HasBit(_viewport_debug_flags, VDF_DISABLE_THREAD))) { extern bool _draw_widget_outlines;
if (unlikely(_draw_widget_outlines || HasBit(_viewport_debug_flags, VDF_DISABLE_THREAD))) {
ViewportDoDrawRenderJob(vp, _vdd.release()); ViewportDoDrawRenderJob(vp, _vdd.release());
} else { } else {
_general_worker_pool.EnqueueJob([](void *data1, void *data2, void *data3) { _general_worker_pool.EnqueueJob([](void *data1, void *data2, void *data3) {
@@ -4021,7 +4022,8 @@ static void ViewportDoDrawRenderJob(Viewport *vp, ViewportDrawerDynamic *vdd)
vdd->draw_jobs_active.store((uint)vdd->parent_sprite_sets.size(), std::memory_order_relaxed); vdd->draw_jobs_active.store((uint)vdd->parent_sprite_sets.size(), std::memory_order_relaxed);
for (uint i = 1; i < (uint)vdd->parent_sprite_sets.size(); i++) { for (uint i = 1; i < (uint)vdd->parent_sprite_sets.size(); i++) {
if (unlikely(HasBit(_viewport_debug_flags, VDF_DISABLE_THREAD))) { extern bool _draw_widget_outlines;
if (unlikely(_draw_widget_outlines || HasBit(_viewport_debug_flags, VDF_DISABLE_THREAD))) {
ViewportDoDrawRenderSubJob(vp, vdd, i); ViewportDoDrawRenderSubJob(vp, vdd, i);
} else { } else {
_general_worker_pool.EnqueueJob([](void *data1, void *data2, void *data3) { _general_worker_pool.EnqueueJob([](void *data1, void *data2, void *data3) {