drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,157 Commits 1 Branch 0 Tags
Commit Graph

210 Commits

Author SHA1 Message Date
Mathias Agopian
89663e6f4d am 9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into eclair 
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
 2009-10-07 11:59:27 -07:00
Mathias Agopian
b71eb676f4 am 4ac45597: Merge change I15b0ebb9 into eclair 
Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-plus-aosp

* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
  a simple test app for gralloc
 2009-10-07 11:34:37 -07:00
Mathias Agopian
6950e428fe 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.
 2009-10-06 17:00:25 -07:00
Mathias Agopian
15b0ebb925 a simple test app for gralloc 2009-10-01 17:23:05 -07:00
Jack Palevich
ebed3c54ba am bcbca57f: Merge change I5ffd6240 into eclair 
Merge commit 'bcbca57f4c0da0cee3682c78aacfa081483f0020' into eclair-plus-aosp

* commit 'bcbca57f4c0da0cee3682c78aacfa081483f0020':
  Add a simple test of OpenGL ES 1.x.
 2009-09-30 14:21:03 -07:00
Jack Palevich
5ffd62405a Add a simple test of OpenGL ES 1.x. 2009-09-30 14:17:12 -07:00
Jack Palevich
bb8151294c am b386a86c: Merge change I8018f091 into eclair 
Merge commit 'b386a86c1c131832c8f9955a5a57a2fa13609d15' into eclair-plus-aosp

* commit 'b386a86c1c131832c8f9955a5a57a2fa13609d15':
  Add very simple input path. Fix end-of-line issues.
 2009-09-30 06:23:57 -07:00
Android (Google) Code Review
b386a86c1c Merge change I8018f091 into eclair 
* changes:
  Add very simple input path. Fix end-of-line issues.
 2009-09-30 09:15:16 -04:00
Jack Palevich
8018f091b9 Add very simple input path. Fix end-of-line issues. 2009-09-30 06:14:24 -07:00
Jack Palevich
019116ce20 am 97702aac: Merge changes I82c78b83,I54f72d9d into eclair 
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.
 2009-09-28 18:38:48 -07:00
Jack Palevich
54f72d9df8 Don't ask for pbuffer support, because we don't use any pbuffers. 2009-09-28 18:28:07 -07:00
Jack Palevich
82c78b83e3 Print out EGL configuration info for the config we've chosen. 
Don't ask for PBuffer support, since we don't actually use pbuffers,
and some drivers might not support them.
 2009-09-28 18:22:01 -07:00
Jack Palevich
0d6d171af2 am ee25eb58: Merge change I669ce246 into eclair 
Merge commit 'ee25eb58aac8fded3927c0343eaa367f66c8b79d' into eclair-plus-aosp

* commit 'ee25eb58aac8fded3927c0343eaa367f66c8b79d':
  Print out all available EGL configurations.
 2009-09-28 16:44:32 -07:00
Jack Palevich
669ce246a8 Print out all available EGL configurations. 2009-09-28 16:34:45 -07:00
Mathias Agopian
8521fe4ef2 am 1a3c8950: Merge change 27387 into eclair 
Merge commit '1a3c8950394b98f6f354456830208d70e87b8bb6' into eclair-plus-aosp

* commit '1a3c8950394b98f6f354456830208d70e87b8bb6':
  fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
 2009-09-27 20:23:55 -07:00
Mathias Agopian
594d02e54a fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT 
Also set max swap interval to 1, which is the only supported value currently.
 2009-09-27 20:18:16 -07:00
Dima Zavin
434462f0c9 am ed5ecdba: egl: temporarily also include eglTerminate->eglInitialize hack for 8k 
Merge commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a' into eclair-plus-aosp

* commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a':
  egl: temporarily also include eglTerminate->eglInitialize hack for 8k
 2009-09-26 02:00:13 -07:00
Dima Zavin
ed5ecdba36 egl: temporarily also include eglTerminate->eglInitialize hack for 8k 
Change-Id: Id5c51e54e733b24e5d5d5de0dcca84ac53afd3a9
Signed-off-by: Dima Zavin <dima@android.com>
 2009-09-26 01:00:49 -07:00
Jack Palevich
ee61acdc53 am 8b854e0d: Merge change 27211 into eclair 
Merge commit '8b854e0d59512004028f96a93016e614c7df478a' into eclair-plus-aosp

* commit '8b854e0d59512004028f96a93016e614c7df478a':
  Fix build.
 2009-09-25 20:04:20 -07:00
Jack Palevich
d7de5ffb30 Fix build. 2009-09-25 19:55:07 -07:00
Jack Palevich
b44d9e150a am 056ade1b: Merge change 27203 into eclair 
Merge commit '056ade1ba976eed5f9b3139ee96b9eb3a26f6283' into eclair-plus-aosp

* commit '056ade1ba976eed5f9b3139ee96b9eb3a26f6283':
  Tighten up sample code.
 2009-09-25 19:16:18 -07:00
Jack Palevich
a46c138ab3 am 07e0dce4: Merge change 27202 into eclair 
Merge commit '07e0dce441ea056710efd76d7df18b8833de772a' into eclair-plus-aosp

* commit '07e0dce441ea056710efd76d7df18b8833de772a':
  Check for failure to create EGL surfaces and contexts.
 2009-09-25 19:16:13 -07:00
Jack Palevich
aa3b0bee51 Tighten up sample code. 
- Still fails to work; don't know why.
 2009-09-25 19:07:31 -07:00
Jack Palevich
2e26fc08aa Check for failure to create EGL surfaces and contexts. 2009-09-25 19:06:30 -07:00
Jack Palevich
b1d9ee6266 am 2a5eea30: Merge change 27168 into eclair 
Merge commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e' into eclair-plus-aosp

* commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e':
  Use EGLUtils to simplify choosing a configuration.
 2009-09-25 16:47:19 -07:00
Jack Palevich
66d2e25ae3 Use EGLUtils to simplify choosing a configuration. 
Doesn't actually select anything, possibly due to device driver errors.
 2009-09-25 16:25:19 -07:00
Mathias Agopian
a38ff0c263 am 117f574e: Merge change 26911 into eclair 
Merge commit '117f574e105c682ebff19ece7230fab86fea3d17' into eclair-plus-aosp

* commit '117f574e105c682ebff19ece7230fab86fea3d17':
  OpenGL ES doesn't allow glColorPointer with a size parameter other than 4
 2009-09-24 14:51:00 -07:00
Android (Google) Code Review
117f574e10 Merge change 26911 into eclair 
* changes:
  OpenGL ES doesn't allow glColorPointer with a size parameter other than 4
 2009-09-24 17:45:32 -04:00
Mathias Agopian
2ddccd1649 OpenGL ES doesn't allow glColorPointer with a size parameter other than 4 2009-09-24 14:22:29 -07:00
Jack Palevich
bf0d904120 am b87f24a6: Merge change 26908 into eclair 
Merge commit 'b87f24a6a88a994256ca97b69904af28824bc9ce' into eclair-plus-aosp

* commit 'b87f24a6a88a994256ca97b69904af28824bc9ce':
  Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory.
 2009-09-24 14:16:48 -07:00
Jack Palevich
d40dfbbbff Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory. 2009-09-24 14:10:17 -07:00
Jack Palevich
726d9074cf am d0b58414: Merge change 26891 into eclair 
Merge commit 'd0b584148bdcc219136d92e2034e316ae50c8151' into eclair-plus-aosp

* commit 'd0b584148bdcc219136d92e2034e316ae50c8151':
  Make tritex test run with latest OpenGL driver.
 2009-09-24 12:27:16 -07:00
Jack Palevich
87a7265ee1 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.
 2009-09-24 12:19:05 -07:00
Jack Palevich
c055f173c9 am 1267b0e1: Merge change 26882 into eclair 
Merge commit '1267b0e1844ac802de92b203007513573e4886fd' into eclair-plus-aosp

* commit '1267b0e1844ac802de92b203007513573e4886fd':
  Publish minor additions to GLSurfaceView API.
 2009-09-24 12:06:29 -07:00
Jack Palevich
82cbaab450 Publish minor additions to GLSurfaceView API. 
Clients can now modify the way that the EGL context and the EGL window
surface are created and destroyed.
 2009-09-24 11:55:04 -07:00
Jack Palevich
b09c63e240 am 311ed019: Merge change 26679 into eclair 
Merge commit '311ed0191d6423e41b1cf5137a38e53504494818' into eclair-plus-aosp

* commit '311ed0191d6423e41b1cf5137a38e53504494818':
  Create samples showing how to call OpenGL from JNI libraries.
 2009-09-23 15:03:46 -07:00
Jack Palevich
a8fecb87c5 Create samples showing how to call OpenGL from JNI libraries. 2009-09-23 14:48:07 -07:00
Jack Palevich
e231743843 am 1167b43c: Merge change 26317 into eclair 
Merge commit '1167b43c3d1ca232c9b4e0a75343b6b3cb90f0df' into eclair-plus-aosp

* commit '1167b43c3d1ca232c9b4e0a75343b6b3cb90f0df':
  Allow GLSurfaceView clients to customize EGL Surfaces and Contexts.
 2009-09-21 19:31:42 -07:00
Jack Palevich
15e1c6dc7a Allow GLSurfaceView clients to customize EGL Surfaces and Contexts. 
This API is hidden for now, will expose once it's been tested more.
 2009-09-21 19:19:25 -07:00
Jack Palevich
5ac5b68bf1 am 5222a957: Merge change 26270 into eclair 
Merge commit '5222a9571ea2538c989608d376ac71eabe0f09d4' into eclair-plus-aosp

* commit '5222a9571ea2538c989608d376ac71eabe0f09d4':
  Fix GLSurfaceView to sync surfaceDestroyed with GL rendering thread
 2009-09-21 16:09:45 -07:00
Jack Palevich
1bd888ba2e Fix GLSurfaceView to sync surfaceDestroyed with GL rendering thread 
Until now we had a race condition where the GL rendering thread could
continue rendering a frame after we have returned from the
SurfaceHolder.Callback.surfaceDestroyed notification.
 2009-09-21 15:59:17 -07:00
Mathias Agopian
be4d7d2446 am cc7f40a8: Merge change 26060 into eclair 
Merge commit 'cc7f40a88d64cbb4e664e231668ae4e2862036c6' into eclair-plus-aosp

* commit 'cc7f40a88d64cbb4e664e231668ae4e2862036c6':
  log an error when loading an existing GL driver fails
 2009-09-20 16:15:29 -07:00
Mathias Agopian
40621774ec log an error when loading an existing GL driver fails 2009-09-20 16:07:26 -07:00
Jack Palevich
f44ddb6b45 am cd0aceb7: Merge change 25883 into eclair 
Merge commit 'cd0aceb710fc3b62a238992ceef628e359ee1e7d' into eclair-plus-aosp

* commit 'cd0aceb710fc3b62a238992ceef628e359ee1e7d':
  Draw a green triangle using OpenGL 2.0 APIs.
 2009-09-18 18:37:38 -07:00
Jack Palevich
953254b2f2 Draw a green triangle using OpenGL 2.0 APIs. 2009-09-18 18:27:37 -07:00
Jack Palevich
6d3179332d am 78059337: Merge change 25523 into eclair 
Merge commit '7805933738de33b1961bd03553237a86d90792dd' into eclair-plus-aosp

* commit '7805933738de33b1961bd03553237a86d90792dd':
  Add additional error checking, exit early if errors occur.
 2009-09-17 11:06:54 -07:00
Jack Palevich
fc342cbbf7 Add additional error checking, exit early if errors occur. 2009-09-17 10:59:23 -07:00
Jack Palevich
c05a7f6216 am fee6b69a: Merge change 25303 into eclair 
Merge commit 'fee6b69a7ce38118423c114abb977fd1b053be3c' into eclair-plus-aosp

* commit 'fee6b69a7ce38118423c114abb977fd1b053be3c':
  Add EGL call error checking.
 2009-09-16 11:40:30 -07:00
Jack Palevich
113096d5d0 Add EGL call error checking. 2009-09-16 11:08:43 -07:00
Jack Palevich
b734a268a0 am ebebf9c3: Merge change 24618 into eclair 
Merge commit 'ebebf9c36c0112d99cb2e11953febdff8ba5ff23' into eclair-plus-aosp

* commit 'ebebf9c36c0112d99cb2e11953febdff8ba5ff23':
  AGL's glCompressedTexImage2D now checks the imageSize parameter.
 2009-09-10 17:51:50 -07:00