Commit Graph

482 Commits

Author SHA1 Message Date
134db3b2d6 am 85ade33e: fix [2071412] work around mdp 32-bits fade limitation
Merge commit '85ade33edcc7d9be462ad7b8455d27f6654aca5e' into eclair-plus-aosp

* commit '85ade33edcc7d9be462ad7b8455d27f6654aca5e':
  fix [2071412] work around mdp 32-bits fade limitation
2009-10-28 15:04:10 -07:00
85ade33edc fix [2071412] work around mdp 32-bits fade limitation
in the case where we fade a 32-bits surface (ie: GL_MODULATE w/ a,a,a,a + blending),
we first make a copy of the background into a RGB buffer, then we blend the 32-bits
surface as usual (without the alpha component), and finally blend the copy of
the background on top with 1-a. This uses a lot of bandwidth, but no CPU time.
2009-10-28 14:49:44 -07:00
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
7bde36e64e added GL test for textured lines 2009-10-28 02:09:21 -07:00
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
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
31f4c2d653 am a9046729: am a2ec1f4c: am 8f89a1a3: Merge change Ic620a52b into eclair
Merge commit 'a904672996c60c4ec50439a8d2be04fd9bd6444c'

* commit 'a904672996c60c4ec50439a8d2be04fd9bd6444c':
  Add size checks for glBufferData and glBufferSubData
2009-10-23 17:55:49 -07:00
a904672996 am a2ec1f4c: am 8f89a1a3: Merge change Ic620a52b into eclair
Merge commit 'a2ec1f4cea5531fb824b3fb2802ef4573a4916d9' into eclair-mr2-plus-aosp

* commit 'a2ec1f4cea5531fb824b3fb2802ef4573a4916d9':
  Add size checks for glBufferData and glBufferSubData
2009-10-23 17:49:17 -07:00
a2ec1f4cea am 8f89a1a3: Merge change Ic620a52b into eclair
Merge commit '8f89a1a360465e08e81ceca3cb3042606a98668b' into eclair-mr2

* commit '8f89a1a360465e08e81ceca3cb3042606a98668b':
  Add size checks for glBufferData and glBufferSubData
2009-10-23 17:39:47 -07:00
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
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
cfd10e3b7f am 18dc8826: am 992f4802: am b34d5d52: Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit '18dc8826a2c7244a7a61c9c53113516416db4714'

* commit '18dc8826a2c7244a7a61c9c53113516416db4714':
  Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
2009-10-19 16:43:15 -07:00
18dc8826a2 am 992f4802: am b34d5d52: Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit '992f4802aefba9f4a8122cc5332f2bc726a3f3f6' into eclair-mr2-plus-aosp

* commit '992f4802aefba9f4a8122cc5332f2bc726a3f3f6':
  Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
2009-10-19 16:37:36 -07:00
992f4802ae am b34d5d52: Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit 'b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-mr2

* commit 'b34d5d527596102ae7a040d787e4d8c336bf192b':
  Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
2009-10-19 16:27:37 -07:00
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
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
03010fe160 am 5a4c7a61: am 60714539: am 62df88bc: Merge change I0953c1d5 into eclair
Merge commit '5a4c7a61da8f8586a535661c73ce4681cb9bf111'

* commit '5a4c7a61da8f8586a535661c73ce4681cb9bf111':
  fix [2153873] EGL-1.4 software implementation misses surface attributes
2009-10-19 15:55:51 -07:00
5a4c7a61da am 60714539: am 62df88bc: Merge change I0953c1d5 into eclair
Merge commit '60714539ad896a548c4b0c0b42afc61447cb6e2b' into eclair-mr2-plus-aosp

* commit '60714539ad896a548c4b0c0b42afc61447cb6e2b':
  fix [2153873] EGL-1.4 software implementation misses surface attributes
2009-10-19 15:44:18 -07:00
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
60714539ad am 62df88bc: Merge change I0953c1d5 into eclair
Merge commit '62df88bcc95a714c1d5035471dfe7fe0ddd9d50b' into eclair-mr2

* commit '62df88bcc95a714c1d5035471dfe7fe0ddd9d50b':
  fix [2153873] EGL-1.4 software implementation misses surface attributes
2009-10-19 15:33:59 -07:00
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
5cfaaac5f5 am a4aa677d: am b263450f: am 3662f9ee: Merge change Ide4c8cbc into eclair
Merge commit 'a4aa677db36651e806f38e8aa7e8532da4f06b0d'

* commit 'a4aa677db36651e806f38e8aa7e8532da4f06b0d':
  fix [2151588] glTexSubImage2D() allows pixel format conversion
2009-10-19 15:04:54 -07:00
1f15a12a2e am 220f052f: am cf4ff740: am 639d69fe: Merge change I88d11cfb into eclair
Merge commit '220f052f6103655e08cba6cfb1dc542b81ffab11'

* commit '220f052f6103655e08cba6cfb1dc542b81ffab11':
  one step towards fixing [2071412] work around mdp 32-bits fade limitation
2009-10-19 15:04:36 -07:00
a4aa677db3 am b263450f: am 3662f9ee: Merge change Ide4c8cbc into eclair
Merge commit 'b263450f7a5b6ff3c8be8cd4b16aa2f65978f657' into eclair-mr2-plus-aosp

* commit 'b263450f7a5b6ff3c8be8cd4b16aa2f65978f657':
  fix [2151588] glTexSubImage2D() allows pixel format conversion
2009-10-19 14:53:18 -07:00
220f052f61 am cf4ff740: am 639d69fe: Merge change I88d11cfb into eclair
Merge commit 'cf4ff74017ec6b29646022ae5cbf667483b6137b' into eclair-mr2-plus-aosp

* commit 'cf4ff74017ec6b29646022ae5cbf667483b6137b':
  one step towards fixing [2071412] work around mdp 32-bits fade limitation
2009-10-19 14:53:01 -07:00
0953c1d5e1 fix [2153873] EGL-1.4 software implementation misses surface attributes 2009-10-19 14:46:27 -07:00
b263450f7a am 3662f9ee: Merge change Ide4c8cbc into eclair
Merge commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c' into eclair-mr2

* commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c':
  fix [2151588] glTexSubImage2D() allows pixel format conversion
2009-10-19 14:42:00 -07:00
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
cf4ff74017 am 639d69fe: Merge change I88d11cfb into eclair
Merge commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4' into eclair-mr2

* commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4':
  one step towards fixing [2071412] work around mdp 32-bits fade limitation
2009-10-19 14:41:48 -07:00
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
3662f9ee5b Merge change Ide4c8cbc into eclair
* changes:
  fix [2151588] glTexSubImage2D() allows pixel format conversion
2009-10-19 17:31:52 -04:00
78811906c3 fix [2151588] glTexSubImage2D() allows pixel format conversion 2009-10-19 14:23:02 -07:00
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
01c7234434 am 1ed0e43d: am 93942a5b: am 69fba87a: Merge change I6fc56997 into eclair
Merge commit '1ed0e43dac155db048ccc9152dc9425506099957'

* commit '1ed0e43dac155db048ccc9152dc9425506099957':
  fix [2187212] add support for GLESv2 dispatch based on TLS
2009-10-16 15:02:41 -07:00
1ed0e43dac am 93942a5b: am 69fba87a: Merge change I6fc56997 into eclair
Merge commit '93942a5bbc27fe569d370b57a0c3137f6c4171f7' into eclair-mr2-plus-aosp

* commit '93942a5bbc27fe569d370b57a0c3137f6c4171f7':
  fix [2187212] add support for GLESv2 dispatch based on TLS
2009-10-16 14:44:23 -07:00
93942a5bbc am 69fba87a: Merge change I6fc56997 into eclair
Merge commit '69fba87ac16d1c10da81fc3213ae169c755797f4' into eclair-mr2

* commit '69fba87ac16d1c10da81fc3213ae169c755797f4':
  fix [2187212] add support for GLESv2 dispatch based on TLS
2009-10-16 14:33:10 -07:00
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
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
a0fb8eb138 am 09e7ef8a: am a5bfe52d: Merge change Ib3558f35 into eclair-mr2
Merge commit '09e7ef8aadb480349e9f63dcab155cb466296e92'

* commit '09e7ef8aadb480349e9f63dcab155cb466296e92':
  Make our choice of surface explicit.
2009-10-13 20:10:19 -07:00
86a19b3d2c am 70d12dda: am 3743559d: Merge change I28023911 into eclair-mr2
Merge commit '70d12dda7c1e36850e1ed95d719bc1d6dadb6fef'

* commit '70d12dda7c1e36850e1ed95d719bc1d6dadb6fef':
  Add additional error checking of EGL function calls.
2009-10-13 20:10:10 -07:00
09e7ef8aad am a5bfe52d: Merge change Ib3558f35 into eclair-mr2
Merge commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876' into eclair-mr2-plus-aosp

* commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876':
  Make our choice of surface explicit.
2009-10-13 20:00:58 -07:00
70d12dda7c am 3743559d: Merge change I28023911 into eclair-mr2
Merge commit '3743559db03645ef7d319c0344238c335a315b65' into eclair-mr2-plus-aosp

* commit '3743559db03645ef7d319c0344238c335a315b65':
  Add additional error checking of EGL function calls.
2009-10-13 20:00:51 -07:00
b3558f3526 Make our choice of surface explicit. 2009-10-13 19:52:44 -07:00
28023911a4 Add additional error checking of EGL function calls. 2009-10-13 19:52:06 -07:00
ef79172c55 am 98a51b86: am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2
Merge commit '98a51b86869e9cf2a1624f8540c4c126962a3a85'

* commit '98a51b86869e9cf2a1624f8540c4c126962a3a85':
  Allow multiple OpenGL contexts on systems that support them.
2009-10-13 18:20:28 -07:00
98a51b8686 am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2
Merge commit '3b7a1e6d70fda4ce834034930847fe2cc75de515' into eclair-mr2-plus-aosp

* commit '3b7a1e6d70fda4ce834034930847fe2cc75de515':
  Allow multiple OpenGL contexts on systems that support them.
2009-10-13 18:14:51 -07:00
c52ba78cab Allow multiple OpenGL contexts on systems that support them.
Previously we always restricted the number of OpenGL contexts to 1.
2009-10-13 17:58:47 -07:00
2f37ac9677 am 65cc9418: am 332c7934: Merge change I69e21f5f into eclair-mr2
Merge commit '65cc9418af489bd98f3417f165b6837656383a1c'

* commit '65cc9418af489bd98f3417f165b6837656383a1c':
  GLDual test application.
2009-10-13 17:11:22 -07:00
3bf0a1bea8 am 0b2dd95d: am 0c559a4b: am 98b3def2: Merge change I6261ab54 into eclair
Merge commit '0b2dd95d2ead61241688a121ae1c6a5092149ef6'

* commit '0b2dd95d2ead61241688a121ae1c6a5092149ef6':
  Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
2009-10-13 17:02:02 -07:00
65cc9418af am 332c7934: Merge change I69e21f5f into eclair-mr2
Merge commit '332c793432be71d40473fed803123165c57197cd' into eclair-mr2-plus-aosp

* commit '332c793432be71d40473fed803123165c57197cd':
  GLDual test application.
2009-10-13 15:04:12 -07:00