Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
WinRT: made use of SDL's framebuffer emulation code, instead of the c…
Browse files Browse the repository at this point in the history 
…ustom stuff; then removed SDL_winrtrenderer
  • Loading branch information
@DavidLudwig
DavidLudwig committed Feb 10, 2013
1 parent 3bf8f38 commit 73440f6
Show file tree
Hide file tree
Showing 11 changed files with 6 additions and 356 deletions.
14 changes: 0 additions & 14 deletions VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj
View file
Expand Up @@ -248,9 +248,7 @@
<ClInclude Include="..\..\src\video\windowsrt\SDLmain_WinRT_common.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_WinRTApp.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtevents_c.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtframebuffer_c.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtmouse.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtrenderer.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtvideo.h" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -366,24 +364,12 @@
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtframebuffer.cpp">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtmouse.cpp">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtrenderer.cpp">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtvideo.cpp">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
Expand Down
12 changes: 0 additions & 12 deletions VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters
View file
Expand Up @@ -333,15 +333,9 @@
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtevents_c.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtframebuffer_c.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtmouse.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtrenderer.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtvideo.h">
<Filter>Source Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -593,15 +587,9 @@
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtevents.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtframebuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtmouse.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtrenderer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtvideo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
18 changes: 0 additions & 18 deletions VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj
View file
Expand Up @@ -151,14 +151,6 @@
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</CompileAsWinRT>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtframebuffer.cpp">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</CompileAsWinRT>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtmouse.cpp">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
Expand All @@ -167,14 +159,6 @@
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</CompileAsWinRT>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtrenderer.cpp">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</CompileAsWinRT>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtvideo.cpp">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
Expand Down Expand Up @@ -293,9 +277,7 @@
<ClInclude Include="..\..\src\video\windowsrt\SDLmain_WinRT_common.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_WinRTApp.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtevents_c.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtframebuffer_c.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtmouse.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtrenderer.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtvideo.h" />
</ItemGroup>
<ItemGroup>
Expand Down
12 changes: 0 additions & 12 deletions VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters
View file
Expand Up @@ -234,15 +234,9 @@
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtevents.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtframebuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtmouse.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtrenderer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\video\windowsrt\SDL_winrtvideo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -356,9 +350,6 @@
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtevents_c.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtframebuffer_c.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\render\SDL_yuv_sw_c.h">
<Filter>Source Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -578,9 +569,6 @@
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtmouse.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtrenderer.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\video\windowsrt\SDL_winrtvideo.h">
<Filter>Source Files</Filter>
</ClInclude>
Expand Down
20 changes: 2 additions & 18 deletions src/video/windowsrt/SDL_WinRTApp.cpp
View file
@@ -1,5 +1,6 @@
#include "SDLmain_WinRT_common.h"
#include "SDL_WinRTApp.h"
#include "ppltasks.h"

extern "C" {
#include "SDL_assert.h"
Expand Down Expand Up @@ -47,8 +48,7 @@ SDL_WinRTApp::SDL_WinRTApp() :
m_windowClosed(false),
m_windowVisible(true),
m_sdlWindowData(NULL),
m_useRelativeMouseMode(false),
m_renderer(nullptr)
m_useRelativeMouseMode(false)
{
}

Expand All @@ -62,8 +62,6 @@ void SDL_WinRTApp::Initialize(CoreApplicationView^ applicationView)

CoreApplication::Resuming +=
ref new EventHandler<Platform::Object^>(this, &SDL_WinRTApp::OnResuming);

m_renderer = ref new SDL_winrtrenderer();
}

void SDL_WinRTApp::SetWindow(CoreWindow^ window)
Expand Down Expand Up @@ -136,15 +134,6 @@ void SDL_WinRTApp::PumpEvents()
}
}

void SDL_WinRTApp::UpdateWindowFramebuffer(SDL_Surface * surface, SDL_Rect * rects, int numrects)
{
if (!m_windowClosed && m_windowVisible)
{
m_renderer->Render(surface, rects, numrects);
m_renderer->Present(); // This call is synchronized to the display frame rate.
}
}

void SDL_WinRTApp::Uninitialize()
{
}
Expand Down Expand Up @@ -649,11 +638,6 @@ void SDL_WinRTApp::SetSDLWindowData(const SDL_WindowData* windowData)
m_sdlWindowData = windowData;
}

void SDL_WinRTApp::ResizeMainTexture(int w, int h)
{
m_renderer->ResizeMainTexture(w, h);
}

IFrameworkView^ Direct3DApplicationSource::CreateView()
{
// TODO, WinRT: see if this function (CreateView) can ever get called
Expand Down
6 changes: 0 additions & 6 deletions src/video/windowsrt/SDL_WinRTApp.h
View file
Expand Up @@ -2,7 +2,6 @@

#include "SDLmain_WinRT_common.h"
#include "SDL_winrtvideo.h"
#include "SDL_winrtrenderer.h"
#include <vector>

using namespace Windows::UI::Core;
Expand All @@ -27,8 +26,6 @@ ref class SDL_WinRTApp sealed : public Windows::ApplicationModel::Core::IFramewo
bool HasSDLWindowData() const;
void SetRelativeMouseMode(bool enable);
void SetSDLWindowData(const SDL_WindowData * windowData);
void UpdateWindowFramebuffer(SDL_Surface * surface, SDL_Rect * rects, int numrects);
void ResizeMainTexture(int w, int h);
Windows::Foundation::Point TransformCursor(Windows::Foundation::Point rawPosition);

protected:
Expand All @@ -47,9 +44,6 @@ ref class SDL_WinRTApp sealed : public Windows::ApplicationModel::Core::IFramewo
void OnKeyDown(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args);
void OnKeyUp(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args);

internal:
SDL_winrtrenderer^ m_renderer;

private:
bool m_windowClosed;
bool m_windowVisible;
Expand Down
104 changes: 0 additions & 104 deletions src/video/windowsrt/SDL_winrtframebuffer.cpp
View file

This file was deleted.

27 changes: 0 additions & 27 deletions src/video/windowsrt/SDL_winrtframebuffer_c.h
View file

This file was deleted.

0 comments on commit 73440f6

Please sign in to comment.