Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11dga.c @ 4390:725e506f6243 SDL-1.2
Fixed bug #895
Markus Rothe 2009-12-07 09:32:46 PST
Check if libspe2 is available
Building on PowerPC64 results in:
[...]
In file included from ./src/video/ps3/SDL_ps3events_c.h:33,
from ./src/video/ps3/SDL_ps3video.c:32:
./src/video/ps3/SDL_ps3video.h:34:21: error: libspe2.h: No such file or
directory
In file included from ./src/video/ps3/SDL_ps3events_c.h:33,
from ./src/video/ps3/SDL_ps3video.c:32:
./src/video/ps3/SDL_ps3video.h:75: error: expected specifier-qualifier-list
before 'spe_context_ptr_t'
./src/video/ps3/SDL_ps3video.c:78: error: expected '=', ',', ';', 'asm' or
'__attribute__' before 'fb_writer_spu'
./src/video/ps3/SDL_ps3video.c: In function 'PS3_VideoInit':
./src/video/ps3/SDL_ps3video.c:167: error: 'spu_data_t' has no member named
'program'
./src/video/ps3/SDL_ps3video.c:167: error: 'fb_writer_spu' undeclared (first
use in this function)
[...]
The problem is that the ps3 video driver is being build regardless if libspe2
is installed or not. The attached patch fixes this problem.
[ Note: The other headers that are being checked for are coming from the linux
headers package on powerpc64. As a result these are also available if you're on
a generic powerpc64 machine and not a PS3 only. ]
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Fri, 11 Dec 2009 15:14:13 +0000 |
| parents | a1b03ba2fcd0 |
| children |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 9 |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 /* This is currently only used to enable DGA mouse. | |
| 4021 | 25 There is a completely separate DGA driver that is fullscreen-only. |
| 0 | 26 */ |
| 27 | |
| 28 #include "SDL_video.h" | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
29 #include "../SDL_cursor_c.h" |
| 0 | 30 #include "SDL_x11dga_c.h" |
| 31 | |
| 32 /* Global for the error handler */ | |
| 33 int dga_event, dga_error = -1; | |
| 34 | |
| 35 void X11_EnableDGAMouse(_THIS) | |
| 36 { | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
37 #if SDL_VIDEO_DRIVER_X11_DGAMOUSE |
| 4021 | 38 static int use_dgamouse = -1; |
| 0 | 39 |
| 40 /* Check configuration to see if we should use DGA mouse */ | |
| 4021 | 41 if ( use_dgamouse < 0 ) { |
| 42 int dga_major, dga_minor; | |
| 43 int dga_flags; | |
| 44 const char *env_use_dgamouse; | |
| 45 | |
| 46 use_dgamouse = 1; | |
| 47 env_use_dgamouse = SDL_getenv("SDL_VIDEO_X11_DGAMOUSE"); | |
| 48 if ( env_use_dgamouse ) { | |
| 49 use_dgamouse = SDL_atoi(env_use_dgamouse); | |
| 50 } | |
| 51 /* Check for buggy X servers */ | |
| 52 if ( use_dgamouse && BUGGY_XFREE86(==, 4000) ) { | |
| 53 use_dgamouse = 0; | |
| 54 } | |
| 55 if ( !use_dgamouse || !local_X11 || | |
| 56 !SDL_NAME(XF86DGAQueryExtension)(SDL_Display, &dga_event, &dga_error) || | |
| 57 !SDL_NAME(XF86DGAQueryVersion)(SDL_Display, &dga_major, &dga_minor) || | |
| 58 !SDL_NAME(XF86DGAQueryDirectVideo)(SDL_Display, SDL_Screen, &dga_flags) || | |
| 59 !(dga_flags & XF86DGADirectPresent) ) { | |
| 60 use_dgamouse = 0; | |
| 61 } | |
| 0 | 62 } |
| 4021 | 63 |
| 64 if ( use_dgamouse && !(using_dga & DGA_MOUSE) ) { | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
65 if ( SDL_NAME(XF86DGADirectVideo)(SDL_Display, SDL_Screen, XF86DGADirectMouse) ) { |
| 0 | 66 using_dga |= DGA_MOUSE; |
| 67 } | |
| 68 } | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
69 #endif /* SDL_VIDEO_DRIVER_X11_DGAMOUSE */ |
| 0 | 70 } |
| 71 | |
| 72 /* Argh. Glide resets DGA mouse mode when it makes the context current! */ | |
| 73 void X11_CheckDGAMouse(_THIS) | |
| 74 { | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
75 #if SDL_VIDEO_DRIVER_X11_DGAMOUSE |
| 0 | 76 if ( using_dga & DGA_MOUSE ) { |
| 4021 | 77 SDL_NAME(XF86DGADirectVideo)(SDL_Display,SDL_Screen,XF86DGADirectMouse); |
| 0 | 78 } |
| 79 #endif | |
| 80 } | |
| 81 | |
| 82 void X11_DisableDGAMouse(_THIS) | |
| 83 { | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
84 #if SDL_VIDEO_DRIVER_X11_DGAMOUSE |
| 0 | 85 if ( using_dga & DGA_MOUSE ) { |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
86 SDL_NAME(XF86DGADirectVideo)(SDL_Display, SDL_Screen, 0); |
| 0 | 87 using_dga &= ~DGA_MOUSE; |
| 88 } | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
89 #endif /* SDL_VIDEO_DRIVER_X11_DGAMOUSE */ |
| 0 | 90 } |