summaryrefslogtreecommitdiffstats
path: root/graphics
Commit message (Collapse)AuthorAgeFilesLines
* Merge "New cursor controller in TextViews."Gilles Debunne2010-07-092-4/+11
|\
| * New cursor controller in TextViews.Gilles Debunne2010-07-092-4/+11
| | | | | | | | | | | | | | Editable TextView now display a cursor controller under the insertion point so that it can be precisely moved. Change-Id: Ia2e6ddc57d249647ff6683e10e4226db3df27223
* | Remove points from fixed function.Jason Sams2010-07-093-18/+0
|/ | | | | | Add basic GL performance test. Change-Id: I421a41b6683b2c5f70045cdd0f610a6939105fee
* Merge "Add boolean support for setVar."Jason Sams2010-07-071-0/+4
|\
| * Add boolean support for setVar.Jason Sams2010-07-071-0/+4
| | | | | | | | Change-Id: Id64f3b2e43e19fc2a2d5fd81bb98d9ca67aae843
* | Add support to draw 9patches in OpenGL.Romain Guy2010-07-073-23/+46
|/ | | | | | | This change only adds the necessary API and stubs. The implementation will be added in another change. Change-Id: Ie50b8aff5868e78796cee331df15bdbf990d2ea1
* Support bidi layout for drawTextOnPath.Doug Felt2010-07-071-5/+8
| | | | Change-Id: Ie5867fdb66fe15336774e20d65fa63e0d05bf6fe
* Cleanup pass on the mesh api change.Alex Sakhartchouk2010-07-023-393/+0
| | | | | | Removed all the simple mesh related calls and temporary objects. Change-Id: Ic64a72a894e0314f216f10e1cfc0d45b17e2e182
* Start of mesh API cleanup.Alex Sakhartchouk2010-07-014-9/+487
| | | | | | | | | Switched all native code to go through Mesh class. Removed SimpleMesh Added java Mesh class Will need to port all existing code to use java Mesh, then remove java SimpleMesh. Change-Id: Idb9c03d0b06b4ef87db28dffcffa1881d39120e5
* Add hooks for drawBitmap().Romain Guy2010-06-302-8/+18
| | | | | | | | Change-Id: I58e962c3a8b2bc75c2605fe369ad3002579d86e0 Add texture cache. Change-Id: I1c0e5581d228869e114438258a1014e33e024ad7
* Implement quickReject() and drawRect().Romain Guy2010-06-252-2/+10
| | | | | | | The OpenGL ES 2.0 renderer can now draw colored rectangles. At least there's something on screen now. Change-Id: I80a13ccc1dd56784edf74f2670a364f30700234a
* Adding freetype font rendering to renderscript.Alex Sakhartchouk2010-06-244-5/+95
| | | | Change-Id: I3a10ffe27092a41df156341c9cb3f7aa19c49f19
* Merge "Add matrix ops to RSH headers."Jason Sams2010-06-241-1/+1
|\
| * Add matrix ops to RSH headers.Jason Sams2010-06-241-1/+1
| | | | | | | | Change-Id: I7e2843983a12e0155114b4a18813799e4341d26f
* | Add support for transformations.Romain Guy2010-06-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds partial support for the following transforms: - scale() - translate() - rotate() - setMatrix() - getMatrix() The transform is stored in a snapshot and saved/restored as needed. The transform is currently not applied to the clip rect and is not mapped to the vertex shader. Change-Id: Id48993453311200804149917d0c126a4d0471226
* | New XmlDocumentProvider class.Gilles Debunne2010-06-231-4/+2
| | | | | | | | | | | | | | | | Minor changes in the Adapters.java helper class. Extracts data out of a XML document using an XPath-like syntax. Change-Id: I0617b0783f11c86118b42cd8485d54440810c805
* | Fix the simulator build.Romain Guy2010-06-221-1/+5
|/ | | | Change-Id: Ie404f7c2c308f0657f273af19a56e8c039b61898
* Fix build error.Jason Sams2010-06-211-1/+1
| | | | Change-Id: Ife0ec056c33654a56f270a5673f614820cfc2e29
* Move ImageProcessing and ModelViewer to reflected files.Jason Sams2010-06-213-14/+28
| | | | | | Implement boolean support. Change-Id: Iac2dc28067ac430b3e413fc651dfaa0b96214e2e
* Add skip to field packer.Jason Sams2010-06-171-0/+4
| | | | | | | remove hsb functions from env headers. add RS_PACKED define for packed structures. Change-Id: Idc661edff85c0047baa201f43e0839ac82c74593
* Merge "Add new API to check whether a Bitmap was modified."Romain Guy2010-06-151-0/+14
|\
| * Add new API to check whether a Bitmap was modified.Romain Guy2010-06-151-0/+14
| | | | | | | | | | | | | | | | | | | | Bitmap.getGenerationId() can be used by caches to find out if a Bitmap has been modified. This simply exposes an existing Skia API. This change also adds a small test app for Canvas hardware acceleration. The new Bitmap API is required to implement a texture cache. Change-Id: I8547b146cd14c8afe1a2327fcd6d71b1b1cb68fc
* | Remove InvokeData and add ContextFinish to generate a sync point.Jason Sams2010-06-153-17/+20
|/ | | | Change-Id: I27da8bf5fba2c8a428964cb6a5e66dd7a94958d8
* Move shaping to native.Doug Felt2010-06-102-30/+382
| | | | | | | | | | | | | | | | | Add internal API (getTextRunAdvances) to Paint, use when measuring. Add internal API (getTextRunCursor) to Paint, use when determining valid cursor positions. Remove java-level shaping code. Remove 'prep' code in TextLine (except for replacement text) since shaping now is done on the fly as needed in native. Provide explicit shaping context bounds to internal text measuring, cursor movement, and rendering APIs. Update for to changes in external API in ushape.h. Change-Id: I146958b624802ce8553125e5c3c6c03031bc9608
* Move OpenGL support out of ViewRoot into a new HardwareRenderer class.Romain Guy2010-06-091-4/+25
| | | | Change-Id: Iffaed924a5defc3c4df26223c390dc27eee115b1
* Merge "Begin using reflected files."Jason Sams2010-06-083-19/+15
|\
| * Begin using reflected files.Jason Sams2010-06-083-19/+15
| | | | | | | | Change-Id: I5307a0eac9c206b85c0cf7451d3f8300134bf8e3
* | am cefdedc3: merge from froyo-plus-aospThe Android Open Source Project2010-06-071-1/+1
|\ \ | |/ |/|
| * merge from froyo-plus-aospThe Android Open Source Project2010-06-071-1/+1
| |\ | | | | | | | | | Change-Id: I58f1d905b3fa781e4f5827d4d7b9323a4cdcc04e
| | * merge from open-source masterThe Android Open Source Project2010-06-071-1/+1
| | |\ | | | | | | | | | | | | Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b
| | | * Canvas.drawVertices: correct color range-checkErik Faye-Lund2010-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The range-check in drawVertices previously checked that the color count was equal to the vertex count. However, the vertex count is specified in array elements, and there's two array elements per vertex for the positions, but only one array element per vertex for the colors. Correct the code so the check is consistent with the element count. Change-Id: Id043f1003f9245f18adc91bac49dc33727ca765e
| | | * Improved error handling when font loading fails.Peter Eliasson2010-04-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch, an application could trigger a platform crash by calling: Typeface typeface = Typeface.createFromFile(""); boolean isbold = typeface.isBold(); The crash occurs since the Skia error that occurs when font loading fails is not propagated. With this patch, the Typeface constructor throws an IllegalStateException when Skia fails to load the font (i.e. when the native instance is null). Change-Id: I1002b37b7b32840cb7eeef6819d2982cb18c9003
| | | * merge from open-source masterThe Android Open Source Project2010-03-302-3/+4
| | | |\ | | | | | | | | | | | | | | | Change-Id: Iad50c5ab4915d0868b3f79ea6ba0d657a6f98525
| | | * \ am 0b9bbb6d: DO NOT MERGE. Merge Froyo renderscript to Eclair to support ↵Jason Sams2010-02-1211-614/+689
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU. Merge commit '0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8' into eclair-plus-aosp * commit '0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8': 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.
| | | | * | DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers ↵Jason Sams2010-02-1111-614/+689
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Creating the jni and java layer to integrate a3dAlex Sakhartchouk2010-06-043-0/+277
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I438359633bae59bf9188cd2c4664a92ca16c5f37
* | | | | | Remove RS_KIND from vertex arrays types.Jason Sams2010-06-013-176/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy vertex programs now bind by name just like the user programs. This removes the need for two different ways of declairing the same information. Change-Id: I0178c0962842a1bbffb6726984ae1b8f5bb7529c
* | | | | | Begin naming cleanup for renderscript runtime.Jason Sams2010-05-193-44/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefix functions with "rs" or "rsg". Change-Id: I4435b486831bfab1ea473ccfad435b404e68f1c9
* | | | | | Remove more pieces of setRoot. Add pointer to allocation lookup for scripts.Jason Sams2010-05-173-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c3075d2056f02bb834bfad403dc72da991f3156
* | | | | | Delete legacy setDefine API.Jason Sams2010-05-141-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1bae13533ab9efea3d3b0ebb6a3711343e922f8a
* | | | | | Delete old createFromClass methods.Jason Sams2010-05-142-64/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It no longer makes sense to create type info from Java since this cannot be exported to scripts. The new flow is in the opposite direction. Change-Id: I9b46e3f57abf84c01326bd9b9b834f3ff0f7c504
* | | | | | Rename ProgramFragmentStore to ProgramStore.Jason Sams2010-05-134-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8ad9ac856944838ced38a2f1e8f07387050bdfd
* | | | | | Modify Canvas drawText to run bidi and shape.Doug Felt2010-05-122-22/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds drawTextRun as internal API on Canvas and GraphicsOperations. Adds implementation to implementors of GraphicsOperations. Adds state and API on Paint to control the bidi algorithm when used by Canvas. This API is currently hidden. The drawText changes are incomplete since shaping is not yet available in the native code. Change-Id: I4368048aef9545df0953a349381771603e04b619
* | | | | | Convert renderscript from using ACC to LLVM for its compiler.Jason Sams2010-05-115-148/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will also require application to be updated to support the new compiler and data passing models. Change-Id: If078e3a5148af395ba1b936169a407d8c3ad727f
* | | | | | Set a layered drawable's child callback to be the container.Romain Guy2010-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I959ad03883931d727d464f384073926e8fa9e2d2
* | | | | | Make sure that a drawable replacing a layer in a LayerDrawable gets a callback.Romain Guy2010-05-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefac7d280b3c16e05f45688da655e17e21a3098b
* | | | | | update dox for FILL_AND_STROKE styleMike Reed2010-04-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7835068a376dfa4d8c18d8bb20d97941a058e89f http://b/issue?id=2590047
* | | | | | am e73a100f: am 445a9785: Merge "don\'t hardcode "mSurface" throughout our ↵Mathias Agopian2010-04-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | source code" into kraken
| * | | | | don't hardcode "mSurface" throughout our source codeMathias Agopian2010-04-121-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is used in a few places to get access to the android.view.Surface native surface. use a macro instead. Also rename the field to mNativeSurface. Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
* | | | | Added documentation in Drawable.Gilles Debunne2010-04-121-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation on the ConstantState added. Removed all warnings in Eclipse. Change-Id: Ib1daf7eef1aff5660e805483f9dcae6fcd5a595e