Commit Graph

23 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
Jason Sams
6b9dec00af Remove depricated triangleMesh. 2009-09-23 18:07:45 -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
Marco Nelissen
3f8f9da85f Fix the simulator build by removing librs_jni and libRS from it.
Since libacc isn't 64-bit clean (it casts pointers to integers),
and so can't be built for the gHardy simulator, everything
that depends on it can't be built for the simulator either, which
means removing libRS and librs_jni.
2009-08-12 09:41:07 -07:00
Joe Onorato
daed524c35 The build system knows how to deal with lex files, but it treats them as c++, so make spec.lex
conform to that.
2009-08-10 15:01:51 -07:00
Joe Onorato
01e5fbd721 build libRS 2009-08-10 14:06:01 -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
ecc7ca0372 Add swaying effect to the grass. 2009-08-04 14:41:41 -07:00
Jason Sams
8af858e9b6 Unbreak build by making the build of renderscript again conditional on BUILD_RENDERSCRIPT until we can figure out why the build servers see an error that does not reproduce locally. 2009-07-23 16:10:46 -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
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
7aa4f3a163 More test app work 2009-07-14 13:59:23 -07:00
Jason Sams
bba134c8a1 All light source objects. 2009-06-22 15:49:21 -07:00
Jason Sams
196ac850af Fix build error due to bad path generation in makefile for generated tools.
Implemented by JoeO
2009-06-10 18:35:42 -07:00
Jason Sams
94d8e90ad7 Split renderscript java code from test apps. Update makefiles. 2009-06-10 16:09:05 -07:00
Jason Sams
ffe9f48890 Improve bitmap support and do conversion in native rather than java code to reduce conversion time. 2009-06-01 17:45:53 -07:00
Jack Palevich
e1ab434926 Don't prelink the libRS libraries.
These are temporary libraries for the development of RenderScript, so they
don't have to be prelinked.
2009-05-29 14:38:01 -07:00
Jack Palevich
ec5a20bf2b Delete the acc script when deleting the Renderscript rsScriptC object.
Previously we had been leaking the ACCscript object.
2009-05-28 15:53:04 -07:00
Jack Palevich
55d4522392 Fix Fountain test app so that it actually builds.
Also check in first part of an libACC implementation.
2009-05-26 19:21:23 -07:00
Jack Palevich
eaff30744e Fix RenderScript JNI code build issue.
We should not try to build the JNI file until after we have built the
the generated header files that it includes.
2009-05-26 17:23:34 -07:00
Jack Palevich
60aa3eaf55 Add sprite fountain test.
It's still called "Calc".
2009-05-26 13:45:08 -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