Commit Graph

7816 Commits

Author SHA1 Message Date
David 'Digit' Turner
58df39a591 am 93ee57e6: am 3490b1c2: am b69f4871: Merge "emulator: opengl: remove debug traces."
* commit '93ee57e6786ff406a01161f7a07d9103d4856e48':
  emulator: opengl: remove debug traces.
2011-08-24 09:27:56 -07:00
David 'Digit' Turner
64483553ef am 614d39c2: am f66bbde9: am 95f517bf: Merge "emulator: opengl: Make host decoder libraries static"
* commit '614d39c2f75db3f25ce55a876948c91591f8bf1d':
  emulator: opengl: Make host decoder libraries static
2011-08-24 09:27:54 -07:00
David 'Digit' Turner
0705808814 am efd0415c: am b492a89f: am 476ff38f: Merge "emulator: opengl: build gralloc driver by default"
* commit 'efd0415cf81ddf8c276af1553ded3756e71c53bf':
  emulator: opengl: build gralloc driver by default
2011-08-24 09:27:51 -07:00
David 'Digit' Turner
4ff832cc41 am e0a093ec: am e526f515: am 6d241caf: Merge "emulator: opengl: support moved shared libraries."
* commit 'e0a093ec5b527b3f5455fc54b59e96bd9cc88188':
  emulator: opengl: support moved shared libraries.
2011-08-24 09:27:49 -07:00
David 'Digit' Turner
9eb39ab27f am 6479d059: am 4a6acc04: am d8079c1e: Merge "emulator: opengl: Avoid conflicts with SDL_CONFIG"
* commit '6479d059feb638a7230379621fdd54b86eee5951':
  emulator: opengl: Avoid conflicts with SDL_CONFIG
2011-08-24 09:27:46 -07:00
David 'Digit' Turner
96fafad0ca am b0e1f794: am 011acd64: am d98b3782: Merge "emulator: opengl: fix Windows build"
* commit 'b0e1f794c08f09e4e3f30a00ca686d02a838a020':
  emulator: opengl: fix Windows build
2011-08-24 09:27:43 -07:00
David 'Digit' Turner
eaaa559011 am 827619fc: am d9e0cdfd: am 69f7c472: Merge "Remove obsolete comments"
* commit '827619fc57402c2fbc974e3c2a5da60a3819bf51':
  Remove obsolete comments
2011-08-24 09:27:38 -07:00
David 'Digit' Turner
93ee57e678 am 3490b1c2: am b69f4871: Merge "emulator: opengl: remove debug traces."
* commit '3490b1c2e45f72114d3ac78b35854573e2cbe6de':
  emulator: opengl: remove debug traces.
2011-08-24 09:23:38 -07:00
David 'Digit' Turner
614d39c2f7 am f66bbde9: am 95f517bf: Merge "emulator: opengl: Make host decoder libraries static"
* commit 'f66bbde91de9ff4a9ea87bb16133393fc1027bd7':
  emulator: opengl: Make host decoder libraries static
2011-08-24 09:23:36 -07:00
David 'Digit' Turner
efd0415cf8 am b492a89f: am 476ff38f: Merge "emulator: opengl: build gralloc driver by default"
* commit 'b492a89f00dcea382fc238eb85f5ce3ce4262039':
  emulator: opengl: build gralloc driver by default
2011-08-24 09:23:34 -07:00
David 'Digit' Turner
e0a093ec5b am e526f515: am 6d241caf: Merge "emulator: opengl: support moved shared libraries."
* commit 'e526f515d4615ca2d97fde5aa945f8f60a148089':
  emulator: opengl: support moved shared libraries.
2011-08-24 09:23:31 -07:00
David 'Digit' Turner
6479d059fe am 4a6acc04: am d8079c1e: Merge "emulator: opengl: Avoid conflicts with SDL_CONFIG"
* commit '4a6acc04ca6982114a24c85cc1220bc216d4d867':
  emulator: opengl: Avoid conflicts with SDL_CONFIG
2011-08-24 09:23:28 -07:00
David 'Digit' Turner
b0e1f794c0 am 011acd64: am d98b3782: Merge "emulator: opengl: fix Windows build"
* commit '011acd64edd3d484c0705c426b8d2d3b69f3f997':
  emulator: opengl: fix Windows build
2011-08-24 09:23:25 -07:00
David 'Digit' Turner
827619fc57 am d9e0cdfd: am 69f7c472: Merge "Remove obsolete comments"
* commit 'd9e0cdfda9988f2f45ded4c2c590b8f61c4d9335':
  Remove obsolete comments
2011-08-24 09:23:21 -07:00
David 'Digit' Turner
3490b1c2e4 am b69f4871: Merge "emulator: opengl: remove debug traces."
* commit 'b69f4871cc144fa638315a48f80deaf4968669cf':
  emulator: opengl: remove debug traces.
2011-08-24 09:20:33 -07:00
David 'Digit' Turner
f66bbde91d am 95f517bf: Merge "emulator: opengl: Make host decoder libraries static"
* commit '95f517bfd8dde0a8dc9946eaa4ffc2b057d6c873':
  emulator: opengl: Make host decoder libraries static
2011-08-24 09:20:31 -07:00
David 'Digit' Turner
b492a89f00 am 476ff38f: Merge "emulator: opengl: build gralloc driver by default"
* commit '476ff38f5ffd2cd8c6b6f0e0407aa7a2acc5bdb9':
  emulator: opengl: build gralloc driver by default
2011-08-24 09:20:29 -07:00
David 'Digit' Turner
e526f515d4 am 6d241caf: Merge "emulator: opengl: support moved shared libraries."
* commit '6d241caf737de944a3420a08ec8739623ac47283':
  emulator: opengl: support moved shared libraries.
2011-08-24 09:20:27 -07:00
David 'Digit' Turner
4a6acc04ca am d8079c1e: Merge "emulator: opengl: Avoid conflicts with SDL_CONFIG"
* commit 'd8079c1ecc97504021115865af1e704d4414e2e6':
  emulator: opengl: Avoid conflicts with SDL_CONFIG
2011-08-24 09:20:24 -07:00
David 'Digit' Turner
011acd64ed am d98b3782: Merge "emulator: opengl: fix Windows build"
* commit 'd98b3782a72ca20bf83f15be2782df460503f592':
  emulator: opengl: fix Windows build
2011-08-24 09:20:21 -07:00
David 'Digit' Turner
d9e0cdfda9 am 69f7c472: Merge "Remove obsolete comments"
* commit '69f7c472f660f2fe4c2e44e0a7446c8bf819fcd5':
  Remove obsolete comments
2011-08-24 09:20:18 -07:00
David 'Digit' Turner
b69f4871cc Merge "emulator: opengl: remove debug traces." 2011-08-24 08:18:47 -07:00
David 'Digit' Turner
95f517bfd8 Merge "emulator: opengl: Make host decoder libraries static" 2011-08-24 08:18:17 -07:00
David 'Digit' Turner
476ff38f5f Merge "emulator: opengl: build gralloc driver by default" 2011-08-24 08:18:01 -07:00
David 'Digit' Turner
6d241caf73 Merge "emulator: opengl: support moved shared libraries." 2011-08-24 08:17:41 -07:00
David 'Digit' Turner
d8079c1ecc Merge "emulator: opengl: Avoid conflicts with SDL_CONFIG" 2011-08-24 08:16:59 -07:00
David 'Digit' Turner
d98b3782a7 Merge "emulator: opengl: fix Windows build" 2011-08-24 08:16:50 -07:00
David 'Digit' Turner
69f7c472f6 Merge "Remove obsolete comments" 2011-08-24 08:16:36 -07:00
David 'Digit' Turner
47cbdfb291 emulator: opengl: remove debug traces.
You can still re-enable them by uncommenting one line in
development/tools/emulator/opengl/Android.mk

Change-Id: Ie0a640b6f3359b437aba40b124da0892defb00ef
2011-08-24 16:06:21 +02:00
David 'Digit' Turner
cecb6a0e36 emulator: opengl: Make host decoder libraries static
These libraries are only used by libOpenglRender, so make them
static so that their code is included in this shared library
instead. This reduces the shared library dependencies that
will be required from the emulator.

Change-Id: I24438932f0d6b40852b515140ea6950c04124fdd
2011-08-24 16:06:21 +02:00
David 'Digit' Turner
6efe381c82 emulator: opengl: build gralloc driver by default
This patch forces the default definition of BUILD_EMULATOR_OPENGL_DRIVER
to true by default, which is the common case where we will build the
goldfish-specific gralloc hardware module to allow SurfaceFlinger to
use GLES emulation exclusively.

The only reason to define thi to 'false' today is to debug specific
apps, but this requires displaying the GL output in a different window
than the emulator to be usable.

Change-Id: Iaf03a9c780449bb6b991928d324a088021a73203
2011-08-24 16:06:21 +02:00
David 'Digit' Turner
5dfd5b292a emulator: opengl: support moved shared libraries.
It is possible to move the final installation path of a shared
library by using LOCAL_MODULE_PATH/LOCAL_UNSTRIPPED_PATH in its
module declaration.

We do this for example to put certain libraries under /system/lib/egl
or /system/lib/hw.

However, the Android build system has a small bug where you cannot
depend on these shared libraries because it will complain it doesn't
find them under /system/lib, the default install location.

More precisely, consider libfoo defined as:

  include $(CLEAR_VARS)
  LOCAL_MODULE := libfoo
  LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
  ...
  include $(BUILD_SHARED_LIBRARY)

Its final binary will be installed to /system/lib/egl/libfoo.so

Now, let's write a module that depends on it, as:

  include $(CLEAR_VARS)
  LOCAL_MODULE := libbar
  LOCAL_SHARED_LIBRARIES += libfoo
  ...
  include $(BUILD_SHARED_LIBRARY)

The build system will complain there is no rule to define the target
/system/lib/libfoo.so, but the target should be /system/lib/egl/libfoo.so.

A work-around is to define libbar as follows instead:

  include $(CLEAR_VARS)
  LOCAL_MODULE := libbar
  LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_SHARED_LIBRARIES)/egl/libfoo.so
  ...
  include $(BUILD_SHARED_LIBRARY)

This works if you don't need to link against the library when building your
shared library (which is fortunately the case for the GLES emulation
libraries).

That's essentially what this patch implements under common.mk. We update
emugl-set-shared-library-subpath to record that a module has been "moved",
and we avoid adding them to the LOCAL_SHARED_LIBRARIES variable of the
modules that export it.

+ Simplify three Android.mk files accordingly.

Change-Id: Id15bef5359b0daa8d82bfaa5abf9346f00190ab5
2011-08-24 16:01:00 +02:00
David 'Digit' Turner
e2dda38017 emulator: opengl: Avoid conflicts with SDL_CONFIG
Do not redefine SDL_CONFIG to avoid conflicts with the emulator's
build system which depend on its definition. Note that this has
been fixed in another patch (https://review.source.android.com/25684)
but it is also cleaner to do this here.

Change-Id: I1a30d200e467ac7a91a1e6135fa1de34033e8df0
2011-08-24 16:00:56 +02:00
David 'Digit' Turner
0008793af3 emulator: opengl: fix Windows build
Change-Id: I6953feee41cb2e27f884629104ff6b3b9cccabbc
2011-08-24 16:00:55 +02:00
Brian Carlstrom
974b1d6742 Removed --target-api option from dx.
Change-Id: Ia0d633edfe414061bb313f43c45f9ef55b45f380
2011-08-24 00:20:48 -07:00
David 'Digit' Turner
503419ca75 Remove obsolete comments
Change-Id: Ibaeca7f3cd17305dd4cac042d6020455c5675e2d
2011-08-23 14:10:46 +02:00
David Turner
8597e73b09 am 215a9b22: am 4b9e753f: am beda8a2f: Merge "opengles emulator- check framebuffer status fix"
* commit '215a9b221436a1f1137a48c529d955893dad0736':
  opengles emulator- check framebuffer status fix
2011-08-22 05:39:56 -07:00
David Turner
215a9b2214 am 4b9e753f: am beda8a2f: Merge "opengles emulator- check framebuffer status fix"
* commit '4b9e753fd5fe8e39b122c31e4f4d0911a4c65dc6':
  opengles emulator- check framebuffer status fix
2011-08-22 05:37:28 -07:00
David Turner
4b9e753fd5 am beda8a2f: Merge "opengles emulator- check framebuffer status fix"
* commit 'beda8a2ff919215f082833acc7265f0a5372f048':
  opengles emulator- check framebuffer status fix
2011-08-22 05:35:34 -07:00
David Turner
beda8a2ff9 Merge "opengles emulator- check framebuffer status fix" 2011-08-22 05:20:30 -07:00
Liran
f7e7e467ce opengles emulator- check framebuffer status fix
add drawValidate when calling glCheckFramebufferStatus
in the draw validate, a color attachement will be added to the
framebuffer if there is no target attached to COLOR_ATTACHMENT
of the framebuffer.
opengl does not allow framebuffer with no color attachement
so CheckFramebufferStatus would return INCOMPLETE status.

We already call drawValidate before any draw, the call was
missing at glCheckFramebufferStatus.

Change-Id: I94b930024c3076ac5fe0f8662d11884729c4f953
2011-08-22 14:11:45 +02:00
David Turner
fd783762b0 am 7de05220: am 0b21f486: am b5588b2e: Merge "opengles emulator: fixes flashing effect on Mac"
* commit '7de05220d9ac57691beb4b9a38b7b2113b0f41ab':
  opengles emulator: fixes flashing effect on Mac
2011-08-22 04:19:09 -07:00
David Turner
5df789464c am c3b673b9: am d11fe07f: am 2b80fc12: Merge "opengles emulator: fixed EGL sharing context"
* commit 'c3b673b99cb8e5650355bcb27079dc92b38dbb12':
  opengles emulator: fixed EGL sharing context
2011-08-22 04:19:04 -07:00
David Turner
7de05220d9 am 0b21f486: am b5588b2e: Merge "opengles emulator: fixes flashing effect on Mac"
* commit '0b21f4863bb56f7f5e159dd1cb8dbdba364a7c3e':
  opengles emulator: fixes flashing effect on Mac
2011-08-22 04:15:26 -07:00
David Turner
c3b673b99c am d11fe07f: am 2b80fc12: Merge "opengles emulator: fixed EGL sharing context"
* commit 'd11fe07fed4a1d06ece5b21a05ab9fd302abc4bf':
  opengles emulator: fixed EGL sharing context
2011-08-22 04:15:23 -07:00
David Turner
0b21f4863b am b5588b2e: Merge "opengles emulator: fixes flashing effect on Mac"
* commit 'b5588b2e86ea7b2f19bed58f2e1078393c66fd6a':
  opengles emulator: fixes flashing effect on Mac
2011-08-22 04:11:15 -07:00
David Turner
d11fe07fed am 2b80fc12: Merge "opengles emulator: fixed EGL sharing context"
* commit '2b80fc12bb3385ac6d4a548343c359b855c56ece':
  opengles emulator: fixed EGL sharing context
2011-08-22 04:11:14 -07:00
David Turner
b5588b2e86 Merge "opengles emulator: fixes flashing effect on Mac" 2011-08-22 03:56:58 -07:00
David Turner
2b80fc12bb Merge "opengles emulator: fixed EGL sharing context" 2011-08-22 03:56:25 -07:00
Flavio Lerda
2d7184f851 Remove tests for obsolete repository.
We re-organized the code to live in one of the existing packages and
therefore we no longer need the tests to be run on their own.

Change-Id: I55e6e58628d384218adc6c116f790b540709ec3c
2011-08-21 15:23:15 +01:00