Commit Graph

6160 Commits

Author SHA1 Message Date
David Turner
225830effb am 7ff51735: am 92c079df: Merge "changing GLcommon lib to be a sharedlib instead of static"
* commit '7ff51735737bae34b0fe2b7e326a4843fde3b115':
  changing GLcommon lib to be a sharedlib instead of static
2011-05-16 07:33:54 -07:00
David Turner
41709da80e am b5f5dce4: Merge " small changes to the code before the commit for supporting windows os"
* commit 'b5f5dce4c722e797d9acbfaea24123dfbc58a82b':
  small changes to the code before the commit for supporting windows os
2011-05-16 07:15:39 -07:00
David Turner
7ff5173573 am 92c079df: Merge "changing GLcommon lib to be a sharedlib instead of static"
* commit '92c079dfd65b254ffbfa33060297170e6bbcd93a':
  changing GLcommon lib to be a sharedlib instead of static
2011-05-16 07:15:36 -07:00
David Turner
b5f5dce4c7 Merge " small changes to the code before the commit for supporting windows os" 2011-05-16 06:43:58 -07:00
David Turner
92c079dfd6 Merge "changing GLcommon lib to be a sharedlib instead of static" 2011-05-16 06:40:07 -07:00
Dianne Hackborn
8486cba691 am d9012d1b: DO NOT MERGE. Integrate API demo work from master.
* commit 'd9012d1bfa132969fb8fed737e2f9f19eefbc0b5':
  DO NOT MERGE.  Integrate API demo work from master.
2011-05-13 15:45:34 -07:00
Dianne Hackborn
d9012d1bfa DO NOT MERGE. Integrate API demo work from master.
New API demo for the support library FragmentPager class.

Add API demo for new -wNNNdp and -hNNNdp configs.

Add new API demo for implementing a custom loader.

Also turn the fragment cursor list demo into a loader cursor demo.
2011-05-13 13:31:52 -07:00
Jean-Baptiste Queru
39e63e526a Merge 6a79f798
Change-Id: I1bb91242b2fb7651ba0505c416d7559d50259472
2011-05-12 16:28:47 -07:00
Jean-Baptiste Queru
6a79f79832 am 3ef19fa9: Merge "test_defs: new CTS security test." into gingerbread
* commit '3ef19fa91771be93f398af577a4432bb0fd571aa':
  test_defs: new CTS security test.
2011-05-12 16:20:21 -07:00
Jean-Baptiste Queru
3ef19fa917 Merge "test_defs: new CTS security test." into gingerbread 2011-05-12 15:56:22 -07:00
Amit Feller
6203540306 small changes to the code before the commit for supporting windows os
Change-Id: I062add6d6340677a9e2e98ac47d53c87ad2a6535
2011-05-11 17:48:21 +03:00
Amit Feller
e387c21109 changing GLcommon lib to be a sharedlib instead of static
Change-Id: Ic1fdcd1fbf3105a6fbd26c77e58acbe9b09dcacb
2011-05-11 17:31:02 +03:00
David 'Digit' Turner
265327f06c am d1ac6bdc: Merge "emulator: opengl: ut_renderer usability improvements"
* commit 'd1ac6bdc3b3b4c2fe788d8b8f7886ac625cb1559':
  emulator: opengl: ut_renderer usability improvements
2011-05-10 17:19:04 -07:00
David 'Digit' Turner
d1ac6bdc3b Merge "emulator: opengl: ut_renderer usability improvements" 2011-05-09 02:45:28 -07:00
David 'Digit' Turner
91f40d930e emulator: opengl: ut_renderer usability improvements
This patch provides two useful changes to the ut_renderer
unit-test program:

1/ the ability to control the GL window dimensions with
   two env. variables: ANDROID_WINDOW_WIDTH and ANDROID_WINDOW_HEIGHT

2/ the ability to save/restore the GL window position between
   GL connections.

Both are useful to use ut_renderer in a demo setting, nothing more.

Change-Id: I19a8f911ee821ddc4eb6307de12d63600ff696b0
2011-05-05 22:42:31 +02:00
Mike Lockwood
04b53db9b4 am cd392822: Add USB MissleLauncher sample program
* commit 'cd39282253ec8a27eae1d580fbaa91a8f3c7c5ff':
  Add USB MissleLauncher sample program
2011-05-03 15:22:17 -07:00
Mike Lockwood
95dfe36725 am 3385faf4: Add AdbTest sample program
* commit '3385faf4e60e1ac4f4cf387702ef3be211374ef2':
  Add AdbTest sample program
2011-05-03 15:22:14 -07:00
Mike Lockwood
cd39282253 Add USB MissleLauncher sample program
This is sample code that controls a USB missle launcher using USB host APIs

Change-Id: Ic4201faccc4562bf114c70d50b0cab6a00d28a98
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 17:56:51 -04:00
Mike Lockwood
3385faf4e6 Add AdbTest sample program
This sample implements the "adb logcat" command using USB host APIs.

Change-Id: Ifbf122e99358bd3a1cd2a7967c364ffd59f003b3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 17:55:19 -04:00
Nick Kralevich
26070d5afe test_defs: new CTS security test.
Change-Id: Ic400b823796d6f9ef140e8b24001434129e92da1
2011-05-03 14:31:02 -07:00
David Turner
11540e0aaf am 835aef2c: Merge "emulator: opengl: Fix Mac and Windows builds."
* commit '835aef2ce8f1e63454868471d5184a13f8b2415b':
  emulator: opengl: Fix Mac and Windows builds.
2011-05-03 12:55:11 -07:00
David 'Digit' Turner
2076f0fd16 am caa6ddbe: Merge "emulator: opengl: Add clean step."
* commit 'caa6ddbe8e6a5cb1141a87a4962b84c64fb4cc28':
  emulator: opengl: Add clean step.
2011-05-03 12:55:08 -07:00
David 'Digit' Turner
937322d250 am 4ad320d8: Merge "adding error handling for Xerrors on EGl linux implementation (EglLinuxApi.cpp)"
* commit '4ad320d819064f288c8bcfac18a5584e2c1b34d9':
  adding error handling for Xerrors on EGl linux implementation (EglLinuxApi.cpp)
2011-05-03 12:55:06 -07:00
David 'Digit' Turner
9ffa5d9043 am d73fbc24: Merge "emulator: opengl: Use QEMU pipe."
* commit 'd73fbc24fe703e9866a63b8950954430af46bca1':
  emulator: opengl: Use QEMU pipe.
2011-05-03 12:55:02 -07:00
David Turner
ade2d9c49e am 02d918b0: Merge "common debug flag for the wrapper libraries"
* commit '02d918b0cbf96ad18f0c22f963c3bfb4d20899f4':
  common debug flag for the wrapper libraries
2011-05-03 12:54:59 -07:00
David Turner
cb06d63476 am d82e3bed: Merge "emulator opengl: handle NULL pointers"
* commit 'd82e3bedd000a6f57763272e2452e8af2973823b':
  emulator opengl: handle NULL pointers
2011-05-03 12:54:56 -07:00
David Turner
1522331437 am d6ff1cc8: Merge "emugen: porperly handle nullAllowed API calls"
* commit 'd6ff1cc8e5805058152020661082f5f1bd9d58a8':
  emugen: porperly handle nullAllowed API calls
2011-05-03 12:54:51 -07:00
David Turner
3c87fcdc42 am cb8efdf0: Merge "emulator opengl: missing constant in glUtilsParamSize"
* commit 'cb8efdf09efd56f723426a2c165ae6f542bf1a9b':
  emulator opengl: missing constant in glUtilsParamSize
2011-05-03 12:54:45 -07:00
David Turner
7cc315debd am ecd4dd7b: Merge "emulator opengl - ensure server connection for rendering thread"
* commit 'ecd4dd7b6a7ab9a88454ebef17a07a34f3ce966d':
  emulator opengl - ensure server connection for rendering thread
2011-05-03 12:54:40 -07:00
David Turner
24d217ce70 am f549d0b3: Merge "emulator opengl : add Dungeon Defenders to the test apps list"
* commit 'f549d0b3ae3bed0a827fdb433cdf32d87c63d3b2':
  emulator opengl : add Dungeon Defenders to the test apps list
2011-05-03 12:54:36 -07:00
David Turner
e43081d3e7 am 413e35ed: Merge changes I9226275f,If78e8431,I3e36796d,I90c157df
* commit '413e35ed292e59b62df920e41b1e7cf97fa21964':
  opengl emulator : GLESv2 handling in the test egl implementation
  emulator opengl : unit-test renderer  GLESv2
  emulator opengl: context version param
  emulator opengl - encode glShaderSource
2011-05-03 12:54:32 -07:00
David Turner
d4427e5758 am d10c9651: Merge "opengl emulator - handle shader string decoding"
* commit 'd10c96517b17a786a7b7614f6279a0f4880848e9':
  opengl emulator - handle shader string decoding
2011-05-03 12:54:28 -07:00
David Turner
2608ce9cc1 am 5b840fb3: Merge "emulator opengl - GLESv2 implementation"
* commit '5b840fb32b8daaa75533fa8af010f0fb281b28f4':
  emulator opengl - GLESv2 implementation
2011-05-03 12:54:23 -07:00
David Turner
975a39baa3 am 26aad35e: Merge "emulator opengl: typo caused the decoder to crash"
* commit '26aad35effe8006cefd246c655cf299f1e5cdf1e':
  emulator opengl: typo caused the decoder to crash
2011-05-03 12:54:18 -07:00
David Turner
699650b50b am 4fc26310: Merge "Emulator Opengl unit test - use sperate implementation libraries"
* commit '4fc26310512a118e2ec00f4fcc50d6d7671b8f75':
  Emulator Opengl unit test - use sperate implementation libraries
2011-05-03 12:54:13 -07:00
David Turner
43a4beea24 am 1dac46ff: Merge "Emulator Opengl - adding preliminary version of GLESv2 encoder"
* commit '1dac46ff9f635203aa28f0eda4af356533dadaa4':
  Emulator Opengl - adding preliminary version of GLESv2 encoder
2011-05-03 12:54:08 -07:00
David Turner
d043a68144 am 3dadd581: Merge "emugen: make \'setContextAccessor\' method static"
* commit '3dadd58183bd5f808fefa5709a18e42a1c208737':
  emugen: make 'setContextAccessor' method static
2011-05-03 12:54:01 -07:00
David Turner
cf0dd28b87 am a80adff3: Merge "emugen - fix wrapper context naming"
* commit 'a80adff329db784d8e22510668a4613a4031da0f':
  emugen - fix wrapper context naming
2011-05-03 12:53:52 -07:00
David Turner
2bd2dcb395 am 13006a26: Merge "emugen: generate wrapper library files"
* commit '13006a265736ad992f4918707a895d3549e2f1f0':
  emugen: generate wrapper library files
2011-05-03 12:53:46 -07:00
David Turner
071f3aaa15 am 351c4d55: Merge "emulator Opengl - slight type change for GLESv2"
* commit '351c4d55b7fbf3e1730878a845c5411fd724d7e0':
  emulator Opengl - slight type change for GLESv2
2011-05-03 12:53:40 -07:00
David Turner
153c35f335 am d8bbe0ce: Merge "emulator Opengl - number of supported vertex attributes"
* commit 'd8bbe0ce838663738a14dcc269e5793b6e978221':
  emulator Opengl - number of supported vertex attributes
2011-05-03 12:53:20 -07:00
David Turner
003f8d1275 am e72ec4bf: Merge "adding support for getting gles proc address from eglGetProcAdress"
* commit 'e72ec4bfbda1aef6faebd20c0afc19ace53b308e':
  adding support for getting gles proc address from eglGetProcAdress
2011-05-03 12:53:14 -07:00
David Turner
d1286137f7 am 8e2dc32b: Merge "Add GLESv2 functionality to GLESv1/GLESv2 shared code"
* commit '8e2dc32b2d540f09a22dc447b53442070477498e':
  Add GLESv2 functionality to GLESv1/GLESv2 shared code
2011-05-03 12:53:07 -07:00
David Turner
ec0369decc am 77b1a456: Merge "Move utility functions into glUtils"
* commit '77b1a4565ca4f6599a4848dd1d83b12727b1ebbc':
  Move utility functions into glUtils
2011-05-03 12:52:52 -07:00
David Turner
835aef2ce8 Merge "emulator: opengl: Fix Mac and Windows builds." 2011-05-03 09:31:17 -07:00
David Turner
fdd5607a6d emulator: opengl: Fix Mac and Windows builds.
+ Fix typo in clean step.

Change-Id: I1da8b17a167247d252b5e8519832b042c2db3ccd
2011-05-03 18:29:27 +02:00
David 'Digit' Turner
caa6ddbe8e Merge "emulator: opengl: Add clean step." 2011-05-03 07:57:50 -07:00
David 'Digit' Turner
e22ae45128 emulator: opengl: Add clean step.
The previous changes replaced /system/lib/libGLES_emul.so with
several other libraries (lib{EGL, GLESv1_CM, GLESv2}_emul.so).

The clean step removes the old libGLES_emul.so from the build to
avoid any surprises.

Change-Id: I285b34c4d5f5a8bd3b37d9cb1b2da33fb155e62c
2011-05-03 16:55:11 +02:00
David 'Digit' Turner
4ad320d819 Merge "adding error handling for Xerrors on EGl linux implementation (EglLinuxApi.cpp)" 2011-05-03 07:51:48 -07:00
David 'Digit' Turner
4707d72787 adding error handling for Xerrors on EGl linux implementation (EglLinuxApi.cpp)
Change-Id: Ib8535e2c25c7de67c8d7830a644643b52742ceaa
2011-05-03 16:42:44 +02:00