summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
* am 79749845: Merge "Fix pointer-to-int and int-to-pointer warnings."Dan Albert2015-02-253-3/+8
|\ | | | | | | | | * commit '797498450cbcb87c28636e775ada942005436909': Fix pointer-to-int and int-to-pointer warnings.
| * Fix pointer-to-int and int-to-pointer warnings.Dan Albert2015-02-233-3/+8
| | | | | | | | Change-Id: If534cbcf2c3e644270572cbf829ba9b5acab29e6
* | Merge commit '26cc3d0b67ff4daf31eaeed0ecd87b391978aadb' into HEADBill Yi2015-02-193-121/+148
|\ \ | |/ |/|
| * am d6fce7ab: Merge "Remove lock around ref count check in terminate." into ↵Michael Lentine2015-01-282-120/+147
| |\ | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'd6fce7ab66e5d33e3ee16247485d1b8c26dd7ee8': Remove lock around ref count check in terminate.
| | * Remove lock around ref count check in terminate.Michael Lentine2015-01-282-120/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the global lock in terminate for the ref count check with atomics and a local lock. Bug: 19072064 Change-Id: I0cfd6564e227a75b8387a8788b16381d5bc2cc88
| * | am a46ff664: Merge "Use register numbers instead of register names"Jesse Hall2015-01-263-22/+22
| |\ \ | | | | | | | | | | | | | | | | * commit 'a46ff664571465b7a2741bed4225d30b5bf07503': Use register numbers instead of register names
| * \ \ am f551e1c1: Merge "[MIPS] Further opengl support for mips64 and mipsr6"Jesse Hall2015-01-223-14/+115
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'f551e1c1a59ae7ac906e2b204c3704d0dbf926a8': [MIPS] Further opengl support for mips64 and mipsr6
| * \ \ \ am 4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""Jeff Davidson2015-01-1510-5256/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '4df903dbc71c48e2db6fae9390795b81782470b4': Revert "Revert "Update protobuf library from 2.3 to 2.6.""
| * \ \ \ \ am 6f9c6541: Merge "[MIPS] Build libGLES for mips64, mips32r6"Brian Carlstrom2015-01-133-3/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a': [MIPS] Build libGLES for mips64, mips32r6
| * \ \ \ \ \ am 83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6.""Jeff Davidson2015-01-1210-13/+5256
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '83f14309f17af398ec8ff7f82d9b2f010ea7cd5f': Revert "Update protobuf library from 2.3 to 2.6."
| * \ \ \ \ \ \ am 9200d4e3: Merge "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-1210-5256/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9200d4e3bf0bf9bf21d9bb335e04818364bf12a8': Update protobuf library from 2.3 to 2.6.
| * \ \ \ \ \ \ \ am bceb29c8: Merge "Fix clang -Wc++11-narrowing warnings."Chih-Hung Hsieh2014-12-115-15/+20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bceb29c83ea54d38b38e40d66402e56364cff56b': Fix clang -Wc++11-narrowing warnings.
| * \ \ \ \ \ \ \ \ am f8954c81: Merge "OpenGL tests: Fix unused variables"Andreas Gampe2014-12-024-18/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8954c81a4ec43958867d1f6f497ef449bf091fd': OpenGL tests: Fix unused variables
| * \ \ \ \ \ \ \ \ \ am 4aaa3935: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"Jesse Hall2014-12-021-10/+6
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4aaa39358f538d8e06e026385bb8be8088d78c35': Avoid overwriting EGL14.EGL_NO_SURFACE
| * \ \ \ \ \ \ \ \ \ \ am 1bb53054: Merge "Fix class vs. struct mismatch"Chih-hung Hsieh2014-11-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1bb53054f2d77ce570a22629006c849fc54707dc': Fix class vs. struct mismatch
| * \ \ \ \ \ \ \ \ \ \ \ am d72ff140: Merge "Move frameworks/native to libc++."Dan Albert2014-11-161-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd72ff140e0df44106cd8539396ce686aa8f3306a': Move frameworks/native to libc++.
| * \ \ \ \ \ \ \ \ \ \ \ \ am fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"Andreas Gampe2014-11-1213-2/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fecc0bf4f1d8d1939807123d0f01ca1fe377bda4': Frameworks/native: Add pragmas to glgen headers
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 7b3fd290: Merge "EGL: make x86/64 wrappers resistant to ↵Jesse Hall2014-11-123-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -fno-omit-frame-pointer flag" * commit '7b3fd29037bc12c2691e06334bf51171853aa8f3': EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into ↵Dan Stoza2014-11-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '98d20f82ca8979b30c81df9639f54ab11e1951f9': Add a BufferItem parameter to onFrameAvailable
| | * | | | | | | | | | | | | | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passes the BufferItem for the queued buffer to the onFrameAvailable callback so the consumer can track the BufferQueue's contents. Also adds an onFrameReplaced callback, which is necessary if the consumer wants to do anything more than simple queue length tracking. Bug: 18111837 Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
* | | | | | | | | | | | | | | | egl: Remove old tuna BGRA vs RGBA workaround.Alistair Strachan2015-02-122-33/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some time before kitkat, a workaround was put in place to keep tuna working with obsolete PowerVR GPU drivers. The tuna product was dropped in AOSP for kitkat, but the workaround remained. There are still a number of devices shipping with OMAP4 processors, and this workaround continues to be applied on those products even when it is not required. The effect is that virtual display CTS will fail on those devices.
* | | | | | | | | | | | | | | Use register numbers instead of register namesNikola Veljkovic2015-01-193-22/+22
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid ambiguity by using register numbers. Register names are interpreted depending on the ABI. Fixes the issue with mips64 gcc, where registers t0-t4 are translated into $8-$11 (o32 ABI) instead of $12-$15 (o64 ABI). Also, use t9 ($25) for storing function address (in getProcAddress.cpp). Change-Id: I12ef5cd98bf14dab3c01f2756889cc02856c1cd8
* | | | | | | | | | | | | | [MIPS] Further opengl support for mips64 and mipsr6Duane Sand2015-01-193-14/+115
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combines 4 patches by Dragoslav and Douglas: Use t9 to hold the address of the called function. Add support for gl binding. Fix inline assembly code to be R6 compatible. Fix some more inline assembly code to be R6 compatible. Change-Id: I0b899813790b2ba4ca538bb21692014cc1933f66
* | | | | | | | | | | | | Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""Jeff Davidson2015-01-1510-5256/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Revert "Revert "Update protobuf library from 2.3 to 2.6.""Jeff Davidson2015-01-1210-5256/+13
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bca4262dac55cc59b28d6fde658d5f8a254fcc2d. Change-Id: I8ecd859340779dfacffba4c6d1a44c5cdbdfceed
| * | | | | | | | | | | Revert "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-1210-13/+5256
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a42cdf169060e1bb65c77bc8a394d266403d8583. Change-Id: I8f75e6fcc921041ebdfd35c4724134fcb2c739c6
| * | | | | | | | | | Update protobuf library from 2.3 to 2.6.Jeff Davidson2015-01-0810-5256/+13
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove generated cpp/h files for gltrace.proto as we can use the build system to generate these dynamically. Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
* | | | | | | | | | [MIPS] Build libGLES for mips64, mips32r6Duane Sand2015-01-123-3/+5
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, use generic C code instead of assembler. Change-Id: I604ecdcde2d5373f1f68ab97a63a80667b630846
* | | | | | | | | Fix clang -Wc++11-narrowing warnings.Chih-Hung Hsieh2014-12-115-15/+20
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang compiler gives warning to implicit conversions of literal structure fields, although the compiler generated implicit conversions are what we want in these cases. Change-Id: I8f04e7f2fa1db0ed1d1937135d9091532eec3d5b
* | | | | | | | Merge "OpenGL tests: Fix unused variables"Andreas Gampe2014-12-024-18/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | OpenGL tests: Fix unused variablesAndreas Gampe2014-11-244-18/+0
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, fix unused variables. Change-Id: I1863418f7467412d7698dd0ce0c8e40d1bd0348e
* | | | | | | Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"Jesse Hall2014-12-021-10/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Avoid overwriting EGL14.EGL_NO_SURFACESangkyu Lee2014-11-251-10/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both EGL14 and EGLExt have the same initialization codes for EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_CONTEXT and EGL14.EGL_NO_DISPLAY. Since EGLExt is initialized later, they are overwritten by EGLExt's initialization codes. Therefore, EGL_NO_SURFACE returned by methods in EGL14 is not actually EGL14.EGL_NO_SURFACE object and it makes several problems in handling error cases. For instance, "Let's fish" game application cannot be run on L. To solve the problem, this patch makes EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_CONTEXT and EGL14.EGL_NO_DISPLAY initialized just once. Change-Id: Icce878164ff0b715ad2b5a2cd038a9616c7cf1e9
* | | | | | Fix class vs. struct mismatchBernhard Rosenkränzer2014-11-171-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | egl_connection_t is a struct - shouldn't be forward-declared as a class Change-Id: I39f5d9bff9fc64f4694fb2bef7e4afa131b449cc Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | Move frameworks/native to libc++.Dan Albert2014-11-151-3/+2
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | I'm pretty sure I had done this before... Must have been new dependencies that slipped in when L merged in. Bug: 15193147 Change-Id: Ib9b1b8a65665d25c33c6141b9476a8e13c4084e0
* | | | Merge "Frameworks/native: Add pragmas to glgen headers"Andreas Gampe2014-11-1213-2/+46
|\ \ \ \ | |_|_|/ |/| | |
| * | | Frameworks/native: Add pragmas to glgen headersAndreas Gampe2014-11-1213-2/+46
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code currently being generated by glgen is not the cleanest, but we would like to get core/jni onto -Werror. Thus add pragmas turning off warnings locally to the C headers. Also fix signed-comparison in two functions. Longer term TODO: Emit clean code. Change-Id: Iee8582f8c0c1de076d64851d3b6ca467afd5bc43
* | | EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flagMichal Wajdeczko2014-11-123-6/+6
|/ / | | | | | | | | | | | | | | Wrapper functions were broken on builds that forced -fno-omit-frame-pointer flag. Change-Id: I5a80f9587fb3db821b4156af56acda59a0b4579b Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com>
* | am d12586b8: Merge "Move hwc tests to libc++."Dan Albert2014-11-052-37/+32
|\ \ | | | | | | | | | | | | * commit 'd12586b8593cf0cb894d02104a9794ed9dd85d16': Move hwc tests to libc++.
| * | Move hwc tests to libc++.Dan Albert2014-11-042-37/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since these tests were pulling in a static library linked against stlport, the tests needed to be explicit about which STL they're using. Might as well be libc++. Bug: 15193147 Change-Id: I4e0fc4ea10f7982dd04e7baaf57139dd5d55543e
* | | am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"Chih-hung Hsieh2014-10-161-0/+2
|\ \ \ | |/ / | | | | | | | | | * commit 'e9034b4502ae6e693ad52fe2e435066dc969a3ab': Use LOCAL_CLANG := false for GLES wrappers for now
| * | Use LOCAL_CLANG := false for GLES wrappers for nowBernhard Rosenkraenzer2014-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GLES wrappers built with clang currently result in crashes in libhwui, UI doesn't come up. Force gcc for the wrappers until this is investigated and fixed properly. Bug: 18003438 Change-Id: I24a17ec019409930883da8040fe2fb05b0fea0c5 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | am 12c4bdad: Add rate-limited logging for unimplemented es functions.Michael Lentine2014-09-231-5/+19
|\ \ \ | | |/ | |/| | | | | | | * commit '12c4bdad7b2372ab64dcd2abbdbe47e709fb8b90': Add rate-limited logging for unimplemented es functions.
| * | Add rate-limited logging for unimplemented es functions.Michael Lentine2014-09-231-5/+19
| | | | | | | | | | | | | | | | | | Bug: 17322013 Change-Id: I7aa5ab2f76cf344cfb75802edbfd44e8e7526ff1
* | | am e1e3d278: Merge "Clean cruft out of makefiles."Dan Albert2014-09-124-26/+12
|\ \ \ | | |/ | |/| | | | | | | * commit 'e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2': Clean cruft out of makefiles.
| * | Clean cruft out of makefiles.Dan Albert2014-09-114-26/+12
| | | | | | | | | | | | | | | | | | | | | Cleans up manual uses of stlport and bionic (and removes uses of private bionic headers). Change-Id: I157309d702e59152adfa3450939082248ae4c043
* | | am 4c5b9acf: Merge "Don\'t try to capture the pointer when using PBOs for ↵Ben Clayton2014-08-203-34/+85
|\ \ \ | | |/ | |/| | | | | | | | | | | | | texture APIs" into lmp-dev * commit '4c5b9acf655531f1be45bf7fffc5ee145a80cca7': Don't try to capture the pointer when using PBOs for texture APIs
| * | Don't try to capture the pointer when using PBOs for texture APIsBen Clayton2014-08-203-34/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a PBO is bound, then the pointer argument is a relative offset from the start of the PBO, not an absolute address. Fixes b/17063439 Change-Id: I39629ce6c9bb3cb6bac5c9b0311287628306ddd4 (cherry picked from commit 0ad707f2f3d714af7d983d68330ed51dace815f5)
* | | am 45e2fc22: Revert "Modify EGL to disconnect the window when the surface ↵Michael Lentine2014-08-081-9/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | gets destroyed." * commit '45e2fc22261cb8ecac4901b4425bcb7352c71174': Revert "Modify EGL to disconnect the window when the surface gets destroyed."
| * | Revert "Modify EGL to disconnect the window when the surface gets destroyed."Michael Lentine2014-08-081-9/+0
| | | | | | | | | | | | This reverts commit 843cbb241da60ada234918a30cfe9a01a1e04187.