Alex Sakhartchouk
541b492d49
Merge "Allocation sampling api prototypes."
2012-03-01 09:43:43 -08:00
Alex Sakhartchouk
96804ad6bc
Allocation sampling api prototypes.
...
Change-Id: Ia11c6a107ea49ad6f40cfd220c537376a18c3b62
2012-02-29 16:43:24 -08:00
Alex Sakhartchouk
a65fb113dd
Merge "Removing GL calls from librs"
2012-02-27 15:08:07 -08:00
Mathias Agopian
018549e4bf
Merge "remove dependency on android_native{s_priv|buffer}.h"
2012-02-24 19:08:12 -08:00
Mathias Agopian
af01feafc3
remove dependency on android_native{s_priv|buffer}.h
...
Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
2012-02-24 18:26:01 -08:00
Jason Sams
3d408e5010
Merge "test runs but I do not check results yet."
2012-02-24 17:21:02 -08:00
Mathias Agopian
cc0eaa6582
remove libui dependency on libEGL
...
Change-Id: I1194f04085637d5c384e134967249430cc43b6ee
2012-02-24 16:42:46 -08:00
Jason Sams
9733f26093
test runs but I do not check results yet.
...
Change-Id: I427581a301bb1a9710554187accad2d6f9d9b10c
2012-02-24 14:24:56 -08:00
Alex Sakhartchouk
20c9c92ec6
Removing GL calls from librs
...
Change-Id: Ida22199a33f0f9fd534dcc5951d12937967a187b
2012-02-24 14:22:34 -08:00
Jason Sams
170dc848ae
More RS cpp binding work. All classes for
...
compute should be partially implemented at this time.
Change-Id: Iddf9405cc69513b708975d20783395f0be04c680
2012-02-23 17:14:39 -08:00
Jason Sams
a23c4ebe04
Merge "start new headers"
2012-02-23 14:19:43 -08:00
Stephen Hines
a16c98c155
Merge "Support running ForEach on non-root functions."
2012-02-23 09:58:56 -08:00
Stephen Hines
473a2048d3
Support running ForEach on non-root functions.
...
BUG=6000538
Change-Id: Ie2b16893b150cc5955ee4b9d028c988f69a82744
2012-02-22 15:24:29 -08:00
Jason Sams
f70b0fc880
start new headers
...
Change-Id: I950e5db76ecd3afbc7ea2b3ec792e4cb242f57bf
cpp
2012-02-22 15:22:41 -08:00
Mathias Agopian
b13b9bdad2
frameworks/base refactoring.
...
step 2: move libutils headers to their new home: androidfw
Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
2012-02-17 19:01:26 -08:00
Jason Sams
6db0608dff
Merge "Work around VSync signal while screen is off."
2012-02-17 17:20:27 -08:00
Jason Sams
f7795e0c2f
Work around VSync signal while screen is off.
...
Change-Id: I0a9637170ee658ff84a363e91c558892dce5cfaf
2012-02-17 17:00:37 -08:00
Jason Sams
42a23efa85
Merge "Update prototype remote fifo. Tested primary connection using only fifo data transport."
2012-02-17 12:05:13 -08:00
Jason Sams
e158f203d2
Merge "Rename three header files to free namespace for api."
2012-02-17 12:04:20 -08:00
Jason Sams
548cc0e973
Update prototype remote fifo. Tested primary connection
...
using only fifo data transport.
cleanup cl.
Change-Id: I9b5f5e5a256b7f66b387bd801c1da0e642761200
2012-02-16 17:21:32 -08:00
Jason Sams
1d6983af33
Rename three header files to free namespace for api.
...
Change-Id: Ie9ef65a477373c30b2d5b02248f62e768b6f27ae
2012-02-16 17:14:06 -08:00
Alex Sakhartchouk
791c0d188a
Merge "Piping texture names through shader builder. Fixing uint size_t mismatch."
2012-02-16 09:28:21 -08:00
Alex Sakhartchouk
2123b46ba8
Piping texture names through shader builder.
...
Fixing uint size_t mismatch.
Change-Id: Ia7c8bd9f829deaa50e1cc381ccd50f29676bbdfb
2012-02-15 16:21:46 -08:00
Alex Sakhartchouk
6be163651c
Merge "Fixing uint32 size_t mismatches."
2012-02-15 15:14:21 -08:00
Jason Sams
163766cbe7
Beging IO stream out from allocation to surface texture.
...
Change-Id: I4d6b7f7740a896d39b811d6fe7532bb00db62373
2012-02-15 12:04:24 -08:00
Alex Sakhartchouk
a3f154324a
Fixing uint32 size_t mismatches.
...
Change-Id: I5263158f5855472db6317a52c209fe4e273f3368
2012-02-14 16:00:22 -08:00
Stephen Hines
10e9f39f1d
Merge "Initialize all class members."
2012-02-14 13:35:21 -08:00
Stephen Hines
5b79842b4a
Initialize all class members.
...
Change-Id: I2bb2701a9dde66f6c4484a62945c72ddf52248fa
2012-02-13 17:49:20 -08:00
Alex Sakhartchouk
ff3de0e5d9
am 87a36a3b: Merge "Making shader compilation errors throw a Java exception."
...
* commit '87a36a3b291e78a612d2d08c14b245ff970080e0':
Making shader compilation errors throw a Java exception.
2012-02-10 15:30:48 -08:00
Jason Sams
b2a5354f0c
resolved conflicts for merge of cb66aec0 to graphics-dev
...
Change-Id: Ic8817f702b6993f046c89f2fc598c9fe3bf30fe8
2012-02-10 15:27:26 -08:00
Alex Sakhartchouk
87a36a3b29
Merge "Making shader compilation errors throw a Java exception."
2012-02-10 15:00:21 -08:00
Jason Sams
cb66aec0bd
Merge "Start implementing SurfaceTexture streaming into RS allocations."
2012-02-10 13:51:04 -08:00
Jason Sams
532efd3ce2
Start implementing SurfaceTexture streaming into RS allocations.
...
Change-Id: I561fbb63c63371ea59047c07fb2d68c21d16e76b
Conflicts:
libs/rs/rsAllocation.h
2012-02-10 13:24:18 -08:00
Jason Sams
206904b2af
am 468a9715: Merge "Remove unused param."
...
* commit '468a971512f4665b13e83cc3c7dc24c9031b14eb':
Remove unused param.
2012-02-09 15:19:10 -08:00
Jason Sams
87e2721f89
Remove unused param.
...
Change-Id: Idf26c3bf4eec7ed17dbfb99b40c314bce7996101
2012-02-09 14:50:50 -08:00
Jason Sams
811adfe1b4
am 5b6abb38: Merge "Fix bug in generated code for functions with inband data from pointers. Passing zero length data would desync return command stream."
...
* commit '5b6abb38f0892f429976bd6976f93ae216b21d38':
Fix bug in generated code for functions with inband data from pointers. Passing zero length data would desync return command stream.
2012-02-07 18:58:19 -08:00
Jason Sams
d51280f10b
Fix bug in generated code for functions with inband data
...
from pointers. Passing zero length data would desync
return command stream.
Change-Id: I273a6a44636a203d8305ddff3d6607eae9f9ec8a
2012-02-07 18:54:03 -08:00
Alex Sakhartchouk
257e8a9a4f
Making shader compilation errors throw a Java exception.
...
Change-Id: I612142b6fe1b75eab62e89950c3bea6f326cb730
2012-02-07 18:06:13 -08:00
Jason Sams
eb5b73504d
Merge commit 'bdeec118' into manualmerge
...
Conflicts:
libs/rs/rsThreadIO.h
Change-Id: I7f448996a86f41188b47ec3dc353c364692e8bf2
2012-02-07 16:40:51 -08:00
Jason Sams
4c2e4c80ce
Implement RS VSync on new vsync infrastructure.
...
Change-Id: I662159a086a56e28732dd64a3a3cb30f8d4b72b1
Replace lockless fifo from server to client with sockets.
Change-Id: I99a4ab4f18496c0fbac96ee7b8099797af4712ea
2012-02-07 15:32:08 -08:00
Stephen Hines
0a29fe1be1
am cc2daede: Merge "Properly recover from failed compilation."
...
* commit 'cc2daede56257f0f1f490a1aebf5b9b898d9816a':
Properly recover from failed compilation.
2012-02-02 21:28:17 -08:00
Stephen Hines
cc2daede56
Merge "Properly recover from failed compilation."
2012-02-02 21:25:19 -08:00
Alex Sakhartchouk
98bea4a3ec
am 7042613c: Merge "Fix an incorrect assert that doesn\'t account for element array size."
...
* commit '7042613c653fd0de253f2f659901318902fa4584':
Fix an incorrect assert that doesn't account for element array size.
2012-02-02 14:56:34 -08:00
Alex Sakhartchouk
7042613c65
Merge "Fix an incorrect assert that doesn't account for element array size."
2012-02-02 14:54:32 -08:00
Stephen Hines
862dadb7a7
Properly recover from failed compilation.
...
BUG=5955072
We used to call delete, which did not update the Context's view of the world,
leading to potential segfaults on Context teardown. This change also enables
exceptions to be thrown when runtime errors are encountered.
Change-Id: If63578efff2d7dd03639da1049c1a5ebc69fde35
2012-02-02 13:23:20 -08:00
Alex Sakhartchouk
bf3c3f2ab1
Fix an incorrect assert that doesn't account for element array size.
...
Change-Id: Ibcb5c55d91967603391a1721137d010a85025990
2012-02-02 09:47:26 -08:00
Stephen Hines
dee8be5b89
am bb3968fe: Merge "Remove wrapper version check assert."
...
* commit 'bb3968fed8e7fb2b53ac32d40e26e0d21600a922':
Remove wrapper version check assert.
2012-02-01 17:11:44 -08:00
Stephen Hines
07c12933e3
Remove wrapper version check assert.
...
This really shouldn't have been here to begin with, since the wrapper version
should be meaningless to libRS.
Change-Id: I329446ed96d1a70197247735e267b8539a8c83a2
2012-02-01 16:56:03 -08:00
Stephen Hines
bc19591c1f
am 855eadf9: Merge "Fix potential bug with reordered size/offset arguments."
...
* commit '855eadf942c8ff5c2665d7dc3b6d4b5ba630419a':
Fix potential bug with reordered size/offset arguments.
2012-01-30 12:23:21 -08:00
Stephen Hines
855eadf942
Merge "Fix potential bug with reordered size/offset arguments."
2012-01-30 12:22:10 -08:00