Merge pull request xbmc#6561 from FernetMenta/sdlopengl

SDL clean-up - remove HAS_SDL_OPENGL
mkortstiege · Mar 2, 2015 · 5a7ab40 · 5a7ab40
2 parents f3fe6fb + a55b387
commit 5a7ab40
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 274 deletions.
diff --git a/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj b/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj
@@ -63,7 +63,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
       </PrecompiledHeader>

diff --git a/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj b/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj
@@ -63,7 +63,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
       </PrecompiledHeader>

diff --git a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj b/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj
@@ -63,7 +63,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
       </PrecompiledHeader>

diff --git a/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj b/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj
@@ -63,7 +63,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
       </PrecompiledHeader>

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -807,7 +807,7 @@ bool CApplication::CreateGUI()
 
   uint32_t sdlFlags = 0;
 
-#if (defined(HAS_SDL_OPENGL) || (HAS_GLES == 2)) && !defined(HAS_GLX)
+#if defined(TARGET_DARWIN_OSX)
   sdlFlags |= SDL_INIT_VIDEO;
 #endif
 

diff --git a/xbmc/addons/AddonDll.h b/xbmc/addons/AddonDll.h
@@ -101,8 +101,6 @@ CAddonDll<TheDll, TheStruct, TheProps>::CAddonDll(const cp_extension_t *ext)
   m_strLibName = CAddonMgr::Get().GetExtValue(ext->configuration, "@library_android");
 #elif defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
     m_strLibName = CAddonMgr::Get().GetExtValue(ext->configuration, "@library_linux");
-#elif defined(TARGET_WINDOWS) && defined(HAS_SDL_OPENGL)
-    m_strLibName = CAddonMgr::Get().GetExtValue(ext->configuration, "@library_wingl");
 #elif defined(TARGET_WINDOWS) && defined(HAS_DX)
     m_strLibName = CAddonMgr::Get().GetExtValue(ext->configuration, "@library_windx");
 #elif defined(TARGET_DARWIN)

diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
@@ -141,8 +141,6 @@ AddonPtr CAddonMgr::Factory(const cp_extension_t *props)
           tograb = "@library_android";
 #elif defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
           tograb = "@library_linux";
-#elif defined(TARGET_WINDOWS) && defined(HAS_SDL_OPENGL)
-          tograb = "@library_wingl";
 #elif defined(TARGET_WINDOWS) && defined(HAS_DX)
           tograb = "@library_windx";
 #elif defined(TARGET_DARWIN)
@@ -794,8 +792,6 @@ bool CAddonMgr::PlatformSupportsAddon(const cp_plugin_info_t *plugin) const
       if (*platform == "android")
 #elif defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
       if (*platform == "linux")
-#elif defined(TARGET_WINDOWS) && defined(HAS_SDL_OPENGL)
-      if (*platform == "wingl")
 #elif defined(TARGET_WINDOWS) && defined(HAS_DX)
       if (*platform == "windx")
 #elif defined(TARGET_DARWIN_OSX)

diff --git a/xbmc/system.h b/xbmc/system.h
@@ -144,7 +144,6 @@
   #if defined(TARGET_DARWIN_OSX)
     #define HAS_GL
     #define HAS_SDL
-    #define HAS_SDL_OPENGL
     #define HAS_SDL_WIN_EVENTS
   #endif
   #define HAS_ZEROCONF
@@ -170,9 +169,6 @@
 #endif
 #ifdef HAVE_SDL
 #define HAS_SDL
-#ifndef HAS_SDL_OPENGL
-#define HAS_SDL_OPENGL
-#endif
 #ifndef HAVE_X11
 #define HAS_SDL_WIN_EVENTS
 #endif

diff --git a/xbmc/visualizations/Goom/Makefile.in b/xbmc/visualizations/Goom/Makefile.in
@@ -2,7 +2,7 @@ ARCH=@ARCH@
 INCLUDES=-I. -I.. -I../../linux -I../../ -Igoom2k4-0/src
 OBJS=Main.o
 SLIB=visualization.goom/Goom.vis
-DEFINES+=-DHAS_SDL_OPENGL -DHAS_SDL
+DEFINES+=-DHAS_GL
 CXXFLAGS=-fPIC
 DIRS=goom2k4-0
 DISTCLEAN_FILES=../../../addons/visualization.goom

diff --git a/xbmc/visualizations/Goom/build_xbmc_win32.sh b/xbmc/visualizations/Goom/build_xbmc_win32.sh
@@ -30,7 +30,7 @@ goom2k4-0/src/v3d.c \
 goom2k4-0/src/xmmx.c \
 "
 
-gcc -c -O3 -g -D_WIN32PC -DHAS_SDL_OPENGL -DHAVE_MMX -D_MINGW -Igoom2k4-0/src/ -I../../../lib/libSDL-WIN32/include/ -I../../../visualisations/ ${GOOM_SRC} Main.cpp
+gcc -c -O3 -g -D_WIN32PC -DHAVE_MMX -D_MINGW -Igoom2k4-0/src/ -I../../../lib/libSDL-WIN32/include/ -I../../../visualisations/ ${GOOM_SRC} Main.cpp
 
 gcc -g -s -shared -o ../../../visualisations/goom_win32.vis *.o -lopengl32 -lstdc++
 rm *.o
diff --git a/xbmc/visualizations/OpenGLSpectrum/Makefile.in b/xbmc/visualizations/OpenGLSpectrum/Makefile.in
@@ -17,8 +17,7 @@ ifeq (@USE_OPENGLES@,1)
     LDFLAGS += -lGLESv2
   endif
 else
-  DEFINES += -DHAS_SDL
-  DEFINES += -DHAS_SDL_OPENGL
+  DEFINES += -DHAS_GL
   ifeq ($(findstring osx,$(ARCH)), osx)
     LDFLAGS += -framework OpenGL
   else

diff --git a/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.cpp b/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.cpp
@@ -88,7 +88,7 @@ static const char *vert = "attribute vec4 m_attrpos;\n"
 
 static CVisGUIShader *vis_shader = NULL;
 
-#elif defined(HAS_SDL_OPENGL)
+#elif defined(HAS_GL)
 #include <GL/glew.h>
 static GLenum  g_mode = GL_FILL;
 
@@ -102,7 +102,7 @@ static GLfloat z_angle = 0.0, z_speed = 0.0;
 static GLfloat heights[16][16], cHeights[16][16], scale;
 static GLfloat hSpeed = 0.05;
 
-#if defined(HAS_SDL_OPENGL)
+#if defined(HAS_GL)
 static void draw_rectangle(GLfloat x1, GLfloat y1, GLfloat z1, GLfloat x2, GLfloat y2, GLfloat z2)
 {
   if(y1 == y2)
@@ -606,7 +606,7 @@ extern "C" ADDON_STATUS ADDON_SetSetting(const char *strSetting, const void* val
   }
   else if (strcmp(strSetting, "mode")==0)
   {
-#if defined(HAS_SDL_OPENGL)
+#if defined(HAS_GL)
     switch (*(int*) value)
     {
       case 1:

diff --git a/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.sln b/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.sln
diff --git a/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.vcproj b/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.vcproj