54 Commits

Author SHA1 Message Date
Mathias Agopian
24e2cdcece am 2eca23d6: am a2151b2b: am 7bde36e6: added GL test for textured lines
Merge commit '2eca23d690379911a102729eecd35412d0c8be63'

* commit '2eca23d690379911a102729eecd35412d0c8be63':
  added GL test for textured lines
2009-10-29 02:05:33 -07:00
Mathias Agopian
a2151b2b98 am 7bde36e6: added GL test for textured lines
Merge commit '7bde36e64e66c81f0150d0372e1357a31f4ec704' into eclair-mr2

* commit '7bde36e64e66c81f0150d0372e1357a31f4ec704':
  added GL test for textured lines
2009-10-29 01:27:18 -07:00
Mathias Agopian
7bde36e64e added GL test for textured lines 2009-10-28 02:09:21 -07:00
Jack Palevich
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
Jack Palevich
b3558f3526 Make our choice of surface explicit. 2009-10-13 19:52:44 -07:00
Jack Palevich
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
Jack Palevich
69e21f5f6e GLDual test application.
Draws two images at once, one GL based, one GL2 based.
2009-10-13 14:56:00 -07:00
android-build SharedAccount
fd2f0a9425 merged d7c18d7672f3ecbbcb2f5bec92fe54dd990cb8dd, w/conflict in opengl/tests/copybits/Android.mk 2009-10-12 12:23:37 -07:00
Mathias Agopian
e88cd11c33 am c5b09d8a: am 4ac45597: Merge change I15b0ebb9 into eclair
Merge commit 'c5b09d8a5f7bbf9545b1f2b2d69920fd115d3ecd'

* commit 'c5b09d8a5f7bbf9545b1f2b2d69920fd115d3ecd':
  a simple test app for gralloc
2009-10-12 11:19:04 -07:00
Jack Palevich
39171561f0 am 7d638292: Merge change Ib4285d22 into eclair-mr2
Merge commit '7d638292969687ed4557d36e741e1275d2052fb0'

* commit '7d638292969687ed4557d36e741e1275d2052fb0':
  Change way we choose EGL surfaces to be compatible with the native
2009-10-12 11:18:32 -07:00
Mathias Agopian
0ef55540ab am 9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into eclair
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
2009-10-06 19:17:44 -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
Doug Kwan
b1bb6cfe91 Add back missing shared libraries used in executables in link commands. These
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.
2009-10-04 19:27:57 -07:00
Mathias Agopian
c5b09d8a5f am 4ac45597: Merge change I15b0ebb9 into eclair
Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-mr2

* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
  a simple test app for gralloc
2009-10-04 15:14:32 -07:00
Jack Palevich
b4285d222a Change way we choose EGL surfaces to be compatible with the native
window surface.
2009-10-02 14:43:51 -07:00
Mathias Agopian
15b0ebb925 a simple test app for gralloc 2009-10-01 17:23:05 -07:00
Jack Palevich
5ffd62405a Add a simple test of OpenGL ES 1.x. 2009-09-30 14:17:12 -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
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
669ce246a8 Print out all available EGL configurations. 2009-09-28 16:34:45 -07:00
Jack Palevich
d7de5ffb30 Fix build. 2009-09-25 19:55:07 -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
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
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
a8fecb87c5 Create samples showing how to call OpenGL from JNI libraries. 2009-09-23 14:48:07 -07:00
Jack Palevich
953254b2f2 Draw a green triangle using OpenGL 2.0 APIs. 2009-09-18 18:27:37 -07:00
Jack Palevich
fc342cbbf7 Add additional error checking, exit early if errors occur. 2009-09-17 10:59:23 -07:00
Jack Palevich
113096d5d0 Add EGL call error checking. 2009-09-16 11:08:43 -07:00
Jason Sams
b22f5b3bb3 Simple app to create a gl2 context and dump the strings. 2009-09-01 20:41:05 -07:00
Mathias Agopian
a1d9388ea7 show that we need to glClear to be fast(er) 2009-08-11 20:50:20 -07:00
Mathias Agopian
0d63f8163d option to use drawtexture at compile time 2009-08-11 20:12:18 -07:00
Mathias Agopian
88caa97f9e fix and extend the filter test a bit 2009-08-11 19:55:31 -07:00
Mathias Agopian
e6f0f5c8fb workaround a bug in the SGX driver that would prevent eglGetConfig to work properly 2009-08-10 16:48:22 -07:00
Mathias Agopian
9ca4dd6011 minor code clean-up 2009-08-07 16:38:10 -07:00
Mathias Agopian
a1f6eff297 update most gl tests to use EGLUtils 2009-08-06 16:26:15 -07:00
Mathias Agopian
265d9c076a added two EGL helpers for selecting a config matching a certain pixelformat or native window type 2009-08-06 16:05:39 -07:00
Mathias Agopian
bb99ffb4db added a gl swapinterval test 2009-08-05 17:38:49 -07:00
Mathias Agopian
429c521b15 opengl tests 2009-08-05 12:22:29 -07:00
Mathias Agopian
f31868e59f merge master in master_gl 2009-06-24 18:31:21 -07:00
Sriram Raman
1562f872a3 Remove opengl tests from tests build 2009-06-22 17:22:12 -07:00
Mathias Agopian
350d651706 fix a bug where copybit only renders in the first buffer when used with s/w GL 2009-06-10 16:15:32 -07:00
Mathias Agopian
07fcf4c3a9 revive the copybit test. 2009-06-09 21:38:08 -07:00
Mathias Agopian
51c8a3e00e Merge commit 'goog/master' into merge_master 2009-06-05 15:45:39 -07:00
Mathias Agopian
de15ddc86c simplify this test 2009-06-02 18:35:48 -07:00
Mathias Agopian
46d7ccb403 added a test that exhibits some lighting issues in the software renderer. see external bug 1709 2009-06-01 18:59:44 -07:00
Mathias Agopian
dff8e58d47 update surfaceflinger, libui and libagl to the new gralloc api
- Currently the lock/unlock path is naive and is done for each drawing operation (glDrawElements and glDrawArrays). this should be improved eventually.
- factor all the lock/unlock code in SurfaceBuffer.
- fixed "showupdate" so it works even when we don't have preserving eglSwapBuffers().
- improved the situation with the dirty-region and fixed a problem that caused GL apps to not update.
- make use of LightRefBase() where needed, instead of duplicating its implementation
- add LightRefBase::getStrongCount()
- renamed EGLNativeWindowSurface.cpp to FramebufferNativeWindow.cpp

- disabled copybits test, since it clashes with the new gralloc api

- Camera/Video will be fixed later when we rework the overlay apis
2009-05-04 14:17:04 -07:00
Jack Palevich
e909ae55e3 Add clarifying comment.
(Primarily as a test of the master_gl branch.)
2009-04-13 22:03:39 -07:00
Mathias Agopian
1473f46cbc Integrate from //sandbox/mathias/donut/...@145728
SurfaceFlinger rework for new EGL driver model support.
2009-04-10 14:24:30 -07:00