aboutsummaryrefslogtreecommitdiffstats
path: root/emulator/opengl/host/libs/Translator
Commit message (Collapse)AuthorAgeFilesLines
* emulator/opengl: Remove obsolete directory.David 'Digit' Turner2014-12-0899-23113/+0
| | | | | | | | | | | | | All sources were moved to external/qemu/distrib/android-emugl to make it easier to modify both the emulator and host libraries at the same time. See: https://android-review.googlesource.com/#/c/118203/ As such, the sources in this directory are now ignored and can be safely removed. Change-Id: I5d143c971f995e2599e5e1d6174030d6803e8080
* Merge "handles glGetFloatv with GL_STENCIL_VALUE_MASK etc"bohu2014-11-181-0/+14
|\
| * handles glGetFloatv with GL_STENCIL_VALUE_MASK etcbohu2014-11-171-0/+14
| | | | | | | | | | | | | | | | For GL_STENCIL_VALUE_MASK and the like, glGetFloatv returns -1 and this is incorrect, according to GLES 2 spec. This commit does proper casts to get sensible value. Change-Id: I9c07ddf812458bd2d374189c0c4263c44de0d6da
* | Merge "Properly handle shader program deletion"bohu2014-11-183-1/+42
|\ \ | |/ |/|
| * Properly handle shader program deletionbohu2014-11-063-1/+42
| | | | | | | | | | | | | | | | When deleting a program that is still in use, its delete status should set to true and the actual deletion should happen later when the program is not in use. Change-Id: I821312997d372ed4773033ba373a8c792f6d7ba9
* | Correctly set error codebohu2014-11-062-4/+28
|/ | | | | | Fixed a few error codes to be more accurate Change-Id: Ifad6bf51c399215a9110bd40cfd380309ac6422c
* Merge "Properly handle shader deletion"bohu2014-11-063-3/+61
|\
| * Properly handle shader deletionbohu2014-10-283-3/+61
| | | | | | | | | | | | | | | | | | | | | | When deleting a shader that is still attached to program, it should not be deleted immediately. Instead, it should be marked for deletion. When a program is deleted, its shaders should be detached. When a shader is detached, it should be deleted if it is marked for deletion. Change-Id: I481dbfe37e3ad4af454574b75d157bdfeb1c9cdd
* | Merge "Detach texture or renderbuffer when deleting them"bohu2014-11-062-1/+29
|\ \
| * | Detach texture or renderbuffer when deleting thembohu2014-10-292-1/+29
| |/ | | | | | | | | | | | | When a texture or renderbuffer is still attached to framebuffer but is getting deleted, it should also be detached from framebuffer. Change-Id: Ide2c2a0e36ca8bf58f9351a17b78b76ebd507c12
* | Merge "Validate glClear mask"bohu2014-11-061-0/+3
|\ \
| * | Validate glClear maskbohu2014-10-281-0/+3
| |/ | | | | | | | | | | | | The mask should only be a combination of GL_DEPTH_BUFFER_BIT, GL_COLOR_BUFFER_BIT, and GL_STENCIL_BUFFER_BIT Change-Id: Ic448bd33a9bf0dc50db4298a53e96dd128fd110c
* | Merge "Check and return correct error code"bohu2014-11-061-3/+5
|\ \
| * | Check and return correct error codebohu2014-10-291-3/+5
| |/ | | | | | | | | | | | | check and return proper error codes when negative width, height or size or wrong internal texture format is passed in. Change-Id: Ic4ddea55042d8e21f8729a7ca675a44a232b7c7c
* | Merge changes I8cc8fdb0,I750f95f2,Ibab92ab3,Ib11fd06a,I9abc3f9aDavid 'Digit' Turner2014-10-318-8/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: emulator/opengl/emugen: Add new 'flushOnEncode' entry point flag. emulator/opengl: Fix glShaderSource() signature. emulator/opengl: Remove compiler warnings. emulator/opengl/emugen: Small cleanup of autogenerated sources. emulator/opengl: Add emugen test suite.
| * | emulator/opengl: Fix glShaderSource() signature.David 'Digit' Turner2014-10-318-8/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | The glShaderSource() function really takes a 'const GLchar* const*' parameter, not 'const GLchar**'. This creates issues when compiling the auto-generated encoders created with the latest version of 'emugen' and the GL2 Khronos headers. This patch is used to fix the issue. Note that it requires defining a new type in gl2.types, as well as fixing the signature of misc functions in the translator. Change-Id: I750f95f2e33d83b3b5563642ad7f87e4b8a37f35
* | validate glBufferData's usage parameterbohu2014-10-293-0/+12
|/ | | | | | | Only GL_STREAM_DRAW, GL_STATIC_DRAW and GL_DYNAMIC_DRAW usages are allowed. Change-Id: I2d6a425363c32330d25272d26884d32610d8dd19
* Properly reset source code bufferbohu2014-10-171-0/+1
| | | | | | | | | This commit clears m_src of ShaderParser in setSrc() method before reading new shader source code so that any previous source code won't be prefixed to new shader source code. Change-Id: Iacc98b32aea380d1e4503c37b86f5db55263e667
* emulator/opengl: Cleanup build files + remove obsolete tests.David 'Digit' Turner2014-08-274-41/+23
| | | | | | | | | | | | | | | | | | | | | | This patch cleans up the build files for the GPU emulation libraries (i.e. there is no need to test for BUILD_EMULATOR_64BITS anymore, filtering is now handled by the build system directly). + Remove a bunch obsolete tests, which were not unit tests, despite their name beginning with ut_xxxx. Which includes removing dependency on SDL too. + Remove -m64 and -fPIC flags from compilation. These are not necessary anymore (again, the build system now takes charge of placing them when necessary), and generated link-time warning when building Windows executables. + Remove a few declarations related to the now-obsolete platform build (these libraries are only built with the emulator's build system now). Change-Id: I27c28979c42cd51f2fe9e30edd4141136e80ee03
* emulator/opengl: Remove out-of-process handling code.David 'Digit' Turner2014-07-091-2/+0
| | | | | | | | | | | This removes the last pieces of shared/OpenglOsUtils which were never used since the code in render_api.cpp always used thread-based rendering, instead of process-based one. This feature could be re-implemented in the future, if really desirable. Change-Id: I551e0f3d6d5a06ff66cb40b007e2b24c295f1dd8
* emulator/opengl: refactor shared library handling.David 'Digit' Turner2014-07-092-6/+6
| | | | | | + Add a unit test. Change-Id: I27c993d1dc819e5bd89fc1e9ae266e11e6ef9a76
* emulator/opengl: Prepare for 64-bit build changes.David 'Digit' Turner2014-06-114-4/+4
| | | | | | | | | | | This patch slightly modifies the build files for the GPU emulation libraries to prepare for future changes in the emulator-specific build system that will be necessary to support Win64 binaries. The main difference is the introduction of 64-bit versions of the emugl-begin-host-<type> macros, named emugl-begin-host64-<type>. Change-Id: Ib40c030fa407b0ed951755dd9b007fda85778e03
* emulator/opengl: Fix compilation with Mingw64 toolchain.David 'Digit' Turner2014-06-041-2/+2
| | | | | | | | | | When using the newest Mingw64 toolchain, both the forward declaration and the definition of functions need to use GLAPI / GLAPIENTRY or the compiler will complain. BUG=15402623 Change-Id: Ida9e1cb9b177759e7d6688dc1d883dd856abda04
* 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
* emulator/opengl: A few debugging, stability improvements to emuglKen Mixter2014-05-211-1/+1
| | | | | | | | | | | | | | | | | | | * 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
* emulator/opengl: Fix GCC 4.8 warnings.David 'Digit' Turner2014-04-283-27/+27
| | | | | | | | 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-172-1/+15
| | | | | | | | | | 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
* emulator/opengl: Fix misc. compiler warnings.David 'Digit' Turner2014-04-017-35/+27
| | | | | | | 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: Allow standalone build.David 'Digit' Turner2014-03-115-28/+142
| | | | | | | | 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-111-2/+2
| | | | | | | | Final patch to completely remove dependencies on libcutils/libutils/liblog from the host-side GPU emulation libraries. Change-Id: I84a058bbd0ca676b18c0b0a094ac8bae692f9c94
* emulator/opengl: Remove Android-specific thread_store.David 'Digit' Turner2014-03-112-31/+58
| | | | | | | | | | | | | | | | | 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-1120-169/+128
| | | | | | | | | | | 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: Refactor SmartPtr implementation.David 'Digit' Turner2014-01-218-178/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-181-0/+282
| | | | | | | | | | | 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-187-42/+43
| | | | | | | | | | | 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
* 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
* | 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
* | 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
* use tlsDestruct in linux to destroy thread specific OpenGl resourceskeunyoung2013-04-051-16/+12
| | | | | | - lack of tlsDestruct causes resource leakage in linux Change-Id: I6f5308fd00da06dbecd9246393021e3d72aa40c3
* prevent dead-lock by removing mutex lock in errorHandlerProckeunyoung2013-03-281-1/+0
| | | | | | | | - setting int should be OK even without lock as there is no synchronization in reader side - dead-lock can happen inside constructor if the same error handler is already set and if error happens inside constructor in place like XSync Change-Id: I2f401067e0555ae092df23f57cc9ab054a1555d7
* Check that the native display is valid before using itJesse Hall2012-08-245-0/+16
| | | | | | | | | | | EglOS::getDefaultDisplay() can return an invalid display, e.g. on X11 if $DISPLAY is not set. This is called from the EglGlobalInfo constructor, which doesn't have a good way to indicate failure. So instead EglGlobalInfo::addDisplay() checks that the display is valid before wrapping it in a EglDisplay. Bug: 7020498 Change-Id: Id18fc568dae5bff4b45b706f3322ae5e4785d95d
* Fix convert8To4, convert8To5Jack Palevich2012-06-151-2/+2
| | | | | | | | | | | | | | See b/5680952 "Compilation warnings in etc1.cpp" for discussion. This is a manual merge of an update that was made to frameworks/native/opengl/libs/ETC1/etc1.cpp. sdk/emulator/opengl/host/libs/Translator/GLcommon/etc1.cpp is an exact copy of frameworks/native/opengl/libs/ETC1/etc1.cpp, so we might as well keep the two versions in synch. Bug: 5680952 Change-Id: Icf5d5ed2e7c5c79eb9677d210b1ff5fee507271d
* Export GL strings through render_apiJesse Hall2012-05-016-24/+62
| | | | | | | | | This also changes the strings reported by the default OpenGL ES 1.1/2.0 to OpenGL translators so they include the strings from the underlying OpenGL implementation. This will give more useful bug reports and SDK deployment statistics. Change-Id: Id2d231a4fe3c40157c24a63ec19785826e037fd3
* Move emulator GLES from development.git to sdk.gitJesse Hall2012-04-1698-0/+22624
The emulator GLES support has two interfaces: a host shared library interface used by QEMU, and a protocol between the platform and the host. The host library interface is not versioned; QEMU and the GLES renderer must match. The protocol on the other hand must be backwards compatible: a new GLES renderer must support an older platform image. Thus for branching purposes it makes more sense to put the GLES renderer in sdk.git, which is branched along with qemu.git for SDK releases. Platform images will be built against the protocol version in the platform branch of sdk.git. Change-Id: I2c3bce627ecfd0a4b3e688d1839fe10755a21e58