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
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
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
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
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
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
Raphael
89c0b1a34e
am 7a8e0399: (-s ours) am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge."
...
* commit '7a8e0399c6b8b0b02cd596d0949acc8364500887':
Merge 48023786cf : 'Generate SDK Repository XML.' Do not merge.
2011-03-30 08:20:01 -07:00
Raphael
84ed11075e
am 8ad74177: (-s ours) am 2a610080: am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge."
...
* commit '8ad7417748be9a2a1456f55d1e5e4c6484c06f93':
Merge 2ff496b8a1 : 'Build SDK repository.' Do not merge.
2011-03-30 08:19:56 -07:00
David 'Digit' Turner
7b14e7c051
am a5d35801: am 50dd0170: Merge "Fix linux sdk build."
...
* commit 'a5d358011e16abdc29ac600a40d96e5b5d59cd7a':
Fix linux sdk build.
2011-03-29 09:57:16 -07:00
David 'Digit' Turner
a5d358011e
am 50dd0170: Merge "Fix linux sdk build."
...
* commit '50dd0170660e4ef98ec3eb470eb6ce053d2b9825':
Fix linux sdk build.
2011-03-29 09:55:00 -07:00
David 'Digit' Turner
50dd017066
Merge "Fix linux sdk build."
2011-03-29 09:39:59 -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
Xavier Ducrohet
f19518fcb1
am 9775ffe5: Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1
...
* commit '9775ffe5fd3b8498137edf59c7570c4639a73763':
Update SDK files to API 12/Android 3.1
2011-03-28 15:58:37 -07:00
Winson Chung
b02ad50d1a
Making the sample weather widget vertically resizeable.
...
Change-Id: I0301004a703b501cf135e0750512ad9070aff59c
2011-03-28 15:46:29 -07:00
Xavier Ducrohet
9775ffe5fd
Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1
2011-03-28 15:27:26 -07:00
Xavier Ducrohet
a6f8392dc7
Update SDK files to API 12/Android 3.1
...
Change-Id: I630413dab4f6859623a9c1aa44b54abe6ef392b8
2011-03-28 15:23:37 -07:00
David Turner
ee8e31ad52
am 02c8a712: am 4bda89b6: Merge changes I6379d6b1,I77794044
...
* commit '02c8a7121ff33b44dc7d7581eb67faae59ee3d2c':
Android emulator opengl - host side EGL wrapper
Android emulator opengl - unit test host side renderer
2011-03-28 13:16:42 -07:00
David Turner
420e1b0dd4
am d5df4a71: am 485970b9: Merge "Android emulator opengles - unit test gles wrapper"
...
* commit 'd5df4a71c659f6ca450be596dda87150dd44b6a3':
Android emulator opengles - unit test gles wrapper
2011-03-28 13:16:40 -07:00
David Turner
98c75d0349
am 0aa24748: am 3f22fdc0: Merge "Android emulator opengl - unit testing render control api"
...
* commit '0aa24748348e5e830f0a069b5f44d90444ce1709':
Android emulator opengl - unit testing render control api
2011-03-28 13:16:38 -07:00
David Turner
e347712dac
am 06bf2701: am 02ef4e99: Merge "Android emulator opengl - OpenGL ES 1.1 decoder"
...
* commit '06bf2701348c253876876bcba1229fa3afe85658':
Android emulator opengl - OpenGL ES 1.1 decoder
2011-03-28 13:16:36 -07:00
David Turner
02c8a7121f
am 4bda89b6: Merge changes I6379d6b1,I77794044
...
* commit '4bda89b6df7f31e9ea80e40e1aa23b6a80eafdd5':
Android emulator opengl - host side EGL wrapper
Android emulator opengl - unit test host side renderer
2011-03-28 13:14:41 -07:00
David Turner
d5df4a71c6
am 485970b9: Merge "Android emulator opengles - unit test gles wrapper"
...
* commit '485970b99f550602e0296658ea15849a2e857d96':
Android emulator opengles - unit test gles wrapper
2011-03-28 13:14:39 -07:00
David Turner
0aa2474834
am 3f22fdc0: Merge "Android emulator opengl - unit testing render control api"
...
* commit '3f22fdc0faeb35ad6b7476f87938e7b2554a2255':
Android emulator opengl - unit testing render control api
2011-03-28 13:14:37 -07:00
David Turner
06bf270134
am 02ef4e99: Merge "Android emulator opengl - OpenGL ES 1.1 decoder"
...
* commit '02ef4e99572bd67d83332168f355c49bb6d4aba7':
Android emulator opengl - OpenGL ES 1.1 decoder
2011-03-28 13:14:35 -07: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
2e5f0d15fb
am 8a882514: am 39c9911c: Merge "Emulator opengl - Opengl ES 1.1 encoder"
...
* commit '8a8825144a518296afa33a1e41295bad729d3431':
Emulator opengl - Opengl ES 1.1 encoder
2011-03-28 13:08:43 -07:00
David Turner
483ff04245
am 687d8b76: am 98015723: Merge "Opengl implementation - codec common code"
...
* commit '687d8b7629f67cfe4916b12550d91685ec7113b2':
Opengl implementation - codec common code
2011-03-28 13:08:41 -07:00
David Turner
485970b99f
Merge "Android emulator opengles - unit test gles wrapper"
2011-03-28 13:04:52 -07:00
David Turner
8a8825144a
am 39c9911c: Merge "Emulator opengl - Opengl ES 1.1 encoder"
...
* commit '39c9911c9d786b39e4bf7bd47b57db43e6c8e249':
Emulator opengl - Opengl ES 1.1 encoder
2011-03-28 13:04:39 -07:00
David Turner
687d8b7629
am 98015723: Merge "Opengl implementation - codec common code"
...
* commit '980157234c3074cd6504e198a2b06c844b4c9027':
Opengl implementation - codec common code
2011-03-28 13:04:36 -07:00
David Turner
3f22fdc0fa
Merge "Android emulator opengl - unit testing render control api"
2011-03-28 13:01:00 -07:00