From 091202589c787ccceb58d8a77167e3312ed80347 Mon Sep 17 00:00:00 2001 From: Kenneth Lorthioir Date: Wed, 8 Feb 2017 19:00:16 -0500 Subject: [PATCH] Removed DX9 Rasterizer in windows. This doesn't seem to be needed anymore and the code to free the unused rasterizer was throwing a memory violation since it was getting set to a value somehow. --- platform/windows/os_windows.cpp | 7 ------- platform/windows/os_windows.h | 1 - 2 files changed, 8 deletions(-) diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index b230dda9cbc..0e0231139e9 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 2c8fa64f8ee..fb708854f01 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;