summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
...
* | | am aa01ad91: am aaa27fd5: Merge "Use reinterpret_cast when an integer is ↵Narayan Kamath2014-02-256-6/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | cast to a pointer" * commit 'aa01ad91cd22304fd15810f241c67ebb59e90c04': Use reinterpret_cast when an integer is cast to a pointer
| * | Merge "Use reinterpret_cast when an integer is cast to a pointer"Narayan Kamath2014-02-256-6/+8
| |\ \
| | * | Use reinterpret_cast when an integer is cast to a pointerAshok Bhat2014-02-246-6/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I5adcd59f58c029f7b2b596f4826d8ea69fb9bba6 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | am 097b5991: am e5c99bf3: Merge "Use long for pointers in opengl/EGL classes"Narayan Kamath2014-02-2514-40/+203
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '097b59919f01d7b057d252d23cb96ce5fcdd9469': Use long for pointers in opengl/EGL classes
| * | | Use long for pointers in opengl/EGL classesAshok Bhat2014-02-2414-40/+203
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGL classes in frameworks/base have to be updated to support 64-bit platforms. Key changes in the EGL classes include [x] EGLObjectHandle class - EGLObjectHandle class has two public methods (constructor and getHandle) that assume handles are 32-bit. They have not been changed. Instead, two new hidden methods (EGLObjectHandle(long) and getNativeHandle) have been added. [x] EG14 class - Two public methods eglGetDisplay and eglCreatePbufferFromClientBuffer assume that handles are 32-bit. They have been changed to throw unsupported operation exception on non 32-bit machines. Two new methods eglGetDisplay(long) and eglCreatePbufferFromClientBuffer(...long buffer..) have been added to support 64-bit handles. To allow the above changes in frameworks/base EGL classes, corresponding code generation mechanism in frameworks/native has been updated. Change-Id: I5d0a62e10c20ccf05f610d6608b8dfb6414b5116 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
| * | Merge "Update EGL codegen to be in sync with frameworks/base"Narayan Kamath2014-02-211-1/+1
| |\ \
| | * | Update EGL codegen to be in sync with frameworks/baseAshok Bhat2014-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Takeshi Aimi with commit-id f9337377 changed core/jni/android_opengl_EGL14.cpp in the frameworks/base. However the corresponding code snippet in frameworks/ native was not updated. This patch addresses the issue. Change-Id: I40bcc43d36d7ab4e0db4a73556a4f7480c7431c1 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
| * | | Update GLES codegen to be in sync with frameworks/baseAshok Bhat2014-02-201-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from synergydev with commit-id 01994c79 changed core/jni/com_google_android_gles_jni_GLImpl.cpp in the frameworks/base. However the corresponding code snippet in frameworks/native was not updated. This patch addresses the issue. Change-Id: I89c3d88de832efc8cbbe682c8a7ff7dfbef99db3 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | Merge "Hide three malformed GL bindings"Andy McFadden2014-02-195-2/+5
|\ \ \
| * | | Hide three malformed GL bindingsAndy McFadden2014-02-195-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were replaced with correct bindings a while back, but the broken methods weren't hidden. Also, pick up two changes that were made to the generated code rather than the source. Bug 6006380 Change-Id: Ibfe9a5f2e13e745f8d82116d1b4d8c2d025ac830
* | | | am 7a66f7af: am 913a17fd: Merge "libagl: support multilib build"Colin Cross2014-02-181-11/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '7a66f7afd1b6a975ab3b99b4765781a0d66958c8': libagl: support multilib build
| * | | Merge "libagl: support multilib build"Colin Cross2014-02-181-11/+7
| |\ \ \
| | * | | libagl: support multilib buildColin Cross2014-02-141-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use LOCAL_SRC_FILES_arch and LOCAL_CFLAGS_arch to support building for multiple architectures. Change-Id: I829c1bea880739bf8184df4006d0a481ffccc5c2
* | | | | am 8a9a2e24: am d5fe844b: Merge "Use /(vendor|system)/lib64/egl for 64-bit ↵Colin Cross2014-02-181-0/+14
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | EGL libraries" * commit '8a9a2e24db868fba404049d700ae704b0982e5f3': Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
| * | | Use /(vendor|system)/lib64/egl for 64-bit EGL librariesDan Willemsen2014-02-161-0/+14
| |/ / | | | | | | | | | Change-Id: Ie64806bfe4ba60a3167b84685cf983d4ada1042d
* | | am 67041e68: am fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit ↵Siva Velusamy2014-02-042-638/+640
|\ \ \ | |/ / | | | | | | | | | | | | | | | architectures" * commit '67041e6841d89efb0dbaf4562b601b80be61e1e6': GLES_trace: fix compile errors on 64 bit architectures
| * | GLES_trace: fix compile errors on 64 bit architecturesSiva Velusamy2014-01-282-638/+640
| |/ | | | | | | | | | | | | | | | | | | GLES_trace passes some pointers back to the host. Encode them using int64's rather than int32's This fix requires an update to the host tool to look at pointers as 64 bit, and if not found, then fall back to 32 bit integers. Change-Id: I11ff2ca51290f05913c1b9143cecee1caf015543
| * Make libEGL build cleanly under 64-bitDan Stoza2014-01-272-7/+8
| | | | | | | | Change-Id: I255dfb70b166b7469d59352b1acfc7aececa07de
* | am dec678db: am a21ba585: am 55f0668f: Merge "frameworks/native: convert ↵Colin Cross2014-01-281-1/+1
|\ \ | |/ | | | | | | | | | | LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" * commit 'dec678dbd240e5c53afac8c3901d5beb23706378': frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
| * frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-271-1/+1
| | | | | | | | | | | | | | LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it with LOCAL_MODULE_RELATIVE_PATH. Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
* | am dd000905: am e3aeefd1: am af29b77a: Merge "libGLES_android: fix 64-bit ↵Colin Cross2014-01-253-10/+14
|\ \ | |/ | | | | | | | | | | compile errors" * commit 'dd00090530340de22ca60f79446b5fe3050cd95f': libGLES_android: fix 64-bit compile errors
| * libGLES_android: fix 64-bit compile errorsColin Cross2014-01-243-10/+14
| | | | | | | | | | | | | | | | | | Fix size of vertex_t on 64-bit architectures Fix __get_tls casts, the TLS area is a void** Cast through uintptr_t to store integers in a pointer Use %zu to print size_t Change-Id: I91079ec76025237e6d2081784c5348518b0ce122
* | Make libEGL build cleanly under 64-bitDan Stoza2014-01-172-7/+8
| | | | | | | | Change-Id: I255dfb70b166b7469d59352b1acfc7aececa07de
* | Improve error messageAndy McFadden2014-01-071-3/+5
|/ | | | | | | | | The previous message indicated that the fault was due to an already- connected window, which was misleading at times. Bug 12439318 Change-Id: I1e0a042673dd245d1b0d237af963c52946803eb6
* am 40da5283: Merge "EGL: rename CallStack::dump into CallStack::log" into ↵Igor Murashkin2013-10-301-1/+1
|\ | | | | | | | | | | | | klp-dev * commit '40da5283ebc6b5cf1e3820740dc274c47cc55f6d': EGL: rename CallStack::dump into CallStack::log
| * EGL: rename CallStack::dump into CallStack::logIgor Murashkin2013-10-251-1/+1
| | | | | | | | | | Bug: 11324229 Change-Id: Ibac1be182c336e7aa5ac098f08d18b3c188964b4
* | am a9c47f32: Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-devJamie Gennis2013-10-023-3/+15
|\ \ | |/ | | | | | | * commit 'a9c47f327373cbe48e187442c7f9554d24a75c08': GLConsumer: start using EGL_ANDROID_image_crop
| * GLConsumer: start using EGL_ANDROID_image_cropJamie Gennis2013-10-023-3/+15
| | | | | | | | | | | | | | | | | | | | This change makes GLConsumer use the EGL_ANDROID_image_crop extension when available on a device. The crop rectangle is passed to the EGL driver when creating EGLImages, allowing the crop to be performed by the driver rather than using the texture transform matrix. Bug: 10897141 Change-Id: I63e9a5d5c85067376abc420e3639154468346311
* | am d9be16f9: Merge "Fix OpenGL stub exception handling."Elliott Hughes2013-09-271-0/+1
|\ \ | |/ |/| | | | | * commit 'd9be16f920f7c2581fda3ca495c1e6fc88857a6c': Fix OpenGL stub exception handling.
| * Fix OpenGL stub exception handling.Elliott Hughes2013-09-241-0/+1
| | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=60390 Change-Id: I2bdc22c5fe75f5e41ffb9dd9259ae92cf8a12917
* | Disable the egl_khr_gl_colorspace extensionJesse Hall2013-09-161-3/+29
| | | | | | | | | | Bug: 10777398 Change-Id: Ib50ea8b9d5d960537701b85929d6312304993a0f
* | fix a possible null dereference when eglMakeCurrent() failsMathias Agopian2013-09-061-1/+2
| | | | | | | | | | Bug: 10648797 Change-Id: Iee0be47f2646feb25de4ea199bbb9b707452916e
* | remove adreno 130 workaround supportMathias Agopian2013-08-282-19/+0
| | | | | | | | Change-Id: I8ea5ee65d405114b30cfaa44e1a0c971d1ef2a61
* | try to keep omap4 aliveMathias Agopian2013-08-283-35/+22
| | | | | | | | | | Bug: 10527646 Change-Id: Iec572a910e932115cf4f2e1215142b10cd91bd6f
* | only use format compatible with CPU consumersMathias Agopian2013-08-211-15/+28
| | | | | | | | | | | | | | | | | | EGL now picks the buffer format out of a small set of formats compatible with CPU consumers instead of using the EGL_NATIVE_VISUAL_ID. Bug: 10194508 Change-Id: If423cd29601b7a3ace8670f4c73004132cfc4b31
* | Replace sRGB_888 with sRGB_X_8888Jesse Hall2013-08-161-3/+3
| | | | | | | | | | Bug: 10357459 Change-Id: I3a1d92cce2c9d3e930408129fb20887276fffddc
* | Add support for EGL_KHR_gl_colorspaceJesse Hall2013-08-133-19/+77
| | | | | | | | Change-Id: I684d0b8556cd6c84ee4b4d67e1bb95c3b96fccfb
* | Don't swallow eglCreateContext errorsJesse Hall2013-08-121-6/+0
| | | | | | | | | | | | | | | | | | | | If the implementation eglCreateContext failed, we called eglGetError(), so we could check that it set the EGL error properly. But since we'd already called this, when the app called eglGetError() it would get EGL_SUCCESS! Bug: 10181333 Change-Id: Ic45d3a8fcb8c4421e04844c6d2f52761790b5948
* | make sure we have a context when creating the 1st surfaceMathias Agopian2013-08-081-0/+5
| | | | | | | | | | | | | | also add an option to dump the stack trace when calling a GL function without a context. Change-Id: I57b72bb8c322ac4253c3077bf150621bd9863b69
* | Merge "Add EGL_KHR_get_all_proc_addresses to extension string"Jesse Hall2013-08-072-18/+26
|\ \
| * | Add EGL_KHR_get_all_proc_addresses to extension stringJesse Hall2013-08-062-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | We've had the extended behavior since Android 4.3, but the extension hadn't been ratified by Khronos yet so we couldn't add it to the extension string. Bug: 9681677 Change-Id: I78842316a3ab7a3f66a0ac1a4742d837de664c4c
* | | All consumers now take an IGraphicBufferConsumer instead of a BufferQueueMathias Agopian2013-08-061-4/+4
|/ / | | | | | | | | | | | | | | | | | | this means they only have access to the consumer end of the interface. we had a lot of code that assumed consumers where holding a BufferQueue (i.e.: both ends), so most of this change is untangling in fix that Bug: 9265647 Change-Id: Ic2e2596ee14c7535f51bf26d9a897a0fc036d22c
* | Merge "Binderize the consumer side of BufferQueue"Mathias Agopian2013-08-022-1/+2
|\ \
| * | Binderize the consumer side of BufferQueueMathias Agopian2013-08-012-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While currently untested, this should allow to move the BuffereQueue in the consumer process and have everything work as usual. Bug: 9265647 Change-Id: I9ca8f099f7c65b9a27b7e7a3643b46d1b58eacfc
* | | Drop frames based on presentation timestampAndy McFadden2013-08-011-5/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | If there are two or more buffers pending that are ready for immediate presentation, drop all but the last one. Any code that didn't explicitly specify timestamps for buffers was using the default value (auto-generated "now"). As a result, surfaceflinger would drop frames whenever more than one buffer was queued. We now use zero as the auto-generated timestamp, and we don't set the timestamp in eglBeginFrame(). Change-Id: I187f42d33de227cd3411ff0dcd3b9ce1961457eb
* | Make Flattenable not virtualMathias Agopian2013-07-301-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fallout from the Flattenable change, update all its uses. Additionnaly, fix/tighten size checks when (un)flatten()ing things. Removed the assumption by some flattenables (e.g.: Fence) that the size passed to them would be exact (it can and will be larger in some cases) The code in Parcel is a bit complicated so that we don't have to expose the full implementation (and also to keep the code smallish). Change-Id: I0bf1c8aca2a3128491b4f45510bc46667e566dde
* | Merge "EGL: fix eglTerminate blob cache behavior"Jamie Gennis2013-07-301-6/+3
|\ \
| * | EGL: fix eglTerminate blob cache behaviorJamie Gennis2013-07-301-6/+3
| | | | | | | | | | | | | | | Bug: 9610573 Change-Id: I258e7e0d82ab76fbacf0b9c25d4f92fca6df04ac
* | | get rid of HAL pixelformats 5551 and 4444Mathias Agopian2013-07-263-12/+0
|/ / | | | | | | Change-Id: I39409103144c1ba09078c4ddc323a58987fb09ea
* | BufferQueue improvements and APIs changesMathias Agopian2013-07-181-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is the first step of a series of improvements to BufferQueue. A few things happen in this change: - setSynchronousMode() goes away as well as the SynchronousModeAllowed flag - BufferQueue now defaults to (what used to be) synchronous mode - a new "controlled by app" flag is passed when creating consumers and producers those flags are used to put the BufferQueue in a mode where it will never block if both flags are set. This is achieved by: - returning an error from dequeueBuffer() if it would block - making sure a buffer is always available by replacing the previous buffer with the new one in queueBuffer() (note: this is similar to what asynchrnous mode used to be) Note: in this change EGL's swap-interval 0 is broken; this will be fixed in another change. Change-Id: I691f9507d6e2e158287e3039f2a79a4d4434211d