Commit Graph

7851 Commits

Author SHA1 Message Date
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
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
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
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
7e901892af am c40f3ba4: am 3ee119cd: Merge "ndk: update JNIEXPORT declaration in <jni.h>"
* commit 'c40f3ba4c6dfb84a4918c8ec7c721d307fdad02b':
  ndk: update JNIEXPORT declaration in <jni.h>
2011-08-24 09:23:40 -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
c40f3ba4c6 am 3ee119cd: Merge "ndk: update JNIEXPORT declaration in <jni.h>"
* commit '3ee119cda4c2e1bdd978f96bfb0b761669d0a62d':
  ndk: update JNIEXPORT declaration in <jni.h>
2011-08-24 09:20:35 -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