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

930 Commits

Author SHA1 Message Date
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
Mathias Agopian
be124027db am dfbcee6c: fix build 
* commit 'dfbcee6cb8ab9cf89b9052eb7498e453afdb1463':
  fix build
 2012-01-29 22:24:52 -08:00
Mathias Agopian
dfbcee6cb8 fix build 
Change-Id: Ibdc45f1794e7ef60dc1ca0ff85c5cc4dff84c3fa
 2012-01-29 22:22:08 -08:00
Jason Sams
85694cf6c7 Merge "Add comment to confusing commands." into graphics-dev 2012-01-27 13:30:20 -08:00
Jason Sams
61e76a7ffa Add comment to confusing commands. 
Change-Id: I7b84b9d8e9b3b595e0bab33d5e219842f6c86f83
 2012-01-27 13:27:01 -08:00
Stephen Hines
2061424da7 am cee905be: Merge "Don\'t wait forever if there are no commands to execute." 
* commit 'cee905be4874f6d3f112527a53b0f7ff87655c66':
  Don't wait forever if there are no commands to execute.
 2012-01-27 10:10:27 -08:00
Stephen Hines
cee905be48 Merge "Don't wait forever if there are no commands to execute." 2012-01-27 10:08:18 -08:00
Stephen Hines
e3f9cc6761 Don't wait forever if there are no commands to execute. 
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
 2012-01-26 17:32:09 -08:00
Stephen Hines
6bd4c7ad4f am caaac348: Merge "Fix bugs with unsigned rsAtomicCas/Max/Min." 
* commit 'caaac348ed163f59cf1b8185bb14137050c18e7e':
  Fix bugs with unsigned rsAtomicCas/Max/Min.
 2012-01-26 13:58:14 -08:00
Stephen Hines
caaac348ed Merge "Fix bugs with unsigned rsAtomicCas/Max/Min." 2012-01-26 13:55:57 -08:00
Stephen Hines
109116bb2f Fix bugs with unsigned rsAtomicCas/Max/Min. 
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
 2012-01-25 18:17:34 -08:00
Stephen Hines
4cbe25a86b Fix potential bug with reordered size/offset arguments. 
This change also cleans up a few uint32_t/size_t issues.

Change-Id: Iae0fc085c12149129b91fce0ebbc28c8cf358eaf
 2012-01-20 19:21:35 -08:00
Robert Ly
fda817416c am b41c96a3: am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs 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
 2012-01-18 13:24:42 -08:00
Robert Ly
b41c96a374 am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 
* commit '43fda84e91b1fe356af35386d2f304d3ab71529e':
  update overview page for rs api docs to open iframe links in parent
 2012-01-18 13:21:51 -08:00
Stephen Hines
b97c8dd6eb am d36f7d24: Merge "Add support for new root.expand() calls." 
* commit 'd36f7d249591559e713a8ca45c6d452c14c94895':
  Add support for new root.expand() calls.
 2012-01-13 14:16:39 -08:00
Jason Sams
615e7cee03 Start implementing SurfaceTexture streaming into RS allocations. 
Change-Id: I561fbb63c63371ea59047c07fb2d68c21d16e76b
 2012-01-13 14:01:20 -08:00
Robert Ly
2eeb53c155 update overview page for rs api docs to open iframe links in parent 
Change-Id: Ic0aa77192fa19b045a7fd9df5926255511fdc3be
 2012-01-13 10:18:43 -08:00
Robert Ly
0272f1dfd7 cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62 
Change-Id: Iff4b4bd171818208bb3be46dd3ef7e91b6cbd80f
 2012-01-13 10:07:20 -08:00
Stephen Hines
6b4cf07cab Add support for new root.expand() calls. 
BUG=5444144

Change-Id: I9ab942561a03e9f837a3199457259bb3e07ac76f
 2012-01-12 18:56:43 -08:00
Jason Sams
17801f1eaa Plumbing for RS priority. 
Change-Id: Ibddfd40407fd6d24ac829a76a9a1e2047c48c5fd
 2012-01-12 14:22:21 -08:00
Jason Sams
aa9565b1b2 Fix LOGE. 
Change-Id: I533bedf0827edb27e0aead78e2bb3389be85acd8
 2012-01-10 15:45:04 -08:00
Alex Sakhartchouk
10f2a3c5b3 Merge "Now utilizing ability to bind constants. Fixing small copy/paste typo." into graphics-dev 2012-01-10 14:40:48 -08:00
Alex Sakhartchouk
b64ef770db Merge "Adding ability to bind constants to shaders." into graphics-dev 2012-01-10 14:39:59 -08:00
Alex Sakhartchouk
fdccec9c21 Now utilizing ability to bind constants. 
Fixing small copy/paste typo.

Change-Id: I8ca993f3e894214b710bea019dfd65822a4cd88f
 2012-01-10 14:30:34 -08:00
Alex Sakhartchouk
33680ff630 Adding ability to bind constants to shaders. 
Change-Id: I63b664fd2fec7e0c8157b7185782192132222f1a
 2012-01-10 10:16:52 -08:00
Steve Block
2e681c1b09 resolved conflicts for merge of 08289f55 to graphics-dev 
Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
 2012-01-09 23:24:46 +00:00
Steve Block
3762c31172 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
 2012-01-08 13:19:13 +00:00
Alex Sakhartchouk
61cd943514 Cleanup based on comments. 
Change-Id: I2d261b3cd240b890001dcc7d2a849cfdc34328bf
 2012-01-05 14:55:11 -08:00
Glenn Kasten
6b6e640323 am a8719ad9: Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" 
* commit 'a8719ad9d53d3fe51e8031b2471e9558b8ef727f':
  Use the standard CC_LIKELY and CC_UNLIKELY macros
 2012-01-05 07:40:36 -08:00