view src/audio/mint/SDL_mintaudio_gsxb.h @ 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 594422ab8f9f
children d910939febfa
line wrap: on
line source

/*
 * GSXB audio definitions
 * 
 * Patrice Mandin
 */

#ifndef _SDL_mintaudio_gsxb_h
#define _SDL_mintaudio_gsxb_h

#include <mint/falcon.h>	/* for trap_14_xxx macros */

/* GSXB Cookie */

#define C_GSXB		0x47535842L

/* Bit 5 in cookie _SND */

#define SND_GSXB	(1<<5)

/* NSoundcmd modes */

#define SETRATE			7	/* Set sample rate */
#define SET8BITFORMAT	8	/* 8 bits format */
#define SET16BITFORMAT	9	/* 16 bits format */
#define SET24BITFORMAT	10	/* 24 bits format */
#define SET32BITFORMAT	11	/* 32 bits format */
#define LTATTEN_MASTER	12	/* Attenuation */
#define RTATTEN_MASTER	13
#define LTATTEN_MICIN	14
#define RTATTEN_MICIN	15
#define LTATTEN_FMGEN	16
#define RTATTEN_FMGEN	17
#define LTATTEN_LINEIN	18
#define RTATTEN_LINEIN	19
#define LTATTEN_CDIN	20
#define RTATTEN_CDIN	21
#define LTATTEN_VIDIN	22
#define RTATTEN_VIDIN	23
#define LTATTEN_AUXIN	24
#define RTATTEN_AUXIN	25

/* Setmode modes */

#define MONO16		3
#define STEREO24	4
#define STEREO32	5
#define MONO24		6
#define MONO32		7

/* Sndstatus modes */

#define SND_QUERYFORMATS	2
#define SND_QUERYMIXERS		3
#define SND_QUERYSOURCES	4
#define SND_QUERYDUPLEX		5
#define SND_QUERY8BIT		8
#define SND_QUERY16BIT		9
#define SND_QUERY24BIT		10
#define SND_QUERY32BIT		11

#define SND_FORMAT8		(1<<0)
#define SND_FORMAT16	(1<<1)
#define SND_FORMAT24	(1<<2)
#define SND_FORMAT32	(1<<3)

#define SND_FORMATSIGNED		(1<<0)
#define SND_FORMATUNSIGNED		(1<<1)
#define SND_FORMATBIGENDIAN		(1<<2)
#define SND_FORMATLITTLEENDIAN	(1<<3)

/* Devconnect prescalers */

#define CLK_44K		1
#define CLK_22K		3
#define CLK_11K		7

/* Extra xbios functions */

#define NSoundcmd(mode,data,data2)	\
	(long)trap_14_wwl((short)130,(short)(mode),(short)(data),(long)(data2))
#define NSetinterrupt(src_inter,cause,inth_addr)	\
	(long)trap_14_wwwl((short)135,(short)(src_inter),(short)(cause),	\
		(long)(inth_addr))

#endif /* _SDL_mintaudio_gsxb_h */