CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-14 06:18:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(OSX PPC) Change anonymous unions, define GLint64/GLuint64/GLsync

Browse Source 
for Leopard and Snow Leopard, other changes..
This commit is contained in:
twinaphex 2014-02-11 16:07:00 +11:00
parent c3bdfa9c8e
commit c42a00a39f
22 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apple/OSX/hid_pad.c
View File

@ -14,7 +14,7 @@
*/
#include <IOKit/hid/IOHIDManager.h>
#include "apple/common/apple_input.h"
#include "../common/apple_input.h"
struct apple_pad_connection
{

12
apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj
View File

@ -247,7 +247,11 @@
"-DHAVE_DYNAMIC,",
"-DHAVE_MENU,",
"-DWANT_RPNG,",
"-DHAVE_OPENGL",
"-DHAVE_OPENGL,",
"-DWANT_MINIZ,",
"-DHAVE_ZLIB,",
"-DRARCH_INTERNAL,",
"-DOSX",
);
PREBINDING = NO;
SDKROOT = macosx10.5;
@ -266,7 +270,11 @@
"-DHAVE_DYNAMIC,",
"-DHAVE_MENU,",
"-DWANT_RPNG,",
"-DHAVE_OPENGL",
"-DHAVE_OPENGL,",
"-DWANT_MINIZ,",
"-DHAVE_ZLIB,",
"-DRARCH_INTERNAL,",
"-DOSX",
);
PREBINDING = NO;
SDKROOT = macosx10.5;

BIN
apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree
View File

Binary file not shown.

BIN
apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree
View File

Binary file not shown.

BIN
apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/files.pbxbtree
View File

Binary file not shown.

BIN
apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree
View File

Binary file not shown.

BIN
apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header
View File

Binary file not shown.

BIN
apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree
View File

Binary file not shown.

BIN
apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control
View File

Binary file not shown.

BIN
apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/strings
View File

Binary file not shown.

BIN
apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols
View File

Binary file not shown.

6
apple/common/apple_input.c
View File

@ -17,10 +17,10 @@
#include <unistd.h>
#include "apple_gamecontroller.h"
#include "input/input_common.h"
#include "../../input/input_common.h"
#include "apple_input.h"
#include "general.h"
#include "driver.h"
#include "../../general.h"
#include "../../driver.h"
#include "keycode.inc"

2
apple/common/apple_input.h
View File

@ -16,7 +16,7 @@
#ifndef __APPLE_RARCH_INPUT_H__
#define __APPLE_RARCH_INPUT_H__
#include "general.h"
#include "../../general.h"
// Input responder
#define MAX_TOUCHES 16

10
apple/common/apple_joypad.c
View File

@ -13,8 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "input/input_common.h"
#include "general.h"
#include "../../input/input_common.h"
#include "../../general.h"
#ifdef IOS
#include "apple/iOS/bluetooth/btdynamic.c"
@ -24,9 +24,9 @@
#include "../OSX/hid_pad.c"
#endif
#include "apple/common/hidpad/wiimote.c"
#include "apple/common/hidpad/apple_ps3_pad.c"
#include "apple/common/hidpad/apple_wii_pad.c"
#include "hidpad/wiimote.c"
#include "hidpad/apple_ps3_pad.c"
#include "hidpad/apple_wii_pad.c"
typedef struct
{

4
apple/common/hidpad/apple_ps3_pad.c
View File

@ -17,8 +17,8 @@
#include <string.h>
#include <stdlib.h>
#include "boolean.h"
#include "apple/common/apple_input.h"
#include "../../../boolean.h"
#include "../apple_input.h"
struct hidpad_ps3_data
{

14
apple/common/hidpad/apple_wii_pad.c
View File

@ -17,8 +17,8 @@
#include <string.h>
#include <stdlib.h>
#include "boolean.h"
#include "apple/common/rarch_wrapper.h"
#include "../../../boolean.h"
#include "../rarch_wrapper.h"
#include "wiimote.h"
@ -47,10 +47,10 @@ static int16_t hidpad_wii_get_axis(struct wiimote_t* device, unsigned axis)
{
switch (axis)
{
case 0: return device->exp.classic.ljs.x.value * 0x7FFF;
case 1: return device->exp.classic.ljs.y.value * 0x7FFF;
case 2: return device->exp.classic.rjs.x.value * 0x7FFF;
case 3: return device->exp.classic.rjs.y.value * 0x7FFF;
case 0: return device->exp.cc.classic.ljs.x.value * 0x7FFF;
case 1: return device->exp.cc.classic.ljs.y.value * 0x7FFF;
case 2: return device->exp.cc.classic.rjs.x.value * 0x7FFF;
case 3: return device->exp.cc.classic.rjs.y.value * 0x7FFF;
default: return 0;
}
}
@ -91,7 +91,7 @@ static void hidpad_wii_packet_handler(struct wiimote_t* device, uint8_t *packet,
}
}
g_current_input_data.pad_buttons[device->unid] = device->btns | (device->exp.classic.btns << 16);
g_current_input_data.pad_buttons[device->unid] = device->btns | (device->exp.cc.classic.btns << 16);
for (int i = 0; i < 4; i ++)
g_current_input_data.pad_axis[device->unid][i] = hidpad_wii_get_axis(device, i);
}

6
apple/common/hidpad/wiimote.c
View File

@ -43,7 +43,7 @@
#include <string.h>
#include <math.h>
#include <unistd.h>
#include "boolean.h"
#include "../../../boolean.h"
#include "wiimote.h"
@ -134,7 +134,7 @@ void wiimote_pressed_buttons(struct wiimote_t* wm, byte* msg) {
void wiimote_handle_expansion(struct wiimote_t* wm, byte* msg) {
switch (wm->exp.type) {
case EXP_CLASSIC:
classic_ctrl_event(&wm->exp.classic, msg);
classic_ctrl_event(&wm->exp.cc.classic, msg);
break;
default:
break;
@ -302,7 +302,7 @@ int wiimote_handshake(struct wiimote_t* wm, byte event, byte* data, unsigned sh
if(event != WM_RPT_READ)
return 0;
classic_ctrl_handshake(wm, &wm->exp.classic, data,len);
classic_ctrl_handshake(wm, &wm->exp.cc.classic, data,len);
wm->handshake_state = 3;
continue;

2
apple/common/hidpad/wiimote.h
View File

@ -159,7 +159,7 @@ extern "C" {
union {
struct classic_ctrl_t classic;
};
} cc;
} expansion_t;
/**

2
apple/common/keycode.h
View File

@ -156,7 +156,7 @@ enum {
//
#include "input/input_common.h" // < For rarch_key_map
#include "../../input/input_common.h" // < For rarch_key_map
struct apple_key_name_map_entry
{

2
apple/common/rarch_wrapper.h
View File

@ -17,7 +17,7 @@
#ifndef __APPLE_RARCH_WRAPPER_H__
#define __APPLE_RARCH_WRAPPER_H__
#include "gfx/gfx_context.h"
#include "../../gfx/gfx_context.h"
// These functions must only be called in gfx/context/apple_gl_context.c
bool apple_gfx_ctx_init(void);

2
gfx/gl.c
View File

@ -1725,9 +1725,11 @@ static bool resolve_extensions(gl_t *gl)
}
gl->has_fp_fbo = gl_query_extension(gl, "OES_texture_float_linear");
#else
#ifdef HAVE_FBO
// Float FBO is core in 3.2.
gl->has_fp_fbo = gl->core_context || gl_query_extension(gl, "ARB_texture_float");
#endif
#endif
#ifdef GL_DEBUG
// Useful for debugging, but kinda obnoxious otherwise.

8
gfx/glsym/glsym_gl.h
View File

@ -22,7 +22,9 @@ typedef void *GLeglImageOES;
typedef GLint GLfixed;
#endif
#if defined(OSX) && !defined(MAC_OS_X_VERSION_10_7)
#define OSX_10_6_SNOW_LEOPARD 1
typedef long long int GLint64;
typedef unsigned long long int GLuint64;
typedef struct __GLsync *GLsync;
#endif
typedef void (APIENTRYP RGLSYMGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
typedef void (APIENTRYP RGLSYMGLBLENDEQUATIONPROC) (GLenum mode);
@ -333,10 +335,8 @@ typedef void (APIENTRYP RGLSYMGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint fir
typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount);
typedef void (APIENTRYP RGLSYMGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
typedef void (APIENTRYP RGLSYMGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
#ifndef OSX_10_6_SNOW_LEOPARD
typedef void (APIENTRYP RGLSYMGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
typedef void (APIENTRYP RGLSYMGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
#endif
typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
typedef void (APIENTRYP RGLSYMGLMINSAMPLESHADINGPROC) (GLfloat value);
@ -595,7 +595,6 @@ typedef void (APIENTRYP RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, G
typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex);
typedef void (APIENTRYP RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex);
typedef void (APIENTRYP RGLSYMGLPROVOKINGVERTEXPROC) (GLenum mode);
#ifndef OSX_10_6_SNOW_LEOPARD
typedef GLsync (APIENTRYP RGLSYMGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
typedef GLboolean (APIENTRYP RGLSYMGLISSYNCPROC) (GLsync sync);
typedef void (APIENTRYP RGLSYMGLDELETESYNCPROC) (GLsync sync);
@ -603,7 +602,6 @@ typedef GLenum (APIENTRYP RGLSYMGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield f
typedef void (APIENTRYP RGLSYMGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
typedef void (APIENTRYP RGLSYMGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params);
typedef void (APIENTRYP RGLSYMGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
#endif
typedef void (APIENTRYP RGLSYMGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
typedef void (APIENTRYP RGLSYMGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);