Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 908 vs 909 for /trunk/Source Code/Platform/Video/OpenGL/GLWrapper.cpp

Diff revisions: vs.
  @@ -16,8 +16,10 @@
16 16 #include "Platform/Video/OpenGL/Buffers/Headers/glMemoryManager.h"
17 17
18 18 #include "GUI/Headers/GUIText.h"
19 + #include "Core/Headers/Kernel.h"
19 20 #include "Core/Headers/Console.h"
20 21 #include "Core/Headers/Application.h"
22 + #include "Core/Headers/PlatformContext.h"
21 23 #include "Core/Time/Headers/ProfileTimer.h"
22 24 #include "Utility/Headers/Localization.h"
23 25 #include "Geometry/Material/Headers/Material.h"
  @@ -73,13 +75,13 @@
73 75
74 76 _hardwareQueries.reserve(g_performanceQueryCount);
75 77 for (U32 i = 0; i < g_performanceQueryCount; ++i) {
76 - _hardwareQueries.emplace_back(MemoryManager_NEW glHardwareQueryRing(g_performanceQueryRingLength));
78 + _hardwareQueries.emplace_back(std::make_shared<glHardwareQueryRing>(context, g_performanceQueryRingLength));
77 79 }
78 80 }
79 81
80 82 GL_API::~GL_API()
81 83 {
82 - MemoryManager::DELETE_VECTOR(_hardwareQueries);
84 + _hardwareQueries.clear();
83 85 }
84 86
85 87 /// FontStash library initialization
  @@ -117,7 +119,7 @@
117 119 // Swap buffers
118 120 if (swapBuffers) {
119 121 Time::ScopedTimer time(_swapBufferTimer);
120 - SDL_GL_SwapWindow(Application::instance().windowManager().getActiveWindow().getRawWindow());
122 + SDL_GL_SwapWindow(_context.parent().platformContext().app().windowManager().getActiveWindow().getRawWindow());
121 123 }
122 124
123 125 // End the timing query started in beginFrame() in debug builds