diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-05 09:18:03 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-05 09:18:03 -0300 |
| commit | 495d059a744b268b0355d0cbfbb9ef30fec865e2 (patch) | |
| tree | 96c7cc2c4bcf3a1f2c62a18ddbe2aaa7a42a44ed /platform/windows | |
| parent | 0f7af4ea51744cda23c4d3c7481f9c332973d1d4 (diff) | |
| parent | e39a6242ac1c503a3c35f40c8a44296fa9df28cb (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/os_windows.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 11e5fd1387..84db94db23 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1087,13 +1087,15 @@ void OS_Windows::initialize(const VideoMode& p_desired,int p_video_driver,int p_ RasterizerGLES3::make_current(); #else - #ifdef DX9_ENABLED + // FIXME: Does DX support still work now that rasterizer is no longer used? +#ifdef DX9_ENABLED rasterizer = memnew( RasterizerDX9(hWnd) ); - #endif +#endif #endif visual_server = memnew( VisualServerRaster ); - //if (get_render_thread_mode()!=RENDER_THREAD_UNSAFE) { + // FIXME: Reimplement threaded rendering? Or remove? +// if (get_render_thread_mode()!=RENDER_THREAD_UNSAFE) { // // visual_server =memnew(VisualServerWrapMT(visual_server,get_render_thread_mode()==RENDER_SEPARATE_THREAD)); // } |