drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,091 Commits 1 Branch 0 Tags
Commit Graph

254 Commits

Author SHA1 Message Date
Jason Sams
718cd1f322 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.
 2009-12-23 14:35:29 -08:00
Android (Google) Code Review
873c031861 Merge change I68afd01e 
* changes:
  Move texture bindings to base program object.  Change ProgramFragment creation to require a texture format in 1.0 mode.
 2009-12-18 12:01:34 -08:00
Jason Sams
68afd01ec9 Move texture bindings to base program object. Change ProgramFragment creation to require a texture format in 1.0 mode. 2009-12-17 16:55:08 -08:00
Mike Reed
f7ed3a2b0f am 0249c83e: am 31a69fdb: throw if we have a null typeface native instance (so we don\'t crash in native code) we may still have to native-destroy a Typeface with a null ref, so check for that 
Merge commit '0249c83ed014cc6a36caac30e55db62c29c204e2'

* commit '0249c83ed014cc6a36caac30e55db62c29c204e2':
  throw if we have a null typeface native instance (so we don't crash in native code)
 2009-12-17 09:27:42 -08:00
Mike Reed
0249c83ed0 am 31a69fdb: throw if we have a null typeface native instance (so we don\'t crash in native code) we may still have to native-destroy a Typeface with a null ref, so check for that 
Merge commit '31a69fdbe1edd8d686043e8ca7d278289f65808e' into eclair-mr2-plus-aosp

* commit '31a69fdbe1edd8d686043e8ca7d278289f65808e':
  throw if we have a null typeface native instance (so we don't crash in native code)
 2009-12-17 09:24:18 -08:00
Mike Reed
31a69fdbe1 throw if we have a null typeface native instance (so we don't crash in native code) 
we may still have to native-destroy a Typeface with a null ref, so check for that
 2009-12-17 12:18:44 -05:00
Jason Sams
8bb41dd614 Add argument checking to sampler builder to disallow illegal modes. 2009-12-16 15:59:59 -08:00
Jason Sams
7e5ab3b177 Continue es2 shader dev 
Conflicts:

	graphics/java/android/renderscript/Program.java
	graphics/java/android/renderscript/ProgramVertex.java
 2009-12-15 13:27:04 -08:00
Jason Sams
0011bcf57f 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. 2009-12-15 12:58:36 -08:00
Jason Sams
11fbdf5020 Remove check for surface valid that is no longer valid. 2009-12-14 19:20:30 -08:00
Jason Sams
c7b74e3412 am 54f5ca41: am ffacbc34: am fd2f6358: Merge change I771bebb9 into eclair 
Merge commit '54f5ca4115b776eb5a1e04a4c014acccb916ef9c'

* commit '54f5ca4115b776eb5a1e04a4c014acccb916ef9c':
  Add Java exceptions to catch RS calls with no context or no surface.
 2009-12-07 18:35:48 -08:00
Jason Sams
54f5ca4115 am ffacbc34: am fd2f6358: Merge change I771bebb9 into eclair 
Merge commit 'ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f' into eclair-mr2-plus-aosp

* commit 'ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f':
  Add Java exceptions to catch RS calls with no context or no surface.
 2009-12-07 13:04:51 -08:00
Jason Sams
ffacbc3419 am fd2f6358: Merge change I771bebb9 into eclair 
Merge commit 'fd2f6358321e95d661f24ba4e08327268035aa59' into eclair-mr2

* commit 'fd2f6358321e95d661f24ba4e08327268035aa59':
  Add Java exceptions to catch RS calls with no context or no surface.
 2009-12-07 13:00:25 -08:00
Jason Sams
387488fb1f am fd2f6358: Merge change I771bebb9 into eclair 
Merge commit 'fd2f6358321e95d661f24ba4e08327268035aa59' into eclair-plus-aosp

* commit 'fd2f6358321e95d661f24ba4e08327268035aa59':
  Add Java exceptions to catch RS calls with no context or no surface.
 2009-12-07 12:59:57 -08:00
Jason Sams
771bebb940 Add Java exceptions to catch RS calls with no context or no surface. 2009-12-07 12:40:12 -08:00
Joe Onorato
8da7873f94 am dbed5350: am b28632a5: am c7a63eea: Add a new field to Intent that allows you to give a hint about what on screen caused the intent to be sent. 
Merge commit 'dbed53504f515337ccc2f60248bb589dff0f24fb'

* commit 'dbed53504f515337ccc2f60248bb589dff0f24fb':
  Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
 2009-12-03 10:51:34 -08:00
Joe Onorato
dbed53504f am b28632a5: am c7a63eea: Add a new field to Intent that allows you to give a hint about what on screen caused the intent to be sent. 
Merge commit 'b28632a5206d11844db39ca1ab5f64a99ec74e29' into eclair-mr2-plus-aosp

* commit 'b28632a5206d11844db39ca1ab5f64a99ec74e29':
  Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
 2009-12-02 23:22:19 -08:00
Joe Onorato
b28632a520 am c7a63eea: Add a new field to Intent that allows you to give a hint about what on screen caused the intent to be sent. 
Merge commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640' into eclair-mr2

* commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640':
  Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
 2009-12-02 22:40:57 -08:00
Joe Onorato
03cd88b3ff am c7a63eea: Add a new field to Intent that allows you to give a hint about what on screen caused the intent to be sent. 
Merge commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640' into eclair-plus-aosp

* commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640':
  Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
 2009-12-02 22:39:53 -08:00
Joe Onorato
c7a63eea8d Add a new field to Intent that allows you to give a hint about what on screen caused the intent to 
be sent.
 2009-12-02 22:27:07 -08:00
Jason Sams
54c0ec14e0 Beging GL2 user shaders. Switch master to using GL2 by default. 2009-11-30 15:34:03 -08:00
Jason Sams
f630904134 am f56f317f: am fa0394c9: Merge change I715333b8 into eclair 
Merge commit 'f56f317fb941c354c3a10e9fbf36d194656fa7d4' into eclair-mr2-plus-aosp

* commit 'f56f317fb941c354c3a10e9fbf36d194656fa7d4':
  Add support for dumping RS objects to aid in debugging of white blocks bug.
 2009-11-17 17:41:02 -08:00
Jason Sams
bd2b773c23 am fa0394c9: Merge change I715333b8 into eclair 
Merge commit 'fa0394c9f89f13b53c6db2470253825b88cafb64' into eclair-plus-aosp

* commit 'fa0394c9f89f13b53c6db2470253825b88cafb64':
  Add support for dumping RS objects to aid in debugging of white blocks bug.
 2009-11-17 17:36:27 -08:00
Jason Sams
f56f317fb9 am fa0394c9: Merge change I715333b8 into eclair 
Merge commit 'fa0394c9f89f13b53c6db2470253825b88cafb64' into eclair-mr2

* commit 'fa0394c9f89f13b53c6db2470253825b88cafb64':
  Add support for dumping RS objects to aid in debugging of white blocks bug.
 2009-11-17 17:35:44 -08:00
Jason Sams
715333b832 Add support for dumping RS objects to aid in debugging of white blocks bug. 2009-11-17 17:26:46 -08:00
Jason Sams
234e509a67 am 22186a2c: am ec8178eb: Merge change I9c1bad53 into eclair 
Merge commit '22186a2c15cc752cfaaf8a12d415a3c097d338e0' into eclair-mr2-plus-aosp

* commit '22186a2c15cc752cfaaf8a12d415a3c097d338e0':
  Add setPriority to allow wallpapers to run at lower cpu priority than default.
 2009-11-16 14:42:10 -08:00
Jason Sams
7b159b4a63 am ec8178eb: Merge change I9c1bad53 into eclair 
Merge commit 'ec8178eb0fb10e1ed753be4d065cf7f004355575' into eclair-plus-aosp

* commit 'ec8178eb0fb10e1ed753be4d065cf7f004355575':
  Add setPriority to allow wallpapers to run at lower cpu priority than default.
 2009-11-16 14:04:54 -08:00
Jason Sams
22186a2c15 am ec8178eb: Merge change I9c1bad53 into eclair 
Merge commit 'ec8178eb0fb10e1ed753be4d065cf7f004355575' into eclair-mr2

* commit 'ec8178eb0fb10e1ed753be4d065cf7f004355575':
  Add setPriority to allow wallpapers to run at lower cpu priority than default.
 2009-11-16 14:04:15 -08:00
Jason Sams
7d787b4722 Add setPriority to allow wallpapers to run at lower cpu priority than default. 2009-11-15 12:14:26 -08:00
Jean-Baptiste Queru
478de466ce merge from eclair 2009-11-15 12:06:23 -08:00
Jean-Baptiste Queru
8a4e470fc2 merge from open-source master 2009-11-15 11:04:00 -08:00
Android (Google) Code Review
373329d477 Merge change I736c525a into eclair-mr2 
* changes:
  update dox to account for different behavior between AVOID and TARGET modes
 2009-11-13 14:05:20 -08:00
Jean-Baptiste Queru
9db3d07b96 eclair snapshot 2009-11-13 13:53:39 -08:00
Jason Sams
da8bb292db am 59175ac2: Merge change I81b1421a into eclair 
Merge commit '59175ac269df2a584241e9786dc70ac35cb973e3' into eclair-mr2

* commit '59175ac269df2a584241e9786dc70ac35cb973e3':
  Defer EGL init until the surface changed call comes in.  Pass w,h along with surface for verification of driver state.
 2009-11-12 23:05:59 -08:00
Jason Sams
1e75deb288 am 59175ac2: Merge change I81b1421a into eclair 
Merge commit '59175ac269df2a584241e9786dc70ac35cb973e3' into eclair-plus-aosp

* commit '59175ac269df2a584241e9786dc70ac35cb973e3':
  Defer EGL init until the surface changed call comes in.  Pass w,h along with surface for verification of driver state.
 2009-11-12 19:07:49 -08:00
Mike Reed
736c525a04 update dox to account for different behavior between AVOID and TARGET modes 
http://b/issue?id=2034547
 2009-11-12 21:13:12 -05:00
Jason Sams
3bc47d4381 Defer EGL init until the surface changed call comes in. Pass w,h along with surface for verification of driver state. 2009-11-12 15:10:47 -08:00
Jean-Baptiste Queru
7e2b4f602a merge from open-source master 2009-11-11 08:26:31 -08:00
Olivier Goutet
83387a484c Correction of an error in the setRotate method of the ColorMatrix class. 
The matrix rotation params around the 2nd axis was not set correctly:

Initial matrix for axis 2 (green):
 cos 0 sin 0 0
  0  1  0  0 0
-sin 0  0  0 0
  0  0 cos 1 0

After correction:
 cos 0 -sin 0 0
  0  1   0  0 0
 sin 0  cos 0 0
  0  0   0  1 0
 2009-11-05 14:48:03 +01:00
Jason Sams
a1c3681fb8 am decc139b: Merge change I7a824efc into eclair 
Merge commit 'decc139b232721ea1b0521d144521c8082636f0c' into eclair-mr2

* commit 'decc139b232721ea1b0521d144521c8082636f0c':
  Support applications changing the surface attached to the RS.
 2009-11-03 16:02:21 -08:00
Jason Sams
efd9b6fb2e Support applications changing the surface attached to the RS. 2009-11-03 14:15:28 -08:00
Mike Reed
58d30b6907 am 1864d01f: Merge change Iae849da2 into eclair 
Merge commit '1864d01f2be0e82da7d8844fa91bee8880282041' into eclair-mr2

* commit '1864d01f2be0e82da7d8844fa91bee8880282041':
  add table maskfilter
 2009-10-30 14:13:44 -07:00
Mike Reed
0e1e623011 add table maskfilter 
hidden for now, since it need only be seen by Launcher2

http://b/issue?id=2210685
 2009-10-30 08:11:58 -04:00
Jason Sams
e4133ec129 am ec1f1e3d: Merge change Ieab4c75b into eclair 
Merge commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde' into eclair-mr2

* commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde':
  Fix type in Java enums.  Not currently used, easier to fix now than when apps are using it.
 2009-10-29 19:30:11 -07:00
Jason Sams
eab4c75b09 Fix type in Java enums. Not currently used, easier to fix now than when apps are using it. 2009-10-28 17:40:13 -07:00
Mike Reed
c04851fd0a add boundary patch 2009-10-28 15:18:41 -04:00
Jason Sams
7299c83bd8 Fix bug exposed by filmstrip. The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used. 2009-10-16 14:55:41 -07:00
Jason Sams
bd2197fb00 Add script to script call support. Add exception to catch out of bound index data when added to TriangleMeshBuilder. 2009-10-07 18:14:01 -07:00
Mike Reed
a78b0a2d9e add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque. 
Knowing that a 32bit bitmap is opaque is a performance boost for some blits.
 2009-10-07 11:38:05 -07:00
Jason Sams
516c319115 Implement data push from scripts. Fixes the problem where apps would have to poll to monitor a scripts state. 
Fix bug in StoreState where state could be overridden by the default unless the script used more than one state.

Change only impacts renderscript and renderscript apps.
 2009-10-06 13:58:47 -07:00