summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
* Add ES3 functions and constants, difficult ones commented outJesse Hall2013-04-103-31/+453
| | | | | | | | | | | | | | | This change adds ES3 functions to GLES30.spec, disabling any that require non-trivial changes for the generator to handle. Steps taken to add these: - Copy ES3 function declarations from gl3.h - Remove GL_APICALL, GL_APIENTRY, and semicolon from each declaration - Add whitespace around parens and *s as required by the parser - Comment out functions that the generator doesn't understand or that it generates bad Java interfaces for (by inspection). Bug: 8566953 Change-Id: Iaaef7d53e24f9a576759dbba72cd206bae1c1276
* Support "const GLChar*" and "const GLenum*" typesJesse Hall2013-04-102-1/+6
| | | | | Bug: 8566953 Change-Id: I349575e592e8b0d93d14237230b69bec4e04cf3e
* Minor changes to ES3 functions inherited from ES2Jesse Hall2013-04-101-5/+5
| | | | | | | | | With the addition of float framebuffer support in ES3, some parameters to ES2 functions are now GLfloat instead of GLclampf. Both are typedefs for 'float', so this is a source and binary compatible change. Bug: 8566953 Change-Id: I0b5acc78da7799a04053fdb568205f793792cad9
* Generate GLES30 class, just a clone of GLES20 for nowJesse Hall2013-04-105-3/+501
| | | | | Bug: 8566953 Change-Id: I6fad880344b9c247de4018711ea7cb6eb1a609d6
* Make gen more readable, use UNIX-style line endingsJesse Hall2013-04-102-146/+162
| | | | Change-Id: I6f4a1afa19f84d89278e9447f14a124476106fef
* Add liblogYing Wang2013-04-099-6/+15
| | | | | Bug: 8580410 Change-Id: I2ca4fa00dde0b574df3619134836bcb9315bd506
* fix local include pathsMathias Agopian2013-04-0411-22/+20
| | | | Change-Id: Icb921fa796ec08612dbb2feb7e7161bcb0cf4a99
* Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-devJamie Gennis2013-04-011-0/+121
|\
| * EGL_ANDROID_presentation_time: initial spec draftJamie Gennis2013-04-011-0/+121
| | | | | | | | Change-Id: I1cd174a08c499e5bde19e7ecd449da8266e7e66e
* | Fix MIPS assembly variable names to not conflict with GL API parameter namesJesse Hall2013-03-303-22/+22
| | | | | | | | Change-Id: I8e93fb55018de53a596cb176d48dbfdf1fd396e4
* | Merge "don't use compile-time configuration of libgui as much as possible" ↵Mathias Agopian2013-03-291-4/+19
|\ \ | | | | | | | | | into jb-mr2-dev
| * | don't use compile-time configuration of libgui as much as possibleMathias Agopian2013-03-291-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now detect at runtime which sync features to use, which allows us to remove a lot of the compile-time configuration options. There is still one option though, to disable KHR_fence_sync on some devices (which are more efficient without it). - added a backdoor to get the vendor's EGL strings the new logic is: - use always ANDROID_native_fence_sync if available - fallback to KHR_fence_sync if available and not disabled by the compile-time option - use KHR_wait_sync if available and either of the above is enabled Change-Id: I9c4b49d9ff1151faf902cc93bd53ea5f205aaabf
* | | am e3a396b2: am 906bd042: Merge "[MIPS] Add MIPS architecture support to libagl"Keun-young Park2013-03-294-1/+113
|\ \ \ | | | | | | | | | | | | | | | | * commit 'e3a396b25d53cc9ae61e3a2f0daeaa68ac1ba5a1': [MIPS] Add MIPS architecture support to libagl
| * \ \ Merge "[MIPS] Add MIPS architecture support to libagl"Keun-young Park2013-03-294-1/+113
| |\ \ \
| | * | | [MIPS] Add MIPS architecture support to libaglDuane Sand2013-03-274-1/+113
| | | | | | | | | | | | | | | | | | | | Change-Id: I30eb92857a2a6ea867fe0ee45109f17609043aae
* | | | | am 111d920b: am d3b2c029: Merge "[MIPS] Add MIPS architecture support to ↵Keun-young Park2013-03-284-1/+116
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | opengl framework" * commit '111d920bb588669006bdd8699e786d6305f14c36': [MIPS] Add MIPS architecture support to opengl framework
| * | | Merge "[MIPS] Add MIPS architecture support to opengl framework"Keun-young Park2013-03-294-1/+116
| |\ \ \
| | * | | [MIPS] Add MIPS architecture support to opengl frameworkDuane Sand2013-03-284-1/+116
| | |/ / | | | | | | | | | | | | Change-Id: Id7704d35bed14d96a85dc1f29db0566cd03872b5
* | | | Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-devMathias Agopian2013-03-286-147/+504
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | * changes: replace eglWaitSyncANDROID by eglWaitSyncKHR update EGL headers to most recent cleanup EGL extensions strings and entry-points
| * | | replace eglWaitSyncANDROID by eglWaitSyncKHRMathias Agopian2013-03-283-26/+34
| | | | | | | | | | | | | | | | Change-Id: I22f1b3588011c88389e249f738f1e6915cc97e72
| * | | update EGL headers to most recentMathias Agopian2013-03-283-86/+372
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add ANDROID extensions missing from official headers: EGL_ANDROID_wait_sync EGL_ANDROID_presentation_time Change-Id: I5496d0de123a6279234098c19f9a12220adec876
| * | | cleanup EGL extensions strings and entry-pointsMathias Agopian2013-03-283-40/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move all the code related to EGL extensions in one place - add missing extension strings: EGL_KHR_lock_surface EGL_KHR_reusable_sync - add public extensions strings and entry-points EGL_ANDROID_wait_sync EGL_ANDROID_presentation_time - add missing entry-points for EGL_KHR_reusable_sync Change-Id: Ifd98966b549e8efd8ef5385eba0efde8c4cbc77b
* | | | am 4194b389: am 0b6c4157: Merge "frameworks/native/opengl: Fix build with ↵Jesse Hall2013-03-284-4/+4
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | gcc 4.8" * commit '4194b3898df867a5c4377de49ddc72ad3e51122b': frameworks/native/opengl: Fix build with gcc 4.8
| * | frameworks/native/opengl: Fix build with gcc 4.8Bernhard Rosenkränzer2013-03-274-4/+4
| |/ | | | | | | | | | | | | | | | | In gcc 4.8, the warning for unused parameters (such as JNIEnv* pointers in JNI functions that don't need it) is enabled by default - causing -Werror to break the build. Change-Id: Ib91721f2cb9912b79c2ac19b4210b1309b08304f Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | improved CallStack a bitMathias Agopian2013-03-212-6/+2
| | | | | | | | | | | | | | - added a ctor that updates and dumps the stack immediately - added a "logtag" parameter to dump() Change-Id: Ie51c256071d282591752243bdb4f68cf9ff8829d
* | Merge "When disconnecting a surface, cancel don't queue the buffer" into ↵Jesse Hall2013-03-071-2/+1
|\ \ | | | | | | | | | jb-mr2-dev
| * | When disconnecting a surface, cancel don't queue the bufferJesse Hall2013-03-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't really right either, but avoids having an extra buffer that the consumer has to drain which it might not be expecting. To be correct, disconnecting a surface from a context should retain the current buffer and continue using it when reconnected. The buffer should only be canceled when the surface is destroyed. That will wait for a later change. Bug: 8320762 Change-Id: I5efa39c741193ca4f5612ea9de001ccbb683b345
* | | Merge "Defer destroying surfaces until not current" into jb-mr2-devJesse Hall2013-03-071-5/+12
|\ \ \ | |/ /
| * | Defer destroying surfaces until not currentJesse Hall2013-03-071-5/+12
| | | | | | | | | | | | | | | Bug: 8320762 Change-Id: I1320cf87923bcc5b795a86a13193363a49e29653
* | | another attempt to fix the buildMathias Agopian2013-03-062-2/+4
|/ / | | | | | | Change-Id: Ie0245db97170cca9a2cd8783b0fd512daf0d30a6
* | attempt to fix buildMathias Agopian2013-03-061-0/+4
| | | | | | | | Change-Id: Ifb186d2f157ad02f593bf9b681aab53575f183ce
* | Add eglPresentationTimeANDROIDAndy McFadden2013-03-055-1/+37
| | | | | | | | | | | | | | | | | | | | Added EGL extension to set a timestamp on a surface. Also, fix JNI encoding of "long" in glgen. Bug 8191230 Change-Id: I38b7334bade3f8ff02bffe600bb74469ef22c164
* | add some missing parameter validation in GLES java bindingsMathias Agopian2013-02-2529-595/+508
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added support for comments in checks.spec - added most missing checks - added and commented with // special-cased functions - added and commented with # functions that are still missing validation checks - moved glGet* to a special case and updated all the "pnames" from the khronos spec - changed ifcheck to default to 1 value. this allows us to simplify the checks.spec file and handle unknown pnames automatically (they'll be validated against 1 value, if it happens to need more, the call will go through but the validation will not happen). - refactored the cpp headers in to a common header + GLES version specific header Bug: 7402895 Change-Id: Ib5c68ca0ca416407b4cfa36e3a21901b2d6263ab
* | Merge changes Ic344ef63,If9bb02be,Ic8f94634Jesse Hall2013-02-2426-126/+7738
|\ \ | | | | | | | | | | | | | | | | | | * changes: Symlink /system/lib/libGLESv3.so -> libGLESv2.so Add ES3 support to libGLESv2 and tracing tools Import OpenGL ES 3.0 headers from Khronos SVN
| * | Symlink /system/lib/libGLESv3.so -> libGLESv2.soJesse Hall2013-02-131-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The platform has a unified GLES2/GLES3 wrapper in libGLESv2.so, which is what bundled binaries should link against. The NDK will have separate GLES2 and GLES3 libraries so that applications will get a link error if they accidentally use GLES3 entry points in a GLES2 application. This symlink allows GLES3 NDK apps to load using the unified wrapper. Change-Id: Ic344ef63c334047fccebb55b7cb2fb23a4c2d61b
| * | Add ES3 support to libGLESv2 and tracing toolsJesse Hall2013-02-1220-124/+6608
| | | | | | | | | | | | | | | | | | | | | | | | Since ES3 is backwards compatible with ES2, a new wrapper isn't necessary, and the Khronos implementation guidelines recommend supporting both versions with the same library. Change-Id: If9bb02be60ce01cc5fe25d1f40c4e7f37244ebf6
| * | Import OpenGL ES 3.0 headers from Khronos SVNJesse Hall2013-02-125-2/+1116
| | | | | | | | | | | | | | | | | | | | | | | | Add MODULE_LICENSE_MIT: The GLES headers use an MIT license or a slight variant of it (the "SGI Free Software License B version 2.0", http://oss.sgi.com/projects/FreeB/). Change-Id: Ic8f946341cdd0d579f51b6f7a3ee109cd31b1691
* | | Merge changes I45836219,I70a4075eJesse Hall2013-02-236-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | * changes: Regenerate API/trace files for constness change Import constness fix from gl3.h into gl2.h.
| * | Regenerate API/trace files for constness changeJesse Hall2013-02-114-4/+4
| | | | | | | | | | | | Change-Id: I45836219fc0e97607d83d458de9babb44f4c7534
| * | Import constness fix from gl3.h into gl2.h.Alistair Strachan2013-02-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change has been made in Khronos SVN for GLES2 already, however it is mildly controversial and discussion is on-going. This change is necessary for Android because otherwise applications cannot include both GLES2/gl2.h and GLES3/gl3.h as the glShaderSource() prototype mismatches. Native programs may include framework headers (which now include GLES3 headers only) but already have included GLES2 headers, creating an incompatibility. Change-Id: I70a4075e079ee063e76cef5a227abb0ae70aebb4
* | | sort the check file in alphabetical orderMathias Agopian2013-02-221-20/+19
| | | | | | | | | | | | | | | | | | this simplifies a lot comparing it to the spec files. Change-Id: I4b9b5e7469338a626100472d360ea26a902017bc
* | | update glgen to take into account recent changesMathias Agopian2013-02-224-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - it looks like UserId has been renamed to UserHandle in the framework. - also for some reason I don't understand glgen didn't seem to be up to date with respect to the generated bindings in the tree. It's like the bindings were generated with a more recent version of glgen (maybe it was never checked in). So we fix that here. Change-Id: Ie49522ebf67fcab9213246b4d93500e37a3cbc05
* | | Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-143-4/+4
| | | | | | | | | | | | Change-Id: Ibed34175ae273608393aaa5f0a7df207dc40d709
* | | am 45b0e435: Merge "Simplify OpenGL TLS access on ARM."Elliott Hughes2013-02-146-65/+3
|\ \ \ | |/ / |/| / | |/ | | | | # Via Elliott Hughes (1) and Gerrit Code Review (1) * commit '45b0e4350d3404bd194edc569e36ecca017c3d76': Simplify OpenGL TLS access on ARM.
| * Simplify OpenGL TLS access on ARM.Elliott Hughes2013-02-136-65/+3
| | | | | | | | | | | | bionic now assumes the TLS register is available, so OpenGL can too. Change-Id: If2b56a4c08de9f887759b78f70022026a181dc47
* | Force a specific locale for sortingJesse Hall2013-02-111-0/+8
| | | | | | | | | | | | | | | | Avoids irrelevant output differences based on the user's locale. The current output files were generated with a C or POSIX locale, and sort differently under en_US.UTF-8. Change-Id: I0dd85475e9ee2d58e7fa9fe2a4f86ad5c8142e00
* | am 873ab60e: am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"Jesse Hall2013-02-011-1/+4
|\ \ | |/ | | | | | | | | | | # By luliuhui # Via Android Git Automerger (1) and others * commit '873ab60e94811488caea1906eb98133329a3e28f': Gfx-3d: fix GetProcAddress in egl extention
| * am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"Jesse Hall2013-02-011-1/+4
| |\ | | | | | | | | | | | | | | | | | | # By luliuhui # Via Gerrit Code Review (1) and Shuo Gao (1) * commit '75b83e4dc7d8055a70e590f868f7307fdaf656a7': Gfx-3d: fix GetProcAddress in egl extention
| | * Gfx-3d: fix GetProcAddress in egl extentionluliuhui2013-01-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch can fix issue when Proc address return NULL. Glbench10, egl-ext and conformance test need this patch to run pass. Change-Id: I275c7cb6f77cb334c3ee7fa23cd696bba1c5a458 Author: Liuhui Lu <liuhui.lu@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 52622
| * | am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an ↵Andy McFadden2012-11-271-10/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | enum name" into jb-mr1.1-dev * commit 'a90173d86dd209aee55d833c73c424d854a98c70': DO NOT MERGE - native_fence_sync: fix an enum name