diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-05 08:37:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 08:37:06 +0100 |
| commit | e39a6242ac1c503a3c35f40c8a44296fa9df28cb (patch) | |
| tree | 2679fbc9347eb5096a3e04ee1152db8654ecbea1 /platform/windows/os_windows.cpp | |
| parent | d8e54b1e2620be99a3f1fdc7df11009f5a107eaa (diff) | |
| parent | 5e717ed8a38dee1b6c722ad0827a764d45089cdb (diff) | |
Merge pull request #7429 from BastiaanOlij/glew3-osx
Fixing compilation errors for gles3 for Mac OS X
Diffstat (limited to 'platform/windows/os_windows.cpp')
| -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 445f4fc328..cfa73b5e0e 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)); // } |