310f8da0c3
merge master to master_gl
2009-05-22 02:16:08 -07:00
bdbf6b094d
am 69a6c3eb: Merge change 2292 into donut
...
Merge commit '69a6c3ebd46a8de0e896747757f364322c12608d'
* commit '69a6c3ebd46a8de0e896747757f364322c12608d':
split boot animation out of SurfaceFlinger
2009-05-21 19:36:53 -07:00
a1ecca920e
split boot animation out of SurfaceFlinger
...
Conflicts:
data/etc/platform.xml
2009-05-21 19:21:59 -07:00
a47f02afb1
change 2115 wasn't merged properly into master. this fixes that.
...
Merge change 2115 into donut
* changes:
bring the native_handle stuff back from master_gl
Conflicts:
libs/binder/Parcel.cpp
2009-05-21 16:29:38 -07:00
53f6f3c799
bring the native_handle stuff back from master_gl
2009-05-20 14:33:23 -07:00
c5b2c0bf80
move libbinder's header files under includes/binder
2009-05-20 12:55:03 -07:00
208059f67e
checkpoint: split libutils into libutils + libbinder
2009-05-20 12:55:02 -07:00
20f68782a4
Region now has its own implementation instead of relying on SkRegion, which allows us to break libui's dependency on libcorecg.
2009-05-17 23:34:16 -07:00
d717598616
Merge commit 'goog/master' into merge_master
...
Conflicts:
opengl/libagl/Android.mk
opengl/libs/Android.mk
opengl/libs/egl_impl.h
2009-05-14 22:44:23 -07:00
93b94584ed
Modify camera framework to use new streamlined binder interface.
...
This is the second half of bug 1837832. Modifies the camera client
and camera service to use the new binder interface. Removes the
old binder interface. There will be one more part to this change
to surface the undefined callbacks to the Java layer so that
partners can implement new features without having to touch the
stack.
2009-05-11 07:36:58 -07:00
5958661507
Merge commit 'goog/master' into merge_master
2009-05-08 13:13:12 -07:00
1e16b13857
add support for update-on-demand in SurfaceFlinger
2009-05-07 17:40:23 -07:00
9b35233ea5
Add new binder methods to camera client to support generic callbacks
...
This is the first step in a multi-step change to move from the old
specific callbacks to a generic callback. This will allow future
flexibility in the interface without requiring binder rewrites.
Bug 1837832
2009-05-07 12:25:25 -07:00
aa8c0ff7a3
get rid off unneeded flags
2009-05-05 18:29:35 -07:00
58a79f4745
move android_native_buffer_t declaration into its own private/ui/android_native_priv.h header, since user code should never have access to it.
2009-05-05 18:21:32 -07:00
7189c0054e
move opengl/include/EGL/android_natives.h to include/ui/egl/android_natives.h and don't include it from egl.h
...
the android_native_ types are just forward declared in egl.h
2009-05-05 18:11:11 -07:00
21c59d0070
get rid of android_native_buffer_t::getHandle() and replace it with an handle field
...
this abstraction was not necessary. things are easier now.
2009-05-05 00:59:23 -07:00
e71212ba53
removed the "bits" attribute from android_native_buffer_t.
...
"bits" can never be trusted now that we need to call lock() on the handle to get the virtual address of the buffer.
2009-05-05 00:37:46 -07:00
b2dd686d06
minor clean-up in FramebufferNativeWindow
2009-05-04 19:38:43 -07:00
0926f50664
update surfaceflinger, libui and libagl to the new gralloc api
...
- Currently the lock/unlock path is naive and is done for each drawing operation (glDrawElements and glDrawArrays). this should be improved eventually.
- factor all the lock/unlock code in SurfaceBuffer.
- fixed "showupdate" so it works even when we don't have preserving eglSwapBuffers().
- improved the situation with the dirty-region and fixed a problem that caused GL apps to not update.
- make use of LightRefBase() where needed, instead of duplicating its implementation
- add LightRefBase::getStrongCount()
- renamed EGLNativeWindowSurface.cpp to FramebufferNativeWindow.cpp
- disabled copybits test, since it clashes with the new gralloc api
- Camera/Video will be fixed later when we rework the overlay apis
2009-05-04 14:17:04 -07:00
7be3e5d2d8
Merge commit 'goog/master' into merge_master
...
Conflicts:
libs/surfaceflinger/Layer.cpp
libs/surfaceflinger/SurfaceFlinger.cpp
opengl/libagl/egl.cpp
opengl/libs/EGL/egl.cpp
opengl/libs/GLES_CM/gl.cpp
opengl/libs/GLES_CM/gl_api.in
opengl/libs/gl_entries.in
opengl/libs/tools/glapigen
2009-04-30 14:43:18 -07:00
d2dc9ac87b
Bug fix(1807910): media recorder crash due to the use of locked camera object (last part)
...
- remove an unused Camera constructor
- add a check on the argument in Camera::create() method
2009-04-27 12:01:59 -07:00
f1d8e87b09
a brand new MessageQueue for SurfaceFlinger.
2009-04-24 16:22:36 -07:00
9f88afb013
Squashed commit of the following:
...
commit e5c24638f98162c3b75b4c67a16b510d38e31341
Author: Mathias Agopian <mathias@google.com>
Date: Fri Apr 17 14:09:03 2009 -0700
oops forgot this file.
commit 282642632d0cb12882eecf42e0fdfb2343275de1
Author: Mathias Agopian <mathias@google.com>
Date: Fri Apr 17 14:07:32 2009 -0700
use a helper macro for creating Singleton<>'s static attributes instances.
2009-04-24 15:00:41 -07:00
f1a5314076
Fix a media server crash (bug 1807910): part one
...
Add a factory method that creates a Camera object from a remote client
Next:
The changes in authordriver.cpp and android_camera_input.cpp will come.
and the constructor for Camera object will be removed.
2009-04-23 14:07:23 -07:00
18d8446fe1
cleanup, remove unused fields. Also make sure that we don't systematically allocate a Surface in Surface.java if only a SurfaceControl is needed (Common case).
2009-04-16 20:30:22 -07:00
01b766839e
more splitting of Surface/SurfaceControl. Surface.java is now implemented in terms of Surface and SurfaceControl.
...
The WindowManager side of Surface.java holds a SurfaceControl, while the client-side holds a Surface. When the client is in the system process, Surface.java holds both (which is a problem we'll try to fix later).
2009-04-16 20:04:08 -07:00
62185b7335
split Surface.cpp into Surface and SurfaceControl
...
SurfaceControl is used for controling the geometry of the surface (for the WM), while Surface is used to access the buffers (for SF's clients).
SurfaceFlingerClient now uses the SurfaceID instead of Surface*.
Currently Surface still has the SurfaceControl API and is implemented by calling into SurfaceControl.
2009-04-16 16:19:50 -07:00
40b7f6e043
fix some issues with Surface's lifetime management.
...
To deal with Java's lack of destructors and delayed garbage collection, we used to duplicate Surface.cpp objects in some case; this caused some issues because Surface is supposed to be reference-counted and unique.
2009-04-16 12:29:34 -07:00
4243e66621
fix a rookie mistake causing Singleton<> to be a "multiton". Also improve the BufferMapper's debugging, but turn it off.
...
Squashed commit of the following:
commit 04e9cae7f806bd65f2cfe35c011b47a36773bbe5
Author: Mathias Agopian <mathias@google.com>
Date: Wed Apr 15 18:30:30 2009 -0700
fix and improve BufferMapper's tracking of mapped buffers.
commit 1a8deaed15811092b2349cc3c40cafb5f722046c
Author: Mathias Agopian <mathias@google.com>
Date: Wed Apr 15 00:52:02 2009 -0700
fix some bugs with the Singleton<> class. untested.
commit ed01cc06ad70cf640ce1258f01189cb1a96fd3a8
Author: Mathias Agopian <mathias@google.com>
Date: Tue Apr 14 19:29:25 2009 -0700
some work to debug the Singleton<> template.
2009-04-15 18:34:24 -07:00
8b765b7f5e
more debugging tools around BufferMapper
2009-04-10 20:34:46 -07:00
076b1cc3a9
Integrate from //sandbox/mathias/donut/...@145728
...
SurfaceFlinger rework for new EGL driver model support.
2009-04-10 14:24:30 -07:00
c08731e756
AI 143320: am: CL 143171 am: CL 142873 fix [1732012] Only show screen rotation animation when triggered by sensor
...
Original author: mathias
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143320
2009-03-27 18:11:38 -07:00
24fd77d440
AI 143171: am: CL 142873 fix [1732012] Only show screen rotation animation when triggered by sensor
...
Original author: mathias
Merged from: //branches/cupcake/...
Automated import of CL 143171
2009-03-27 16:10:37 -07:00
c1992a6f75
Automated import from //branches/donutburger/...@142727,142727
2009-03-25 17:24:35 -07:00
c3aa00b29f
Automated import from //branches/master/...@142771,142771
2009-03-25 16:21:55 -07:00
edbf3b6af7
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
d5193d9394
auto import from //depot/cupcake/@135843
2009-03-03 18:28:45 -08:00
43aa2b1cbf
auto import from //depot/cupcake/@132589
2009-03-03 14:04:24 -08:00
0bb03408de
auto import from //depot/cupcake/@137055
2009-03-02 22:54:33 -08:00
ac65e0b172
auto import from //branches/cupcake/...@131421
2009-02-13 12:57:50 -08:00
a6938bab1f
auto import from //branches/cupcake/...@130745
2009-02-10 15:44:00 -08:00
5f78a48bb8
auto import from //branches/cupcake/...@127101
2009-01-20 14:03:58 -08:00
8a7a67538a
auto import from //branches/cupcake/...@126645
2009-01-15 16:12:10 -08:00
276293246e
auto import from //branches/cupcake/...@125939
2009-01-09 17:51:23 -08:00
e09fd9e819
Code drop from //branches/cupcake/...@124589
2008-12-17 18:05:43 -08:00
7c1b96a165
Initial Contribution
2008-10-21 07:00:00 -07:00
Mathias Agopian