summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Merge "gl_code.cpp: Remove a DOS style newline"Jesse Hall2013-05-131-1/+1
| | |\ \
| | | * | gl_code.cpp: Remove a DOS style newlineBernhard Rosenkränzer2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3edd6e511371fa8b0afef2e90baed4662ed76c4 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | Merge "change how the userspace GLES drivers are named"Mathias Agopian2013-05-022-63/+127
|\ \ \ \ \
| * | | | | change how the userspace GLES drivers are namedMathias Agopian2013-04-262-63/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for single library: /vendor/lib/egl/GLES.so for multiple libraries: /vendor/lib/egl/EGL.so /vendor/lib/egl/GLESv1_CM.so /vendor/lib/egl/GLESv2.so EGL_BOARD_CONFIG as well as egl.cfg are not needed anymore. To facilitate the transition, the loader will also look for the older naming scheme. Bug: 8631636 Change-Id: Id4b113468df29bae72b323f76598229914e1c7a1
* | | | | | am 958ef3d7: am c8639351: Generate new EGLExt classJesse Hall2013-05-028-24/+195
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '958ef3d79c48ddef3afa5327f7ed15a5ecfd2d1d': Generate new EGLExt class
| * | | | | Generate new EGLExt classJesse Hall2013-05-028-24/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially populated with EGL_ANDROID_presentation_time (moved from the EGL14 class) and the ES-relevant parts of EGL_KHR_create_context. Bug: 8678160 Change-Id: Ifed2ee3da264ca701ae1f4b309a0758f7fcc3acc
* | | | | | am 34c0fb18: am cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into ↵Jesse Hall2013-04-301-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '34c0fb183767b80e93a7cd77233ead5fe50bd822': Fix glGetUniformIndices JNI prototype
| * | | | | Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-devJesse Hall2013-05-011-1/+1
| |\ \ \ \ \
| | * | | | | Fix glGetUniformIndices JNI prototypeJesse Hall2013-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8657863 Change-Id: I130d1b54d0cbd1f8613d3108482526d05d73d9e4
* | | | | | | am ef4dbb6a: am 5d46b04b: Merge "Recommend different time source" into ↵Andy McFadden2013-04-301-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'ef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2': Recommend different time source
| * | | | | | Merge "Recommend different time source" into jb-mr2-devAndy McFadden2013-05-011-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Recommend different time sourceAndy McFadden2013-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were recommending SystemClock#uptimeMillis() from Java code, but millisecond resolution is a little coarse. We don't have an appropriate call in SystemClock, so use System.nanoTime() instead. Bug 8733179 Change-Id: Ifb85a03eabf7ff168966adcb5ed5914bbf3884b2
* | | | | | | am 8369c473: am f6d1c393: EGL: expose the EGL_KHR_create_context extensionJamie Gennis2013-04-291-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8369c4739a58367e9636c84facc272cf8ddcb070': EGL: expose the EGL_KHR_create_context extension
| * | | | | | EGL: expose the EGL_KHR_create_context extensionJamie Gennis2013-04-251-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8616866 Change-Id: Ic60f9f21397a1760c552b6f141d5177d1cbaf1f8
* | | | | | Merge "Fix range check"Andy McFadden2013-04-291-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix range checkAndy McFadden2013-04-251-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The getarray() function checks to see if there's enough room in the buffer, but it's using a byte count for the available size and a possibly non-byte count for the space required. Dividing down by the unit size corrects the problem. Bug 8713753 Change-Id: Id42c0df65c3233dcc5f76d05e229f7d40d4c1f99
* | | | | fix a typo in EGL loaderMathias Agopian2013-04-231-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the code intended to filter out the software-renderer, but the test as written was essentially a no-op. the problem didn't happen most of the time because we had updated egl.cfg to not even list the software renderer. the test as written didn't generate a compile-time error because String8 has a const char* cast operator; but the end result was to compare pointers instead of the string itself. http://code.google.com/p/android/issues/detail?id=54606 Change-Id: I739dd1c838fbc24c5643a631fae19713a8ef1717
* | | | fix "traceGpuCompletion" debug featureMathias Agopian2013-04-161-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eglCreateSyncKHR requires a call to glFlush which we were not doing. fixed by moving the code above eglSwapBuffers(), which both fixes the problem and gives us a slightly better idea of when the GPU is done drawing. Change-Id: Ic826ef1fe25a6247742c3d49d0cb69f4031e3593
* | | | Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEXJesse Hall2013-04-155-466/+9
| | | | | | | | | | | | | | | | | | | | Bug: 8566953 Change-Id: I66085c300a8658a4018796645257edb73be94719
* | | | Special-case glGetActiveUniformBlockNameJesse Hall2013-04-104-1/+159
| | | | | | | | | | | | | | | | | | | | Bug: 8566953 Change-Id: Ic9b3be9fa0136495633ee3b1c38583cfa315942a
* | | | Special-case glGetStringiJesse Hall2013-04-104-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Modeled on the existing glGetString special-case. Bug: 8566953 Change-Id: Icc6b23ab53b00510368900ad99c92028253dc797
* | | | Special-case glMapBufferRangeJesse Hall2013-04-104-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating the generator to handle GLvoid*/java.nio.Buffer return values probably wouldn't be too hard, but this is the only function that needs it currently. Bug: 8566953 Change-Id: I359a951136ab479ab576ce2e5a2881b937b7e8c9
* | | | Special-case glGetBufferPointervJesse Hall2013-04-104-1/+20
| | | | | | | | | | | | | | | | | | | | Bug: 8566953 Change-Id: I11a7394eb46f229fd3ae716e77487a45bac6ed53
* | | | Special-case glGetUniformIndicesJesse Hall2013-04-104-1/+174
| | | | | | | | | | | | | | | | | | | | Bug: 8566953 Change-Id: Ic8bcd03e8d41a81f48d603f67ce2046a4afa1561
* | | | Special-case glGetTransformFeedbackVaryingJesse Hall2013-04-104-1/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just a search-and-replace on the glGetActiveAttrib special-case, since they have the same signature and parameter handling. Bug: 8566953 Change-Id: I40834d6f32bf9ecb39718df29036aa2d1bbfa07a
* | | | Special-case glTransformFeedbackVaryingsJesse Hall2013-04-104-1/+59
| | | | | | | | | | | | | | | | | | | | Bug: 8566953 Change-Id: I02a1548aebc12bd3599903029bfd2e4ccea53211
* | | | Add buffer object versions of several functionsJesse Hall2013-04-106-7/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of these are new ES3 functions, some are existing ES2 functions that can now use the new pixel pack/unpack buffer bindings. glDrawElementsInstanced needs a special case since the pointer/offset arg isn't the last one like the generator assumes. Bug: 8566953 Change-Id: I638a36b0a31aefcb5bfee6f4d049348223045103
* | | | Add *int64 and GLsync types and related functionsJesse Hall2013-04-103-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return values are declared with the C return type, but the JNI function returns the JNI return type. In the case of GLsync/jlong as in glFenceSync(), this causes a compile error. So the generator now explicitly casts the return value to the JNI return type. Bug: 8566953 Change-Id: I814befe2e4cce745434cbc4e1c8639fc3ce8aeae
* | | | 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