ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

onepad: remove deadcode 

zzogl-pg: disable opengl3 context creation for the moment (crash with geforce7)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4789 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2011-07-01 09:01:50 +00:00
parent 774f90f642
commit 7ecd913a7d
6 changed files with 9 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/onepad/controller.cpp
View File

@ -22,8 +22,6 @@
#include "onepad.h"
#include "controller.h"
HatPins hat_position = {false, false, false, false};
__forceinline void set_keyboad_key(int pad, int keysym, int index)
{
conf->keysym_map[pad][keysym] = index;

49
plugins/onepad/controller.h
View File

@ -55,55 +55,6 @@ extern int hat_to_key(int dir, int axis_id);
extern int PadEnum[2][2];
typedef struct
{
bool left, right, up, down;
} HatPins;
extern HatPins hat_position;
static __forceinline void set_hat_pins(int tilt_o_the_hat)
{
hat_position.left = false;
hat_position.right = false;
hat_position.up = false;
hat_position.down = false;
switch (tilt_o_the_hat)
{
case SDL_HAT_UP:
hat_position.up = true;
break;
case SDL_HAT_RIGHT:
hat_position.right= true;
break;
case SDL_HAT_DOWN:
hat_position.down = true;
break;
case SDL_HAT_LEFT:
hat_position.left = true;
break;
case SDL_HAT_LEFTUP:
hat_position.left = true;
hat_position.up = true;
break;
case SDL_HAT_RIGHTUP:
hat_position.right= true;
hat_position.up = true;
break;
case SDL_HAT_LEFTDOWN:
hat_position.left = true;
hat_position.down = true;
break;
case SDL_HAT_RIGHTDOWN:
hat_position.right= true;
hat_position.down = true;
break;
default:
break;
}
}
struct PADconf
{
public:

2
plugins/onepad/joystick.h
View File

@ -114,7 +114,6 @@ class JoystickInfo
int GetHatState(int i)
{
//PAD_LOG("Getting POV State of %d.\n", i);
set_hat_pins(vhatstate[i]);
return vhatstate[i];
}
@ -131,7 +130,6 @@ class JoystickInfo
void SetHatState(int i, int value)
{
//PAD_LOG("We should set %d to %d.\n", i, value);
set_hat_pins(i);
vhatstate[i] = value;
}

12
plugins/onepad/keyboard.cpp
View File

@ -250,8 +250,8 @@ bool PollX11KeyboardMouseEvent(u32 &pkey)
#else
LRESULT WINAPI PADwndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
int keyPress[2] = {0}, keyRelease[2] = {0};
static bool lbutton = false, rbutton = false;
key_status->keyboard_state_acces(cpad);
switch (msg)
{
@ -264,8 +264,7 @@ LRESULT WINAPI PADwndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
if (wParam == get_key(pad, i))
{
set_bit(keyPress[pad], i);
clear_bit(keyRelease[pad], i);
key_status->press(pad, i);
break;
}
}
@ -282,8 +281,7 @@ LRESULT WINAPI PADwndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
if (wParam == get_key(pad,i))
{
set_bit(keyRelease[pad], i);
clear_bit(keyPress[pad], i);
key_status->release(pad, i);
break;
}
}
@ -305,9 +303,7 @@ LRESULT WINAPI PADwndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
}
for (int pad = 0; pad < 2; ++pad)
{
UpdateKeys(pad, keyPress[pad], keyRelease[pad]);
}
key_status->commit_status(pad);
return TRUE;
}

158
plugins/onepad/mkinstalldirs
View File

@ -1,158 +0,0 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
scriptversion=2005-06-29.22
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Public domain.
#
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
errstatus=0
dirmode=
usage="\
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
Create each directory DIR (with mode MODE, if specified), including all
leading file name components.
Report bugs to <bug-automake@gnu.org>."
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
echo "$usage"
exit $?
;;
-m) # -m PERM arg
shift
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
dirmode=$1
shift
;;
--version)
echo "$0 $scriptversion"
exit $?
;;
--) # stop option processing
shift
break
;;
-*) # unknown option
echo "$usage" 1>&2
exit 1
;;
*) # first non-opt arg
break
;;
esac
done
for file
do
if test -d "$file"; then
shift
else
break
fi
done
case $# in
0) exit 0 ;;
esac
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
# mkdir -p a/c at the same time, both will detect that a is missing,
# one will create a, then the other will try to create a and die with
# a "File exists" error. This is a problem when calling mkinstalldirs
# from a parallel make. We use --version in the probe to restrict
# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
test -d ./-p && rmdir ./-p
test -d ./--version && rmdir ./--version
fi
;;
*)
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
else
# Clean up after NextStep and OpenStep mkdir.
for d in ./-m ./-p ./--version "./$dirmode";
do
test -d $d && rmdir $d
done
fi
;;
esac
for file
do
case $file in
/*) pathcomp=/ ;;
*) pathcomp= ;;
esac
oIFS=$IFS
IFS=/
set fnord $file
shift
IFS=$oIFS
for d
do
test "x$d" = x && continue
pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
lasterr=
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
errstatus=$lasterr
fi
fi
fi
fi
pathcomp=$pathcomp/
done
done
exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

5
plugins/zzogl-pg/opengl/GLWinX11.cpp
View File

@ -181,6 +181,11 @@ void GLWindow::CreateContextGL()
// Create a 2.0 opengl context. My understanding, you need it to call the gl function to get the 3.0 context
context = glXCreateContext(glDisplay, vi, NULL, GL_TRUE);
// FIXME
// On Geforce7, the context 3.0 creation crashes with BadAlloc (insufficient resources for operation)
// So until a better solution is found, keep the 2.0 context -- Gregory
return;
PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC) glXGetProcAddress((GLubyte *) "glXCreateContextAttribsARB");
PFNGLXCHOOSEFBCONFIGPROC glXChooseFBConfig = (PFNGLXCHOOSEFBCONFIGPROC) glXGetProcAddress((GLubyte *) "glXChooseFBConfig");
if (!glXCreateContextAttribsARB or !glXChooseFBConfig) {