Jeff Brown
651e67175a
Delete the simulator.
...
Bug: 5010576
Change-Id: Idc731612107444594f86c68ac40dcc0033423b54
2011-07-08 19:00:07 -07:00
David Turner
fef230b282
am 608383de: am 3e51ea6b: Merge "opengl emulator: Added gl error tracking on the guest (encoder)"
...
* commit '608383decf0f02f90d9f0f2d6256fe1070fa6bbf':
opengl emulator: Added gl error tracking on the guest (encoder)
2011-07-08 10:52:11 -07:00
David Turner
19756f43cb
am d0e43fbd: am b6d01e32: Merge "emulator opengl: fixing clean windows build"
...
* commit 'd0e43fbd117c66b86181d5b3ea30db9191c79932':
emulator opengl: fixing clean windows build
2011-07-08 10:52:09 -07:00
David Turner
eb95c216f8
am a3726566: am b798156b: Merge "opengl renderer: added option to dump GL stream to file."
...
* commit 'a3726566b383ddad797dab6a5d6eb9daf9f71c36':
opengl renderer: added option to dump GL stream to file.
2011-07-08 10:52:07 -07:00
David Turner
bd1b82d505
am bbbdc458: am 829a2e5b: Merge "opengl translator: fixed EGL regression"
...
* commit 'bbbdc458bdbf557a4a2af90a414db1ab8ab638e2':
opengl translator: fixed EGL regression
2011-07-08 10:52:04 -07:00
David Turner
cdce972db9
am 81ff139c: am f8611d3f: Merge "opengl translator: Added support to ETC1 compressed textures."
...
* commit '81ff139c00e440cac1109cbdff2699b4b31cf128':
opengl translator: Added support to ETC1 compressed textures.
2011-07-08 10:52:01 -07:00
David Turner
435e043dd6
am 4b0aee0d: am 4b8fefdc: Merge "Opengl translator: fix EGL Windows specific issues"
...
* commit '4b0aee0da0c7982b028af03e44cc7ef309369d51':
Opengl translator: fix EGL Windows specific issues
2011-07-08 10:51:58 -07:00
David Turner
b098473757
am 398e3db0: am dcbb5192: Merge "opengl translator: add native config id to EglConfig"
...
* commit '398e3db06e6dad9206b28457f67d2591e68868ce':
opengl translator: add native config id to EglConfig
2011-07-08 10:51:55 -07:00
David Turner
3b090d1603
am 91ed228d: am 2d233e86: Merge "opengl translator: fixed normalized vertex attribs"
...
* commit '91ed228d78e9c53ca4765c2968ec6873c7ef3a99':
opengl translator: fixed normalized vertex attribs
2011-07-08 10:51:51 -07:00
David Turner
608383decf
am 3e51ea6b: Merge "opengl emulator: Added gl error tracking on the guest (encoder)"
...
* commit '3e51ea6b5baab25504af27db712d2f245333242d':
opengl emulator: Added gl error tracking on the guest (encoder)
2011-07-08 10:44:06 -07:00
David Turner
d0e43fbd11
am b6d01e32: Merge "emulator opengl: fixing clean windows build"
...
* commit 'b6d01e328d6b74cb0d2bbeceedb4d9c60c97dab3':
emulator opengl: fixing clean windows build
2011-07-08 10:44:01 -07:00
David Turner
a3726566b3
am b798156b: Merge "opengl renderer: added option to dump GL stream to file."
...
* commit 'b798156bcba72b23eed3c81cf917edff880f23f4':
opengl renderer: added option to dump GL stream to file.
2011-07-08 10:43:58 -07:00
David Turner
bbbdc458bd
am 829a2e5b: Merge "opengl translator: fixed EGL regression"
...
* commit '829a2e5b9a0f3bea21c643aaf1bc5668bcb2a4c6':
opengl translator: fixed EGL regression
2011-07-08 10:43:53 -07:00
David Turner
81ff139c00
am f8611d3f: Merge "opengl translator: Added support to ETC1 compressed textures."
...
* commit 'f8611d3fe6583e85074ee597a64c30c27945ed5f':
opengl translator: Added support to ETC1 compressed textures.
2011-07-08 10:43:48 -07:00
David Turner
4b0aee0da0
am 4b8fefdc: Merge "Opengl translator: fix EGL Windows specific issues"
...
* commit '4b8fefdc00271de992429795d9c675afe1ef05f5':
Opengl translator: fix EGL Windows specific issues
2011-07-08 10:43:45 -07:00
David Turner
398e3db06e
am dcbb5192: Merge "opengl translator: add native config id to EglConfig"
...
* commit 'dcbb51924f152c4e4502cd7f1326aeafde3076ed':
opengl translator: add native config id to EglConfig
2011-07-08 10:43:42 -07:00
David Turner
91ed228d78
am 2d233e86: Merge "opengl translator: fixed normalized vertex attribs"
...
* commit '2d233e8633fdca4c34b9f620b36851b6f2678ab8':
opengl translator: fixed normalized vertex attribs
2011-07-08 10:43:31 -07:00
David Turner
3e51ea6b5b
Merge "opengl emulator: Added gl error tracking on the guest (encoder)"
2011-07-08 09:54:21 -07:00
David Turner
b6d01e328d
Merge "emulator opengl: fixing clean windows build"
2011-07-08 09:52:48 -07:00
David Turner
b798156bcb
Merge "opengl renderer: added option to dump GL stream to file."
2011-07-08 09:50:57 -07:00
David Turner
829a2e5b9a
Merge "opengl translator: fixed EGL regression"
2011-07-08 09:49:40 -07:00
Yochai Shefi Simchon
14f351baf7
opengl translator: fixed EGL regression
...
prevent rederence NULL surface objects in
EglOS layer.
Change-Id: If5e8dc1a0cdf25fe9b268cce6456cc7da88b9f7f
2011-07-08 18:47:13 +02:00
David Turner
f8611d3fe6
Merge "opengl translator: Added support to ETC1 compressed textures."
2011-07-08 09:45:33 -07:00
David Turner
4b8fefdc00
Merge "Opengl translator: fix EGL Windows specific issues"
2011-07-08 09:40:57 -07:00
David Turner
dcbb51924f
Merge "opengl translator: add native config id to EglConfig"
2011-07-08 09:40:21 -07:00
David Turner
2d233e8633
Merge "opengl translator: fixed normalized vertex attribs"
2011-07-08 09:39:35 -07:00
David 'Digit' Turner
dfd5d02cec
merge intel x86 patches into gingerbread branch
2011-07-08 18:19:01 +02:00
David 'Digit' Turner
bed131848e
sdk: Copy ABI-specific kernel image to platform image directory.
...
Back-port from AOSP master tree.
This patch depends on https://review.source.android.com/24052
It is used to ensure that the proper kernel image is copied to the
platform image's kernel-qemu.
This is needed because for ARMv7 platform builds, the image is
in prebuilt/android-arm/kernel/kernel-qemu-armv7, instead of
prebuilt/android-arm/kernel/kernel-qemu
Change-Id: I1d79c2ac9711472be1832605bb27bdce7b09344c
Orig-Changed-Id: f7f6842b32
2011-07-07 23:42:44 +02:00
Stas Gurtovoy
8bebd3b48b
opengl translator: Added support to ETC1 compressed textures.
...
Copied the etc1 implementation from frameworks/base/opengl/libs/ETC1
to the translator common library, this is for keeping the translator
be independant.
Added support for ETC1 compressed textures in both GLESv1 and GLESv2
which is needed for some applications. (Cordy).
Change-Id: Ie615ed82896cb36c42fa640b83d9e93b723b3b80
2011-07-07 16:36:04 +03:00
Amit Feller
44fd37338e
Opengl translator: fix EGL Windows specific issues
...
Fixed management of DC's, use one DC for each egl config as before
but use the correct one every time and not the last one used during
createContext call.
Filter out GENERIC pixel formats which might not be supported by
accelerated hardware.
Prevent calling to ChoosePixelFormat at every create{window/pbuffer}
call, instead use the exact config specified by the caller. We
need to call at least once to wglChoosePixelFormat in order to let
the driver initialize, we do it during eglInitialize time just before
querying the native pixel formats.
Change-Id: Id00addaed9cb0369c41311d2bcd3ce8c7ea6408c
2011-07-07 16:36:04 +03:00
Amit Feller
a62aa2c009
opengl translator: add native config id to EglConfig
...
The EGL_CONFIG_ID attribute should be uniqueue for each
config, at some cases we duplicate a configuration in
order to simulate different pixel format (RGB_565) at that
case we want to keep the native config_id of the backend
OpenGL the same on both configs.
This change adds extra attribute 'native_config_id' for that
purpose.
Change-Id: I7e560a4badd01d146b9753cee603ff4707ccfd7f
2011-07-07 16:36:04 +03:00
Stas Gurtovoy
d6f18cdf80
opengl emulator: Added gl error tracking on the guest (encoder)
...
Sometimes we need to check parameter values before encoding
to prevent crashes, for example:
glDeleteBufferes(-1, ptr); - would crash
For that we need to check some gl errors on the guest.
The change adds error state to the encoder and also
adds new feature to emugen which allows to insert
parameter check code into the attribute file.
Added such parameter check code in the appropiate
gl functions in gl.attrib and gl2.attrib
Change-Id: I7f317df52ac8fbd96979100a1031cf023a0b49d3
2011-07-07 16:35:16 +03:00
Amit Feller
dd3849c9ed
emulator opengl: fixing clean windows build
...
Fixes windows build found after clean build.
the emugen tool does not built on windows. For
windows build we need to use the build host executable.
(that works for mingw builds since it uses the linux exeutable).
Change-Id: I6a0cc6936d4b9f11f074695066b800e12156fd83
2011-07-07 16:32:11 +03:00
Guy Zadickario
64f8ae0369
opengl renderer: added option to dump GL stream to file.
...
This is a debugging tool which enables to dump the guest
command stream to a file which can be later be examined
and "played" using a seperate tool.
Change-Id: I3fec19c1a651f0ed4394c33a0c0cd9ba54384355
2011-07-07 16:32:04 +03:00
David Turner
2dc8781282
am ad6c67b1: am f20da889: am ee856671: Merge "opengl Translator: adding type EGLNativeSurfaceType"
...
* commit 'ad6c67b1f59a98a26d1f35de5e65723911df4e07':
opengl Translator: adding type EGLNativeSurfaceType
2011-07-06 07:53:05 -07:00
David Turner
42557f3ff8
am e83a9636: am 737facef: am eec12a62: Merge "EGL translator: fixes shared context on windows"
...
* commit 'e83a96362c54e2259f1175a2a9e258529f03fefc':
EGL translator: fixes shared context on windows
2011-07-06 07:53:03 -07:00
David Turner
b069486748
am 276023ed: am 5db1600b: am 82217072: Merge "OpenGL renderer: handling subwindow messages"
...
* commit '276023edf014e935607b23096b0807274ae8ccd9':
OpenGL renderer: handling subwindow messages
2011-07-06 07:53:01 -07:00
David Turner
0bc344b139
am 87a02417: am 0f3a5206: am 95d6192b: Merge "fixing bug of shadowing a variable"
...
* commit '87a02417f65436d1d0e9bf1b5f70f7f9af3d4e7c':
fixing bug of shadowing a variable
2011-07-06 07:52:59 -07:00
David Turner
b9c0514704
am 7a7f741c: am 661e62d1: am 0f1ceaf2: Merge "opengl renderer: Enable and fix renderer Mac support"
...
* commit '7a7f741c358a449ca0e69f7382162f5727422e63':
opengl renderer: Enable and fix renderer Mac support
2011-07-06 07:52:57 -07:00
David Turner
f86c639e7b
am e3a1d009: am 3aca01d3: am 2683b10b: Merge "opengl translator: Mac fixes for unbind context"
...
* commit 'e3a1d0097572511f7c78fa632cc44643fc5ac7b0':
opengl translator: Mac fixes for unbind context
2011-07-06 07:52:54 -07:00
David Turner
3a14add6d2
am 26969262: am a8a402cf: am 5b701a29: Merge "GLES2 translator:"
...
* commit '26969262c02f7f26bd47962cff511b3b966550b4':
GLES2 translator:
2011-07-06 07:52:51 -07:00
David Turner
d0b6320065
am bd46dff8: am f1207573: am fe3de568: Merge "System egl: fix eglInitialize"
...
* commit 'bd46dff80b38a866947e36a1ca3e8b8d2dd8329d':
System egl: fix eglInitialize
2011-07-06 07:52:48 -07:00
David Turner
a4b9eec54e
am 5d7d0564: am 8dbeacf2: am e1b8d543: Merge "opengles Translator: Omit precision macros from shaders"
...
* commit '5d7d0564fc2df74a8c025bfb915793b76b22cbdf':
opengles Translator: Omit precision macros from shaders
2011-07-06 07:52:39 -07:00
David Turner
78c47bf920
am 311c1a76: am b0270924: am 5d0b85f0: Merge "opengles host: some order in host gl debugging"
...
* commit '311c1a7677d28f7eff154693e85ae31eb84e59a5':
opengles host: some order in host gl debugging
2011-07-06 07:52:31 -07:00
David Turner
4903cab685
am 647dc897: am 47de335b: am b5196422: Merge "opengles emulator: Init eglError to EGL_SUCCESS"
...
* commit '647dc897dbee9568c1d9d116f4196227369fd3d6':
opengles emulator: Init eglError to EGL_SUCCESS
2011-07-06 07:52:27 -07:00
David Turner
a5d3a613eb
am 8635056f: am 1bc9dace: am 1c06aa5a: Merge "egl translator"
...
* commit '8635056f5f5a0beb12539b9ee6256b5c0ae868cb':
egl translator
2011-07-06 07:52:23 -07:00
David Turner
fda51946bd
am f0710bd8: am bd7e4051: am 9e144ad8: Merge "add gles includes to the translator"
...
* commit 'f0710bd83a1c2e1731abb1e2b1a9d70e8777ba5c':
add gles includes to the translator
2011-07-06 07:52:18 -07:00
David Turner
577387e174
am 62ca4b99: am 1405ca10: am 902b2ea3: Merge "Translator GLES2: fix glGetShaderSource"
...
* commit '62ca4b99f313476785ab40ffe5bc6d46b922069f':
Translator GLES2: fix glGetShaderSource
2011-07-06 07:52:14 -07:00
David Turner
d8019b8298
am 4f252663: am 45d6858d: am 6a2aa7d7: Merge "Make sure RGB_565 config is available to emulator"
...
* commit '4f25266334eea20313741877fa2f1d9aff716239':
Make sure RGB_565 config is available to emulator
2011-07-06 07:51:59 -07:00
David Turner
ac9ae7c133
am 68c6ca02: am cb9a648f: am 6930d610: Merge "opengles renderer: added CHECK_GL_ERROR defie for gl debugging"
...
* commit '68c6ca02fa3b37fc14d84b7ac300dd24d48b66b2':
opengles renderer: added CHECK_GL_ERROR defie for gl debugging
2011-07-06 07:51:44 -07:00