Commit Graph

2327 Commits

Author SHA1 Message Date
Amit Feller
f0b7c2e4f9 this checkin supports windows OS in all Translator libs
Note: this is a re-submit of Ie5111d9c435b64d205b140a79863c0273742ee7f,
fixed to avoid breaking the Mac build.

Change-Id: Ib534063d3f403d33d162956bf510baf9689a246a
2011-05-17 21:28:17 +02:00
David 'Digit' Turner
149c180522 am 8fc94823: am 42a6c754: am 3a38c110: Merge "Fix mac build"
* commit '8fc94823cfd7f9f2403f1ad553d84544252c7849':
  Fix mac build
2011-05-17 12:23:50 -07:00
David 'Digit' Turner
8fc94823cf am 42a6c754: am 3a38c110: Merge "Fix mac build"
* commit '42a6c75463a3b4590dbc9a3483222f3478342367':
  Fix mac build
2011-05-17 12:21:29 -07:00
Raphael Moll
7d747db6b1 am 08382e1e: am ed78d63d: am 3fe7791c: Merge "Revert "this checkin supports windows OS in all Translator libs""
* commit '08382e1e2cae7d0bdf94c493edd24a2644de9b5d':
  Revert "this checkin supports windows OS in all Translator libs"
2011-05-17 12:14:34 -07:00
Raphael Moll
08382e1e2c am ed78d63d: am 3fe7791c: Merge "Revert "this checkin supports windows OS in all Translator libs""
* commit 'ed78d63de23730be2a85b7a55b5646b7dc4b7057':
  Revert "this checkin supports windows OS in all Translator libs"
2011-05-17 12:11:42 -07:00
David 'Digit' Turner
2840185690 Fix mac build
Change-Id: I1fc8c5043160dbe2508324655fb506bc31cc50ac
2011-05-17 21:00:52 +02:00
Raphael Moll
603b37abac Revert "this checkin supports windows OS in all Translator libs"
This reverts commit 0bf6848571.

This commit breaks Mca builds:
  development/tools/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp: In function 'EGLBoolean eglChooseConfig(void*, const EGLint*, void**, EGLint, EGLint*)':
  development/tools/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp:412: error: 'PIXEL_FORMAT_INITIALIZER' was not declared in this scope
  make: *** [out/host/darwin-x86/obj/SHARED_LIBRARIES/libEGL_translator_intermediates/EglImp.o] Error 1
2011-05-17 11:41:30 -07:00
David Turner
e6ac336c1c am c8e4598a: am 97d1ddc6: am 4e79d11a: Merge " fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth""
* commit 'c8e4598a5e29aae5e973ea033b81dd2b64e19492':
  fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"
2011-05-17 06:21:54 -07:00
David Turner
c8e4598a5e am 97d1ddc6: am 4e79d11a: Merge " fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth""
* commit '97d1ddc632df673693b570bcb8f8fa99b5b9b6da':
  fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"
2011-05-17 06:19:57 -07:00
Amit Feller
1f4c692222 adding functionality to get the local name of an object from it's local name
Change-Id: I8c9ccc36a5fb70a38a77fa0f0e7826a6fe886db1
2011-05-17 16:10:27 +03:00
Amit Feller
02c3e538e8 fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"
Change-Id: I9700bdb973d2dc01400078c349010a271004dbd9
2011-05-17 15:33:43 +03:00
David Turner
8748cfe6e9 am df0c8dbf: am ce5934c3: am 89bccc8b: Merge "this checkin supports windows OS in all Translator libs"
* commit 'df0c8dbf3d1385205da839011d4645bf1c57f430':
  this checkin supports windows OS in all Translator libs
2011-05-17 04:49:52 -07:00
David Turner
df0c8dbf3d am ce5934c3: am 89bccc8b: Merge "this checkin supports windows OS in all Translator libs"
* commit 'ce5934c3a025d656a7c268e15b766b0b8f20af53':
  this checkin supports windows OS in all Translator libs
2011-05-17 04:45:07 -07:00
Amit Feller
0bf6848571 this checkin supports windows OS in all Translator libs
Change-Id: Ie5111d9c435b64d205b140a79863c0273742ee7f
2011-05-17 11:20:25 +03:00
David Turner
8e80722a9f am d30ae48e: am 41709da8: am b5f5dce4: Merge " small changes to the code before the commit for supporting windows os"
* commit 'd30ae48ee4156c05eb310bea2fbcd94e14ebba15':
  small changes to the code before the commit for supporting windows os
2011-05-16 07:41:03 -07:00
David Turner
2d81f95693 am 225830ef: am 7ff51735: am 92c079df: Merge "changing GLcommon lib to be a sharedlib instead of static"
* commit '225830effb32b24aca07dce61b097c0d8deee940':
  changing GLcommon lib to be a sharedlib instead of static
2011-05-16 07:40:59 -07:00
David Turner
d30ae48ee4 am 41709da8: am b5f5dce4: Merge " small changes to the code before the commit for supporting windows os"
* commit '41709da80e95e94d9f533a18b11c646f56cebfba':
  small changes to the code before the commit for supporting windows os
2011-05-16 07:34:01 -07:00
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 'Digit' Turner
f3d15e4ff7 am 265327f0: am d1ac6bdc: Merge "emulator: opengl: ut_renderer usability improvements"
* commit '265327f06c60aeed17e600db12ad40367c50ae72':
  emulator: opengl: ut_renderer usability improvements
2011-05-11 13:11:51 -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
Alex Sakhartchouk
7efa2db5a1 Merge "Some refactoring of the code." 2011-05-10 10:03:06 -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
Brian Carlstrom
ac8836da56 Move jdwpspy into C++ now that jdwp itself is in C++.
git cherry-pick --no-commit  73cfba122a4ae1c6162fe1c5112e77d8c8430dd9

Change-Id: Id0c6188ece19f6eade18ba8725384d94465aa197
2011-05-05 00:19:46 -07:00
Alex Sakhartchouk
13ec73c22c Some refactoring of the code.
Change-Id: I7b2aa13621c9a2e7a952efafbb1aaf4d86461fed
2011-05-04 18:40:09 -07:00
David Turner
372da9e106 am 11540e0a: am 835aef2c: Merge "emulator: opengl: Fix Mac and Windows builds."
* commit '11540e0aaf9bd88693902cd7aa3fa75e4c8bd614':
  emulator: opengl: Fix Mac and Windows builds.
2011-05-03 13:46:37 -07:00
David 'Digit' Turner
f1a0d538ed am 2076f0fd: am caa6ddbe: Merge "emulator: opengl: Add clean step."
* commit '2076f0fd16c486b18536491050060ff46261908a':
  emulator: opengl: Add clean step.
2011-05-03 13:46:21 -07:00
David 'Digit' Turner
92f7b61b6a am 937322d2: am 4ad320d8: Merge "adding error handling for Xerrors on EGl linux implementation (EglLinuxApi.cpp)"
* commit '937322d250474ee79a8e298656887004c5ed7813':
  adding error handling for Xerrors on EGl linux implementation (EglLinuxApi.cpp)
2011-05-03 13:46:06 -07:00
David 'Digit' Turner
d4d9176eed am 9ffa5d90: am d73fbc24: Merge "emulator: opengl: Use QEMU pipe."
* commit '9ffa5d9043ff64badaf3ad4d024c0dd020630202':
  emulator: opengl: Use QEMU pipe.
2011-05-03 13:45:43 -07:00
David Turner
6c919f7346 am ade2d9c4: am 02d918b0: Merge "common debug flag for the wrapper libraries"
* commit 'ade2d9c49e23fe1d161bc95e9c74d2701f5b6e91':
  common debug flag for the wrapper libraries
2011-05-03 13:45:12 -07:00
David Turner
208c321ed5 am cb06d634: am d82e3bed: Merge "emulator opengl: handle NULL pointers"
* commit 'cb06d63476ec87be63349db1f7e4453295b2ca3f':
  emulator opengl: handle NULL pointers
2011-05-03 13:45:05 -07:00
David Turner
50c5590e27 am 15223314: am d6ff1cc8: Merge "emugen: porperly handle nullAllowed API calls"
* commit '15223314375a8a0c945f916a4024abf59e80682b':
  emugen: porperly handle nullAllowed API calls
2011-05-03 13:44:55 -07:00
David Turner
132473e137 am 3c87fcdc: am cb8efdf0: Merge "emulator opengl: missing constant in glUtilsParamSize"
* commit '3c87fcdc42d76391591cfe428499a30da3a517c1':
  emulator opengl: missing constant in glUtilsParamSize
2011-05-03 13:44:52 -07:00
David Turner
ea083bd4bf am 7cc315de: am ecd4dd7b: Merge "emulator opengl - ensure server connection for rendering thread"
* commit '7cc315debd14e321d1e2c6b2e5294dc019d2cc3f':
  emulator opengl - ensure server connection for rendering thread
2011-05-03 13:44:46 -07:00
David Turner
f77b8f2350 am 24d217ce: am f549d0b3: Merge "emulator opengl : add Dungeon Defenders to the test apps list"
* commit '24d217ce70374fb698e05bb66897761bfb2fd320':
  emulator opengl : add Dungeon Defenders to the test apps list
2011-05-03 13:44:13 -07:00
David Turner
21f8dc1e5c am e43081d3: am 413e35ed: Merge changes I9226275f,If78e8431,I3e36796d,I90c157df
* commit 'e43081d3e7321c8d0892a809ea625ecf2cf36b0c':
  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 13:44:07 -07:00
David Turner
5dec7c0cc7 am d4427e57: am d10c9651: Merge "opengl emulator - handle shader string decoding"
* commit 'd4427e5758766b2f3f721b90a6d74a6167872959':
  opengl emulator - handle shader string decoding
2011-05-03 13:43:50 -07:00
David Turner
290e934051 am 2608ce9c: am 5b840fb3: Merge "emulator opengl - GLESv2 implementation"
* commit '2608ce9cc12fa4c7fc6380b85af7b45b680a1f16':
  emulator opengl - GLESv2 implementation
2011-05-03 13:43:44 -07:00
David Turner
f6d08a9371 am 975a39ba: am 26aad35e: Merge "emulator opengl: typo caused the decoder to crash"
* commit '975a39baa3d779a1972100c11fe7d9447b2feae8':
  emulator opengl: typo caused the decoder to crash
2011-05-03 13:43:39 -07:00
David Turner
d80b7d556c am 699650b5: am 4fc26310: Merge "Emulator Opengl unit test - use sperate implementation libraries"
* commit '699650b50b38b2c716731e0943ebee2e79b3d4ee':
  Emulator Opengl unit test - use sperate implementation libraries
2011-05-03 13:43:35 -07:00
David Turner
e62c67f6e9 am 43a4beea: am 1dac46ff: Merge "Emulator Opengl - adding preliminary version of GLESv2 encoder"
* commit '43a4beea240f848546b2bb7f59a789a1a07dfcb9':
  Emulator Opengl - adding preliminary version of GLESv2 encoder
2011-05-03 13:43:26 -07:00
David Turner
a6eebf5eaf am d043a681: am 3dadd581: Merge "emugen: make \'setContextAccessor\' method static"
* commit 'd043a68144572b7fa71dc59e15adeb1199613d32':
  emugen: make 'setContextAccessor' method static
2011-05-03 13:43:16 -07:00
David Turner
de9024201b am cf0dd28b: am a80adff3: Merge "emugen - fix wrapper context naming"
* commit 'cf0dd28b871cfc45d66f6814c561777c6a3ad7be':
  emugen - fix wrapper context naming
2011-05-03 13:43:11 -07:00
David Turner
70a14fd343 am 2bd2dcb3: am 13006a26: Merge "emugen: generate wrapper library files"
* commit '2bd2dcb3957a409de2c6d788e8c239dc80e8fd31':
  emugen: generate wrapper library files
2011-05-03 13:43:05 -07:00
David Turner
859aac3ad0 am 071f3aaa: am 351c4d55: Merge "emulator Opengl - slight type change for GLESv2"
* commit '071f3aaa15772ad41f0adaabd35ce6c102d2e7aa':
  emulator Opengl - slight type change for GLESv2
2011-05-03 13:42:58 -07:00
David Turner
4065fbfc56 am 153c35f3: am d8bbe0ce: Merge "emulator Opengl - number of supported vertex attributes"
* commit '153c35f3354e7283c2e2f4071b7788eb33132af2':
  emulator Opengl - number of supported vertex attributes
2011-05-03 13:42:52 -07:00
David Turner
9c79c3c17b am 003f8d12: am e72ec4bf: Merge "adding support for getting gles proc address from eglGetProcAdress"
* commit '003f8d1275e9c95d3f5646b8a2f9c13c3a6a3038':
  adding support for getting gles proc address from eglGetProcAdress
2011-05-03 13:42:45 -07:00
David Turner
80412bab31 am d1286137: am 8e2dc32b: Merge "Add GLESv2 functionality to GLESv1/GLESv2 shared code"
* commit 'd1286137f73a6547f6728f9d76752b59ad60c720':
  Add GLESv2 functionality to GLESv1/GLESv2 shared code
2011-05-03 13:42:38 -07:00
David Turner
2cb730f33f am ec0369de: am 77b1a456: Merge "Move utility functions into glUtils"
* commit 'ec0369deccf45313376a00849c43f9a9c18fa621':
  Move utility functions into glUtils
2011-05-03 13:42:25 -07:00