Skip to content

Commit 3001171

Browse files
committed
251044e: drv3d: fixed missing destroy_cached_window_data() for macOS
1 parent 0f4a84f commit 3001171

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

prog/engine/drv/drv3d_pc_multi/init.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,3 +629,7 @@ static class __Drv3dVtableInit
629629
}
630630
static void na_func() { DAG_FATAL("D3DI function not implemented"); }
631631
} __drv3d_vtable_init;
632+
633+
#if _TARGET_PC_MACOSX && !USE_MULTI_D3D_Metal
634+
void destroy_cached_window_data(void *) {}
635+
#endif

prog/engine/drv/drv3d_stub/d3d_stub.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1952,3 +1952,7 @@ void d3d::stop_capture() {}
19521952

19531953
#define CHECK_MAIN_THREAD()
19541954
#include "frameStateTM.inc.cpp"
1955+
1956+
#if _TARGET_PC_MACOSX && !defined(_TARGET_WAS_MULTI)
1957+
void destroy_cached_window_data(void *) {}
1958+
#endif

prog/tools/sceneTools/dbldUtil/dbldDeps.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,3 @@ void custom_get_land_min_max(BBox2, float &out_min, float &out_max)
700700
// stub it
701701
#include <eventLog/eventLog.h>
702702
void event_log::send_udp(const char *, const void *, uint32_t, Json::Value *) {}
703-
704-
#if _TARGET_PC_MACOSX
705-
void destroy_cached_window_data(void *) {}
706-
#endif

0 commit comments

Comments
 (0)