1.1 --- a/src/video/android/SDL_androidgl.c Fri Jun 18 00:02:13 2010 +1200
1.2 +++ b/src/video/android/SDL_androidgl.c Fri Jun 18 00:03:09 2010 +1200
1.3 @@ -34,125 +34,62 @@
1.4 #include "SDL_androidevents.h"
1.5 #include "SDL_androidrender.h"
1.6
1.7 -/* Android header */
1.8 -#include "egl.h"
1.9 +#include <android/log.h>
1.10
1.11
1.12 -//EGL globals
1.13 -static EGLDisplay iEglDisplay;
1.14 -static EGLConfig iEglConfig;
1.15 -static EGLContext iEglContext;
1.16 -static EGLSurface iEglSurface;
1.17 -
1.18 -EGLint attribList [] =
1.19 -{
1.20 - EGL_BUFFER_SIZE, 16, //16 bit color
1.21 - EGL_DEPTH_SIZE, 15,
1.22 - EGL_NONE
1.23 -};
1.24 -
1.25 -
1.26 +/*
1.27 +These things are in the JNI android support
1.28 +*/
1.29 +
1.30
1.31
1.32 /* GL functions */
1.33 int Android_GL_LoadLibrary(_THIS, const char *path){
1.34 - printf("[STUB] GL_LoadLibrary\n");
1.35 + __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_LoadLibrary\n");
1.36 return 0;
1.37 }
1.38
1.39 void *Android_GL_GetProcAddress(_THIS, const char *proc){
1.40 - printf("[STUB] GL_GetProcAddress\n");
1.41 + __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_GetProcAddress\n");
1.42 return 0;
1.43 }
1.44
1.45 void Android_GL_UnloadLibrary(_THIS){
1.46 - printf("[STUB] GL_UnloadLibrary\n");
1.47 + __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_UnloadLibrary\n");
1.48 }
1.49
1.50 /*
1.51 int *Android_GL_GetVisual(_THIS, Display * display, int screen){
1.52 - printf("[STUB] GL_GetVisual\n");
1.53 + __android_log_print(ANDROID_LOG_INFO, "SDL","[STUB] GL_GetVisual\n");
1.54 return 0;
1.55 }
1.56 */
1.57
1.58 SDL_GLContext Android_GL_CreateContext(_THIS, SDL_Window * window){
1.59 - printf("[STUB] GL_CreateContext\n");
1.60 -
1.61 - //Start up the display
1.62 - iEglDisplay = eglGetDisplay (EGL_DEFAULT_DISPLAY);
1.63 - if(iEglDisplay == EGL_NO_DISPLAY){
1.64 - printf("Unable to find a suitable EGLDisplay\n");
1.65 - return NULL;
1.66 - }
1.67 -
1.68 - printf("1\n");
1.69 -
1.70 - if(!eglInitialize(iEglDisplay, 0, 0)){
1.71 - printf("Couldn't init display\n");
1.72 - return NULL;
1.73 - }
1.74 -
1.75 - printf("2\n");
1.76 -
1.77 - EGLint numConfigs;
1.78 -
1.79 - if(!eglChooseConfig(iEglDisplay, attribList, &iEglConfig, 1, &numConfigs)){
1.80 - printf("Couldn't choose config\n");
1.81 - return NULL;
1.82 - }
1.83 -
1.84 - printf("3\n");
1.85 -
1.86 - iEglContext = eglCreateContext(iEglDisplay, iEglConfig, EGL_NO_CONTEXT, 0);
1.87 -
1.88 - if(iEglContext == 0){
1.89 - printf("Couldn't create context\n");
1.90 - return NULL;
1.91 - }
1.92 -
1.93 - printf("4\n");
1.94 -
1.95 - NativeWindowType iWindow = 1; //android_createDisplaySurface();
1.96 -
1.97 - iEglSurface = eglCreateWindowSurface(iEglDisplay, iEglConfig, iWindow, 0);
1.98 -
1.99 - printf("5\n");
1.100 -
1.101 - if(iEglSurface == NULL){
1.102 - printf("Couldn't create surface\n");
1.103 - return NULL;
1.104 - }
1.105 -
1.106 - printf("6\n");
1.107 -
1.108 - eglMakeCurrent(iEglDisplay, iEglSurface, iEglSurface, iEglContext);
1.109 -
1.110 - printf("fininshed making context\n");
1.111 -
1.112 - return iEglSurface;
1.113 + __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_CreateContext\n");
1.114 + return NULL;
1.115 }
1.116
1.117 int Android_GL_MakeCurrent(_THIS, SDL_Window * window,
1.118 SDL_GLContext context){
1.119 - printf("[STUB] GL_MakeCurrent\n");
1.120 + __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_MakeCurrent\n");
1.121 return 0;
1.122 }
1.123
1.124 int Android_GL_SetSwapInterval(_THIS, int interval){
1.125 - printf("[STUB] GL_SetSwapInterval\n");
1.126 + __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_SetSwapInterval\n");
1.127 return 0;
1.128 }
1.129
1.130 int Android_GL_GetSwapInterval(_THIS){
1.131 - printf("[STUB] GL_GetSwapInterval\n");
1.132 + __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_GetSwapInterval\n");
1.133 return 0;
1.134 }
1.135
1.136 void Android_GL_SwapWindow(_THIS, SDL_Window * window){
1.137 - printf("[STUB] GL_SwapWindow\n");
1.138 + __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_SwapWindow\n");
1.139 }
1.140
1.141 void Android_GL_DeleteContext(_THIS, SDL_GLContext context){
1.142 - printf("[STUB] GL_DeleteContext\n");
1.143 + __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_DeleteContext\n");
1.144 }
2.1 --- a/src/video/android/SDL_androidvideo.c Fri Jun 18 00:02:13 2010 +1200
2.2 +++ b/src/video/android/SDL_androidvideo.c Fri Jun 18 00:03:09 2010 +1200
2.3 @@ -120,8 +120,8 @@
2.4
2.5 /* Use a fake 32-bpp desktop mode */
2.6 mode.format = SDL_PIXELFORMAT_RGB888;
2.7 - mode.w = 1024;
2.8 - mode.h = 768;
2.9 + mode.w = 320;
2.10 + mode.h = 480;
2.11 mode.refresh_rate = 0;
2.12 mode.driverdata = NULL;
2.13 if (SDL_AddBasicVideoDisplay(&mode) < 0) {
3.1 --- a/src/video/android/egl.h Fri Jun 18 00:02:13 2010 +1200
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,330 +0,0 @@
3.4 -/* -*- mode: c; tab-width: 8; -*- */
3.5 -/* vi: set sw=4 ts=8: */
3.6 -/* Reference version of egl.h for EGL 1.4.
3.7 - * $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $
3.8 - */
3.9 -
3.10 -/*
3.11 -** Copyright (c) 2007-2009 The Khronos Group Inc.
3.12 -**
3.13 -** Permission is hereby granted, free of charge, to any person obtaining a
3.14 -** copy of this software and/or associated documentation files (the
3.15 -** "Materials"), to deal in the Materials without restriction, including
3.16 -** without limitation the rights to use, copy, modify, merge, publish,
3.17 -** distribute, sublicense, and/or sell copies of the Materials, and to
3.18 -** permit persons to whom the Materials are furnished to do so, subject to
3.19 -** the following conditions:
3.20 -**
3.21 -** The above copyright notice and this permission notice shall be included
3.22 -** in all copies or substantial portions of the Materials.
3.23 -**
3.24 -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
3.25 -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
3.26 -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
3.27 -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
3.28 -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
3.29 -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
3.30 -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
3.31 -*/
3.32 -
3.33 -#ifndef __egl_h_
3.34 -#define __egl_h_
3.35 -
3.36 -/* All platform-dependent types and macro boilerplate (such as EGLAPI
3.37 - * and EGLAPIENTRY) should go in eglplatform.h.
3.38 - */
3.39 -#include "eglplatform.h"
3.40 -
3.41 -#ifdef __cplusplus
3.42 -extern "C" {
3.43 -#endif
3.44 -
3.45 -/* EGL Types */
3.46 -/* EGLint is defined in eglplatform.h */
3.47 -typedef unsigned int EGLBoolean;
3.48 -typedef unsigned int EGLenum;
3.49 -typedef void *EGLConfig;
3.50 -typedef void *EGLContext;
3.51 -typedef void *EGLDisplay;
3.52 -typedef void *EGLSurface;
3.53 -typedef void *EGLClientBuffer;
3.54 -
3.55 -/* EGL Versioning */
3.56 -#define EGL_VERSION_1_0 1
3.57 -#define EGL_VERSION_1_1 1
3.58 -#define EGL_VERSION_1_2 1
3.59 -#define EGL_VERSION_1_3 1
3.60 -#define EGL_VERSION_1_4 1
3.61 -
3.62 -/* EGL Enumerants. Bitmasks and other exceptional cases aside, most
3.63 - * enums are assigned unique values starting at 0x3000.
3.64 - */
3.65 -
3.66 -/* EGL aliases */
3.67 -#define EGL_FALSE 0
3.68 -#define EGL_TRUE 1
3.69 -
3.70 -/* Out-of-band handle values */
3.71 -#define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)0)
3.72 -#define EGL_NO_CONTEXT ((EGLContext)0)
3.73 -#define EGL_NO_DISPLAY ((EGLDisplay)0)
3.74 -#define EGL_NO_SURFACE ((EGLSurface)0)
3.75 -
3.76 -/* Out-of-band attribute value */
3.77 -#define EGL_DONT_CARE ((EGLint)-1)
3.78 -
3.79 -/* Errors / GetError return values */
3.80 -#define EGL_SUCCESS 0x3000
3.81 -#define EGL_NOT_INITIALIZED 0x3001
3.82 -#define EGL_BAD_ACCESS 0x3002
3.83 -#define EGL_BAD_ALLOC 0x3003
3.84 -#define EGL_BAD_ATTRIBUTE 0x3004
3.85 -#define EGL_BAD_CONFIG 0x3005
3.86 -#define EGL_BAD_CONTEXT 0x3006
3.87 -#define EGL_BAD_CURRENT_SURFACE 0x3007
3.88 -#define EGL_BAD_DISPLAY 0x3008
3.89 -#define EGL_BAD_MATCH 0x3009
3.90 -#define EGL_BAD_NATIVE_PIXMAP 0x300A
3.91 -#define EGL_BAD_NATIVE_WINDOW 0x300B
3.92 -#define EGL_BAD_PARAMETER 0x300C
3.93 -#define EGL_BAD_SURFACE 0x300D
3.94 -#define EGL_CONTEXT_LOST 0x300E /* EGL 1.1 - IMG_power_management */
3.95 -
3.96 -/* Reserved 0x300F-0x301F for additional errors */
3.97 -
3.98 -/* Config attributes */
3.99 -#define EGL_BUFFER_SIZE 0x3020
3.100 -#define EGL_ALPHA_SIZE 0x3021
3.101 -#define EGL_BLUE_SIZE 0x3022
3.102 -#define EGL_GREEN_SIZE 0x3023
3.103 -#define EGL_RED_SIZE 0x3024
3.104 -#define EGL_DEPTH_SIZE 0x3025
3.105 -#define EGL_STENCIL_SIZE 0x3026
3.106 -#define EGL_CONFIG_CAVEAT 0x3027
3.107 -#define EGL_CONFIG_ID 0x3028
3.108 -#define EGL_LEVEL 0x3029
3.109 -#define EGL_MAX_PBUFFER_HEIGHT 0x302A
3.110 -#define EGL_MAX_PBUFFER_PIXELS 0x302B
3.111 -#define EGL_MAX_PBUFFER_WIDTH 0x302C
3.112 -#define EGL_NATIVE_RENDERABLE 0x302D
3.113 -#define EGL_NATIVE_VISUAL_ID 0x302E
3.114 -#define EGL_NATIVE_VISUAL_TYPE 0x302F
3.115 -#define EGL_PRESERVED_RESOURCES 0x3030
3.116 -#define EGL_SAMPLES 0x3031
3.117 -#define EGL_SAMPLE_BUFFERS 0x3032
3.118 -#define EGL_SURFACE_TYPE 0x3033
3.119 -#define EGL_TRANSPARENT_TYPE 0x3034
3.120 -#define EGL_TRANSPARENT_BLUE_VALUE 0x3035
3.121 -#define EGL_TRANSPARENT_GREEN_VALUE 0x3036
3.122 -#define EGL_TRANSPARENT_RED_VALUE 0x3037
3.123 -#define EGL_NONE 0x3038 /* Attrib list terminator */
3.124 -#define EGL_BIND_TO_TEXTURE_RGB 0x3039
3.125 -#define EGL_BIND_TO_TEXTURE_RGBA 0x303A
3.126 -#define EGL_MIN_SWAP_INTERVAL 0x303B
3.127 -#define EGL_MAX_SWAP_INTERVAL 0x303C
3.128 -#define EGL_LUMINANCE_SIZE 0x303D
3.129 -#define EGL_ALPHA_MASK_SIZE 0x303E
3.130 -#define EGL_COLOR_BUFFER_TYPE 0x303F
3.131 -#define EGL_RENDERABLE_TYPE 0x3040
3.132 -#define EGL_MATCH_NATIVE_PIXMAP 0x3041 /* Pseudo-attribute (not queryable) */
3.133 -#define EGL_CONFORMANT 0x3042
3.134 -
3.135 -/* Reserved 0x3041-0x304F for additional config attributes */
3.136 -
3.137 -/* Config attribute values */
3.138 -#define EGL_SLOW_CONFIG 0x3050 /* EGL_CONFIG_CAVEAT value */
3.139 -#define EGL_NON_CONFORMANT_CONFIG 0x3051 /* EGL_CONFIG_CAVEAT value */
3.140 -#define EGL_TRANSPARENT_RGB 0x3052 /* EGL_TRANSPARENT_TYPE value */
3.141 -#define EGL_RGB_BUFFER 0x308E /* EGL_COLOR_BUFFER_TYPE value */
3.142 -#define EGL_LUMINANCE_BUFFER 0x308F /* EGL_COLOR_BUFFER_TYPE value */
3.143 -
3.144 -/* More config attribute values, for EGL_TEXTURE_FORMAT */
3.145 -#define EGL_NO_TEXTURE 0x305C
3.146 -#define EGL_TEXTURE_RGB 0x305D
3.147 -#define EGL_TEXTURE_RGBA 0x305E
3.148 -#define EGL_TEXTURE_2D 0x305F
3.149 -
3.150 -/* Config attribute mask bits */
3.151 -#define EGL_PBUFFER_BIT 0x0001 /* EGL_SURFACE_TYPE mask bits */
3.152 -#define EGL_PIXMAP_BIT 0x0002 /* EGL_SURFACE_TYPE mask bits */
3.153 -#define EGL_WINDOW_BIT 0x0004 /* EGL_SURFACE_TYPE mask bits */
3.154 -#define EGL_VG_COLORSPACE_LINEAR_BIT 0x0020 /* EGL_SURFACE_TYPE mask bits */
3.155 -#define EGL_VG_ALPHA_FORMAT_PRE_BIT 0x0040 /* EGL_SURFACE_TYPE mask bits */
3.156 -#define EGL_MULTISAMPLE_RESOLVE_BOX_BIT 0x0200 /* EGL_SURFACE_TYPE mask bits */
3.157 -#define EGL_SWAP_BEHAVIOR_PRESERVED_BIT 0x0400 /* EGL_SURFACE_TYPE mask bits */
3.158 -
3.159 -#define EGL_OPENGL_ES_BIT 0x0001 /* EGL_RENDERABLE_TYPE mask bits */
3.160 -#define EGL_OPENVG_BIT 0x0002 /* EGL_RENDERABLE_TYPE mask bits */
3.161 -#define EGL_OPENGL_ES2_BIT 0x0004 /* EGL_RENDERABLE_TYPE mask bits */
3.162 -#define EGL_OPENGL_BIT 0x0008 /* EGL_RENDERABLE_TYPE mask bits */
3.163 -
3.164 -/* QueryString targets */
3.165 -#define EGL_VENDOR 0x3053
3.166 -#define EGL_VERSION 0x3054
3.167 -#define EGL_EXTENSIONS 0x3055
3.168 -#define EGL_CLIENT_APIS 0x308D
3.169 -
3.170 -/* QuerySurface / SurfaceAttrib / CreatePbufferSurface targets */
3.171 -#define EGL_HEIGHT 0x3056
3.172 -#define EGL_WIDTH 0x3057
3.173 -#define EGL_LARGEST_PBUFFER 0x3058
3.174 -#define EGL_TEXTURE_FORMAT 0x3080
3.175 -#define EGL_TEXTURE_TARGET 0x3081
3.176 -#define EGL_MIPMAP_TEXTURE 0x3082
3.177 -#define EGL_MIPMAP_LEVEL 0x3083
3.178 -#define EGL_RENDER_BUFFER 0x3086
3.179 -#define EGL_VG_COLORSPACE 0x3087
3.180 -#define EGL_VG_ALPHA_FORMAT 0x3088
3.181 -#define EGL_HORIZONTAL_RESOLUTION 0x3090
3.182 -#define EGL_VERTICAL_RESOLUTION 0x3091
3.183 -#define EGL_PIXEL_ASPECT_RATIO 0x3092
3.184 -#define EGL_SWAP_BEHAVIOR 0x3093
3.185 -#define EGL_MULTISAMPLE_RESOLVE 0x3099
3.186 -
3.187 -/* EGL_RENDER_BUFFER values / BindTexImage / ReleaseTexImage buffer targets */
3.188 -#define EGL_BACK_BUFFER 0x3084
3.189 -#define EGL_SINGLE_BUFFER 0x3085
3.190 -
3.191 -/* OpenVG color spaces */
3.192 -#define EGL_VG_COLORSPACE_sRGB 0x3089 /* EGL_VG_COLORSPACE value */
3.193 -#define EGL_VG_COLORSPACE_LINEAR 0x308A /* EGL_VG_COLORSPACE value */
3.194 -
3.195 -/* OpenVG alpha formats */
3.196 -#define EGL_VG_ALPHA_FORMAT_NONPRE 0x308B /* EGL_ALPHA_FORMAT value */
3.197 -#define EGL_VG_ALPHA_FORMAT_PRE 0x308C /* EGL_ALPHA_FORMAT value */
3.198 -
3.199 -/* Constant scale factor by which fractional display resolutions &
3.200 - * aspect ratio are scaled when queried as integer values.
3.201 - */
3.202 -#define EGL_DISPLAY_SCALING 10000
3.203 -
3.204 -/* Unknown display resolution/aspect ratio */
3.205 -#define EGL_UNKNOWN ((EGLint)-1)
3.206 -
3.207 -/* Back buffer swap behaviors */
3.208 -#define EGL_BUFFER_PRESERVED 0x3094 /* EGL_SWAP_BEHAVIOR value */
3.209 -#define EGL_BUFFER_DESTROYED 0x3095 /* EGL_SWAP_BEHAVIOR value */
3.210 -
3.211 -/* CreatePbufferFromClientBuffer buffer types */
3.212 -#define EGL_OPENVG_IMAGE 0x3096
3.213 -
3.214 -/* QueryContext targets */
3.215 -#define EGL_CONTEXT_CLIENT_TYPE 0x3097
3.216 -
3.217 -/* CreateContext attributes */
3.218 -#define EGL_CONTEXT_CLIENT_VERSION 0x3098
3.219 -
3.220 -/* Multisample resolution behaviors */
3.221 -#define EGL_MULTISAMPLE_RESOLVE_DEFAULT 0x309A /* EGL_MULTISAMPLE_RESOLVE value */
3.222 -#define EGL_MULTISAMPLE_RESOLVE_BOX 0x309B /* EGL_MULTISAMPLE_RESOLVE value */
3.223 -
3.224 -/* BindAPI/QueryAPI targets */
3.225 -#define EGL_OPENGL_ES_API 0x30A0
3.226 -#define EGL_OPENVG_API 0x30A1
3.227 -#define EGL_OPENGL_API 0x30A2
3.228 -
3.229 -/* GetCurrentSurface targets */
3.230 -#define EGL_DRAW 0x3059
3.231 -#define EGL_READ 0x305A
3.232 -
3.233 -/* WaitNative engines */
3.234 -#define EGL_CORE_NATIVE_ENGINE 0x305B
3.235 -
3.236 -/* EGL 1.2 tokens renamed for consistency in EGL 1.3 */
3.237 -#define EGL_COLORSPACE EGL_VG_COLORSPACE
3.238 -#define EGL_ALPHA_FORMAT EGL_VG_ALPHA_FORMAT
3.239 -#define EGL_COLORSPACE_sRGB EGL_VG_COLORSPACE_sRGB
3.240 -#define EGL_COLORSPACE_LINEAR EGL_VG_COLORSPACE_LINEAR
3.241 -#define EGL_ALPHA_FORMAT_NONPRE EGL_VG_ALPHA_FORMAT_NONPRE
3.242 -#define EGL_ALPHA_FORMAT_PRE EGL_VG_ALPHA_FORMAT_PRE
3.243 -
3.244 -/* EGL extensions must request enum blocks from the Khronos
3.245 - * API Registrar, who maintains the enumerant registry. Submit
3.246 - * a bug in Khronos Bugzilla against task "Registry".
3.247 - */
3.248 -
3.249 -
3.250 -
3.251 -/* EGL Functions */
3.252 -
3.253 -EGLAPI EGLint EGLAPIENTRY eglGetError(void);
3.254 -
3.255 -EGLAPI EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id);
3.256 -EGLAPI EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor);
3.257 -EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy);
3.258 -
3.259 -EGLAPI const char * EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name);
3.260 -
3.261 -EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs,
3.262 - EGLint config_size, EGLint *num_config);
3.263 -EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list,
3.264 - EGLConfig *configs, EGLint config_size,
3.265 - EGLint *num_config);
3.266 -EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
3.267 - EGLint attribute, EGLint *value);
3.268 -
3.269 -EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config,
3.270 - EGLNativeWindowType win,
3.271 - const EGLint *attrib_list);
3.272 -EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config,
3.273 - const EGLint *attrib_list);
3.274 -EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config,
3.275 - EGLNativePixmapType pixmap,
3.276 - const EGLint *attrib_list);
3.277 -EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface);
3.278 -EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface,
3.279 - EGLint attribute, EGLint *value);
3.280 -
3.281 -EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api);
3.282 -EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void);
3.283 -
3.284 -EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient(void);
3.285 -
3.286 -EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread(void);
3.287 -
3.288 -EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(
3.289 - EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer,
3.290 - EGLConfig config, const EGLint *attrib_list);
3.291 -
3.292 -EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface,
3.293 - EGLint attribute, EGLint value);
3.294 -EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
3.295 -EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
3.296 -
3.297 -
3.298 -EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval);
3.299 -
3.300 -
3.301 -EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config,
3.302 - EGLContext share_context,
3.303 - const EGLint *attrib_list);
3.304 -EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx);
3.305 -EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw,
3.306 - EGLSurface read, EGLContext ctx);
3.307 -
3.308 -EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext(void);
3.309 -EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw);
3.310 -EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void);
3.311 -EGLAPI EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx,
3.312 - EGLint attribute, EGLint *value);
3.313 -
3.314 -EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL(void);
3.315 -EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine);
3.316 -EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface);
3.317 -EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface,
3.318 - EGLNativePixmapType target);
3.319 -
3.320 -/* This is a generic function pointer type, whose name indicates it must
3.321 - * be cast to the proper type *and calling convention* before use.
3.322 - */
3.323 -typedef void (*__eglMustCastToProperFunctionPointerType)(void);
3.324 -
3.325 -/* Now, define eglGetProcAddress using the generic function ptr. type */
3.326 -EGLAPI __eglMustCastToProperFunctionPointerType EGLAPIENTRY
3.327 - eglGetProcAddress(const char *procname);
3.328 -
3.329 -#ifdef __cplusplus
3.330 -}
3.331 -#endif
3.332 -
3.333 -#endif /* __egl_h_ */
4.1 --- a/src/video/android/eglext.h Fri Jun 18 00:02:13 2010 +1200
4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
4.3 @@ -1,162 +0,0 @@
4.4 -#ifndef __eglext_h_
4.5 -#define __eglext_h_
4.6 -
4.7 -#ifdef __cplusplus
4.8 -extern "C" {
4.9 -#endif
4.10 -
4.11 -/*
4.12 -** Copyright (c) 2007-2009 The Khronos Group Inc.
4.13 -**
4.14 -** Permission is hereby granted, free of charge, to any person obtaining a
4.15 -** copy of this software and/or associated documentation files (the
4.16 -** "Materials"), to deal in the Materials without restriction, including
4.17 -** without limitation the rights to use, copy, modify, merge, publish,
4.18 -** distribute, sublicense, and/or sell copies of the Materials, and to
4.19 -** permit persons to whom the Materials are furnished to do so, subject to
4.20 -** the following conditions:
4.21 -**
4.22 -** The above copyright notice and this permission notice shall be included
4.23 -** in all copies or substantial portions of the Materials.
4.24 -**
4.25 -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
4.26 -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
4.27 -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
4.28 -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
4.29 -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
4.30 -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
4.31 -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
4.32 -*/
4.33 -
4.34 -#include <EGL/eglplatform.h>
4.35 -
4.36 -/*************************************************************/
4.37 -
4.38 -/* Header file version number */
4.39 -/* Current version at http://www.khronos.org/registry/egl/ */
4.40 -/* $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $ */
4.41 -#define EGL_EGLEXT_VERSION 3
4.42 -
4.43 -#ifndef EGL_KHR_config_attribs
4.44 -#define EGL_KHR_config_attribs 1
4.45 -#define EGL_CONFORMANT_KHR 0x3042 /* EGLConfig attribute */
4.46 -#define EGL_VG_COLORSPACE_LINEAR_BIT_KHR 0x0020 /* EGL_SURFACE_TYPE bitfield */
4.47 -#define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR 0x0040 /* EGL_SURFACE_TYPE bitfield */
4.48 -#endif
4.49 -
4.50 -#ifndef EGL_KHR_lock_surface
4.51 -#define EGL_KHR_lock_surface 1
4.52 -#define EGL_READ_SURFACE_BIT_KHR 0x0001 /* EGL_LOCK_USAGE_HINT_KHR bitfield */
4.53 -#define EGL_WRITE_SURFACE_BIT_KHR 0x0002 /* EGL_LOCK_USAGE_HINT_KHR bitfield */
4.54 -#define EGL_LOCK_SURFACE_BIT_KHR 0x0080 /* EGL_SURFACE_TYPE bitfield */
4.55 -#define EGL_OPTIMAL_FORMAT_BIT_KHR 0x0100 /* EGL_SURFACE_TYPE bitfield */
4.56 -#define EGL_MATCH_FORMAT_KHR 0x3043 /* EGLConfig attribute */
4.57 -#define EGL_FORMAT_RGB_565_EXACT_KHR 0x30C0 /* EGL_MATCH_FORMAT_KHR value */
4.58 -#define EGL_FORMAT_RGB_565_KHR 0x30C1 /* EGL_MATCH_FORMAT_KHR value */
4.59 -#define EGL_FORMAT_RGBA_8888_EXACT_KHR 0x30C2 /* EGL_MATCH_FORMAT_KHR value */
4.60 -#define EGL_FORMAT_RGBA_8888_KHR 0x30C3 /* EGL_MATCH_FORMAT_KHR value */
4.61 -#define EGL_MAP_PRESERVE_PIXELS_KHR 0x30C4 /* eglLockSurfaceKHR attribute */
4.62 -#define EGL_LOCK_USAGE_HINT_KHR 0x30C5 /* eglLockSurfaceKHR attribute */
4.63 -#define EGL_BITMAP_POINTER_KHR 0x30C6 /* eglQuerySurface attribute */
4.64 -#define EGL_BITMAP_PITCH_KHR 0x30C7 /* eglQuerySurface attribute */
4.65 -#define EGL_BITMAP_ORIGIN_KHR 0x30C8 /* eglQuerySurface attribute */
4.66 -#define EGL_BITMAP_PIXEL_RED_OFFSET_KHR 0x30C9 /* eglQuerySurface attribute */
4.67 -#define EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR 0x30CA /* eglQuerySurface attribute */
4.68 -#define EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR 0x30CB /* eglQuerySurface attribute */
4.69 -#define EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR 0x30CC /* eglQuerySurface attribute */
4.70 -#define EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR 0x30CD /* eglQuerySurface attribute */
4.71 -#define EGL_LOWER_LEFT_KHR 0x30CE /* EGL_BITMAP_ORIGIN_KHR value */
4.72 -#define EGL_UPPER_LEFT_KHR 0x30CF /* EGL_BITMAP_ORIGIN_KHR value */
4.73 -#ifdef EGL_EGLEXT_PROTOTYPES
4.74 -EGLAPI EGLBoolean EGLAPIENTRY eglLockSurfaceKHR (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);
4.75 -EGLAPI EGLBoolean EGLAPIENTRY eglUnlockSurfaceKHR (EGLDisplay display, EGLSurface surface);
4.76 -#endif /* EGL_EGLEXT_PROTOTYPES */
4.77 -typedef EGLBoolean (EGLAPIENTRYP PFNEGLLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);
4.78 -typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface);
4.79 -#endif
4.80 -
4.81 -#ifndef EGL_KHR_image
4.82 -#define EGL_KHR_image 1
4.83 -#define EGL_NATIVE_PIXMAP_KHR 0x30B0 /* eglCreateImageKHR target */
4.84 -typedef void *EGLImageKHR;
4.85 -#define EGL_NO_IMAGE_KHR ((EGLImageKHR)0)
4.86 -#ifdef EGL_EGLEXT_PROTOTYPES
4.87 -EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
4.88 -EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR (EGLDisplay dpy, EGLImageKHR image);
4.89 -#endif /* EGL_EGLEXT_PROTOTYPES */
4.90 -typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
4.91 -typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGLImageKHR image);
4.92 -#endif
4.93 -
4.94 -#ifndef EGL_KHR_vg_parent_image
4.95 -#define EGL_KHR_vg_parent_image 1
4.96 -#define EGL_VG_PARENT_IMAGE_KHR 0x30BA /* eglCreateImageKHR target */
4.97 -#endif
4.98 -
4.99 -#ifndef EGL_KHR_gl_texture_2D_image
4.100 -#define EGL_KHR_gl_texture_2D_image 1
4.101 -#define EGL_GL_TEXTURE_2D_KHR 0x30B1 /* eglCreateImageKHR target */
4.102 -#define EGL_GL_TEXTURE_LEVEL_KHR 0x30BC /* eglCreateImageKHR attribute */
4.103 -#endif
4.104 -
4.105 -#ifndef EGL_KHR_gl_texture_cubemap_image
4.106 -#define EGL_KHR_gl_texture_cubemap_image 1
4.107 -#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR 0x30B3 /* eglCreateImageKHR target */
4.108 -#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR 0x30B4 /* eglCreateImageKHR target */
4.109 -#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR 0x30B5 /* eglCreateImageKHR target */
4.110 -#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR 0x30B6 /* eglCreateImageKHR target */
4.111 -#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR 0x30B7 /* eglCreateImageKHR target */
4.112 -#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR 0x30B8 /* eglCreateImageKHR target */
4.113 -#endif
4.114 -
4.115 -#ifndef EGL_KHR_gl_texture_3D_image
4.116 -#define EGL_KHR_gl_texture_3D_image 1
4.117 -#define EGL_GL_TEXTURE_3D_KHR 0x30B2 /* eglCreateImageKHR target */
4.118 -#define EGL_GL_TEXTURE_ZOFFSET_KHR 0x30BD /* eglCreateImageKHR attribute */
4.119 -#endif
4.120 -
4.121 -#ifndef EGL_KHR_gl_renderbuffer_image
4.122 -#define EGL_KHR_gl_renderbuffer_image 1
4.123 -#define EGL_GL_RENDERBUFFER_KHR 0x30B9 /* eglCreateImageKHR target */
4.124 -#endif
4.125 -
4.126 -#ifndef EGL_KHR_image_base
4.127 -#define EGL_KHR_image_base 1
4.128 -/* Most interfaces defined by EGL_KHR_image_pixmap above */
4.129 -#define EGL_IMAGE_PRESERVED_KHR 0x30D2 /* eglCreateImageKHR attribute */
4.130 -#endif
4.131 -
4.132 -#ifndef EGL_KHR_image_pixmap
4.133 -#define EGL_KHR_image_pixmap 1
4.134 -/* Interfaces defined by EGL_KHR_image above */
4.135 -#endif
4.136 -
4.137 -
4.138 -#ifndef EGL_ANDROID_image_native_buffer
4.139 -#define EGL_ANDROID_image_native_buffer 1
4.140 -struct android_native_buffer_t;
4.141 -#define EGL_NATIVE_BUFFER_ANDROID 0x3140 /* eglCreateImageKHR target */
4.142 -#endif
4.143 -
4.144 -#ifndef EGL_ANDROID_get_render_buffer
4.145 -#define EGL_ANDROID_get_render_buffer 1
4.146 -#ifdef EGL_EGLEXT_PROTOTYPES
4.147 -EGLAPI EGLClientBuffer EGLAPIENTRY eglGetRenderBufferANDROID(EGLDisplay dpy, EGLSurface draw);
4.148 -#endif
4.149 -typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLGETRENDERBUFFERANDROIDPROC) (EGLDisplay dpy, EGLSurface draw);
4.150 -#endif
4.151 -
4.152 -#ifndef EGL_ANDROID_swap_rectangle
4.153 -#define EGL_ANDROID_swap_rectangle 1
4.154 -#ifdef EGL_EGLEXT_PROTOTYPES
4.155 -EGLAPI EGLBoolean EGLAPIENTRY eglSetSwapRectangleANDROID (EGLDisplay dpy, EGLSurface draw, EGLint left, EGLint top, EGLint width, EGLint height);
4.156 -#endif /* EGL_EGLEXT_PROTOTYPES */
4.157 -typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSWAPRECTANGLEANDROIDPROC) (EGLDisplay dpy, EGLSurface draw, EGLint left, EGLint top, EGLint width, EGLint height);
4.158 -#endif
4.159 -
4.160 -
4.161 -#ifdef __cplusplus
4.162 -}
4.163 -#endif
4.164 -
4.165 -#endif
5.1 --- a/src/video/android/eglplatform.h Fri Jun 18 00:02:13 2010 +1200
5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
5.3 @@ -1,118 +0,0 @@
5.4 -#ifndef __eglplatform_h_
5.5 -#define __eglplatform_h_
5.6 -
5.7 -/*
5.8 -** Copyright (c) 2007-2009 The Khronos Group Inc.
5.9 -**
5.10 -** Permission is hereby granted, free of charge, to any person obtaining a
5.11 -** copy of this software and/or associated documentation files (the
5.12 -** "Materials"), to deal in the Materials without restriction, including
5.13 -** without limitation the rights to use, copy, modify, merge, publish,
5.14 -** distribute, sublicense, and/or sell copies of the Materials, and to
5.15 -** permit persons to whom the Materials are furnished to do so, subject to
5.16 -** the following conditions:
5.17 -**
5.18 -** The above copyright notice and this permission notice shall be included
5.19 -** in all copies or substantial portions of the Materials.
5.20 -**
5.21 -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
5.22 -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
5.23 -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
5.24 -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
5.25 -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
5.26 -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
5.27 -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
5.28 -*/
5.29 -
5.30 -/* Platform-specific types and definitions for egl.h
5.31 - * $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $
5.32 - *
5.33 - * Adopters may modify khrplatform.h and this file to suit their platform.
5.34 - * You are encouraged to submit all modifications to the Khronos group so that
5.35 - * they can be included in future versions of this file. Please submit changes
5.36 - * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
5.37 - * by filing a bug against product "EGL" component "Registry".
5.38 - */
5.39 -
5.40 -#include <KHR/khrplatform.h>
5.41 -
5.42 -/* Macros used in EGL function prototype declarations.
5.43 - *
5.44 - * EGL functions should be prototyped as:
5.45 - *
5.46 - * EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
5.47 - * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
5.48 - *
5.49 - * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
5.50 - */
5.51 -
5.52 -#ifndef EGLAPI
5.53 -#define EGLAPI KHRONOS_APICALL
5.54 -#endif
5.55 -
5.56 -#define EGLAPIENTRY KHRONOS_APIENTRY
5.57 -#define EGLAPIENTRYP KHRONOS_APIENTRY*
5.58 -
5.59 -/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
5.60 - * are aliases of window-system-dependent types, such as X Display * or
5.61 - * Windows Device Context. They must be defined in platform-specific
5.62 - * code below. The EGL-prefixed versions of Native*Type are the same
5.63 - * types, renamed in EGL 1.3 so all types in the API start with "EGL".
5.64 - */
5.65 -
5.66 -#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
5.67 -#ifndef WIN32_LEAN_AND_MEAN
5.68 -#define WIN32_LEAN_AND_MEAN 1
5.69 -#endif
5.70 -#include <windows.h>
5.71 -
5.72 -typedef HDC EGLNativeDisplayType;
5.73 -typedef HBITMAP EGLNativePixmapType;
5.74 -typedef HWND EGLNativeWindowType;
5.75 -
5.76 -#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */
5.77 -
5.78 -typedef int EGLNativeDisplayType;
5.79 -typedef void *EGLNativeWindowType;
5.80 -typedef void *EGLNativePixmapType;
5.81 -
5.82 -#elif defined(__unix__) && !defined(ANDROID)
5.83 -
5.84 -/* X11 (tentative) */
5.85 -#include <X11/Xlib.h>
5.86 -#include <X11/Xutil.h>
5.87 -
5.88 -typedef Display *EGLNativeDisplayType;
5.89 -typedef Pixmap EGLNativePixmapType;
5.90 -typedef Window EGLNativeWindowType;
5.91 -
5.92 -
5.93 -#elif defined(ANDROID)
5.94 -
5.95 -struct android_native_window_t;
5.96 -struct egl_native_pixmap_t;
5.97 -
5.98 -typedef struct android_native_window_t* EGLNativeWindowType;
5.99 -typedef struct egl_native_pixmap_t* EGLNativePixmapType;
5.100 -typedef void* EGLNativeDisplayType;
5.101 -
5.102 -#else
5.103 -#error "Platform not recognized"
5.104 -#endif
5.105 -
5.106 -/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
5.107 -typedef EGLNativeDisplayType NativeDisplayType;
5.108 -typedef EGLNativePixmapType NativePixmapType;
5.109 -typedef EGLNativeWindowType NativeWindowType;
5.110 -
5.111 -
5.112 -/* Define EGLint. This must be a signed integral type large enough to contain
5.113 - * all legal attribute names and values passed into and out of EGL, whether
5.114 - * their type is boolean, bitmask, enumerant (symbolic constant), integer,
5.115 - * handle, or other. While in general a 32-bit integer will suffice, if
5.116 - * handles are 64 bit types, then EGLint should be defined as a signed 64-bit
5.117 - * integer type.
5.118 - */
5.119 -typedef khronos_int32_t EGLint;
5.120 -
5.121 -#endif /* __eglplatform_h */