Commit Graph

118 Commits

Author SHA1 Message Date
Jason Sams
0b9bbb6dc5 DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Committer: Jason Sams <rjsams@android.com>

 On branch droid
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   libs/rs/rsAllocation.cpp
	modified:   libs/rs/rsAllocation.h
	modified:   libs/rs/rsContext.cpp
	modified:   libs/rs/rsContext.h
	modified:   libs/rs/rsProgram.cpp
	modified:   libs/rs/rsProgram.h

Delete the old rollo sample which is obsolete.

Fix film init

Begin gl2 support.  Renderscript still uses GL1.1 by default.  However, 2.0 can be enabled and will render most tests correctly.

Fix film

Beging GL2 user shaders.  Switch master to using GL2 by default.

Implement RS tracked defered texture and buffer object uploads.

 Committer: Jason Sams <rjsams@android.com>

 On branch droid
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   libs/rs/rsAllocation.cpp
	modified:   libs/rs/rsAllocation.h
	modified:   libs/rs/rsContext.h
	modified:   libs/rs/rsProgramFragment.cpp
	modified:   libs/rs/rsSimpleMesh.cpp

Remove check for surface valid that is no longer valid.

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.

Continue es2 shader dev

Conflicts:

	graphics/java/android/renderscript/Program.java
	graphics/java/android/renderscript/ProgramVertex.java

Place shader logging behind prop to declutter logs.

Fix emulated glColor in es2 mode.

Fix live wallpaper many.  Z coordinate was being ignored for draw quad call.

Add argument checking to sampler builder to disallow illegal modes.

Move texture bindings to base program object.  Change ProgramFragment creation to require a texture format in 1.0 mode.

Element restructuring.  Add support for new basic Element types including the RS objects and vectors(2-4).  In theory this paves the way for maintaining type info for RS objects, passing elements for GLSL uiforms/attribs/varyings, and supporting nested structures.

This will break some apps, checkings for other projects will follow to unbreak them.

Disable excessive RS logging.

Add RS support for generic attribs as input to vertex programs.

More complete support for named attribs.  Adds user typed attribs as available to programVertex.  Non user attribs are not treated like user for GL2 for simplicity.

Support npot on es 2.0 HW.

Change user attribs to look for empty slot rather than using them in order.  Prevents conflict with numbered legacy slots.

Fix npot but where mipmap level sizes were rounding in the wrong direction.  Should always be floor.

Implement type generation for user uniforms in vertex shader.

Remove excessive logging, fix error in GLSL uniform generation.

Fix RS mipmap generation for 8 bit alpha textures.

Cleanup seperation of Legacy and user attribs.  All user programs now use the new names.  Legacy vertex attribs are given default names.

Fix some minor bugs with GL state setup that were exposed by Droids driver.

Implement drawSpriteCropped on es2.0
2010-02-11 18:16:21 -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
d7fa122dfe Add new RenderScript sample: ImageProcessing.
Change-Id: I5e482bbc34911c940a3a74258f8f8549b1939bc4
2009-10-09 16:05:25 -07:00
Jason Sams
7f047786d9 Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion. 2009-10-02 18:18:35 -07:00
Joe Onorato
9e384dddb8 Add a test pattern as rollo's icon 2009-10-01 16:48:44 -07:00
Jason Sams
5235cf3f41 Fix but processing raster state pragma.
rename stateFragmentStore to stateStore
2009-09-28 18:12:56 -07:00
Jason Sams
3c0dfbab80 Improve logging code to dump more detaild rs object info. Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement. 2009-09-27 17:50:38 -07:00
Jason Sams
f075b4e713 Fix fountain crash. 2009-09-25 20:24:54 -07:00
Jason Sams
a57e982785 Fix remaining object leaks. Change FountainView to tear down the rsContext and recreate on rotation to test teardown. 2009-09-25 16:50:36 -07:00
Jason Sams
a9e7a05b84 Improve renderscript context teardown. Track object in the system and then force their cleanup by releasing all user references once destroy context is called. Java layer will no longer send destroy notifications for objects garbage collected once a context is destroyed. 2009-09-25 14:51:22 -07:00
Jason Sams
e60446b9c1 Fix invokables to make sure script pointers are setup before invoking function calls. Reduce app startup time up to 1s. 2009-09-24 14:55:38 -07:00
Jason Sams
ebfb436a49 Add raster object to control point and line params. Add flag to force SW rendering. 2009-09-23 13:57:02 -07:00
Jason Sams
988f6ebb44 Minor perf tweak for fountain. 2009-09-14 15:00:05 -07:00
Romain Guy
fa736d79b7 Remove the FallRS demo, now promoted as a wallpaper.
Change-Id: I0e40f2aa4b51f9e9cdbe14d178491b3667662023
2009-09-09 13:10:56 -07:00
Jason Sams
7042cde5e1 Minor perf improvement to fall and expand use of struct. 2009-09-04 18:19:46 -07:00
Jason Sams
7adb985e85 checkpoint 2009-09-04 16:01:41 -07:00
Jason Sams
ea84a7c517 Remove "predefined" elements from Java layer. Static elements continue to exist but are no longer treated as a special version of element. 2009-09-04 14:42:41 -07:00
Jason Sams
2525a81522 Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs. 2009-09-03 15:43:13 -07:00
Jason Sams
44e9983ffc Update fountain to use structures. 2009-08-31 12:10:24 -07:00
Jason Sams
07ae406237 Implement async data/subData. Implement TriangleMeshBuilder in SimpleMesh which replaces TriangleMesh. Update Film to use new builder. 2009-08-27 20:23:34 -07:00
Jason Sams
67c6844ea0 Remove bogus comments and logging. 2009-08-25 17:09:59 -07:00
Jason Sams
b13ada5071 Add support for selecting the color bit depth and if the application used a depth buffer. 2009-08-25 11:44:30 -07:00
Romain Guy
463a60830f Remove Galaxy Render Script, replaced by its wallpaper equivalent.
Change-Id: I28c91d648fe5ab6e794bf55d11879388b139dbe9
2009-08-24 13:12:40 -07:00
Romain Guy
1965610f3b Fix FallRS by keeping a reference to the mesh. 2009-08-21 16:29:42 -07:00
Romain Guy
d22fff7185 Cleanup the Galaxy, add a few RS functions for Grass. 2009-08-20 17:08:33 -07:00
Romain Guy
8e7c671db7 Micro-optimizations for FallRS 2009-08-19 18:08:09 -07:00
Romain Guy
313b5b8b63 Improved performance in Galaxy and Fall 2009-08-19 17:16:17 -07:00
Romain Guy
484d57f435 Move the sky 2009-08-19 12:10:03 -07:00
Romain Guy
8a947bd696 Tweak the water and its texture 2009-08-18 18:38:38 -07:00
Android (Google) Code Review
6c8dd9841f Merge change 21831 into eclair
* changes:
  Add reflections to the water
2009-08-18 17:22:02 -07:00
Romain Guy
15b2969818 Add reflections to the water 2009-08-18 17:21:07 -07:00
Jason Sams
730ee65d4d Implement OOB destroy method that can be called from the java finalizer removing the need to explicitly destroy objects. 2009-08-18 17:07:09 -07:00
Romain Guy
cac80a6e13 Tweak the galaxy 2009-08-18 11:39:17 -07:00
Romain Guy
4f7136c659 Optimized Galaxy 2009-08-17 19:59:27 -07:00
Jason Sams
334ea0c98f Update fountain and add writable flag to script slots. 2009-08-17 13:56:09 -07:00
Romain Guy
81e4640d18 Add Galaxy wallpaper 2009-08-16 23:22:44 -07:00
Jason Sams
fbf0b9ecda Implement named slots and convert script.addType to script.setType to remove ordering restrictions. 2009-08-13 12:59:04 -07:00
Jason Sams
43ee06857b Implement reflecting Java objects into the ACC enviroment. 2009-08-12 17:54:11 -07:00
Romain Guy
12d6831156 Grass has graduated from an RS experiment to a real live wallpaper. 2009-08-12 15:55:17 -07:00
Jason Sams
40a29e8e28 Implement basic allocation readback. Add Get height, width to ScriptC_Lib. 2009-08-10 14:55:26 -07:00
Romain Guy
a9d2d5ed28 Make the laves follow the ripples 2009-08-09 19:12:27 -07:00
Jason Sams
1bada8cd6e Begin implementing SimpleMesh and fix some bugs with refcounting and java object destruction tracking. 2009-08-09 17:05:13 -07:00
Romain Guy
8f5c94b453 Better ripples and leaves 2009-08-09 15:20:29 -07:00
Romain Guy
6c0cc6db99 Add refraction and bettr normals computation to FallRS 2009-08-07 15:40:32 -07:00
Romain Guy
b62627ea33 Add lighting to animated water ripples. 2009-08-06 22:52:13 -07:00
Romain Guy
f8e136dcd0 Use arrays in Grass RS 2009-08-06 12:40:41 -07:00
Android (Google) Code Review
71cb821c05 Merge change 20217
* changes:
  Draw untextured water mesh
2009-08-05 19:27:58 -07:00
Romain Guy
31858c2b84 Draw untextured water mesh 2009-08-05 18:39:37 -07:00
Jason Sams
8c709dcc41 Implement basic snapping. 2009-08-05 17:35:36 -07:00