Mercurial > sdl-ios-xcode
view src/hermes/HeadX86.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 | c94b390687d2 |
| children | bb5ace455586 |
line wrap: on
line source
/* Header definitions for the x86 routines for the HERMES library Copyright (c) 1998 Christian Nentwich (brn@eleet.mcb.at) This source code is licensed under the GNU LGPL Please refer to the file COPYING.LIB contained in the distribution for licensing conditions */ #ifndef __HERMES_HEAD_X86__ #define __HERMES_HEAD_X86__ #ifdef X86_ASSEMBLER /* If you can't stand IFDEFS, then close your eyes now, please :) */ /* Ok, we start with normal function definitions */ #ifdef __cplusplus extern "C" { #endif void STACKCALL ConvertX86(HermesConverterInterface *); void STACKCALL ClearX86_32(HermesClearInterface *); void STACKCALL ClearX86_24(HermesClearInterface *); void STACKCALL ClearX86_16(HermesClearInterface *); void STACKCALL ClearX86_8(HermesClearInterface *); int STACKCALL Hermes_X86_CPU(); void ConvertX86p32_32BGR888(); void ConvertX86p32_32RGBA888(); void ConvertX86p32_32BGRA888(); void ConvertX86p32_24RGB888(); void ConvertX86p32_24BGR888(); void ConvertX86p32_16RGB565(); void ConvertX86p32_16BGR565(); void ConvertX86p32_16RGB555(); void ConvertX86p32_16BGR555(); void ConvertX86p32_8RGB332(); void ConvertX86p16_32RGB888(); void ConvertX86p16_32BGR888(); void ConvertX86p16_32RGBA888(); void ConvertX86p16_32BGRA888(); void ConvertX86p16_24RGB888(); void ConvertX86p16_24BGR888(); void ConvertX86p16_16BGR565(); void ConvertX86p16_16RGB555(); void ConvertX86p16_16BGR555(); void ConvertX86p16_8RGB332(); void CopyX86p_4byte(); void CopyX86p_3byte(); void CopyX86p_2byte(); void CopyX86p_1byte(); void ConvertX86pI8_32(); void ConvertX86pI8_24(); void ConvertX86pI8_16(); extern int ConvertX86p16_32RGB888_LUT_X86[512]; extern int ConvertX86p16_32BGR888_LUT_X86[512]; extern int ConvertX86p16_32RGBA888_LUT_X86[512]; extern int ConvertX86p16_32BGRA888_LUT_X86[512]; #ifdef __cplusplus } #endif /* Now fix up the ELF underscore problem */ #if defined(__ELF__) && defined(__GNUC__) #ifdef __cplusplus extern "C" { #endif int Hermes_X86_CPU() __attribute__ ((alias ("_Hermes_X86_CPU"))); void ConvertX86(HermesConverterInterface *) __attribute__ ((alias ("_ConvertX86"))); #if 0 void ClearX86_32(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_32"))); void ClearX86_24(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_24"))); void ClearX86_16(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_16"))); void ClearX86_8(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_8"))); #endif void ConvertX86p32_32BGR888() __attribute__ ((alias ("_ConvertX86p32_32BGR888"))); void ConvertX86p32_32RGBA888() __attribute__ ((alias ("_ConvertX86p32_32RGBA888"))); void ConvertX86p32_32BGRA888() __attribute__ ((alias ("_ConvertX86p32_32BGRA888"))); void ConvertX86p32_24RGB888() __attribute__ ((alias ("_ConvertX86p32_24RGB888"))); void ConvertX86p32_24BGR888() __attribute__ ((alias ("_ConvertX86p32_24BGR888"))); void ConvertX86p32_16RGB565() __attribute__ ((alias ("_ConvertX86p32_16RGB565"))); void ConvertX86p32_16BGR565() __attribute__ ((alias ("_ConvertX86p32_16BGR565"))); void ConvertX86p32_16RGB555() __attribute__ ((alias ("_ConvertX86p32_16RGB555"))); void ConvertX86p32_16BGR555() __attribute__ ((alias ("_ConvertX86p32_16BGR555"))); void ConvertX86p32_8RGB332() __attribute__ ((alias ("_ConvertX86p32_8RGB332"))); #if 0 void ConvertX86p16_32RGB888() __attribute__ ((alias ("_ConvertX86p16_32RGB888"))); void ConvertX86p16_32BGR888() __attribute__ ((alias ("_ConvertX86p16_32BGR888"))); void ConvertX86p16_32RGBA888() __attribute__ ((alias ("_ConvertX86p16_32RGBA888"))); void ConvertX86p16_32BGRA888() __attribute__ ((alias ("_ConvertX86p16_32BGRA888"))); void ConvertX86p16_24RGB888() __attribute__ ((alias ("_ConvertX86p16_24RGB888"))); void ConvertX86p16_24BGR888() __attribute__ ((alias ("_ConvertX86p16_24BGR888"))); #endif void ConvertX86p16_16BGR565() __attribute__ ((alias ("_ConvertX86p16_16BGR565"))); void ConvertX86p16_16RGB555() __attribute__ ((alias ("_ConvertX86p16_16RGB555"))); void ConvertX86p16_16BGR555() __attribute__ ((alias ("_ConvertX86p16_16BGR555"))); void ConvertX86p16_8RGB332() __attribute__ ((alias ("_ConvertX86p16_8RGB332"))); #if 0 void CopyX86p_4byte() __attribute__ ((alias ("_CopyX86p_4byte"))); void CopyX86p_3byte() __attribute__ ((alias ("_CopyX86p_3byte"))); void CopyX86p_2byte() __attribute__ ((alias ("_CopyX86p_2byte"))); void CopyX86p_1byte() __attribute__ ((alias ("_CopyX86p_1byte"))); void ConvertX86pI8_32() __attribute__ ((alias ("_ConvertX86pI8_32"))); void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24"))); void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16"))); extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86"))); extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86"))); extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86"))); extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86"))); #endif #ifdef __cplusplus } #endif #endif /* ELF & GNU */ /* Make it run with WATCOM C */ #ifdef __WATCOMC__ #pragma warning 601 9 #pragma aux Hermes_X86_CPU "_*" #pragma aux ConvertX86 "_*" modify [EAX EBX ECX EDX ESI EDI] #pragma aux ClearX86_32 "_*" modify [EAX EBX ECX EDX ESI EDI] #pragma aux ClearX86_24 "_*" modify [EAX EBX ECX EDX ESI EDI] #pragma aux ClearX86_16 "_*" modify [EAX EBX ECX EDX ESI EDI] #pragma aux ClearX86_8 "_*" modify [EAX EBX ECX EDX ESI EDI] #pragma aux ConvertX86p32_32BGR888 "_*" #pragma aux ConvertX86p32_32RGBA888 "_*" #pragma aux ConvertX86p32_32BGRA888 "_*" #pragma aux ConvertX86p32_24RGB888 "_*" #pragma aux ConvertX86p32_24BGR888 "_*" #pragma aux ConvertX86p32_16RGB565 "_*" #pragma aux ConvertX86p32_16BGR565 "_*" #pragma aux ConvertX86p32_16RGB555 "_*" #pragma aux ConvertX86p32_16BGR555 "_*" #pragma aux ConvertX86p32_8RGB332 "_*" #pragma aux ConvertX86p16_32RGB888 "_*" #pragma aux ConvertX86p16_32BGR888 "_*" #pragma aux ConvertX86p16_32RGBA888 "_*" #pragma aux ConvertX86p16_32BGRA888 "_*" #pragma aux ConvertX86p16_24RGB888 "_*" #pragma aux ConvertX86p16_24BGR888 "_*" #pragma aux ConvertX86p16_16BGR565 "_*" #pragma aux ConvertX86p16_16RGB555 "_*" #pragma aux ConvertX86p16_16BGR555 "_*" #pragma aux ConvertX86p16_8RGB332 "_*" #pragma aux CopyX86p_4byte "_*" #pragma aux CopyX86p_3byte "_*" #pragma aux CopyX86p_2byte "_*" #pragma aux CopyX86p_1byte "_*" #pragma aux ConvertX86pI8_32 "_*" #pragma aux ConvertX86pI8_24 "_*" #pragma aux ConvertX86pI8_16 "_*" #pragma aux ConvertX86p16_32RGB888_LUT_X86 "_*" #pragma aux ConvertX86p16_32BGR888_LUT_X86 "_*" #pragma aux ConvertX86p16_32RGBA888_LUT_X86 "_*" #pragma aux ConvertX86p16_32BGRA888_LUT_X86 "_*" #endif /* __WATCOMC__ */ #endif /* X86_ASSEMBLER */ #endif