Commit Graph

6716 Commits

Author SHA1 Message Date
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
ad6c67b1f5 am f20da889: am ee856671: Merge "opengl Translator: adding type EGLNativeSurfaceType"
* commit 'f20da8890882ee2f313521b07b42f8de1bcebd20':
  opengl Translator: adding type EGLNativeSurfaceType
2011-07-06 07:46:36 -07:00
David Turner
e83a96362c am 737facef: am eec12a62: Merge "EGL translator: fixes shared context on windows"
* commit '737facef2204df476f2d27023d26119479d0a066':
  EGL translator: fixes shared context on windows
2011-07-06 07:46:34 -07:00
David Turner
276023edf0 am 5db1600b: am 82217072: Merge "OpenGL renderer: handling subwindow messages"
* commit '5db1600b1a2fa07870d6bdd2f5c1833cc0a26610':
  OpenGL renderer: handling subwindow messages
2011-07-06 07:46:32 -07:00
David Turner
87a02417f6 am 0f3a5206: am 95d6192b: Merge "fixing bug of shadowing a variable"
* commit '0f3a520637421830287bb5b41f101e5f456dc4f8':
  fixing bug of shadowing a variable
2011-07-06 07:46:29 -07:00
David Turner
7a7f741c35 am 661e62d1: am 0f1ceaf2: Merge "opengl renderer: Enable and fix renderer Mac support"
* commit '661e62d159809d484e17d7777a270f9e5908b2cc':
  opengl renderer: Enable and fix renderer Mac support
2011-07-06 07:46:27 -07:00
David Turner
e3a1d00975 am 3aca01d3: am 2683b10b: Merge "opengl translator: Mac fixes for unbind context"
* commit '3aca01d3b03bdb2e312ff302d04eb36034f09384':
  opengl translator: Mac fixes for unbind context
2011-07-06 07:46:24 -07:00
David Turner
26969262c0 am a8a402cf: am 5b701a29: Merge "GLES2 translator:"
* commit 'a8a402cfd74edee5efaa32547ef5ee8550b2e135':
  GLES2 translator:
2011-07-06 07:46:16 -07:00
David Turner
bd46dff80b am f1207573: am fe3de568: Merge "System egl: fix eglInitialize"
* commit 'f1207573cec993937bbecbb869eb559209d6c0df':
  System egl: fix eglInitialize
2011-07-06 07:46:12 -07:00
David Turner
5d7d0564fc am 8dbeacf2: am e1b8d543: Merge "opengles Translator: Omit precision macros from shaders"
* commit '8dbeacf27d691509f103212e32d90301a0c61fda':
  opengles Translator: Omit precision macros from shaders
2011-07-06 07:46:09 -07:00
David Turner
311c1a7677 am b0270924: am 5d0b85f0: Merge "opengles host: some order in host gl debugging"
* commit 'b027092440227477278248ced65f05ecfe8df456':
  opengles host: some order in host gl debugging
2011-07-06 07:46:05 -07:00
David Turner
647dc897db am 47de335b: am b5196422: Merge "opengles emulator: Init eglError to EGL_SUCCESS"
* commit '47de335bd60310be3cb2f936a5547dc060918e99':
  opengles emulator: Init eglError to EGL_SUCCESS
2011-07-06 07:46:01 -07:00
David Turner
8635056f5f am 1bc9dace: am 1c06aa5a: Merge "egl translator"
* commit '1bc9dace079857ef3be16658c0c11bf398fcd67d':
  egl translator
2011-07-06 07:45:57 -07:00
David Turner
f0710bd83a am bd7e4051: am 9e144ad8: Merge "add gles includes to the translator"
* commit 'bd7e405132467aed1aea4aeb507235aa3e01acc8':
  add gles includes to the translator
2011-07-06 07:45:53 -07:00
David Turner
62ca4b99f3 am 1405ca10: am 902b2ea3: Merge "Translator GLES2: fix glGetShaderSource"
* commit '1405ca10c24dce2b5ab6cfe8f4462b91eed4a957':
  Translator GLES2: fix glGetShaderSource
2011-07-06 07:45:48 -07:00
David Turner
4f25266334 am 45d6858d: am 6a2aa7d7: Merge "Make sure RGB_565 config is available to emulator"
* commit '45d6858de85d13e2c5dd5722af8f0699819e9c4b':
  Make sure RGB_565 config is available to emulator
2011-07-06 07:45:43 -07:00
David Turner
68c6ca02fa am cb9a648f: am 6930d610: Merge "opengles renderer: added CHECK_GL_ERROR defie for gl debugging"
* commit 'cb9a648fab74514b84acc53081cec128b395ce9d':
  opengles renderer: added CHECK_GL_ERROR defie for gl debugging
2011-07-06 07:45:38 -07:00
David Turner
0cf74d8fdd am e8a57a4c: am 20144054: Merge "opengles Translator: sort conformant configs first"
* commit 'e8a57a4c8c85364e984af85cf76623664bbc0826':
  opengles Translator: sort conformant configs first
2011-07-06 07:45:33 -07:00
David Turner
49cd6f14d5 am 48d6b7d4: am f5c108a8: Merge "opengl renderer: create rendering subwindow"
* commit '48d6b7d4a6e884c4a40138e45055d4f9454ae761':
  opengl renderer: create rendering subwindow
2011-07-06 07:45:27 -07:00
David Turner
66959dc1b6 am 38c1e495: am deebe1a6: Merge "opengl renderer: windows runtime fix"
* commit '38c1e49559346f22f1e0a991bcd22da43da8cfa4':
  opengl renderer: windows runtime fix
2011-07-06 07:45:21 -07:00
David Turner
6010a1ef59 am 50e2a815: am 76e58151: Merge "opengl translator: EGL Windows bug fix"
* commit '50e2a8157c9a44d2ac4c8e25d5212b12eba21a85':
  opengl translator: EGL Windows bug fix
2011-07-06 07:45:15 -07:00
David Turner
e28cee4db8 am 24de4dee: am 2dc55605: Merge "opengl translator: fixing 2 Windows EGL issues:"
* commit '24de4dee2cdf8791f792693ba9b8b294c34ac815':
  opengl translator: fixing 2 Windows EGL issues:
2011-07-06 07:45:09 -07:00
David Turner
d23b43e463 am 07c26fbf: am 2a223529: Merge "1.1 Translator: fix conversion of compressed textures"
* commit '07c26fbfa7f70ec37418352a48530cfeaf576d16':
  1.1 Translator: fix conversion of compressed textures
2011-07-06 07:44:58 -07:00
David Turner
2d301233f3 am 78d910ac: am 76580a43: Merge "1.1 Translator: fix drawing of GL_POINT_SIZE_ARRAY"
* commit '78d910ac22d2f2f226936a7b589fc7708a54bb48':
  1.1 Translator: fix drawing of GL_POINT_SIZE_ARRAY
2011-07-06 07:44:51 -07:00
David Turner
11cf629613 am 435437b2: am 4ca8cd85: Merge "1.1 Translator: fix bug in glDeleteTexture"
* commit '435437b223b5b1c307ee0b283685c07cd796031f':
  1.1 Translator: fix bug in glDeleteTexture
2011-07-06 07:44:44 -07:00
David Turner
784d309772 am 917d38b6: am 450b32be: Merge "1.1 Translaotr: handle glGet(POINT_SIZE_ARRAY)"
* commit '917d38b63ee867874b2da4629fd5fcb336daf0d4':
  1.1 Translaotr: handle glGet(POINT_SIZE_ARRAY)
2011-07-06 07:44:37 -07:00
David Turner
24c4c34b9b am 033e0b04: am 1fb2e928: Merge "1.1 Translator conformance: fix texture issues"
* commit '033e0b04c8ada4cb485b7e336f8fe5ad2202a71a':
  1.1 Translator conformance: fix texture issues
2011-07-06 07:44:30 -07:00
David Turner
80304210f4 am e7a629c9: am a48c6f24: Merge "opengl translator: fixed glGetString(GL_EXTENSIONS) for GLESv2"
* commit 'e7a629c9fc55ddb085d213a34b8925d1b2b82205':
  opengl translator: fixed glGetString(GL_EXTENSIONS) for GLESv2
2011-07-06 07:44:22 -07:00