David Turner
5c0f4ce0be
am 5eaaac26: am e8c05eb1: Merge "fix handling pointers in emugen."
...
* commit '5eaaac26e2ff3e1b09fe5d725f47442bda71779d':
fix handling pointers in emugen.
2011-04-05 07:35:02 -07:00
David 'Digit' Turner
ca7616f21d
am d5106417: Merge "Fix Mac sdk builds"
...
* commit 'd510641759d0cd769bc2bb397db001a6bd656617':
Fix Mac sdk builds
2011-04-05 06:45:36 -07:00
David 'Digit' Turner
d510641759
Merge "Fix Mac sdk builds"
2011-04-05 06:39:19 -07:00
David 'Digit' Turner
c29456a000
Fix Mac sdk builds
...
Change-Id: Ia90be6b2ef10520ab2efb70fc03332a36e531ddc
2011-04-05 15:37:31 +02:00
David Turner
5eaaac26e2
am e8c05eb1: Merge "fix handling pointers in emugen."
...
* commit 'e8c05eb11a966887daa96dab64aea40c4862775c':
fix handling pointers in emugen.
2011-04-05 06:06:48 -07:00
David Turner
0c0fd6480c
am fef11912: am ba43b928: Merge "emulator opengl - directory rearrangment"
...
* commit 'fef11912975311ce706a25eb28f71ba78e4a8300':
emulator opengl - directory rearrangment
2011-04-05 06:05:50 -07:00
David Turner
e8c05eb11a
Merge "fix handling pointers in emugen."
2011-04-05 05:59:55 -07:00
David Turner
fef1191297
am ba43b928: Merge "emulator opengl - directory rearrangment"
...
* commit 'ba43b928e6de8100c8feea75383dd89b1207c3c1':
emulator opengl - directory rearrangment
2011-04-05 05:51:49 -07:00
David Turner
ba43b928e6
Merge "emulator opengl - directory rearrangment"
2011-04-05 05:37:39 -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
The Android Automerger
51c57d3ae3
merge in gingerbread-release history after reset to gingerbread
2011-04-01 13:27:30 -07:00
Vladimir Chtchetkine
3e254c17fd
Fix build scripts for vbox_x86 target
...
Change-Id: I9a626711a887c26b0825d291ffa3f7400b728518
2011-04-01 08:27:02 -07:00
Raphael
68be95ef4c
am ff5d4db8: (-s ours) am b2d8f0ee: (-s ours) am 31d15b9f: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge.
...
* commit 'ff5d4db8bd84a1accbbc81585fdb03ba21fdfb60':
Merge 48023786cf : 'Generate SDK Repository XML.' Do not merge.
2011-03-31 16:51:28 -07:00
Raphael
29930470ba
am 19f0482e: (-s ours) am d739e3ab: (-s ours) am 922ee89a: Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge.
...
* commit '19f0482e712fa43f3e0ab3f7318ff17a8de95e2f':
Merge 2ff496b8a1 : 'Build SDK repository.' Do not merge.
2011-03-31 16:51:25 -07:00
Raphael
ff5d4db8bd
am b2d8f0ee: (-s ours) am 31d15b9f: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge.
...
* commit 'b2d8f0ee4e2d90e317f34a1709ba0f4380f56e8f':
Merge 48023786cf : 'Generate SDK Repository XML.' Do not merge.
2011-03-31 16:41:45 -07:00
Raphael
19f0482e71
am d739e3ab: (-s ours) am 922ee89a: Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge.
...
* commit 'd739e3ab11047cefab4b3a9ea161ee3ba58952f4':
Merge 2ff496b8a1 : 'Build SDK repository.' Do not merge.
2011-03-31 16:41:41 -07:00
Raphael
b2d8f0ee4e
am 31d15b9f: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge.
...
* commit '31d15b9f7616ac5605a895ad8fbc3117f0ff4475':
Merge 48023786cf : 'Generate SDK Repository XML.' Do not merge.
2011-03-31 16:34:25 -07:00
Raphael
d739e3ab11
am 922ee89a: Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge.
...
* commit '922ee89a69da7c3007b48977835e9736766b4ba2':
Merge 2ff496b8a1 : 'Build SDK repository.' Do not merge.
2011-03-31 16:34:18 -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
Jean-Baptiste Queru
02fe35d64f
am c969a03b: merge from open-source master
...
* commit 'c969a03b5e5f6754adf45edd98ed1a10c42bf641':
Fix device builds
2011-03-31 09:23:33 -07:00
Jean-Baptiste Queru
c969a03b5e
merge from open-source master
...
Change-Id: I1f2a4650c696c6a58d59b8fd6e96dc3a372ff095
2011-03-31 09:19:11 -07:00
David 'Digit' Turner
a8725e817a
Merge "Fix device builds"
2011-03-31 08:33:40 -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
The Android Automerger
d0b1934f31
merge in gingerbread-release history after reset to gingerbread
2011-03-30 18:32:47 -07:00
Winson Chung
5892ebcdd9
am 6c6639d1: am b02ad50d: Making the sample weather widget vertically resizeable.
...
* commit '6c6639d1e25c041800228d1c961279b1451ed2aa':
Making the sample weather widget vertically resizeable.
2011-03-30 16:38:41 -07: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
Raphael
de3c6fdf34
am ee13f1c3: am 06f2189a: am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master
...
* commit 'ee13f1c3a7ca2eb47031d7c5bfabc3babd3e513a':
Fix XMLNS detection in SDK Repo XSD files.
2011-03-30 16:34:26 -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
Raphael
21470619d6
am 89c0b1a3: (-s ours) am 7a8e0399: (-s ours) am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge."
...
* commit '89c0b1a34e968b4525ed8fed0a8cf09f1184d08e':
Merge 48023786cf : 'Generate SDK Repository XML.' Do not merge.
2011-03-30 16:34:13 -07:00
Raphael
f922f6d124
am 84ed1107: (-s ours) am 8ad74177: (-s ours) am 2a610080: am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge."
...
* commit '84ed11075eed81f4e2525319010793881ff16dd9':
Merge 2ff496b8a1 : 'Build SDK repository.' Do not merge.
2011-03-30 16:34:07 -07:00
Winson Chung
6c6639d1e2
am b02ad50d: Making the sample weather widget vertically resizeable.
...
* commit 'b02ad50d1a83f7171aaa1c1d17716ed5699dec40':
Making the sample weather widget vertically resizeable.
2011-03-30 09:37:06 -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
Raphael
ee13f1c3a7
am 06f2189a: am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master
...
* commit '06f2189a4eb7221ae5ef0eda451f4f7875b906b5':
Fix XMLNS detection in SDK Repo XSD files.
2011-03-30 08:20:33 -07:00