David Turner
cb802ae3d9
am 6d70e8c3: am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into
...
* commit '6d70e8c39ec00488ce8acb94d39a77072d9ef465':
Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder.
2011-06-07 13:21:44 -07:00
Amit Feller
624176d51a
Emulators's GLES 2.0 translator implementation
...
This is the GLESv2 on top of openGL implementation on the host
most of this change is moving code which is necessary by both
GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into
GLcommon folder.
GLESv2Imp - includes GLES 2.0 entry points implementation
Change-Id: I934fb963478a7f596d824612f847a5aa77d2ed9d
2011-05-30 11:06:24 +03:00
David Turner
d143387d72
am 1c53e616: am fd6ed4dd: Merge "adding functionality to get the local name of an object from it\'s local name"
...
* commit '1c53e61689094f088a07b6fb3cb634eda1833f05':
adding functionality to get the local name of an object from it's local name
2011-05-18 07:42:00 -07:00
David Turner
fd6ed4dd31
Merge "adding functionality to get the local name of an object from it's local name"
2011-05-18 06:52:22 -07:00
David Turner
a76ded7112
am 7e026547: am 83b55247: Merge "this checkin supports windows OS in all Translator libs"
...
* commit '7e0265477a936ff562dc8cab84a3b24bde267799':
this checkin supports windows OS in all Translator libs
2011-05-18 03:22:51 -07:00
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
8fc94823cf
am 42a6c754: am 3a38c110: Merge "Fix mac build"
...
* commit '42a6c75463a3b4590dbc9a3483222f3478342367':
Fix mac build
2011-05-17 12:21:29 -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
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
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
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
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
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
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
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
David 'Digit' Turner
892a6306e7
emulator: opengl: Use QEMU pipe.
...
This patch modifies the guest libraries to use the new
fast qemu "opengles" pipe to communicate with the host
renderer process.
Note that the renderer is still listening on a TCP socket
on port 22468.
Change-Id: I6ab84f972a8024e1fdababa4615d0650c8d461bf
Conflicts:
tools/emulator/opengl/tests/gles_android_wrapper/Android.mk
tools/emulator/opengl/tests/gles_android_wrapper/ServerConnection.h
2011-05-03 16:21:12 +02:00
Jacky Romano
7b73c9f1d3
common debug flag for the wrapper libraries
...
Change-Id: I6f20ed1e7a2b95dee21e09aa9b43fae22e5e4d3d
2011-05-03 16:12:26 +02:00