summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-08-28Changes to build a host-side libvirglrender.sotemp_116172357_cuttlefish-testingmaster-cuttlefish-testing-releaseGreg Hartman
BUG: 77276633 Change-Id: Ie6b4ddc5010e35bd7940a5c82e84480460ef542a Test: builds
2018-08-23AVDVirglRenderer: Host-side 3D for cuttlefishAlistair Strachan
Initial implementation of libvirglrenderer for the cuttlefish AVD. This replaces the host renderer part of the Virgil3D project. Control messages are replaced with the goldfish-opengl protocol. QEMU needs to be built with support for libvirglrenderer, then this library can either replace the system copy of libvirglrenderer, or be LD_PRELOADed. Code from the goldfish emulator has been extensively reused. The protocol decoders are identical to those used by the external/qemu emu-master-dev project. Additionally, the OpenGLESDispatch library was taken and repurposed to allow an alternative EGL/GLES implementation to be loaded and utilized by AVDVirglRenderer. - OpenGL ES 1.1 and OpenGL ES 3.1 are supported. - OpenGL ES 3.2 support is not planned. - Vulkan support is not planned. Bug: 77276633 Change-Id: I981102308113577bccb514d1d7c515a999e6b059
2018-08-23Add a fork of the emugen host toolAlistair Strachan
This change also adds a fork of the emugen host tool from external/qemu 799a545 to enable the generation of wrapper code using the emulator library templates. To regenerate the wrappers, use the following commands: $ emugen_cuttlefish -W eglwrapper -i eglwrapper egl $ emugen_cuttlefish -W eglwrapper -i eglwrapper gles1 $ emugen_cuttlefish -W eglwrapper -i eglwrapper gles3 Bug: 76027192 Bug: 74573450 Bug: 74572414 Bug: 74571771 Bug: 73780279 Test: this change is completely untested Change-Id: Ib5e26ff824fd073a670971174014ea4c1b86c9f6
2018-08-23Enable ASAN on mac os.Erwin Jansen
- We passed in the wrong type of parameters to enable asan. Note: Asan cannot work on gcc4.8-mingw. Bug: b/80526239 Test: Launch emulator on mac: ==95822==ERROR: AddressSanitizer: global-buffer-overflow on address 0x00010a24ea60 at pc 0x00010c7a7844 bp 0x70000eb11c70 sp 0x70000eb11420 Change-Id: I9ce056733ca93d88440c3c51ed1becc0c34d3dd4
2018-08-23EGL: export eglQuerySurface function.Tao Wu
It seems somehow we forget to export it even we've already implemented it. BUG: 70179880 Change-Id: Ib06ab832ed957a1c176cc37ee5f32ced37b6db6c
2018-08-23Enable Windows x86 buildErwin Jansen
We disabled the Windows 32 bit build during the introduction of clang, we now turn it back on again Bug: b/73238968 Change-Id: I3ba976b9b7c40bfdd67cbc7a75161aad3a434b88
2018-08-23Enable static ASAN from clangErwin Jansen
- We now use the sanitizer shipped with clang. - Note: Running with the sanitizer enabled might not always work or behave as expected. This change merely enables the sanitizer, it doesn't fix any failures. Change-Id: Ib58171129ab96c3073402ae22e6af1074ab7bb98 Test: ASAN_SYMBOLIZER_PATH=$PWD/../../prebuilts/clang/host/linux-x86/clang-4053586/bin/llvm-symbolizer ./objs/android_emu64_unittests
2018-08-23Fix missing dlls on windowsErwin Jansen
- We no longer include libc++.so on windows - Fix missing dlls due to toolchain changes. Bug: b/73547546 Test: Launched emulator on windows Change-Id: I19dd13b40b1655eac71fb8c9a903d0e836d45ecd
2018-08-23Use libc++ instead of libstdc++ on linux.Erwin Jansen
- We now use libc++ with clang vs. libstdc++ with gcc4.8 - Fixes compiler issues - Fixes build scripts to use libc.so, set rpath in executables - Removes libstdc++.so copying - Deprecrates -use-system-libs - Fix reporting bug in rebuild.sh - Run tests on newer versions of wine. - Remove 32 bit support on windows, cross compilers currently expect same bitness on host as as target. Clang only produces 64 bit, breaking the 32 bit build. Test: Unit tests green, can launch Test: Runs on Xenial Bug: b/37075150 Change-Id: Id37a98c36d7e9c0d26d737286e3a2f9e46269cf6
2018-08-23[deqp] fix delete_sync failureLingfeng Yang
Separate gl vs egl sync namespaces. bug: 71354060 Change-Id: I50f3c66b6945ffb76da5531cf99496ec63e531a5
2018-08-23[gl] remove some glClientWaitSyncLingfeng Yang
Test: No out of order frames on Antutu Thought I could get rid of all the glClientWaitSyncs, but we still need the SyncThread one. Change-Id: I639b98ddba15618139574895282e70c49c1e280f
2018-08-23[gl] Rewrite blitFromCurrentReadBufferLingfeng Yang
- Most eglMakeCurrent calls per frame removed (rest are from the guest OS) - Client wait sync still necessary (actually even extra ones needed) Change-Id: I717c924a6efa127c4cff88c3552f1463e2622f7c
2018-08-23[GPU Snapshot] GLES1 save vertex pointer data correctlyYahan Zhou
We would need to pass buffer size when calling glVertexPointer with a client data buffer. Change-Id: I719521b8186fc33467cb55efae963ef686c4c24a
2018-08-23[core-profile] Consistent FBO api usageLingfeng Yang
bug: 68335353 Even if the underlying GPU supports core profile, the EXT function pointers for FBOs may be missing / incompatible, or the suffix-less ARB function pointers are missing. + Add a fallback to the ARB suffixed functions (for older GPUs), and log failures to find GL functions. Change-Id: Iba76262b7da14a84766ed89eb739a90e022f4a45
2018-08-23[VR] EGL_KHR_wait_syncLingfeng Yang
Change-Id: I4125d83a2753d227ed71b3975202faff8185fff2
2018-08-23Move glRenderbufferStorageMultisample to gles_common.entriesYahan Zhou
glRenderbufferStorageMultisample is used by both GLES1 and GLES2. Move it from gles3_only.entries to gles_common.entries. BUG: 64951203 Change-Id: Ifa422eb4336ba1733a697351710ac147e196d254
2018-08-23[gl] ES version from underlying GLES or core profile GL versionLingfeng Yang
bug: 64131077 - Use context creation trials to determine max GLES version - Use feature control for compatibility and to prevent making guests that don't support ES3 run ES3. - Edit the version string to match, too. - remove dlsym based dispatch - filter extensions based on known working set of ES2 extensions if in ES2 mode Change-Id: I02c36cb9bcddb0ebba82c98a5ab631bbfe15162e
2018-08-23[gl][snapshot] Use LazyLoadedEGLDispatchLingfeng Yang
Instead of duplicating the functionality of it. +fix build break on Mac due to non-void function with blank return Change-Id: If3159c23a4957f7cd3418ad1f435d06b7d019bdb
2018-08-23[egl] Use eglGetProcAddress as fallback for missing functionsLingfeng Yang
bug: 63908229 Change-Id: I69b832198ae6dd5d58cee842bafa6e3dc5a74fa1
2018-08-23[ANGLE Snapshot] GLES2 translator on top of ANGLEYahan Zhou
This patch modifies our GLES2 translator to allow it to mount on top of ANGLE. Because ANGLE is a GLES2 backend while previously our translator assumes desktop GL backend, some modifications are required. The main changes in this patch include: (1) Pass a flag to GLES translator to tell if it is running on top of another GLES backend (2) Desktop GL sometimes assume EXT postfix for some functions while GLES does not. Modify dispatcher so that it loads func as well funcEXT and funcOES as alias. (3) ANGLE does not like GL_RGB8 and GL_RGBA8 texture internal formats. Change them to GL_RGB and GL_RGBA. (4) Bypass some texture parameter validations when using ANGLE backend. (5) Ignore the parsed shader and use orignal shader source when using ANGLE backend. Change-Id: I6c5a770a0157c020920a432f3c949e2f8d67e0eb
2018-08-23[gl] Fix 'inout' variable qualification + complex readbackLingfeng Yang
- Can use variables with both input and output qualities - Allow readback of complex structures. 3 phases: - host_pack_tmp_alloc: custom expression to allocate aligned temporaries for the output structs - host_pack: custom expression to pack into stream (losing alignment) - guest_unpack: custom expression to unpack into object on guest (regaining alignment) Change-Id: I9073325efe6847762e8b2d42fd9803d81ff67374
2018-08-23Fix a series of compiler warningsErwin Jansen
- Fix a set of warnings from the mac build - Deleted unused variables - Marked methods as override Change-Id: I614f0a444b83de6ec978afc017cfb53d9ceafd62
2018-08-23[gl] Allow custom unpack in decoderLingfeng Yang
Encoder has custom pack, why not custom unpack as well? Change-Id: I955e0967dad6ee6e1c46bda51774463b67774744
2018-08-23[snapshot] Save if IOStream has |m_buf| setYurii Zubrytskyi
IOStream uses |m_buf| as a buffer pointer and as a flag at the same time: if it's not set then there's no need to flush. Previous snapshotting code didn't save this bit of information, so next time one tried to allocate a buffer from a just loaded empty IOStream, it thought it's not empty (as |m_buf| was not nullptr) and tried to flush garbage. This CL saves this separately, so now |m_buf| after snapshot loading is exactly in the same state as it was before. Bug=b/36700704 Change-Id: I7af309bb1d3c16ba20969f7bb3f9bfc067d0051d
2018-08-23unconditionally extern "C", update guest encoderLingfeng Yang
Change-Id: Ia1cc789acd1ec4d00b83950e0125de4e7957d097
2018-08-23Fix running with anything other than lib64GLES_V2_translatorLingfeng Yang
Change-Id: Id145c7fda144dcca34d9d61c1d6e465edc862535
2018-08-23[GPU snapshot] Snapshot translator GLES2 contextYahan Zhou
This patch snapshot the translator GLES2 context as it is. Namespaces and GL objects will be in another patch. Hardware GPU restore will be in another patch. Change-Id: I12cd6d0b7174414bce0bd9143fcdf21786f12ba4
2018-08-23Remove a bad assert() in IOStream dtorYurii Zubrytskyi
The assert was ok for the regular case, but it would fail if the guest closed the pipe in the middle of processing because of some logic error Change-Id: I9d69f8ea6d9cb0e0cca3b1607fa49b7876be6b14
2018-08-23ChecksumCalculator serializationYurii Zubrytskyi
Change-Id: Id135b7e226c0664c3bc2261f0f6b5ab28cb580c6
2018-08-23[GPU snapshot] Framebuffer and contexts snapshotYahan Zhou
This patch snapshot FrameBuffer and RenderContexts. With this patch, after from a GPU snapshot, the emulator should not crash but it will complain about invalid window surface handle. Next step: snapshot window surfaces TODO: call eglMakeCurrent after loading refactor objectNameManager so that shared groups are indexed by ID better interface for EglContext::onLoad clean up the code Change-Id: I7aa740f215f96c054634f08d5862bbc9534728c1
2018-08-23IOStream and ChannelStream serialization functionsYurii Zubrytskyi
- IOStream serializes its internal state first, then calls derived class' implementation. - ChannelStream just saves/loads internal buffers Change-Id: Iccb7302c9cfe1f0f5d2c592376d5498d1b586266
2018-08-23GL state snapshot - initial structureLingfeng Yang
- sit between udnerlying es driver and guest - work with any es backend (angle, swiftshader, etc) - snapshot clear color as a smoke test TODO - plug into rest of snapshot - snapshot minimum set of GL state necessary to get to home screen Change-Id: Idf2eb9822d62f9308275ff2df8d12f4402e085c3
2018-08-23[WIP] glesv31 hostside changesLingfeng Yang
Change-Id: I2710d1685e19071cdadf0d5eeb1f29fae6f68e9a
2018-08-23[test] OpenGL unit testsLingfeng Yang
This CL moves MyEGL/GLESv2/Dispatch into a more general location---emugl_common---allowing us to dispatch underlying GLESv2/EGL libs from other places in the emulator than qt gl widget, and introduces code for OpenGL unit tests, along with a basic context creation unit tests. We can now do offscreen-rendering type unit tests with OpenGL. This is very helpful for debugging host-side OpenGL issues, rather than going through X11 / WGL from the ground up to repro OpenGL cases. This should also be useful for testing snapshots. Usage: qemu dir -> cwd DYLD_LIBRARY_PATH (or platform equivalent)=objs/lib64 objs/lib64OpenglRender_unittests --gtest_also_run_disabled_tests should run at least basic context creation and dispatch. Change-Id: If89966156bb4978a302fd94a96d77e5ce1552c03
2018-08-23[GLESv3] fix build on older imagesLingfeng Yang
Change-Id: Ibef7263f881c55d9f79c0881bfa24c1f0c46eebf
2018-08-23[GLESv3] ES 3.x API implementation v1Lingfeng Yang
- ES 3.0 almost conformant (~80 failing tests not having to do w/ compressed texture support) - ES 3.1 has a first cut, still lots TODO Change-Id: I3aaafa6f42aba5ba7b1937556529b746d54cfb95
2018-08-23[GLESv3] dispatch, (en|de)coder, feature controlLingfeng Yang
This is an initial pass at GLES 3.x encoding. Some GLES 3.x functions like mapped buffers need tricky handling. See gles2.in for documentation of current encoder design and scoping of 3.x features and issues. Features: - Dynamic version detection of GLES 3.x support in both underlying GLESv2 lib (possibly SwiftShader or ANGLE) and the host OpenGL underneath the GLESv2 lib. Dynamic detection is put under feature control (currently off) to allow development while not breaking CTS. - Auto-generated translation of GLES 3.x functions to host OpenGL in android/scripts/gen-entries.py - Added all GLES 3.x buffer targets. - Enabled GLSL ES 300 -> GLSL compiler in ANGLE shader translator. Change-Id: Ib56ca6962466e6c21bfc45cdeb97ffa684c873c6
2018-08-23[getopt] Fixed our own implementation of getopt()Yurii Zubrytskyi
We have own code for getopt() that's not used now. But if we try compiling emugen on platform without native getopt(), e.g. Windows, we need to use ours. It had a bug where we were not advancing the |optind| variable if option's value was in the next |argv| item. This CL fixed it Change-Id: I4d1f4cf226f22817fdbba28a4fbc6f34ee78ea83
2018-08-23[build] Copy target CFLAGS into the host onesYurii Zubrytskyi
We use host CFLAGS to build emugen, and it was missing all flags one needs, including debug info and optimizations. This CL copies the flags we use for target build. + Fix build errors after enabling Werror Change-Id: I6be85210f3e9e447fb603e48dace074296b59d0e
2018-08-23[apigen] Fix the generated code for WITH_LARGE_SUPPORT=0Yurii Zubrytskyi
We've abandoned that mode for a while, but it is a good way to compare the performance of memcpy() buffers vs pass them through the pipe without copying Change-Id: I4a0b1b2332c93fd5484c8e82399e35686247a504
2018-08-23[video] Do YV12 conversion on the host with a shaderLingfeng Yang
Doing YV12 conversion in the guest makes gralloc unlock block for a very long time, which chokes MediaCodec. Doing YV12 conversion in shader, 1080p60 is achievable for short bursts, since the conversion is faster by over 10x (<3ms instead of ~30ms to convert a 1080p YV12 frame to RGB888). Still, at 1080p60, there are various stalls/hiccups... Change-Id: I031c4fd7b1260e89d9bc4398602ea1baea6f5e98
2018-08-23[video] goldfish_dma androidemu changesLingfeng Yang
This set of CLs instantiates the goldfish dma pipe extension's interface, and uses it to perform all color buffer updates, making video playback smoother. Change-Id: I543ba907fcc948d48d812146fa2e69a86cecb941
2018-08-23Move android-emugl from distrib/ to android/David 'Digit' Turner
Since this is no longer a side-project, move it under android/ where it logically belong. distrib/ should now only contains sources and build files related to third-party libraries used by the emulator. Change-Id: I012c2d8c875d018b0c97891773fa5e8e2811087e
2018-08-23emugl: Simplify RenderChannel interface.David 'Digit' Turner
This patch simplifies the RenderChannel interface and its implementation (a.k.a. RenderChannelImpl). This has several benefits: - The interface is now much closer to the one expected by an AndroidPipe instance, making EmuglPipe easier to implement (e.g. get rid of atomic variables in it). - RenderChannelImpl only uses a single lock instead of three, and doesn't use atomic variables anymore, thanks to the BufferQueue class. This makes the code a lot less confusing and removes risks of thread-racy behaviour due to the use of multiple locks and atomics at the same time. Performance wise, this seems to be comparable to the current implementation. The following numbers corresponds to the frames/s collected when running the Antutu3D 6.0 "Garden" benchmark, on an Android API level 23/x86 system image, 1920x1080 resultion, running on an HPz620 (32 cores at 2.7 GHz) with the "performance" scaling governor set on all CPUs: Official Current release Tip-of-tree With this patch 15.07 17.13 17.52 15.35 17.36 17.52 15.06 17.34 17.37 Change-Id: I1f0e998b23c38051c8de519a3cab3f6a961be930
2018-08-23emugl: Move IOStream.h to host/include/libOpenglRender/David 'Digit' Turner
There is no longer a reason to distinguish between include/libOpenglRender and include/OpenglRender/. Since the former only contains IOStream.h, move the header to include/libOpenglRender to get rid of one include directory during the build. Change-Id: I75b20025e79d25ed9dfb1c6e57c55566a5995c17
2018-08-23[GL] Minor optimizations and cleanupsYurii Zubrytskyi
- Make the IOStream's ctor and dtor protected - Remove unused virtual function in IOStream - writeFully() - Change ApiGen to privately inherit from std::vector<> (inheriting from vector is still bad, but I don't want too many unrelated changes in the CL) - Don't pass output parameter buffers from the guest to host in the GL protocol. We used to reserve memory for output buffers among the input parameters stream, and never actually read it on the host. Now we don't reserve it anymore (and don't pass it over!) - Add two conditional defines to ApiGen.cpp, INSTRUMENT_TIMING_{GUEST,HOST} When defined to 1, emugen generates timing printouts for each of the generated functions. Very useful for debugging. - Don't call eglMakeCurrent if the context we're making current is already one - Grab the thread-specific checksum calculator in the RenderThread's main function and pass it to decode() functions. This way we don't need to keep calling into TLS on every packet processing for several times to just get what we know is there and won't change 43 -> 44 fps in Antutu Change-Id: I9411cbd1758192b049f8f2e37b2d319e9f6a8593
2018-08-23SmallVector class for GLes pipe data transfersYurii Zubrytskyi
This CL adds a SmallVector class that allocates smaller data chunks on the stack, and falls back to heap memory for larger ones. For the ChannelBuffer class it makes the slow allocations almost disappear for my testing, only having them once in a couple minutes. SmallVector as of now only implements a tiny subset of vector<> interface, the one used in the code. Overall speedup is about 10% for Antutu benchmark, 15% for YouTube video player at 720p60Hz Change-Id: Ib64efe2ef7dac18263866069a5a5e67baec385cb
2018-08-23[gl] Slightly faster checksum calculationYurii Zubrytskyi
Checksum calculation is something we call on each gl command, so it has to be really fast. This CL gets rid of unneeded memcpy() calls, so it is slightly faster now Change-Id: Ib299580c167be1c94130a4fbda1e81fed88bf3a5
2018-08-23[gl] Update the emugen test data for the latest emugen changesYurii Zubrytskyi
Change-Id: I141d650302a7f0d984fd09b0be7bee09c0a9a65c
2018-08-23[emugen] Slightly better generated code for protocol decodersYurii Zubrytskyi
Change-Id: If9f45a5e0233c03fc1fbb02132e1375200d30121