From f013e1afd1e68af5e3b868c26a653bbfb39538f8 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Wed, 17 Dec 2008 18:05:43 -0800 Subject: Code drop from //branches/cupcake/...@124589 --- libs/ui/EGLNativeWindowSurface.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libs/ui/EGLNativeWindowSurface.cpp') diff --git a/libs/ui/EGLNativeWindowSurface.cpp b/libs/ui/EGLNativeWindowSurface.cpp index 0b6afc0462bc..d55fb7090ff6 100644 --- a/libs/ui/EGLNativeWindowSurface.cpp +++ b/libs/ui/EGLNativeWindowSurface.cpp @@ -163,7 +163,12 @@ void EGLNativeWindowSurface::connect() egl_native_window_t::format = info.format; egl_native_window_t::base = intptr_t(info.base); egl_native_window_t::offset = intptr_t(info.bits) - intptr_t(info.base); - egl_native_window_t::memory_type = mSurface->getMemoryType(); + // FIXME: egl_native_window_t::memory_type used to be set from + // mSurface, but we wanted to break this dependency. We set it to + // GPU because the software rendered doesn't care, but the h/w + // accelerator needs it. Eventually, this value should go away + // completely, since memory will be managed by OpenGL. + egl_native_window_t::memory_type = NATIVE_MEMORY_TYPE_GPU; egl_native_window_t::fd = 0; } } -- cgit v1.2.3-59-g8ed1b