Commit Graph

35 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
Joe Onorato
6656c1be2b add drawSpriteScreenspaceCropped to renderscript 2010-01-14 16:00:04 -05: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
Romain Guy
d7fa122dfe Add new RenderScript sample: ImageProcessing.
Change-Id: I5e482bbc34911c940a3a74258f8f8549b1939bc4
2009-10-09 16:05:25 -07:00
Jason Sams
bd2197fb00 Add script to script call support. Add exception to catch out of bound index data when added to TriangleMeshBuilder. 2009-10-07 18:14:01 -07:00
Jason Sams
516c319115 Implement data push from scripts. Fixes the problem where apps would have to poll to monitor a scripts state.
Fix bug in StoreState where state could be overridden by the default unless the script used more than one state.

Change only impacts renderscript and renderscript apps.
2009-10-06 13:58:47 -07:00
Jason Sams
e9ad9a719d Implement screen aligned bitmap drawing support. 2009-09-30 17:40:06 -07:00
Romain Guy
bd5b572279 absf() -> fabsf() instead of fabs()
Change-Id: I5571a635757295aa1514aeaff72e80cc3dd8752c
2009-09-29 13:17:27 -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
6b9dec00af Remove depricated triangleMesh. 2009-09-23 18:07:45 -07:00
Jason Sams
d342fd7526 Clean up some debugging and add 2 math lib routines. 2009-09-18 14:24:24 -07:00
Romain Guy
2d496bfebc Fix point sprites.
Change-Id: Ic9438daaf25f3969a0dd5b634b7cceccbbbfb27b
2009-09-04 17:55:53 -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
Romain Guy
d22fff7185 Cleanup the Galaxy, add a few RS functions for Grass. 2009-08-20 17:08:33 -07:00
Romain Guy
cac80a6e13 Tweak the galaxy 2009-08-18 11:39:17 -07:00
Jason Sams
334ea0c98f Update fountain and add writable flag to script slots. 2009-08-17 13:56:09 -07:00
Jason Sams
43ee06857b Implement reflecting Java objects into the ACC enviroment. 2009-08-12 17:54:11 -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
Joe Onorato
3370ec9e54 add three rs functions: uptimeMillis, startTimeMillis, elapsedTimeMillis 2009-08-09 17:31:59 -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
Romain Guy
a2136d6b18 Add ability to load arrays in RenderScript. 2009-08-04 18:50:24 -07:00
Romain Guy
ecc7ca0372 Add swaying effect to the grass. 2009-08-04 14:41:41 -07:00
Romain Guy
a32d100b34 Add new utility methods to rsScriptC_Lib, android.util.MathUtil and android.graphics.Color.
Fixes RS compilation.
2009-07-31 21:36:18 -07:00
Romain Guy
8839ca5533 Add several math functions to rsScript_Lib. 2009-07-31 11:20:59 -07:00
Romain Guy
584a375df6 First pass at implementing the Grass live wallpaper in RenderScript.
This change also adds second(), minute() and hour() to the RS library.
2009-07-30 19:11:51 -07:00
Jason Sams
faf1520be7 Filmstrip work and boxed bitmap load bugfixes. 2009-07-29 20:55:44 -07:00
Jason Sams
6f5c61c8df Add new icons and implement text. Fix bug with uploading 8888 bitmaps of non-square size. 2009-07-28 17:20:11 -07:00
Jason Sams
b0ec1b46d6 Add "boxed" bitmap uploads which simply place a non-pow2 bitmap into the smallest larger pow texture. The added space is filled black. 2009-07-28 12:02:16 -07:00
Jason Sams
ee41112e15 Enable light sources and update film test app. 2009-07-21 12:20:54 -07:00
Jason Sams
c97bb8844f Split rsScriptC into class implemtation and library functions. Update test apps, all 3 should be working. 2009-07-20 14:31:06 -07:00