Commit 9c126183 authored by Sam Lantinga's avatar Sam Lantinga

Removed partially functional renderers

--HG--
extra : rebase_source : 3fc2560c02393bf9e7c46360fc24f2585c9409be
parent 886e9476
...@@ -855,14 +855,6 @@ ...@@ -855,14 +855,6 @@
RelativePath="..\..\src\video\SDL_gamma.c" RelativePath="..\..\src\video\SDL_gamma.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\windows\SDL_gdirender.c"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_gdirender.h"
>
</File>
<File <File
RelativePath="..\..\src\events\SDL_gesture.c" RelativePath="..\..\src\events\SDL_gesture.c"
> >
......
...@@ -842,14 +842,6 @@ ...@@ -842,14 +842,6 @@
RelativePath="..\..\src\video\SDL_gamma.c" RelativePath="..\..\src\video\SDL_gamma.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\windows\SDL_gdirender.c"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_gdirender.h"
>
</File>
<File <File
RelativePath="..\..\src\events\SDL_gesture.c" RelativePath="..\..\src\events\SDL_gesture.c"
> >
......
...@@ -296,7 +296,6 @@ echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_r ...@@ -296,7 +296,6 @@ echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_r
<ClInclude Include="..\..\src\SDL_error_c.h" /> <ClInclude Include="..\..\src\SDL_error_c.h" />
<ClInclude Include="..\..\src\events\SDL_events_c.h" /> <ClInclude Include="..\..\src\events\SDL_events_c.h" />
<ClInclude Include="..\..\src\SDL_fatal.h" /> <ClInclude Include="..\..\src\SDL_fatal.h" />
<ClInclude Include="..\..\src\video\windows\SDL_gdirender.h" />
<ClInclude Include="..\..\src\video\SDL_glesfuncs.h" /> <ClInclude Include="..\..\src\video\SDL_glesfuncs.h" />
<ClInclude Include="..\..\src\video\SDL_glfuncs.h" /> <ClInclude Include="..\..\src\video\SDL_glfuncs.h" />
<ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" /> <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
...@@ -401,7 +400,6 @@ echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_r ...@@ -401,7 +400,6 @@ echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_r
<ClCompile Include="..\..\src\SDL_fatal.c" /> <ClCompile Include="..\..\src\SDL_fatal.c" />
<ClCompile Include="..\..\src\video\SDL_fillrect.c" /> <ClCompile Include="..\..\src\video\SDL_fillrect.c" />
<ClCompile Include="..\..\src\video\SDL_gamma.c" /> <ClCompile Include="..\..\src\video\SDL_gamma.c" />
<ClCompile Include="..\..\src\video\windows\SDL_gdirender.c" />
<ClCompile Include="..\..\src\stdlib\SDL_getenv.c" /> <ClCompile Include="..\..\src\stdlib\SDL_getenv.c" />
<ClCompile Include="..\..\src\haptic\SDL_haptic.c" /> <ClCompile Include="..\..\src\haptic\SDL_haptic.c" />
<ClCompile Include="..\..\src\stdlib\SDL_iconv.c" /> <ClCompile Include="..\..\src\stdlib\SDL_iconv.c" />
......
...@@ -1322,12 +1322,6 @@ AC_HELP_STRING([--enable-video-x11-xdamage-xfixes], [enable X11 Xdamage and Xfix ...@@ -1322,12 +1322,6 @@ AC_HELP_STRING([--enable-video-x11-xdamage-xfixes], [enable X11 Xdamage and Xfix
AC_DEFINE(SDL_VIDEO_DRIVER_X11_XDAMAGE) AC_DEFINE(SDL_VIDEO_DRIVER_X11_XDAMAGE)
AC_DEFINE(SDL_VIDEO_DRIVER_X11_XFIXES) AC_DEFINE(SDL_VIDEO_DRIVER_X11_XFIXES)
fi fi
AC_ARG_ENABLE(render-x11,
AC_HELP_STRING([--enable-render-x11], [enable the X11 render driver [[default=yes]]]),
, enable_render_x11=yes)
if test x$enable_render_x11 = xyes; then
AC_DEFINE(SDL_VIDEO_RENDER_X11)
fi
fi fi
fi fi
} }
...@@ -2351,12 +2345,6 @@ case "$host" in ...@@ -2351,12 +2345,6 @@ case "$host" in
AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS) AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS)
SOURCES="$SOURCES $srcdir/src/video/windows/*.c" SOURCES="$SOURCES $srcdir/src/video/windows/*.c"
have_video=yes have_video=yes
AC_ARG_ENABLE(render-gdi,
AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]),
, enable_render_gdi=yes)
if test x$enable_render_gdi = xyes; then
AC_DEFINE(SDL_VIDEO_RENDER_GDI)
fi
AC_ARG_ENABLE(render-gapi, AC_ARG_ENABLE(render-gapi,
AC_HELP_STRING([--enable-render-gapi], [enable the GAPI/RAWFRAMEBUFFER render driver [[default=yes]]]), AC_HELP_STRING([--enable-render-gapi], [enable the GAPI/RAWFRAMEBUFFER render driver [[default=yes]]]),
, enable_render_gapi=yes) , enable_render_gapi=yes)
...@@ -2457,12 +2445,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau ...@@ -2457,12 +2445,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS) AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS)
SOURCES="$SOURCES $srcdir/src/video/windows/*.c" SOURCES="$SOURCES $srcdir/src/video/windows/*.c"
have_video=yes have_video=yes
AC_ARG_ENABLE(render-gdi,
AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]),
, enable_render_gdi=yes)
if test x$enable_render_gdi = xyes; then
AC_DEFINE(SDL_VIDEO_RENDER_GDI)
fi
AC_ARG_ENABLE(render-d3d, AC_ARG_ENABLE(render-d3d,
AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[default=yes]]]), AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[default=yes]]]),
, enable_render_d3d=yes) , enable_render_d3d=yes)
......
...@@ -285,10 +285,8 @@ ...@@ -285,10 +285,8 @@
#undef SDL_VIDEO_DRIVER_X11_XSHAPE #undef SDL_VIDEO_DRIVER_X11_XSHAPE
#undef SDL_VIDEO_RENDER_D3D #undef SDL_VIDEO_RENDER_D3D
#undef SDL_VIDEO_RENDER_GDI
#undef SDL_VIDEO_RENDER_OGL #undef SDL_VIDEO_RENDER_OGL
#undef SDL_VIDEO_RENDER_OGL_ES #undef SDL_VIDEO_RENDER_OGL_ES
#undef SDL_VIDEO_RENDER_X11
#undef SDL_VIDEO_RENDER_GAPI #undef SDL_VIDEO_RENDER_GAPI
#undef SDL_VIDEO_RENDER_DDRAW #undef SDL_VIDEO_RENDER_DDRAW
......
...@@ -151,9 +151,6 @@ ...@@ -151,9 +151,6 @@
#ifndef SDL_VIDEO_RENDER_OGL #ifndef SDL_VIDEO_RENDER_OGL
#define SDL_VIDEO_RENDER_OGL 1 #define SDL_VIDEO_RENDER_OGL 1
#endif #endif
#ifndef SDL_VIDEO_RENDER_X11
#define SDL_VIDEO_RENDER_X11 1
#endif
/* Enable OpenGL support */ /* Enable OpenGL support */
#ifndef SDL_VIDEO_OPENGL #ifndef SDL_VIDEO_OPENGL
......
...@@ -187,9 +187,6 @@ typedef unsigned int uintptr_t; ...@@ -187,9 +187,6 @@ typedef unsigned int uintptr_t;
#define SDL_VIDEO_RENDER_D3D 1 #define SDL_VIDEO_RENDER_D3D 1
#endif #endif
#endif #endif
#ifndef SDL_VIDEO_RENDER_GDI
#define SDL_VIDEO_RENDER_GDI 1
#endif
/* Enable OpenGL support */ /* Enable OpenGL support */
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
......
This diff is collapsed.
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997-2010 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Sam Lantinga
slouken@libsdl.org
*/
#include "SDL_config.h"
/* SDL surface based renderer implementation */
#if SDL_VIDEO_RENDER_GDI
extern void GDI_AddRenderDriver(_THIS);
#endif
/* vi: set ts=4 sw=4 expandtab: */
...@@ -225,9 +225,6 @@ WIN_VideoInit(_THIS) ...@@ -225,9 +225,6 @@ WIN_VideoInit(_THIS)
#if SDL_VIDEO_RENDER_DDRAW #if SDL_VIDEO_RENDER_DDRAW
DDRAW_AddRenderDriver(_this); DDRAW_AddRenderDriver(_this);
#endif #endif
#if SDL_VIDEO_RENDER_GDI
GDI_AddRenderDriver(_this);
#endif
#if SDL_VIDEO_RENDER_GAPI #if SDL_VIDEO_RENDER_GAPI
WINCE_AddRenderDriver(_this); WINCE_AddRenderDriver(_this);
#endif #endif
......
This diff is collapsed.
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997-2010 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Sam Lantinga
slouken@libsdl.org
*/
#include "SDL_config.h"
/* SDL surface based renderer implementation */
#if SDL_VIDEO_RENDER_X11
extern void X11_AddRenderDriver(_THIS);
#endif
/* vi: set ts=4 sw=4 expandtab: */
...@@ -350,10 +350,6 @@ X11_VideoInit(_THIS) ...@@ -350,10 +350,6 @@ X11_VideoInit(_THIS)
return -1; return -1;
} }
#if SDL_VIDEO_RENDER_X11
X11_AddRenderDriver(_this);
#endif
if (X11_InitKeyboard(_this) != 0) { if (X11_InitKeyboard(_this) != 0) {
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment