ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
51,753 Commits 2 Branches 0 Tags 54 MiB
Commit Graph

980 Commits

Author SHA1 Message Date
Chih-hung Hsieh 765f12c7de am 22536916: am 1bb53054: Merge "Fix class vs. struct mismatch" 
* commit '22536916a5abd294ed4ccfa5bde9066305c81b48':
  Fix class vs. struct mismatch
 2014-11-17 23:07:39 +00:00
Chih-hung Hsieh 22536916a5 am 1bb53054: Merge "Fix class vs. struct mismatch" 
* commit '1bb53054f2d77ce570a22629006c849fc54707dc':
  Fix class vs. struct mismatch
 2014-11-17 22:58:50 +00:00
Bernhard Rosenkränzer 9f425914db Fix class vs. struct mismatch 
egl_connection_t is a struct - shouldn't be forward-declared as a class

Change-Id: I39f5d9bff9fc64f4694fb2bef7e4afa131b449cc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-17 21:12:15 +01:00
Dan Albert 06235085c6 am 36ec7a8b: am d72ff140: Merge "Move frameworks/native to libc++." 
* commit '36ec7a8b99e287d923bfacd2ef69661818aeb85e':
  Move frameworks/native to libc++.
 2014-11-16 17:35:37 +00:00
Dan Albert 36ec7a8b99 am d72ff140: Merge "Move frameworks/native to libc++." 
* commit 'd72ff140e0df44106cd8539396ce686aa8f3306a':
  Move frameworks/native to libc++.
 2014-11-16 17:31:57 +00:00
Dan Albert 6d72063cfd Move frameworks/native to libc++. 
I'm pretty sure I had done this before... Must have been new
dependencies that slipped in when L merged in.

Bug: 15193147
Change-Id: Ib9b1b8a65665d25c33c6141b9476a8e13c4084e0
 2014-11-15 18:22:55 -08:00
Andreas Gampe 385899b74a am c5657b0c: am fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers" 
* commit 'c5657b0c344b39d794c4c8241004d4e19341c096':
  Frameworks/native: Add pragmas to glgen headers
 2014-11-12 19:12:59 +00:00
Andreas Gampe c5657b0c34 am fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers" 
* commit 'fecc0bf4f1d8d1939807123d0f01ca1fe377bda4':
  Frameworks/native: Add pragmas to glgen headers
 2014-11-12 18:40:21 +00:00
Andreas Gampe fecc0bf4f1 Merge "Frameworks/native: Add pragmas to glgen headers" 2014-11-12 18:30:40 +00:00
Andreas Gampe b5da0d78d2 Frameworks/native: Add pragmas to glgen headers 
The code currently being generated by glgen is not the cleanest, but
we would like to get core/jni onto -Werror. Thus add pragmas turning
off warnings locally to the C headers.

Also fix signed-comparison in two functions.

Longer term TODO: Emit clean code.

Change-Id: Iee8582f8c0c1de076d64851d3b6ca467afd5bc43
 2014-11-12 10:10:12 -08:00
Jesse Hall a059fc7353 am 3b93c2b9: am 7b3fd290: Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag" 
* commit '3b93c2b9d0bd4495b6d0fa5f834214f6665873ab':
  EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag
 2014-11-12 17:36:52 +00:00
Jesse Hall 3b93c2b9d0 am 7b3fd290: Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag" 
* commit '7b3fd29037bc12c2691e06334bf51171853aa8f3':
  EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag
 2014-11-12 17:31:03 +00:00
Michal Wajdeczko 701048cbe8 EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag 
Wrapper functions were broken on builds that forced -fno-omit-frame-pointer flag.

Change-Id: I5a80f9587fb3db821b4156af56acda59a0b4579b
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
 2014-11-12 06:33:24 +00:00
Dan Stoza 6b7a45859e am 8e624d4c: am 98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit '8e624d4cad45532c09879356f3adaa3b65fdcfc9':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 20:09:39 +00:00
Dan Stoza 8e624d4cad am 98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit '98d20f82ca8979b30c81df9639f54ab11e1951f9':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 20:03:42 +00:00
Dan Stoza 8dc55396fc Add a BufferItem parameter to onFrameAvailable 
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents. Also
adds an onFrameReplaced callback, which is necessary if the consumer
wants to do anything more than simple queue length tracking.

Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
 2014-11-07 10:39:13 -08:00
Dan Albert 66aae0a4c8 am 090dbeb7: am c90b7d9c: am d12586b8: Merge "Move hwc tests to libc++." 
* commit '090dbeb7f174e5c1c605d8d91ef0faa2c46e9ee3':
  Move hwc tests to libc++.
 2014-11-05 03:29:55 +00:00
Dan Albert c90b7d9c0f am d12586b8: Merge "Move hwc tests to libc++." 
* commit 'd12586b8593cf0cb894d02104a9794ed9dd85d16':
  Move hwc tests to libc++.
 2014-11-05 02:41:59 +00:00
Dan Albert bcc1ae07d9 Move hwc tests to libc++. 
Since these tests were pulling in a static library linked against
stlport, the tests needed to be explicit about which STL they're
using. Might as well be libc++.

Bug: 15193147
Change-Id: I4e0fc4ea10f7982dd04e7baaf57139dd5d55543e
 2014-11-04 17:25:12 -08:00
Chih-hung Hsieh 1eee62777d am 108e6334: am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now" 
* commit '108e6334c7520cc9fc2f3694e7d4d62db85a97fb':
  Use LOCAL_CLANG := false for GLES wrappers for now
 2014-10-16 03:13:15 +00:00
Chih-hung Hsieh 108e6334c7 am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now" 
* commit 'e9034b4502ae6e693ad52fe2e435066dc969a3ab':
  Use LOCAL_CLANG := false for GLES wrappers for now
 2014-10-16 03:06:42 +00:00
Chih-hung Hsieh 82ba423f1c am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now" 
* commit 'e9034b4502ae6e693ad52fe2e435066dc969a3ab':
  Use LOCAL_CLANG := false for GLES wrappers for now
 2014-10-16 03:06:25 +00:00
Bernhard Rosenkraenzer d3684aeda5 Use LOCAL_CLANG := false for GLES wrappers for now 
GLES wrappers built with clang currently result in crashes in libhwui,
UI doesn't come up.

Force gcc for the wrappers until this is investigated and fixed
properly.

Bug: 18003438
Change-Id: I24a17ec019409930883da8040fe2fb05b0fea0c5
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
 2014-10-15 22:23:42 +00:00
Michael Lentine c3cd862fcb am 14fa402f: am 12c4bdad: Add rate-limited logging for unimplemented es functions. 
* commit '14fa402fea7b3aa420271923e9e051ba122912b6':
  Add rate-limited logging for unimplemented es functions.
 2014-09-23 20:57:03 +00:00
Michael Lentine 14fa402fea am 12c4bdad: Add rate-limited logging for unimplemented es functions. 
* commit '12c4bdad7b2372ab64dcd2abbdbe47e709fb8b90':
  Add rate-limited logging for unimplemented es functions.
 2014-09-23 19:41:45 +00:00
Michael Lentine 53bffaaf27 am 12c4bdad: Add rate-limited logging for unimplemented es functions. 
* commit '12c4bdad7b2372ab64dcd2abbdbe47e709fb8b90':
  Add rate-limited logging for unimplemented es functions.
 2014-09-23 19:16:54 +00:00
Tom Hudson 9fe0ef5680 Merge "Return EGL_FALSE early when eglInitialize() fails" 2014-09-23 17:16:36 +00:00
Tom Hudson e11b1a733c Return EGL_FALSE early when eglInitialize() fails 
In the Meta-EGL shim, eglInitialize() could fail but return EGL_TRUE,
writing into the version numbers; both of these behaviors contradict
the spec.

BUG=b/17486830
R=jessehall@google.com

Change-Id: I810bdbd701e222ac09ab8660ce9dfc0c0954c3d7
 2014-09-23 12:00:41 -04:00
Michael Lentine 12c4bdad7b Add rate-limited logging for unimplemented es functions. 
Bug: 17322013

Change-Id: I7aa5ab2f76cf344cfb75802edbfd44e8e7526ff1
 2014-09-23 08:30:12 -07:00
Dan Albert 4355c0c986 am e1e3d278: Merge "Clean cruft out of makefiles." 
* commit 'e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2':
  Clean cruft out of makefiles.
 2014-09-12 16:22:03 +00:00
Dan Albert b79dfe6721 Clean cruft out of makefiles. 
Cleans up manual uses of stlport and bionic (and removes uses of private
bionic headers).

Change-Id: I157309d702e59152adfa3450939082248ae4c043
 2014-09-11 18:49:47 -07:00
Ben Clayton 6c011731d0 am 4c5b9acf: Merge "Don\'t try to capture the pointer when using PBOs for texture APIs" into lmp-dev 
* commit '4c5b9acf655531f1be45bf7fffc5ee145a80cca7':
  Don't try to capture the pointer when using PBOs for texture APIs
 2014-08-20 16:32:37 +00:00
Ben Clayton 0ad707f2f3 Don't try to capture the pointer when using PBOs for texture APIs 
If a PBO is bound, then the pointer argument is a relative offset from
the start of the PBO, not an absolute address.

Fixes b/17063439

Change-Id: I39629ce6c9bb3cb6bac5c9b0311287628306ddd4
 2014-08-19 17:03:54 +01:00
Ben Clayton 16d7b6a8bb Don't try to capture the pointer when using PBOs for texture APIs 
If a PBO is bound, then the pointer argument is a relative offset from
the start of the PBO, not an absolute address.

Fixes b/17063439

Change-Id: I39629ce6c9bb3cb6bac5c9b0311287628306ddd4
(cherry picked from commit 0ad707f2f3)
 2014-08-20 15:21:44 +00:00
Michael Lentine 0ffbac894c am 45e2fc22: Revert "Modify EGL to disconnect the window when the surface gets destroyed." 
* commit '45e2fc22261cb8ecac4901b4425bcb7352c71174':
  Revert "Modify EGL to disconnect the window when the surface gets destroyed."
 2014-08-08 17:42:02 +00:00
Michael Lentine 45e2fc2226 Revert "Modify EGL to disconnect the window when the surface gets destroyed." 
This reverts commit 843cbb241d.
 2014-08-08 10:30:44 -07:00
Jesse Hall 83142a12fb am e2e17e5b: Merge "GlES2: Add NULL check" 
* commit 'e2e17e5b238ccd214c72ec1a1864cf391425f09f':
  GlES2: Add NULL check
 2014-08-06 17:22:52 +00:00
Anshuman Dani 0627071cc9 GlES2: Add NULL check 
Check for NULL before calling thread specific glGetString.

CRs-fixed: 569609

Change-Id: Ifee8257152ba7ca7a05df5d7b113171b71d16c82
 2014-08-06 21:53:35 +05:30
Michael Lentine cd36eb445b Merge "Modify EGL to disconnect the window when the surface gets destroyed." into lmp-dev 2014-07-25 21:16:23 +00:00
Michael Lentine 843cbb241d Modify EGL to disconnect the window when the surface gets destroyed. 
Bug: 14445579

Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa
 2014-07-29 18:59:56 -07:00
Ying Wang d1ceb8b78f Install symlinks in multilib build. 
(cherry picked from commit c3aed1eaef)

Change-Id: Ic0082ffbd7ecf610476bccb0929e67427a05190d
 2014-07-24 10:36:55 -07:00
Ying Wang c3aed1eaef Install symlinks in multilib build. 
Change-Id: Ia8a4995de127c42beebb3fe603366ce29a6f94d3
 2014-07-23 11:55:43 -07:00
Ben Clayton 7b3f48d2ef Use the count parameter to store all the uniform vectors, not just the first one. DO NOT MERGE. 
Change-Id: Ib56d859051f0b895de5c12ffa371cd4b2b65ac0b
(cherry picked from commit 31b0aec64b)
 2014-07-21 09:52:48 +00:00
Ben Clayton 3d3c125423 Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls. 
Change-Id: I38643f5d279a84f1b7069801d7c106fc8f1ae394
 2014-07-07 11:57:45 +01:00
Ying Wang 722e75179b am 0cea0a22: am d284c4cd: Merge "Don\'t set LOCAL_MODULE_PATH for native tests." 
* commit '0cea0a22109ace7e3dfbb4913a1469f3f8480f6e':
  Don't set LOCAL_MODULE_PATH for native tests.
 2014-06-11 17:58:44 +00:00
Ying Wang 8baf4fcabd Don't set LOCAL_MODULE_PATH for native tests. 
The build system will set it up automatically.

Change-Id: Id5ed9eff88dab2349c3b357ee09f7da9479d7d2d
 2014-06-09 15:23:46 -07:00
Jesse Hall 0d7271527f am 17cbadf0: am 6fa169fa: Merge "Add aarch64 EGL/GLES trampolines" 
* commit '17cbadf0f598b0d02179262ad5b6b270850ccb94':
  Add aarch64 EGL/GLES trampolines
 2014-06-07 00:19:53 +00:00
Jesse Hall 30a41aa1cc Add aarch64 EGL/GLES trampolines 
Change-Id: Ia90e18d26ff3bdb7e643aff8d77cbaddd2ac2a03
 2014-06-06 16:31:53 -07:00
Simon Wilson 7ef56b7315 am ad8d25e8: am 90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too" 
* commit 'ad8d25e812d8842298de92657158a0325c42cdbd':
  Revert "Enable OMAP4 SGX workaround for OMAP3 too"
 2014-05-29 17:58:30 +00:00
Simon Wilson ad8d25e812 am 90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too" 
* commit '90654afb3aeac78916f2a53fe689a087c0e283c9':
  Revert "Enable OMAP4 SGX workaround for OMAP3 too"
 2014-05-29 17:54:34 +00:00