From a55b387f1604c810b1eff04a66b0545634e6fbda Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 27 Feb 2015 20:52:33 +0100 Subject: [PATCH] SDL clean-up - remove HAS_SDL_OPENGL --- .../VS2010Express/libXBMC_addon.vcxproj | 2 +- .../VS2010Express/libXBMC_codec.vcxproj | 2 +- .../project/VS2010Express/libXBMC_gui.vcxproj | 2 +- .../project/VS2010Express/libXBMC_pvr.vcxproj | 2 +- xbmc/Application.cpp | 2 +- xbmc/addons/AddonDll.h | 2 - xbmc/addons/AddonManager.cpp | 4 - xbmc/system.h | 4 - xbmc/visualizations/Goom/Makefile.in | 2 +- xbmc/visualizations/Goom/build_xbmc_win32.sh | 2 +- .../visualizations/OpenGLSpectrum/Makefile.in | 3 +- .../OpenGLSpectrum/opengl_spectrum.cpp | 6 +- .../OpenGLSpectrum/opengl_spectrum.sln | 21 -- .../OpenGLSpectrum/opengl_spectrum.vcproj | 211 ------------------ xbmc/visualizations/WaveForm/Main.cpp | 28 +-- xbmc/visualizations/WaveForm/Makefile.in | 3 +- xbmc/visualizations/XBMCProjectM/Makefile.in | 2 +- .../XBMCProjectM/build_projectM_win32.sh | 2 +- xbmc/visualizations/fishBMC/Makefile.in | 2 - 19 files changed, 28 insertions(+), 274 deletions(-) delete mode 100644 xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.sln delete mode 100644 xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.vcproj diff --git a/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj b/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj index 41120beff3d16..55bfd4ea2c0a8 100644 --- 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 @@ ..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories) - HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Sync diff --git a/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj b/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj index 67f6c384d98cb..c2d14e5ebcf99 100644 --- 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 @@ ..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) - HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions) + HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions) Sync diff --git a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj b/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj index fa88231678696..7c5197f3d442f 100644 --- 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 @@ ..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) - HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions) + HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions) Sync diff --git a/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj b/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj index b5da9b99d235a..eda0b1fe2b833 100644 --- 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 @@ ..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) - HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions) + HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions) Sync diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index 62d76597f24f8..8985630ac579a 100644 --- 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 index d5e05b27d999a..d5e4e9e08a74a 100644 --- a/xbmc/addons/AddonDll.h +++ b/xbmc/addons/AddonDll.h @@ -101,8 +101,6 @@ CAddonDll::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 index 746a81fcb8c2c..2865793f48571 100644 --- a/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp @@ -138,8 +138,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) @@ -708,8 +706,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 index db70586bd382b..6ee2a0485a356 100644 --- 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 index e307d71d3cdfe..97bf0775e0052 100644 --- 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 index 1e586689dcc3b..6a6875a4d8ac1 100644 --- 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 index b9f290330f5f1..6ab55050f42a0 100644 --- 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 index 9d0e97f563254..57d446b468d8b 100644 --- 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 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 deleted file mode 100644 index f5a4de13e6c74..0000000000000 --- a/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl_spectrum", "opengl_spectrum.vcproj", "{0D91724A-E6F6-4708-AF47-9F88BBE2114B}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {0D91724A-E6F6-4708-AF47-9F88BBE2114B}.Debug.ActiveCfg = Debug|Win32 - {0D91724A-E6F6-4708-AF47-9F88BBE2114B}.Debug.Build.0 = Debug|Win32 - {0D91724A-E6F6-4708-AF47-9F88BBE2114B}.Release.ActiveCfg = Release|Win32 - {0D91724A-E6F6-4708-AF47-9F88BBE2114B}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.vcproj b/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.vcproj deleted file mode 100644 index b304b54a52bf4..0000000000000 --- a/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.vcproj +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xbmc/visualizations/WaveForm/Main.cpp b/xbmc/visualizations/WaveForm/Main.cpp index 34cc48abc1e4e..c271e1f807a88 100644 --- a/xbmc/visualizations/WaveForm/Main.cpp +++ b/xbmc/visualizations/WaveForm/Main.cpp @@ -23,7 +23,7 @@ #include "addons/include/xbmc_vis_dll.h" #include -#ifdef HAS_SDL_OPENGL +#ifdef HAS_GL #include #else #ifdef _WIN32 @@ -32,14 +32,14 @@ #endif char g_visName[512]; -#ifndef HAS_SDL_OPENGL +#ifndef HAS_GL LPDIRECT3DDEVICE9 g_device; #else void* g_device; #endif float g_fWaveform[2][512]; -#ifdef HAS_SDL_OPENGL +#ifdef HAS_GL typedef struct { int X; int Y; @@ -59,7 +59,7 @@ struct Vertex_t D3DCOLOR col; }; -#ifndef HAS_SDL_OPENGL +#ifndef HAS_GL #define VERTEX_FORMAT (D3DFVF_XYZ | D3DFVF_DIFFUSE) #endif @@ -73,7 +73,7 @@ ADDON_STATUS ADDON_Create(void* hdl, void* props) VIS_PROPS* visProps = (VIS_PROPS*)props; -#ifndef HAS_SDL_OPENGL +#ifndef HAS_GL g_device = (LPDIRECT3DDEVICE9)visProps->device; #else g_device = visProps->device; @@ -122,13 +122,13 @@ extern "C" void Render() { Vertex_t verts[512]; -#ifndef HAS_SDL_OPENGL +#ifndef HAS_GL g_device->SetFVF(VERTEX_FORMAT); g_device->SetPixelShader(NULL); #endif // Left channel -#ifdef HAS_SDL_OPENGL +#ifdef HAS_GL GLenum errcode; glColor3f(1.0, 1.0, 1.0); glDisable(GL_BLEND); @@ -142,22 +142,22 @@ extern "C" void Render() verts[i].x = g_viewport.X + ((i / 255.0f) * g_viewport.Width); verts[i].y = g_viewport.Y + g_viewport.Height * 0.33f + (g_fWaveform[0][i] * g_viewport.Height * 0.15f); verts[i].z = 1.0; -#ifdef HAS_SDL_OPENGL +#ifdef HAS_GL glVertex2f(verts[i].x, verts[i].y); #endif } -#ifdef HAS_SDL_OPENGL +#ifdef HAS_GL glEnd(); if ((errcode=glGetError())!=GL_NO_ERROR) { printf("Houston, we have a GL problem: %s\n", gluErrorString(errcode)); } -#elif !defined(HAS_SDL_OPENGL) +#elif !defined(HAS_GL) g_device->DrawPrimitiveUP(D3DPT_LINESTRIP, 255, verts, sizeof(Vertex_t)); #endif // Right channel -#ifdef HAS_SDL_OPENGL +#ifdef HAS_GL glBegin(GL_LINE_STRIP); #endif for (int i = 0; i < 256; i++) @@ -166,19 +166,19 @@ extern "C" void Render() verts[i].x = g_viewport.X + ((i / 255.0f) * g_viewport.Width); verts[i].y = g_viewport.Y + g_viewport.Height * 0.66f + (g_fWaveform[1][i] * g_viewport.Height * 0.15f); verts[i].z = 1.0; -#ifdef HAS_SDL_OPENGL +#ifdef HAS_GL glVertex2f(verts[i].x, verts[i].y); #endif } -#ifdef HAS_SDL_OPENGL +#ifdef HAS_GL glEnd(); glEnable(GL_BLEND); glPopMatrix(); if ((errcode=glGetError())!=GL_NO_ERROR) { printf("Houston, we have a GL problem: %s\n", gluErrorString(errcode)); } -#elif !defined(HAS_SDL_OPENGL) +#elif !defined(HAS_GL) g_device->DrawPrimitiveUP(D3DPT_LINESTRIP, 255, verts, sizeof(Vertex_t)); #endif diff --git a/xbmc/visualizations/WaveForm/Makefile.in b/xbmc/visualizations/WaveForm/Makefile.in index 98117cfffc5de..5c43bb3aa96b9 100644 --- a/xbmc/visualizations/WaveForm/Makefile.in +++ b/xbmc/visualizations/WaveForm/Makefile.in @@ -19,8 +19,7 @@ ifeq (@USE_OPENGLES@,1) endif else OBJS = Main.o - DEFINES += -DHAS_SDL - DEFINES += -DHAS_SDL_OPENGL + DEFINES += -DHAS_GL ifeq ($(findstring osx,$(ARCH)), osx) LDFLAGS += -framework OpenGL else diff --git a/xbmc/visualizations/XBMCProjectM/Makefile.in b/xbmc/visualizations/XBMCProjectM/Makefile.in index 249338c9c1ae1..ce4e8e24d67b9 100644 --- a/xbmc/visualizations/XBMCProjectM/Makefile.in +++ b/xbmc/visualizations/XBMCProjectM/Makefile.in @@ -2,7 +2,7 @@ ARCH=@ARCH@ OBJS=Main.o SLIB=@abs_top_srcdir@/addons/visualization.projectm/projectM.vis PRESETS=@abs_top_srcdir@/addons/visualization.projectm/resources/presets.zip -DEFINES+=-DHAS_SDL_OPENGL -DHAS_SDL +DEFINES+=-DHAS_GL CXXFLAGS=-fPIC DIRS=libprojectM diff --git a/xbmc/visualizations/XBMCProjectM/build_projectM_win32.sh b/xbmc/visualizations/XBMCProjectM/build_projectM_win32.sh index cffe3d263c46a..81f68e8b89f90 100644 --- a/xbmc/visualizations/XBMCProjectM/build_projectM_win32.sh +++ b/xbmc/visualizations/XBMCProjectM/build_projectM_win32.sh @@ -1,6 +1,6 @@ SRC="libprojectM/SOIL.c libprojectM/image_DXT.c libprojectM/image_helper.c libprojectM/stb_image_aug.c" -gcc -c -O2 -DHAS_SDL_OPENGL -DUSE_FBO -IlibprojectM/ -I../../../lib/libSDL-WIN32/include/ -Iwin32/pthreads -I../../../visualisations/ Main.cpp libprojectM/*.cpp ${SRC} +gcc -c -O2 -DUSE_FBO -IlibprojectM/ -I../../../lib/libSDL-WIN32/include/ -Iwin32/pthreads -I../../../visualisations/ Main.cpp libprojectM/*.cpp ${SRC} gcc -g -s -shared -o ../../../visualisations/ProjectM_win32.vis *.o -lopengl32 -lstdc++ -lglew32 -Lwin32/glew/ rm *.o \ No newline at end of file diff --git a/xbmc/visualizations/fishBMC/Makefile.in b/xbmc/visualizations/fishBMC/Makefile.in index 0c2141e153280..a3091fd7f77f0 100644 --- a/xbmc/visualizations/fishBMC/Makefile.in +++ b/xbmc/visualizations/fishBMC/Makefile.in @@ -13,8 +13,6 @@ OBJS = analyst.o \ vectorfield.o \ wavepainter.o - DEFINES += -DHAS_SDL - DEFINES += -DHAS_SDL_OPENGL ifeq ($(findstring osx,$(ARCH)), osx) LDFLAGS += -framework OpenGL else