283 Commits

Author SHA1 Message Date
Mathias Agopian
e36f5af3ad am 7bde36e6: added GL test for textured lines
Merge commit '7bde36e64e66c81f0150d0372e1357a31f4ec704' into eclair-plus-aosp

* commit '7bde36e64e66c81f0150d0372e1357a31f4ec704':
  added GL test for textured lines
2009-10-28 02:16:14 -07:00
Mathias Agopian
7bde36e64e added GL test for textured lines 2009-10-28 02:09:21 -07:00
Mathias Agopian
59b2ee0dfd am 73e17015: Merge change I8d2de438 into eclair
Merge commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694' into eclair-plus-aosp

* commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694':
  fix [2143798] Need to figure out how to do video
2009-10-27 23:48:38 -07:00
Mathias Agopian
9042b4564d fix [2143798] Need to figure out how to do video
Use EGLImageKHR instead of copybit directly.
    We now have the basis to use streaming YUV textures (well, in fact
    we already are). When/if we use the GPU instead of the MDP we'll
    need to make sure it supports the appropriate YUV format.

    Also make sure we compile if EGL_ANDROID_image_native_buffer is not supported
2009-10-27 13:13:29 -07:00
Jack Palevich
4cf5d9bf13 am 8f89a1a3: Merge change Ic620a52b into eclair
Merge commit '8f89a1a360465e08e81ceca3cb3042606a98668b' into eclair-plus-aosp

* commit '8f89a1a360465e08e81ceca3cb3042606a98668b':
  Add size checks for glBufferData and glBufferSubData
2009-10-23 17:39:12 -07:00
Jack Palevich
c620a52b69 Add size checks for glBufferData and glBufferSubData
Without the size checks it's possible for calls to glBufferData
and glBufferSubData to read off the end of the Buffer object's
data, which can cause page faults.

Fix end-of-line characters for the "spec" files. (That's why
every line of these files is changed.)

Enhance our code emitter to properly handle bounds checks for
possibly-null pointers.
2009-10-21 11:02:44 -07:00
Mathias Agopian
f2d5fb6487 am b34d5d52: Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit 'b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-plus-aosp

* commit 'b34d5d527596102ae7a040d787e4d8c336bf192b':
  Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
2009-10-19 16:26:56 -07:00
Mathias Agopian
b34d5d5275 Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
this will be needed for SMP, but would improve dispatching GL calls a bit
on armv6 and above.
2009-10-19 16:13:46 -07:00
Mathias Agopian
10e49891bc am 62df88bc: Merge change I0953c1d5 into eclair
Merge commit '62df88bcc95a714c1d5035471dfe7fe0ddd9d50b' into eclair-plus-aosp

* commit '62df88bcc95a714c1d5035471dfe7fe0ddd9d50b':
  fix [2153873] EGL-1.4 software implementation misses surface attributes
2009-10-19 15:34:04 -07:00
Android (Google) Code Review
62df88bcc9 Merge change I0953c1d5 into eclair
* changes:
  fix [2153873] EGL-1.4 software implementation misses surface attributes
2009-10-19 18:27:47 -04:00
Mathias Agopian
0953c1d5e1 fix [2153873] EGL-1.4 software implementation misses surface attributes 2009-10-19 14:46:27 -07:00
Mathias Agopian
e9c394a597 am 3662f9ee: Merge change Ide4c8cbc into eclair
Merge commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c' into eclair-plus-aosp

* commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c':
  fix [2151588] glTexSubImage2D() allows pixel format conversion
2009-10-19 14:41:53 -07:00
Mathias Agopian
283cf1ce56 am 639d69fe: Merge change I88d11cfb into eclair
Merge commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4' into eclair-plus-aosp

* commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4':
  one step towards fixing [2071412] work around mdp 32-bits fade limitation
2009-10-19 14:41:42 -07:00
Android (Google) Code Review
3662f9ee5b Merge change Ide4c8cbc into eclair
* changes:
  fix [2151588] glTexSubImage2D() allows pixel format conversion
2009-10-19 17:31:52 -04:00
Mathias Agopian
78811906c3 fix [2151588] glTexSubImage2D() allows pixel format conversion 2009-10-19 14:23:02 -07:00
Mathias Agopian
88d11cfbfc one step towards fixing [2071412] work around mdp 32-bits fade limitation
simplify the GL_MODULATE case and allow blending disabled with RGBA texture
2009-10-16 18:24:12 -07:00
Mathias Agopian
b0f33aa280 am 69fba87a: Merge change I6fc56997 into eclair
Merge commit '69fba87ac16d1c10da81fc3213ae169c755797f4' into eclair-plus-aosp

* commit '69fba87ac16d1c10da81fc3213ae169c755797f4':
  fix [2187212] add support for GLESv2 dispatch based on TLS
2009-10-16 14:32:37 -07:00
Mathias Agopian
6fc569971f fix [2187212] add support for GLESv2 dispatch based on TLS
Instead of using a different function pointer table for ES 1.x and ES 2.x,
we use a single one that is the union (sort|uniq) of both tables. Two
instances of this table are initialized with pointers to GL ES 1.x and GL ES 2.x
entry-points.
When a context is created, we store its version number and when it is bound to a
thread we set the approruiate table based on the stored version.

This introduce no penalty while dispatching gl calls to the right API version.

[Pending Dr No approval for MR1]
2009-10-14 02:06:37 -07:00
Dima Zavin
aa8f0e5256 am 98b3def2: Merge change I6261ab54 into eclair
Merge commit '98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-plus-aosp

* commit '98b3def2983e78409002cf406574bbc8eeef8bfd':
  Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
2009-10-12 12:08:10 -07:00
Christoffer Gurell
4a783af6ec Fix obvious typo bug in egl.cpp
can (and does sometimes) lead to accessing array with -1 as index
2009-10-12 11:57:27 +02:00
Dima Zavin
6261ab5422 Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
This reverts commit ed5ecdba36648973be3033a045e2ece8bf039e4a.
2009-10-09 18:23:08 -07:00
Mathias Agopian
f3b37d1bce am 846322a9: Merge change Ib96df854 into eclair
Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-plus-aosp

* commit '846322a9ae5ef8155cca0059d3f64d718516ca13':
  add a way to easily catch and log GL errors (compile time flag)
2009-10-08 16:20:45 -07:00
Mathias Agopian
b96df8548e add a way to easily catch and log GL errors (compile time flag) 2009-10-08 15:58:11 -07:00
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