David Turner
c89cd7afa4
am 0777f78e: am a2e0e64a: am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp"
...
* commit '0777f78ee81b4089f88290af82db2055906a73ab':
removed old/obsolete file GLEScontext.cpp
2011-06-07 13:24:38 -07:00
David Turner
ea4284a78a
am f3c78295: am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"
...
* commit 'f3c78295e6d7415b9899778f07ff7ba32ede136e':
Fix issues raised by the GLES 1.1 conformance test
2011-06-07 13:24:34 -07:00
David Turner
0677b7a1e3
am f68103bf: am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
...
* commit 'f68103bf0df892b35c66615efd4c504ef7e96918':
Fix a bug where eglMakeCurrent(NULL) did not work
2011-06-07 13:24:29 -07:00
David Turner
0c5fb2eea7
am b848ebfe: am 62f593fa: am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"
...
* commit 'b848ebfedca6087a327ffab2c402828398241b0a':
Fix a mess in contexts/surfaces reference count
2011-06-07 13:24:24 -07:00
David Turner
01dca04f26
am 5eac0624: am 8821d5a5: Merge "ThreadInfo- use explicit rather than void pointers"
...
* commit '5eac0624d2307ee537d0b4ee6587a02738118c29':
ThreadInfo- use explicit rather than void pointers
2011-06-07 13:22:24 -07:00
David Turner
1a34e175fc
am 3f232d30: am 0b05185e: Merge "Fix version returned by eglInitialize from 4.1 to 1.4."
...
* commit '3f232d30586cddb9b463c7557095906fd58a2db7':
Fix version returned by eglInitialize from 4.1 to 1.4.
2011-06-07 13:22:18 -07:00
David Turner
f90611b840
am 9448b1c2: am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL."
...
* commit '9448b1c2822eaf7a55ceaa3feefa88941d8b47d9':
EglChooseConfig should handle the case where "configs" is NULL.
2011-06-07 13:22:13 -07:00
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
Guy Zadikario
a7f83c0565
removed old/obsolete file GLEScontext.cpp
...
Change-Id: I82f21eef958e37515b46279cf2b44386320723ca
2011-06-06 13:19:26 +03:00
Yochai Shefi Simchon
3150361b51
Fix issues raised by the GLES 1.1 conformance test
...
- Most of the fixes are about unhandled enums.
- Adding an unbindBuffer method to GLEScontext, and use it in the
glDeleteBuffers call, so a buffer is not considered bound after
it has been deleted.
- Handle the case where a call to glCompressedTexImage2D gets
NULL as its data (in which case the uncompressTexture function
should only calculate the output format, but not attempt to
uncompress the NULL data).
- A few segfaults.
Change-Id: I6a856ea6da1be3b15b41140d6383508a6803897c
2011-06-05 13:34:27 +03:00
Yochai Shefi Simchon
889d928f29
Fix a bug where eglMakeCurrent(NULL) did not work
...
This happened because the VALIDATE macros terminated the function prematurally.
Also clear the surface bindings from the previous context.
Change-Id: I33d587f5e877caa6ec651a04ff887e0c77a9d5f3
2011-05-31 15:01:59 +03:00
Yochai Shefi Simchon
88ec3acc83
Fix a mess in contexts/surfaces reference count
...
The main issue was that SmartPtr had an implicit cast to void*, returning its
internal pointer. This allowed writing unsafe code, since the internal pointer
could be handled without increasing its ref count.
So, removed this cast and fixed the various places which relied on it.
Also, fix two calls to "destroy" ahich should have been "markForDestruction".
The naming is not good, should probably change it in a later patch.
Change-Id: Idabc800e97649b2e2404fb7387d25deac70af62e
2011-05-31 15:01:59 +03:00
Yochai Shefi Simchon
eada5b81de
ThreadInfo- use explicit rather than void pointers
...
Replace the void* pointers with explicit pointers for EglContext, EglDisplay
and GLEScontext. Use forward declarations. This is to improve finding errors
in compile time rather than on run time.
Change-Id: Iaec3c36c1e12f36b37d34f68e9d8aa58ff1b30c0
2011-05-31 14:59:20 +03:00
Yochai Shefi Simchon
094026698e
Fix version returned by eglInitialize from 4.1 to 1.4.
...
Change-Id: I43f3512374f546a81b7cfbba8959ce9f0ed7fe53
2011-05-31 14:15:02 +03:00
Yochai Shefi Simchon
aac7fe282c
EglChooseConfig should handle the case where "configs" is NULL.
...
Change-Id: I236afdfc73eb5dd5a3ab19e2b388772ea297bdb4
2011-05-31 14:13:26 +03: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