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

Merge "fix Surface positions are not floats"

Browse Source
This commit is contained in:
Mathias Agopian
2011-08-30 19:24:04 -07:00
committed by Android (Google) Code Review
parent 66b665ab8b 34cb9f2a96
commit c21843a8b5
9 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/Surface.java
View File

@@ -446,7 +446,9 @@ public class Surface implements Parcelable {
/** @hide */
public native void setLayer(int zorder);
/** @hide */
public native void setPosition(int x, int y);
public void setPosition(int x, int y) { setPosition((float)x, (float)y); }
/** @hide */
public native void setPosition(float x, float y);
/** @hide */
public native void setSize(int w, int h);
/** @hide */

4
core/jni/android_view_Surface.cpp
View File

@@ -589,7 +589,7 @@ static void Surface_setLayer(
}
static void Surface_setPosition(
JNIEnv* env, jobject clazz, jint x, jint y)
JNIEnv* env, jobject clazz, jfloat x, jfloat y)
{
const sp<SurfaceControl>& surface(getSurfaceControl(env, clazz));
if (surface == 0) return;
@@ -832,7 +832,7 @@ static JNINativeMethod gSurfaceMethods[] = {
{"screenshot", "(II)Landroid/graphics/Bitmap;", (void*)Surface_screenshotAll },
{"screenshot", "(IIII)Landroid/graphics/Bitmap;", (void*)Surface_screenshot },
{"setLayer", "(I)V", (void*)Surface_setLayer },
{"setPosition", "(II)V",(void*)Surface_setPosition },
{"setPosition", "(FF)V",(void*)Surface_setPosition },
{"setSize", "(II)V",(void*)Surface_setSize },
{"hide", "()V", (void*)Surface_hide },
{"show", "()V", (void*)Surface_show },

4
include/private/surfaceflinger/LayerState.h
View File

@@ -54,8 +54,8 @@ struct layer_state_t {
};
SurfaceID surface;
uint32_t what;
int32_t x;
int32_t y;
float x;
float y;
uint32_t z;
uint32_t w;
uint32_t h;

2
include/surfaceflinger/SurfaceComposerClient.h
View File

@@ -145,7 +145,7 @@ public:
status_t setAlpha(SurfaceID id, float alpha=1.0f);
status_t setFreezeTint(SurfaceID id, uint32_t tint);
status_t setMatrix(SurfaceID id, float dsdx, float dtdx, float dsdy, float dtdy);
status_t setPosition(SurfaceID id, int32_t x, int32_t y);
status_t setPosition(SurfaceID id, float x, float y);
status_t setSize(SurfaceID id, uint32_t w, uint32_t h);
status_t destroySurface(SurfaceID sid);

6
libs/gui/SurfaceComposerClient.cpp
View File

@@ -102,7 +102,7 @@ class Composer : public Singleton<Composer>
public:
status_t setPosition(const sp<SurfaceComposerClient>& client, SurfaceID id,
int32_t x, int32_t y);
float x, float y);
status_t setSize(const sp<SurfaceComposerClient>& client, SurfaceID id,
uint32_t w, uint32_t h);
status_t setLayer(const sp<SurfaceComposerClient>& client, SurfaceID id,
@@ -161,7 +161,7 @@ layer_state_t* Composer::getLayerStateLocked(
}
status_t Composer::setPosition(const sp<SurfaceComposerClient>& client,
SurfaceID id, int32_t x, int32_t y) {
SurfaceID id, float x, float y) {
Mutex::Autolock _l(mLock);
layer_state_t* s = getLayerStateLocked(client, id);
if (!s)
@@ -372,7 +372,7 @@ status_t SurfaceComposerClient::setFreezeTint(SurfaceID id, uint32_t tint) {
return getComposer().setFreezeTint(this, id, tint);
}
status_t SurfaceComposerClient::setPosition(SurfaceID id, int32_t x, int32_t y) {
status_t SurfaceComposerClient::setPosition(SurfaceID id, float x, float y) {
return getComposer().setPosition(this, id, x, y);
}

9
services/surfaceflinger/LayerBase.cpp
View File

@@ -45,7 +45,6 @@ LayerBase::LayerBase(SurfaceFlinger* flinger, DisplayID display)
mFlinger(flinger), mFiltering(false),
mNeedsFiltering(false),
mOrientation(0),
mLeft(0), mTop(0),
mTransactionFlags(0),
mPremultipliedAlpha(true), mName("unnamed"), mDebug(false),
mInvalidate(0)
@@ -119,7 +118,7 @@ uint32_t LayerBase::setTransactionFlags(uint32_t flags) {
return android_atomic_or(flags, &mTransactionFlags);
}
bool LayerBase::setPosition(int32_t x, int32_t y) {
bool LayerBase::setPosition(float x, float y) {
if (mCurrentState.transform.tx() == x && mCurrentState.transform.ty() == y)
return false;
mCurrentState.sequence++;
@@ -259,8 +258,6 @@ void LayerBase::validateVisibility(const Transform& planeTransform)
mOrientation = tr.getOrientation();
mTransform = tr;
mTransformedBounds = tr.makeBounds(w, h);
mLeft = tr.tx();
mTop = tr.ty();
}
void LayerBase::lockPageFlip(bool& recomputeVisibleRegions)
@@ -477,10 +474,10 @@ void LayerBase::dump(String8& result, char* buffer, size_t SIZE) const
snprintf(buffer, SIZE,
"+ %s %p\n"
" "
"z=%9d, pos=(%4d,%4d), size=(%4d,%4d), "
"z=%9d, pos=(%g,%g), size=(%4d,%4d), "
"isOpaque=%1d, needsDithering=%1d, invalidate=%1d, "
"alpha=0x%02x, flags=0x%08x, tr=[%.2f, %.2f][%.2f, %.2f]\n",
getTypeId(), this, s.z, tx(), ty(), s.w, s.h,
getTypeId(), this, s.z, s.transform.tx(), s.transform.ty(), s.w, s.h,
isOpaque(), needsDithering(), contentDirty,
s.alpha, s.flags,
s.transform[0][0], s.transform[0][1],

6
services/surfaceflinger/LayerBase.h
View File

@@ -84,7 +84,7 @@ public:
String8 getName() const;
// modify current state
bool setPosition(int32_t x, int32_t y);
bool setPosition(float x, float y);
bool setLayer(uint32_t z);
bool setSize(uint32_t w, uint32_t h);
bool setAlpha(uint8_t alpha);
@@ -217,8 +217,6 @@ public:
inline State& currentState() { return mCurrentState; }
int32_t getOrientation() const { return mOrientation; }
int tx() const { return mLeft; }
int ty() const { return mTop; }
protected:
const GraphicPlane& graphicPlane(int dpy) const;
@@ -250,8 +248,6 @@ protected:
Transform mTransform;
GLfloat mVertices[4][2];
Rect mTransformedBounds;
int mLeft;
int mTop;
// these are protected by an external lock
State mCurrentState;

12
services/surfaceflinger/Transform.cpp
View File

@@ -91,12 +91,12 @@ bool Transform::transformed() const {
return type() > TRANSLATE;
}
int Transform::tx() const {
return floorf(mMatrix[2][0] + 0.5f);
float Transform::tx() const {
return mMatrix[2][0];
}
int Transform::ty() const {
return floorf(mMatrix[2][1] + 0.5f);
float Transform::ty() const {
return mMatrix[2][1];
}
void Transform::reset() {
@@ -239,7 +239,9 @@ Region Transform::transform(const Region& reg) const
out.set(transform(reg.bounds()));
}
} else {
out = reg.translate(tx(), ty());
int xpos = floorf(tx() + 0.5f);
int ypos = floorf(ty() + 0.5f);
out = reg.translate(xpos, ypos);
}
return out;
}

4
services/surfaceflinger/Transform.h
View File

@@ -64,8 +64,8 @@ public:
uint32_t getOrientation() const;
float const* operator [] (int i) const; // returns column i
int tx() const;
int ty() const;
float tx() const;
float ty() const;
// modify the transform
void reset();