History log of /frameworks/rs/rsProgramFragment.cpp
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
c7968a0ac24f05d978616a79a5068b6b16dbbda6 12-Nov-2014 Jason Sams <jsams@google.com> Array type and allocation support

Change-Id: Ic09188a8ceb212634b4369eb1ffe42c6f249e3ed
/frameworks/rs/rsProgramFragment.cpp
44bef6fba6244292b751387f3d6c31cca96c28ad 12-Aug-2014 Chris Wailes <chriswailes@google.com> Replace NULL macros with nullptr literals.

Change-Id: I918c40879aa547438f77e7d1a95fa2aa33bec398
/frameworks/rs/rsProgramFragment.cpp
f8852d0494a260c583795a96a2a06c49b86a9b10 30-Jan-2014 Ian Rogers <irogers@google.com> Work-around 64bit build issues.

Log errors and abort as a temporary work-around for 64bit support.

Change-Id: I7f6b483d671189bd12ae0ef79515fcdd871eba17
/frameworks/rs/rsProgramFragment.cpp
f313dc32d5ea68a7c48fb4ec6e131ec2fb97ce2d 09-Jul-2013 Jason Sams <jsams@google.com> Remove internal element builder and vector code.

Remove additional String8 references from shared includes.

Change-Id: Iede11384b9fc5a303d15d47fd4074c800dc6ad5f
/frameworks/rs/rsProgramFragment.cpp
a7f5e0406825151660c1c2e75c287e2fc8368023 09-Jul-2013 Jason Sams <jsams@google.com> Remove unnecessary string operations.

Change-Id: I9e59c54e0ac200b5cf8bd35b3746112d0444a8d5
/frameworks/rs/rsProgramFragment.cpp
a572aca4eb4ddb32c10baa1f529431cfefd756b8 09-Jan-2013 Jason Sams <jsams@google.com> Add support for YUV allocations.

Change-Id: I21a47c745a2f8435af4f37ec0ad624002f3db555
/frameworks/rs/rsProgramFragment.cpp
807fdc4b6f3fb893015ee136565d6151bb2332d3 26-Jul-2012 Jason Sams <jsams@google.com> Move memory layout to driver.

This change moves all allocation data copies to the
hal. Also removes stride from the runtime. Follow on
changes will remove the malloc pointer from the runtime.

Change-Id: I30967c739800cd4b97186e9fc8b69f26a3f2787d
/frameworks/rs/rsProgramFragment.cpp
e3150cfb3edb028407669e4a65e087eae77e718c 25-Jul-2012 Jason Sams <jsams@google.com> Plumb context through for serialization.

Change-Id: I2a49f57aa7576604deeac898a7cceb36ae68d66f
/frameworks/rs/rsProgramFragment.cpp
748eb07e805b93c2bf79340d4937963ab739d17c 16-Feb-2012 Alex Sakhartchouk <alexst@google.com> Piping texture names through shader builder.
Fixing uint size_t mismatch.

Change-Id: Ia7c8bd9f829deaa50e1cc381ccd50f29676bbdfb
/frameworks/rs/rsProgramFragment.cpp
af12ac6a08651464f8d823add667c706f993b587 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
/frameworks/rs/rsProgramFragment.cpp
064aa7ed76db9564b041afcd4b75da5b3d12faba 18-Oct-2011 Alex Sakhartchouk <alexst@google.com> Remove ObjBaseRef from the hal struct

Change-Id: Idcac14ecfdd4d06a0f54bf50e3b9657be62e6638
/frameworks/rs/rsProgramFragment.cpp
c700e649ca44d0dcff8b271e42d949ea72fe3c63 16-Aug-2011 Alex Sakhartchouk <alexst@google.com> Fixing asynchronous performance issues.

Change-Id: I10f02cd37a33a6c655814d24e0a4291dc044fba3
/frameworks/rs/rsProgramFragment.cpp
b81a0eb8180791e4eaab1253b59fa8bd562b046b 03-Jun-2011 Alex Sakhartchouk <alexst@google.com> More work to make libRS buildable on the host.

Change-Id: I239585ef7c1334f7fc19fa6423535dea7b9a753f
/frameworks/rs/rsProgramFragment.cpp
eb4fe18dd88634330f9566cbb9e785d8c7ec5813 27-May-2011 Jason Sams <rjsams@android.com> Start splitting allocation into hal and core.

Change-Id: Ic506abb0469238cb0471eb1401cfcb7b2fbbe4bb
/frameworks/rs/rsProgramFragment.cpp
c19ff0177a7a0dadfc01b1990f822354fdc95991 06-May-2011 Alex Sakhartchouk <alexst@google.com> rsLib cleanup

Change-Id: Ifb66059338e3435ac79435296a650c44699921aa
/frameworks/rs/rsProgramFragment.cpp
c2c02a88641620f50a69cc174077ac8bbef40478 05-May-2011 Alex Sakhartchouk <alexst@google.com> Code Cleanup and better Sampler creation method

Change-Id: I9e35081ee6034cb619f43a47f8f22f38977f5d12
/frameworks/rs/rsProgramFragment.cpp
a04e30dbb5ab11592b03666bb3d102070759c58e 30-Apr-2011 Alex Sakhartchouk <alexst@google.com> Moving renderscript GL code into the HAL
This change affects
- shaders
- meshes
- fonts
- quad rendering

Change-Id: I2a53acb4cd1fa8f4c6e67668f6ee969f3d7f7aa1
/frameworks/rs/rsProgramFragment.cpp
77d9f4bd05b2d2a161f30c12a2248f9c97eaac42 31-Jan-2011 Alex Sakhartchouk <alexst@google.com> Cleaning up the serialization change.
Renaming the define to be more in line with what it does and removing the host stub header file.

Change-Id: Ibd3a0a6a398c7f81cc661f71e4478707fe1679ed
/frameworks/rs/rsProgramFragment.cpp
366c9c85196675437a8dd74c1cf6b63ddbde3d6a 09-Dec-2010 Jason Sams <rjsams@android.com> Allocation API update.

Change-Id: I9b4a71f9e94c7d3978f06b7971051ab4f8472503
/frameworks/rs/rsProgramFragment.cpp
87319de2b16a185cf360827c96a42cf1fcaae744 23-Nov-2010 Jason Sams <rjsams@android.com> More error checks

Change-Id: Id2b9ab7a76bbdf2ed745f5e36e552dc9b101982f
/frameworks/rs/rsProgramFragment.cpp
84e4027f83b20af59f5b1fc52be6e45f159d3970 19-Nov-2010 Alex Sakhartchouk <alexst@google.com> Support for cubemaps.

Change-Id: Iaf6087f614451a8e233b3e5bc49c834ab0ad08ee
/frameworks/rs/rsProgramFragment.cpp
afb743aca56c18beb7ab924e75cb6e070ef3e55a 10-Nov-2010 Alex Sakhartchouk <alexst@google.com> Code cleanup to make formatting consistent
across all the renderscript files.

Change-Id: Idf5fcc60877e44c8f074f7176e37f70b3b895a3c
/frameworks/rs/rsProgramFragment.cpp
54929cce0bf44090424b1f91b676529a2422378f 09-Nov-2010 Alex Sakhartchouk <alexst@google.com> Moving attrib creation to Mesh. Adding arrays as shader inputs.
Removing fixed size arrays.

Change-Id: I0213e403a2f1283dd43f21bea770aeb059561903
/frameworks/rs/rsProgramFragment.cpp
f0c1df480304a72ce41e7d4b088319cbd7f0938a 26-Oct-2010 Jason Sams <rjsams@android.com> Begin adding async allocation creation.

Change-Id: I5d1381699e2b334c1d824f357bd6b310a5f79be8

Implement async bitmap upload and clean up types.

Change-Id: Icbe9894e04c1319351c1cd75b0e0017855198f20
/frameworks/rs/rsProgramFragment.cpp
225afd317e101a7be5fe02c0a86361146ea89f05 21-Oct-2010 Jason Sams <rjsams@android.com> Fix refcounting bugs where the sys refcount
could be corrupted during async type creation.

Change-Id: If42828e92990598b0cb5da81c82ea513f94725f2

Fix stack object deletion bug.

Change-Id: I2c723aa5ad15e0c99dc9cd0cfbc7db80bace172a
/frameworks/rs/rsProgramFragment.cpp
7ffcaf20cbb115326f3d72a983835d6c314a4cef 06-Oct-2010 Alex Sakhartchouk <alexst@google.com> changing vec4 to vec2 for perf reasons.

Change-Id: Ic885a6dc697af4fd82e184158772863673f041bd
/frameworks/rs/rsProgramFragment.cpp
889fe50e7aaebed8cb8284b16a0e51e64e8a3a9c 01-Oct-2010 Alex Sakhartchouk <alexst@google.com> fixing bugs 3053960, 3044804, 3044798
shader cleanup and removing unnecessary state setup.

Change-Id: Ibddf2ad3a26bb983fc43bdeb58b1cec6224920b4
/frameworks/rs/rsProgramFragment.cpp
886f11ade9dde05485cb11c0d67d87f76a428f6c 29-Sep-2010 Alex Sakhartchouk <alexst@google.com> More robust attribute binding
Adding attribute and uniform debug logging.
Checking to see if aniso filtering is available.

Change-Id: I2ed9d166ed7ff3df971d7af18b7a33f4e3ade928
/frameworks/rs/rsProgramFragment.cpp
383e5b1f68c321a77bfd7466fa1171a9bfab4a6f 24-Sep-2010 Alex Sakhartchouk <alexst@google.com> Adding support for all allowed textures.
Cleaning up unused code
Adding error messages

Change-Id: I3a92476738ff7699d49feeafcd3eee6f70621acb
/frameworks/rs/rsProgramFragment.cpp
df9f1c2142ba5a7dfe475f130d51044f0c0c04a4 22-Sep-2010 Jason Sams <rjsams@android.com> Remove excessive logging.

Change-Id: If8e30fcb93d7cbf639c3a6c280c23f4553f11e5b
/frameworks/rs/rsProgramFragment.cpp
900f1616bf33c7ba13cf2a737832a95bcd176388 17-Sep-2010 Jason Sams <rjsams@android.com> Cleanup GL setup code and remove legacy 1.1 paths.
Reset pointers to NULL when allocations are unbound.

Change-Id: Ifaba634ecbb154970b7fb47faa8e6475d16d2f66
/frameworks/rs/rsProgramFragment.cpp
e7ae69f4a70f1813cf8086ebd9714192c635300a 14-Sep-2010 Alex Sakhartchouk <alexst@google.com> Shader changes to allow for more flexible constant binding.

Change-Id: Ic66e6e2a371c6e3d5dce1b00f63acab8c09bd110
/frameworks/rs/rsProgramFragment.cpp
660ccc77fbceda1f0a4b0b811fbb82a5b006ec9b 03-Sep-2010 Alex Sakhartchouk <alexst@google.com> Fixing fragment shader bounding code

Change-Id: I743dae12bb3f226f758a065d9b353eff36e2f964
/frameworks/rs/rsProgramFragment.cpp
6e9342199959dc9beb5299fefc9775fe8c32620e 31-Aug-2010 Alex Sakhartchouk <alexst@google.com> Fixing uniform binding for fragment shader.
Updating the glsl fragment shader to color the lights.

Change-Id: I6f850d1aa22059a2974e379f652f7e99d6a799fb
/frameworks/rs/rsProgramFragment.cpp
0002a17db181f2276464fe5d6caaa9d869ef7e7b 06-Aug-2010 Jason Sams <rjsams@android.com> Use lowp colors in fixed funtion emulation.

Change-Id: Ie525ee6e52652ba83efe4d9f1627410d846824ee
/frameworks/rs/rsProgramFragment.cpp
6445e5210c6d7f8689e94be9026153d017c9545b 05-Aug-2010 Jason Sams <rjsams@android.com> Support constant and varying colors in ProgramFragment.

Change-Id: I16ce84ff427016f3a1923594efc718eca32dd7f2
/frameworks/rs/rsProgramFragment.cpp
e64c2f172516972abe581ca1b762302dd2ba1199 23-Jun-2010 Jason Sams <rjsams@android.com> Re-enable optimization for detecting nop state changes in fragment
and vertex programs.

Change-Id: Ic5b9ecf564d121d7a00a1eed92afb4c4783ce8bc
/frameworks/rs/rsProgramFragment.cpp
fb6b614bcea88a587a7ea4530be45ff0ffa0210e 21-May-2010 Alex Sakhartchouk <alexst@google.com> Removed unnecessary change based on comments.
Now using android utils lib.
collada_to_a3d seems to work with android util libs.
Integrating old changelist
Changing assert to rsAssrt in VertexArray
making context compile.
Change-Id: I33890defa777f09253bfab630d97782359ec49d7

Added serialization code to rsLib
Integrated old changelist
Change-Id: Ie4746113f6d1817fbb3264f97fdddde25b779311

Added serialization code to rsLib

Change-Id: Ie4746113f6d1817fbb3264f97fdddde25b779311
/frameworks/rs/rsProgramFragment.cpp
5a27917966b3a5d0c978f2a096b409170b6b5d78 18-May-2010 Jason Sams <rjsams@android.com> Remove excess logging.

Change-Id: Ib4af6428c5fd87c3891f41eca6ca43d84f0edc97
/frameworks/rs/rsProgramFragment.cpp
771565f47fc44608444c00aa8fa3bda769ceaece 15-May-2010 Jason Sams <rjsams@android.com> Change RS to use the passed surface size rather than EGL size.
Its possible that during a resize the EGL information could be stale so
caching this is bad. The surface size should always be correct.

Change-Id: Ifd479e1ea70b1cada1a8690c7c82e91aa391b685

Conflicts:

libs/rs/rsProgramStore.cpp
libs/rs/rsProgramStore.h
/frameworks/rs/rsProgramFragment.cpp
be36bf3a76481737a7fa606a04144ceef80eb4f2 11-May-2010 Jason Sams <rjsams@android.com> Convert renderscript from using ACC to LLVM for its compiler.

This will also require application to be updated to support
the new compiler and data passing models.

Change-Id: If078e3a5148af395ba1b936169a407d8c3ad727f
/frameworks/rs/rsProgramFragment.cpp
ef21edcc70fc2734a3dc7995d3c3af1f90d16ef8 23-Feb-2010 Jason Sams <rjsams@android.com> beging np2 extension check work.
/frameworks/rs/rsProgramFragment.cpp
3eb28f07ab726a2e73063b95729abc191103b432 27-Jan-2010 Jason Sams <rjsams@android.com> Fix some minor bugs with GL state setup that were exposed by Droids driver.
/frameworks/rs/rsProgramFragment.cpp
433eca30b2efe0cf84bbda33f2dfdfd6dcafaf59 06-Jan-2010 Jason Sams <rjsams@android.com> 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.
/frameworks/rs/rsProgramFragment.cpp
d01d970cf5973aa5186cc02c80fb2c143a69b0b1 23-Dec-2009 Jason Sams <rjsams@android.com> 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.
/frameworks/rs/rsProgramFragment.cpp
7dad9c30a59c99b57269e1b498807b6f034d56e9 18-Dec-2009 Jason Sams <rjsams@android.com> Move texture bindings to base program object. Change ProgramFragment creation to require a texture format in 1.0 mode.
/frameworks/rs/rsProgramFragment.cpp
cd50653f99c960e1a47c2c30e53b369b8805344a 16-Dec-2009 Jason Sams <rjsams@android.com> Place shader logging behind prop to declutter logs.
/frameworks/rs/rsProgramFragment.cpp
f2e4fa215c420cf0f8d226e9a59acb1f312e5e40 15-Dec-2009 Jason Sams <rjsams@android.com> Continue es2 shader dev

Conflicts:

graphics/java/android/renderscript/Program.java
graphics/java/android/renderscript/ProgramVertex.java
/frameworks/rs/rsProgramFragment.cpp
4815c0d121310cfcd6a8aba4eab77a9910af53ac 15-Dec-2009 Jason Sams <rjsams@android.com> 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.
/frameworks/rs/rsProgramFragment.cpp
cf4c7c9b2f513be77a5b9853319ca82ac2b128ed 14-Dec-2009 Jason Sams <rjsams@android.com> Implement RS tracked defered texture and buffer object uploads.
/frameworks/rs/rsProgramFragment.cpp
f2a5d7326b38e5a28b6618f9b1e5a021aef7179f 30-Nov-2009 Jason Sams <rjsams@android.com> Beging GL2 user shaders. Switch master to using GL2 by default.
/frameworks/rs/rsProgramFragment.cpp
c460e55d78cbe8bee95c5c947dfe541218142a5b 25-Nov-2009 Jason Sams <rjsams@android.com> Begin gl2 support. Renderscript still uses GL1.1 by default. However, 2.0 can be enabled and will render most tests correctly.
/frameworks/rs/rsProgramFragment.cpp
f2649a961db2995e9e24a6c98f8a419f1496c1b7 26-Sep-2009 Jason Sams <rjsams@android.com> Improved object lifecycle tracking and fix leaks.
/frameworks/rs/rsProgramFragment.cpp
e514b45de8561fbc6ef6770845102ca10b0a69d7 25-Sep-2009 Jason Sams <rjsams@android.com> 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.
/frameworks/rs/rsProgramFragment.cpp
e62cc90ba67bbc21ba06145490cd3838092c3492 05-Sep-2009 Romain Guy <romainguy@android.com> Fix point sprites.

Change-Id: Ic9438daaf25f3969a0dd5b634b7cceccbbbfb27b
/frameworks/rs/rsProgramFragment.cpp
9397e30ce5fe3f6af9212a93b490836b04fdfffa 28-Aug-2009 Jason Sams <rjsams@android.com> Implement async data/subData. Implement TriangleMeshBuilder in SimpleMesh which replaces TriangleMesh. Update Film to use new builder.
/frameworks/rs/rsProgramFragment.cpp
afcb25c65e8145d15aaf50a0ca38333954a97000 25-Aug-2009 Jason Sams <rjsams@android.com> Add support for selecting the color bit depth and if the application used a depth buffer.
/frameworks/rs/rsProgramFragment.cpp
e0158410a2fedef43f5a2848c28393ad611e8cad 21-Aug-2009 Jason Sams <rjsams@android.com> Point Sprites
/frameworks/rs/rsProgramFragment.cpp
707aaf341a4b068e6ccadf923af85acdd85fd775 18-Aug-2009 Jason Sams <rjsams@android.com> Cleanup of object destruction. No need to have a per-class destruction function. This was a legacy of the distant past when the classes did not have a common base.
/frameworks/rs/rsProgramFragment.cpp
e5ffb879ae535a899a486285a23bea05e912480f 10-Aug-2009 Jason Sams <rjsams@android.com> Begin implementing SimpleMesh and fix some bugs with refcounting and java object destruction tracking.
/frameworks/rs/rsProgramFragment.cpp
cfb1d11ce6826fce7241d316d8b7dcab661f63a6 05-Aug-2009 Jason Sams <rjsams@android.com> Remove useless slot from ProgramVertex. Optimize GL state setup.
/frameworks/rs/rsProgramFragment.cpp
334fd9aeacd4221fc8cd1333b2a34fb3b26b3a0d 03-Jul-2009 Jason Sams <rjsams@android.com> Add support for multitexture and fix allocation ref counting bug in RS. Add plaque to rollo and leave it disabled due to ugly appearance.
/frameworks/rs/rsProgramFragment.cpp
992a0b70d8fd7a14f0c57bc3c7e16c1f269a6609 23-Jun-2009 Jason Sams <rjsams@android.com> Cleanup logging and fix a startup race condition that manifested on Firestone.
/frameworks/rs/rsProgramFragment.cpp
1aa5a4eb81b8b88aeb5d2b6f4c47356fd0a62923 23-Jun-2009 Jason Sams <rjsams@android.com> Cleanup includes so Log.h can use the tag. rsUtils.h is the file that should be included everywhere and contain rs global defines.
/frameworks/rs/rsProgramFragment.cpp
8ce125be69531dbf3a7e856d5e59d1b8e2789db0 18-Jun-2009 Jason Sams <rjsams@android.com> Implement default programs and implement defaults and parents for imports.
/frameworks/rs/rsProgramFragment.cpp
a0a1b6fbece2eb8d72d788422ab3e5f58d5a9216 11-Jun-2009 Jason Sams <rjsams@android.com> Add named objects and implement support for ProgramFragmentStore and ProgramFragment to be used by name in scripts.
/frameworks/rs/rsProgramFragment.cpp
39c8bc7be5751ec52693d21abdf139c4dfd29a2c 29-May-2009 Jason Sams <rjsams@android.com> Add sampler support
/frameworks/rs/rsProgramFragment.cpp
6678e9b2568ad041429a2477177133fe4932159f 27-May-2009 Jason Sams <rjsams@android.com> Implement first pass bitmap to allocation support. The Java bindings can create a 2D allocation by passing in a Bitmap object.
/frameworks/rs/rsProgramFragment.cpp
326e0ddf89e8df2837752fbfd7a014814b32082c 22-May-2009 Jason Sams <jsams@google.com> 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
/frameworks/rs/rsProgramFragment.cpp