Commit Graph

5959 Commits

Author SHA1 Message Date
David Turner
02ef4e9957 Merge "Android emulator opengl - OpenGL ES 1.1 decoder" 2011-03-28 12:59:55 -07:00
David Turner
39c9911c9d Merge "Emulator opengl - Opengl ES 1.1 encoder" 2011-03-28 12:57:14 -07:00
Raphael
e2d5577e86 am 4cc9a1e9: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge.
* commit '4cc9a1e942f068c86b0715e398ec40f86a9deb87':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
2011-03-28 12:56:11 -07:00
David Turner
980157234c Merge "Opengl implementation - codec common code" 2011-03-28 12:50:36 -07:00
Jacky Romano
f99884f916 Android emulator opengl - host side EGL wrapper
This adds an EGL wrapper used by the test rendering to load an EGL
implementation that matches the OpenGL ES impelmentation that it uses.
The library is a simple wrapper that direct EGL calls through a dispatch
table that is dynamically loaded from an EGL shared library implementation

Change-Id: I6379d6b156c69f9e017da0039c96699290f0f84f
2011-03-28 19:22:31 +02:00
Jacky Romano
faa8994f17 Android emulator opengl - unit test host side renderer
This adds 'ut_renderer' - a host side unit test renderer. ut_renderer is used to
take a command stream over a socket connection and render it into an opengl window.
The renderer uses the GLESv1_dec decoder library and the ut_rendercontrol api to parse
the command stream.
The ut_renderer uses an external (plug-in) opengl impelementation.

Change-Id: I77794044ca9ca8a75a66a95a248eac384710aafe
2011-03-28 19:20:23 +02:00
Jacky Romano
a4205ba264 Android emulator opengles - unit test gles wrapper
This adds opengl es implementation driver that selects whether to use
the native android emulator opengl impelementation or use a remote,
host side renderer. This driver is used to selectivley run applications using
the remote renderer. The selection is based on the application/process name and
is configured using /etc/gles_emul.cfg in the emulator side.

This change also installs /etc/egl.cfg that is used by the Android opengl wrapper
to select an opengl implementation

Change-Id: I66eda3d48938f8057bf45e6476b7faefaf1130fb
2011-03-28 19:18:27 +02:00
Jacky Romano
2d824c62e7 Android emulator opengl - unit testing render control api
This adds minimal rendering control api codec that is used by opengl codec
unit tests. The api is used to pass messages regarding resource creation
(surfaces, opengl context) and swapbuffers notifications.
The actual encoder and decoder code is generated using 'emugen'

Change-Id: Ia9b74ae755d032a9b02fdc5f85575d4cd8ada326
2011-03-28 19:08:40 +02:00
Jacky Romano
f92438f64c Android emulator opengl - OpenGL ES 1.1 decoder
This change adds the opengl host side decoder library (libGLESv1_dec)
The library uses the GLESv1 api defintion (part of libGLESv1_enc library)
used by emugen to generate the library code. It also includes
The generated code is wrapped with the GLDecoder class to handle OpenGL
specific semantics

Change-Id: I0948f1984e538d8f6cfedc961e6296686b4be850
2011-03-28 19:08:20 +02:00
Jacky Romano
6a04b8afc5 Emulator opengl - Opengl ES 1.1 encoder
This change the opengl target side encoder library (libGLESv1_enc)
The library includes api definition files for 'emugen' code generation
tool and a serrounding code to handle opengl specific sematics (such as client state)
tracking

Change-Id: I8708b945c8c9c7fbe06147b703bdee27a576c7a0
2011-03-28 19:06:03 +02:00
Jacky Romano
c27986a3c2 Opengl implementation - codec common code
This change adds the libOpenglCodecCommon, which holds
shared code between the encoder and the decoder parts of the opengl
codec. The library is built as static with both a target version and
a host version.

Change-Id: I163eea8fdb635620e6cde9d1d75c3e7369953213
2011-03-28 19:01:49 +02:00
David Turner
201398b489 am 85d6342d: am 99d6295f: Merge "Enable lcd backlight in the emulator."
* commit '85d6342d8b5e76f933a200c8a9832a52b69d9548':
  Enable lcd backlight in the emulator.
2011-03-28 07:41:20 -07:00
David Turner
85d6342d8b am 99d6295f: Merge "Enable lcd backlight in the emulator."
* commit '99d6295f69532f24371a40c27671ac6cbc6b1ded':
  Enable lcd backlight in the emulator.
2011-03-28 07:28:07 -07:00
David Turner
99d6295f69 Merge "Enable lcd backlight in the emulator." 2011-03-28 07:04:33 -07:00
Raphael
06f2189a4e am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master
* commit '627afeae86cf877b53316d976f53c3735414f3ca':
  Fix XMLNS detection in SDK Repo XSD files.
2011-03-25 17:51:57 -07:00
Raphael
31d15b9f76 Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Also merges 3ea87ca65f
  'Fix XMLNS detection in SDK Repo XSD files.'
  to prevent a merge conflict later on.

Change-Id: Ib14fe820dab7a60bb5412968c146c30ec5ba81c7
2011-03-25 17:50:38 -07:00
Raphael
4cc9a1e942 Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Also merges 3ea87ca65f
  'Fix XMLNS detection in SDK Repo XSD files.'
  to prevent a merge conflict later on.

Change-Id: Ic9832e71456d76f849406e641792f4285ffbf649
2011-03-25 17:45:21 -07:00
Raphael
627afeae86 resolved conflicts for merge of 002acfc3 to stage-korg-master
Change-Id: I58e9828bd4d3ebcc4099c9f9ab97390023a1b8e8
2011-03-25 17:38:23 -07:00
Raphael
002acfc342 Merge "Fix XMLNS detection in SDK Repo XSD files." 2011-03-25 16:35:04 -07:00
David Turner
411f741d90 am 4621d1a8: am 18ddf41d: Merge "Add x86 qemu"
* commit '4621d1a82ce5bb3196c82cb164e7b56521f3a7d2':
  Add x86 qemu
2011-03-25 15:51:22 -07:00
Raphael
3ea87ca65f Fix XMLNS detection in SDK Repo XSD files.
Change-Id: I7e804c1d7de2db9428d53242c146e15f4c2fcc15
2011-03-25 14:25:03 -07:00
David 'Digit' Turner
1ca79b3497 am 8edebe1f: am 4712e4eb: Merge "qemud: disable debug traces"
* commit '8edebe1f2877bb0e64321342ff3984e2ab9ab2c3':
  qemud: disable debug traces
2011-03-25 08:49:37 -07:00
David 'Digit' Turner
8edebe1f28 am 4712e4eb: Merge "qemud: disable debug traces"
* commit '4712e4eb1421867bcd0e61d0cc51662fc56a7938':
  qemud: disable debug traces
2011-03-25 08:39:28 -07:00
David 'Digit' Turner
4712e4eb14 Merge "qemud: disable debug traces" 2011-03-25 08:24:58 -07:00
Raphael
7a8e0399c6 am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge."
* commit '86f738abccb61c820d50a3a50d1fd1f0f2745c84':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
2011-03-24 22:44:03 -07:00
Raphael
8ad7417748 am 2a610080: am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge."
* commit '2a6100802234fbbe0643d11ecc8a874096ab9f0f':
  Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
2011-03-24 22:43:59 -07:00
Raphael
86f738abcc am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge."
* commit '473fad031584363bfd011b51522b819cf62d79d3':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
2011-03-24 22:39:32 -07:00
Raphael
2a61008022 am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge."
* commit '878796e999792bf9632cbdbb2f97d7214f212b93':
  Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
2011-03-24 22:39:29 -07:00
Raphael
473fad0315 Merge "Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge." 2011-03-24 22:23:20 -07:00
Raphael
878796e999 Merge "Merge 2ff496b8a1: 'Build SDK repository.' Do not merge." 2011-03-24 22:23:16 -07:00
Raphael
922ee89a69 Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I671e8ff1bc2a6e9f5c097241d65da1cfdde21154
2011-03-24 13:07:30 -07:00
Raphael
56c341295a Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Change-Id: I4f60d3197cac8c22027534cb7686de087ddf1a90
2011-03-24 11:20:16 -07:00
Raphael
9eec951059 Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I1c4a120616697383792d7fb1b328cfcefac0b2f5
2011-03-24 11:09:43 -07:00
David 'Digit' Turner
5f64d75d1d qemud: disable debug traces
They're verbose and unuseful during normal usage.

Change-Id: Ia5e2fb89b0a4844ce911a735078efdafb56bc1b4
2011-03-24 17:14:44 +01:00
David Turner
4621d1a82c am 18ddf41d: Merge "Add x86 qemu"
* commit '18ddf41d5d11729c58fbbfbe0f22e7c5888a1751':
  Add x86 qemu
2011-03-22 06:10:31 -07:00
David Turner
18ddf41d5d Merge "Add x86 qemu" 2011-03-22 06:03:34 -07:00
Bruce Beare
60f5414658 Add x86 qemu
Change-Id: Ic0bfcacd5834f9c2345d7fc0c45528da321f0f7f
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Author: Jun Nakajima <jun.nakajima@intel.com>
2011-03-22 14:02:45 +01:00
Tim Wan
eb02d8daa6 Enable lcd backlight in the emulator.
Adding a new lights.goldfish.so library to enable
lcd backlight in the emulator

Change-Id: I2a6c8af268859d7d30fd90b60ac2a0fe0d9625e8
2011-03-22 13:57:01 +01:00
Xavier Ducrohet
6f06f5755a am 57931c3d: Move samples to 12.
* commit '57931c3ddb4dece3541cb3f1ccfd71aca5920a52':
  Move samples to 12.
2011-03-21 18:16:00 -07:00
Xavier Ducrohet
57931c3ddb Move samples to 12.
Change-Id: Ic56f5f9e59ce601db37b593b2e715793f6c3473c
2011-03-21 17:38:04 -07:00
David 'Digit' Turner
5aaf5c288c am 282bd952: am 9dacf7ee: Merge "Fix two incorrect <android/input.h> function declarations."
* commit '282bd952be2e15391d7e33fa0a9ffab378d374ca':
  Fix two incorrect <android/input.h> function declarations.
2011-03-21 07:44:29 -07:00
David 'Digit' Turner
282bd952be am 9dacf7ee: Merge "Fix two incorrect <android/input.h> function declarations."
* commit '9dacf7ee76a54333c0774eb8c870a3d8b2ef6c5d':
  Fix two incorrect <android/input.h> function declarations.
2011-03-21 07:10:57 -07:00
David 'Digit' Turner
9dacf7ee76 Merge "Fix two incorrect <android/input.h> function declarations." 2011-03-21 06:30:06 -07:00
David 'Digit' Turner
9d0136004f Fix two incorrect <android/input.h> function declarations.
The <android/input.h> header file provided with the NDK contained
two invalid function declarations. This patch fixes them.

Note that this breaks the API, but fixes the ABI (which was previously
broken). It is likely that any application developer that tried to use
these function had problems with them anyway.

Another patch to ndk.git will add a note to the changelog and to
the documentation to explain the issue.

+ Fix some documentation typos.

Change-Id: I0f4517458257ff3242127de9f9099f39948c0a56
2011-03-21 13:57:12 +01:00
Romain Guy
595d6f085b am bc411cdd: Merge 520c90cc from master. do not merge.
* commit 'bc411cdd0233914f5fbab34e8e43fd98732f416b':
  Merge 520c90cc from master. do not merge.
2011-03-18 16:56:49 -07:00
Romain Guy
bc411cdd02 Merge 520c90cc from master. do not merge.
Don't crash because of hardware acceleration.

Change-Id: I70554d5c7637b768cf815bb9f57a5d3e2c49066d
2011-03-18 16:20:28 -07:00
Xavier Ducrohet
c66f8c1880 am d73e1584: Add android-support-v4.jar to the apidemo samples in the SDK package.
* commit 'd73e1584d5898c9c976ec0eeabf4131ddea8ea50':
  Add android-support-v4.jar to the apidemo samples in the SDK package.
2011-03-17 12:49:35 -07:00
Xavier Ducrohet
d73e1584d5 Add android-support-v4.jar to the apidemo samples in the SDK package.
Change-Id: I07a9723152ffc4f08bbfd254e886986ec0429509
2011-03-17 12:10:10 -07:00
Scott Main
128213967b am 900a1c1c: am 62c9b6cb: Merge "fix density sample to state density type rather than screen size" into honeycomb
* commit '900a1c1cf1b6cbf6672f2261f7f65ffce65ce02e':
  fix density sample to state density type rather than screen size
2011-03-16 12:18:21 -07:00
Scott Main
900a1c1cf1 am 62c9b6cb: Merge "fix density sample to state density type rather than screen size" into honeycomb
* commit '62c9b6cb1479c24e07bc81b61b77905d13998b41':
  fix density sample to state density type rather than screen size
2011-03-16 12:13:58 -07:00