Commit Graph

6884 Commits

Author SHA1 Message Date
David Turner
4be3c18126 am 3001b512: am c848f113: am ad66b123: Merge "emulator opengl: fix crash in gralloc_free"
* commit '3001b512438489df64dc83837eff4d1e220d058b':
  emulator opengl: fix crash in gralloc_free
2011-06-22 00:19:06 -07:00
David Turner
e38f9f31a0 am c76cd1af: am 49c24102: am 97dfbff4: Merge "emulator opengl: implement glGetString"
* commit 'c76cd1afbcf26bf211f697ac6174988743a25eff':
  emulator opengl: implement glGetString
2011-06-22 00:18:57 -07:00
David Turner
12e9736f8c am f528fddf: am bd414ea2: Merge "opengl translator: fix eglGetConfigAttrib"
* commit 'f528fddf95143acc6384b74c00276055c447e49c':
  opengl translator: fix eglGetConfigAttrib
2011-06-21 23:58:26 -07:00
David Turner
5605bd75c1 am 227247ea: am 8e706026: Merge "opengl translator: conformance fixes"
* commit '227247eabf785a19818f4f0df71f9fdaa75ed4cd':
  opengl translator: conformance fixes
2011-06-21 23:58:07 -07:00
David Turner
15b6cc560e am b4b448a9: am 97dba6cf: Merge "emulator gralloc: removed compilation warnings."
* commit 'b4b448a97e36bc142c8718fbe7478193818ea7d3':
  emulator gralloc: removed compilation warnings.
2011-06-21 23:56:32 -07:00
David Turner
472716143c am cb0cad4b: am 4e18d73d: Merge "emulator opengl: Fix gralloc color buffer uploads"
* commit 'cb0cad4b35d689b4d8ba9d6fe7eabe2884c5cd1e':
  emulator opengl: Fix gralloc color buffer uploads
2011-06-21 23:56:24 -07:00
David Turner
95d7f3ce1d am 00736340: am ec3f9a75: Merge "emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig"
* commit '00736340f50538abba585b1d8c5bba049e35b68f':
  emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig
2011-06-21 23:56:21 -07:00
David Turner
3001b51243 am c848f113: am ad66b123: Merge "emulator opengl: fix crash in gralloc_free"
* commit 'c848f113905f112e70811f4953e03e67a6130ec5':
  emulator opengl: fix crash in gralloc_free
2011-06-21 23:56:18 -07:00
David Turner
c76cd1afbc am 49c24102: am 97dfbff4: Merge "emulator opengl: implement glGetString"
* commit '49c24102734dd1b77c6ff7b613528c3afee782c5':
  emulator opengl: implement glGetString
2011-06-21 23:56:13 -07:00
David Turner
f528fddf95 am bd414ea2: Merge "opengl translator: fix eglGetConfigAttrib"
* commit 'bd414ea2ff3893e12612d40a5482419bb3004614':
  opengl translator: fix eglGetConfigAttrib
2011-06-21 23:38:47 -07:00
David Turner
227247eabf am 8e706026: Merge "opengl translator: conformance fixes"
* commit '8e706026d1cf909a883599ef46746c9cf374744f':
  opengl translator: conformance fixes
2011-06-21 23:38:41 -07:00
David Turner
b4b448a97e am 97dba6cf: Merge "emulator gralloc: removed compilation warnings."
* commit '97dba6cf074ab8c4d5c67eb8fcea7dc82d434d29':
  emulator gralloc: removed compilation warnings.
2011-06-21 23:37:07 -07:00
David Turner
cb0cad4b35 am 4e18d73d: Merge "emulator opengl: Fix gralloc color buffer uploads"
* commit '4e18d73d1ba1226126fca1ffd53febf24104c55c':
  emulator opengl: Fix gralloc color buffer uploads
2011-06-21 23:37:05 -07:00
David Turner
00736340f5 am ec3f9a75: Merge "emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig"
* commit 'ec3f9a757f311b58b797c93ac13fea3c582e3372':
  emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig
2011-06-21 23:37:03 -07:00
David Turner
c848f11390 am ad66b123: Merge "emulator opengl: fix crash in gralloc_free"
* commit 'ad66b1236ac059f7d77c17684e68400b047ebf41':
  emulator opengl: fix crash in gralloc_free
2011-06-21 23:37:01 -07:00
David Turner
49c2410273 am 97dfbff4: Merge "emulator opengl: implement glGetString"
* commit '97dfbff43bac34d39535ccc41817c7eda08a8d7d':
  emulator opengl: implement glGetString
2011-06-21 23:36:54 -07:00
David Turner
bd414ea2ff Merge "opengl translator: fix eglGetConfigAttrib" 2011-06-21 23:23:26 -07:00
David Turner
8e706026d1 Merge "opengl translator: conformance fixes" 2011-06-21 23:23:07 -07:00
David Turner
97dba6cf07 Merge "emulator gralloc: removed compilation warnings." 2011-06-21 23:13:56 -07:00
David Turner
4e18d73d1b Merge "emulator opengl: Fix gralloc color buffer uploads" 2011-06-21 23:13:41 -07:00
David Turner
ec3f9a757f Merge "emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig" 2011-06-21 23:13:30 -07:00
David Turner
ad66b1236a Merge "emulator opengl: fix crash in gralloc_free" 2011-06-21 23:13:21 -07:00
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