drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,614 Commits 1 Branch 0 Tags
Commit Graph

1059 Commits

Author SHA1 Message Date
Alex Sakhartchouk
2123b46ba8 Piping texture names through shader builder. 
Fixing uint size_t mismatch.

Change-Id: Ia7c8bd9f829deaa50e1cc381ccd50f29676bbdfb
 2012-02-15 16:21:46 -08:00
Stephen Hines
f6fb3ab8c0 Merge "Update Element.isCompatible() to work with NONE." 2012-02-15 15:21:01 -08:00
Jason Sams
c107b10354 Merge "Beging IO stream out from allocation to surface texture." 2012-02-15 12:05:26 -08:00
Jason Sams
163766cbe7 Beging IO stream out from allocation to surface texture. 
Change-Id: I4d6b7f7740a896d39b811d6fe7532bb00db62373
 2012-02-15 12:04:24 -08:00
Stephen Hines
2094811371 Update Element.isCompatible() to work with NONE. 
In the past, we used a null reference to signify a user-created Element. The
use of DataType.NONE for user-created Elements thus required an update to our
Element compatibility check.

Change-Id: I3293a645eff85c9040487c22f3a3240862f74350
 2012-02-14 19:42:42 -08:00
Romain Guy
79952ee29a Merge "Clarify documentation of Bitmap.createScaledBitmap/createBitmap Bug #6015472" 2012-02-14 16:55:55 -08:00
Romain Guy
f12f6f058f Clarify documentation of Bitmap.createScaledBitmap/createBitmap 
Bug #6015472

Change-Id: I6cf9efc2f695928d54a0dfba08b085559574ae14
 2012-02-14 16:25:16 -08:00
Stephen Hines
0599d6ede3 Merge "Fix typos/spacing with new APIs." 2012-02-14 13:38:43 -08:00
Stephen Hines
9069ee88cb Fix typos/spacing with new APIs. 
Change-Id: I26b772e8e29b12381042fb50c6dfa9df012b3f63
 2012-02-13 18:25:54 -08:00
Jason Sams
cb66aec0bd Merge "Start implementing SurfaceTexture streaming into RS allocations." 2012-02-10 13:51:04 -08:00
Jason Sams
532efd3ce2 Start implementing SurfaceTexture streaming into RS allocations. 
Change-Id: I561fbb63c63371ea59047c07fb2d68c21d16e76b

Conflicts:

	libs/rs/rsAllocation.h
 2012-02-10 13:24:18 -08:00
Justin Ho
cc3669ab9c am fe07b9a2: Merge "Tentative fix for mysteriously recycled bitmap" 
* commit 'fe07b9a2ab54305de553332d0ab278fdf7158ae4':
  Tentative fix for mysteriously recycled bitmap
 2012-02-08 13:00:39 -08:00
Romain Guy
4e525a6e5a Tentative fix for mysteriously recycled bitmap 
This code should not be triggered with scale == 1.0f because of the
density comparisons above though.

Change-Id: I9e39e3769a3b6550c97df3b213457947ec1f554b
 2012-02-08 11:19:11 -08:00
Jason Sams
eb5b73504d Merge commit 'bdeec118' into manualmerge 
Conflicts:
	libs/rs/rsThreadIO.h

Change-Id: I7f448996a86f41188b47ec3dc353c364692e8bf2
 2012-02-07 16:40:51 -08:00
Jason Sams
4c2e4c80ce Implement RS VSync on new vsync infrastructure. 
Change-Id: I662159a086a56e28732dd64a3a3cb30f8d4b72b1

Replace lockless fifo from server to client with sockets.

Change-Id: I99a4ab4f18496c0fbac96ee7b8099797af4712ea
 2012-02-07 15:32:08 -08:00
Stephen Hines
0b1ad704f4 am e05bc81c: Merge "We should not throw for non-fatal errors." 
* commit 'e05bc81c19838801b91de2642dc275a16dd7cf71':
  We should not throw for non-fatal errors.
 2012-02-03 15:37:52 -08:00
Stephen Hines
be74bdd234 We should not throw for non-fatal errors. 
BUG=5955072

Change-Id: I731242805957a057aaff1ba96a58c69d6e474a59
 2012-02-03 15:29:36 -08:00
Stephen Hines
0a29fe1be1 am cc2daede: Merge "Properly recover from failed compilation." 
* commit 'cc2daede56257f0f1f490a1aebf5b9b898d9816a':
  Properly recover from failed compilation.
 2012-02-02 21:28:17 -08:00
Stephen Hines
cc2daede56 Merge "Properly recover from failed compilation." 2012-02-02 21:25:19 -08:00
Alex Sakhartchouk
98bea4a3ec am 7042613c: Merge "Fix an incorrect assert that doesn\'t account for element array size." 
* commit '7042613c653fd0de253f2f659901318902fa4584':
  Fix an incorrect assert that doesn't account for element array size.
 2012-02-02 14:56:34 -08:00
Stephen Hines
862dadb7a7 Properly recover from failed compilation. 
BUG=5955072

We used to call delete, which did not update the Context's view of the world,
leading to potential segfaults on Context teardown. This change also enables
exceptions to be thrown when runtime errors are encountered.

Change-Id: If63578efff2d7dd03639da1049c1a5ebc69fde35
 2012-02-02 13:23:20 -08:00
Alex Sakhartchouk
bf3c3f2ab1 Fix an incorrect assert that doesn't account for element array size. 
Change-Id: Ibcb5c55d91967603391a1721137d010a85025990
 2012-02-02 09:47:26 -08:00
Romain Guy
6019853bc7 am a403a2e0: Merge "Add GradientDrawable.setColors(int[])" 
* commit 'a403a2e0f0d55a709821a6310de849176dc9b426':
  Add GradientDrawable.setColors(int[])
 2012-01-31 12:59:28 -08:00
Romain Guy
8bd9698b66 Add GradientDrawable.setColors(int[]) 
This change also updates the documentation to warn the user about which properties
require a call to mutate().

Change-Id: I84717068bf026669e3eef1ae92db665a964fe08a
 2012-01-31 12:11:02 -08:00
Romain Guy
99022a322f am b74b84f1: Merge "Proper equals/hashCode impls in Rect and RectF" 
* commit 'b74b84f195e7620415784323c7160afadfcbe9c5':
  Proper equals/hashCode impls in Rect and RectF
 2012-01-31 10:53:35 -08:00
Romain Guy
74d7ca133a Proper equals/hashCode impls in Rect and RectF 
Change-Id: Ief52d84f134018af4dfd19674de12736c056e3f8
 2012-01-31 10:50:38 -08:00
Stephen Hines
bc19591c1f am 855eadf9: Merge "Fix potential bug with reordered size/offset arguments." 
* commit '855eadf942c8ff5c2665d7dc3b6d4b5ba630419a':
  Fix potential bug with reordered size/offset arguments.
 2012-01-30 12:23:21 -08:00
Stephen Hines
855eadf942 Merge "Fix potential bug with reordered size/offset arguments." 2012-01-30 12:22:10 -08:00
Romain Guy
68a1df6541 am 1a54368b: Merge "Add full support for Canvas.setDrawFilter()" 
* commit '1a54368b24a8cb88ee56ee746eae45171a43b89e':
  Add full support for Canvas.setDrawFilter()
 2012-01-23 17:12:28 -08:00
Romain Guy
5ff9df6582 Add full support for Canvas.setDrawFilter() 
Change-Id: I0ad35d0603c4eeda469014803be14c1dcdde918c
 2012-01-23 17:09:05 -08:00
Romain Guy
767a04d896 am e575005f: Merge "Update hardware acceleration doc" 
* commit 'e575005f7c7a2ec26662862631ca1d0d1959d6bc':
  Update hardware acceleration doc
 2012-01-23 16:30:32 -08:00
Romain Guy
36d7549181 Update hardware acceleration doc 
Change-Id: I3bed77b3c4e1eff96fa462e4849f25f38784c415
 2012-01-23 16:26:46 -08:00
Stephen Hines
4cbe25a86b Fix potential bug with reordered size/offset arguments. 
This change also cleans up a few uint32_t/size_t issues.

Change-Id: Iae0fc085c12149129b91fce0ebbc28c8cf358eaf
 2012-01-20 19:21:35 -08:00
Romain Guy
86fcb90f3b am 22d41843: Fix the build, for real 
* commit '22d418437e44587cb0fba4353515719453269189':
  Fix the build, for real
 2012-01-19 18:36:34 -08:00
Romain Guy
22d418437e Fix the build, for real 
Change-Id: I6263f7e5e3ae2f7efe045f8b464c0ed1b87fc793
 2012-01-19 18:33:25 -08:00
Romain Guy
dec35b81b7 am 90bd1873: Merge "Fix build" 
* commit '90bd18737a5ce16708003363683744cfd0480d83':
  Fix build
 2012-01-19 18:17:54 -08:00
Romain Guy
65447287cb Fix build 
Change-Id: I0e0f6a613cdad3ec075da9b84e3532dd492f0162
 2012-01-19 18:15:24 -08:00
Romain Guy
3e77e8e59c am d2f0dcd1: Merge "Remove unused code" 
* commit 'd2f0dcd182fbc0423d206919e81f3845fb9b8155':
  Remove unused code
 2012-01-19 17:44:50 -08:00
Romain Guy
68fc1dfce0 Remove unused code 
Change-Id: Ife0a43f3cfe64a1e74401b10bf74d37cbeefb5af
 2012-01-19 17:41:39 -08:00
Romain Guy
4adbee3784 am bad12166: Merge "Deprecate unused APIs" 
* commit 'bad12166190a7e8087eb5db0ae8df9a4e5843fde':
  Deprecate unused APIs
 2012-01-19 17:37:10 -08:00
Jean-Baptiste Queru
12b7da6995 am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-19 17:26:12 -08:00
Jean-Baptiste Queru
97aa8ee811 Merge ee4618bc 
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
 2012-01-19 17:18:25 -08:00
Romain Guy
f9d9c065ed Deprecate unused APIs 
Change-Id: I0107e246b632dda96b8b025217936954f1f46283
 2012-01-19 17:16:38 -08:00
Steve Block
c6aacce371 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) 
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
 2012-01-19 14:45:03 -08:00
Steve Block
06ade6ae1b Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) 
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
 2012-01-19 14:44:31 -08:00
Romain Guy
205c2c5fb1 am e7bdf2d9: Merge "Don\'t crash on Canvas.drawPicture()" 
* commit 'e7bdf2d9d0107afadddb6498331cd21be260d23c':
  Don't crash on Canvas.drawPicture()
 2012-01-18 18:12:51 -08:00
Romain Guy
84fce187b0 Don't crash on Canvas.drawPicture() 
Implementation yet to come but prevent app crashes.

Change-Id: I81d6851ebf776a98e13c606bab272a03aec406ee
 2012-01-18 18:09:54 -08:00
Romain Guy
c32d232c91 am 11d06a73: Merge "Fix text encoding when drawing with drawPosText in software" 
* commit '11d06a73df371be0b11d5cf586e24601d796c048':
  Fix text encoding when drawing with drawPosText in software
 2012-01-17 14:56:45 -08:00
Romain Guy
62b6eaa7f3 Fix text encoding when drawing with drawPosText in software 
Change-Id: I0cd8ee526189c38c50953a1a08b50e0b31c55d8c
 2012-01-17 14:53:26 -08:00
Jason Sams
615e7cee03 Start implementing SurfaceTexture streaming into RS allocations. 
Change-Id: I561fbb63c63371ea59047c07fb2d68c21d16e76b
 2012-01-13 14:01:20 -08:00