LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,195 Commits 2 Branches 0 Tags
372da9e1065a8d6e81c40c50895fc8eced2d9aa2
Commit Graph

1501 Commits

Author SHA1 Message Date
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
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
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
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