get rid of GraphicPlane
its functionality is now folded into DisplayHardware
there will be more changes in that area.
diff --git a/services/surfaceflinger/DisplayHardware.h b/services/surfaceflinger/DisplayHardware.h
new file mode 100644
index 0000000..3da9f16
--- /dev/null
+++ b/services/surfaceflinger/DisplayHardware.h
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_DISPLAY_HARDWARE_H
+#define ANDROID_DISPLAY_HARDWARE_H
+
+#include <stdlib.h>
+
+#include <ui/PixelFormat.h>
+#include <ui/Region.h>
+
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
+#include "GLExtensions.h"
+#include "Transform.h"
+
+#include "DisplayHardware/DisplayHardwareBase.h"
+#include "DisplayHardware/HWComposer.h"
+#include "DisplayHardware/PowerHAL.h"
+
+namespace android {
+
+class FramebufferSurface;
+
+class DisplayHardware :
+ public DisplayHardwareBase,
+ public HWComposer::EventHandler
+{
+public:
+
+ class VSyncHandler : virtual public RefBase {
+ friend class DisplayHardware;
+ virtual void onVSyncReceived(int dpy, nsecs_t timestamp) = 0;
+ protected:
+ virtual ~VSyncHandler() {}
+ };
+
+ enum {
+ COPY_BITS_EXTENSION = 0x00000008,
+ PARTIAL_UPDATES = 0x00020000, // video driver feature
+ SLOW_CONFIG = 0x00040000, // software
+ SWAP_RECTANGLE = 0x00080000,
+ };
+
+ DisplayHardware(
+ const sp<SurfaceFlinger>& flinger,
+ uint32_t displayIndex);
+
+ virtual ~DisplayHardware();
+
+ void releaseScreen() const;
+ void acquireScreen() const;
+
+ // Flip the front and back buffers if the back buffer is "dirty". Might
+ // be instantaneous, might involve copying the frame buffer around.
+ void flip(const Region& dirty) const;
+
+ float getDpiX() const;
+ float getDpiY() const;
+ float getRefreshRate() const;
+ float getDensity() const;
+ int getWidth() const;
+ int getHeight() const;
+ PixelFormat getFormat() const;
+ uint32_t getFlags() const;
+ uint32_t getMaxTextureSize() const;
+ uint32_t getMaxViewportDims() const;
+ nsecs_t getRefreshPeriod() const;
+ nsecs_t getRefreshTimestamp() const;
+ void makeCurrent() const;
+
+ status_t setOrientation(int orientation);
+ int getOrientation() const { return mOrientation; }
+ const Transform& getTransform() const { return mGlobalTransform; }
+ int getUserWidth() const { return mUserDisplayWidth; }
+ int getUserHeight() const { return mUserDisplayHeight; }
+
+ void setVSyncHandler(const sp<VSyncHandler>& handler);
+
+ enum {
+ EVENT_VSYNC = HWC_EVENT_VSYNC
+ };
+
+ void eventControl(int event, int enabled);
+
+
+ uint32_t getPageFlipCount() const;
+ EGLDisplay getEGLDisplay() const { return mDisplay; }
+ EGLConfig getEGLConfig() const { return mConfig; }
+
+ void dump(String8& res) const;
+
+ // Hardware Composer
+ HWComposer& getHwComposer() const;
+
+ status_t compositionComplete() const;
+
+ Rect getBounds() const {
+ return Rect(mDisplayWidth, mDisplayHeight);
+ }
+ inline Rect bounds() const { return getBounds(); }
+
+private:
+ virtual void onVSyncReceived(int dpy, nsecs_t timestamp);
+ void init(uint32_t displayIndex);
+ void fini();
+
+ sp<SurfaceFlinger> mFlinger;
+ EGLDisplay mDisplay;
+ EGLSurface mSurface;
+ EGLContext mContext;
+ EGLConfig mConfig;
+ float mDpiX;
+ float mDpiY;
+ float mRefreshRate;
+ float mDensity;
+ int mDisplayWidth;
+ int mDisplayHeight;
+ PixelFormat mFormat;
+ uint32_t mFlags;
+ mutable uint32_t mPageFlipCount;
+ GLint mMaxViewportDims[2];
+ GLint mMaxTextureSize;
+
+ nsecs_t mRefreshPeriod;
+ mutable nsecs_t mLastHwVSync;
+
+ // constant once set
+ HWComposer* mHwc;
+ PowerHAL mPowerHAL;
+
+
+ // this used to be in GraphicPlane
+ static status_t orientationToTransfrom(int orientation, int w, int h,
+ Transform* tr);
+ Transform mGlobalTransform;
+ Transform mDisplayTransform;
+ int mOrientation;
+ int mLogicalDisplayWidth;
+ int mLogicalDisplayHeight;
+ int mUserDisplayWidth;
+ int mUserDisplayHeight;
+
+
+ mutable Mutex mLock;
+
+ // protected by mLock
+ wp<VSyncHandler> mVSyncHandler;
+
+ sp<FramebufferSurface> mNativeWindow;
+};
+
+}; // namespace android
+
+#endif // ANDROID_DISPLAY_HARDWARE_H