David Turner
97dfbff43b
Merge "emulator opengl: implement glGetString"
2011-06-21 23:13:06 -07:00
Adam Powell
c81d080a6a
Add SwitchPreference demo in ApiDemos.
...
Renamed toggle to Checkbox.
Update to trigger build queue recompilation.
Change-Id: Ie7800b5e41e86f8182bb550da869ccb316cbeb91
2011-06-21 16:55:33 -07:00
David Turner
50832de753
am 0ed0e2fa: am e7661212: am 4a47a38b: am cd108d55: Merge "emulator opengl: Small change to support more surface attributes"
...
* commit '0ed0e2fabde8ad3a8a37bdb66f6ab18d49f2df96':
emulator opengl: Small change to support more surface attributes
2011-06-21 15:28:03 -07:00
David Turner
54f8f18788
am c98d28c7: am cbf73e7b: am 5d4b1f50: am c4b10a54: Merge "emulator opengl: Added glFinishRoundTrip implementation."
...
* commit 'c98d28c7c61f8c4a228065e45cff26ec06cc22c6':
emulator opengl: Added glFinishRoundTrip implementation.
2011-06-21 15:27:52 -07:00
David Turner
00023d5f43
am 58c9dc19: am 117408f1: am 407faf4c: am b9cbdec5: Merge "emulator opengl: implemented getProcAddress in GLESv1."
...
* commit '58c9dc194dfc0e0e2acef8aef5ee946a35b4f0a5':
emulator opengl: implemented getProcAddress in GLESv1.
2011-06-21 15:27:47 -07:00
David Turner
418cabcc4a
am c73a475d: am 85f7ec00: am bf2d789d: am 52ae291a: Merge "emulator opengl: system GLESv1 first commit."
...
* commit 'c73a475de5192d984f3ca104b717cc31742eb2e9':
emulator opengl: system GLESv1 first commit.
2011-06-21 15:27:34 -07:00
Guy Zadikario
22a288abf8
emulator gralloc: removed compilation warnings.
...
just removes anoying compliation warnings in the HMI
initialization.
Change-Id: I23377a7cae774cf436f89e25edb78c10ff5b5c78
2011-06-21 20:47:43 +02:00
Guy Zadikario
7d39ef3772
emulator opengl: Fix gralloc color buffer uploads
...
Use the correct OpenGL pixel type enum when uploading
color buffer content to host.
Change-Id: Idc859306c0398850505f0f348796bc4f12b63b6a
2011-06-21 20:47:43 +02:00
Stas Gurtovoy
5960b2717c
emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig
...
Fixed a bug in FBConfig::chooseConfig implementation
Change-Id: I4b8e98f43825c012f13d0a0684fe8f918e511400
2011-06-21 20:47:43 +02:00
Stas Gurtovoy
ca629bd28e
emulator opengl: fix crash in gralloc_free
...
Fixed bug in list implementation in gralloc_free which caused a crash,
also removed some log prints.
Change-Id: Ie932c838086c99567643868682419ceb122cf787
2011-06-21 20:47:43 +02:00
Guy Zadikario
1ef706f96f
emulator opengl: implement glGetString
...
Added rcGetGLString token to renderControl to query
a GL string constant from the current context from the host.
Implement glGetString functinality in EGL so that the string
value can be cached in the context structure and also
implementation can be shared between GLESv1 and GLESv2.
Also, fixed clientAPI context initialization check in
eglMakeCurrent. The check was for the previously bounded
context instead for the newly bounded context.
Change-Id: I41c0b4ad462c9ad5bd5c66719b41509bb1b7a947
2011-06-21 20:47:43 +02:00
David Turner
daaabe8a8d
am 1d8ebc35: am 4f2b6309: am 5b675210: Merge "emulator opengl: use eglGetProcAddress in EGL dispatch."
...
* commit '1d8ebc357917a053d368d46373d6074458408bb3':
emulator opengl: use eglGetProcAddress in EGL dispatch.
2011-06-21 11:44:16 -07:00
David Turner
6d9eb60463
am 7fb8f627: am fa60dc0a: am c3349b5a: Merge "emulator egl translator: Fix eglGetProcAddress."
...
* commit '7fb8f627b48ba517309d4ea3dbe9ed9a92459a19':
emulator egl translator: Fix eglGetProcAddress.
2011-06-21 11:44:14 -07:00
David Turner
cdb5dd3550
am b0361b1c: am 022254b8: am f4c9f254: Merge "opengl renderer: Fixed colorBuffer texture creation."
...
* commit 'b0361b1c11f7b80364e5e7ed70086cf710ea737e':
opengl renderer: Fixed colorBuffer texture creation.
2011-06-21 11:44:12 -07:00
David Turner
4391d215e1
am c0f900b7: am 5f326344: am 025c1f7f: Merge "emulator opengl: Fix bug when re-binding the same context"
...
* commit 'c0f900b70b108045e67178f714460b06fd1ca4a4':
emulator opengl: Fix bug when re-binding the same context
2011-06-21 11:44:09 -07:00
David Turner
7944a9a6c9
am ac921443: am ef6691f2: am 3ef2b6bf: Merge "emulator opengl: more few fixups needed for the system to load."
...
* commit 'ac921443eaf0db25d3b0f566a3ef9eebecb48876':
emulator opengl: more few fixups needed for the system to load.
2011-06-21 11:44:06 -07:00
David Turner
47138a6e4a
am 426420ab: am 91acad1a: am 1c39202b: Merge "emulator opengl: pool of fixups to the host side."
...
* commit '426420abaea9231358f080b5d6b5cfd81f583bf1':
emulator opengl: pool of fixups to the host side.
2011-06-21 11:43:53 -07:00
David Turner
1d8ebc3579
am 4f2b6309: am 5b675210: Merge "emulator opengl: use eglGetProcAddress in EGL dispatch."
...
* commit '4f2b6309884bd9298eef0e0decf4a6a9259269a8':
emulator opengl: use eglGetProcAddress in EGL dispatch.
2011-06-21 11:38:03 -07:00
David Turner
7fb8f627b4
am fa60dc0a: am c3349b5a: Merge "emulator egl translator: Fix eglGetProcAddress."
...
* commit 'fa60dc0a24a95b92d107464b0d13df77f804db85':
emulator egl translator: Fix eglGetProcAddress.
2011-06-21 11:38:01 -07:00
David Turner
b0361b1c11
am 022254b8: am f4c9f254: Merge "opengl renderer: Fixed colorBuffer texture creation."
...
* commit '022254b80bd4f05ca58e31e2b0d95b47580e8467':
opengl renderer: Fixed colorBuffer texture creation.
2011-06-21 11:37:59 -07:00
David Turner
c0f900b70b
am 5f326344: am 025c1f7f: Merge "emulator opengl: Fix bug when re-binding the same context"
...
* commit '5f326344bd5bc7f9d767c9757b2dd976e263f5c3':
emulator opengl: Fix bug when re-binding the same context
2011-06-21 11:37:56 -07:00
David Turner
ac921443ea
am ef6691f2: am 3ef2b6bf: Merge "emulator opengl: more few fixups needed for the system to load."
...
* commit 'ef6691f284365c8da5532a6d3189185a5d88276e':
emulator opengl: more few fixups needed for the system to load.
2011-06-21 11:37:45 -07:00
David Turner
426420abae
am 91acad1a: am 1c39202b: Merge "emulator opengl: pool of fixups to the host side."
...
* commit '91acad1afa6ec9ce7f17348bed3353c45013c2ae':
emulator opengl: pool of fixups to the host side.
2011-06-21 11:37:34 -07:00
David Turner
4f2b630988
am 5b675210: Merge "emulator opengl: use eglGetProcAddress in EGL dispatch."
...
* commit '5b675210ed267a859e0c98794844fa87626f7505':
emulator opengl: use eglGetProcAddress in EGL dispatch.
2011-06-21 11:30:39 -07:00
David Turner
fa60dc0a24
am c3349b5a: Merge "emulator egl translator: Fix eglGetProcAddress."
...
* commit 'c3349b5a4c82365bec119ab074a77a7d2e50973a':
emulator egl translator: Fix eglGetProcAddress.
2011-06-21 11:30:27 -07:00
David Turner
022254b80b
am f4c9f254: Merge "opengl renderer: Fixed colorBuffer texture creation."
...
* commit 'f4c9f254dfa33f529de67aba32235f7818704ef7':
opengl renderer: Fixed colorBuffer texture creation.
2011-06-21 11:30:00 -07:00
David Turner
5f326344bd
am 025c1f7f: Merge "emulator opengl: Fix bug when re-binding the same context"
...
* commit '025c1f7f1b3134a40447972c2632db72376ec9cf':
emulator opengl: Fix bug when re-binding the same context
2011-06-21 11:29:57 -07:00
David Turner
ef6691f284
am 3ef2b6bf: Merge "emulator opengl: more few fixups needed for the system to load."
...
* commit '3ef2b6bfdfcf6dd81f182c96bf298ec057dc60ef':
emulator opengl: more few fixups needed for the system to load.
2011-06-21 11:29:34 -07:00
David Turner
91acad1afa
am 1c39202b: Merge "emulator opengl: pool of fixups to the host side."
...
* commit '1c39202b7a9e4a28085e35da8a68d5f9d1e61afd':
emulator opengl: pool of fixups to the host side.
2011-06-21 11:29:21 -07:00
Brett Chabot
fb75d53bfb
Merge "Add layoutlib-tests to sdk build."
2011-06-21 11:27:45 -07:00
David Turner
5b675210ed
Merge "emulator opengl: use eglGetProcAddress in EGL dispatch."
2011-06-21 11:11:11 -07:00
David Turner
c3349b5a4c
Merge "emulator egl translator: Fix eglGetProcAddress."
2011-06-21 11:08:54 -07:00
David Turner
f4c9f254df
Merge "opengl renderer: Fixed colorBuffer texture creation."
2011-06-21 11:07:26 -07:00
David Turner
025c1f7f1b
Merge "emulator opengl: Fix bug when re-binding the same context"
2011-06-21 11:05:56 -07:00
David Turner
3ef2b6bfdf
Merge "emulator opengl: more few fixups needed for the system to load."
2011-06-21 11:03:01 -07:00
David Turner
1c39202b7a
Merge "emulator opengl: pool of fixups to the host side."
2011-06-21 11:02:46 -07:00
David Turner
59970b6d11
am 7304f16f: am 8f709075: am 3f5c9555: Merge "emulator opengl: pool of fixups to the system components."
...
* commit '7304f16f03097fa4d19b8baf29a0abe907483069':
emulator opengl: pool of fixups to the system components.
2011-06-21 05:38:01 -07:00
David Turner
25354d605d
am 97ae42d7: am 02c5d31f: am 6aef5092: Merge "emulator opengl: added Bind texture to EGLImage/surface"
...
* commit '97ae42d71849d02fa2a9766bf29d16adffdb6981':
emulator opengl: added Bind texture to EGLImage/surface
2011-06-21 05:34:26 -07:00
David Turner
f70e6700c5
am ad070202: am e0126df2: am 390b0753: Merge "emulator opengl: Added glFinishRoundTrip to GLESv2"
...
* commit 'ad07020224a19d30d8c35c248a87a1b34266bebc':
emulator opengl: Added glFinishRoundTrip to GLESv2
2011-06-21 05:34:18 -07:00
David Turner
7304f16f03
am 8f709075: am 3f5c9555: Merge "emulator opengl: pool of fixups to the system components."
...
* commit '8f709075cbed02f8f660b89f2fd7b6131dad19c4':
emulator opengl: pool of fixups to the system components.
2011-06-21 05:11:50 -07:00
David Turner
97ae42d718
am 02c5d31f: am 6aef5092: Merge "emulator opengl: added Bind texture to EGLImage/surface"
...
* commit '02c5d31f09559c1793ee34bea9cfecddeafced18':
emulator opengl: added Bind texture to EGLImage/surface
2011-06-21 05:09:55 -07:00
David Turner
ad07020224
am e0126df2: am 390b0753: Merge "emulator opengl: Added glFinishRoundTrip to GLESv2"
...
* commit 'e0126df2a644e1d1325bc4b43026b5dc25b9ed9b':
emulator opengl: Added glFinishRoundTrip to GLESv2
2011-06-21 05:09:51 -07:00
David Turner
8f709075cb
am 3f5c9555: Merge "emulator opengl: pool of fixups to the system components."
...
* commit '3f5c95553a0cf67881fa5a722571747fc6d46128':
emulator opengl: pool of fixups to the system components.
2011-06-21 04:50:38 -07:00
David Turner
02c5d31f09
am 6aef5092: Merge "emulator opengl: added Bind texture to EGLImage/surface"
...
* commit '6aef50929c667d52f58263766465c0b4eeb4daa9':
emulator opengl: added Bind texture to EGLImage/surface
2011-06-21 04:48:54 -07:00
David Turner
e0126df2a6
am 390b0753: Merge "emulator opengl: Added glFinishRoundTrip to GLESv2"
...
* commit '390b0753a9a46de18a1a56662274e7c5ee8b8241':
emulator opengl: Added glFinishRoundTrip to GLESv2
2011-06-21 04:48:49 -07:00
Guy Zadikario
a2ec7339da
emulator opengl: use eglGetProcAddress in EGL dispatch.
...
Initialize EGL extensions functions in the EGLDispatch
table using eglGetProcAddress instead of dlsym.
(try dlsym if eglGetProcAddress failed).
Change-Id: I256c4c5f9f3728a5b0e4d5bbcc75b83aa8a85f29
2011-06-21 14:48:44 +03:00
Guy Zadikario
4ec4346f07
emulator egl translator: Fix eglGetProcAddress.
...
Fixed eglGetProcAddress when called for egl
extension functions.
Also fixed a typo in the EGL extension string.
Change-Id: Ia081257fa641182246eec723d08ae2e9148ca0cc
2011-06-21 14:48:44 +03:00
Guy Zadikario
f0dce80492
opengl renderer: Fixed colorBuffer texture creation.
...
The created texture format which represents the color buffer must
be of type GL_RGB or GL_RGBA also for the 565/5551 surface formats.
Change-Id: I7799a4824a0a5b8d57e3bfc507cac5664340725e
2011-06-21 14:48:44 +03:00
Guy Zadikario
b57ad81dae
emulator opengl: Fix bug when re-binding the same context
...
When re-binding the same context the resoult was that the
surfaces got unbinded from the context.
Fixed that situation and added an optimization to do nothing
in case of re-binding the same context to the same binded surfaces.
Change-Id: Ic7058723399b0807d902c29b4170c7465c02bb99
2011-06-21 14:48:44 +03:00
Stas Gurtovoy
5def410ff5
emulator opengl: more few fixups needed for the system to load.
...
Change-Id: I698b14d0f594c091c237a605aeefbb048bf746ca
2011-06-21 14:48:44 +03:00