Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread

Browse Source
This commit is contained in:
Mathias Agopian
2010-12-06 18:20:09 -08:00
committed by Android (Google) Code Review
parent eba947a32a 698a8aaca2
commit daef0a040d
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
opengl/libs/EGL/egl.cpp
View File

@@ -40,6 +40,8 @@
#include <utils/KeyedVector.h> #include <utils/KeyedVector.h>
#include <utils/String8.h> #include <utils/String8.h>
#include <ui/egl/android_natives.h>
#include "hooks.h" #include "hooks.h"
#include "egl_impl.h" #include "egl_impl.h"
#include "Loader.h" #include "Loader.h"
@@ -196,15 +198,16 @@ struct egl_surface_t : public egl_object_t
{ {
typedef egl_object_t::LocalRef<egl_surface_t, EGLSurface> Ref; typedef egl_object_t::LocalRef<egl_surface_t, EGLSurface> Ref;
egl_surface_t(EGLDisplay dpy, EGLSurface surface, EGLConfig config, egl_surface_t(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win,
int impl, egl_connection_t const* cnx) EGLSurface surface, int impl, egl_connection_t const* cnx)
: dpy(dpy), surface(surface), config(config), impl(impl), cnx(cnx) { : dpy(dpy), surface(surface), config(config), win(win), impl(impl), cnx(cnx) {
} }
~egl_surface_t() { ~egl_surface_t() {
} }
EGLDisplay dpy; EGLDisplay dpy;
EGLSurface surface; EGLSurface surface;
EGLConfig config; EGLConfig config;
sp<ANativeWindow> win;
int impl; int impl;
egl_connection_t const* cnx; egl_connection_t const* cnx;
}; };
@@ -984,11 +987,22 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config,
egl_display_t const* dp = 0; egl_display_t const* dp = 0;
egl_connection_t* cnx = validate_display_config(dpy, config, dp); egl_connection_t* cnx = validate_display_config(dpy, config, dp);
if (cnx) { if (cnx) {
EGLDisplay iDpy = dp->disp[ dp->configs[intptr_t(config)].impl ].dpy;
EGLConfig iConfig = dp->configs[intptr_t(config)].config;
EGLint format;
// set the native window's buffers format to match this config
if (cnx->egl.eglGetConfigAttrib(iDpy,
iConfig, EGL_NATIVE_VISUAL_ID, &format)) {
if (format != 0) {
native_window_set_buffers_geometry(window, 0, 0, format);
}
}
EGLSurface surface = cnx->egl.eglCreateWindowSurface( EGLSurface surface = cnx->egl.eglCreateWindowSurface(
dp->disp[ dp->configs[intptr_t(config)].impl ].dpy, iDpy, iConfig, window, attrib_list);
dp->configs[intptr_t(config)].config, window, attrib_list);
if (surface != EGL_NO_SURFACE) { if (surface != EGL_NO_SURFACE) {
egl_surface_t* s = new egl_surface_t(dpy, surface, config, egl_surface_t* s = new egl_surface_t(dpy, config, window, surface,
dp->configs[intptr_t(config)].impl, cnx); dp->configs[intptr_t(config)].impl, cnx);
return s; return s;
} }
@@ -1007,7 +1021,7 @@ EGLSurface eglCreatePixmapSurface( EGLDisplay dpy, EGLConfig config,
dp->disp[ dp->configs[intptr_t(config)].impl ].dpy, dp->disp[ dp->configs[intptr_t(config)].impl ].dpy,
dp->configs[intptr_t(config)].config, pixmap, attrib_list); dp->configs[intptr_t(config)].config, pixmap, attrib_list);
if (surface != EGL_NO_SURFACE) { if (surface != EGL_NO_SURFACE) {
egl_surface_t* s = new egl_surface_t(dpy, surface, config, egl_surface_t* s = new egl_surface_t(dpy, config, NULL, surface,
dp->configs[intptr_t(config)].impl, cnx); dp->configs[intptr_t(config)].impl, cnx);
return s; return s;
} }
@@ -1025,7 +1039,7 @@ EGLSurface eglCreatePbufferSurface( EGLDisplay dpy, EGLConfig config,
dp->disp[ dp->configs[intptr_t(config)].impl ].dpy, dp->disp[ dp->configs[intptr_t(config)].impl ].dpy,
dp->configs[intptr_t(config)].config, attrib_list); dp->configs[intptr_t(config)].config, attrib_list);
if (surface != EGL_NO_SURFACE) { if (surface != EGL_NO_SURFACE) {
egl_surface_t* s = new egl_surface_t(dpy, surface, config, egl_surface_t* s = new egl_surface_t(dpy, config, NULL, surface,
dp->configs[intptr_t(config)].impl, cnx); dp->configs[intptr_t(config)].impl, cnx);
return s; return s;
} }
@@ -1046,6 +1060,9 @@ EGLBoolean eglDestroySurface(EGLDisplay dpy, EGLSurface surface)
EGLBoolean result = s->cnx->egl.eglDestroySurface( EGLBoolean result = s->cnx->egl.eglDestroySurface(
dp->disp[s->impl].dpy, s->surface); dp->disp[s->impl].dpy, s->surface);
if (result == EGL_TRUE) { if (result == EGL_TRUE) {
if (s->win != NULL) {
native_window_set_buffers_geometry(s->win.get(), 0, 0, 0);
}
_s.terminate(); _s.terminate();
} }
return result; return result;