Commit Graph

5920 Commits

Author SHA1 Message Date
David Turner
a2192b8e17 am ba19e88d: am c4721695: Merge "emulator opengl: add OpenglOsUtils library, a set of OS utils."
* commit 'ba19e88d5351ccbb545eda1ecf4baa8056dd926d':
  emulator opengl: add OpenglOsUtils library, a set of OS utils.
2011-04-16 06:54:14 -07:00
David Turner
6504f70b74 am 0a2bacf6: am b06b3c76: Merge changes If48f5ed6,Ic63a6f73
* commit '0a2bacf64ce7fc2aff7e06a547f5e9f6b67eeda7':
  emulator opengl: first commit of gralloc implementation.
  emulator opengl: OpenglSystemCommon library shared between gralloc/EGL/GLES.
2011-04-16 06:52:26 -07:00
David Turner
ba19e88d53 am c4721695: Merge "emulator opengl: add OpenglOsUtils library, a set of OS utils."
* commit 'c4721695c920abda1dac55e354f032c406669612':
  emulator opengl: add OpenglOsUtils library, a set of OS utils.
2011-04-16 06:26:46 -07:00
David Turner
0a2bacf64c am b06b3c76: Merge changes If48f5ed6,Ic63a6f73
* commit 'b06b3c761c1cc90d1b3ff6b4ae5ab2e16cb8238c':
  emulator opengl: first commit of gralloc implementation.
  emulator opengl: OpenglSystemCommon library shared between gralloc/EGL/GLES.
2011-04-16 06:25:14 -07:00
David Turner
c4721695c9 Merge "emulator opengl: add OpenglOsUtils library, a set of OS utils." 2011-04-16 06:12:25 -07:00
David Turner
b06b3c761c Merge changes If48f5ed6,Ic63a6f73
* changes:
  emulator opengl: first commit of gralloc implementation.
  emulator opengl: OpenglSystemCommon library shared between gralloc/EGL/GLES.
2011-04-16 06:10:24 -07:00
Guy Zadikario
20368d96e0 emulator opengl: add OpenglOsUtils library, a set of OS utils.
This is just a set of OS dependant functionality needed by the
emulator OpenGL host renderer. It currently has implementation for
Linux and Windows only.

osDynLibrary - dlopen/dlsym abstraction
osProcess    - interface to launch a new process, wait and kill it.
osThread     - abstraction interface for creating a thread.

Change-Id: Ib0264592d8c87e865da87acf5c94e2b331801ca4
2011-04-16 10:42:43 +03:00
Guy Zadikario
f7cd7ec421 emulator opengl: first commit of gralloc implementation.
This is the emulator opengl implementation of gralloc.

NOTE that it is currently build only if BUILD_EMULATOR_OPENGL_DRIVER
is defined, This is because the other driver peices (EGL/GLES) are
still missing.

Change-Id: If48f5ed619df6efb00cb4e590d99ce49d87875f6
2011-04-16 10:42:34 +03:00
Guy Zadikario
64db3f9a02 emulator opengl: OpenglSystemCommon library shared between gralloc/EGL/GLES.
This is a static library of utilities shared between the emulator opengl
system components, gralloc, EGL, GLES. In includes host connection functionality
and access to OpenGL TLS info.

Change-Id: Ic63a6f7384a2035308ca6d316c747f0e6c6f2ef3
2011-04-16 10:32:39 +03:00
David 'Digit' Turner
72974d6a95 am 3cdf8eb7: am 2a384265: Merge "Fix Mac build"
* commit '3cdf8eb7548bf165c7e202631107d2d7fe2af943':
  Fix Mac build
2011-04-15 07:51:23 -07:00
David 'Digit' Turner
3cdf8eb754 am 2a384265: Merge "Fix Mac build"
* commit '2a38426583d320ddd234f74594db1fb16ae75d16':
  Fix Mac build
2011-04-15 07:44:59 -07:00
David Turner
43b5d0e259 am d6ad2a63: am 23a491dc: Merge "emulator opengl: renderControl API encoder/decoder"
* commit 'd6ad2a63ca51f11c97042baa43eb33904e6aefb4':
  emulator opengl: renderControl API encoder/decoder
2011-04-15 07:39:15 -07:00
David Turner
eebc97b987 am c1491eb3: am 0f0732fe: Merge "emulator opengl: Added glUtilsPixelBitSize function to glUtils."
* commit 'c1491eb3b91f1e4d84b4e603d0d22d07502158a2':
  emulator opengl: Added glUtilsPixelBitSize function to glUtils.
2011-04-15 07:39:13 -07:00
David Turner
658185c550 am 961949e0: am 2732ff2d: Merge "Moved IOStream.h to be used in external API for libOpenGLRender."
* commit '961949e054c7bb99777848dd8d10ba933bd41817':
  Moved IOStream.h to be used in external API for libOpenGLRender.
2011-04-15 07:39:11 -07:00
David Turner
f0970841bc am a95826fb: am 39062218: Merge " This is a common library for the EGL/GLES/GLES2 translator libraries."
* commit 'a95826fb63f86064e0aff39290926da047e5b873':
  This is a common library for the EGL/GLES/GLES2 translator libraries.
2011-04-15 07:39:04 -07:00
David 'Digit' Turner
2a38426583 Merge "Fix Mac build" 2011-04-15 07:31:34 -07:00
David 'Digit' Turner
f85c358b27 Fix Mac build
Change-Id: I030c9903f073aced6c2778665f7961f3e9f9804d
2011-04-15 16:30:26 +02:00
David Turner
d6ad2a63ca am 23a491dc: Merge "emulator opengl: renderControl API encoder/decoder"
* commit '23a491dccdc8c294af2ecd0602d10da9f2707ac1':
  emulator opengl: renderControl API encoder/decoder
2011-04-15 07:08:25 -07:00
David Turner
c1491eb3b9 am 0f0732fe: Merge "emulator opengl: Added glUtilsPixelBitSize function to glUtils."
* commit '0f0732febfb1fa0b10f204e28384ce4671fcc969':
  emulator opengl: Added glUtilsPixelBitSize function to glUtils.
2011-04-15 07:08:22 -07:00
David Turner
961949e054 am 2732ff2d: Merge "Moved IOStream.h to be used in external API for libOpenGLRender."
* commit '2732ff2db2bea7665002e58bfb056d06895d42e0':
  Moved IOStream.h to be used in external API for libOpenGLRender.
2011-04-15 07:08:20 -07:00
David Turner
a95826fb63 am 39062218: Merge " This is a common library for the EGL/GLES/GLES2 translator libraries."
* commit '39062218ffc47f27da844dfc4019ec37c885349c':
  This is a common library for the EGL/GLES/GLES2 translator libraries.
2011-04-15 07:08:15 -07:00
David Turner
23a491dccd Merge "emulator opengl: renderControl API encoder/decoder" 2011-04-15 06:45:25 -07:00
David Turner
0f0732febf Merge "emulator opengl: Added glUtilsPixelBitSize function to glUtils." 2011-04-15 06:43:32 -07:00
David Turner
2732ff2db2 Merge "Moved IOStream.h to be used in external API for libOpenGLRender." 2011-04-15 06:42:28 -07:00
David Turner
39062218ff Merge " This is a common library for the EGL/GLES/GLES2 translator libraries." 2011-04-15 06:39:27 -07:00
David 'Digit' Turner
62b21b4146 am 832388de: am 13a0b81c: Merge "Revert 776bd3e46c2fb5c003ecec4fee99f01943876644"
* commit '832388de41c6b44d43bd1f1307b3386d0fcc376e':
  Revert 776bd3e46c
2011-04-14 07:39:04 -07:00
David 'Digit' Turner
832388de41 am 13a0b81c: Merge "Revert 776bd3e46c2fb5c003ecec4fee99f01943876644"
* commit '13a0b81cdd18151b4bbb4c61a6b7c7a652eca6ed':
  Revert 776bd3e46c
2011-04-14 07:32:48 -07:00
David 'Digit' Turner
13a0b81cdd Merge "Revert 776bd3e46c2fb5c003ecec4fee99f01943876644" 2011-04-14 07:19:30 -07:00
David 'Digit' Turner
a6e54e04a3 Revert 776bd3e46c
Unfortunately, we need to keep duplicate libraries under sdk/emulator/
to avoid breaking a few internal branches.

    commit 776bd3e46c
    Author: David 'Digit' Turner <digit@android.com>
    Date:   Thu Apr 7 10:58:07 2011 +0200

    emulator: Remove the global Make variable trick for emulator-specific system modules.

    Remove a sad trick that was used to smoothly move the platform-specific emulator
    modules from sdk/emulator/ to development/tools/emulator/system without creating
    build conflicts.

    Now that the sdk/ modules have been removed, we can get rid of the guard variable.

Change-Id: Id5c44a4160191d8ac9afcbbeeef7de0b9a5b0f6f
2011-04-14 14:06:05 +02:00
David 'Digit' Turner
13e07e5c66 am 28eeece2: am 755d75f4: Merge "ndk: Add missing update arm C library for android-9 platform."
* commit '28eeece2152a6dd78bc630a6a0924ceb6921118a':
  ndk: Add missing update arm C library for android-9 platform.
2011-04-14 03:53:59 -07:00
David 'Digit' Turner
28eeece215 am 755d75f4: Merge "ndk: Add missing update arm C library for android-9 platform."
* commit '755d75f4a2d2bd360b5d8a92e9a4a9bc01a185e4':
  ndk: Add missing update arm C library for android-9 platform.
2011-04-14 03:26:48 -07:00
David 'Digit' Turner
755d75f4a2 Merge "ndk: Add missing update arm C library for android-9 platform." 2011-04-14 03:10:19 -07:00
David 'Digit' Turner
f76679f6ba ndk: Add missing update arm C library for android-9 platform.
The C library was updated in Gingerbread to support. The corresponding
headers were updated, but the change was missing an updated library,
used for proper linking of new functions (e.g. pthread_rwlock_init).

Fix for http://code.google.com/p/android/issues/detail?id=12990

For the record, this binary was simply pulled from an AVD created
with the standard SDK platform image for Gingerbread.

Change-Id: Ic30921582f143adfc4bcfe3f70a6293530fe0202
2011-04-14 11:44:04 +02:00
Guy Zadikario
32fc922316 emulator opengl: renderControl API encoder/decoder
That adds the renderControl API encoder/decoder which is used for
guest to host control commands. See system/renderControl_enc/README
for more info about the API itself.

Change-Id: I2c72803137889d646fbb3d2a56ecdcf94b088f40
2011-04-13 13:33:26 +03:00
Guy Zadikario
fc2d0b09ec emulator opengl: Added glUtilsPixelBitSize function to glUtils.
moved pixel size calculation from GLClientState to glUtils to be used
outside the client state scope. (needed for the renderControl encoder
which will follow in next commit).

Change-Id: I5adbc40b241537054c6743e2afc52ba44454664f
2011-04-13 13:33:26 +03:00
Guy Zadikario
caafd4df2e Moved IOStream.h to be used in external API for libOpenGLRender.
This change includes four changes:
1) moved IOStream.h into host/include/libOpenGLRender, this directory
   will include the api interface into the libOpenGLRender which will be
   used later by the emulator and we need this interface to use IOStream.h
2) Updated Andorid.mk files to include the new directory location of IOStream.h
   in the LOCAL_C_INCLUDE.
3) Added new function "read" to IOStream which reads a message without a givven
   size.
4) Updated TcpStream to use "cutils/sockets.h" instead of using directly the socket api for portability reasons. (It now compiles on windows as well).

Change-Id: I30eb40c8dcd5aacf0d993aff9cdb90b283b12dde
2011-04-13 13:33:05 +03:00
Amit Feller
a7ec4c76e2 This is a common library for the EGL/GLES/GLES2 translator libraries.
It includes code that is shared with all three components:

    ThreadInfo.h - defines a structure of information stored in the TLS.
    TranslatorIfaces - defines the interface between EGL and its client APIs (GLES and GLESv2)
    objectrNameManager - manages the set of OpenGL objects in share groups name space.

Change-Id: Idb1bd1e2c3dcbb5dac7ba4ea85f78da856b897d9
2011-04-12 15:28:14 +03:00
David 'Digit' Turner
ffb1368402 am 957b0ebe: am bfdff660: Merge "ndk: x86: Update libc.so and libstdc++.so"
* commit '957b0ebeb15ec37059705558d10ab01505853738':
  ndk: x86: Update libc.so and libstdc++.so
2011-04-11 17:32:49 -07:00
David 'Digit' Turner
e40fb554a9 am 07dfa1b1: am 0ed88818: am cecd02c1: Merge "emulator: Remove the global Make variable trick for emulator-specific system modules."
* commit '07dfa1b15d8ef2bce114d094d3281421ec6034e2':
  emulator: Remove the global Make variable trick for emulator-specific system modules.
2011-04-11 17:26:31 -07:00
David 'Digit' Turner
929e2f1016 am 4fc035aa: am 9909e7f5: am b24b2470: Merge "Really fix the Mac SDK build this time. Doh."
* commit '4fc035aaca64214f4af2425d6b6d68187241b38d':
  Really fix the Mac SDK build this time. Doh.
2011-04-11 14:46:51 -07:00
David 'Digit' Turner
6bd20ca22a am f0f9b1bd: am ca7616f2: am d5106417: Merge "Fix Mac sdk builds"
* commit 'f0f9b1bd4010f9584675a83e079e7ab6167bb7ee':
  Fix Mac sdk builds
2011-04-11 14:46:37 -07:00
David Turner
0f7fe2a2a0 am 5c0f4ce0: am 5eaaac26: am e8c05eb1: Merge "fix handling pointers in emugen."
* commit '5c0f4ce0bede5b1652853e7bc14dcc0e0a98ac5c':
  fix handling pointers in emugen.
2011-04-11 14:46:34 -07:00
David Turner
8ce14fd8b0 am 0c0fd648: am fef11912: am ba43b928: Merge "emulator opengl - directory rearrangment"
* commit '0c0fd6480c7dfd40de6a0514abd634e481c35f90':
  emulator opengl - directory rearrangment
2011-04-11 14:46:27 -07:00
David 'Digit' Turner
957b0ebeb1 am bfdff660: Merge "ndk: x86: Update libc.so and libstdc++.so"
* commit 'bfdff660a66eda206e1f289d56a2e335f65a9398':
  ndk: x86: Update libc.so and libstdc++.so
2011-04-07 13:04:17 -07:00
David 'Digit' Turner
bfdff660a6 Merge "ndk: x86: Update libc.so and libstdc++.so" 2011-04-07 12:42:29 -07:00
David 'Digit' Turner
7e9db3d22b ndk: x86: Update libc.so and libstdc++.so
This patch updates the system C and C++ libraries used for
the x86 ABI. We remove the old binary targetting API level 5
(Eclair) since we don't support x86 on it anyway, and put new ones
generated from the AOSP tree with the full_x86-eng build product.

This is necessary to be able to prebuild STLport binaries for
the x86 NDK.

The binaries corresponding to the AOSP platform/bionic.git tree
using the following SHA-1, when building full_x86-eng:

    4c090434a4fcffb3a8bb7ebee7cc6e52befceeae

Change-Id: I63c71554c655f18a6a6f9135074792a8681098bb
2011-04-07 17:22:28 +02:00
David 'Digit' Turner
07dfa1b15d am 0ed88818: am cecd02c1: Merge "emulator: Remove the global Make variable trick for emulator-specific system modules."
* commit '0ed888186a59454ff074a53ff8ea0458d8e0fc46':
  emulator: Remove the global Make variable trick for emulator-specific system modules.
2011-04-07 02:33:43 -07:00
David 'Digit' Turner
0ed888186a am cecd02c1: Merge "emulator: Remove the global Make variable trick for emulator-specific system modules."
* commit 'cecd02c1ba1180b774063d779f89a18bce78f029':
  emulator: Remove the global Make variable trick for emulator-specific system modules.
2011-04-07 02:18:54 -07:00
David 'Digit' Turner
cecd02c1ba Merge "emulator: Remove the global Make variable trick for emulator-specific system modules." 2011-04-07 02:00:40 -07:00
David 'Digit' Turner
776bd3e46c emulator: Remove the global Make variable trick for emulator-specific system modules.
Remove a sad trick that was used to smoothly move the platform-specific emulator
modules from sdk/emulator/ to development/tools/emulator/system without creating
build conflicts.

Now that the sdk/ modules have been removed, we can get rid of the guard variable.

Change-Id: I0261fcd6cdf6af7564106c5ab8d2b3bda001d567
2011-04-07 10:58:07 +02:00