Mercurial > sdl-ios-xcode
view src/audio/mint/SDL_mintaudio_it.S @ 876:9e84d106ec19
(Said Max Horn on the SDL mailing list...)
Hi folks,
based on Eric Wing's patch, I created the attached patch which fixes
the OpenGL coordinate inversion bug in SDL. It works fine over here on
10.3 with Ryan's test program (which I also attached).
There is another change in it: I removed the "- 1" in the two lines
using CGDisplayPixelsHigh()... while I understand from a logical point
of view why they *should* be correct, I checked the actual values
computed that way, and they were off-by-one. After removing the " - 1",
the returned mouse coordinates are correct. I checked this by moving
the mouse to the screen top/bottom in fullscreen mode, BTW. With the
change, the proper values 0 and 479 are returned (in 640x480 mode).
Sam, you may still want to test on 10.1, it's very simple using Ryan's
minimal test code :-)
Cheers,
Max
(Here is the reproduction case for revision history's sake...)
/*
* To compile:
* gcc -o test test.c `sdl-config --cflags` `sdl-config --libs` -framework OpenGL
*
* --ryan.
*/
#include <stdio.h>
#include "SDL.h"
#include "SDL_opengl.h"
int main(int argc, char **argv)
{
Uint32 flags = SDL_OPENGL /* | SDL_FULLSCREEN */;
SDL_Surface *screen;
SDL_Event event;
int done = 0;
GLfloat ratio;
SDL_Init(SDL_INIT_VIDEO);
SDL_ShowCursor(0);
if ((argv[1]) && (strcmp(argv[1], "--grab") == 0))
SDL_WM_GrabInput(SDL_GRAB_ON);
screen = SDL_SetVideoMode(640, 480, 0, flags);
if (!screen)
return(42);
ratio = ((GLfloat) screen->w) / ((GLfloat) screen->h);
glClearColor( 0.0f, 0.0f, 0.0f, 0.0f );
glClearDepth( 1.0f );
glEnable( GL_DEPTH_TEST );
glDepthFunc( GL_LEQUAL );
glViewport( 0, 0, screen->w, screen->h);
glMatrixMode( GL_PROJECTION );
glLoadIdentity();
gluPerspective( 45.0f, ratio, 0.1f, 100.0f );
glMatrixMode( GL_MODELVIEW );
glLoadIdentity();
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
SDL_GL_SwapBuffers();
// eh, close enough.
#define MAX_X 6.12
#define MAX_Y 4.50
while (!done)
{
int x, y;
GLfloat glx, gly;
if (!SDL_WaitEvent(&event))
break;
switch (event.type)
{
case SDL_KEYUP:
if (event.key.keysym.sym == SDLK_ESCAPE)
done = 1;
break;
}
SDL_GetMouseState(&x, &y);
glx = ((((GLfloat) x) / ((GLfloat) screen->w)) - 0.5f) * MAX_X;
gly = ((((GLfloat) y) / ((GLfloat) screen->h)) - 0.5f) * MAX_Y;
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glLoadIdentity();
glTranslatef(glx,-gly,-6.0f);
glBegin(GL_TRIANGLES);
glColor3f(1,0,0); glVertex3f( 0.00f, 0.25f, 0.00f);
glColor3f(0,1,0); glVertex3f(-0.25f, -0.25f, 0.00f);
glColor3f(0,0,1); glVertex3f( 0.25f, -0.25f, 0.00f);
glEnd();
SDL_GL_SwapBuffers();
}
SDL_Quit();
return(0);
}
/* end of test.c ... */
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Mon, 22 Mar 2004 09:38:20 +0000 |
| parents | c4803992e09c |
| children | 185acc07127a |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ /* Audio interrupts Patrice Mandin */ .text .globl _SDL_MintAudio_Callback .globl _SDL_MintAudio_GsxbInterrupt .globl _SDL_MintAudio_EmptyGsxbInterrupt .globl _SDL_MintAudio_XbiosInterrupt .globl _SDL_MintAudio_Dma8Interrupt .globl _SDL_MintAudio_StfaInterrupt .globl _SDL_MintAudio_mutex .globl _SDL_MintAudio_audiobuf .globl _SDL_MintAudio_numbuf .globl _SDL_MintAudio_audiosize .globl _SDL_MintAudio_stfa /* How it works: - Audio is playing buffer #0 (resp. #1) - We must calculate a sample in buffer #1 (resp. #0) so we first call the callback to do it - Then we swap the buffers */ /*--- GSXB interrupt vector ---*/ .text _SDL_MintAudio_GsxbInterrupt: /* Check if we are not already running */ tstw _SDL_MintAudio_mutex bnes _SDL_MintAudio_EmptyGsxbInterrupt notw _SDL_MintAudio_mutex /* Swap buffers */ eorw #1,_SDL_MintAudio_numbuf moveml d0-d2/a0-a2,sp@- /* Callback */ jsr _SDL_MintAudio_Callback /* Set new buffer */ moveq #0,d0 movel _SDL_MintAudio_audiosize,d1 movew _SDL_MintAudio_numbuf,d0 lsll #2,d0 lea _SDL_MintAudio_audiobuf,a0 movel a0@(d0:l),a1 lea a1@(d1:l),a2 movel a2,sp@- movel a1,sp@- clrw sp@- movew #131,sp@- trap #14 lea sp@(12),sp moveml sp@+,d0-d2/a0-a2 clrw _SDL_MintAudio_mutex _SDL_MintAudio_EmptyGsxbInterrupt: rts /*--- Xbios interrupt vector ---*/ _SDL_MintAudio_XbiosInterrupt: /* Reenable interrupts, so other interrupts can work */ movew #0x2300,sr /* Clear service bit, so other MFP interrupts can work */ bclr #5,0xfffffa0f:w /* Check if we are not already running */ tstw _SDL_MintAudio_mutex bnes SDL_MintAudio_XbiosEnd notw _SDL_MintAudio_mutex /* Swap buffers */ eorw #1,_SDL_MintAudio_numbuf moveml d0-d2/a0-a2,sp@- /* Callback */ jsr _SDL_MintAudio_Callback /* Set new buffer */ moveq #0,d0 movel _SDL_MintAudio_audiosize,d1 movew _SDL_MintAudio_numbuf,d0 lsll #2,d0 lea _SDL_MintAudio_audiobuf,a0 movel a0@(d0:l),a1 lea a1@(d1:l),a2 movel a2,sp@- movel a1,sp@- clrw sp@- movew #131,sp@- trap #14 lea sp@(12),sp moveml sp@+,d0-d2/a0-a2 clrw _SDL_MintAudio_mutex SDL_MintAudio_XbiosEnd: rte /*--- DMA 8 bits interrupt vector ---*/ _SDL_MintAudio_Dma8Interrupt: /* Reenable interrupts, so other interrupts can work */ movew #0x2300,sr /* Clear service bit, so other MFP interrupts can work */ bclr #5,0xfffffa0f:w /* Check if we are not already running */ tstw _SDL_MintAudio_mutex bnes SDL_MintAudio_Dma8End notw _SDL_MintAudio_mutex /* Swap buffers */ eorw #1,_SDL_MintAudio_numbuf moveml d0-d1/a0-a1,sp@- /* Callback */ jsr _SDL_MintAudio_Callback /* Set new buffer */ moveq #0,d0 movew _SDL_MintAudio_numbuf,d0 lslw #2,d0 lea _SDL_MintAudio_audiobuf,a0 movel a0@(d0:w),d1 /* Modify DMA addresses */ lea 0xffff8900:w,a0 moveb d1,a0@(0x07) /* Start address */ rorl #8,d1 moveb d1,a0@(0x05) rorl #8,d1 moveb d1,a0@(0x03) swap d1 addl _SDL_MintAudio_audiosize,d1 moveb d1,a0@(0x13) /* End address */ rorl #8,d1 moveb d1,a0@(0x11) rorl #8,d1 moveb d1,a0@(0x0f) moveml sp@+,d0-d1/a0-a1 clrw _SDL_MintAudio_mutex SDL_MintAudio_Dma8End: rte /*--- STFA interrupt vector ---*/ STFA_SOUND_START = 6 STFA_SOUND_END = STFA_SOUND_START+8 _SDL_MintAudio_StfaInterrupt: /* Reenable interrupts, so other interrupts can work */ movew #0x2300,sr /* Check if we are not already running */ tstw _SDL_MintAudio_mutex bnes SDL_MintAudio_StfaEnd notw _SDL_MintAudio_mutex /* Swap buffers */ eorw #1,_SDL_MintAudio_numbuf moveml d0-d1/a0-a1,sp@- /* Callback */ jsr _SDL_MintAudio_Callback /* Set new buffer */ moveq #0,d0 movel _SDL_MintAudio_stfa,a1 movew _SDL_MintAudio_numbuf,d0 lslw #2,d0 lea _SDL_MintAudio_audiobuf,a0 movel a0@(d0:w),d1 /* Modify STFA replay buffers */ movel d1,a1@(STFA_SOUND_START) addl _SDL_MintAudio_audiosize,d1 movel d1,a1@(STFA_SOUND_END) moveml sp@+,d0-d1/a0-a1 clrw _SDL_MintAudio_mutex SDL_MintAudio_StfaEnd: rte