222 Commits

Author SHA1 Message Date
Jason Sams
7e5ab3b177 Continue es2 shader dev
Conflicts:

	graphics/java/android/renderscript/Program.java
	graphics/java/android/renderscript/ProgramVertex.java
2009-12-15 13:27:04 -08:00
Jason Sams
0011bcf57f Continue development of es2.0 user shader support for renderscript. This change cleans up ProgramVertex creation and adds support for passing input, output, and constant type info. 2009-12-15 12:58:36 -08:00
Jason Sams
3b7d39bb51 Implement RS tracked defered texture and buffer object uploads. 2009-12-14 12:59:49 -08:00
Jason Sams
aad442ec27 am b62954b6: am 8f31c230: am 57ce0888: Merge change Id22c0137 into eclair
Merge commit 'b62954b66542e3e2654d97a81123c51805bceca7'

* commit 'b62954b66542e3e2654d97a81123c51805bceca7':
  Throttle low priority RS threads by sleeping once per frame to avoid starving other apps.
2009-12-10 17:15:13 -08:00
Jason Sams
8f31c23021 am 57ce0888: Merge change Id22c0137 into eclair
Merge commit '57ce0888fcb1376b385c3dab5e4262793acaaf16' into eclair-mr2

* commit '57ce0888fcb1376b385c3dab5e4262793acaaf16':
  Throttle low priority RS threads by sleeping once per frame to avoid starving other apps.
2009-12-10 16:45:22 -08:00
Jason Sams
b9d5c574ff Throttle low priority RS threads by sleeping once per frame to avoid starving other apps. 2009-12-09 11:05:45 -08:00
Jason Sams
c73ec39bd0 DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app. 2009-12-03 15:43:18 -08:00
Jason Sams
54c0ec14e0 Beging GL2 user shaders. Switch master to using GL2 by default. 2009-11-30 15:34:03 -08:00
Jason Sams
7efde12a03 Fix film 2009-11-25 15:14:50 -08:00
Jason Sams
bb51c40d89 Begin gl2 support. Renderscript still uses GL1.1 by default. However, 2.0 can be enabled and will render most tests correctly. 2009-11-25 13:22:07 -08:00
Jason Sams
0a2e7a3963 am e4df64bd: am 66358e24: am 9dab667e: Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit 'e4df64bdaaf86fb7d06715de122a97d723d7fea2'

* commit 'e4df64bdaaf86fb7d06715de122a97d723d7fea2':
  Force a crash under conditions where white square bug in all apps is likely to occur.
2009-11-24 12:57:57 -08:00
Jason Sams
9dab667e03 Force a crash under conditions where white square bug in all apps is likely to occur. 2009-11-24 12:26:35 -08:00
Jason Sams
79e2646504 am 9f96a37a: am 6a2500a3: am 39dbb099: Merge change I36176536 into eclair
Merge commit '9f96a37aabbffffe719c1dfb73b5c437f190bcf0'

* commit '9f96a37aabbffffe719c1dfb73b5c437f190bcf0':
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:29:46 -08:00
Jason Sams
361765361a Fix ref counting bug that could cause memory leak in allApps. 2009-11-23 15:28:55 -08:00
Jason Sams
857d2b1565 am 93f409b5: am d581b1a8: am ddac83a5: Fix extended logging for object dumping.
Merge commit '93f409b5f7992767594107b7f468143e4a89a8c1'

* commit '93f409b5f7992767594107b7f468143e4a89a8c1':
  Fix extended logging for object dumping.
2009-11-19 17:43:24 -08:00
Jason Sams
ddac83a516 Fix extended logging for object dumping. 2009-11-19 13:08:17 -08:00
Android (Google) Code Review
f5fac58f50 Merge change Id10824da
* changes:
  Fix film init
2009-11-17 18:53:07 -08:00
Jason Sams
d10824dadc Fix film init 2009-11-17 18:51:58 -08:00
Android (Google) Code Review
9390931b6e Merge change I948415fd
* changes:
  Delete the old rollo sample which is obsolete.
2009-11-17 18:51:25 -08:00
Jason Sams
948415fdd9 Delete the old rollo sample which is obsolete. 2009-11-17 18:50:09 -08:00
Jason Sams
644a0e320d resolved conflicts for merge of f6309041 to master 2009-11-17 18:07:54 -08:00
Jason Sams
715333b832 Add support for dumping RS objects to aid in debugging of white blocks bug. 2009-11-17 17:26:46 -08:00
Jason Sams
41301259fb am 234e509a: am 22186a2c: am ec8178eb: Merge change I9c1bad53 into eclair
Merge commit '234e509a67eb32606f3051d21eb3ea25b272d80d'

* commit '234e509a67eb32606f3051d21eb3ea25b272d80d':
  Add setPriority to allow wallpapers to run at lower cpu priority than default.
2009-11-17 07:31:07 -08:00
Jason Sams
7d787b4722 Add setPriority to allow wallpapers to run at lower cpu priority than default. 2009-11-15 12:14:26 -08:00
Jason Sams
d7bc5e9891 am 8dcb4233: am 4834887e: am 4dd6fee7: Merge change Ieb4b0318 into eclair
Merge commit '8dcb4233fcb043f82774768d3e5bee86d867b852'

* commit '8dcb4233fcb043f82774768d3e5bee86d867b852':
  Make default vertex program correctly track surface size.
2009-11-13 10:51:39 -08:00
Jason Sams
bc4d75bc64 am adf38939: am da8bb292: am 59175ac2: Merge change I81b1421a into eclair
Merge commit 'adf38939836ee1d1f5967fc45d02e07117f44009'

* commit 'adf38939836ee1d1f5967fc45d02e07117f44009':
  Defer EGL init until the surface changed call comes in.  Pass w,h along with surface for verification of driver state.
2009-11-13 10:50:49 -08:00
Jason Sams
eb4b031804 Make default vertex program correctly track surface size. 2009-11-12 16:09:45 -08:00
Jason Sams
3bc47d4381 Defer EGL init until the surface changed call comes in. Pass w,h along with surface for verification of driver state. 2009-11-12 15:10:47 -08:00
Romain Guy
28ffcc4bb2 am e614f938: am dac92e6f: am 3e584fc9: Merge change I5975651f into eclair
Merge commit 'e614f9382799826ca11960eb8ffacb677e2a2b1b'

* commit 'e614f9382799826ca11960eb8ffacb677e2a2b1b':
  Don't feed the timezone to RenderScript time functions, let the library figure it out.
2009-11-11 17:39:42 -08:00
Romain Guy
baed727481 Don't feed the timezone to RenderScript time functions, let the library figure it out.
Bug #2211070.

Change-Id: I5975651fd12399fb8dfe283dfdfaa17569738c7b
2009-11-11 15:36:06 -08:00
Jason Sams
237d247cc4 am 4909b554: am a8f2c2b4: am 902051df: Merge change I0e27b5ca into eclair
Merge commit '4909b554782c1970bce11fb421b0a06664a25718'

* commit '4909b554782c1970bce11fb421b0a06664a25718':
  Fix texture upload bug for narrow texture of less than 32bpp.
2009-11-05 16:00:56 -08:00
Jason Sams
0e27b5cadb Fix texture upload bug for narrow texture of less than 32bpp. 2009-11-05 12:44:58 -08:00
Jason Sams
bd98f10764 am eb7e27e8: am a1c3681f: am decc139b: Merge change I7a824efc into eclair
Merge commit 'eb7e27e8007d1b27d3e01c376b6747dc885db517'

* commit 'eb7e27e8007d1b27d3e01c376b6747dc885db517':
  Support applications changing the surface attached to the RS.
2009-11-03 16:27:39 -08:00
Jason Sams
74807763e0 am 03fa848a: am ebca5eec: am 83665194: Merge change I9d5e03db into eclair
Merge commit '03fa848afd16ee678e2d04ec824794893f199804'

* commit '03fa848afd16ee678e2d04ec824794893f199804':
  Fix RS bugs.  We were holding a pointer to the script text from the java vm. Move freeing of objects to before context teardown to allow allocations to clean up their data.
2009-11-03 15:26:09 -08:00
Jason Sams
efd9b6fb2e Support applications changing the surface attached to the RS. 2009-11-03 14:15:28 -08:00
Jason Sams
9d5e03db99 Fix RS bugs. We were holding a pointer to the script text from the java vm. Move freeing of objects to before context teardown to allow allocations to clean up their data. 2009-11-03 11:25:42 -08:00
Jason Sams
46f385459f am 15ec511b: am 38f95586: am 03e778b9: Merge change Ic4918c30 into eclair
Merge commit '15ec511b5c5cdb901bf1bd0e26ff0514635fc681'

* commit '15ec511b5c5cdb901bf1bd0e26ff0514635fc681':
  Fix a build break.  Too many branches to keep track of.
2009-11-02 15:23:02 -08:00
Jason Sams
43b5a56644 am 766df995: am d31b0e44: am 3bbb5e9a: Merge change Ib7a6c434 into eclair
Merge commit '766df995e30caa054cc25068e55f160c765590eb'

* commit '766df995e30caa054cc25068e55f160c765590eb':
  Fix some leaks.  This fixes the major malloc memory leak in allApps.  Still tracking some much more minor issues.
2009-11-02 15:22:34 -08:00
Jason Sams
c4918c3014 Fix a build break. Too many branches to keep track of. 2009-11-02 15:05:04 -08:00
Jason Sams
b7a6c4340a Fix some leaks. This fixes the major malloc memory leak in allApps. Still tracking some much more minor issues. 2009-11-02 14:25:10 -08:00
Marco Nelissen
a6e385cf20 am 923f2cf0: am a89a059e: am 04104665: Merge change I911458a0 into eclair
Merge commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b'

* commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b':
  Fix x offset for boxed textures
2009-10-29 14:47:10 -07:00
Jason Sams
060746b383 am 3c249da7: am 21e799ed: am e9e50b57: Merge change I7136220b into eclair
Merge commit '3c249da7eaceaffae87657aeb7179ffc4a5e1570'

* commit '3c249da7eaceaffae87657aeb7179ffc4a5e1570':
  Fix egl cleanup code on context teardown.
2009-10-29 02:03:37 -07:00
Marco Nelissen
911458a081 Fix x offset for boxed textures 2009-10-28 15:10:56 -07:00
Jason Sams
7136220b54 Fix egl cleanup code on context teardown. 2009-10-27 14:44:31 -07:00
Jason Sams
83f1c63c56 Fix dirty state tracking of allocation attached to ProgramVertex objects when being updated while not attached. 2009-10-26 15:20:43 -07:00
Jason Sams
741a6100a0 Fix bug where dirty messages for allocations attached to programVertex objects could be lost. 2009-10-15 18:45:45 -07:00
Jason Sams
41c19db90e Remove hack in RS that called exit to WAR now fixed driver bugs. Make gloabal init safe by locking around the critical code. 2009-10-15 16:47:31 -07:00
Jason Sams
c7412b3b08 Minor bug fixes and add glError check. 2009-10-15 16:06:42 -07:00
Jason Sams
6a17e163a0 Add egl init start message to help debug driver init hangs. 2009-10-15 16:06:42 -07:00
Romain Guy
d7fa122dfe Add new RenderScript sample: ImageProcessing.
Change-Id: I5e482bbc34911c940a3a74258f8f8549b1939bc4
2009-10-09 16:05:25 -07:00