Commit Graph

8071 Commits

Author SHA1 Message Date
David 'Digit' Turner
1cb2c5455c emulator: opengl: Fix egl.cfg tsdefinition
This fixes the definition of the emulator-specific egl.cfg file
used to indicate to our EGL system library which support modules
are available in the emulator.

We need to list two modules here:

  'emulation' corresponding to GPU emulation
  'android' corresponding to the software renderer

The indices before each name correspond to the 'display' and 'impl'
numbers that are expected by frameworks/base/opengl/libs/EGL/Loader.cpp

In a nutshell, 'display' should always be 0, and 'impl' should be 0
for the software renderer, and 1 for a hardware-based one. See the code
under framewors/base/opengl/libs/EGL/egl.cpp for mode details.

Change-Id: I52c898759200c2dfba9049ed00b31b18e8c37f69
2011-09-02 15:26:14 +02:00
Raphael Moll
169eb6ea17 Merge "Move sdk project ant templates into development.git" 2011-09-01 21:35:11 -07:00
Raphael Moll
22e4eb2957 Move sdk project ant templates into development.git
These templates were previously located in sdk.git but
are actually embedded in sdk/platforms/android-n/templates
so really they should be in development.git to avoid
any multi-repo issue.

Change-Id: I9b68f35572fa0c18001873854e1e60d2947dcb39
2011-09-01 00:51:46 -07:00
Adam Powell
758f6d0ab5 Add switch demo
Added default on state and a listener triggering a toast.

Change-Id: I79a89801d878b08fee55919e92044cd71f47108c
2011-08-31 11:23:02 -07:00
David 'Digit' Turner
1479a6cb84 am 7cd5aeb7: am dda2e51a: am 6ba16ba7: Merge "emulator: opengl: add initLibrary function to render library"
* commit '7cd5aeb7c7a109712a660c89d50fb67d35471081':
  emulator: opengl: add initLibrary function to render library
2011-08-30 09:50:49 -07:00
David 'Digit' Turner
b61218ba1b am 1ff9d194: am b6114c7b: am 7cb797f1: Merge "emulator: opengl: use bilinear filtering"
* commit '1ff9d194e3f252a03555edd90702a368a10e50cc':
  emulator: opengl: use bilinear filtering
2011-08-30 09:50:46 -07:00
David 'Digit' Turner
ad520ab701 Merge "emulator: opengl: Fix the emulator-specific builds." 2011-08-30 01:21:32 -07:00
Dianne Hackborn
96ce893673 Merge "Dang you, TabHost." 2011-08-29 18:42:41 -07:00
Dianne Hackborn
648e25f0c7 Dang you, TabHost.
Change-Id: I937cd0748fe0c44d6cd642637321aa6eb550cf91
2011-08-29 18:39:21 -07:00
David 'Digit' Turner
7cd5aeb7c7 am dda2e51a: am 6ba16ba7: Merge "emulator: opengl: add initLibrary function to render library"
* commit 'dda2e51a15ddfc44b34ec3c35e68f3bc1cfb5786':
  emulator: opengl: add initLibrary function to render library
2011-08-29 18:01:01 -07:00
David 'Digit' Turner
1ff9d194e3 am b6114c7b: am 7cb797f1: Merge "emulator: opengl: use bilinear filtering"
* commit 'b6114c7b66744729b8e0e9142e8b07eba41637d5':
  emulator: opengl: use bilinear filtering
2011-08-29 18:00:56 -07:00
David 'Digit' Turner
dda2e51a15 am 6ba16ba7: Merge "emulator: opengl: add initLibrary function to render library"
* commit '6ba16ba75232000740d0532e936df88e33b49b05':
  emulator: opengl: add initLibrary function to render library
2011-08-29 17:57:53 -07:00
David 'Digit' Turner
b6114c7b66 am 7cb797f1: Merge "emulator: opengl: use bilinear filtering"
* commit '7cb797f1fda821c0bc8498855ff8cdcd893c0985':
  emulator: opengl: use bilinear filtering
2011-08-29 17:57:52 -07:00
David 'Digit' Turner
34fa5630b7 emulator: opengl: Fix the emulator-specific builds.
The gralloc.goldfish module cannot build in master because
the gralloc interface evolved considerably since gingerbread
(which the current code is based on).

For now, disable it completely, this will make it impossible
to test GPU emulation in the internal master tree for now.

We'll have to port this module to the new world-order to solve
this.

Change-Id: I864217f9c41fd1234f0df497005499800af879e5
2011-08-29 22:20:37 +02:00
David 'Digit' Turner
ec4c093361 am 84e83659: am 13cd2cd4: am 56eca4e0: Merge "emulator: opengl: fix the build"
* commit '84e836590e5fb655c7fd1f49613a4ae9cd2fa963':
  emulator: opengl: fix the build
2011-08-29 11:05:17 -07:00
David 'Digit' Turner
8ef53760d5 am 2276a468: am 846dd223: am dbe3b024: Merge "emulator: opengl: fallback gralloc module"
* commit '2276a468202750d743848810675e62a63ace67bb':
  emulator: opengl: fallback gralloc module
2011-08-29 11:05:10 -07:00
David 'Digit' Turner
c6d73d7af4 am d960239d: am 43946da5: am 7f45e7c1: Merge "emulator: oops, really fix the build"
* commit 'd960239de6371c2368792c6cc75de6d59abe172c':
  emulator: oops, really fix the build
2011-08-29 11:05:01 -07:00
David 'Digit' Turner
bce8ca33d0 am fec153a7: am 9765cb8a: am 2a59fa7d: Merge "emulator: fix the build"
* commit 'fec153a765edf051f3b97610c748d1ab9526cbfa':
  emulator: fix the build
2011-08-29 11:04:57 -07:00
David 'Digit' Turner
6ba16ba752 Merge "emulator: opengl: add initLibrary function to render library" 2011-08-29 08:01:42 -07:00
David 'Digit' Turner
5d1e8b2f28 emulator: opengl: add initLibrary function to render library
This adds an initLibrary() function to libOpenglRender.

It will be used by the emulator to fallback on software rendering
if the library cannot be initialized properly, e.g. if it is not
possible to load the host EGL/GLES libraries.

Change-Id: I41e8ad73a315166e4a15cbee1db72c2552370f46
2011-08-29 16:57:38 +02:00
David 'Digit' Turner
7cb797f1fd Merge "emulator: opengl: use bilinear filtering" 2011-08-29 06:55:32 -07:00
David 'Digit' Turner
84e836590e am 13cd2cd4: am 56eca4e0: Merge "emulator: opengl: fix the build"
* commit '13cd2cd4f57ce3e005f8d5c150c0cd3c4daf386d':
  emulator: opengl: fix the build
2011-08-26 12:12:56 -07:00
David 'Digit' Turner
2276a46820 am 846dd223: am dbe3b024: Merge "emulator: opengl: fallback gralloc module"
* commit '846dd22375f3db7308fa676e9730757ec1e6c028':
  emulator: opengl: fallback gralloc module
2011-08-26 12:12:52 -07:00
David 'Digit' Turner
13cd2cd4f5 am 56eca4e0: Merge "emulator: opengl: fix the build"
* commit '56eca4e089ee51a43bf3c816773e7af51ca5c628':
  emulator: opengl: fix the build
2011-08-26 12:10:51 -07:00
David 'Digit' Turner
846dd22375 am dbe3b024: Merge "emulator: opengl: fallback gralloc module"
* commit 'dbe3b024cb81419796f01eebb64fba28eedaa301':
  emulator: opengl: fallback gralloc module
2011-08-26 12:10:49 -07:00
David 'Digit' Turner
56eca4e089 Merge "emulator: opengl: fix the build" 2011-08-26 09:18:42 -07:00
David 'Digit' Turner
2dfb7b549f emulator: opengl: fix the build
Change-Id: Ia20d15b63a059ed5d86c9087b827bdfa32c41c86
2011-08-26 18:17:13 +02:00
David 'Digit' Turner
dbe3b024cb Merge "emulator: opengl: fallback gralloc module" 2011-08-26 08:46:55 -07:00
David 'Digit' Turner
91572d15eb emulator: opengl: use bilinear filtering
This patch changes the filter used to scale the GL window
in the rendering library. Instead of nearest-neighbour, use
bi-linear, which will provide for much more pleasant results
when scaling the emulator UI window, or toggling to full-screen
mode.

Change-Id: If2d9e1300fa4878c25e1221eaedb565b9150431a
2011-08-26 17:31:58 +02:00
David 'Digit' Turner
783cc1bb53 emulator: opengl: fallback gralloc module
This patch modifies the gralloc.goldfish module to check
that the emulator does, indeed, support GPU emulation.

If this is not the case, it loads the framebuffer-based fallback
module (gralloc.default) explicitely and uses it instead.

This is necessary because sometimes the emulator will be started
in headless mode in restricted environment, i.e. without access
to the display subsystem or GL libraries, which make GPU emulation
impossible.

We check for ro.kernel.qemu.gles which will be either undefined
or set to 0 if the emulator doesn't support GPU emulation, or 1
otherwise.

Change-Id: Ib6b143e6dcdfb44ff2c5b889138d0fb4118bb461
2011-08-26 17:31:58 +02:00
Fred Quintana
870716fc7a Merge "Make the sync adapter driver understand the new settingsActivity parameter." 2011-08-25 17:30:14 -07:00
David Hu
d9b501bed8 Fix the location of the GspLocationTest.apk
Change-Id: I4f45bab629bb45fdc9e8ac465a330fa1ab7a7a34
2011-08-25 15:29:15 -07:00
David 'Digit' Turner
d960239de6 am 43946da5: am 7f45e7c1: Merge "emulator: oops, really fix the build"
* commit '43946da54d3dc8d840c5e39c8eaf2f46ece57518':
  emulator: oops, really fix the build
2011-08-25 14:30:12 -07:00
David 'Digit' Turner
fec153a765 am 9765cb8a: am 2a59fa7d: Merge "emulator: fix the build"
* commit '9765cb8a7f29dacc615d2357d04ee5412c3e888d':
  emulator: fix the build
2011-08-25 14:30:08 -07:00
David 'Digit' Turner
43946da54d am 7f45e7c1: Merge "emulator: oops, really fix the build"
* commit '7f45e7c1822fd583dd0c9776cb2c1e8d4aa6cb54':
  emulator: oops, really fix the build
2011-08-25 13:48:05 -07:00
David 'Digit' Turner
7f45e7c182 Merge "emulator: oops, really fix the build" 2011-08-25 13:40:54 -07:00
David 'Digit' Turner
20d5b0a857 emulator: oops, really fix the build
Change-Id: Id8de1b6a069cdc462681cf44bf8ebd84bbd1e6f0
2011-08-25 22:14:29 +02:00
David 'Digit' Turner
9765cb8a7f am 2a59fa7d: Merge "emulator: fix the build"
* commit '2a59fa7dd29872c203218ebc3da45011f7caf66c':
  emulator: fix the build
2011-08-25 13:10:39 -07:00
David 'Digit' Turner
2a59fa7dd2 Merge "emulator: fix the build" 2011-08-25 13:01:57 -07:00
David 'Digit' Turner
8b55909388 emulator: fix the build
Change-Id: Id88f488d441f04b10de3bca8ffe5c37763c4e98e
2011-08-25 22:00:55 +02:00
Fred Quintana
bcc1cb9fc0 Make the sync adapter driver understand the new settingsActivity
parameter.

Bug: 5204776
Change-Id: I66c5f40f8cc460479232ecdb71c4e8e0495058c3
2011-08-25 11:27:08 -07:00
Svetoslav Ganov
61c9cbb8b4 Merge "Update required due to framework API change." 2011-08-25 09:10:28 -07:00
David 'Digit' Turner
2746a34082 am c0a719b8: am c6623763: am f29ee346: Merge "emulator: opengl: Open libGL.dylib as a framework on Mac"
* commit 'c0a719b864071df069859ef595271020b960a99a':
  emulator: opengl: Open libGL.dylib as a framework on Mac
2011-08-25 05:58:38 -07:00
David 'Digit' Turner
c0a719b864 am c6623763: am f29ee346: Merge "emulator: opengl: Open libGL.dylib as a framework on Mac"
* commit 'c6623763231c35b738863f5429ddf11c1af3a0be':
  emulator: opengl: Open libGL.dylib as a framework on Mac
2011-08-25 05:56:45 -07:00
David 'Digit' Turner
c662376323 am f29ee346: Merge "emulator: opengl: Open libGL.dylib as a framework on Mac"
* commit 'f29ee346321209b75f37b4f34f9234779e875077':
  emulator: opengl: Open libGL.dylib as a framework on Mac
2011-08-25 05:55:33 -07:00
David 'Digit' Turner
f29ee34632 Merge "emulator: opengl: Open libGL.dylib as a framework on Mac" 2011-08-25 05:44:23 -07:00
David 'Digit' Turner
3f88bea9a8 emulator: opengl: Open libGL.dylib as a framework on Mac
This patch modifies GLDispatch.cpp in the translator libraries
to open the Darwin GL library as a framework. Using a hard-coded
system path prevents the requirement to modify LD_LIBRARY_PATH
or DYLD_LIBRARY_PATH to point to the directory that contains the
library.

In this specific case, this is equivalent to

/System/Frameworks/OpenGL.framework/Libraries/libGL.dylib

But is the "kosher" way to open it the library.

Change-Id: Iccd6568d36fc97200617c268f05d7b4ea85f918e
2011-08-25 14:40:43 +02:00
Svetoslav Ganov
33a93ebfe3 Update required due to framework API change.
Change-Id: I0c297c978415e2a23df1fc2e70ebfa3e6e00715d
2011-08-24 16:35:09 -07:00
David 'Digit' Turner
aa109fa96d am 7e901892: am c40f3ba4: am 3ee119cd: Merge "ndk: update JNIEXPORT declaration in <jni.h>"
* commit '7e901892af103efd41a3967d67063df988c3ebd7':
  ndk: update JNIEXPORT declaration in <jni.h>
2011-08-24 09:27:58 -07:00
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