summaryrefslogtreecommitdiffstats
path: root/libs/rs
Commit message (Collapse)AuthorAgeFilesLines
* am 87a36a3b: Merge "Making shader compilation errors throw a Java exception."Alex Sakhartchouk2012-02-102-4/+2
|\ | | | | | | | | * commit '87a36a3b291e78a612d2d08c14b245ff970080e0': Making shader compilation errors throw a Java exception.
| * Merge "Making shader compilation errors throw a Java exception."Alex Sakhartchouk2012-02-102-4/+2
| |\
| | * Making shader compilation errors throw a Java exception.Alex Sakhartchouk2012-02-072-4/+2
| | | | | | | | | | | | Change-Id: I612142b6fe1b75eab62e89950c3bea6f326cb730
* | | resolved conflicts for merge of cb66aec0 to graphics-devJason Sams2012-02-101-2/+1
|\ \ \ | |/ / | | | | | | Change-Id: Ic8817f702b6993f046c89f2fc598c9fe3bf30fe8
| * | Merge "Start implementing SurfaceTexture streaming into RS allocations."Jason Sams2012-02-1010-3/+51
| |\ \
| | * | Start implementing SurfaceTexture streaming into RS allocations.Jason Sams2012-02-1010-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I561fbb63c63371ea59047c07fb2d68c21d16e76b Conflicts: libs/rs/rsAllocation.h
* | | | am 468a9715: Merge "Remove unused param."Jason Sams2012-02-093-6/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '468a971512f4665b13e83cc3c7dc24c9031b14eb': Remove unused param.
| * | | Remove unused param.Jason Sams2012-02-093-6/+5
| |/ / | | | | | | | | | Change-Id: Idf26c3bf4eec7ed17dbfb99b40c314bce7996101
* | | am 5b6abb38: Merge "Fix bug in generated code for functions with inband data ↵Jason Sams2012-02-071-1/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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.
| * | Fix bug in generated code for functions with inband dataJason Sams2012-02-071-1/+8
| | | | | | | | | | | | | | | | | | | | | from pointers. Passing zero length data would desync return command stream. Change-Id: I273a6a44636a203d8305ddff3d6607eae9f9ec8a
* | | Merge commit 'bdeec118' into manualmergeJason Sams2012-02-0714-626/+259
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: libs/rs/rsThreadIO.h Change-Id: I7f448996a86f41188b47ec3dc353c364692e8bf2
| * | Implement RS VSync on new vsync infrastructure.Jason Sams2012-02-0714-620/+259
| |/ | | | | | | | | | | | | | | Change-Id: I662159a086a56e28732dd64a3a3cb30f8d4b72b1 Replace lockless fifo from server to client with sockets. Change-Id: I99a4ab4f18496c0fbac96ee7b8099797af4712ea
* | am cc2daede: Merge "Properly recover from failed compilation."Stephen Hines2012-02-021-1/+1
|\ \ | |/ | | | | | | * commit 'cc2daede56257f0f1f490a1aebf5b9b898d9816a': Properly recover from failed compilation.
| * Merge "Properly recover from failed compilation."Stephen Hines2012-02-021-1/+1
| |\
| | * Properly recover from failed compilation.Stephen Hines2012-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 7042613c: Merge "Fix an incorrect assert that doesn\'t account for ↵Alex Sakhartchouk2012-02-021-3/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | element array size." * commit '7042613c653fd0de253f2f659901318902fa4584': Fix an incorrect assert that doesn't account for element array size.
| * | Merge "Fix an incorrect assert that doesn't account for element array size."Alex Sakhartchouk2012-02-021-3/+4
| |\ \ | | |/ | |/|
| | * Fix an incorrect assert that doesn't account for element array size.Alex Sakhartchouk2012-02-021-3/+4
| | | | | | | | | | | | Change-Id: Ibcb5c55d91967603391a1721137d010a85025990
* | | am bb3968fe: Merge "Remove wrapper version check assert."Stephen Hines2012-02-011-1/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'bb3968fed8e7fb2b53ac32d40e26e0d21600a922': Remove wrapper version check assert.
| * | Remove wrapper version check assert.Stephen Hines2012-02-011-1/+0
| |/ | | | | | | | | | | | | This really shouldn't have been here to begin with, since the wrapper version should be meaningless to libRS. Change-Id: I329446ed96d1a70197247735e267b8539a8c83a2
* | am 855eadf9: Merge "Fix potential bug with reordered size/offset arguments."Stephen Hines2012-01-303-27/+27
|\ \ | |/ | | | | | | * commit '855eadf942c8ff5c2665d7dc3b6d4b5ba630419a': Fix potential bug with reordered size/offset arguments.
| * Merge "Fix potential bug with reordered size/offset arguments."Stephen Hines2012-01-303-27/+27
| |\
| | * Fix potential bug with reordered size/offset arguments.Stephen Hines2012-01-203-27/+27
| | | | | | | | | | | | | | | | | | This change also cleans up a few uint32_t/size_t issues. Change-Id: Iae0fc085c12149129b91fce0ebbc28c8cf358eaf
* | | am dfbcee6c: fix buildMathias Agopian2012-01-293-6/+6
|\ \ \ | |/ / | | | | | | | | | * commit 'dfbcee6cb8ab9cf89b9052eb7498e453afdb1463': fix build
| * | fix buildMathias Agopian2012-01-293-6/+6
| | | | | | | | | | | | Change-Id: Ibdc45f1794e7ef60dc1ca0ff85c5cc4dff84c3fa
* | | Merge "Add comment to confusing commands." into graphics-devJason Sams2012-01-271-0/+6
|\ \ \
| * | | Add comment to confusing commands.Jason Sams2012-01-271-0/+6
| | | | | | | | | | | | | | | | Change-Id: I7b84b9d8e9b3b595e0bab33d5e219842f6c86f83
* | | | am cee905be: Merge "Don\'t wait forever if there are no commands to execute."Stephen Hines2012-01-271-2/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'cee905be4874f6d3f112527a53b0f7ff87655c66': Don't wait forever if there are no commands to execute.
| * | | Merge "Don't wait forever if there are no commands to execute."Stephen Hines2012-01-271-2/+7
| |\ \ \
| | * | | Don't wait forever if there are no commands to execute.Stephen Hines2012-01-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=5614887 This fixes a timing issue where we could calculate a delay of 0 (indicating wait forever) when we have no pending commands to actually execute. In such cases, we should just break out of the playback loop. This also fixes a small issue with returning whether or not to redraw. Change-Id: Id1e481679341773256b7287062c68925e2bc8f9e
* | | | | am caaac348: Merge "Fix bugs with unsigned rsAtomicCas/Max/Min."Stephen Hines2012-01-262-3/+23
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'caaac348ed163f59cf1b8185bb14137050c18e7e': Fix bugs with unsigned rsAtomicCas/Max/Min.
| * | | | Merge "Fix bugs with unsigned rsAtomicCas/Max/Min."Stephen Hines2012-01-262-3/+23
| |\ \ \ \ | | |/ / /
| | * | | Fix bugs with unsigned rsAtomicCas/Max/Min.Stephen Hines2012-01-252-3/+23
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=5888007 rsAtomicMax/Min did not have proper semantics for unsigned integers. They were always using signed comparisons. rsAtomicCas had the wrong function signature in our math library, leading to no way to properly link/execute it. Change-Id: I336cdd8cd9f2d8093f12e101b55b2797515f039b
* | | | am b41c96a3: am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs ↵Robert Ly2012-01-181-3/+3
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | api docs to open iframe links in parent" into ics-mr1 * commit 'b41c96a374134c84558291fbb532fe490386a4ba': update overview page for rs api docs to open iframe links in parent
| * | am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to ↵Robert Ly2012-01-181-3/+3
| |\ \ | | |/ | |/| | | | | | | | | | | | | open iframe links in parent" into ics-mr1 * commit '43fda84e91b1fe356af35386d2f304d3ab71529e': update overview page for rs api docs to open iframe links in parent
| | * update overview page for rs api docs to open iframe links in parentRobert Ly2012-01-131-3/+3
| | | | | | | | | | | | Change-Id: Ic0aa77192fa19b045a7fd9df5926255511fdc3be
| | * cherrypick from master - add overview description for RS API reference ↵Robert Ly2012-01-131-0/+25
| | | | | | | | | | | | | | | | | | Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62 Change-Id: Iff4b4bd171818208bb3be46dd3ef7e91b6cbd80f
| | * Add support for handling a bitcode wrapper to librs.Stephen Hines2011-12-011-1/+19
| | | | | | | | | | | | | | | | | | BUG=5425905 Change-Id: I75676060703df6d9043b287fea900c4379455ee2
* | | am d36f7d24: Merge "Add support for new root.expand() calls."Stephen Hines2012-01-133-192/+22
|\ \ \ | |/ / | | | | | | | | | * commit 'd36f7d249591559e713a8ca45c6d452c14c94895': Add support for new root.expand() calls.
| * | Add support for new root.expand() calls.Stephen Hines2012-01-123-192/+22
| | | | | | | | | | | | | | | | | | BUG=5444144 Change-Id: I9ab942561a03e9f837a3199457259bb3e07ac76f
* | | Start implementing SurfaceTexture streaming into RS allocations.Jason Sams2012-01-1310-3/+50
| | | | | | | | | | | | Change-Id: I561fbb63c63371ea59047c07fb2d68c21d16e76b
* | | Plumbing for RS priority.Jason Sams2012-01-125-0/+17
| | | | | | | | | | | | Change-Id: Ibddfd40407fd6d24ac829a76a9a1e2047c48c5fd
* | | Fix LOGE.Jason Sams2012-01-102-7/+7
| | | | | | | | | | | | Change-Id: I533bedf0827edb27e0aead78e2bb3389be85acd8
* | | Merge "Now utilizing ability to bind constants. Fixing small copy/paste ↵Alex Sakhartchouk2012-01-101-3/+3
|\ \ \ | | | | | | | | | | | | typo." into graphics-dev
| * | | Now utilizing ability to bind constants.Alex Sakhartchouk2012-01-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixing small copy/paste typo. Change-Id: I8ca993f3e894214b710bea019dfd65822a4cd88f
* | | | Merge "Adding ability to bind constants to shaders." into graphics-devAlex Sakhartchouk2012-01-104-0/+48
|\ \ \ \ | |/ / /
| * | | Adding ability to bind constants to shaders.Alex Sakhartchouk2012-01-104-0/+48
| | | | | | | | | | | | | | | | Change-Id: I63b664fd2fec7e0c8157b7185782192132222f1a
* | | | resolved conflicts for merge of 08289f55 to graphics-devSteve Block2012-01-0934-209/+209
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
| * | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-0835-212/+212
| | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* | | Cleanup based on comments.Alex Sakhartchouk2012-01-056-17/+14
| | | | | | | | | | | | Change-Id: I2d261b3cd240b890001dcc7d2a849cfdc34328bf
generated by cgit v1.1 at 2025-03-23 06:44:45 +0000