Mercurial > sdl-ios-xcode
annotate src/hermes/x86_main.asm @ 1133:609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
To: SDL Developers <sdl@libsdl.org>
From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se>
Date: Mon, 30 May 2005 23:29:04 +0200
Subject: [SDL] Mac OS X Video Drivers [patch]
I've updated/added the Carbon and X11 video drivers
to the Mac OS X port of SDL 1.2 (the CVS version),
and made the Cocoa driver and runtime *optional*.
The default is still Cocoa, and the "Quartz" driver.
But you can now also use "toolbox" for Carbon, and
"x11" for running with Apple's (or other) X11 server:
export SDL_VIDEODRIVER=x11
export SDL_VIDEO_GL_DRIVER=/usr/X11R6/lib/libGL.dylib
It also checks if the frameworks are available, by a:
#include <Carbon/Carbon.h> or #import <Cocoa/Cocoa.h>
(this should make it configure on plain Darwin as well?)
Here are the new configure targets:
--enable-video-cocoa use Cocoa/Quartz video driver default=yes
--enable-video-carbon use Carbon/QuickDraw video driver default=yes
--enable-video-x11 use X11 video driver default=no
./configure --enable-video-cocoa --enable-video-carbon
--enable-video-x11 \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
The Carbon version is just an updated version of the old
SDL driver for Mac OS 9, and could probably be improved...
(but it does work, including the Carbon version of SDLmain)
If you disable cocoa, you can run with -framework Carbon only,
and the C version of SDL_main.c. And if you disable carbon too,
you can still use the X11 version which doesn't require SDLmain.
I updated the DrawSprocket version, but did not include it.
(no blitters or VRAM GWorlds etc. available on OS X anyway)
Besides for Mac OS 9, I don't think there's any use for it ?
And note that any performance on Mac OS X equals OpenGL anyway...
You can get "fair" software SDL results on captured CG displays,
but for decent frame rates you need to be using GL for rendering.
Finally, here is the patch itself:
http://www.algonet.se/~afb/SDL-12CVS-macvideo.patch
--anders
PS. It says "video", but as usual it applies to mouse/keyboard too.
------
To: A list for developers using the SDL library <sdl@libsdl.org>
From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se>
Date: Sun, 4 Sep 2005 10:02:15 +0200
Subject: [SDL] Updated Mac patch
Updated the previous Mac patch to disable Carbon by default.
Also "fixed" the SDL.spec again, so that it builds on Darwin.
http://www.algonet.se/~afb/SDL-1.2.9-mac.patch
Also applied fine to SDL12 CVS, when I tried it.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Thu, 08 Sep 2005 06:16:14 +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 |