Commit Graph

6691 Commits

Author SHA1 Message Date
Bernhard Reutner-Fischer
b99b5f6b67 Fix typo in informational text
Change-Id: I43958dea3a6c89523f5d4b914effdc7eb602ae8b
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2011-04-26 13:27:06 +02:00
David Turner
f61c5ad575 am 092b588b: am 9e9b85c3: Merge "Really fix the Mac build."
* commit '092b588b0bcafcab6579407042a5bb0890bc890e':
  Really fix the Mac build.
2011-04-16 13:34:05 -07:00
David Turner
092b588b0b am 9e9b85c3: Merge "Really fix the Mac build."
* commit '9e9b85c3f610ebd9165644a96ccfbdd704ab3bc6':
  Really fix the Mac build.
2011-04-16 13:29:26 -07:00
David Turner
9e9b85c3f6 Merge "Really fix the Mac build." 2011-04-16 13:25:48 -07:00
David Turner
eff952cdbf Really fix the Mac build.
Damned!

Change-Id: Ice8295fb23beefe328207112b011489276b5b278
2011-04-16 22:21:57 +02:00
David Turner
e91699fe21 am 43fa53c4: am 34f083b1: Merge "Fix mac build"
* commit '43fa53c42871bc565b40a19a1bc7761d30881ba6':
  Fix mac build
2011-04-16 10:50:49 -07:00
David Turner
43fa53c428 am 34f083b1: Merge "Fix mac build"
* commit '34f083b1f3d45e60fb60bd11f9af0515cc3255fa':
  Fix mac build
2011-04-16 10:41:21 -07:00
David Turner
34f083b1f3 Merge "Fix mac build" 2011-04-16 10:25:15 -07:00
David Turner
427cb6c3b0 Fix mac build
Change-Id: Ic0ada31663beadbff06ac18ca4c5960c869b0ec8
2011-04-16 19:23:56 +02:00
David Turner
5ecdcdfb91 am a25b885e: am 218ccb4d: Merge "emulator opengl: small test app for the emulator renderer API."
* commit 'a25b885eedb4f038c38a564101aef2ad6f7bdc89':
  emulator opengl: small test app for the emulator renderer API.
2011-04-16 06:54:28 -07:00
David Turner
e99ef4fa07 am 89ea131e: am 36fc1bfe: Merge "emulator opengl: the host renderer executable."
* commit '89ea131e33cfc7867149b0f792c77bdbe664a953':
  emulator opengl: the host renderer executable.
2011-04-16 06:54:23 -07:00
David Turner
b07b714a1d am a8c91545: am bb45561f: Merge "emulatgor opengl: First commit of the host renderer library."
* commit 'a8c91545a59a9675a1a63d41d700b2c4abd003f1':
  emulatgor opengl: First commit of the host renderer library.
2011-04-16 06:54:18 -07:00
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
a25b885eed am 218ccb4d: Merge "emulator opengl: small test app for the emulator renderer API."
* commit '218ccb4d4688d9708e440f59e883a2996725215a':
  emulator opengl: small test app for the emulator renderer API.
2011-04-16 06:26:52 -07:00
David Turner
89ea131e33 am 36fc1bfe: Merge "emulator opengl: the host renderer executable."
* commit '36fc1bfe1f2410c5995650c9e22e2182e72d0f2b':
  emulator opengl: the host renderer executable.
2011-04-16 06:26:50 -07:00
David Turner
a8c91545a5 am bb45561f: Merge "emulatgor opengl: First commit of the host renderer library."
* commit 'bb45561f8d9ecb3a0484ffad588f3339cc747a1a':
  emulatgor opengl: First commit of the host renderer library.
2011-04-16 06:26:48 -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
218ccb4d46 Merge "emulator opengl: small test app for the emulator renderer API." 2011-04-16 06:20:32 -07:00
David Turner
36fc1bfe1f Merge "emulator opengl: the host renderer executable." 2011-04-16 06:19:00 -07:00
David Turner
bb45561f8d Merge "emulatgor opengl: First commit of the host renderer library." 2011-04-16 06:17:11 -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
cca6a5fc0e emulator opengl: small test app for the emulator renderer API.
This sample program simulates the use of the renderer api as it should
be used from the emulator program. It opens a SDL window, initialize the
renderer, process events on the window and terminate the renderer when the
window is closed.

Change-Id: If983b4ce6465dee71f548e8edaf2b56b6443f7b0
2011-04-16 10:45:48 +03:00
Guy Zadikario
555d9bece7 emulator opengl: the host renderer executable.
This is the host renderer executable. It is a small process which
just calls into libOpenglRender library. The process is invoked
through the initOpenGLRenderer function of libOpenglRenderer.

Change-Id: I85af075b5eb751ffb9543ecbd8e7fc155054f146
2011-04-16 10:45:48 +03:00
Guy Zadikario
1f0d3939ed emulatgor opengl: First commit of the host renderer library.
This is a library which includes all the OpenGL renderer functionality,
it is packaged in a library so that both the renderer process and the emulator
program will be able to use that functionality.

NOTES:
   1) gl_proc.h and GLDispatch.{h,cpp} in this commit will be replaced
      with the decoder auto-generated dispatch in a later commit, the
      auto-generated dispatch is currently missing some extension functions
      required for the renderer.
   2) look at host/include/libOpenglRender/render_api.h for the external
      interface defined for this library (to be used by the emulator).

The following is a description of each component:

FrameBuffer - The main object which manages the framebuffer and color buffers.
              This is a singleton which get initialized through its initialize
              static function. It initializes the OpenGL renderer and must be
              called first. This initialization function is not thread safe so
              it must be called before any thread that is calling to this
              library is created.

FBConfig - Includes a static set of configs supported by the renderer which get
           initialized during FrameBuffer initialization phase. Also,
           an instance of this class includes the a description of one frame
           buffer configuration supported by the renderer.

RenderContext - encapsulate a rendering context state.

ColorBuffer - implements a color buffer object as a texture which can be bind
              as render target or source.

WindowSurface - implements the functionality of a native window which can be
                bound to a rendering context and its target ColorBuffer can
                be specified and replaced.

ThreadInfo - holds per-thread information.

EGLDispatch - loads the EGL plugin library, all egl calls are made through
              this dispatch table which get initialized during initialization
              phase.

GLDispatch - loads the GLES plugin library, all GLES calls are made through
             this dispatch table which get initialized during initialization
             phase - This will be replaced by the auto-generated code of the
             decoder ...

RenderThread - implements a thread that reads command tokens from an IOStream
               and decode it.

RenderControl - implements the host side implementation of the renderControl
                API, when a renderControl token is decoded from the stream
                it is dispatched to this implementation.

RenderServer - implements a TCP server which listens to port number and
               launcges a RenderThread for each new connection.

Change-Id: I9f34d17bdfcb715893a13cd30086c767f499df87
2011-04-16 10:45:39 +03: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