Commit Graph

28 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
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
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
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
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
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
9bee51c42e Remove useless slot from ProgramVertex. Optimize GL state setup. 2009-08-05 13:57:03 -07:00
Jason Sams
110195fe9f Seperate ProgramVertex from RenderScript.java and merge ProgramVertexAlloc into the ProgramVertex class. 2009-08-04 19:00:00 -07:00
Jason Sams
0835d42be9 Seperate Light and Sampler from RenderScript.java 2009-08-04 17:58:23 -07:00
Jason Sams
22534176fb Split ProgramFragment and ProgramStore from RenderScript.java. Update Element and Type to new cached builder for easier app developement. 2009-08-04 17:05:43 -07:00
Jason Sams
69f0d31e57 Split ScriptC from RenderScript.java. Implement state caching in the Builder objects. 2009-08-04 12:29:40 -07:00
Jason Sams
bd1c3ad0cd Implement the jni bindings for Adapter2D. Fix a refcount bug in the native adapter implementation. Use adapters in Film to border the mipmaps. 2009-08-03 16:03:08 -07:00
Jason Sams
b8c5a84e7c Split RenderScript Type and Allocation into seperate classes. 2009-07-31 20:40:47 -07:00
Jason Sams
36e612a488 Begin splitting up RenderScript.java into seperate classes. First piece split off Element. 2009-07-31 16:26:13 -07:00
Jason Sams
dba3ba5b5b Implement bitmap resource loaders for utility. cleanup rolloRS and checkin maps.png which was missing. 2009-07-30 14:56:12 -07:00
Jason Sams
0ea8c8a7c0 Simplify image loading. Use common internal format. 2009-07-29 21:05:11 -07:00
Jason Sams
faf1520be7 Filmstrip work and boxed bitmap load bugfixes. 2009-07-29 20:55:44 -07:00
Jason Sams
31b532ee9e Checkin art assets for film test app and change loading of icons to 8888. 2009-07-29 17:39:45 -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
e29d471e5c Move the java and jni renderscript files to the proper location. 2009-07-23 15:19:03 -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
Jason Sams
7c878f3a83 Begin adding mesh 2009-06-30 14:13:25 -07:00
Jason Sams
bba134c8a1 All light source objects. 2009-06-22 15:49:21 -07:00
Jason Sams
af49c744d0 implement modeview matrix sliding from within scripts. 2009-06-19 18:33:44 -07:00
Jason Sams
462d11b880 checkpoint filmstrip, implemented TLS. 2009-06-19 16:03:18 -07:00