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

minor clean-up in FramebufferNativeWindow

Browse Source
This commit is contained in:
Mathias Agopian
2009-05-04 19:38:43 -07:00
parent dff8e58d47
commit 6279619e42
4 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/ui/FramebufferNativeWindow.h
View File

@@ -76,13 +76,9 @@ public:
framebuffer_device_t const * getDevice() const { return fbDev; }
void setSwapRectangle(const Rect& dirty);
private:
friend class LightRefBase<FramebufferNativeWindow>;
~FramebufferNativeWindow(); // this class cannot be overloaded
static void connect(android_native_window_t* window);
static void disconnect(android_native_window_t* window);
static int setSwapInterval(android_native_window_t* window, int interval);
static int dequeueBuffer(android_native_window_t* window, android_native_buffer_t** buffer);
static int lockBuffer(android_native_window_t* window, android_native_buffer_t* buffer);
@@ -94,8 +90,6 @@ private:
sp<NativeBuffer> buffers[2];
sp<NativeBuffer> front;
Rect mDirty;
mutable Mutex mutex;
Condition mCondition;
int32_t mNumBuffers;

11
libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
View File

@@ -305,16 +305,13 @@ void DisplayHardware::flip(const Region& dirty) const
EGLDisplay dpy = mDisplay;
EGLSurface surface = mSurface;
Region newDirty(dirty);
newDirty.andSelf(Rect(mWidth, mHeight));
if (mFlags & BUFFER_PRESERVED) {
mDirty = newDirty;
Region newDirty(dirty);
newDirty.andSelf(Rect(mWidth, mHeight));
const Rect& b(newDirty.bounds());
//mNativeWindow->setSwapRectangle(b);
}
const Rect& b(newDirty.bounds());
mNativeWindow->setSwapRectangle(b);
mPageFlipCount++;
eglSwapBuffers(dpy, surface);
checkEGLErrors("eglSwapBuffers");

1
libs/surfaceflinger/DisplayHardware/DisplayHardware.h
View File

@@ -102,7 +102,6 @@ private:
int mHeight;
PixelFormat mFormat;
uint32_t mFlags;
mutable Region mDirty;
mutable uint32_t mPageFlipCount;
sp<FramebufferNativeWindow> mNativeWindow;

14
libs/ui/FramebufferNativeWindow.cpp
View File

@@ -131,14 +131,6 @@ FramebufferNativeWindow::~FramebufferNativeWindow() {
framebuffer_close(fbDev);
}
void FramebufferNativeWindow::connect(android_native_window_t* window)
{
}
void FramebufferNativeWindow::disconnect(android_native_window_t* window)
{
}
int FramebufferNativeWindow::setSwapInterval(
android_native_window_t* window, int interval)
{
@@ -146,12 +138,6 @@ int FramebufferNativeWindow::setSwapInterval(
return fb->setSwapInterval(fb, interval);
}
void FramebufferNativeWindow::setSwapRectangle(const Rect& dirty)
{
Mutex::Autolock _l(mutex);
mDirty = dirty;
}
int FramebufferNativeWindow::dequeueBuffer(android_native_window_t* window,
android_native_buffer_t** buffer)
{