David Turner
02e363eeb2
am 8324d38c: am a0bd0cbe: Merge "opengles emulator: Fixed Windows renderer termination"
...
* commit '8324d38c281d97dce68204d1c8ff2a5a3849a09b':
opengles emulator: Fixed Windows renderer termination
2011-08-10 01:21:42 -07:00
David Turner
bf65b7feb8
am 278d1058: am 6bb95113: Merge "opengles emulator: GLES memory leaks"
...
* commit '278d10586dfb14be87e1bb8b4def77725bcac45f':
opengles emulator: GLES memory leaks
2011-08-10 01:21:40 -07:00
David Turner
ec3cac82e2
am 7ed0fc9a: am 5bc21905: Merge "opengles emulator: fix glGetUnifrom"
...
* commit '7ed0fc9ab39f34b206ca21cc43a919c356d56ea1':
opengles emulator: fix glGetUnifrom
2011-08-10 01:21:37 -07:00
David Turner
c9cd1777ca
am 833d1a4e: am 6c812a6e: Merge "opengles emulator: libEGL fixes for ATI driver on windows."
...
* commit '833d1a4e336167865db43fe155e29f606d2a8757':
opengles emulator: libEGL fixes for ATI driver on windows.
2011-08-10 01:21:35 -07:00
David Turner
bc1b310fb5
am 69ae2a4a: am b49454ac: Merge "opengles emulator: limit X11 configs some more"
...
* commit '69ae2a4ae2924257dc4e682641b0d409ad6c1caf':
opengles emulator: limit X11 configs some more
2011-08-10 01:21:32 -07:00
David Turner
d0d6657a50
am a9605f55: am 385ae28d: Merge "opengles emulator: fixing pointer size bug."
...
* commit 'a9605f557651cf6d9642e2345330bfc8ccc164ee':
opengles emulator: fixing pointer size bug.
2011-08-10 01:21:29 -07:00
David Turner
1a50f15fe9
am ae707198: am 275e99fd: Merge "opengles emulator: remove compilation warning."
...
* commit 'ae70719852919ca3a7ed614481380e2ad14d97a3':
opengles emulator: remove compilation warning.
2011-08-10 01:21:25 -07:00
David Turner
7cd5d7bfdc
am 3d0d9865: am 26892efa: Merge "opengles emulator: fixed renderer termination flow"
...
* commit '3d0d98658ec74afc2c2a542fc3b051c9372502db':
opengles emulator: fixed renderer termination flow
2011-08-10 01:21:20 -07:00
David Turner
dc8f3c3794
am 5a034089: Merge "opengles emulator: fix a bug in RangeList"
...
* commit '5a034089968b544fd36f68d6f20741f0bef78ed4':
opengles emulator: fix a bug in RangeList
2011-08-10 01:18:19 -07:00
David Turner
8324d38c28
am a0bd0cbe: Merge "opengles emulator: Fixed Windows renderer termination"
...
* commit 'a0bd0cbed44d4fbe4172ba113c811dc971ac23fc':
opengles emulator: Fixed Windows renderer termination
2011-08-10 01:18:17 -07:00
David Turner
278d10586d
am 6bb95113: Merge "opengles emulator: GLES memory leaks"
...
* commit '6bb9511365bb64772e35b8b7bfbb0fdbabb0cec4':
opengles emulator: GLES memory leaks
2011-08-10 01:18:15 -07:00
David Turner
7ed0fc9ab3
am 5bc21905: Merge "opengles emulator: fix glGetUnifrom"
...
* commit '5bc21905be68131bf911ad62ee1fa1d8dc759487':
opengles emulator: fix glGetUnifrom
2011-08-10 01:18:13 -07:00
David Turner
833d1a4e33
am 6c812a6e: Merge "opengles emulator: libEGL fixes for ATI driver on windows."
...
* commit '6c812a6e8980a7479a08f9f187e05b17e67a5119':
opengles emulator: libEGL fixes for ATI driver on windows.
2011-08-10 01:18:11 -07:00
David Turner
69ae2a4ae2
am b49454ac: Merge "opengles emulator: limit X11 configs some more"
...
* commit 'b49454ac3958a3497e1a715cc3471805f14ab84a':
opengles emulator: limit X11 configs some more
2011-08-10 01:18:08 -07:00
David Turner
a9605f5576
am 385ae28d: Merge "opengles emulator: fixing pointer size bug."
...
* commit '385ae28d2c9a96ac89c6ebcaa5fe4b021029dd9f':
opengles emulator: fixing pointer size bug.
2011-08-10 01:18:05 -07:00
David Turner
ae70719852
am 275e99fd: Merge "opengles emulator: remove compilation warning."
...
* commit '275e99fdb8cb7b5db7a0d2f4ce9160e8dd330334':
opengles emulator: remove compilation warning.
2011-08-10 01:18:02 -07:00
David Turner
3d0d98658e
am 26892efa: Merge "opengles emulator: fixed renderer termination flow"
...
* commit '26892efaf84f0f3a532307f10d723a2eeca1c208':
opengles emulator: fixed renderer termination flow
2011-08-10 01:17:59 -07:00
Guy Zadickario
62c6532937
opengles emulator: handle window surface resize
...
resize the internal pbuffer we use for a WindowSurface
when a color buffer of different size is attached to the "window".
That fixes "Glyder 2 by glu" application view while loading.
Change-Id: I8f235f428e93077d57bd200f10b45b9a92f1a9d3
2011-08-10 10:13:38 +02:00
Stas Gurtovoy
af8fb702d5
opengles emulator: fix bug in glTranslatex
...
We need to convert the fixed values to floats before we call glTranslatef
Change-Id: If164a8f67b32177e7229f4c5c2f6eff99680d685
2011-08-10 10:13:38 +02:00
Stas Gurtovoy
42b6b44939
opengles emulator: fix printf's
...
On guest we use LOGD and on host fprintf to stderr.
Change-Id: I1f419ef3e5af5358f0dc8368d246254393acb674
2011-08-10 10:13:38 +02:00
David Turner
5a03408996
Merge "opengles emulator: fix a bug in RangeList"
2011-08-10 01:12:13 -07:00
David Turner
a0bd0cbed4
Merge "opengles emulator: Fixed Windows renderer termination"
2011-08-10 01:12:04 -07:00
Stas Gurtovoy
0957f4acda
opengles emulator: fix a bug in RangeList
...
When an intersection is found, we want to add it to the output list, if splitting is needed and if not.
Change-Id: I9c9827b1c0ecd434925ff5698dd42bc1025dbedf
2011-08-10 10:11:13 +02:00
Guy Zadickario
ded8587d2d
opengles emulator: Fixed Windows renderer termination
...
Make the event pump loop in the renderer process we do on Windows
exit when the Framebuffer's subwindow is destroyed.
Fixed TcpStream to close the socket using 'closesocket' on windows,
otherwise the other end of the socket does not sense that the socket
is closed.
+ Use WS_DISABLED to ensure that our GL subwindow doesn't receive
any input events.
Change-Id: Icb477b3e1d7993a8880acb5e01bc5da29309ae50
2011-08-10 10:11:13 +02:00
David Turner
6bb9511365
Merge "opengles emulator: GLES memory leaks"
2011-08-10 01:09:48 -07:00
David Turner
5bc21905be
Merge "opengles emulator: fix glGetUnifrom"
2011-08-10 01:09:37 -07:00
David Turner
6c812a6e89
Merge "opengles emulator: libEGL fixes for ATI driver on windows."
2011-08-10 01:09:26 -07:00
David Turner
b49454ac39
Merge "opengles emulator: limit X11 configs some more"
2011-08-10 01:09:17 -07:00
David Turner
385ae28d2c
Merge "opengles emulator: fixing pointer size bug."
2011-08-10 01:09:07 -07:00
Liran
5018365268
opengles emulator: GLES memory leaks
...
fix some memory leaks detected in valgrind
Change-Id: I48d91223c520c9c10b797a89a679eed7a950a3e6
2011-08-10 10:08:05 +02:00
Liran
8ee217f9cc
opengles emulator: fix glGetUnifrom
...
added state tracking for uniforms in program objects
for each active uniform in index i we will save its starting location
,size and type, so when calling glGetUniform on its location,
we can tell how many bytes we should read from the stream according to
the uniform's type
add some type and size definitions to functions
that calculate size from enum
some other fixes to the codec
Change-Id: I4ecdf41e752454a908d131e76bab113a616f2bc8
2011-08-10 10:08:05 +02:00
Guy Zadickario
d2fae7055e
opengles emulator: libEGL fixes for ATI driver on windows.
...
Removed calling into opengl/wgl from the initialiation code
of libEGL (was made during creation for the EglGlobalInfo object
during global variable initialization) !
That causes issues on ATI driver on windows since we might call into
the driver before it gets initialized. Instead we initialie the EglGlobalInfo
during the first call into libEGL.
Also ATI's version of wglChoosePixelFormatARB does not accept
NULL in the attribute list arguments.
Change-Id: I508263dc0440561ee1cd1311ed5ce37cee4d407e
2011-08-10 10:08:05 +02:00
Yochai Shefi Simchon
a22010c0f4
opengles emulator: limit X11 configs some more
...
On Linux/Intel, some configurations are returned which make no sense.
Also, no use for single buffer config, and we don't support pixmap
visuals.
Change-Id: I11f37c8ba612ee10dd654141e6f167add1675dce
2011-08-10 10:08:05 +02:00
Amit Feller
cd359e5718
opengles emulator: fixing pointer size bug.
...
Fix for a bug in pointer size of shaders param in
glGetAttachedShaders function
Change-Id: I647032b2bfcc9d341214accd72700adce07e6e4c
2011-08-10 10:08:05 +02:00
David Turner
275e99fdb8
Merge "opengles emulator: remove compilation warning."
2011-08-10 01:04:05 -07:00
David Turner
26892efaf8
Merge "opengles emulator: fixed renderer termination flow"
2011-08-10 01:03:50 -07:00
Guy Zadickario
e2dfd84f1f
opengles emulator: remove compilation warning.
...
There was very few compilation warning on Windows and Linux.
This change just fixes those warnings.
Change-Id: I0428aa3dd33b2add40aa6cd12da76910950533b8
2011-08-10 10:03:07 +02:00
Guy Zadickario
467e5fb162
opengles emulator: fixed renderer termination flow
...
Handling clean exit of the renderer when stopOpenGLRenderer
is called. This is done by openning a connection to the renderer
and flag that it should exit. Added 'clientFlags' field which must
be send after every connection is made to the renderer for this purpose.
The server will wait for running rendering threads to exit and then will
close all EGL/GL resources and will exit. The stopOpenGLRenderer will
return only when the renderer has exited.
Change-Id: I8272b8ea59d5fc78453bb7bd2d25908068869fa7
2011-08-10 10:03:07 +02:00
Chris Craik
1ac352eb59
Merge "updated Animation Plugin for NativeWindow interface"
2011-08-09 17:23:32 -07:00
Chris Craik
aceb2e3bda
updated Animation Plugin for NativeWindow interface
...
bug:5114637
Uses new ANativeWindow plugin API, supports either software rendering or GL
rendering via flag in RenderingThread.h
Note: Currently crashes on close
Change-Id: Ia7338a6c38c0ca9db02c19814d99b29970cc7b8e
2011-08-09 16:34:30 -07:00
Daniel Lehmann
a6826891f9
Merge "Start service intent when contact is being displayed"
2011-08-09 14:49:58 -07:00
Daniel Lehmann
af2e1dccbc
Start service intent when contact is being displayed
...
Bug:5138185
Change-Id: I32e239e4af564bb876d1eb021f31b2fd6287feaf
2011-08-09 13:42:08 -07:00
David 'Digit' Turner
2a3bcf93a0
am 44d6a0fa: am 4e9cf45c: am 891ad0e8: Merge "emulator: opengl: Make render_api.h C-compatible"
...
* commit '44d6a0fa6f828f2196dd5a39ca80eff9c2db0922':
emulator: opengl: Make render_api.h C-compatible
2011-08-09 13:37:28 -07:00
David Turner
5647257e6e
am 3374f8ad: am 254a7090: am 0f97bab8: Merge changes Ibee74a22,Ifef4dc98
...
* commit '3374f8ad2cd4fcff7ab40bd80672b8b380242c84':
NDK: x86 header file has incorrect definition for ptrdiff_t
Fix size_t definition in x86 NDK header file
2011-08-09 13:37:17 -07:00
David Turner
edc55c16c7
am 611b3af6: am 385d396f: Merge "opengles emulator: fixing GL_HALF_FLOAT_OES bug"
...
* commit '611b3af642d6c1a873cf0f285a67233c75f437d2':
opengles emulator: fixing GL_HALF_FLOAT_OES bug
2011-08-09 10:07:02 -07:00
David Turner
8320204067
am 89c5482b: am 283df9c4: Merge "opengles emulator: forced GLSL version to be 120."
...
* commit '89c5482b0f673d40778ba9a4f424135255d243f7':
opengles emulator: forced GLSL version to be 120.
2011-08-09 10:07:00 -07:00
David Turner
b5e8d4c520
am 81973086: am c7fb2970: Merge "opengles emulator: GLES2 codec - glFinishRoundTrip"
...
* commit '81973086cf93e84fdbac204a4d9dd06cbe72798c':
opengles emulator: GLES2 codec - glFinishRoundTrip
2011-08-09 10:06:58 -07:00
David Turner
eac7fbd6b3
am e6954209: am fc15a710: Merge "opengles emulator: test: added shader flags to triangleV2 test"
...
* commit 'e69542091eec03625b6f63abdf6e6db7c36ad1ca':
opengles emulator: test: added shader flags to triangleV2 test
2011-08-09 10:06:55 -07:00
David Turner
f1482edd61
am 96221311: am 8b5652be: Merge "opengles emulator: support glEGLImageTargetRenderbufferStorageOES"
...
* commit '96221311b4eb6a139d856c03d360f1abf51a2d33':
opengles emulator: support glEGLImageTargetRenderbufferStorageOES
2011-08-09 10:06:53 -07:00
David Turner
8fbd35c5b1
am d76a7100: am 0660de71: Merge "emulator opengl: fixed encoding of glGenRendebuffer"
...
* commit 'd76a71002068556c6be39b3b39ca1dc26714f467':
emulator opengl: fixed encoding of glGenRendebuffer
2011-08-09 10:06:50 -07:00