LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,502 Commits 2 Branches 0 Tags
c8ed8c25bc796cd82fb1df0ea100e320a542eeb3
Commit Graph

2606 Commits

Author SHA1 Message Date
Jesse Hall
9cb15c9e81 am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1 
* commit '8bd39ae17caac6d275d785ce9420d7e643f15eb9':
  EmuGL: GLESv2 support for OES_EGL_image_external
 2012-02-24 12:08:38 -08:00
Jesse Hall
72efa999d1 am ba8c8d15: am 66a386e3: am 00e61338: EmuGL: refinements to GLESv1 image_external 
* commit 'ba8c8d1591a25b13047b24c10a1315ff178b2160':
  EmuGL: refinements to GLESv1 image_external
 2012-02-23 12:25:49 -08:00
Jesse Hall
1d4fcce585 am 4660966b: am 144e1b59: am ac018fe3: EmuGL: refcount ColorBuffers on the host 
* commit '4660966b791d8ea1be086a9ab0c58c672cca36ee':
  EmuGL: refcount ColorBuffers on the host
 2012-02-23 12:25:47 -08:00
Jesse Hall
c2aa2cd77e am 2419e67b: am fc7a319e: am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures 
* commit '2419e67b07de7cdb7f502bb69634b23c147f899a':
  GLESv2 translator: don't delete EGLImage textures
 2012-02-23 12:22:30 -08:00
Jesse Hall
d6bd1843ce EmuGL: GLESv2 support for OES_EGL_image_external 
Change-Id: I8911328d5dcccdf4731bd2d8fd953c12fdec5f1b
 2012-02-22 15:03:30 -08:00
Jesse Hall
66a386e33a am 00e61338: EmuGL: refinements to GLESv1 image_external 
* commit '00e61338b8374de090e81537047846ca06f88280':
  EmuGL: refinements to GLESv1 image_external
 2012-02-22 13:47:27 -08:00
Jesse Hall
144e1b5998 am ac018fe3: EmuGL: refcount ColorBuffers on the host 
* commit 'ac018fe3f65e18083a2dd317f73e4139bfa5fee6':
  EmuGL: refcount ColorBuffers on the host
 2012-02-22 13:45:42 -08:00
Jesse Hall
fc7a319e5c am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures 
* commit '91d4e8e195592dbc812441597118452f887ea07d':
  GLESv2 translator: don't delete EGLImage textures
 2012-02-22 10:11:31 -08:00
Siva Velusamy
e7cb1c37e8 Merge "glesv2debugger: Remove obsolete files." 2012-02-22 10:10:11 -08:00
Jesse Hall
00e61338b8 EmuGL: refinements to GLESv1 image_external 
* EGLImageTargetRenderbufferStorageOES was incorrectly accepting
  TEXTURE_EXTERNAL_OES as a target. Revert that; the host GL will
  correctly reject it with INVALID_ENUM.

* Handle the REQUIRED_TEXTURE_IMAGE_UNITS_OES texparameter query.

* Validate texture parameters set on TEXTURE_EXTERNAL textures;
  otherwise invalid parameters would work on the emulator but not on a
  real device.

Change-Id: I49a088608d58a9822f33e5916bd354eee3709127
 2012-02-21 11:13:20 -08:00
Jesse Hall
ac018fe3f6 EmuGL: refcount ColorBuffers on the host 
The gralloc API assumes system-wide reference counting of gralloc
buffers. The host-GL accelerated gralloc maps buffers to host-side
ColorBuffer objects, but was destroying them unconditionally in
gralloc_free(), ignoring any additional references from
gralloc_register_buffer().

This affected the SurfaceTexture gralloc buffers used by the
Browser/WebView. For some reason these buffers are actually allocated
by SurfaceFlinger and passed back to the WebView through Binder. But
since SurfaceFlinger doesn't actually need the buffer for anything,
sometime after the WebView has called gralloc_register_buffer()
SurfaceFlinger calls gralloc_free() on it. This caused the host
ColorBuffer to be destroyed long before the WebView is done using it.

Change-Id: I33dbee887a48a6907041cf19e9f38a1f6c983eff
 2012-02-21 11:13:20 -08:00
Jesse Hall
91d4e8e195 GLESv2 translator: don't delete EGLImage textures 
Copy changes faaf1553cf and
f37a7ed6c5 from the GLESv1 translator to
the GLESv2 translator. After this, both translators use the same logic
for glEGLImageTargetTexture2DOES().

Change-Id: I0a95bf2301df7b7428abc593f38170edf4cbda30
 2012-02-21 11:13:19 -08:00
Siva Velusamy
88a2bd65da glesv2debugger: Remove obsolete files. 
The new version of gl debugger is located at:
sdk/eclipse/plugins/com.android.ide.eclipse.gldebugger

Change-Id: I274be9ab34b9da9d7b9d7e00c2d53dcbeab4b15a
 2012-02-21 09:41:14 -08:00
Mathias Agopian
c6746da9a5 Merge "egl.cfg can now only have a single entry" 2012-02-14 12:35:19 -08:00
Mathias Agopian
baa8e96c70 egl.cfg can now only have a single entry 
Change-Id: Ic86671e41859dbf40ed4408f62450019c2164015
 2012-02-13 20:38:35 -08:00
Jesse Hall
15c77094dc am 66258220: am 165c21e8: am 1276f7ba: am 0e981c83: EmuGL: Fix heap corruption 
* commit '66258220b0c86e72002c5be15708f2cc83dbd39c':
  EmuGL: Fix heap corruption
 2012-02-06 14:41:27 -08:00
Jesse Hall
66258220b0 am 165c21e8: am 1276f7ba: am 0e981c83: EmuGL: Fix heap corruption 
* commit '165c21e84cf87c6d5ccf085546d6313ea1533c6f':
  EmuGL: Fix heap corruption
 2012-02-06 14:39:22 -08:00
Jesse Hall
1276f7ba04 am 0e981c83: EmuGL: Fix heap corruption 
* commit '0e981c83041878e6a05b0a996879160fd0f320cf':
  EmuGL: Fix heap corruption
 2012-02-06 13:36:19 -08:00
Tor Norbye
222a5346e0 am 80437f41: Merge "Update default project icons, and add an xhdpi version" 
* commit '80437f41e53cd90d1ea1ba17158f4c3064c2fbc7':
  Update default project icons, and add an xhdpi version
 2012-02-06 12:51:41 -08:00
Tor Norbye
80437f41e5 Merge "Update default project icons, and add an xhdpi version" 2012-02-06 12:48:20 -08:00
Jesse Hall
0e981c8304 EmuGL: Fix heap corruption 
Off-by-two bug when removing textures from the tracking array could
overwrite malloc's mem chunk data structure, usually resulting in a
heap corruption abort on a later malloc/realloc/free.

Bug: 5951738
Change-Id: I11056bb62883373c2a3403f53899347ff8cdabf2
 2012-02-03 22:54:24 -08:00
Marco Nelissen
3bd580e1dd am 936e648c: Fix findunusedresources to handle package name different from path 
* commit '936e648ce98cb468ac02dc7e6ef9f7df897f03ff':
  Fix findunusedresources to handle package name different from path
 2012-01-27 16:18:56 -08:00
Marco Nelissen
936e648ce9 Fix findunusedresources to handle package name different from path 
Change-Id: Ia010d0f71e3e7141f762fc83ff34d3426bac85a0
 2012-01-27 16:07:59 -08:00
Jesse Hall
97c1620440 am 900f5e87: am 9b19d582: am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 
* commit '900f5e879360898afc5599fc887b98aa012c8ce2':
  EmuGL: handle NULL data in glBufferData
 2012-01-11 17:15:50 -08:00
Jesse Hall
900f5e8793 am 9b19d582: am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 
* commit '9b19d582d94a343437aacf962b8b95b83361bc10':
  EmuGL: handle NULL data in glBufferData
 2012-01-11 17:13:42 -08:00
Jesse Hall
9b19d582d9 am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 
* commit '4f66a14d5311ee94d5a498c8e0049f6b95d4d0d6':
  EmuGL: handle NULL data in glBufferData
 2012-01-11 17:12:09 -08:00
Jesse Hall
5bad48a65e EmuGL: handle NULL data in glBufferData 
The data pointer argument to glBufferData can be NULL; this
[re]allocates the buffer while leaving the contents undefined.

Bug: 5833436

Change-Id: Ia1ddf62e2cd2c59d3d631e01d23d7c557ca5a52e
 2012-01-11 15:40:29 -08:00
Steve Block
3ba6e9ff86 am 7d47e557: Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" 
* commit '7d47e557172d15fb698604a48f1a0100dfd84330':
  Rename LOG_ASSERT to ALOG_ASSERT  DO NOT MERGE
 2012-01-10 14:46:33 -08:00
Steve Block
7d47e55717 Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" 2012-01-10 14:08:30 -08:00
Jesse Hall
1f30075c7f am 56335392: am d23522e6: am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1 
* commit '5633539268af0c8686ce97c174122e053ecbb774':
  EmuGL: misc small cleanups
 2012-01-10 09:02:49 -08:00
Jesse Hall
90f9afea71 am 8a5b5242: am 19b03e4e: am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1 
* commit '8a5b5242a4cf4e5be85f9e5fed1787027d92704b':
  EmuGL: fix GL view position in window on OS X
 2012-01-10 09:02:48 -08:00
Jesse Hall
5633539268 am d23522e6: am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1 
* commit 'd23522e614c517a50222796286a7fffb6c11bd14':
  EmuGL: misc small cleanups
 2012-01-09 16:37:28 -08:00
Jesse Hall
8a5b5242a4 am 19b03e4e: am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1 
* commit '19b03e4ef1e7861b938dd7c52356af5396f456b3':
  EmuGL: fix GL view position in window on OS X
 2012-01-09 16:37:27 -08:00
Jesse Hall
d23522e614 am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1 
* commit 'f0baef2fed555e87a0910e5aab6b8b763487b350':
  EmuGL: misc small cleanups
 2012-01-09 15:53:49 -08:00
Jesse Hall
19b03e4ef1 am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1 
* commit '409c49c526508b5fa36f8bc6edc1fc70cba5a3e1':
  EmuGL: fix GL view position in window on OS X
 2012-01-09 15:53:48 -08:00
Jesse Hall
f0baef2fed Merge "EmuGL: misc small cleanups" into ics-mr1 2012-01-09 15:52:15 -08:00
Steve Block
8ad367c36d Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE 
See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I2eb298dae73ccfd8e9ee8350344d9f5c96f5c422
 2012-01-09 21:35:44 +00:00
Steve Block
9033d6efcf am 5a622cba: Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
* commit '5a622cba8c5287d5e6577f940a22343a7cae977f':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)  DO NOT MERGE
 2012-01-09 11:22:47 -08:00
Steve Block
5a622cba8c 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: Ic6cac56d137f705dfa7266f21e9b0269219bd5d1
 2012-01-09 10:39:43 +00:00
Steve Block
8460b530e8 am 8e822bd4: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE" 
* commit '8e822bd462aff69821442a02b85ed9c5dcbed341':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)  DO NOT MERGE
 2012-01-06 10:33:19 -08:00
Steve Block
6aff44c27e Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I03c41e20d8f5d7f3c7ef1f01506885e3e250e921
 2012-01-06 10:06:41 +00:00
Steve Block
cb46eed1eb am 91cb6de5: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 
* commit '91cb6de5e5c862ad25c4b494a27716e2bf9e697f':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE
 2012-01-05 14:09:15 -08:00
Jesse Hall
a592d9c043 EmuGL: misc small cleanups 
* Disable verbose debug spam.
* Add missing GL enum to utility function. The default case was
  returning the correct size, so this doesn't fix any bugs, just
  removes some logcat spam.
* Comment and whitespace corrections.

Change-Id: I83fb8644331ae1072d6a8dae9c041da92073089f
 2012-01-05 10:50:01 -08:00
Alex Sakhartchouk
185bb9b5cc Merge "Stripping out geometry data, but keeping names and references instead of removing all geometric data." into graphics-dev 2012-01-04 17:18:44 -08:00
Jesse Hall
a4fb8a60b1 EmuGL: fix GL view position in window on OS X 
The code that creates the GL-accelerated screen view wasn't converting
the upper-left-relative coordinates used within the emulator to the
lower-left coordinates used by the Cocoa APIs on OS X. Since most
skins have the screen view centered vertically this often just
happened to work.

Bug: 5782118
Change-Id: I2f96ee181e850df5676d10a82d86c94421149b40
 2012-01-04 15:03:39 -08:00
Steve Block
cad4194fad Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ia7ba0ca669b2c4168d90837f9b409b21503f95f0
 2012-01-04 21:08:55 +00:00
Steve Block
7ee245378c am 112bc5e5: Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
* commit '112bc5e57e206ec3e0bc5a335b62eae2eb8892e8':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)  DO NOT MERGE
 2012-01-04 10:16:05 -08:00
Alex Sakhartchouk
40b0530285 Stripping out geometry data, but keeping names and references instead 
of removing all geometric data.

Change-Id: I602d548f6ef41b9feba3b50b819501c3d59bf8c6
 2012-01-03 17:39:38 -08:00
Steve Block
112bc5e57e Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: Ia14c98936bb1dc74e681bf2de342ad6861646778
 2012-01-03 22:29:55 +00:00
Al Sutton
3d9ff5598c am c9cfb303: am 34e3d029: am 87879839: Fix build on MacOS 10.7 / XCode 4 
* commit 'c9cfb3032d5d4a502011fb30c344c73a35003b93':
  Fix build on MacOS 10.7 / XCode 4
 2011-12-21 16:51:09 -08:00