Mercurial > sdl-ios-xcode
annotate src/hermes/x86_main.asm @ 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 | 74212992fb08 |
children | da33b7e6d181 |
rev | line source |
---|---|
0 | 1 ; |
2 ; x86 format converters for HERMES | |
3 ; Some routines Copyright (c) 1998 Christian Nentwich (brn@eleet.mcb.at) | |
4 ; This source code is licensed under the GNU LGPL | |
5 ; | |
6 ; Please refer to the file COPYING.LIB contained in the distribution for | |
7 ; licensing conditions | |
8 ; | |
9 ; Most routines are (c) Glenn Fiedler (ptc@gaffer.org), used with permission | |
10 ; | |
11 | |
12 BITS 32 | |
13 | |
14 GLOBAL _ConvertX86 | |
15 GLOBAL _x86return | |
16 | |
17 GLOBAL _Hermes_X86_CPU | |
18 | |
19 | |
20 SECTION .data | |
21 | |
22 cpu_flags dd 0 | |
23 | |
24 | |
25 SECTION .text | |
26 | |
27 ;; _ConvertX86: | |
28 ;; [ESP+8] ConverterInfo* | |
29 ;; -------------------------------------------------------------------------- | |
30 ;; ConverterInfo (ebp+..) | |
31 ;; 0: void *s_pixels | |
32 ;; 4: int s_width | |
33 ;; 8: int s_height | |
34 ;; 12: int s_add | |
35 ;; 16: void *d_pixels | |
36 ;; 20: int d_width | |
37 ;; 24: int d_height | |
38 ;; 28: int d_add | |
39 ;; 32: void (*converter_function)() | |
40 ;; 36: int32 *lookup | |
41 | |
42 _ConvertX86: | |
43 push ebp | |
44 mov ebp,esp | |
45 | |
46 ; Save the registers used by the blitters, necessary for optimized code | |
47 pusha | |
48 | |
49 mov eax,[ebp+8] | |
50 | |
51 cmp dword [eax+4],BYTE 0 | |
52 je endconvert | |
53 | |
54 mov ebp,eax | |
55 | |
56 mov esi,[ebp+0] | |
57 mov edi,[ebp+16] | |
58 | |
59 y_loop: | |
60 mov ecx,[ebp+4] | |
61 | |
62 jmp [ebp+32] | |
63 | |
64 _x86return: | |
65 add esi,[ebp+12] | |
66 add edi,[ebp+28] | |
67 | |
68 dec dword [ebp+8] | |
69 jnz y_loop | |
70 | |
71 ; Restore the registers used by the blitters, necessary for optimized code | |
72 popa | |
73 | |
74 pop ebp | |
75 | |
76 endconvert: | |
77 ret | |
78 | |
79 | |
80 | |
81 ;; Hermes_X86_CPU returns the CPUID flags in eax | |
82 | |
83 _Hermes_X86_CPU: | |
84 pushfd | |
85 pop eax | |
86 | |
87 mov ecx,eax | |
88 | |
89 xor eax,040000h | |
90 push eax | |
91 | |
92 popfd | |
93 pushfd | |
94 | |
95 pop eax | |
96 xor eax,ecx | |
97 jz .L1 ; Processor is 386 | |
98 | |
99 push ecx | |
100 popfd | |
101 | |
102 mov eax,ecx | |
103 xor eax,200000h | |
104 | |
105 push eax | |
106 popfd | |
107 pushfd | |
108 | |
109 pop eax | |
110 xor eax,ecx | |
111 je .L1 | |
112 | |
113 pusha | |
114 | |
115 mov eax,1 | |
116 cpuid | |
117 | |
118 mov [cpu_flags],edx | |
119 | |
120 popa | |
121 | |
122 mov eax,[cpu_flags] | |
123 | |
124 .L1: | |
125 ret |