LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,160 Commits 2 Branches 0 Tags
c89cd7afa4909a4df20d0e39234ae1a6afb2012d
Commit Graph

6160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Turner
c89cd7afa4 am 0777f78e: am a2e0e64a: am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp" 
* commit '0777f78ee81b4089f88290af82db2055906a73ab':
  removed old/obsolete file GLEScontext.cpp
 2011-06-07 13:24:38 -07:00
David Turner
ea4284a78a am f3c78295: am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test" 
* commit 'f3c78295e6d7415b9899778f07ff7ba32ede136e':
  Fix issues raised by the GLES 1.1 conformance test
 2011-06-07 13:24:34 -07:00
David Turner
0677b7a1e3 am f68103bf: am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work" 
* commit 'f68103bf0df892b35c66615efd4c504ef7e96918':
  Fix a bug where eglMakeCurrent(NULL) did not work
 2011-06-07 13:24:29 -07:00
David Turner
0c5fb2eea7 am b848ebfe: am 62f593fa: am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count" 
* commit 'b848ebfedca6087a327ffab2c402828398241b0a':
  Fix a mess in contexts/surfaces reference count
 2011-06-07 13:24:24 -07:00
Jean-Baptiste Queru
331b2a6f83 am 6d0d6ef1: am fc618484: Merge from gingerbread 
* commit '6d0d6ef1598502c20776d443ad93e18b036443be':
 2011-06-07 13:23:33 -07:00
David Turner
01dca04f26 am 5eac0624: am 8821d5a5: Merge "ThreadInfo- use explicit rather than void pointers" 
* commit '5eac0624d2307ee537d0b4ee6587a02738118c29':
  ThreadInfo- use explicit rather than void pointers
 2011-06-07 13:22:24 -07:00
David Turner
1a34e175fc am 3f232d30: am 0b05185e: Merge "Fix version returned by eglInitialize from 4.1 to 1.4." 
* commit '3f232d30586cddb9b463c7557095906fd58a2db7':
  Fix version returned by eglInitialize from 4.1 to 1.4.
 2011-06-07 13:22:18 -07:00
David Turner
f90611b840 am 9448b1c2: am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL." 
* commit '9448b1c2822eaf7a55ceaa3feefa88941d8b47d9':
  EglChooseConfig should handle the case where "configs" is NULL.
 2011-06-07 13:22:13 -07:00
David Turner
cb802ae3d9 am 6d70e8c3: am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into 
* commit '6d70e8c39ec00488ce8acb94d39a77072d9ef465':
  Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder.
 2011-06-07 13:21:44 -07:00
Xavier Ducrohet
733342c712 am 76fb8500: am 80f84422: Add v13 to the compatibility package. 
* commit '76fb8500d32e0d9a64b2d00522237d6d8f7a71e9':
  Add v13 to the compatibility package.
 2011-06-07 10:58:00 -07:00
Xavier Ducrohet
76fb8500d3 am 80f84422: Add v13 to the compatibility package. 
* commit '80f844229137cb0d78689ea61aea37da4c770c8c':
  Add v13 to the compatibility package.
 2011-06-07 10:48:13 -07:00
Xavier Ducrohet
80f8442291 Add v13 to the compatibility package. 
Also remove ApiDemos from the package and instead
add each library-specific sample app to each v##
folder.

Change-Id: I2932bbb91c7122c122973902d1fcd159ca899381
 2011-06-06 19:21:45 -07:00
David 'Digit' Turner
b257bb8ab4 am e9c7386b: am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries." 
* commit 'e9c7386b0506f7c2f0bc258e3a899fcbe64adc3e':
  ndk: x86: Sanitize platform headers and libraries.
 2011-06-06 17:30:49 -07:00
Dianne Hackborn
b36c8d68a3 am 0a9365f8: am 7ffb7d4b: Update pager demos to match new v4 ViewPager API. 
* commit '0a9365f82530e63334e023b605f71968b48ce91c':
  Update pager demos to match new v4 ViewPager API.
 2011-06-06 15:18:59 -07:00
Dianne Hackborn
0a9365f825 am 7ffb7d4b: Update pager demos to match new v4 ViewPager API. 
* commit '7ffb7d4b2face7d2ce5cee82c92ec36fd0ba2932':
  Update pager demos to match new v4 ViewPager API.
 2011-06-06 15:12:15 -07:00
Dianne Hackborn
7ffb7d4b2f Update pager demos to match new v4 ViewPager API. 
Change-Id: I3b0f3382d56b477868b5a5fbf5af22fa83c3e06a
 2011-06-06 15:01:45 -07:00
David Turner
0777f78ee8 am a2e0e64a: am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp" 
* commit 'a2e0e64af3c891733fadf0a85dc7b8293db285ac':
  removed old/obsolete file GLEScontext.cpp
 2011-06-06 07:50:05 -07:00
David Turner
f3c78295e6 am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test" 
* commit 'e6868d1eebdc2057c19ecac23cdff37d9ca2cdd2':
  Fix issues raised by the GLES 1.1 conformance test
 2011-06-06 07:50:00 -07:00
David Turner
a2e0e64af3 am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp" 
* commit '61287c5092b87c384617cb0e06464db247786a48':
  removed old/obsolete file GLEScontext.cpp
 2011-06-06 07:34:34 -07:00
David Turner
e6868d1eeb am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test" 
* commit '299a140c60efbc920a948364d28f5c6eaff4ee4f':
  Fix issues raised by the GLES 1.1 conformance test
 2011-06-06 07:34:29 -07:00
David Turner
61287c5092 Merge "removed old/obsolete file GLEScontext.cpp" 2011-06-06 04:25:26 -07:00
Guy Zadikario
a7f83c0565 removed old/obsolete file GLEScontext.cpp 
Change-Id: I82f21eef958e37515b46279cf2b44386320723ca
 2011-06-06 13:19:26 +03:00
David Turner
299a140c60 Merge "Fix issues raised by the GLES 1.1 conformance test" 2011-06-06 01:50:56 -07:00
Yochai Shefi Simchon
3150361b51 Fix issues raised by the GLES 1.1 conformance test 
- Most of the fixes are about unhandled enums.
- Adding an unbindBuffer method to GLEScontext, and use it in the
 glDeleteBuffers call, so a buffer is not considered bound after
 it has been deleted.
- Handle the case where a call to glCompressedTexImage2D gets
 NULL as its data (in which case the uncompressTexture function
 should only calculate the output format, but not attempt to
 uncompress the NULL data).
- A few segfaults.

Change-Id: I6a856ea6da1be3b15b41140d6383508a6803897c
 2011-06-05 13:34:27 +03:00
David Turner
f68103bf0d am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work" 
* commit '1e4d92cadfb443b0128f615b64b74b6730fd2f32':
  Fix a bug where eglMakeCurrent(NULL) did not work
 2011-06-03 18:38:21 -07:00
David Turner
b848ebfedc am 62f593fa: am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count" 
* commit '62f593fa2daf2ebc1ba3d10dc4a46dbd2ef3bf39':
  Fix a mess in contexts/surfaces reference count
 2011-06-03 18:38:18 -07:00
David Turner
1e4d92cadf am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work" 
* commit '67032b23966bc0a7231b2d6825ac2f1cf84e9949':
  Fix a bug where eglMakeCurrent(NULL) did not work
 2011-06-03 18:19:21 -07:00
David Turner
62f593fa2d am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count" 
* commit '7660bb5806c285bc5646ad5868b9197012943bcb':
  Fix a mess in contexts/surfaces reference count
 2011-06-03 18:19:17 -07:00
David Turner
67032b2396 Merge "Fix a bug where eglMakeCurrent(NULL) did not work" 2011-06-03 15:17:00 -07:00
David Turner
7660bb5806 Merge "Fix a mess in contexts/surfaces reference count" 2011-06-03 14:59:41 -07:00
Dianne Hackborn
b6991d5cf1 am a6cadd62: am 47f569e4: Lost and found. 
* commit 'a6cadd6244b4c0045ccb571881af982267b4ee9c':
  Lost and found.
 2011-06-03 13:33:06 -07:00
Dianne Hackborn
a6cadd6244 am 47f569e4: Lost and found. 
* commit '47f569e460adaef04b75174706b7c95471567ca8':
  Lost and found.
 2011-06-03 13:17:32 -07:00
Dianne Hackborn
47f569e460 Lost and found. 
Change-Id: I3aa4824e2c2157be715d93b698963c54dd98e099
 2011-06-03 12:31:09 -07:00
Andy Stadler
14eda7256c am dfb979cd: am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2 
* commit 'dfb979cd631ef552b627a94a6e88eec6a2db655a':
  DO NOT MERGE Replacement sample code for DevicePolicyManager api.
 2011-06-03 10:33:09 -07:00
Andy Stadler
dfb979cd63 am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2 
* commit '7e408e8be4cd546206b45c51fa41cc09939dbe33':
  DO NOT MERGE Replacement sample code for DevicePolicyManager api.
 2011-06-03 10:28:42 -07:00
Andy Stadler
7e408e8be4 Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2 2011-06-03 10:24:20 -07:00
Dianne Hackborn
6faeacbbc5 am 068fa0c3: am 72d2e5c1: New demos for the v13 support library. 
* commit '068fa0c33bf92ca63a07a93f09e98324c9443709':
  New demos for the v13 support library.
 2011-06-02 19:49:40 -07:00
Dianne Hackborn
068fa0c33b am 72d2e5c1: New demos for the v13 support library. 
* commit '72d2e5c1b9bbd96a38035781790ca14dd59b15b8':
  New demos for the v13 support library.
 2011-06-02 19:48:21 -07:00
Dianne Hackborn
72d2e5c1b9 New demos for the v13 support library. 
Change-Id: I79a727f987d3b21274e1f9ee6359caa2231c258b
 2011-06-02 19:44:57 -07:00
Andy Stadler
547494ef8a DO NOT MERGE Replacement sample code for DevicePolicyManager api. 
* UI is organized into multiple screens to make it easier to understand
* More feedback about local vs global (aggregate) policies
* Uses preference fragments for modern appearance

Backport of: I075161d389942786e6c95483becbff7ebe847078

Change-Id: Ie88c1577b2ebae124615cc4b45968851cf11187e
 2011-06-02 16:39:17 -07:00
Jean-Baptiste Queru
6d0d6ef159 am fc618484: Merge from gingerbread 
* commit 'fc618484abdca2f2378c1aa3dcbe1abe8a9a7f7f':
 2011-06-01 14:26:31 -07:00
Jean-Baptiste Queru
fc618484ab Merge from gingerbread 
Change-Id: I85fd33e5db2744f78166b3d879e9e664a06653e3
 2011-06-01 14:12:20 -07:00
David Turner
5eac0624d2 am 8821d5a5: Merge "ThreadInfo- use explicit rather than void pointers" 
* commit '8821d5a56e5d881908bbee28004d6e6a3e8a220c':
  ThreadInfo- use explicit rather than void pointers
 2011-05-31 14:39:40 -07:00
David Turner
3f232d3058 am 0b05185e: Merge "Fix version returned by eglInitialize from 4.1 to 1.4." 
* commit '0b05185e00ac8cdf6c8c6e9b86bb67603455f25e':
  Fix version returned by eglInitialize from 4.1 to 1.4.
 2011-05-31 14:34:58 -07:00
David Turner
9448b1c282 am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL." 
* commit '8c141dd2c012733feb7fedce6e96a2c3f13c5c6c':
  EglChooseConfig should handle the case where "configs" is NULL.
 2011-05-31 14:32:05 -07:00
David Turner
8821d5a56e Merge "ThreadInfo- use explicit rather than void pointers" 2011-05-31 14:28:48 -07:00
David Turner
0b05185e00 Merge "Fix version returned by eglInitialize from 4.1 to 1.4." 2011-05-31 14:11:00 -07:00
David Turner
8c141dd2c0 Merge "EglChooseConfig should handle the case where "configs" is NULL." 2011-05-31 13:58:18 -07:00
Dianne Hackborn
faf6dcd6cd am 94703eef: am 10c33528: Extract support lib samples out of ApiDemos and in to their own app. 
* commit '94703eef4ce1a5dcfd8ed1a001a41374ec51f94a':
  Extract support lib samples out of ApiDemos and in to their own app.
 2011-05-31 10:54:18 -07:00
Dianne Hackborn
94703eef4c am 10c33528: Extract support lib samples out of ApiDemos and in to their own app. 
* commit '10c33528e033643099783a5bc4eedb4b8a1e9a0e':
  Extract support lib samples out of ApiDemos and in to their own app.
 2011-05-31 10:51:48 -07:00