Commit Graph

965 Commits

Author SHA1 Message Date
David Turner
58a12822d4 am 8ce14fd8: am 0c0fd648: am fef11912: am ba43b928: Merge "emulator opengl - directory rearrangment"
* commit '8ce14fd8b058d4815c89ae04f0476142a26ec540':
  emulator opengl - directory rearrangment
2011-04-11 14:50:02 -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
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
David 'Digit' Turner
45c722023d Really fix the Mac SDK build this time. Doh.
Change-Id: I529c42f89e752b245f76d7ea0d55ad6c676936b0
2011-04-05 17:23:55 +02:00
David 'Digit' Turner
c29456a000 Fix Mac sdk builds
Change-Id: Ia90be6b2ef10520ab2efb70fc03332a36e531ddc
2011-04-05 15:37:31 +02:00
David Turner
e8c05eb11a Merge "fix handling pointers in emugen." 2011-04-05 05:59:55 -07:00
Vladimir Chtchetkine
105b40da3f Merge "Fix build scripts for vbox_x86 target" 2011-04-04 09:40:35 -07:00
Liran
03c86416d5 fix handling pointers in emugen.
Moved 'isPointer' attribute from variable to type field.
The .types input file now includes new column specifying if a type is a pointer or not
previously emugen declared as pointer only types which included '*' character but did not
process well the case of 'char **' (pointer to pointer).

Fixed the gl.types and ut_rendercontrol.types accordingly.
Few other fixes to gl.attrib and gl.in.

Change-Id: Ifd3591119dfa504703c68556802a40e38fe4940e
2011-04-04 16:05:18 +03:00
Jacky Romano
81c015740c emulator opengl - directory rearrangment
Move system/OpenglCodecCommon into shared/OpenglCodecCommon so it's code
can be shared among more components of the project.

Move tests/ut_renderer/TimeUtils.* into a the common area

Annotate ErrLog.h and GLDecoderContextData.h with the project license statement

Change-Id: Ieea42e95edd5ad89fda4cfa40356a012304ee976
2011-04-04 12:20:49 +03:00
Vladimir Chtchetkine
3e254c17fd Fix build scripts for vbox_x86 target
Change-Id: I9a626711a887c26b0825d291ffa3f7400b728518
2011-04-01 08:27:02 -07:00
Jean-Baptiste Queru
88f4283b08 am 4f1e514c: am 02fe35d6: am c969a03b: merge from open-source master
* commit '4f1e514c19368a46316e3975cd8ec0855bcc598c':
  Fix device builds
2011-03-31 09:50:36 -07:00
Jean-Baptiste Queru
4f1e514c19 am 02fe35d6: am c969a03b: merge from open-source master
* commit '02fe35d64f2eb11b6ce8afd046a4d37ee227d1a9':
  Fix device builds
2011-03-31 09:48:44 -07:00
David 'Digit' Turner
e97b54b648 Fix device builds
This patch ensures that the egl.cfg file specific to our
hardware OpenGL emulation is only copied to the system images
of emulator-specific build products.

This fixes a conflict for device-specific products (which provide
their own hw-specific egl.cfg).

Change-Id: I30cd64ba5915e5ffdc1091de8db20f6c3c671486
2011-03-31 09:39:59 +02:00
David 'Digit' Turner
8243e7b4fc am e61f64b3: am 7b14e7c0: am a5d35801: am 50dd0170: Merge "Fix linux sdk build."
* commit 'e61f64b332911ba6830959d3d1b59620b1b85dc5':
  Fix linux sdk build.
2011-03-30 16:36:32 -07:00
David Turner
37ef2afc48 am 720ec5ef: am ee8e31ad: am 02c8a712: am 4bda89b6: Merge changes I6379d6b1,I77794044
* commit '720ec5efca302e63b78a6dafaebe97c3abba456a':
  Android emulator opengl - host side EGL wrapper
  Android emulator opengl - unit test host side renderer
2011-03-30 16:36:30 -07:00
David Turner
accc143f6a am 5a1237f5: am 420e1b0d: am d5df4a71: am 485970b9: Merge "Android emulator opengles - unit test gles wrapper"
* commit '5a1237f519169b81e4cf5ab21143506a297b22e1':
  Android emulator opengles - unit test gles wrapper
2011-03-30 16:36:26 -07:00
David Turner
d9abb30968 am af2d828a: am 98c75d03: am 0aa24748: am 3f22fdc0: Merge "Android emulator opengl - unit testing render control api"
* commit 'af2d828a8b319902e0317f9965fb86c577d7843f':
  Android emulator opengl - unit testing render control api
2011-03-30 16:35:45 -07:00
David Turner
9a74f8e7f3 am 61dd0b82: am e347712d: am 06bf2701: am 02ef4e99: Merge "Android emulator opengl - OpenGL ES 1.1 decoder"
* commit '61dd0b82511cc2000799835d6cdebdcd0769b453':
  Android emulator opengl - OpenGL ES 1.1 decoder
2011-03-30 16:35:39 -07:00
David Turner
03c0ab6771 am a3137783: am 2e5f0d15: am 8a882514: am 39c9911c: Merge "Emulator opengl - Opengl ES 1.1 encoder"
* commit 'a3137783dcbe06bb4da04a722c727eb361851aa8':
  Emulator opengl - Opengl ES 1.1 encoder
2011-03-30 16:34:50 -07:00
David Turner
8eae16f9ba am e9f8263d: am 483ff042: am 687d8b76: am 98015723: Merge "Opengl implementation - codec common code"
* commit 'e9f8263d2a516ef56917a21fe90382cefbca6f38':
  Opengl implementation - codec common code
2011-03-30 16:34:46 -07:00
David Turner
5a4f0c40d4 am d56f61b3: am 201398b4: am 85d6342d: am 99d6295f: Merge "Enable lcd backlight in the emulator."
* commit 'd56f61b3fdd02cb4483a759e240180bac1dd23aa':
  Enable lcd backlight in the emulator.
2011-03-30 16:34:30 -07:00
David 'Digit' Turner
d6174475af am 74a30541: am 1ca79b34: am 8edebe1f: am 4712e4eb: Merge "qemud: disable debug traces"
* commit '74a30541a481ce598b61c2c3665020207c6351bd':
  qemud: disable debug traces
2011-03-30 16:34:17 -07:00
David 'Digit' Turner
e61f64b332 am 7b14e7c0: am a5d35801: am 50dd0170: Merge "Fix linux sdk build."
* commit '7b14e7c051eabf2f9b3e2f8035d8330a4924d930':
  Fix linux sdk build.
2011-03-30 08:21:25 -07:00
David Turner
720ec5efca am ee8e31ad: am 02c8a712: am 4bda89b6: Merge changes I6379d6b1,I77794044
* commit 'ee8e31ad5229634770ecd6eb5c3a52ff03284c17':
  Android emulator opengl - host side EGL wrapper
  Android emulator opengl - unit test host side renderer
2011-03-30 08:21:20 -07:00
David Turner
5a1237f519 am 420e1b0d: am d5df4a71: am 485970b9: Merge "Android emulator opengles - unit test gles wrapper"
* commit '420e1b0dd42e645bf1b928f3fb9d13a0560e366f':
  Android emulator opengles - unit test gles wrapper
2011-03-30 08:21:15 -07:00
David Turner
af2d828a8b am 98c75d03: am 0aa24748: am 3f22fdc0: Merge "Android emulator opengl - unit testing render control api"
* commit '98c75d03495e55c756db5d76218467f355eb8193':
  Android emulator opengl - unit testing render control api
2011-03-30 08:21:13 -07:00
David Turner
61dd0b8251 am e347712d: am 06bf2701: am 02ef4e99: Merge "Android emulator opengl - OpenGL ES 1.1 decoder"
* commit 'e347712dace1e1924e319bc4a6a89796dd7a4cb2':
  Android emulator opengl - OpenGL ES 1.1 decoder
2011-03-30 08:21:10 -07:00
David Turner
a3137783dc am 2e5f0d15: am 8a882514: am 39c9911c: Merge "Emulator opengl - Opengl ES 1.1 encoder"
* commit '2e5f0d15fbb875e67845503427a8ee204261ca5b':
  Emulator opengl - Opengl ES 1.1 encoder
2011-03-30 08:21:07 -07:00
David Turner
e9f8263d2a am 483ff042: am 687d8b76: am 98015723: Merge "Opengl implementation - codec common code"
* commit '483ff04245c6f6739663fa9357f75d6900bc5259':
  Opengl implementation - codec common code
2011-03-30 08:21:04 -07:00
David Turner
d56f61b3fd am 201398b4: am 85d6342d: am 99d6295f: Merge "Enable lcd backlight in the emulator."
* commit '201398b4890f37e2a0db4ef33dfc2140506a4957':
  Enable lcd backlight in the emulator.
2011-03-30 08:20:36 -07:00
David 'Digit' Turner
74a30541a4 am 1ca79b34: am 8edebe1f: am 4712e4eb: Merge "qemud: disable debug traces"
* commit '1ca79b3497eb4ca3f7341dcb97bb263d8fa6245b':
  qemud: disable debug traces
2011-03-30 08:20:18 -07:00
David 'Digit' Turner
db35d9a010 Fix linux sdk build.
This is a temporary patch until we update the prebuilt/ tree accordingly
to include libxcb.so for Linux.

Change-Id: I76d9966bfb73bf3f5ca35cc30f6e12fb262dc2b2
2011-03-29 18:37:37 +02:00
David Turner
4bda89b6df Merge changes I6379d6b1,I77794044
* changes:
  Android emulator opengl - host side EGL wrapper
  Android emulator opengl - unit test host side renderer
2011-03-28 13:12:14 -07:00
David Turner
485970b99f Merge "Android emulator opengles - unit test gles wrapper" 2011-03-28 13:04:52 -07:00
David Turner
3f22fdc0fa Merge "Android emulator opengl - unit testing render control api" 2011-03-28 13:01:00 -07:00
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
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
99d6295f69 Merge "Enable lcd backlight in the emulator." 2011-03-28 07:04:33 -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