joel16/SDL2
1
0
Fork 0
mirror of https://github.com/joel16/SDL2.git synced 2025-02-10 05:32:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix XVideo on GeForce by using last available adaptor

Browse Source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40183
This commit is contained in:
Sam Lantinga 2001-09-14 02:55:36 +00:00
parent 8dd601989f
commit 6a538b9b8d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs.html
View File

@ -16,6 +16,7 @@ be found at the <A HREF="http://www.libsdl.org/"> main SDL page</A>.
Major changes since SDL 1.0.0:
</H2>
<UL>
<LI> 1.2.3: Fix XVideo on GeForce by using last available adaptor
<LI> 1.2.3: Added CD-ROM support for BSD/OS (thanks Steven!)
<LI> 1.2.3: Added library version information to the Windows DLL
<LI> 1.2.3: Added initial support for EPOC/Symbian OS (thanks Hannu!)

11
src/video/x11/SDL_x11yuv.c
View File

@ -50,6 +50,9 @@ static char rcsid =
/* Workaround when pitch != width */
#define PITCH_WORKAROUND
/* Fix for the NVidia GeForce 2 - use the last available adaptor */
#define USE_LAST_ADAPTOR
/* The functions used to manipulate software video overlays */
static struct private_yuvhwfuncs x11_yuvfuncs = {
X11_LockYUVOverlay,
@ -81,7 +84,11 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S
(Success == XvQueryAdaptors(GFX_Display,
RootWindow(GFX_Display, SDL_Screen),
&adaptors, &ainfo)) ) {
#ifdef USE_LAST_ADAPTOR
for ( i=0; i < adaptors; ++i ) {
#else
for ( i=0; (i < adaptors) && (xv_port == -1); ++i ) {
#endif /* USE_LAST_ADAPTOR */
/* Check to see if the visual can be used */
if ( BUGGY_XFREE86(<=, 4001) ) {
int visual_ok = 0;
@ -102,7 +109,11 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S
XvImageFormatValues *formats;
formats = XvListImageFormats(GFX_Display,
ainfo[i].base_id, &num_formats);
#ifdef USE_LAST_ADAPTOR
for ( j=0; j < num_formats; ++j ) {
#else
for ( j=0; (j < num_formats) && (xv_port == -1); ++j ) {
#endif /* USE_LAST_ADAPTOR */
if ( (Uint32)formats[j].id == format ) {
for ( k=0; k < ainfo[i].num_ports; ++k ) {
if ( Success == XvGrabPort(GFX_Display, ainfo[i].base_id+k, CurrentTime) ) {