Mercurial > sdl-ios-xcode
comparison src/video/android/SDL_androidgl.c @ 4722:faa228f7ce5b
- Cleaned up a bunch of code
- Added 'feature' enable/disable so we're not running accel/sound/whatever in Java when we don't need to be
- More work on the sound system. But it still crashes pretty horribly, not sure why yet.
author | Paul Hunkin <paul@bieh.net> |
---|---|
date | Tue, 27 Jul 2010 21:21:24 +0200 |
parents | ed040b480a9f |
children | 16fec41375a6 |
comparison
equal
deleted
inserted
replaced
4721:7bb9d3a3f257 | 4722:faa228f7ce5b |
---|---|
39 #include <pthread.h> | 39 #include <pthread.h> |
40 | 40 |
41 /* | 41 /* |
42 These things are in the JNI android support | 42 These things are in the JNI android support |
43 */ | 43 */ |
44 extern void sdl_create_context(); | 44 extern void Android_CreateContext(); |
45 extern void sdl_render(); | 45 extern void Android_Render(); |
46 | 46 |
47 /* GL functions */ | 47 /* GL functions */ |
48 int Android_GL_LoadLibrary(_THIS, const char *path){ | 48 int Android_GL_LoadLibrary(_THIS, const char *path){ |
49 __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_LoadLibrary\n"); | 49 __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_LoadLibrary\n"); |
50 return 0; | 50 return 0; |
65 return 0; | 65 return 0; |
66 } | 66 } |
67 */ | 67 */ |
68 | 68 |
69 SDL_GLContext Android_GL_CreateContext(_THIS, SDL_Window * window){ | 69 SDL_GLContext Android_GL_CreateContext(_THIS, SDL_Window * window){ |
70 sdl_create_context(); | 70 Android_CreateContext(); |
71 return 1; | 71 return 1; |
72 } | 72 } |
73 | 73 |
74 int Android_GL_MakeCurrent(_THIS, SDL_Window * window, | 74 int Android_GL_MakeCurrent(_THIS, SDL_Window * window, |
75 SDL_GLContext context){ | 75 SDL_GLContext context){ |
86 __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_GetSwapInterval\n"); | 86 __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_GetSwapInterval\n"); |
87 return 0; | 87 return 0; |
88 } | 88 } |
89 | 89 |
90 void Android_GL_SwapWindow(_THIS, SDL_Window * window){ | 90 void Android_GL_SwapWindow(_THIS, SDL_Window * window){ |
91 sdl_render(); | 91 Android_Render(); |
92 } | 92 } |
93 | 93 |
94 void Android_GL_DeleteContext(_THIS, SDL_GLContext context){ | 94 void Android_GL_DeleteContext(_THIS, SDL_GLContext context){ |
95 __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_DeleteContext\n"); | 95 __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_DeleteContext\n"); |
96 } | 96 } |