David Turner
d33222df9d
Merge "opengles emulator: mac support binding context to pbuffer"
2011-08-13 15:45:20 -07:00
David Turner
255bdd3f1b
Merge "opengles emulator: fix shader parser precision qualifiers"
2011-08-13 15:44:32 -07:00
David Turner
dd7d29e06a
Merge "opengles emulator: added FPS statistics printout"
2011-08-13 15:43:11 -07:00
David Turner
d2c5f50354
Merge "opengles emulator: fix the uniform location WAR for intel platforms"
2011-08-13 15:42:41 -07:00
David Turner
f149b4f065
Merge "opengl emulator: fix windows build"
2011-08-13 15:40:50 -07:00
David Turner
584bcf8aea
Merge "opengles emulator: fix shader/program info log functions"
2011-08-13 15:39:50 -07:00
Chet Haase
7c4ad87f6b
Merge "Fix issues in LayoutAnimationsHideShow demo."
2011-08-11 12:16:11 -07:00
Amith Yamasani
d9e0c41a75
Merge "Remove old fashioned expand/collapse techniques in SearchView examples."
2011-08-11 11:42:41 -07:00
Chet Haase
dd722e4680
Fix issues in LayoutAnimationsHideShow demo.
...
There were various minor issues with this app that made it not work
correctly in some situations (the APPEARING animation was basically a no-op,
and disabling the custom animations disabled animations altogether).
Change-Id: I20aba9551043a63c21d26208ae7cd0395cde01cb
2011-08-11 11:36:33 -07:00
Dianne Hackborn
b30b356f20
Merge "New API demo for installing/uninstalling applications."
2011-08-11 11:35:55 -07:00
Guy Zadickario
617416e693
opengles emulator: support display rotation and resize
...
Changes the render_api to support re-creating the display
sub-window and the ability to rotate the displayed framebuffer
image.
That currently works only when the renderer runs as a thread
and not as seperate process. Therefore we setup the library
to run the renderer as thread(s) inside the calling process
on *all* platforms for now.
Change-Id: Ifd009db903759042a7edcf89866d3c3fe076cae9
2011-08-11 17:36:20 +03:00
Guy Zadickario
9dcac079ce
opengles emulator: mac support binding context to pbuffer
...
On Mac it happens that when a context is bound to a pbuffer
and you want to bind it to a window (NSView) instead you must
release it from the pbuffer before binding the window by calling
clearDrawable handle of NSOpenGLContext.
This change added an override of NSOpenGLContext in order to track
to which drawable type the context was previously bound and
call clearDrawable when necessary.
Change-Id: Iece5ab16a46aa0d107ccb773986a6b280d09d181
2011-08-11 17:36:20 +03:00
Yochai Shefi Simchon
f79a58ed62
opengles emulator: fix shader parser precision qualifiers
...
Workaround to intel/linux driver issue.
Desktop OpenGL does not support precision qulifiers in shaders,
so we remove them by defining "precision" "mediump" "lowp" and
"highp" to blank.
That translates the line "precision mediump float;" to "float;" which
is a valid command according to the GLSL spec however it fails
to compile using the intel/linux driver.
This change adds a parser which removes completely the
precision command from the shader source.
Change-Id: I29a16bb78ac0000d624aa2f83e93ef5c6ad60345
2011-08-11 17:36:20 +03:00
Guy Zadickario
13b3da879b
opengles emulator: added FPS statistics printout
...
Make the renderer print FPS statistics every 1 second.
Need to set SHOW_FPS_STATS=1
Change-Id: I69e8c43a779e685ae0b34974d1ef33ad75e7a7e4
2011-08-11 17:36:13 +03:00
Guy Zadickario
7944edcdb2
opengles emulator: fix the uniform location WAR for intel platforms
...
Fixed the location shift WAR to work for arrays that starts at
location 0. Fixed conformance regressions made by this workaround.
The conversion should be smarter than just shifting 16-bits back
and forth, it should take into account if array element is being
accessed.
Change-Id: Icb746c67e16edfacb8264a1e687fd24ac6e868e7
2011-08-11 17:36:03 +03:00
Guy Zadickario
ea7f72a6c7
opengl emulator: fix windows build
...
That fixes the event injection code to build correctly on
Windows.
Also renamed SDL_{CFLAGS,LDFLAGS} used in the Android.mk
to have a LOCAL_ prefix.
Change-Id: Ie82838ffb931880e700322116c3190fbb754d889
2011-08-11 17:35:33 +03:00
Amit Feller
bc9d37e3c9
opengles emulator: fix shader/program info log functions
...
on some platforms info log length of programs and shaders was
not returned correctly, we now cache the info log for these objects
and calculate info log length intenrally to be both correct and
compliant to the spec and conformance tests.
Change-Id: I017932482ba36f9e2e1858fe372683f7ac3a98ca
2011-08-11 17:26:27 +03:00
Amith Yamasani
5591368aec
Remove old fashioned expand/collapse techniques in SearchView examples.
...
These are not the recommended patterns any more.
Bug: 5086888
Change-Id: If354ea5af0eaff33d0e572177a9e804d899d07e1
2011-08-10 18:36:11 -07:00
David Turner
f9e27297b0
am bc034f45: am 8c8a6187: am 47dd884b: Merge "opengles emulator: Support current value for attribute 0"
...
* commit 'bc034f45231afc99edc57421b08d5a19070557ae':
opengles emulator: Support current value for attribute 0
2011-08-10 12:27:24 -07:00
David Turner
f77540941c
am 6d9eec7c: am 2f2f319d: am 1216e72a: Merge "opengles emulator: GLESv2: adding more params validation."
...
* commit '6d9eec7c269112fc73e8a52e972a535edf5643e4':
opengles emulator: GLESv2: adding more params validation.
2011-08-10 12:27:22 -07:00
David Turner
f28c9f247c
am 594c3cee: am 844c0987: am 364e9963: Merge "opengles emulator: check OES_standard_derivatives support"
...
* commit '594c3cee910ee9b8b22bb77f39f75937880352db':
opengles emulator: check OES_standard_derivatives support
2011-08-10 12:27:20 -07:00
David Turner
9f2edbfe1e
am 276f4f43: am 1a9ad005: am 0a931f55: Merge "opengles emulator: fix uniform name translation to apps"
...
* commit '276f4f432804ed50e966725cd6d98f8cdd5eba1c':
opengles emulator: fix uniform name translation to apps
2011-08-10 12:27:18 -07:00
David Turner
eb3430cb7d
am b035c43d: am 8bbc54f4: am d20186af: Merge "opengles emulator: GLES2 translator / codec"
...
* commit 'b035c43d42812687879e1617204dd78d848c36e5':
opengles emulator: GLES2 translator / codec
2011-08-10 12:27:15 -07:00
David Turner
e2e7c680f8
am c4c77c0c: am ef1e9fa0: am 490bb2af: Merge "opengles emulator: GLES fix memory leaks"
...
* commit 'c4c77c0cde3dff3a3cb10f72b2ce108d0b53d33e':
opengles emulator: GLES fix memory leaks
2011-08-10 12:27:13 -07:00
David Turner
6ad2537ebc
am 4b05e065: am 0cc0cb10: am 90d4ce08: Merge "opengles emulator: support glEGLImageTargetRenderbufferStorageOES"
...
* commit '4b05e0654c8dacb87b6849c9a0c33afc7e1a7d3e':
opengles emulator: support glEGLImageTargetRenderbufferStorageOES
2011-08-10 12:27:09 -07:00
David Turner
1e2415ee41
am cf7a50b2: am e594f31f: am f3bb27a7: Merge "opengles emulator: filter-out non-RGB configs"
...
* commit 'cf7a50b2d4aef3b7026854499789bdc90f7e8ed8':
opengles emulator: filter-out non-RGB configs
2011-08-10 12:27:06 -07:00
David Turner
4f0a6794c1
am 52dc2b9e: am 3fa3021e: am fb8c84d8: Merge "opengles emulator: Workaround Cordy (Unity) bug with intel driver."
...
* commit '52dc2b9eba80316e678957de64b54818f75de0c8':
opengles emulator: Workaround Cordy (Unity) bug with intel driver.
2011-08-10 12:27:03 -07:00
David Turner
e611df831a
am 1b0a25ee: am 5d1dc7c9: am f7e07ec9: Merge "opengles emulator: make glFramebufferTexture2D work"
...
* commit '1b0a25eecf50c9930e8ce2656bd43e1ee7b7c006':
opengles emulator: make glFramebufferTexture2D work
2011-08-10 12:26:57 -07:00
David Turner
d15c81b4a6
am dd37090d: am 54c1aa4f: am be19b0fd: Merge "opengles emulator: Separate FramebufferData to header and source files"
...
* commit 'dd37090d15ce2f4825b5bec04d96ac9ac6878853':
opengles emulator: Separate FramebufferData to header and source files
2011-08-10 12:26:53 -07:00
David Turner
87e2f1e3f3
am a765e6e8: am b6a9f378: am 31978050: Merge "opengles emulator: GLESv2: glGetShaderPrecision"
...
* commit 'a765e6e8c0bac31cd646e9501f6582055efb1fee':
opengles emulator: GLESv2: glGetShaderPrecision
2011-08-10 12:26:49 -07:00
David Turner
0eb603609a
am 0ee2955a: am a68ff59e: am 63e88ce1: Merge "opengles emulator: fix initialization of vertex attribute"
...
* commit '0ee2955a5945bc317545c9fc1397c95a68d3f605':
opengles emulator: fix initialization of vertex attribute
2011-08-10 12:26:45 -07:00
David Turner
0aaca2e77e
am 04befcc9: am 2cd8a6d9: am dc84793a: Merge "opengles emulator: object name manager name generation"
...
* commit '04befcc927a9f1d9c277ad0799d10b62c8a2bf76':
opengles emulator: object name manager name generation
2011-08-10 12:26:40 -07:00
David Turner
f4000ab5a1
am 997c4c2a: am 2257c1fd: am 3127d80b: Merge "opengles emulator: handle window surface resize"
...
* commit '997c4c2a62fc6bf75a68e656bfc747075f374098':
opengles emulator: handle window surface resize
2011-08-10 12:26:36 -07:00
David Turner
661a1298fb
am cf81212c: am 705e64ef: am 3ba4f8b8: Merge "opengles emulator: fix bug in glTranslatex"
...
* commit 'cf81212c6778291f78246dcac226c10aba36cbf5':
opengles emulator: fix bug in glTranslatex
2011-08-10 12:26:30 -07:00
David Turner
0b60b6b26e
am 7c36194c: am 3bf1beed: am b1f4d3cb: Merge "opengles emulator: fix printf\'s"
...
* commit '7c36194cf013c0c419ee78348253de66d5359d05':
opengles emulator: fix printf's
2011-08-10 12:26:25 -07:00
David Turner
8dcdc5af9d
am 34492d76: am dc8f3c37: am 5a034089: Merge "opengles emulator: fix a bug in RangeList"
...
* commit '34492d762ebf4760992ec7d704b68503503b0f09':
opengles emulator: fix a bug in RangeList
2011-08-10 12:26:20 -07:00
David Turner
e9ae033412
am 02e363ee: am 8324d38c: am a0bd0cbe: Merge "opengles emulator: Fixed Windows renderer termination"
...
* commit '02e363eeb239070e0410fb61f6f19d3e3b2b6623':
opengles emulator: Fixed Windows renderer termination
2011-08-10 12:26:14 -07:00
David Turner
e6bf0445fd
am bf65b7fe: am 278d1058: am 6bb95113: Merge "opengles emulator: GLES memory leaks"
...
* commit 'bf65b7feb83ad96ce8b326608d1eb90193de60ca':
opengles emulator: GLES memory leaks
2011-08-10 12:26:08 -07:00
David Turner
922df6dd36
am ec3cac82: am 7ed0fc9a: am 5bc21905: Merge "opengles emulator: fix glGetUnifrom"
...
* commit 'ec3cac82e27b77676d433471b607383e1af049bb':
opengles emulator: fix glGetUnifrom
2011-08-10 12:26:02 -07:00
David Turner
5f6d49c480
am c9cd1777: am 833d1a4e: am 6c812a6e: Merge "opengles emulator: libEGL fixes for ATI driver on windows."
...
* commit 'c9cd1777ca7aa066ecc4b2890a428301eb9de2ec':
opengles emulator: libEGL fixes for ATI driver on windows.
2011-08-10 12:25:56 -07:00
David Turner
ed33ace4d6
am bc1b310f: am 69ae2a4a: am b49454ac: Merge "opengles emulator: limit X11 configs some more"
...
* commit 'bc1b310fb58f9063db2c8007aaffb3f8943021d8':
opengles emulator: limit X11 configs some more
2011-08-10 12:25:49 -07:00
David Turner
63a01f8a39
am d0d6657a: am a9605f55: am 385ae28d: Merge "opengles emulator: fixing pointer size bug."
...
* commit 'd0d6657a50def057a362fc8b2f4dc5453cc4e2dd':
opengles emulator: fixing pointer size bug.
2011-08-10 12:25:42 -07:00
David Turner
77903f5e7d
am 1a50f15f: am ae707198: am 275e99fd: Merge "opengles emulator: remove compilation warning."
...
* commit '1a50f15fe90d53bec32eee197634bdcc45348cd8':
opengles emulator: remove compilation warning.
2011-08-10 12:25:35 -07:00
David Turner
1b21295db1
am 7cd5d7bf: am 3d0d9865: am 26892efa: Merge "opengles emulator: fixed renderer termination flow"
...
* commit '7cd5d7bfdc6dcf826359270694c39e38fb5953ff':
opengles emulator: fixed renderer termination flow
2011-08-10 12:25:22 -07:00
David Turner
ed738074f0
am edc55c16: am 611b3af6: am 385d396f: Merge "opengles emulator: fixing GL_HALF_FLOAT_OES bug"
...
* commit 'edc55c16c71f8e506a6d402b6547e431badb759c':
opengles emulator: fixing GL_HALF_FLOAT_OES bug
2011-08-10 12:24:59 -07:00
David Turner
5892c4678b
am 83202040: am 89c5482b: am 283df9c4: Merge "opengles emulator: forced GLSL version to be 120."
...
* commit '832020406793f8dfa8a93cff9e37d73966cefbe9':
opengles emulator: forced GLSL version to be 120.
2011-08-10 12:24:51 -07:00
David Turner
90e65d4aa4
am b5e8d4c5: am 81973086: am c7fb2970: Merge "opengles emulator: GLES2 codec - glFinishRoundTrip"
...
* commit 'b5e8d4c52061ce3ff4153741f37017f299759352':
opengles emulator: GLES2 codec - glFinishRoundTrip
2011-08-10 12:24:43 -07:00
David Turner
22aa5711b8
am eac7fbd6: am e6954209: am fc15a710: Merge "opengles emulator: test: added shader flags to triangleV2 test"
...
* commit 'eac7fbd6b316b0bca6d71ca7ac265935eecc413f':
opengles emulator: test: added shader flags to triangleV2 test
2011-08-10 12:24:34 -07:00
David Turner
f08f3552da
am f1482edd: am 96221311: am 8b5652be: Merge "opengles emulator: support glEGLImageTargetRenderbufferStorageOES"
...
* commit 'f1482edd61c931a0e49ceb64958817e856d7bb92':
opengles emulator: support glEGLImageTargetRenderbufferStorageOES
2011-08-10 12:24:25 -07:00
David Turner
938dcb41ae
am 8fbd35c5: am d76a7100: am 0660de71: Merge "emulator opengl: fixed encoding of glGenRendebuffer"
...
* commit '8fbd35c5b1c4a0d1edbbc07a63d4cf4bf66ad5c7':
emulator opengl: fixed encoding of glGenRendebuffer
2011-08-10 12:24:16 -07:00