diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-12 23:23:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-12 23:23:34 +0100 |
| commit | dc5f978f2867e90b37e39fda44eb38016021384c (patch) | |
| tree | 03a0f64cdd04caec55b65a616ca31773389ef477 /platform/windows | |
| parent | b2db9279fac9fa4e8a6891d269e6758a9231722c (diff) | |
| parent | 091202589c787ccceb58d8a77167e3312ed80347 (diff) | |
Merge pull request #7770 from Limb/removedx9
Removed DX9 Rasterizer in windows
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/os_windows.cpp | 7 | ||||
| -rw-r--r-- | platform/windows/os_windows.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index d26575d338..ffb9bd3bc4 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1092,11 +1092,6 @@ void OS_Windows::initialize(const VideoMode& p_desired,int p_video_driver,int p_ RasterizerGLES3::register_config(); RasterizerGLES3::make_current(); -#else - // FIXME: Does DX support still work now that rasterizer is no longer used? -#ifdef DX9_ENABLED - rasterizer = memnew( RasterizerDX9(hWnd) ); -#endif #endif visual_server = memnew( VisualServerRaster ); @@ -1268,8 +1263,6 @@ void OS_Windows::finalize() { if (gl_context) memdelete(gl_context); #endif - if (rasterizer) - memdelete(rasterizer); if (user_proc) { SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)user_proc); diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index 4314b340ce..73a2d5f451 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -92,7 +92,6 @@ class OS_Windows : public OS { ContextGL_Win *gl_context; #endif VisualServer *visual_server; - Rasterizer *rasterizer; PhysicsServer *physics_server; Physics2DServer *physics_2d_server; int pressrc; |