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

95 Commits

Author SHA1 Message Date
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
Alex Sakhartchouk
87a36a3b29 Merge "Making shader compilation errors throw a Java exception." 2012-02-10 15:00:21 -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
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
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
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
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
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
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
b64ef770db Merge "Adding ability to bind constants to shaders." into graphics-dev 2012-01-10 14:39:59 -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
Glenn Kasten
a8719ad9d5 Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" 2012-01-05 07:38:29 -08:00
Glenn Kasten
e80a4ccd2b Use the standard CC_LIKELY and CC_UNLIKELY macros 
Several source files privately defined macros LIKELY and UNLIKELY in terms
of __builtin_expect. But <cutils/compiler.h> already has CC_LIKELY and
CC_UNLIKELY which are intended for this purpose.  So rename the private
uses to use the standard names.

In addition, AudioFlinger was relying on the macro expanding to extra ( ).

Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873
 2012-01-05 07:33:45 -08:00
Alex Sakhartchouk
6b908df7d9 Merge "Adding better error behavior to RS" into graphics-dev 2012-01-04 16:59:41 -08:00
Alex Sakhartchouk
afdf7be7ce Merge "Adding RS comments, cleaning up the gl implementation with new Element hal." into graphics-dev 2012-01-04 16:59:16 -08:00
Steve Block
c2daafc18d am 41891aea: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE" 
* commit '41891aeaf4e6e4006ae3087fa537786e9ec8caa4':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)  DO NOT MERGE
 2012-01-04 10:16:14 -08:00
Steve Block
5baa3a62a9 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
 2012-01-03 22:38:27 +00:00
Alex Sakhartchouk
5b5664af2d Adding better error behavior to RS 
Change-Id: Iea1cc76793f8978d60575404d7b1c5145e268d6e
 2011-12-29 11:17:38 -08:00
Alex Sakhartchouk
36a7d6003d Adding RS comments, cleaning up the gl implementation with new Element hal. 
Change-Id: I74de1e8248a73a45a39976e6027dac2626d580e9
 2011-12-28 13:47:05 -08:00
Logan Chien
0e05b11803 am 12be3fff: Remove dead code. 
* commit '12be3fff12e5c55193867f49e13169b9400b2997':
  Remove dead code.
 2011-11-27 00:52:49 -08:00
Logan Chien
12be3fff12 Remove dead code. 
Change-Id: I2838a40026291e7345b07911af3ba17278b63ffe
 2011-11-27 08:42:11 +08:00
Jason Sams
857d0c7017 Private API to support MFF transition. 
Change-Id: I17cc9dc46eb37e4397428ba64305b0fd8ed3ae81
 2011-11-23 15:02:15 -08:00
Jason Sams
f15ed0124e Path rendering 
Change-Id: I5379a676c9ec6a9b25f21bc1e050053f27e411dd
 2011-11-10 15:19:16 -08:00
Steve Block
71f2cf116a Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
 2011-10-26 09:57:54 +01:00
Alex Sakhartchouk
5ef2f53a00 Remove ObjBaseRef from the hal struct 
Change-Id: Idcac14ecfdd4d06a0f54bf50e3b9657be62e6638
 2011-10-18 10:54:29 -07:00
Jason Sams
2802dae197 Fix bug with 1D arrays and threading. 
Some elements got launched multiple times.

Change-Id: Icb257019df591a5d9525867c8ef8d18ef7d4cde5
 2011-10-12 18:33:01 -07:00
Jason Sams
aac24a219a Improve rsForEach overhead. 
Change-Id: Iaabef7bb573233ef7c5756077f840ee933ee0c39

fix spacing, reduce rsForEach overhead about 50%
 2011-10-11 18:49:41 -07:00
Jason Sams
795072ec7b Fix crash running old HC apps. 
Change-Id: If7206de334868cb40eb8e5dd04fbe8c70bc1d614
 2011-10-04 15:46:57 -07:00
Jason Sams
8410b14c85 Cleanup RS logs 
Reduce the startup/shutdown info and format the logs
in a consistent manner.

Change-Id: I4592cd9fcf7e2920010d84c7137137262cdc73b9
 2011-09-20 16:59:22 -07:00
Jason Sams
5316b9eead Add RS watchdog. 
Change-Id: I4c912beb84fa8a37ada0088049f7776132e994b6
 2011-09-13 15:41:01 -07:00
Stephen Hines
514f9790fd Call .rs.dtor() when tearing down Scripts. 
BUG=5186750

This allows us to properly reference count any globals (static or extern) that
need to potentially be cleaned up.

Change-Id: I03d2c38c1e7a4ca96c40003d2eeecb6f395d5835
 2011-08-31 17:41:39 -07:00
Stephen Hines
1222393e35 Issue proper parameters to root() calls for RS. 
BUG=5076887

Change-Id: Ic0ce9d45ee20a99add4c780233c0804d05a55e96
 2011-08-19 12:27:07 -07:00
Jason Sams
c1b4c1ff9b Add structure to pack params for forEach. 
This allows the driver to not pass all the sub-params.

Change-Id: I9728a7bb39893f49193a55155994ede0400cb7a6
 2011-08-17 14:13:50 -07:00