From 164d3b034cda704b001765620ea85fb9c39f9818 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 9 Sep 2016 15:56:56 +0200 Subject: [PATCH] Get rid of OSX_PPC --- audio/drivers/coreaudio.c | 20 ++++++------------- config.def.h | 2 +- frontend/drivers/platform_darwin.m | 2 +- gfx/drivers/gl_capabilities.h | 6 +++--- .../gl_renderchains/render_chain_gl_legacy.c | 2 +- libretro-common/include/glsm/glsm.h | 4 ++-- .../RetroArch_PPC.xcodeproj/project.pbxproj | 2 -- ui/drivers/ui_cocoa.m | 2 +- 8 files changed, 15 insertions(+), 25 deletions(-) diff --git a/audio/drivers/coreaudio.c b/audio/drivers/coreaudio.c index d257875f40..94e19a1f86 100644 --- a/audio/drivers/coreaudio.c +++ b/audio/drivers/coreaudio.c @@ -36,20 +36,12 @@ #include "../../configuration.h" #include "../../verbosity.h" -#if defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__) - -#ifndef OSX_PPC -#define OSX_PPC -#endif - -#endif - typedef struct coreaudio { slock_t *lock; scond_t *cond; -#ifdef OSX_PPC +#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) ComponentInstance dev; #else AudioComponentInstance dev; @@ -74,7 +66,7 @@ static void coreaudio_free(void *data) if (dev->dev_alive) { AudioOutputUnitStop(dev->dev); -#ifdef OSX_PPC +#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) CloseComponent(dev->dev); #else AudioComponentInstanceDispose(dev->dev); @@ -194,7 +186,7 @@ static void *coreaudio_init(const char *device, size_t fifo_size; UInt32 i_size; AudioStreamBasicDescription real_desc; -#ifdef OSX_PPC +#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) Component comp; #else AudioComponent comp; @@ -206,7 +198,7 @@ static void *coreaudio_init(const char *device, AudioStreamBasicDescription stream_desc = {0}; bool component_unavailable = false; static bool session_initialized = false; -#ifdef OSX_PPC +#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) ComponentDescription desc = {0}; #else AudioComponentDescription desc = {0}; @@ -241,7 +233,7 @@ static void *coreaudio_init(const char *device, #endif desc.componentManufacturer = kAudioUnitManufacturer_Apple; -#ifdef OSX_PPC +#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) comp = FindNextComponent(NULL, &desc); #else comp = AudioComponentFindNext(NULL, &desc); @@ -249,7 +241,7 @@ static void *coreaudio_init(const char *device, if (comp == NULL) goto error; -#ifdef OSX_PPC +#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) component_unavailable = (OpenAComponent(comp, &dev->dev) != noErr); #else component_unavailable = (AudioComponentInstanceNew(comp, &dev->dev) != noErr); diff --git a/config.def.h b/config.def.h index 8a927fdf53..acd1e43561 100644 --- a/config.def.h +++ b/config.def.h @@ -554,7 +554,7 @@ static float menu_footer_opacity = 1.000; static float menu_header_opacity = 1.000; #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) || defined(HAVE_VULKAN) -#if defined(HAVE_OPENGLES2) || defined(OSX_PPC) +#if defined(HAVE_OPENGLES2) || (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) static unsigned menu_shader_pipeline = 1; #else static unsigned menu_shader_pipeline = 2; diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m index f6465f832b..79a54d9918 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m @@ -697,7 +697,7 @@ static uint64_t frontend_darwin_get_mem_total(void) static uint64_t frontend_darwin_get_mem_used(void) { -#if defined(OSX) && !defined(OSX_PPC) +#if (defined(OSX) && !(defined(__ppc__) || defined(__ppc64__))) vm_size_t page_size; vm_statistics64_data_t vm_stats; mach_port_t mach_port = mach_host_self(); diff --git a/gfx/drivers/gl_capabilities.h b/gfx/drivers/gl_capabilities.h index d847556e6a..ff229f99a6 100644 --- a/gfx/drivers/gl_capabilities.h +++ b/gfx/drivers/gl_capabilities.h @@ -50,7 +50,7 @@ #define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES #define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES #define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT -#elif defined(OSX_PPC) +#elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) #define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT #define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_EXT #define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT @@ -69,7 +69,7 @@ #endif #define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT #define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT -#elif defined(OSX_PPC) +#elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) #define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_EXT #define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT #define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT @@ -86,7 +86,7 @@ #define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT #endif -#ifdef OSX_PPC +#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) #define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_EXT #elif defined(HAVE_PSGL) #define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_OES diff --git a/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c b/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c index f07b903a29..f88eae60f5 100644 --- a/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c +++ b/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c @@ -898,7 +898,7 @@ bool gl_init_hw_render(gl_t *gl, unsigned width, unsigned height) if (stencil) { -#if defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES1) || defined(OSX_PPC) +#if defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES1) || ((defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))) /* GLES2 is a bit weird, as always. * There's no GL_DEPTH_STENCIL_ATTACHMENT like in desktop GL. */ glFramebufferRenderbuffer(RARCH_GL_FRAMEBUFFER, diff --git a/libretro-common/include/glsm/glsm.h b/libretro-common/include/glsm/glsm.h index f35b2e382e..285ffe4b10 100644 --- a/libretro-common/include/glsm/glsm.h +++ b/libretro-common/include/glsm/glsm.h @@ -41,7 +41,7 @@ typedef GLclampf GLclampd; #define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES #define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT #define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT -#elif defined(OSX_PPC) +#elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) #define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_EXT #define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT #define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT @@ -62,7 +62,7 @@ typedef GLclampf GLclampd; #define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES #define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES #define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT -#elif defined(OSX_PPC) +#elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) #define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT #define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_EXT #define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT diff --git a/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj index 704468bbf9..896163e10d 100644 --- a/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj @@ -289,7 +289,6 @@ "-DHAVE_RGUI", "-DHAVE_MENU", "-DOSX", - "-DOSX_PPC", "-DHAVE_OPENGL", "-DHAVE_FBO", "-DHAVE_GLSL", @@ -364,7 +363,6 @@ "-DHAVE_RGUI", "-DHAVE_MENU", "-DOSX", - "-DOSX_PPC", "-DHAVE_OPENGL", "-DHAVE_FBO", "-DHAVE_GLSL", diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index b77eceb036..621d2243e8 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -38,7 +38,7 @@ id apple_platform; -#ifdef OSX_PPC +#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) @interface RetroArch_OSX : NSObject #else @interface RetroArch_OSX : NSObject