Commit Graph

19 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
e9ad9a719d Implement screen aligned bitmap drawing support. 2009-09-30 17:40:06 -07:00
Jason Sams
61f08d6fa7 Improved object lifecycle tracking and fix leaks. 2009-09-25 16:37:33 -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
b6f2b131c4 Removed last bits of predefined element types from native code. Predefined types are now constructed at the java layer from standard building blocks. 2009-09-24 12:33:45 -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
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
b62627ea33 Add lighting to animated water ripples. 2009-08-06 22:52:13 -07:00
Jason Sams
9bee51c42e Remove useless slot from ProgramVertex. Optimize GL state setup. 2009-08-05 13:57:03 -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
f29ca50d80 Cleanup logging and fix a startup race condition that manifested on Firestone. 2009-06-23 12:22:47 -07:00
Jason Sams
4b962e57a9 Cleanup includes so Log.h can use the tag. rsUtils.h is the file that should be included everywhere and contain rs global defines. 2009-06-22 17:15:15 -07:00
Jason Sams
9c54bdbf45 Implement default programs and implement defaults and parents for imports. 2009-06-17 16:52:59 -07:00
Jason Sams
b37c0a5db6 Switch fountain to use ProgramVertex rather than hard coded camers in scripts. Remove camera code from scripts. 2009-06-16 17:49:58 -07:00
Jason Sams
0826a6f90f Bug fixes. TriangleMesh now ref-counts, implement missing element formats, add missing modes for program vertex. Add matrix support classes. Add test app rollo 2009-06-15 19:04:56 -07:00
Jason Sams
3eaa338e11 Add named objects and implement support for ProgramFragmentStore and ProgramFragment to be used by name in scripts. 2009-06-10 15:04:38 -07:00
Jason Sams
d19f10d43a Add the Renderscript library. (Not in the build by default yet.)
This library can be used to create animated 3D User Interfaces.

This library is currently under heavy development, so it's not part of
the build by default.

In order to build this library, you must define

   BUILD_RENDERSCRIPT=true

in your build environment.

You will also have to manually edit

 build/core/prelink-linux-arm.map

And add libRS and libRS_jni at the end like this (exact address may change.)

libRS.so                0x9A100000
libRS_jni.so            0x9A000000
2009-05-22 17:11:00 -07:00