2639 Commits

Author SHA1 Message Date
Shih-wei Liao
7eb295d2c2 am a8e09520: am 96100195: Fix the build.
* commit 'a8e09520010ccc32b303c3028e37f34942e1e48c':
  Fix the build.
2011-01-13 02:25:24 -08:00
Shih-wei Liao
a8e0952001 am 96100195: Fix the build.
* commit '96100195f06d9be287f2577a41f498917b34f7ef':
  Fix the build.
2011-01-13 02:23:21 -08:00
Shih-wei Liao
96100195f0 Fix the build.
Change-Id: I36b523d877c5beadf0fce21b9f7534f0ffc23959
2011-01-13 02:20:51 -08:00
Shih-wei Liao
e5455b737f am 5dfe6222: am 078717be: Merge "Disable on-device linking" into honeycomb
* commit '5dfe6222d97d2403a892188eddf5560971d5270d':
  Disable on-device linking
2011-01-13 02:09:57 -08:00
Shih-wei Liao
b80784f772 am 7e5dc299: am c758f1c6: Merge "Fix the build." into honeycomb
* commit '7e5dc299f303d4cd3a2b93e56e751b5aa3490ea7':
  Fix the build.
2011-01-13 02:09:53 -08:00
Shih-wei Liao
c2cfab1dba am faf88e2d: am f6dd9c53: Merge "On-device linking." into honeycomb
* commit 'faf88e2d9d7af6bcc906e38a03da58df095d8419':
  On-device linking.
2011-01-13 02:09:48 -08:00
Shih-wei Liao
5dfe6222d9 am 078717be: Merge "Disable on-device linking" into honeycomb
* commit '078717be074e4f68b9af37d70ecbd63702b2be6c':
  Disable on-device linking
2011-01-13 02:07:53 -08:00
Shih-wei Liao
7e5dc299f3 am c758f1c6: Merge "Fix the build." into honeycomb
* commit 'c758f1c6a3bd0a65c85572847903c44307d04237':
  Fix the build.
2011-01-13 02:07:48 -08:00
Shih-wei Liao
6806ef69bd am 9b024b69: am 3ae5017b: Merge "convert2uchar3." into honeycomb
* commit '9b024b693e089aa28acfe637eb4513425efa5766':
  convert2uchar3.
2011-01-13 02:07:39 -08:00
Shih-wei Liao
faf88e2d9d am f6dd9c53: Merge "On-device linking." into honeycomb
* commit 'f6dd9c539c1b18f65674b495cb23bf2df36da7af':
  On-device linking.
2011-01-13 02:07:39 -08:00
Shih-wei Liao
078717be07 Merge "Disable on-device linking" into honeycomb 2011-01-13 02:06:17 -08:00
Shih-wei Liao
0394d2495a Disable on-device linking
Change-Id: I7c416c7c9714fae0722e61c4f0368fbdb7d808b3
2011-01-13 02:05:34 -08:00
Shih-wei Liao
9b024b693e am 3ae5017b: Merge "convert2uchar3." into honeycomb
* commit '3ae5017b1bc2910610194cc8790e8d96516ac9b5':
  convert2uchar3.
2011-01-13 02:05:32 -08:00
Shih-wei Liao
c758f1c6a3 Merge "Fix the build." into honeycomb 2011-01-13 02:04:10 -08:00
Shih-wei Liao
f6dd9c539c Merge "On-device linking." into honeycomb 2011-01-13 02:04:00 -08:00
Shih-wei Liao
3ae5017b1b Merge "convert2uchar3." into honeycomb 2011-01-13 02:03:51 -08:00
Shih-wei Liao
3a3dd2b37c Fix the build.
Change-Id: I20ac8700bcc8ccb7905f82bbfea81d007f67a68e
2011-01-13 02:03:00 -08:00
Eric Laurent
5ee164d204 am ba035dd0: am 48f400c3: am bec4abaa: Merge "Fix issue 3302649." into gingerbread
* commit 'ba035dd049c345e2041e86e262d03940f0bb2699':
  Fix issue 3302649.
2011-01-12 20:51:12 -08:00
Eric Laurent
ba035dd049 am 48f400c3: am bec4abaa: Merge "Fix issue 3302649." into gingerbread
* commit '48f400c3762bd50603222cb5e7856d6aef4ebc4e':
  Fix issue 3302649.
2011-01-12 20:48:44 -08:00
Shih-wei Liao
067e7b261a On-device linking.
Change-Id: I609f575f1c2b9e9c3de0d8c16eb06b66b744bcb5
2011-01-12 19:14:27 -08:00
Jason Sams
734a795427 am b7ec5469: am ef56ee31: Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb
* commit 'b7ec54699f51ba3ba30fe7be99babd74117e9eb8':
  WAR driver bug where surfaces of size 0 fail.
2011-01-12 15:32:56 -08:00
Jason Sams
ef56ee316c Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb 2011-01-12 15:28:19 -08:00
Jason Sams
10fd98a3ab am 07e27a11: am 208a1c68: Merge "Implement more of copy2DRange*" into honeycomb
* commit '07e27a11e40089bac689f42f379e2508a26d4115':
  Implement more of copy2DRange*
2011-01-12 15:26:37 -08:00
Jason Sams
ec30933c1d WAR driver bug where surfaces of size 0 fail.
Change-Id: I72b356c4cfb71f2342479ca21238b763d02e729d
2011-01-12 15:26:25 -08:00
Jason Sams
208a1c68ee Merge "Implement more of copy2DRange*" into honeycomb 2011-01-12 15:22:09 -08:00
Romain Guy
6431b6935f am b7a0fa5e: am b08ea03c: Merge "Reenable region composition pipeline for layers Bug #3341848" into honeycomb
* commit 'b7a0fa5efbc25c4cc66209e2e88ae01b4921a364':
  Reenable region composition pipeline for layers Bug #3341848
2011-01-12 15:10:41 -08:00
Jamie Gennis
c155489739 am f152f2ef: am 103198a1: Merge "Implement crop & transform for SurfaceTexture." into honeycomb
* commit 'f152f2efa6892f844949b648aecc3b2a91e1d17e':
  Implement crop & transform for SurfaceTexture.
2011-01-12 15:07:53 -08:00
Romain Guy
b08ea03c1b Merge "Reenable region composition pipeline for layers Bug #3341848" into honeycomb 2011-01-12 15:06:18 -08:00
Romain Guy
c038ea358a Reenable region composition pipeline for layers
Bug #3341848

It works this time!

Change-Id: I0d371d8b2c75c67d4ce5009ddb990fe5e55a0a27
2011-01-12 15:08:47 -08:00
Jamie Gennis
103198a10c Merge "Implement crop & transform for SurfaceTexture." into honeycomb 2011-01-12 14:57:29 -08:00
Jason Sams
fb9f82ca4f Implement more of copy2DRange*
Change-Id: Id6be481c4abc968df27e5bba1ed044262ec0f293
2011-01-12 14:53:25 -08:00
Romain Guy
701d7c90c2 am dee6089c: am 2e0c5261: Merge "Add logging to the new layers API." into honeycomb
* commit 'dee6089c2de42fcddfd22781c90a2e797b5f592c':
  Add logging to the new layers API.
2011-01-12 14:35:59 -08:00
Romain Guy
1fc883b271 Add logging to the new layers API.
Change-Id: I78b9426eb17de3e775aca9fafe4a50bd9c0785c4
2011-01-12 14:31:55 -08:00
Romain Guy
2e0c52610b Merge "Add logging to the new layers API." into honeycomb 2011-01-12 14:29:15 -08:00
Eric Laurent
48f400c376 am bec4abaa: Merge "Fix issue 3302649." into gingerbread
* commit 'bec4abaa12bf6759f354b54119c5524cf9339e7b':
  Fix issue 3302649.
2011-01-12 13:52:42 -08:00
Jason Sams
a804e734d0 am fc6528ec: am 8f597fdf: Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb
* commit 'fc6528ecd1c1285c909cb81ca2196c65086944b1':
  Cleanup bitmap uploads Implement standalone mipmap generation.
2011-01-12 13:35:05 -08:00
Jason Sams
8f597fdfac Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb 2011-01-12 13:30:41 -08:00
Jason Sams
f7086090cf Cleanup bitmap uploads
Implement standalone mipmap generation.

Change-Id: Ie3a9781bbe50e2f58adca6f184d84fea50e40263
2011-01-12 13:28:37 -08:00
Romain Guy
b69e249af8 am 5ecceb7d: am 85354828: Merge "Cleanup GL objects on the correct thread." into honeycomb
* commit '5ecceb7df70a6e6b2a32ab97630bc625000261da':
  Cleanup GL objects on the correct thread.
2011-01-12 12:54:28 -08:00
Romain Guy
853548287f Merge "Cleanup GL objects on the correct thread." into honeycomb 2011-01-12 12:50:50 -08:00
Romain Guy
57066eb64c Cleanup GL objects on the correct thread.
Change-Id: Iddfea6e08a6591a4fab147151098ef27005f373d
2011-01-12 12:53:32 -08:00
Alex Sakhartchouk
42429d3598 am 941f8659: am 27d11608: Merge "Adding ability to load cubemaps from individual faces." into honeycomb
* commit '941f86590cb4e26f070aa5a72a5e215d6555d7bc':
  Adding ability to load cubemaps from individual faces.
2011-01-12 11:57:48 -08:00
Alex Sakhartchouk
27d116085e Merge "Adding ability to load cubemaps from individual faces." into honeycomb 2011-01-12 11:53:42 -08:00
Jamie Gennis
b598fb9072 Implement crop & transform for SurfaceTexture.
This change adds support for the setCrop and setTransform methods of the
SurfaceTexture C++ class.  The crop and transform for the current
texture will be accessed by applications as a single texture coordinate
transform matrix.

Change-Id: I6482bf96f680e5c175364e848936db3908d6c8f8
2011-01-12 11:28:38 -08:00
Shih-wei Liao
16095fc4c8 convert2uchar3.
Change-Id: I5d5406f14b0c22a7b085495b3bcc51d5a288dcf8
2011-01-12 04:44:09 -08:00
Stephen Hines
1c6cbd551f am 445fc566: am 78dd1ef3: Merge "Clean up RS math headers." into honeycomb
* commit '445fc56682a55a3c0ba8e63970631f48adced7cf':
  Clean up RS math headers.
2011-01-11 19:14:35 -08:00
Stephen Hines
78dd1ef3f7 Merge "Clean up RS math headers." into honeycomb 2011-01-11 19:09:47 -08:00
Romain Guy
eb5405762f am a22bcfb6: am 6ed4a2f7: Merge "Disable the region compositing pipeline for layers." into honeycomb
* commit 'a22bcfb6a471946969a33c1637f4460897f5576f':
  Disable the region compositing pipeline for layers.
2011-01-11 18:03:04 -08:00
Romain Guy
35f24545e5 Disable the region compositing pipeline for layers.
This composition mode is affecting Gmail in a bad way. Disabling until
I can figure out the problem.

Change-Id: I00e657ea2d05fc7b4a606242d19dc84dd88c1e35
2011-01-11 18:01:25 -08:00
Romain Guy
acd5366fb9 am a82444ad: am 5f6e583c: Merge "Don\'t break the build!" into honeycomb
* commit 'a82444ad3aa87cc8ce8a585a6e1937ac6cd9ee18':
  Don't break the build!
2011-01-11 18:00:47 -08:00