Merge branch 'gingerbread' into gingerbread-release

This commit is contained in:
The Android Automerger
2010-10-20 07:29:30 -07:00
2 changed files with 5 additions and 4 deletions

View File

@@ -74,14 +74,15 @@ static int engine_init_display(struct engine* engine) {
selectConfigForNativeWindow(display, attribs, engine->app->window, &config);
surface = eglCreateWindowSurface(display, config, engine->app->window, NULL);
context = eglCreateContext(display, config, NULL, NULL);
eglQuerySurface(display, surface, EGL_WIDTH, &w);
eglQuerySurface(display, surface, EGL_HEIGHT, &h);
if (eglMakeCurrent(display, surface, surface, context) == EGL_FALSE) {
LOGW("Unable to eglMakeCurrent");
return -1;
}
eglQuerySurface(display, surface, EGL_WIDTH, &w);
eglQuerySurface(display, surface, EGL_HEIGHT, &h);
engine->display = display;
engine->context = context;
engine->surface = surface;

View File

@@ -1,5 +1,5 @@
Pkg.UserSrc=false
Pkg.Revision=1
AndroidVersion.ApiLevel=8
AndroidVersion.CodeName=gingerbread
AndroidVersion.ApiLevel=9
#AndroidVersion.CodeName=gingerbread