Instead of using a different function pointer table for ES 1.x and ES 2.x,
we use a single one that is the union (sort|uniq) of both tables. Two
instances of this table are initialized with pointers to GL ES 1.x and GL ES 2.x
entry-points.
When a context is created, we store its version number and when it is bound to a
thread we set the approruiate table based on the stored version.
This introduce no penalty while dispatching gl calls to the right API version.
[Pending Dr No approval for MR1]
Merge commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6' into eclair-plus-aosp
* commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6':
Making new Contacts APIs visible in Eclair SDK - Part II
Merge commit '8c471d1def1027d025528b419cc8a1cdb68a4489' into eclair-plus-aosp
* commit '8c471d1def1027d025528b419cc8a1cdb68a4489':
7 more ringtones. Now with more Dr. No!
Merge commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13' into eclair-plus-aosp
* commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13':
Another fix for #2186897: Cannot unlock the device by swiping
Merge commit 'f6d6d180f8c2bec2b152e5dbf74a0c8aec3ec8ee'
* commit 'f6d6d180f8c2bec2b152e5dbf74a0c8aec3ec8ee':
Fix issue #2186709: Can't unlock the device for a while
Merge commit '126ac7f9f957c6be35d6d43f8dee1d5ee7139f95' into eclair-mr2-plus-aosp
* commit '126ac7f9f957c6be35d6d43f8dee1d5ee7139f95':
Fix issue #2186709: Can't unlock the device for a while
Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-plus-aosp
* commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11':
Fix issue #2186709: Can't unlock the device for a while
Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-mr2
* commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11':
Fix issue #2186709: Can't unlock the device for a while
Merge commit '767741ffd5d14471b88791e5db93c08e8d2571eb'
* commit '767741ffd5d14471b88791e5db93c08e8d2571eb':
Making new Contacts APIs visible in Eclair SDK
Merge commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876' into eclair-mr2-plus-aosp
* commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876':
Make our choice of surface explicit.
Merge commit '0741c134645300fed9ad13760273c8d245a04e63' into eclair-mr2-plus-aosp
* commit '0741c134645300fed9ad13760273c8d245a04e63':
Making new Contacts APIs visible in Eclair SDK
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-plus-aosp
* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
Making new Contacts APIs visible in Eclair SDK
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-mr2
* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
Making new Contacts APIs visible in Eclair SDK
Merge commit '98a51b86869e9cf2a1624f8540c4c126962a3a85'
* commit '98a51b86869e9cf2a1624f8540c4c126962a3a85':
Allow multiple OpenGL contexts on systems that support them.
Merge commit 'eac70503c27104117f42de405cd5bd73579096be'
* commit 'eac70503c27104117f42de405cd5bd73579096be':
Framework-side DropBox service that maintains a size-bounded
Merge commit '3b7a1e6d70fda4ce834034930847fe2cc75de515' into eclair-mr2-plus-aosp
* commit '3b7a1e6d70fda4ce834034930847fe2cc75de515':
Allow multiple OpenGL contexts on systems that support them.
Merge commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625' into eclair-mr2-plus-aosp
* commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625':
Framework-side DropBox service that maintains a size-bounded
queue of data chunks (sort of a blob-oriented logcat).
In the future, this will be coupled with a revised checkin service that
would actually upload this data.
Merge commit '7fd752af7507e9f3d3e28f8e646f53f16373c02d'
* commit '7fd752af7507e9f3d3e28f8e646f53f16373c02d':
Prevent getFile from copying when the file is too large.
