aboutsummaryrefslogtreecommitdiffstats
path: root/emulator
Commit message (Collapse)AuthorAgeFilesLines
...
| * emulator/opengl: Fix GPU emulation library crash on Windows.David 'Digit' Turner2014-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The definitions of two EGL translator functions were missing EGLAPI / EGLAPIENTRY macros. On Windows, these enforces the __stdcall procedure call modifier, which changes the way the stack pointer is modified on function exit. Without this patch, a call to these function will result in a corrupted stack pointer in the caller, quickly followed by a random crash. BUG=15402623 Change-Id: Ia0f7ebef29e1252086fb59ebf2e6f907c2a69487
* | Merge "opengl: rcOpenColorBuffer must be synchronous" into idea133David Turner2014-05-286-13/+24
|\ \ | |/ | | | | | | | | | | automerge: a509402 * commit 'a509402a6b907a871b62f89ea713ff63286c23ae': opengl: rcOpenColorBuffer must be synchronous
| * opengl: rcOpenColorBuffer must be synchronousJesse Hall2014-05-276-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | The gralloc register_buffer() function, which calls rcOpenColorBuffer, must actually increment the reference count before returning. Otherwise the buffer allocator may release its reference before the client has obtained one, and the buffer will be freed prematurely. Since rcOpenColorBuffer was just sending a message to the host without waiting for it to be received/processed, this guarantee was not met. Adding a return value makes the call synchronous. Bug: 12988668 Change-Id: I8b2399cfb0f600f99b3387f630343291b59bc9a6
* | Merge "emulator/opengl: A few debugging, stability improvements to emugl" ↵David Turner2014-05-213-4/+8
|\ \ | |/ | | | | | | | | | | | | | | into idea133 Auto-merge: 66ff424 * commit '66ff42468f7dc836f73cc9507bdf8d6f21e17d7f': emulator/opengl: A few debugging, stability improvements to emugl
| * emulator/opengl: A few debugging, stability improvements to emuglKen Mixter2014-05-213-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Zero output parameters so that errors don't return random data (even if the target code was careful to zero its output parameters.) Spec says that we will not modify values in case of an error, which is not currently possible, but at least this means we return deterministic values. * Similarly, avoid passing uninitialized data if an error occurs during getting the viewport. * Fix a bug where glGetError may be called when NULL is decoded in CHECK_GL_ERROR mode. * Output more information about the stream in DEBUG_PRINTOUT mode to help separate from multiple streams. Change-Id: I31706b92642efe4c7ed38d178b49e72835a9c9a6
* | Merge "Update to new notice support." into idea133Xavier Ducrohet2014-05-202-23/+380
|\ \ | |/ | | | | | | | | | | Auto-merge: b22dbfb * commit 'b22dbfb00380ef5b4dfd5b9ca72c4b408878ae87': Update to new notice support.
| * Update to new notice support.Xavier Ducrohet2014-05-202-23/+380
| | | | | | | | | | | | | | Update the build.gradle file to specify notice files, add missing notice files. Change-Id: Ib5e56bb1c53de3584f3942643bbdf736a872dc06
* | Merge "Fix build of mksdcard with Gradle." into idea133Xavier Ducrohet2014-05-151-9/+0
|\ \ | |/ | | | | | | | | | | Auto-merge: 14bad8a * commit '14bad8a95b3677b037f1bdaa5a128817e4bb576b': Fix build of mksdcard with Gradle.
| * Fix build of mksdcard with Gradle.Xavier Ducrohet2014-05-151-9/+0
| | | | | | | | Change-Id: I6126f49ecfa417c3aace65ff5b72cf6ec8678ddd
* | Merge "Build mksdcard for mac/linux with Gradle." into idea133Xavier Ducrohet2014-05-154-1/+66
|\ \ | |/ | | | | | | | | | | Auto-merge: 180a34c * commit '180a34c165f2497cae1018701278df7398186bb0': Build mksdcard for mac/linux with Gradle.
| * Build mksdcard for mac/linux with Gradle.Xavier Ducrohet2014-05-154-1/+66
| | | | | | | | Change-Id: Ie7db983ab953ee3820189e9eb0f4cf47fe40d1e5
* | emulator: Do not build emulator-related modules with platform-build.David 'Digit' Turner2014-05-111-6/+3
|/ | | | | | | | | | | | | | This patch removes the emulator modules from the Windows SDK build, as well as the GPU emulation library modules from emulator-specific platform builds. Note that these binaries and libraries are now directly built from sources through the emulator's own standalone build system, i.e.: cd external/qemu ./android-rebuild.sh Change-Id: I5fd1f154f5118c3d9eee80c24ffa45068d7cfc33
* emulator/opengl: Fix GCC 4.8 warnings.David 'Digit' Turner2014-04-285-31/+32
| | | | | | | | This fixes a few compiler warnings when building the GPU emulation libraries with GCC 4.8. Note that GLbyte is defined as khronos_int8_t which is signed! Change-Id: I52027cd2eb20d6162983319f22d4da150ff514ed
* emulator/opengl: Backport fixes from master branch.David 'Digit' Turner2014-04-174-5/+19
| | | | | | | | | | This back-ports several fixes from aosp/master branch into idea133: 145e25 Fix the Google Maps crash issue e33909 Support GL_MAX_TEXTURE_SIZE case to glGetIntegerv API c6dd20 Fix Mac build. Change-Id: I26a05956c3b926dddeb638c6cff979199075ecbb
* Merge "Fix compilation error due to missing getopt with ↵David Turner2014-04-161-3/+0
|\ | | | | | | x86_64-linux-glibc2.11-4.8" into idea133
| * Fix compilation error due to missing getopt with x86_64-linux-glibc2.11-4.8Andrew Hsieh2014-03-181-3/+0
| | | | | | | | | | | | | | | | Unlike its 4.6 counterpart, the new x86_64-linux-glibc2.11-4.8/x86_64-linux/include/c++/4.8/x86_64-linux/bits/gthr-default.h (line #39) no longer unconditionally include unistd.h which provides getopt prototype Change-Id: I53310bb0f27e6ed7b4ee732ef301c4868decccb4
* | emulator/opengl: Fix misc. compiler warnings.David 'Digit' Turner2014-04-0115-62/+29
| | | | | | | | | | | | | | These warnings appear when building the sources through the emulator's standalone build system, not the platform one. Change-Id: Ib5d51cf6211f32763be00c7436ae14c06f76b436
* | emulator/opengl: Fix Windows EGL queryConfigs().David 'Digit' Turner2014-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | The function uses DescribePixelFormat() which doesn't return a count, but a maximum index, in a base-1 list of possible formats, so adjust the code accordingly. See http://msdn.microsoft.com/en-us/library/windows/desktop/dd318302(v=vs.85).aspx Change-Id: Id0cc92249348e6c845570adaaf4c280721a194bb
* | emulator/opengl: Fix eglWaitGL implementation.David 'Digit' Turner2014-04-011-1/+3
|/ | | | | | | | | | | The eglWaitEGL implementation didn't restore the previous bound API after calling eglWaitClient. This probably isn't a big concern for emugl correctness, but fixing this removes a compiler warning. See http://www.khronos.org/registry/egl/sdk/docs/man/xhtml/eglWaitGL.html Change-Id: I143ffeeefa01aff502d27d4e1d6f892f0d1efe5b
* emulator/opengl: Fix Windows SDK build.David 'Digit' Turner2014-03-112-1/+29
| | | | | | | | | | | | | | | | | | This patch fixes the Windows SDK build. A previous patch apparently broke it even though I could not reproduce this locally before submitting. What it does is, when using the platform build to generate Windows binaries, use the host Linux binary instead of rebuilding the 'emugen' tool from sources. Note that the emulator's standalone build supports building host Linux binaries even when targetting Windows by default. + Add a missing module import that got lost in translation for some odd reason. Change-Id: I2ccd962d8b3df859b2cba82573225820b69b0d32
* emulator/opengl: Allow standalone build.David 'Digit' Turner2014-03-1124-142/+406
| | | | | | | | This patch improves the build files for the GPU emulation libraries to allow them to be built directly with the emulator's own standalone build system. Change-Id: I205392bdfe4223a5c43fa67e24a2beffcbcbc07a
* emulator/opengl: Remove libcutils/libutils/liblogDavid 'Digit' Turner2014-03-115-26/+10
| | | | | | | | Final patch to completely remove dependencies on libcutils/libutils/liblog from the host-side GPU emulation libraries. Change-Id: I84a058bbd0ca676b18c0b0a094ac8bae692f9c94
* emulator/opengl: Remove <utils/List.h> + <utils/String8.h>David 'Digit' Turner2014-03-112-2/+6
| | | | | | | | | | | | | This removes dependencies on two libutils headers. Rather than provide alternative data types, simply disable the corresponding code because it looks like the corresponding fields are simply never used by the code? It is likely that this code is only used in the guest portion of the code, and thus completely un-necessary on the host side. Change-Id: I22c67f114c2c77381ceba8de23dd631158276596
* emulator/opengl: Remove android::KeyedVector usage.David 'Digit' Turner2014-03-116-146/+636
| | | | | | | Replace it with a custom emugl::IdToObjectMap template class that owns the objects, simplifying the code. Change-Id: Id18319e8080211acebed814bc0d702fbaab3b245
* emulator/opengl: Remove android::Vector<> usage.David 'Digit' Turner2014-03-117-8/+582
| | | | | | | | | | | | | This remove the use of android::Vector<> by providing an alternative vector implementation (emugl::PodVector<>) which is heavily based on the emulator version under external/qemu/android/base/containers/PodVector.h. Ultimately the GPU emulation libraries will move under external/qemu/, and the code will be changed to use android::base::PodVector<> instead of emugl::PodVector<>. Change-Id: I9836ed961795c0791115c61e731d15d17f036972
* emulator/opengl: Remove <cutils/sockets.h>David 'Digit' Turner2014-03-116-55/+308
| | | | | | | | Remove the dependency on <cutils/sockets.h> by providing "emugl/common/sockets.h" instead, which contains similar utility wrappers. Change-Id: Ifd48abeb208b004c801c9447a4141881f6fa8f44
* emulator/opengl: Remove Android-specific thread_store.David 'Digit' Turner2014-03-1113-37/+990
| | | | | | | | | | | | | | | | | This patch removes the use of the 'thread_store' class from <utils/threads.h> by providing its own implementation instead under shared/emugl/common/thread_store.h, plus appropriate unit tests. Note that unlike the Android version, this properly destroys the thread-local values on thread exit (instead of leaking them). + Provide a LazyInstance class used to perform thread-safe lazy initialization of static variables without the use of C++ constructors. Change-Id: Iabe01fbd713c6872b5fe245d7255c3c03749a88a
* emulator/opengl: Remove android::Mutex.David 'Digit' Turner2014-03-1130-220/+458
| | | | | | | | | | | This patch removes the dependency on android::Mutex from <cutils/threads.h> by providing a custom implementation, which is a simple wrapper around pthread_mutex_t / CriticalSection, under shared/emugl/common/mutex.h + Provide unit tests. Change-Id: I379ef0c480c478ab9ba5f2faaf8274267eff37ba
* emulator/opengl: Build 64-bit unit tests.David 'Digit' Turner2014-03-063-4/+45
| | | | | | | This is done by building a special version of GoogleTest specially for the GPU emulation libraries. Change-Id: Ie27c75d9a85836f392375e110a5152031af586bc
* emulator/opengl: Fix SmartPtr memory leak.David 'Digit' Turner2014-03-062-2/+4
| | | | Change-Id: I35d0650f2d69b3616167ee03decdc96b7ec09b2a
* emulator/opengl: Remove compiler warningsDavid 'Digit' Turner2014-03-064-9/+3
| | | | | | | This patch removes a few minor compiler warnings related to unused local variables. Change-Id: Icd4b3b478dce0c38cc1dd04419db7350dcbdb8f6
* emulator: Remove obsolete qtools directory.David 'Digit' Turner2014-01-2948-10195/+0
| | | | | | | | | | | | | | | | | | The executable declared in this directory were used to process traces that are generated with the "emulator -trace <name>" option. Unfortunately this feature is broken in many ways: - Only works for ARMv5, not ARMv7, x86 and MIPS - Generates invalid timings that do not reflect modern CPU architectures. Nobody has been using it for a long time, and the feature will be removed from external/qemu, including the removal of one header file included by the code under sdk/emulator/qtools. This patch simply removes the qtools sources entirely. Change-Id: I6e7d141393e71afb36d950c264f73752d42dc412
* gtest needs -lpthread.Elliott Hughes2014-01-281-0/+1
| | | | Change-Id: I020a56c0a762c4df9c0c7cabc17c862e05699c18
* emulator/opengl: Refactor SmartPtr implementation.David 'Digit' Turner2014-01-2121-358/+467
| | | | | | | | | | | | | | | | | | | | | | | | | | This gets rid of two copies of SmartPtr.h and replaces them with a single implementation under shared/emugl/common/smart_ptr.* Note that this uses a new include path rooted at the shared/ directory for classes that are likely to be built both for the host and the device (in case we back-port this to device/generic/goldfish/opengl/ in the future). + Add a gtest-based set of unittests, after building, just call 'emugl_common_host_unittests' to run it. Note that this probably needs a 64-bit version as well, will come later once I find a way to build GTest for 64-bits without breaking the platform build :-) Also note that this moves the class to the 'emugl' namespace, in order to make the code easier to build out of the platform tree, and embed it in other projects. More classes will be transitioned / refactored in future patches. AOSP_BUG=64806 Change-Id: Ieb326c5f3f002a21537b8a391a82ce2ef9925073
* emulator/opengl: Prepare out-of-platform build with SDL.David 'Digit' Turner2014-01-186-25/+318
| | | | | | | | | | | A small patch to prepare for the out-of-platform-tree build. This ones places SDL-related definitions in a new build file (sdl.mk) and provide a way for the emulator's build system to provide its own SDL compiler and linker flags. + Add missing KHR/khrplatform.h file. Change-Id: I496f1a49730ffbfae80a074e09611bd07777cf1a
* emulator/opengl: Get rid of all compiler warnings (Linux).David 'Digit' Turner2014-01-1815-69/+83
| | | | | | | | | | | This patch gets rid of all compiler warnings for the GPU emulation libraries when building on a Linux host. Note that GLcommon/GLutils.h now provides two new functions to perform 'safe' type casts between unsigned integers and pointers: SafePointerFromUInt() and SafeUIntFromPointer(). Change-Id: I01c48bbd72f925d70eb9831f57e15815e687121f
* Fix idea133 build.David 'Digit' Turner2014-01-171-1/+1
| | | | | | | Breakage was introduced by https://android-review.googlesource.com/#/c/79332/ which modified the location of some headers referenced here. Change-Id: I801ba2527386af0d6d2961f2c79f5db332a6d023
* Merge "Catch NULL context and bubbling error up."Xavier Ducrohet2013-11-214-14/+21
|\
| * Catch NULL context and bubbling error up.Stuart Scott2013-08-234-14/+21
| | | | | | | | | | | | | | | | bug: 10456411 Fix for internal bug Change-Id: I85181d358f1844b25cc85fbaf5f64842d5ed6f22
* | Merge "Copy the GL2 extension string before destroying context"Xavier Ducrohet2013-11-211-8/+15
|\ \
| * | Copy the GL2 extension string before destroying contextJesse Hall2013-08-231-8/+15
| |/ | | | | | | | | | | | | | | | | | | The pointer returned by glGetString is owned by the GL context, so when the GL context is destroyed it may become invalid. This happens on Mesa, for example. Make/manage our own copy of the extension string to use after destroying the context. Bug: 9627179 Change-Id: I605536151ee64f50403546d0d38c5b5f1f27dd73
* | Merge "EglMacApi: Make sure that some returned EGL configs have alpha == 0"Xavier Ducrohet2013-11-213-1/+38
|\ \
| * | EglMacApi: Make sure that some returned EGL configs have alpha == 0Martin Storsjo2013-09-253-1/+38
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what the pixel format attribute lists in MacPixelFormatsAttribs.m try to achieve, but despite this, alpha is nonzero in every returned configuration on certain (all?) machines (at least on 10.8.5 on a nvidia gpu). This means that EGL won't return any configs at all with alpha == 0. The default config chooser in GLSurfaceView requires a config with alpha == 0. This means that previously, this view failed to start up on the emulator on OS X, unless set up with a non-default config chooser. Change-Id: I2bf3e92a026c525a97d6746e491d920ce127787f
* | Delete buffer data when removing it from the SharedGroup namespaceJesse Hall2013-11-091-14/+36
| | | | | | | | | | | | | | | | | | | | Updating or deleting data associated with a buffer object was clearing the name->data association, but not actually deallocating the data. Thanks to manjian2006 for finding the bug and proposing the fix. Bug: 60468 Change-Id: Ibabfb1bace8acdeb1a4bbe5bf922845d096a8d22
* | Merge changes I0cccba67,I4cf8a19bXavier Ducrohet2013-11-081-2/+3
|\ \ | |/ |/| | | | | | | * changes: Ignore empty ranges Fix rangeUnion return value in the successful case
| * Ignore empty rangesAlessandro Pignotti2013-07-301-1/+2
| | | | | | | | Change-Id: I0cccba6795e3b9709cc646f6fa55bb60e6446ea1
| * Fix rangeUnion return value in the successful caseAlessandro Pignotti2013-07-301-1/+1
| | | | | | | | | | | | | | Even if the ranges can be merge rangeUnion was returning false. Most probably this was a typo. Change-Id: I4cf8a19bd701a8501c2d49cf0bfa996f9e12c02f
* | Merge changes Ibc381479,I21a2430cXavier Ducrohet2013-08-143-30/+15
|\ \ | | | | | | | | | | | | | | | * changes: ColorBuffer: Remove the y-invert Intel GPU bug workaround EglMacApi: Use the right pbuffer texture target and format parameters
| * | ColorBuffer: Remove the y-invert Intel GPU bug workaroundMartin Storsjo2013-08-102-29/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in 57501158 makes sure pbuffers get initialized properly. The previously incorrect pbuffer texture parameters had different effects on different GPUs/drivers. On a Nvidia GT 650M, the buffers were rendered properly but glReadPixels calls were inverted, while Intel HD 3000/4000 seemed to get the rendering inverted as well. By passing proper pbuffer texture parameters, the bug (which in itself was no driver bug but inconsistent behaviour when given invalid parameters) vanishes. This reverts the bug workaround parts of 9322c5cb (from development.git). Change-Id: Ibc38147967361cba6ba85cdf3b4e9a2e2ee6d881
| * | EglMacApi: Use the right pbuffer texture target and format parametersMartin Storsjo2013-08-101-1/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target and format parameters are in the EGL parameter range (and are stored in EGLints), while nsCreatePBuffer (which calls NSOpenGLPixelBuffer initWithTextureTarget) takes GLenums. This is pretty much similar to the same function in EglWindowsApi.cpp, but contrary to that function, there's nothing similar to WGL_NO_TEXTURE_ARB in initWithTextureTarget, so something has to be specified in all cases. Previously, the default EGL_NO_TEXTURE (0x305C) was passed through. While this mostly worked just fine, it had the surprising hidden side effect of using a vertically flipped coordinate system in glReadPixels (with the origin being the top left corner instead of the bottom left one, which is default in OpenGL). This makes the EncodeDecodeTest media CTS test pass with surface output on the emulator on Mac OS X. (This test renders the decoded video to a pbuffer and checks individual pixel values using glReadPixels.) Change-Id: I21a2430ce6334a5e82ea3203c4d157f5bad1558d
generated by cgit v1.1 at 2024-11-17 01:58:31 +0000