summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am 0b2dd95d: am 0c559a4b: am 98b3def2: Merge change I6261ab54 into eclairDima Zavin2009-10-131-4/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '0b2dd95d2ead61241688a121ae1c6a5092149ef6' * commit '0b2dd95d2ead61241688a121ae1c6a5092149ef6': Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
| * | | am 0c559a4b: am 98b3def2: Merge change I6261ab54 into eclairDima Zavin2009-10-121-4/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '0c559a4b0f8918fe89921d7984001d00285f226f' into eclair-mr2-plus-aosp * commit '0c559a4b0f8918fe89921d7984001d00285f226f': Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
| | * | am 98b3def2: Merge change I6261ab54 into eclairDima Zavin2009-10-121-4/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Merge commit '98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-mr2 * commit '98b3def2983e78409002cf406574bbc8eeef8bfd': Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
| | | * Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"Dima Zavin2009-10-091-4/+0
| | | | | | | | | | | | | | | | This reverts commit ed5ecdba36648973be3033a045e2ece8bf039e4a.
| | * | am 846322a9: Merge change Ib96df854 into eclairMathias Agopian2009-10-081-3/+21
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-mr2 * commit '846322a9ae5ef8155cca0059d3f64d718516ca13': add a way to easily catch and log GL errors (compile time flag)
* | | | am 94f3a363: Merge branch \'eclair-plus-aosp\' of ↵Eric Fischer2009-10-131-3/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp Merge commit '94f3a36326ddecaa09787d795451b0a229fe111c' * commit '94f3a36326ddecaa09787d795451b0a229fe111c': Remove STOPSHIP BT logging. BT API security audit: fix a couple of permission mistakes. Fix issue #2175693: Add vmallocinfo to dumpstate add a way to easily catch and log GL errors (compile time flag) GPS: Fix problem with SUPL when SUPL APN is already active. Import revised translations. DO NOT MERGE Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device. Import revised translations. DO NOT MERGE
| * | | Merge branch 'eclair-plus-aosp' of ↵Eric Fischer2009-10-081-3/+21
| |\ \ \ | | | | | | | | | | | | | | | ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
| | * \ \ am 846322a9: Merge change Ib96df854 into eclairMathias Agopian2009-10-081-3/+21
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-plus-aosp * commit '846322a9ae5ef8155cca0059d3f64d718516ca13': add a way to easily catch and log GL errors (compile time flag)
| | | * | add a way to easily catch and log GL errors (compile time flag)Mathias Agopian2009-10-081-3/+21
| | | | |
| | * | | am 9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into eclairMathias Agopian2009-10-078-1179/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb' into eclair-plus-aosp * commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb': fix [2168528] enable glTexImage2D code path in SF for software-only buffers fix [2168531] have software-only gralloc buffer side-step the HAL fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
| | * | | am 4ac45597: Merge change I15b0ebb9 into eclairMathias Agopian2009-10-076-0/+556
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-plus-aosp * commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d': a simple test app for gralloc
* | | \ \ \ Merge change Id70213e7Android (Google) Code Review2009-10-123-526/+958
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Implement GL11 and GL11Ext methods for GL Log and Error wrappers.
| * | | | | | Implement GL11 and GL11Ext methods for GL Log and Error wrappers.Jack Palevich2009-10-123-526/+958
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now we had been throwing UnsupportedOperationException when developers tried to use the GL11 or GL11Ext methods. Now we handle these methods correctly, passing their arguments through to the wrapped interface's methods. Fixes bug 2167522 GLUtils debug wrapper doesn't support GL11 features
* | | | | | | merged d7c18d7672f3ecbbcb2f5bec92fe54dd990cb8dd, w/conflict in ↵android-build SharedAccount2009-10-128-1180/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | opengl/tests/copybits/Android.mk
| * | | | | | am 0ef55540: am 9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into ↵Mathias Agopian2009-10-068-1179/+5
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eclair Merge commit '0ef55540ab75660c58b284415ebae7ea66684706' into eclair-mr2-plus-aosp * commit '0ef55540ab75660c58b284415ebae7ea66684706': fix [2168528] enable glTexImage2D code path in SF for software-only buffers fix [2168531] have software-only gralloc buffer side-step the HAL fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
| | * | | | | am 9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into eclairMathias Agopian2009-10-068-1179/+5
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb' into eclair-mr2 * commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb': fix [2168528] enable glTexImage2D code path in SF for software-only buffers fix [2168531] have software-only gralloc buffer side-step the HAL fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
| | | * | | | fix [2167050] glTexImage2D code path buggy in SurfaceFlingerMathias Agopian2009-10-068-1179/+5
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When EGLImage extension is not available, SurfaceFlinger will fallback to using glTexImage2D and glTexSubImage2D instead, which requires 50% more memory and an extra copy. However this code path has never been exercised and had some bugs which this patch fix. Mainly the scale factor wasn't computed right when falling back on glDrawElements. We also fallback to this mode of operation if a buffer doesn't have the adequate usage bits for EGLImage usage. This changes only code that is currently not executed. Some refactoring was needed to keep the change clean. This doesn't change anything functionaly.
| * | | | | Merge branch 'eclair-plus-aosp' of ↵Patrick Scott2009-10-051-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
* | | | | am c5b09d8a: am 4ac45597: Merge change I15b0ebb9 into eclairMathias Agopian2009-10-126-0/+556
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c5b09d8a5f7bbf9545b1f2b2d69920fd115d3ecd' * commit 'c5b09d8a5f7bbf9545b1f2b2d69920fd115d3ecd': a simple test app for gralloc
| * | | | am 4ac45597: Merge change I15b0ebb9 into eclairMathias Agopian2009-10-046-0/+556
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-mr2 * commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d': a simple test app for gralloc
| | * | | a simple test app for grallocMathias Agopian2009-10-016-0/+556
| | | | |
* | | | | am 7d638292: Merge change Ib4285d22 into eclair-mr2Jack Palevich2009-10-121-9/+166
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | Merge commit '7d638292969687ed4557d36e741e1275d2052fb0' * commit '7d638292969687ed4557d36e741e1275d2052fb0': Change way we choose EGL surfaces to be compatible with the native
| * | | Change way we choose EGL surfaces to be compatible with the nativeJack Palevich2009-10-021-9/+166
| |/ / | | | | | | | | | window surface.
* | | Add back missing shared libraries used in executables in link commands. TheseDoug Kwan2009-10-044-0/+4
| |/ |/| | | | | | | | | executables have calls to some shared libraries without explicitly linking them. Currently it works as linker links these libraries via dependencies of other libraries. This is fragile and not the right thing to do.
* | am bcbca57f: Merge change I5ffd6240 into eclairJack Palevich2009-09-302-0/+374
|\ \ | |/ | | | | | | | | | | Merge commit 'bcbca57f4c0da0cee3682c78aacfa081483f0020' into eclair-plus-aosp * commit 'bcbca57f4c0da0cee3682c78aacfa081483f0020': Add a simple test of OpenGL ES 1.x.
| * Add a simple test of OpenGL ES 1.x.Jack Palevich2009-09-302-0/+374
| |
* | am b386a86c: Merge change I8018f091 into eclairJack Palevich2009-09-304-64/+76
|\ \ | |/ | | | | | | | | | | Merge commit 'b386a86c1c131832c8f9955a5a57a2fa13609d15' into eclair-plus-aosp * commit 'b386a86c1c131832c8f9955a5a57a2fa13609d15': Add very simple input path. Fix end-of-line issues.
| * Merge change I8018f091 into eclairAndroid (Google) Code Review2009-09-304-64/+76
| |\ | | | | | | | | | | | | * changes: Add very simple input path. Fix end-of-line issues.
| | * Add very simple input path. Fix end-of-line issues.Jack Palevich2009-09-304-64/+76
| | |
* | | am 97702aac: Merge changes I82c78b83,I54f72d9d into eclairJack Palevich2009-09-282-54/+58
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Merge commit '97702aacfc7f84b473357ce102cc70da2a316032' into eclair-plus-aosp * commit '97702aacfc7f84b473357ce102cc70da2a316032': Don't ask for pbuffer support, because we don't use any pbuffers. Print out EGL configuration info for the config we've chosen.
| * | Don't ask for pbuffer support, because we don't use any pbuffers.Jack Palevich2009-09-281-1/+1
| | |
| * | Print out EGL configuration info for the config we've chosen.Jack Palevich2009-09-281-53/+57
| | | | | | | | | | | | | | | Don't ask for PBuffer support, since we don't actually use pbuffers, and some drivers might not support them.
* | | am ee25eb58: Merge change I669ce246 into eclairJack Palevich2009-09-281-8/+82
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'ee25eb58aac8fded3927c0343eaa367f66c8b79d' into eclair-plus-aosp * commit 'ee25eb58aac8fded3927c0343eaa367f66c8b79d': Print out all available EGL configurations.
| * | Print out all available EGL configurations.Jack Palevich2009-09-281-8/+82
| | |
* | | am 1a3c8950: Merge change 27387 into eclairMathias Agopian2009-09-271-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1a3c8950394b98f6f354456830208d70e87b8bb6' into eclair-plus-aosp * commit '1a3c8950394b98f6f354456830208d70e87b8bb6': fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
| * | fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to ↵Mathias Agopian2009-09-271-1/+2
| |/ | | | | | | | | | | EGL_OPENGL_ES_BIT Also set max swap interval to 1, which is the only supported value currently.
* | am ed5ecdba: egl: temporarily also include eglTerminate->eglInitialize hack ↵Dima Zavin2009-09-261-0/+4
|\ \ | |/ | | | | | | | | | | | | | | for 8k Merge commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a' into eclair-plus-aosp * commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a': egl: temporarily also include eglTerminate->eglInitialize hack for 8k
| * egl: temporarily also include eglTerminate->eglInitialize hack for 8kDima Zavin2009-09-261-0/+4
| | | | | | | | | | Change-Id: Id5c51e54e733b24e5d5d5de0dcca84ac53afd3a9 Signed-off-by: Dima Zavin <dima@android.com>
* | am 8b854e0d: Merge change 27211 into eclairJack Palevich2009-09-251-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '8b854e0d59512004028f96a93016e614c7df478a' into eclair-plus-aosp * commit '8b854e0d59512004028f96a93016e614c7df478a': Fix build.
| * Fix build.Jack Palevich2009-09-251-1/+1
| |
* | am 056ade1b: Merge change 27203 into eclairJack Palevich2009-09-253-22/+25
|\ \ | |/ | | | | | | | | | | Merge commit '056ade1ba976eed5f9b3139ee96b9eb3a26f6283' into eclair-plus-aosp * commit '056ade1ba976eed5f9b3139ee96b9eb3a26f6283': Tighten up sample code.
| * Tighten up sample code.Jack Palevich2009-09-253-22/+25
| | | | | | | | - Still fails to work; don't know why.
* | am 07e0dce4: Merge change 27202 into eclairJack Palevich2009-09-251-4/+12
|\ \ | |/ | | | | | | | | | | Merge commit '07e0dce441ea056710efd76d7df18b8833de772a' into eclair-plus-aosp * commit '07e0dce441ea056710efd76d7df18b8833de772a': Check for failure to create EGL surfaces and contexts.
| * Check for failure to create EGL surfaces and contexts.Jack Palevich2009-09-251-4/+12
| |
* | am 2a5eea30: Merge change 27168 into eclairJack Palevich2009-09-251-55/+36
|\ \ | |/ | | | | | | | | | | Merge commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e' into eclair-plus-aosp * commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e': Use EGLUtils to simplify choosing a configuration.
| * Use EGLUtils to simplify choosing a configuration.Jack Palevich2009-09-251-55/+36
| | | | | | | | Doesn't actually select anything, possibly due to device driver errors.
* | am 117f574e: Merge change 26911 into eclairMathias Agopian2009-09-241-3/+1
|\ \ | |/ | | | | | | | | | | Merge commit '117f574e105c682ebff19ece7230fab86fea3d17' into eclair-plus-aosp * commit '117f574e105c682ebff19ece7230fab86fea3d17': OpenGL ES doesn't allow glColorPointer with a size parameter other than 4
| * Merge change 26911 into eclairAndroid (Google) Code Review2009-09-241-3/+1
| |\ | | | | | | | | | | | | * changes: OpenGL ES doesn't allow glColorPointer with a size parameter other than 4
| | * OpenGL ES doesn't allow glColorPointer with a size parameter other than 4Mathias Agopian2009-09-241-3/+1
| | |
* | | am b87f24a6: Merge change 26908 into eclairJack Palevich2009-09-241-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'b87f24a6a88a994256ca97b69904af28824bc9ce' into eclair-plus-aosp * commit 'b87f24a6a88a994256ca97b69904af28824bc9ce': Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory.