Merge commit '3b7a1e6d70fda4ce834034930847fe2cc75de515' into eclair-mr2-plus-aosp
* commit '3b7a1e6d70fda4ce834034930847fe2cc75de515':
Allow multiple OpenGL contexts on systems that support them.
Merge commit '0c559a4b0f8918fe89921d7984001d00285f226f' into eclair-mr2-plus-aosp
* commit '0c559a4b0f8918fe89921d7984001d00285f226f':
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
Merge commit '98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-mr2
* commit '98b3def2983e78409002cf406574bbc8eeef8bfd':
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-mr2
* commit '846322a9ae5ef8155cca0059d3f64d718516ca13':
add a way to easily catch and log GL errors (compile time flag)
Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-plus-aosp
* commit '846322a9ae5ef8155cca0059d3f64d718516ca13':
add a way to easily catch and log GL errors (compile time flag)
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
Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-plus-aosp
* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
a simple test app for gralloc
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
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
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 commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-mr2
* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
a simple test app for gralloc
Merge commit 'bcbca57f4c0da0cee3682c78aacfa081483f0020' into eclair-plus-aosp
* commit 'bcbca57f4c0da0cee3682c78aacfa081483f0020':
Add a simple test of OpenGL ES 1.x.
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.
Merge commit 'ee25eb58aac8fded3927c0343eaa367f66c8b79d' into eclair-plus-aosp
* commit 'ee25eb58aac8fded3927c0343eaa367f66c8b79d':
Print out all available EGL configurations.
Merge commit '1a3c8950394b98f6f354456830208d70e87b8bb6' into eclair-plus-aosp
* commit '1a3c8950394b98f6f354456830208d70e87b8bb6':
fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
Merge commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a' into eclair-plus-aosp
* commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a':
egl: temporarily also include eglTerminate->eglInitialize hack for 8k
Merge commit '07e0dce441ea056710efd76d7df18b8833de772a' into eclair-plus-aosp
* commit '07e0dce441ea056710efd76d7df18b8833de772a':
Check for failure to create EGL surfaces and contexts.
Merge commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e' into eclair-plus-aosp
* commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e':
Use EGLUtils to simplify choosing a configuration.
Merge commit '117f574e105c682ebff19ece7230fab86fea3d17' into eclair-plus-aosp
* commit '117f574e105c682ebff19ece7230fab86fea3d17':
OpenGL ES doesn't allow glColorPointer with a size parameter other than 4
Merge commit 'b87f24a6a88a994256ca97b69904af28824bc9ce' into eclair-plus-aosp
* commit 'b87f24a6a88a994256ca97b69904af28824bc9ce':
Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory.
Merge commit 'd0b584148bdcc219136d92e2034e316ae50c8151' into eclair-plus-aosp
* commit 'd0b584148bdcc219136d92e2034e316ae50c8151':
Make tritex test run with latest OpenGL driver.
Use EGLUtils::selectConfigForNativeWindow to select a legitimate
configuration. (Before now we had been selecting an incorrect
configuration, but the older drivers let us get away with it.)
Converted the source to C++ so we can call selectConfigForNativeWindow.
Merge commit '1267b0e1844ac802de92b203007513573e4886fd' into eclair-plus-aosp
* commit '1267b0e1844ac802de92b203007513573e4886fd':
Publish minor additions to GLSurfaceView API.
