OSDN Git Service
Lingfeng Yang [Fri, 8 Apr 2016 19:46:42 +0000 (12:46 -0700)]
Validation for glGetVertexAttribPointerv
dEQP-GLES2.functional.negative_api.state.get_vertex_attrib_pointerv
Fail -> Pass
Based on Intel's OpenGL validation for goldfish opengl,
introduced in nyc-dev
Change-Id: If67192368935f21de20c0f531036db027b867b37
Lingfeng Yang [Fri, 8 Apr 2016 19:38:35 +0000 (12:38 -0700)]
Validation for glGetVertexAttrib i/f v
dEQP-GLES2.functional.negative_api.state.get_vertex_attrib i/f v:
Fail -> Pass
Based on Intel's OpenGL validation for goldfish opengl,
introduced in nyc-dev
Change-Id: I9b539024e88a5afb7c78f8543e7c9ffff4f837e0
Lingfeng Yang [Fri, 8 Apr 2016 19:21:13 +0000 (12:21 -0700)]
Validation for glGetUniform i/f v
dEQP-GLES2.functional.negative_api.state.get_string:
Fail -> Pass
Based on Intel's OpenGL validation for goldfish opengl,
introduced in nyc-dev
Change-Id: I9c3b820a5fa6b3b3e4b5e8590cca590cf9ef86d2
Lingfeng Yang [Fri, 8 Apr 2016 19:13:45 +0000 (12:13 -0700)]
Validation for glGetString
dEQP-GLES2.functional.negative_api.state.get_string:
Fail -> Pass
Based on Intel's OpenGL validation for goldfish opengl,
introduced in nyc-dev
Change-Id: I74c480cf38a01e9c13f35ee3f58168415f7b6ab3
Lingfeng Yang [Mon, 4 Apr 2016 16:26:19 +0000 (09:26 -0700)]
More gracefulness on dequeueBuffer_* fail on flip
BUG: https://code.google.com/p/android/issues/detail?id=204176
Features like Instant Run will do things like abandon
the current set of buffers SurfaceFlinger gave to the UI,
which makes functions like eglSwapBuffers fail,
since they are dequeueing a buffer that is considered 'invalid'
(as it is before the instant run).
If we set the EGL error to EGL_BAD_ALLOC, this interacts badly
with libs/hwui/renderthread/EGLManager.cpp, causing
a LOG_ALWAYS_FATAL(...) to be called, which aborts the current process.
This CL sets the EGL error to EGL_BAD_SURFACE instead,
which allows hwui to recover.
Change-Id: I7cb5bf3b3834b3696981746f2319804c1adf6a25
Yahan Zhou [Mon, 21 Mar 2016 23:17:53 +0000 (23:17 +0000)]
Merge "Fix a typo in GLES encoder headers" into mnc-emu-dev
Yahan Zhou [Mon, 21 Mar 2016 23:11:38 +0000 (16:11 -0700)]
Fix a typo in GLES encoder headers
Unimportant but let's fix it.
Change-Id: I360ba0dc0b676238adaeb5d4360c10a9ec8c2371
Yahan Zhou [Fri, 18 Mar 2016 21:25:44 +0000 (21:25 +0000)]
Merge "Exit when QemuPipe is corrupted by GL" into mnc-emu-dev
Yahan Zhou [Wed, 16 Mar 2016 19:41:08 +0000 (12:41 -0700)]
Checksum for GLES messages from host to guest
Add checksum for GLES messages from host to guest. This patch contains
generated code (gl_enc.cpp, gl2_enc.cpp, renderControl_enc.cpp) and
shared code with the host (ChecksumCalculator.cpp,
ChecksumCalculator.h).
Change-Id: I577a34cae5208d3f11a165f861a69fa0971cf864
Yahan Zhou [Thu, 10 Mar 2016 19:45:02 +0000 (11:45 -0800)]
Checksum for GL pipe communication
This is the guest side implementation for cl go/oag/c/207292.
It initializes checksum whenever a renderControl is created. Each
HostConnection owns a checksum structure.
The list contains mostly auto-generated code by emugen.
Change-Id: I5f7bb9ec8a0cea82f3687f8a15839081651fd841
Yahan Zhou [Tue, 8 Mar 2016 22:02:22 +0000 (14:02 -0800)]
Exit when QemuPipe is corrupted by GL
Previously when QemuPipe is corrupted, it prints an error message, and
the application will continue to use it, which leads to random behaviour
in GL on the host.
This patch crashes the APP and pops up the crash dialog when the pipe is
(going to be) corrupted. It would happen if the user asks GL to write /
read a NULL pointer (i.e. passing NULL to glGenBuffers). It might also
happen for other unknown reasons.
Change-Id: I303772029bb72a845fa0d4c79b0d38dba1fca2c7
Lingfeng Yang [Wed, 2 Mar 2016 05:27:49 +0000 (21:27 -0800)]
Cache glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, int*).
BUG: https://buganizer.corp.google.com/issues/
27418143
If we don't, the chatter over the pipe will
kill framerate.
I believe this is OK for the emulator,
as the parameter is dependent on only the
GPU hardware.
Change-Id: I9bd74de6317316902bddf54b915ef509625cee52
Yahan Zhou [Fri, 19 Feb 2016 21:59:34 +0000 (13:59 -0800)]
GL encoder null pointer check before write
Previously when encoding some functions, if the user gives us a null
pointer, the encoder will write a header with some data length while not
actually writing any data. This patch fix it by writing 0 into the data
length field for all those functions.
The changed functions include:
glBufferSubData
glCompressedSubTexImage2D
glTexSubImage3DOES
glCompressedTexImage3DOES
glCompressedTexSubImage3DOES
Other functions do not directly write user's pointer, so they don't need
to be updated.
Since this is auto-generated code, there would be another patch in
emu-master-dev to update the code generator.
Change-Id: I05fca078dfcf01e20fa757f1050820b21ca080b7
Yahan Zhou [Thu, 11 Feb 2016 00:10:46 +0000 (16:10 -0800)]
Fix crash when forgot to call glVertexAttribPointer
Calling glDraw* will crash the emulatorif one forgot to call
glVertexAttribPointer first. This patch fixes it.
There are two situations: (1) user forgot to enable any vertex
attribute arrays, or (2) user enabled a vertex attribute array but
forgot to bind any data to it. This patch fix both situations. After the
patch, in (1) user will get an error message, in (2) user will get an
error message as well as GL error code GL_INVALID_OPERATION. These are
similar behaviors as running it in swift shader or on a real device.
(Running it on a real device with (1) will give nothing and with (2)
will crash the app.)
Change-Id: Id045c0c81a489a7c6ee4b6efc91f5ab148432f35
Yahan Zhou [Wed, 10 Feb 2016 01:42:33 +0000 (17:42 -0800)]
Support glDrawElements with GL_UNSIGNED_INT in the encoder
Currently glDrawElements with type GL_UNSIGNED_INT is not supported by
our encoder and decoder. The emulator will crash if someone uses it.
This patch add the support in the encoder side.
The related issue is here: b.android.com/200338
The patch on the decoder:
https://android-review.googlesource.com/#/c/202101
Change-Id: I9a6cde9983d34f39cfcc8c66a7ccf021dd5963eb
Yahan Zhou [Wed, 3 Feb 2016 22:03:43 +0000 (22:03 +0000)]
Merge "Fix the GLES version number in the emulator encoder" into mnc-emu-dev
Yahan Zhou [Fri, 29 Jan 2016 20:12:57 +0000 (12:12 -0800)]
Fix the GLES version number in the emulator encoder
The native code, emulator encoder and emulator decoder each keeps its
own GLES version number. Previously they are inconsistent when
EGL_CONTEXT_CLIENT_VERSION=3. In this patch, because our emulator
currently doesn't support GLES3, we return EGL_NO_CONTEXT with an
error code EGL_BAD_CONFIG when the user tries to use GLES 3.
In future when we impelment GLES3, please remmeber to change the
version number here, as well as those in native code and the emulator
decoder.
Release Note:
Report error code when setting up GLES3
Change-Id: I1d1083310d28bb57f42625daaed710711495a3ed
Lingfeng Yang [Sat, 30 Jan 2016 00:02:25 +0000 (16:02 -0800)]
Clean up minor opengl errors/warnings.
There are always disconcerting messages printed to logcat
whenever developing apps on the emulator.
glUtilsParamSize and other functions
often fail with "unknow param 0x00..."
These are missing GLenums and types that for
some reason are not in glUtils.cpp
in OpenglCodecCommon.
There also has been a long-standing warning
that eglSurfaceAttrib is not implemented.
It seems we don't need to implement that to get things done,
so we will give a no-op implementation that suppresses
the warning.
Change-Id: I1b672cedf1672fc09cfe6a832f908e1496cc7a46
Nicolas Capens [Thu, 10 Dec 2015 22:45:35 +0000 (17:45 -0500)]
Fix pedantic cast error (EGL).
Change-Id: I6afa419f6e2519c3293452f273a0cebac4c00b6f
Nicolas Capens [Thu, 10 Dec 2015 20:10:25 +0000 (15:10 -0500)]
Fix pedantic cast error (GLES1).
Change-Id: I74c2756cbf9190a1e2b9c30546bf60233e4ed543
Nicolas Capens [Thu, 10 Dec 2015 18:47:02 +0000 (13:47 -0500)]
Fix pedantic cast error.
Change-Id: I1d5bfbc17f4ed36774b8713af14d1c7a7177d3e5
Nicolas Capens [Fri, 20 Nov 2015 20:10:09 +0000 (15:10 -0500)]
Advertise EGL_KHR_gl_texture_2d_image
EGL_KHR_gl_texture_2d_image must be supported unconditionally.
Bug
24517776
Change-Id: Ib1e4fc549ceee2291b2313dc46ae7c9c1159e4c9
Nicolas Capens [Mon, 23 Nov 2015 22:13:00 +0000 (17:13 -0500)]
Create EGL image targets from client objects.
Bug
24517776
Change-Id: I90c724e8c882c8686391d5cfb7a6e1977edbaf21
Nicolas Capens [Mon, 23 Nov 2015 22:03:18 +0000 (17:03 -0500)]
Create client object EGL images.
Call the host-side eglCreateImageKHR() implementation to create EGL
images from client objects (e.g. textures).
Bug
24517776
Change-Id: I9bea7cfad700d601d3b747576f903ece7789e7d9
Nicolas Capens [Fri, 20 Nov 2015 16:16:34 +0000 (11:16 -0500)]
Discern between EGL image types.
EGL images can be created from an Android native buffer or a GL client
texture.
Bug
24517776
Change-Id: I3b77ec44ae9e630d7bb4aec87e2ec3957a2f3ab2
Nicolas Capens [Tue, 3 Nov 2015 17:24:12 +0000 (12:24 -0500)]
Use the encoding gralloc only when qemu.gles == 1
Bug
25443830
Change-Id: I2ccd60b4752e436117d65a2a3c7400c35bfaa3df
(cherry picked from commit
ea2243eda287d9ecd582e8c293c8abc2c06d3004)
Pascal Muetschard [Mon, 17 Aug 2015 20:09:57 +0000 (13:09 -0700)]
Implement a couple more surface attributes in eglQuerySurface.
Bug:
23036813
(cherry picked from commit
7c1d90fdcda89c2db9ae0b9af833c7d4e9eeab9c)
Change-Id: Idacdb8c3d63b7d7a2824e954c7455750008b2e9d
Pascal Muetschard [Mon, 17 Aug 2015 23:16:09 +0000 (16:16 -0700)]
Read the size of a window surface from the native buffer.
Currently the size of a window surface is incorrectly read from the native
window rather than the buffer associated with the created surface. With this
change, the surface size is initialized from the buffer and updated whenever
the buffer is swapped.
Bug:
23036813
(cherry picked from commit
3ef98877c4e06835a20e7050d03fa71e1a2d1ddb)
Change-Id: Ifdcdf7f84f74caab799ae3d1ef389eae7168ed21
Pascal Muetschard [Mon, 17 Aug 2015 19:22:07 +0000 (12:22 -0700)]
Handle pixel formats with 16bit and 32bit color channels.
When computing the OpenGL pixel format constant of an EGL surface,
return GL_RGB or GL_RGBA for EGL surfaces that have 16 or 32 bits
per color channel in addition to 8 bits.
Bug:
23036813
(cherry picked from commit
6e696c3bddbcd23dafb5fe6ba394afc4809ff049)
Change-Id: Ib560a8169e4e0c24e59d23f68137eba9926cfdb1
Pascal Muetschard [Mon, 17 Aug 2015 21:07:22 +0000 (14:07 -0700)]
Correctly set the surface type upon creation.
Fix the window and pbuffer surface creation to set the correct type
based on which function was called. Currently the type was
incorrectly set to the bitmask of all surface types supported by the
chosen config.
Bug:
23036813
(cherry picked from commit
21eaf2b62ac4daa5ba1a3b7c6fefe006b6631e41)
Change-Id: I7beaaa8cd55f44f5dc5f6e5d110132d810c06dc9
Pascal Muetschard [Fri, 14 Aug 2015 22:15:05 +0000 (15:15 -0700)]
Fixes interpretation of attribute lists in the EGL emulation library.
In a few places, EGL_NONE was incorrectly assumed to be 0. EGL_NONE is
used to indicate the end of the list. By assuming EGL_NONE is 0, the
code would fail to detect the end of the list appropriately.
Bug:
23036813
(cherry picked from commit
6801005a9e9e5741cbc73a98d7282485767d7e96)
Change-Id: I909d48a15a2cebfda93fb165e55821d7b694fa4b
Miroslav Tisma [Wed, 23 Sep 2015 10:54:56 +0000 (12:54 +0200)]
GPU: Build gralloc.ranchu.so
(cherry picked from commit
84a59f965e69afd90199668b2ba60431e7be3728)
Change-Id: Id0ee8a78830fdaa788c103d506510ba3d4ea36c2
Eino-Ville Talvala [Wed, 5 Aug 2015 22:43:30 +0000 (15:43 -0700)]
Camera/gralloc: Add basic capability handling, support DEPTH
Also fix bug with AE not correctly overriding sensor values
when ON but still INACTIVE.
- Add Y16 support to gralloc (treat exactly as RAW16)
- Add Y16 output support to camera
- Adds depth static and dynamic fields to camera:
- poseRotation
- poseTranslation
- intrinsicCalibration
- radialDistortion
- availableDepthStreamConfigurations
- availableDepthMinFrameDurations
- availableDepthStallDurations
- depthIsExclusive
Bug:
20537722
Change-Id: If64bb2a698a8a49777f848cfc6401d8fba299541
Yu Ning [Fri, 7 Aug 2015 21:30:07 +0000 (21:30 +0000)]
am
7edd1a22: (-s ours) am
4b7ce097: am
9fe34eba: am
34689229: (-s ours) am
02ef81b4: am
51af59bd: (-s ours) am
3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
7edd1a22bf31f23793b7f02e0ced9e7b7b748ed1':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 21:30:07 +0000 (21:30 +0000)]
am
e3d2c781: (-s ours) am
b3f8cad0: am
280ec983: am
b871b1a0: (-s ours) am
3f83b3fd: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
e3d2c781cc392b117fac57b77509dca893926f6e':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 21:30:07 +0000 (21:30 +0000)]
am
d2ddfd29: (-s ours) am
d88b2e76: am
ad5614a1: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
d2ddfd29876e1e58256204d72c9091558d2daaea':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 21:20:39 +0000 (21:20 +0000)]
am
4b7ce097: am
9fe34eba: am
34689229: (-s ours) am
02ef81b4: am
51af59bd: (-s ours) am
3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
4b7ce09787da9d0fe83886a9d108b5cf040f2244':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 21:20:38 +0000 (21:20 +0000)]
am
b3f8cad0: am
280ec983: am
b871b1a0: (-s ours) am
3f83b3fd: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
b3f8cad0747087e269bfe9fa9bf644a578d46f13':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 21:20:37 +0000 (21:20 +0000)]
am
d88b2e76: am
ad5614a1: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
d88b2e76f3c19a80477a7c2554760d20e8359fea':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 21:05:00 +0000 (21:05 +0000)]
am
9fe34eba: am
34689229: (-s ours) am
02ef81b4: am
51af59bd: (-s ours) am
3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
9fe34eba10fee82060545fdcbae94bbe75fcbb7d':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 21:05:00 +0000 (21:05 +0000)]
am
280ec983: am
b871b1a0: (-s ours) am
3f83b3fd: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
280ec983bf8036c82d02582e588faf92b4fbfa6a':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 21:04:59 +0000 (21:04 +0000)]
am
ad5614a1: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
ad5614a19c1307fd8e2d01c525990af47e648de5':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 19:06:37 +0000 (19:06 +0000)]
am
34689229: (-s ours) am
02ef81b4: am
51af59bd: (-s ours) am
3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
34689229db2be359644bc2c9e7246a47d5982bac':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 18:59:20 +0000 (18:59 +0000)]
am
02ef81b4: am
51af59bd: (-s ours) am
3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
02ef81b4c9e9e8db4bc4e797f879aab666fca9e6':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 18:55:01 +0000 (18:55 +0000)]
am
b871b1a0: (-s ours) am
3f83b3fd: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
b871b1a06e24cc8ce863a2ab5a8fb4a4dcc85e1d':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 18:47:49 +0000 (18:47 +0000)]
am
3f83b3fd: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
3f83b3fdc3c3b0926e4d2f56788a9becdb92200b':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 18:46:47 +0000 (18:46 +0000)]
am
51af59bd: (-s ours) am
3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
51af59bd9c6f3d52ab48cc9099b99f071bbda5eb':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 18:38:32 +0000 (18:38 +0000)]
am
3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
3840dbf546a311e7792d8ebde6202028d12f789a':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 18:34:25 +0000 (18:34 +0000)]
am
f378402b: (-s ours) am
e40e60a6: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
f378402be9f51ed17eacbbd65f786d304bcb8dda':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Fri, 7 Aug 2015 18:26:48 +0000 (18:26 +0000)]
am
e40e60a6: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
e40e60a6ad91ac2c42837d1a9cb84037cc2a6e5f':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Thu, 16 Jul 2015 06:54:04 +0000 (14:54 +0800)]
opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
When GPU emulation is enabled, the emulator sometimes freezes, with an
error message in logcat similar to the following:
QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address
Some users have reported the same issue, e.g.:
https://code.google.com/p/android/issues/detail?id=170633
The root cause is that QemuPipeStream::readFully(void *buf, size_t len)
may attempt to read beyond (buf + len), resulting in a -EFAULT return
value from the goldfish/qemu pipe driver.
Fix this bug to improve the stability of the emulator. In addition,
- Add more information to the said error message to facilitate future
debugging.
- Use "%zu" instead of "%d" for logging size_t variables.
Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992
Signed-off-by: Yu Ning <yu.ning@intel.com>
Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
Yu Ning [Thu, 16 Jul 2015 06:54:04 +0000 (14:54 +0800)]
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
When GPU emulation is enabled, the emulator sometimes freezes, with an
error message in logcat similar to the following:
QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address
Some users have reported the same issue, e.g.:
https://code.google.com/p/android/issues/detail?id=170633
The root cause is that QemuPipeStream::readFully(void *buf, size_t len)
may attempt to read beyond (buf + len), resulting in a -EFAULT return
value from the goldfish/qemu pipe driver.
Fix this bug to improve the stability of the emulator. In addition,
- Add more information to the said error message to facilitate future
debugging.
- Use "%zu" instead of "%d" for logging size_t variables.
Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992
Signed-off-by: Yu Ning <yu.ning@intel.com>
Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
Yu Ning [Thu, 16 Jul 2015 06:54:04 +0000 (14:54 +0800)]
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
When GPU emulation is enabled, the emulator sometimes freezes, with an
error message in logcat similar to the following:
QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address
Some users have reported the same issue, e.g.:
https://code.google.com/p/android/issues/detail?id=170633
The root cause is that QemuPipeStream::readFully(void *buf, size_t len)
may attempt to read beyond (buf + len), resulting in a -EFAULT return
value from the goldfish/qemu pipe driver.
Fix this bug to improve the stability of the emulator. In addition,
- Add more information to the said error message to facilitate future
debugging.
- Use "%zu" instead of "%d" for logging size_t variables.
Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992
Signed-off-by: Yu Ning <yu.ning@intel.com>
Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
Yu Ning [Thu, 16 Jul 2015 06:54:04 +0000 (14:54 +0800)]
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
When GPU emulation is enabled, the emulator sometimes freezes, with an
error message in logcat similar to the following:
QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address
Some users have reported the same issue, e.g.:
https://code.google.com/p/android/issues/detail?id=170633
The root cause is that QemuPipeStream::readFully(void *buf, size_t len)
may attempt to read beyond (buf + len), resulting in a -EFAULT return
value from the goldfish/qemu pipe driver.
Fix this bug to improve the stability of the emulator. In addition,
- Add more information to the said error message to facilitate future
debugging.
- Use "%zu" instead of "%d" for logging size_t variables.
Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992
Signed-off-by: Yu Ning <yu.ning@intel.com>
Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
Yu Ning [Thu, 16 Jul 2015 06:54:04 +0000 (14:54 +0800)]
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
When GPU emulation is enabled, the emulator sometimes freezes, with an
error message in logcat similar to the following:
QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address
Some users have reported the same issue, e.g.:
https://code.google.com/p/android/issues/detail?id=170633
The root cause is that QemuPipeStream::readFully(void *buf, size_t len)
may attempt to read beyond (buf + len), resulting in a -EFAULT return
value from the goldfish/qemu pipe driver.
Fix this bug to improve the stability of the emulator. In addition,
- Add more information to the said error message to facilitate future
debugging.
- Use "%zu" instead of "%d" for logging size_t variables.
Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992
Signed-off-by: Yu Ning <yu.ning@intel.com>
Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
David Turner [Fri, 27 Mar 2015 16:50:05 +0000 (16:50 +0000)]
am
9cf8ded9: am
2b763c9f: Merge "Checking parameters for glCreateShader in guest"
* commit '
9cf8ded9783bbd05f8c4b3454164af4b5782a262':
Checking parameters for glCreateShader in guest
David Turner [Fri, 27 Mar 2015 16:35:14 +0000 (16:35 +0000)]
am
2b763c9f: Merge "Checking parameters for glCreateShader in guest"
* commit '
2b763c9fec35bcab3689785ad808a4317772acae':
Checking parameters for glCreateShader in guest
Tina Zhang [Thu, 26 Mar 2015 06:45:29 +0000 (14:45 +0800)]
Checking parameters for glCreateShader in guest
Currently, the guest part doesn't do enough to check each API's
parameters. This may lead to conformance issues. Considering
performance and conformance on multiple platform, it's better
to add the parameter validation in guest part.
Change-Id: Ic37c9bae5fba3c7e75a2095416fea41b8d1a949a
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
Eino-Ville Talvala [Fri, 20 Feb 2015 17:43:36 +0000 (17:43 +0000)]
Merge "Replace HAL_PIXEL_FORMAT_RAW_SENSOR with RAW_16"
Eino-Ville Talvala [Fri, 20 Feb 2015 00:53:59 +0000 (16:53 -0800)]
Replace HAL_PIXEL_FORMAT_RAW_SENSOR with RAW_16
Change-Id: Iee70a27184d5ed35623814886487a5166c73567e
bohu [Wed, 18 Feb 2015 11:38:04 +0000 (11:38 +0000)]
am
481bd07f: am
254093f7: am
35169dbb: am
dfbcadfc: am
6e3ed47a: (-s ours) am
aa028a3c: back port gles fix to api 18
* commit '
481bd07f277a365b6dca003127c8278ae351a445':
back port gles fix to api 18
bohu [Wed, 18 Feb 2015 11:38:03 +0000 (11:38 +0000)]
am
955470ed: am
3bf12050: am
7f721057: (-s ours) resolved conflicts for merge of
52667f55 to klp-modular-dev
* commit '
955470ede6e6338b7b4749ebae275b87381dadde':
Port back gles bug fixes and rotation fix
bohu [Wed, 18 Feb 2015 00:41:53 +0000 (00:41 +0000)]
am
254093f7: am
35169dbb: am
dfbcadfc: am
6e3ed47a: (-s ours) am
aa028a3c: back port gles fix to api 18
* commit '
254093f7271d879c252aedc46511668c5239f2fa':
back port gles fix to api 18
bohu [Wed, 18 Feb 2015 00:41:53 +0000 (00:41 +0000)]
am
3bf12050: am
7f721057: (-s ours) resolved conflicts for merge of
52667f55 to klp-modular-dev
* commit '
3bf1205021bd384aac498b9c7d1ee166652e6944':
Port back gles bug fixes and rotation fix
bohu [Tue, 17 Feb 2015 18:40:00 +0000 (18:40 +0000)]
am
35169dbb: am
dfbcadfc: am
6e3ed47a: (-s ours) am
aa028a3c: back port gles fix to api 18
* commit '
35169dbba182b1e10ea8e12b512a4875d97412e9':
back port gles fix to api 18
bohu [Tue, 17 Feb 2015 18:34:41 +0000 (18:34 +0000)]
am
dfbcadfc: am
6e3ed47a: (-s ours) am
aa028a3c: back port gles fix to api 18
* commit '
dfbcadfc750113cb01a767b67414a1c2041301a6':
back port gles fix to api 18
bohu [Tue, 17 Feb 2015 17:21:15 +0000 (17:21 +0000)]
am
7f721057: (-s ours) resolved conflicts for merge of
52667f55 to klp-modular-dev
* commit '
7f721057aeed0d18ddf96a1b9a4bc9994384d06a':
Port back gles bug fixes and rotation fix
bohu [Fri, 13 Feb 2015 21:35:28 +0000 (13:35 -0800)]
resolved conflicts for merge of
52667f55 to klp-modular-dev
Change-Id: Id6ac649d4a960f1ff176660e80cb5e611c9a03e0
bohu [Fri, 13 Feb 2015 21:22:39 +0000 (21:22 +0000)]
am
6e3ed47a: (-s ours) am
aa028a3c: back port gles fix to api 18
* commit '
6e3ed47ab0b06e09d4b8531e05805c4b3ea0e924':
back port gles fix to api 18
bohu [Fri, 13 Feb 2015 20:55:12 +0000 (20:55 +0000)]
am
aa028a3c: back port gles fix to api 18
* commit '
aa028a3c593319d085b43f3fcc78b571524d6de2':
back port gles fix to api 18
bohu [Tue, 3 Feb 2015 23:26:33 +0000 (15:26 -0800)]
back port gles fix to api 18
Following CLs are backported:
5a50ac8819525f851c677be88a466b14737dbb18 guest system gles fix: Enable screen capture with gpu on
717e625415c4398431b84851ba1b76d8c59ae9cf Add shader version to glGetString
32c30975ea654b9654ad9dade0d25b9856e63f1b Add parameters validation to glShaderSource() API
b0c7cce25bf9323a359800a86c0c7609db2acea4 Fix eglDestroyContext and glTexImage2D
2fc65202c214640c55b52c29bbc9213170d0b533 handles glGetBooleanv when value is nonboolean
beda8027439b9c20475b8a3d379823d09fca3abb Properly initialize GLClientState's m_states
84684ec571a1db94e32a67cb7d154ab562dd0d7f Unbind buffer when buffer is deleted
89b7aac84f8babab93ff5326ad492164d971c421 Handle empty data parameter in glTexSubImage2D_enc
adb0f74f792ba7bca20257b9c0ea41ebda9bb229 Allow glGetProgramInfoLog_enc to have empty length
b31166704ddb7751619cf0bbc4f2f4575c0ad3c4 Guard against negative buffer size
641f35af08a0a4c46586a592ff4e703e866d581a Guard against negative width and height
9d18698dd8da15937f80e5476d73400a011934be Handle empty buffer in QemuPipeStream::writeFully
40a674e0d0acac87aa25eb9de720dc2fb07d9e4f Fix emulator crashes on glDrawElements command
7fa2b92de2058a3556e5f38a135de415bb3d5e45 Merge "Use more appropriate type in cb_handle_t::validate."
fe2c5beb964d2e2aecedb02b9cca592e0811d90b Use more appropriate type in cb_handle_t::validate.
376688e76694bf5b8672379c540b1bda059da682 Merge "ranchu: Fix goldfish_pipe definitions."
e3e686593cc8bdaf3ca4f6fa0b33b62a6951d1d6 ranchu: Fix goldfish_pipe definitions.
7d3d0c99d2c82319e001289d1b9e091e5ff8f7aa Merge "ranchu: Add ARM64-specific root/ramdisk config files."
d0fead3c53d6e450deb69aad72651e132b6cc072 ranchu: Add ARM64-specific root/ramdisk config files.
638ee524f83053613c47ddea22c4bf98a0175c2f Merge "Remove display initialization from eglGetProcAddress API"
7a2929cd6548693b581c17ba69308a49e03c56be Remove display initialization from eglGetProcAddress API
9b1e6c5a3ccd943b7158dce83387fbfcc1162d69 Merge "Make the size of "cb_handle_t" same for 32/64-bit"
7ea757df0311bfb7310a7a765dcec1b79f39f25d Merge "goldfish: camera: fix 64-bit warnings"
3725c7c982eac52ec64a625e82f306822452941c goldfish: camera: fix 64-bit warnings
eed789f036cbcedf2fa96ae3e273c2234102d340 Merge "goldfish: Fix /cache partition type."
f55ac4fc027ae3d97f4faaa6ccd65480f493dea7 goldfish: Fix /cache partition type.
690792a66c7fca6bf0aa17c2d5043ab86d145965 Merge "Revert "Revert "goldfish: cache image is not ext4. yet."""
8853df9503e0edec6cac0e1e0840fa111d57a79a Revert "Revert "goldfish: cache image is not ext4. yet.""
d8a6e67044ddcac7c53adbe6b871c33447110905 Merge "Revert "goldfish: cache image is not ext4. yet.""
5e2caf7883279113d6f5f4777122dc88262c34c6 Revert "goldfish: cache image is not ext4. yet."
3f62b50d45441ae077c958423e9e301acd5dcc11 Make the size of "cb_handle_t" same for 32/64-bit
aec15d91ee48797f2b3c3fe61cca977900ebcd47 am
646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"
646f0b25e63164950d1d99b9b8021be74c2321c6 Merge "opengl: rcOpenColorBuffer must be synchronous"
c542f3d8fc89678574b2fa650395f3dfac991a20 opengl: rcOpenColorBuffer must be synchronous
6ccaeebd78dcb5e20e2c0e81cdc571fb74f9cfb7 am
2c6c08a2: Merge "Move goldfish from fdprintf to POSIX dprintf."
2c6c08a23d2f5f760753745be5b67fe5759dcc91 Merge "Move goldfish from fdprintf to POSIX dprintf."
0228f8a1cdf5b2391201333de73fabab6d2ca72f Move goldfish from fdprintf to POSIX dprintf.
dbda557d4dcf022850ea4ab4f89e1c154e2aea04 am
5cb5779a: Merge "gralloc: don\'t initialize reserved_proc"
5cb5779ad0ad75a59bfb8ce42317a4ee18300281 Merge "gralloc: don't initialize reserved_proc"
e46eea0b5bdef28f5c42e4d7764b030679479354 gralloc: don't initialize reserved_proc
67334d0b9d0da7595daf07a3e9bea6a55436e296 Merge commit '
d9dc763708823aa865983bb8dc37b5ecc5669620' into HEAD
7076e4647af737393baf020c13e81a090f4a9f26 Merge "Add 64-bit software GLES/EGL support in gralloc.goldfish module"
3f92be74c1e9b2314d4c0f8feaacf7bafce7dedc Add 64-bit software GLES/EGL support in gralloc.goldfish module
61a8f0bbc146a4050a885e1e7c314dfc4ab72779 Merge "Fix the Chrome app crash in emulator issue"
bd93fee73b02d0b223b441c34a4f8e04eb57291d Merge "Support GLES acceleration in 64bit emulator on device side"
a1de8e2f5e4c29341be01bae364a54d92d14c742 Fix the Chrome app crash in emulator issue
4f94a5f8b13a5fdd80988e77dd5d468b958b0117 Merge "Remove the useless folder and files in emulator GLES/EGL drivers"
31aad5c0a0de056114b6bb843a5c37d8de6e46e4 Remove the useless folder and files in emulator GLES/EGL drivers
aedc716648071a1403f4ac92a380d1d4a5377052 Support GLES acceleration in 64bit emulator on device side
d9dc763708823aa865983bb8dc37b5ecc5669620 am
aedf829a: Merge "goldfish: cache image is not ext4. yet."
aedf829a920c3100de5caa49b0dec02d66eed96b Merge "goldfish: cache image is not ext4. yet."
a2543be45f35ab7ace3ecd92c99a3c72150622ec goldfish: cache image is not ext4. yet.
9dba558f4621d3d70a05c0a3d8e2c34b3883f866 am
48a76778: Merge "Remove #include <asm/page.h>."
644f53c8705586705c27b799e5b5f303118e8b3c am
155ca91c: Merge topic \'emu64\'
48a76778937abadf5cbd260696a29d737134d0d9 Merge "Remove #include <asm/page.h>."
1daf365476f888a5d9534607c8299a3b5160b4a7 Remove #include <asm/page.h>.
155ca91c1253bcb85a0eeec93ded6da07122d4ff Merge topic 'emu64'
324a0c43835b935721c938a2684874e0b5bf8311 Disable echo on all tty lines
8bb5f92dcd48dbbaa69ab15f97aca13d49b08599 ueventd.goldfish.rc: set system permissions for /dev/goldfish_pipe
5b31b113176dec8d7fcfb5650f3dd7b01baf605c am
48107fa1: Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
48107fa1dd354f8667b74f335c3f82f472b7d112 Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
5212e4a903d2654572b8bdde0bda3bdd6ecbee6e device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
2061519f3e55ba1dac643cac34a4aa6f0f0dfeee am
44c72ca0: Merge "Vibra: Add the vibrator module for goldfish"
44c72ca0b92c75ffef5e691a24d5d06d6a3e7baa Merge "Vibra: Add the vibrator module for goldfish"
0f41b57f2aa2ffa8fd90ebd50c13c2dd0249ee0f Vibra: Add the vibrator module for goldfish
ac534df6c39944a91f157819628db3d6f63b75f1 am
59922432: Merge commit \'
f09bc5256e48a44eec9ca47ba838c12d0e89a198\' into HEAD
59922432be859a46eeb76650b24308505625da36 Merge commit '
f09bc5256e48a44eec9ca47ba838c12d0e89a198' into HEAD
144d2d5d683928f393a9567c443c8f5af13dfdd0 am
b9a62053: Merge commit \'
828bd482a1aeacf96d5f3a3e0701029d9f890c5f\' into HEAD
b9a62053cf74025a43c8baa118d52729e38cc176 Merge commit '
828bd482a1aeacf96d5f3a3e0701029d9f890c5f' into HEAD
a648b35cca58d3d1608e1beb21028f91bd0b9df7 am
2befc3ed: Merge "Modify the build targets for goldfish from to include aosp*."
2befc3edc583afb43a4f6740f0af0534eac8e9d5 Merge "Modify the build targets for goldfish from to include aosp*."
bc233492e3ce3af8cc23496ee58cd3dc1b74d0f0 Modify the build targets for goldfish from to include aosp*.
f09bc5256e48a44eec9ca47ba838c12d0e89a198 am
b9a7de1a: Merge "Delete buffer data when removing it from the SharedGroup namespace"
b9a7de1a690bc638496e0550e6a9ebe859fc0315 Merge "Delete buffer data when removing it from the SharedGroup namespace"
8562d1b6e089254837da3ab2d272c65c3bb5d8c7 Delete buffer data when removing it from the SharedGroup namespace
f8b99f123467cd6164d071237f5dbe703f9ea2d7 am
6b151ca8: Merge "Catch divide by zero case in drawCheckerBoard() function."
6b151ca8833aa7271e311436dad97588b71b7a38 Merge "Catch divide by zero case in drawCheckerBoard() function."
d7cc5da79d828ec6cb21926be13265fc52715e2f am
84309165: Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
84309165ca52b7446e388c13127fd6e305833f24 Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
46bcb5f7a64ccd440d5a292c7afd2e2b5c2bee4f Drop setting of in_qemu boolean and restorecon /sys/qemu_trace.
b0b6afb44269263afa080ecc643f2c4866adfb38 Catch divide by zero case in drawCheckerBoard() function.
828bd482a1aeacf96d5f3a3e0701029d9f890c5f am
2524d396: Update emulator to FUSE-wrap its SD card.
2524d39681566f4eca7afb7950e05ab642978263 Update emulator to FUSE-wrap its SD card.
e8122dff1ef2de4d41835265a59d8960e7800fae camera3: Fix stream id types
3ad13188d4e7e873947040ec22a35d73efb76812 Camera2/3: Implement full-color NV21 output.
07da94023283a7be99fdde9b05e54d9204f7deff get rid of HAL pixelformats 5551 and 4444
a4c19be9274d8bb993f88a6a1cbd2ad92f4a48fa Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."
ccb835ba267e927f7df759290bd46ac78712a3b2 Merge "Camera2/3: Update static metadata"
0049ee8925212a3a5ff095a8a66cab184adf8f1b Camera2/3: Update static metadata
8ff1e5f1e3e24baf311e6263b48f389c206f14ac am
8f9288ea: goldfish: use fstab.goldfish
8f9288eaf10b50d19038f5c7024616e147c64735 goldfish: use fstab.goldfish
e96a7c7da79939c509a7517f2b2de37e840a6390 Added net.dns1 prop for emulator, as Android emulator ignores it by default.
ff3a362fb9aca15285a95cad6baa08e961330e8e am
bf34d172: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
bf34d1722ea1ebdf779837611220b5269bd35968 Reconcile with jb-mr2-zeroday-release - do not merge
d9fcbd08b0413fedc8219237534ce31d6b7fd2f5 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
ad9dd4bfdfa9ab6ccfc4be14305b6ed8b9a0ab5a am
2c84e47e: am
07a4c8b4: Camera3: Fix default AE mode
2c84e47e3d0085b1222de94013c75c0328b02492 am
07a4c8b4: Camera3: Fix default AE mode
Change-Id: Iadb2d609051a33595ce915e638e0e40f9a4841a4
bohu [Mon, 2 Feb 2015 19:32:00 +0000 (19:32 +0000)]
am
e1ad4034: am
66896fd9: Merge "Proper comment on the usage mode in gralloc_alloc"
* commit '
e1ad40345f9283e9e78eea000a7e87282ab1f81f':
Proper comment on the usage mode in gralloc_alloc
bohu [Mon, 2 Feb 2015 19:14:15 +0000 (19:14 +0000)]
am
66896fd9: Merge "Proper comment on the usage mode in gralloc_alloc"
* commit '
66896fd9f7716e027cec2060d05eca45e491c401':
Proper comment on the usage mode in gralloc_alloc
bohu [Mon, 2 Feb 2015 18:56:52 +0000 (10:56 -0800)]
Port back gles bug fixes and rotation fix
Following CLs are back ported:
3321abd96de0c05f5d0cfea88748b8abb3003672 Proper comment on the usage mode in gralloc_alloc
e163a3ce1e09c3ef3d1c2c4e0e46ff77fa28362c guest system gles fix: Enable screen capture with gpu on
ba65b320f09b4b3df0b9cbbb7224191099d62446 Fix previous commit error
717e625415c4398431b84851ba1b76d8c59ae9cf Add shader version to glGetString
32c30975ea654b9654ad9dade0d25b9856e63f1b Add parameters validation to glShaderSource() API
b0c7cce25bf9323a359800a86c0c7609db2acea4 Fix eglDestroyContext and glTexImage2D
2fc65202c214640c55b52c29bbc9213170d0b533 handles glGetBooleanv when value is nonboolean
beda8027439b9c20475b8a3d379823d09fca3abb Properly initialize GLClientState's m_states
84684ec571a1db94e32a67cb7d154ab562dd0d7f Unbind buffer when buffer is deleted
89b7aac84f8babab93ff5326ad492164d971c421 Handle empty data parameter in glTexSubImage2D_enc
adb0f74f792ba7bca20257b9c0ea41ebda9bb229 Allow glGetProgramInfoLog_enc to have empty length
b31166704ddb7751619cf0bbc4f2f4575c0ad3c4 Guard against negative buffer size
641f35af08a0a4c46586a592ff4e703e866d581a Guard against negative width and height
9d18698dd8da15937f80e5476d73400a011934be Handle empty buffer in QemuPipeStream::writeFully
7152d7d9fc89cbecf81ad123cf8018fed38253a1 Upgrade goldfish sensor HAL module to 1_0
40a674e0d0acac87aa25eb9de720dc2fb07d9e4f Fix emulator crashes on glDrawElements command
7fa2b92de2058a3556e5f38a135de415bb3d5e45 Merge "Use more appropriate type in cb_handle_t::validate."
fe2c5beb964d2e2aecedb02b9cca592e0811d90b Use more appropriate type in cb_handle_t::validate.
376688e76694bf5b8672379c540b1bda059da682 Merge "ranchu: Fix goldfish_pipe definitions."
e3e686593cc8bdaf3ca4f6fa0b33b62a6951d1d6 ranchu: Fix goldfish_pipe definitions.
7fe478341c2ac6362d6864c99a8a65b5d7fd142d Merge "Upgrade goldfish sensor HAL module to 1_0"
58ab34d952685a7b8a52151d2e39bd58ee4f6041 Upgrade goldfish sensor HAL module to 1_0
7d3d0c99d2c82319e001289d1b9e091e5ff8f7aa Merge "ranchu: Add ARM64-specific root/ramdisk config files."
d0fead3c53d6e450deb69aad72651e132b6cc072 ranchu: Add ARM64-specific root/ramdisk config files.
638ee524f83053613c47ddea22c4bf98a0175c2f Merge "Remove display initialization from eglGetProcAddress API"
7a2929cd6548693b581c17ba69308a49e03c56be Remove display initialization from eglGetProcAddress API
9b1e6c5a3ccd943b7158dce83387fbfcc1162d69 Merge "Make the size of "cb_handle_t" same for 32/64-bit"
7ea757df0311bfb7310a7a765dcec1b79f39f25d Merge "goldfish: camera: fix 64-bit warnings"
3725c7c982eac52ec64a625e82f306822452941c goldfish: camera: fix 64-bit warnings
eed789f036cbcedf2fa96ae3e273c2234102d340 Merge "goldfish: Fix /cache partition type."
f55ac4fc027ae3d97f4faaa6ccd65480f493dea7 goldfish: Fix /cache partition type.
690792a66c7fca6bf0aa17c2d5043ab86d145965 Merge "Revert "Revert "goldfish: cache image is not ext4. yet."""
8853df9503e0edec6cac0e1e0840fa111d57a79a Revert "Revert "goldfish: cache image is not ext4. yet.""
d8a6e67044ddcac7c53adbe6b871c33447110905 Merge "Revert "goldfish: cache image is not ext4. yet.""
5e2caf7883279113d6f5f4777122dc88262c34c6 Revert "goldfish: cache image is not ext4. yet."
3f62b50d45441ae077c958423e9e301acd5dcc11 Make the size of "cb_handle_t" same for 32/64-bit
aec15d91ee48797f2b3c3fe61cca977900ebcd47 am
646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"
646f0b25e63164950d1d99b9b8021be74c2321c6 Merge "opengl: rcOpenColorBuffer must be synchronous"
c542f3d8fc89678574b2fa650395f3dfac991a20 opengl: rcOpenColorBuffer must be synchronous
6ccaeebd78dcb5e20e2c0e81cdc571fb74f9cfb7 am
2c6c08a2: Merge "Move goldfish from fdprintf to POSIX dprintf."
2c6c08a23d2f5f760753745be5b67fe5759dcc91 Merge "Move goldfish from fdprintf to POSIX dprintf."
0228f8a1cdf5b2391201333de73fabab6d2ca72f Move goldfish from fdprintf to POSIX dprintf.
dbda557d4dcf022850ea4ab4f89e1c154e2aea04 am
5cb5779a: Merge "gralloc: don\'t initialize reserved_proc"
5cb5779ad0ad75a59bfb8ce42317a4ee18300281 Merge "gralloc: don't initialize reserved_proc"
e46eea0b5bdef28f5c42e4d7764b030679479354 gralloc: don't initialize reserved_proc
67334d0b9d0da7595daf07a3e9bea6a55436e296 Merge commit '
d9dc763708823aa865983bb8dc37b5ecc5669620' into HEAD
7076e4647af737393baf020c13e81a090f4a9f26 Merge "Add 64-bit software GLES/EGL support in gralloc.goldfish module"
3f92be74c1e9b2314d4c0f8feaacf7bafce7dedc Add 64-bit software GLES/EGL support in gralloc.goldfish module
61a8f0bbc146a4050a885e1e7c314dfc4ab72779 Merge "Fix the Chrome app crash in emulator issue"
bd93fee73b02d0b223b441c34a4f8e04eb57291d Merge "Support GLES acceleration in 64bit emulator on device side"
a1de8e2f5e4c29341be01bae364a54d92d14c742 Fix the Chrome app crash in emulator issue
4f94a5f8b13a5fdd80988e77dd5d468b958b0117 Merge "Remove the useless folder and files in emulator GLES/EGL drivers"
31aad5c0a0de056114b6bb843a5c37d8de6e46e4 Remove the useless folder and files in emulator GLES/EGL drivers
aedc716648071a1403f4ac92a380d1d4a5377052 Support GLES acceleration in 64bit emulator on device side
d9dc763708823aa865983bb8dc37b5ecc5669620 am
aedf829a: Merge "goldfish: cache image is not ext4. yet."
aedf829a920c3100de5caa49b0dec02d66eed96b Merge "goldfish: cache image is not ext4. yet."
a2543be45f35ab7ace3ecd92c99a3c72150622ec goldfish: cache image is not ext4. yet.
9dba558f4621d3d70a05c0a3d8e2c34b3883f866 am
48a76778: Merge "Remove #include <asm/page.h>."
644f53c8705586705c27b799e5b5f303118e8b3c am
155ca91c: Merge topic \'emu64\'
48a76778937abadf5cbd260696a29d737134d0d9 Merge "Remove #include <asm/page.h>."
1daf365476f888a5d9534607c8299a3b5160b4a7 Remove #include <asm/page.h>.
155ca91c1253bcb85a0eeec93ded6da07122d4ff Merge topic 'emu64'
324a0c43835b935721c938a2684874e0b5bf8311 Disable echo on all tty lines
8bb5f92dcd48dbbaa69ab15f97aca13d49b08599 ueventd.goldfish.rc: set system permissions for /dev/goldfish_pipe
5b31b113176dec8d7fcfb5650f3dd7b01baf605c am
48107fa1: Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
48107fa1dd354f8667b74f335c3f82f472b7d112 Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
5212e4a903d2654572b8bdde0bda3bdd6ecbee6e device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
2061519f3e55ba1dac643cac34a4aa6f0f0dfeee am
44c72ca0: Merge "Vibra: Add the vibrator module for goldfish"
44c72ca0b92c75ffef5e691a24d5d06d6a3e7baa Merge "Vibra: Add the vibrator module for goldfish"
0f41b57f2aa2ffa8fd90ebd50c13c2dd0249ee0f Vibra: Add the vibrator module for goldfish
ac534df6c39944a91f157819628db3d6f63b75f1 am
59922432: Merge commit \'
f09bc5256e48a44eec9ca47ba838c12d0e89a198\' into HEAD
59922432be859a46eeb76650b24308505625da36 Merge commit '
f09bc5256e48a44eec9ca47ba838c12d0e89a198' into HEAD
144d2d5d683928f393a9567c443c8f5af13dfdd0 am
b9a62053: Merge commit \'
828bd482a1aeacf96d5f3a3e0701029d9f890c5f\' into HEAD
b9a62053cf74025a43c8baa118d52729e38cc176 Merge commit '
828bd482a1aeacf96d5f3a3e0701029d9f890c5f' into HEAD
a648b35cca58d3d1608e1beb21028f91bd0b9df7 am
2befc3ed: Merge "Modify the build targets for goldfish from to include aosp*."
2befc3edc583afb43a4f6740f0af0534eac8e9d5 Merge "Modify the build targets for goldfish from to include aosp*."
bc233492e3ce3af8cc23496ee58cd3dc1b74d0f0 Modify the build targets for goldfish from to include aosp*.
f09bc5256e48a44eec9ca47ba838c12d0e89a198 am
b9a7de1a: Merge "Delete buffer data when removing it from the SharedGroup namespace"
b9a7de1a690bc638496e0550e6a9ebe859fc0315 Merge "Delete buffer data when removing it from the SharedGroup namespace"
8562d1b6e089254837da3ab2d272c65c3bb5d8c7 Delete buffer data when removing it from the SharedGroup namespace
f8b99f123467cd6164d071237f5dbe703f9ea2d7 am
6b151ca8: Merge "Catch divide by zero case in drawCheckerBoard() function."
6b151ca8833aa7271e311436dad97588b71b7a38 Merge "Catch divide by zero case in drawCheckerBoard() function."
d7cc5da79d828ec6cb21926be13265fc52715e2f am
84309165: Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
84309165ca52b7446e388c13127fd6e305833f24 Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
46bcb5f7a64ccd440d5a292c7afd2e2b5c2bee4f Drop setting of in_qemu boolean and restorecon /sys/qemu_trace.
b0b6afb44269263afa080ecc643f2c4866adfb38 Catch divide by zero case in drawCheckerBoard() function.
828bd482a1aeacf96d5f3a3e0701029d9f890c5f am
2524d396: Update emulator to FUSE-wrap its SD card.
Change-Id: Ie4ae8266f0077fc619398d8a94a6eba0e1414ae9
bohu [Mon, 2 Feb 2015 18:17:40 +0000 (10:17 -0800)]
Proper comment on the usage mode in gralloc_alloc
Original usage validation is invalid for screen capture mode.
This CL removes the dead code and clarify the comment.
Change-Id: Ic14c1482aa431993f10e8ae1133e6513809b6606
bohu [Thu, 29 Jan 2015 22:00:01 +0000 (22:00 +0000)]
am
7dff72ec: resolved conflicts for merge of
dd14cf86 to lmp-mr1-dev-plus-aosp
* commit '
7dff72ec7b07e0b86c20b2e8855e3d2c014d206e':
guest system gles fix: Enable screen capture with gpu on
bohu [Thu, 29 Jan 2015 21:49:06 +0000 (13:49 -0800)]
resolved conflicts for merge of
dd14cf86 to lmp-mr1-dev-plus-aosp
Change-Id: I128516966bf0949a7079269d8923daf5a7b9a112
bohu [Mon, 26 Jan 2015 17:25:23 +0000 (09:25 -0800)]
guest system gles fix: Enable screen capture with gpu on
Currently, when running emulator with gpu on, screen capture does not work.
This commit fixes that by doing the following steps:
1. enable gralloc to allocate buffer in gralloc_alloc for screen capture
usage mode.
2. read back screen pixels in gralloc_lock for screen capture usage mode
Note: This commit only fixes guest side, and to make screen capture work,
we also need the corresponding fix on host side in the following CL:
e36c098b5563adcc7442cb3a172ff769ee3fb4b6
(cherry picked from commit
5a50ac8819525f851c677be88a466b14737dbb18)
Change-Id: Ie9307eda411ab3d0b3842fbb4a71926dd62a1875
bohu [Tue, 27 Jan 2015 23:33:05 +0000 (23:33 +0000)]
am
9f9e1c9d: am
9d209a04: Merge "guest system gles fix: Enable screen capture with gpu on"
* commit '
9f9e1c9dd24816e5e5f35d57dfed49a7aaf9f7ba':
guest system gles fix: Enable screen capture with gpu on
bohu [Tue, 27 Jan 2015 17:37:45 +0000 (17:37 +0000)]
am
9d209a04: Merge "guest system gles fix: Enable screen capture with gpu on"
* commit '
9d209a04465a41ccf3eb5267f66b588c16f36234':
guest system gles fix: Enable screen capture with gpu on
bohu [Mon, 26 Jan 2015 17:25:23 +0000 (09:25 -0800)]
guest system gles fix: Enable screen capture with gpu on
Currently, when running emulator with gpu on, screen capture does not work.
This commit fixes that by doing the following steps:
1. enable gralloc to allocate buffer in gralloc_alloc for screen capture
usage mode.
2. read back screen pixels in gralloc_lock for screen capture usage mode
Note: This commit only fixes guest side, and to make screen capture work,
we also need the corresponding fix on host side in the following CL:
e36c098b5563adcc7442cb3a172ff769ee3fb4b6
Change-Id: I24b91bb70669fe2ddad3a5fc2eaccf3f3eaa0e1b
Bo Hu [Fri, 23 Jan 2015 03:12:16 +0000 (03:12 +0000)]
am
f5c66251: am
7d9f6e9b: Merge "Set proper error code for glShaderBinary function"
* commit '
f5c662515a936077132caad734a3ff444c84f905':
Set proper error code for glShaderBinary function
Bo Hu [Fri, 23 Jan 2015 00:50:33 +0000 (00:50 +0000)]
am
7d9f6e9b: Merge "Set proper error code for glShaderBinary function"
* commit '
7d9f6e9b35c43e19b810a089557e561f5f2b63bf':
Set proper error code for glShaderBinary function
Bo Hu [Thu, 22 Jan 2015 23:35:44 +0000 (23:35 +0000)]
Merge "Set proper error code for glShaderBinary function"
Bo Hu [Wed, 21 Jan 2015 00:29:50 +0000 (16:29 -0800)]
Set proper error code for glShaderBinary function
This function is not supported, but we still need to set proper error
code when it is called, instead of doing nothing.
Change-Id: I3f880e9b5e661fe4bd8e8f51f38df71c24b420e5
bohu [Thu, 15 Jan 2015 04:58:01 +0000 (04:58 +0000)]
am
57f113ed: am
6d171076: Merge "opengl: Regenerate GPU emulation encoder sources to fix NULL parameters in some gl functions."
* commit '
57f113ed4264925936df95de089d029d860b9911':
opengl: Regenerate GPU emulation encoder sources to fix NULL parameters in some gl functions.
bohu [Thu, 15 Jan 2015 03:58:14 +0000 (03:58 +0000)]
am
6d171076: Merge "opengl: Regenerate GPU emulation encoder sources to fix NULL parameters in some gl functions."
* commit '
6d171076e8a5d1c6302efc48e7c558863b36a6e4':
opengl: Regenerate GPU emulation encoder sources to fix NULL parameters in some gl functions.
bohu [Wed, 14 Jan 2015 17:46:36 +0000 (09:46 -0800)]
opengl: Regenerate GPU emulation encoder sources to fix NULL parameters in some gl functions.
This fix handles NULL values of 'size' and 'type' in
glGetActiveAttrib and glGetActiveUniform.
This patch updates the encoder sources to match the auto-generated
output of the latest 'emugen' tools from sdk/emulator/opengl/
Generated by using external/qemu/distrib/update-emugl-source.sh
related change:
82aa88b78e26b048e428a930a867166eff611984
Change-Id: Ifbd9e8bf3473ed054e95e1ee3a7885652c2002ce
Bo Hu [Wed, 17 Dec 2014 20:41:25 +0000 (20:41 +0000)]
am
7f39e3d9: am
28a1a16e: Merge "Add parameters validation to glShaderSource() API"
* commit '
7f39e3d9e431935a9ff24eec964a40135818b4e0':
Add parameters validation to glShaderSource() API
Bo Hu [Wed, 17 Dec 2014 20:36:46 +0000 (20:36 +0000)]
am
28a1a16e: Merge "Add parameters validation to glShaderSource() API"
* commit '
28a1a16e736d196b2b076f7a8402d365bee28511':
Add parameters validation to glShaderSource() API
Bo Hu [Wed, 17 Dec 2014 20:23:36 +0000 (20:23 +0000)]
Merge "Add parameters validation to glShaderSource() API"
Ying Wang [Tue, 16 Dec 2014 21:50:07 +0000 (21:50 +0000)]
am
74db53ea: am
ba8d44b1: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
74db53ea0fbf59b4a276137b95be26fc722b478f':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 21:05:59 +0000 (21:05 +0000)]
am
ba8d44b1: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
ba8d44b1ae7f5d39992dc0b59aecf56f8c81ee2a':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 20:31:03 +0000 (12:31 -0800)]
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Bug:
18675947
Change-Id: Ic464d98babf86e5bf76c3bacc875926968726cf9
bohu [Fri, 12 Dec 2014 20:21:59 +0000 (20:21 +0000)]
am
cd78a0ce: am
069592df: Merge "Add shader version to glGetString"
* commit '
cd78a0cefe962c851725458f0daa25935a9161b5':
Add shader version to glGetString
bohu [Fri, 12 Dec 2014 17:06:05 +0000 (17:06 +0000)]
am
069592df: Merge "Add shader version to glGetString"
* commit '
069592dfc42a4f435b2d7fb2a5bdfb51ab7e26fa':
Add shader version to glGetString
bohu [Fri, 12 Dec 2014 00:53:07 +0000 (16:53 -0800)]
Add shader version to glGetString
When querry shader version, current implementation returns
null. This commit fixes it.
Change-Id: If9b7c0ba3bb2bc48d0b7404529254834fff6ee5c
Tina Zhang [Thu, 4 Dec 2014 04:37:30 +0000 (12:37 +0800)]
Add parameters validation to glShaderSource() API
According to GLES2.0 Spec., add parameters validataion to
glShaderSource() API.
Change-Id: I5b0e939fd9657ccbb40a13896c8fc74ef02fd085
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
bohu [Wed, 10 Dec 2014 22:36:40 +0000 (22:36 +0000)]
am
0ed5f5f7: am
8142de3a: Fix a missed function override in GLEncoder.cpp
* commit '
0ed5f5f7ceea8c50402d3e6647bfe304ed5b39c2':
Fix a missed function override in GLEncoder.cpp
bohu [Wed, 10 Dec 2014 22:23:22 +0000 (22:23 +0000)]
am
8142de3a: Fix a missed function override in GLEncoder.cpp
* commit '
8142de3a67193062b0aa41cd197b473089b135df':
Fix a missed function override in GLEncoder.cpp