Skip to content

L
libSDL
Commit b49e57ab authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Date: Fri, 18 Feb 2005 07:58:00 +0200 

From: "Mike Gorchak"
Subject: [SDL] [PATCH] QNX6 and not only QNX6 fixes

1) Update SDL.qpg.in for the QNX 6.3.
4) video/photon/SDL_phyuv.c - fixed bug with swapped U and V planes, using
YV12 mode with radeon cards.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401292
parent f708868d
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 40 deletions
SDL.qpg.in
View file @ b49e57ab
...@@ -24,32 +24,28 @@ ...@@ -24,32 +24,28 @@
<QPG:Values> <QPG:Values>
<QPG:Files> <QPG:Files>
<QPG:Add file="./COPYING" install="LicenseUrl/" handling="repdata"/> <QPG:Add file="./COPYING" install="LicenseUrl/" handling="repdata"/>
<QPG:Add permissions="0755" file="./src/.libs/libSDL-@SDL_MAJOR_VERSION@.@SDL_MINOR_VERSION@.so.@SDL_BINARY_AGE@" install="/opt/lib/"/> <QPG:Add permissions="0755" file="./src/.libs/libSDL-@SDL_MAJOR_VERSION@.@SDL_MINOR_VERSION@.so.@LT_AGE@" install="/usr/lib/"/>
<QPG:Add filetype="symlink" file="libSDL.so" install="/opt/lib/" linkto="libSDL-@SDL_MAJOR_VERSION@.@SDL_MINOR_VERSION@.so.@SDL_BINARY_AGE@"/> <QPG:Add filetype="symlink" file="libSDL.so" install="/usr/lib/" linkto="libSDL-@SDL_MAJOR_VERSION@.@SDL_MINOR_VERSION@.so.@LT_AGE@"/>
<QPG:Add filetype="symlink" file="libSDL-@SDL_MAJOR_VERSION@.@SDL_MINOR_VERSION@.so.0" install="/opt/lib/" linkto="libSDL-@SDL_MAJOR_VERSION@.@SDL_MINOR_VERSION@.so.@SDL_BINARY_AGE@"/> <QPG:Add permissions="0644" file="./src/.libs/libSDL.a" install="/usr/lib/"/>
<QPG:Add filetype="symlink" file="libSDL-@SDL_MAJOR_VERSION@.1.so.0" install="/opt/lib/" linkto="libSDL-@SDL_MAJOR_VERSION@.@SDL_MINOR_VERSION@.so.@SDL_BINARY_AGE@"/> <QPG:Add permissions="0644" file="./src/.libs/libSDL.lai" install="/usr/lib/libSDL.la"/>
<QPG:Add filetype="symlink" file="libSDL-@SDL_MAJOR_VERSION@.0.so.0" install="/opt/lib/" linkto="libSDL-@SDL_MAJOR_VERSION@.@SDL_MINOR_VERSION@.so.@SDL_BINARY_AGE@"/> <QPG:Add permissions="0644" file="./src/main/libSDLmain.a" install="/usr/lib/"/>
<QPG:Add permissions="0644" file="./src/.libs/libSDL.a" install="/opt/lib/"/> <QPG:Add permissions="0644" file="./include/*.h" install="/usr/include/SDL/"/>
<QPG:Add permissions="0644" file="./src/.libs/libSDL.lai" install="/opt/lib/libSDL.la"/> <QPG:Add permissions="0755" file="./sdl-config" install="/usr/bin/"/>
<QPG:Add permissions="0644" file="./src/main/libSDLmain.a" install="/opt/lib/"/> <QPG:Add permissions="0644" file="./BUGS" install="/usr/share/doc/SDL12/"/>
<QPG:Add permissions="0644" file="./include/*.h" install="/opt/include/SDL/"/> <QPG:Add permissions="0644" file="./COPYING" install="/usr/share/doc/SDL12/"/>
<QPG:Add permissions="0755" file="./sdl-config" install="/opt/bin/"/> <QPG:Add permissions="0644" file="./CREDITS" install="/usr/share/doc/SDL12/"/>
<QPG:Add permissions="0644" file="./BUGS" install="/usr/doc/SDL12/"/> <QPG:Add permissions="0644" file="./INSTALL" install="/usr/share/doc/SDL12/"/>
<QPG:Add permissions="0644" file="./COPYING" install="/usr/doc/SDL12/"/> <QPG:Add permissions="0644" file="./README" install="/usr/share/doc/SDL12/"/>
<QPG:Add permissions="0644" file="./CREDITS" install="/usr/doc/SDL12/"/> <QPG:Add permissions="0644" file="./README-SDL.txt" install="/usr/share/doc/SDL12/"/>
<QPG:Add permissions="0644" file="./INSTALL" install="/usr/doc/SDL12/"/> <QPG:Add permissions="0644" file="./README.CVS" install="/usr/share/doc/SDL12/"/>
<QPG:Add permissions="0644" file="./README" install="/usr/doc/SDL12/"/> <QPG:Add permissions="0644" file="./README.QNX" install="/usr/share/doc/SDL12/"/>
<QPG:Add permissions="0644" file="./README-SDL.txt" install="/usr/doc/SDL12/"/> <QPG:Add permissions="0644" file="./TODO" install="/usr/share/doc/SDL12/"/>
<QPG:Add permissions="0644" file="./README.CVS" install="/usr/doc/SDL12/"/> <QPG:Add permissions="0644" file="./WhatsNew" install="/usr/share/doc/SDL12/"/>
<QPG:Add permissions="0644" file="./README.QNX" install="/usr/doc/SDL12/"/> <QPG:Add permissions="0644" file="./docs.html" install="/usr/share/doc/SDL12/Changes.html"/>
<QPG:Add permissions="0644" file="./TODO" install="/usr/doc/SDL12/"/> <QPG:Add permissions="0644" file="./docs/index.html" install="/usr/share/doc/SDL12/docs/"/>
<QPG:Add permissions="0644" file="./WhatsNew" install="/usr/doc/SDL12/"/> <QPG:Add permissions="0644" file="./docs/html/*.html" install="/usr/share/doc/SDL12/docs/html/"/>
<QPG:Add permissions="0644" file="./docs.html" install="/usr/doc/SDL12/Changes.html"/> <QPG:Add permissions="0644" file="./docs/man3/*.3" install="/usr/share/man/man3/"/>
<QPG:Add permissions="0644" file="./docs/index.html" install="/usr/doc/SDL12/docs/"/> <QPG:Add permissions="0644" file="./sdl.m4" install="/usr/share/aclocal/"/>
<QPG:Add permissions="0644" file="./docs/html/*.html" install="/usr/doc/SDL12/docs/html/"/>
<QPG:Add permissions="0644" file="./docs/images/rainbow.gif" install="/usr/doc/SDL12/docs/images/"/>
<QPG:Add permissions="0644" file="./docs/man3/*.3" install="/opt/man/man3/"/>
<QPG:Add permissions="0644" file="./sdl.m4" install="/opt/share/aclocal/"/>
</QPG:Files> </QPG:Files>
<QPG:PackageFilter> <QPG:PackageFilter>
<QPM:PackageManifest> <QPM:PackageManifest>
...@@ -59,14 +55,14 @@ ...@@ -59,14 +55,14 @@
<QPM:PackageName>SDL</QPM:PackageName> <QPM:PackageName>SDL</QPM:PackageName>
<QPM:PackageReleaseNumber>1</QPM:PackageReleaseNumber> <QPM:PackageReleaseNumber>1</QPM:PackageReleaseNumber>
<QPM:PackageRepository>http://qnx.org.ru/repository</QPM:PackageRepository> <QPM:PackageRepository>http://qnx.org.ru/repository</QPM:PackageRepository>
<QPM:FileVersion>2.0</QPM:FileVersion> <QPM:FileVersion>2.6</QPM:FileVersion>
</QPM:PackageDescription> </QPM:PackageDescription>
<QPM:ProductDescription> <QPM:ProductDescription>
<QPM:ProductName>Simple DirectMedia Layer (SDL)</QPM:ProductName> <QPM:ProductName>Simple DirectMedia Layer (SDL)</QPM:ProductName>
<QPM:ProductIdentifier>SDL</QPM:ProductIdentifier> <QPM:ProductIdentifier>SDL</QPM:ProductIdentifier>
<QPM:ProductEmail>slouken@libsdl.org</QPM:ProductEmail> <QPM:ProductEmail>slouken@libsdl.org</QPM:ProductEmail>
<QPM:VendorName>public</QPM:VendorName> <QPM:VendorName>Public</QPM:VendorName>
<QPM:VendorInstallName>public</QPM:VendorInstallName> <QPM:VendorInstallName>public</QPM:VendorInstallName>
<QPM:VendorURL>http://www.libsdl.org</QPM:VendorURL> <QPM:VendorURL>http://www.libsdl.org</QPM:VendorURL>
<QPM:VendorEmbedURL/> <QPM:VendorEmbedURL/>
...@@ -85,7 +81,7 @@ ...@@ -85,7 +81,7 @@
<QPM:ReleaseDescription> <QPM:ReleaseDescription>
<QPM:ReleaseVersion>@VERSION@</QPM:ReleaseVersion> <QPM:ReleaseVersion>@VERSION@</QPM:ReleaseVersion>
<QPM:ReleaseUrgency>High</QPM:ReleaseUrgency> <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
<QPM:ReleaseStability>Stable</QPM:ReleaseStability> <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
<QPM:ReleaseNoteMinor/> <QPM:ReleaseNoteMinor/>
<QPM:ReleaseNoteMajor/> <QPM:ReleaseNoteMajor/>
...@@ -96,7 +92,7 @@ ...@@ -96,7 +92,7 @@
<QPM:ContentDescription> <QPM:ContentDescription>
<QPM:ContentTopic xmlmultiple="true">Software Development/Libraries and Extensions/C Libraries</QPM:ContentTopic> <QPM:ContentTopic xmlmultiple="true">Software Development/Libraries and Extensions/C Libraries</QPM:ContentTopic>
<QPM:ContentKeyword>SDL, audio, graphics, demos, games, emulators, direct, media, layer</QPM:ContentKeyword> <QPM:ContentKeyword>SDL,audio,graphics,demos,games,emulators,direct,media,layer</QPM:ContentKeyword>
<QPM:TargetOS>qnx6</QPM:TargetOS> <QPM:TargetOS>qnx6</QPM:TargetOS>
<QPM:HostOS>none</QPM:HostOS> <QPM:HostOS>none</QPM:HostOS>
<QPM:DisplayEnvironment xmlmultiple="true">Photon</QPM:DisplayEnvironment> <QPM:DisplayEnvironment xmlmultiple="true">Photon</QPM:DisplayEnvironment>
......
src/video/photon/SDL_ph_modes.c
View file @ b49e57ab
...@@ -28,7 +28,6 @@ static char rcsid = ...@@ -28,7 +28,6 @@ static char rcsid =
#include "SDL_error.h" #include "SDL_error.h"
#include "SDL_ph_modes_c.h" #include "SDL_ph_modes_c.h"
static unsigned long key1, key2;
static PgVideoModeInfo_t mode_info; static PgVideoModeInfo_t mode_info;
static PgVideoModes_t mode_list; static PgVideoModes_t mode_list;
......
src/video/photon/SDL_phyuv.c
View file @ b49e57ab
...@@ -58,10 +58,10 @@ int grab_ptrs2(PgVideoChannel_t* channel, FRAMEDATA* Frame0, FRAMEDATA* Frame1) ...@@ -58,10 +58,10 @@ int grab_ptrs2(PgVideoChannel_t* channel, FRAMEDATA* Frame0, FRAMEDATA* Frame1)
/* Buffers have moved; re-obtain the pointers */ /* Buffers have moved; re-obtain the pointers */
Frame0->Y = (unsigned char *)PdGetOffscreenContextPtr(channel->yplane1); Frame0->Y = (unsigned char *)PdGetOffscreenContextPtr(channel->yplane1);
Frame1->Y = (unsigned char *)PdGetOffscreenContextPtr(channel->yplane2); Frame1->Y = (unsigned char *)PdGetOffscreenContextPtr(channel->yplane2);
Frame0->U = (unsigned char *)PdGetOffscreenContextPtr(channel->uplane1); Frame0->U = (unsigned char *)PdGetOffscreenContextPtr(channel->vplane1);
Frame1->U = (unsigned char *)PdGetOffscreenContextPtr(channel->uplane2); Frame1->U = (unsigned char *)PdGetOffscreenContextPtr(channel->vplane2);
Frame0->V = (unsigned char *)PdGetOffscreenContextPtr(channel->vplane1); Frame0->V = (unsigned char *)PdGetOffscreenContextPtr(channel->uplane1);
Frame1->V = (unsigned char *)PdGetOffscreenContextPtr(channel->vplane2); Frame1->V = (unsigned char *)PdGetOffscreenContextPtr(channel->uplane2);
if (Frame0->Y) if (Frame0->Y)
planes++; planes++;
...@@ -217,10 +217,10 @@ SDL_Overlay* ph_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SD ...@@ -217,10 +217,10 @@ SDL_Overlay* ph_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SD
if(overlay->hwdata->channel->yplane1 != NULL) if(overlay->hwdata->channel->yplane1 != NULL)
overlay->hwdata->YStride = overlay->hwdata->channel->yplane1->pitch; overlay->hwdata->YStride = overlay->hwdata->channel->yplane1->pitch;
if(overlay->hwdata->channel->uplane1 != NULL)
overlay->hwdata->UStride = overlay->hwdata->channel->uplane1->pitch;
if(overlay->hwdata->channel->vplane1 != NULL) if(overlay->hwdata->channel->vplane1 != NULL)
overlay->hwdata->VStride = overlay->hwdata->channel->vplane1->pitch; overlay->hwdata->UStride = overlay->hwdata->channel->vplane1->pitch;
if(overlay->hwdata->channel->uplane1 != NULL)
overlay->hwdata->VStride = overlay->hwdata->channel->uplane1->pitch;
/* check for the validness of all planes */ /* check for the validness of all planes */
if ((overlay->hwdata->channel->yplane1 == NULL) && if ((overlay->hwdata->channel->yplane1 == NULL) &&
...@@ -267,12 +267,12 @@ SDL_Overlay* ph_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SD ...@@ -267,12 +267,12 @@ SDL_Overlay* ph_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SD
} }
if (overlay->planes > 1) if (overlay->planes > 1)
{ {
overlay->pitches[1] = overlay->hwdata->channel->uplane1->pitch; overlay->pitches[1] = overlay->hwdata->channel->vplane1->pitch;
overlay->pixels[1] = overlay->hwdata->CurrentFrameData->U; overlay->pixels[1] = overlay->hwdata->CurrentFrameData->U;
} }
if (overlay->planes > 2) if (overlay->planes > 2)
{ {
overlay->pitches[2] = overlay->hwdata->channel->vplane1->pitch; overlay->pitches[2] = overlay->hwdata->channel->uplane1->pitch;
overlay->pixels[2] = overlay->hwdata->CurrentFrameData->V; overlay->pixels[2] = overlay->hwdata->CurrentFrameData->V;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment