Commit Graph

7018 Commits

Author SHA1 Message Date
David Turner
dab1fb3b90 am 0315d710: am 06039b1e: Merge "opengles emulator: call XInitThreads in emulator_test_renderer"
* commit '0315d710171f2453699ac97dd0359c05616f30b0':
  opengles emulator: call XInitThreads in emulator_test_renderer
2011-08-15 09:58:05 -07:00
David Turner
0315d71017 am 06039b1e: Merge "opengles emulator: call XInitThreads in emulator_test_renderer"
* commit '06039b1e3be0ace898f28c3f4742a2879d9767b9':
  opengles emulator: call XInitThreads in emulator_test_renderer
2011-08-15 09:56:32 -07:00
David Turner
06039b1e3b Merge "opengles emulator: call XInitThreads in emulator_test_renderer" 2011-08-15 09:20:45 -07:00
Guy Zadickario
bdfb71562c opengles emulator: call XInitThreads in emulator_test_renderer
Now that we are not running the renderer as a seperate process
we need to have the XInitThreads call we put in the renderer process
inside emulator_test_renderer since the render server runs inside that
thread.
NOTE FOR INTEGRATION: this will need to be added to the emulator as
well.

Change-Id: I70592ad976d08c86e2c9e75b11b6ad57d6067606
2011-08-15 16:46:57 +03:00
David Turner
7dc8b4a786 am 3d9ae4e7: am caf8eafb: Merge "opengles emulator: support display rotation and resize"
* commit '3d9ae4e7df9b43ac99f98344e9bd564673f81544':
  opengles emulator: support display rotation and resize
2011-08-13 16:14:12 -07:00
David Turner
3167d2a9c7 am f8f0a7e9: am d33222df: Merge "opengles emulator: mac support binding context to pbuffer"
* commit 'f8f0a7e93aa9c8b679e3f1ee50af681ff40daeff':
  opengles emulator: mac support binding context to pbuffer
2011-08-13 16:14:10 -07:00
David Turner
3d7e82c0c0 am b76d1f0a: am 255bdd3f: Merge "opengles emulator: fix shader parser precision qualifiers"
* commit 'b76d1f0a6b40d2f27e2120c89be04459944ea871':
  opengles emulator: fix shader parser precision qualifiers
2011-08-13 16:14:08 -07:00
David Turner
252e29031d am 7014f052: am dd7d29e0: Merge "opengles emulator: added FPS statistics printout"
* commit '7014f052514e30ff3531813b2ef0c816130ccf1f':
  opengles emulator: added FPS statistics printout
2011-08-13 16:14:06 -07:00
David Turner
06703c0450 am 70cac15e: am d2c5f503: Merge "opengles emulator: fix the uniform location WAR for intel platforms"
* commit '70cac15eacd3524d758bcb0dbd394772f2bbc5a0':
  opengles emulator: fix the uniform location WAR for intel platforms
2011-08-13 16:14:03 -07:00
David Turner
6b7eecfb46 am 1639334c: am f149b4f0: Merge "opengl emulator: fix windows build"
* commit '1639334c53cb51476d4fa07c50facfe75a001692':
  opengl emulator: fix windows build
2011-08-13 16:14:00 -07:00
David Turner
fe2bed335f am 34552f4c: am 584bcf8a: Merge "opengles emulator: fix shader/program info log functions"
* commit '34552f4cf8796a27666d7abbdaeff8a39a2bdbf3':
  opengles emulator: fix shader/program info log functions
2011-08-13 16:13:57 -07:00
David Turner
3d9ae4e7df am caf8eafb: Merge "opengles emulator: support display rotation and resize"
* commit 'caf8eafb1e54cadd2793a0382db9e8343eb247f7':
  opengles emulator: support display rotation and resize
2011-08-13 16:11:02 -07:00
David Turner
f8f0a7e93a am d33222df: Merge "opengles emulator: mac support binding context to pbuffer"
* commit 'd33222df9d7f85708f55d6abd45b0ea3a198d809':
  opengles emulator: mac support binding context to pbuffer
2011-08-13 16:11:00 -07:00
David Turner
b76d1f0a6b am 255bdd3f: Merge "opengles emulator: fix shader parser precision qualifiers"
* commit '255bdd3f1b68c98bdeeea7006132b61e9bade1cb':
  opengles emulator: fix shader parser precision qualifiers
2011-08-13 16:10:58 -07:00
David Turner
7014f05251 am dd7d29e0: Merge "opengles emulator: added FPS statistics printout"
* commit 'dd7d29e06aa9d8c2a68b68291d9343a88df62209':
  opengles emulator: added FPS statistics printout
2011-08-13 16:10:56 -07:00
David Turner
70cac15eac am d2c5f503: Merge "opengles emulator: fix the uniform location WAR for intel platforms"
* commit 'd2c5f50354052223348aa9acbdaeea407b28d8f9':
  opengles emulator: fix the uniform location WAR for intel platforms
2011-08-13 16:10:53 -07:00
David Turner
1639334c53 am f149b4f0: Merge "opengl emulator: fix windows build"
* commit 'f149b4f0650c1a96eb13c6c0db2b493ac57c75aa':
  opengl emulator: fix windows build
2011-08-13 16:10:51 -07:00
David Turner
34552f4cf8 am 584bcf8a: Merge "opengles emulator: fix shader/program info log functions"
* commit '584bcf8aea9270069fed1c4e87a48a2a9c7e4680':
  opengles emulator: fix shader/program info log functions
2011-08-13 16:10:48 -07:00
David Turner
caf8eafb1e Merge "opengles emulator: support display rotation and resize" 2011-08-13 15:47:13 -07:00
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
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
David Turner
bc034f4523 am 8c8a6187: am 47dd884b: Merge "opengles emulator: Support current value for attribute 0"
* commit '8c8a6187bd6d1b547696d568f9972128a8ed57ec':
  opengles emulator: Support current value for attribute 0
2011-08-10 02:23:41 -07:00
David Turner
6d9eec7c26 am 2f2f319d: am 1216e72a: Merge "opengles emulator: GLESv2: adding more params validation."
* commit '2f2f319d6811826b4a4a91b70e47dd98a4b8900a':
  opengles emulator: GLESv2: adding more params validation.
2011-08-10 02:23:38 -07:00
David Turner
594c3cee91 am 844c0987: am 364e9963: Merge "opengles emulator: check OES_standard_derivatives support"
* commit '844c0987e04b0616bbc795f111045b733e68c893':
  opengles emulator: check OES_standard_derivatives support
2011-08-10 02:23:36 -07:00
David Turner
276f4f4328 am 1a9ad005: am 0a931f55: Merge "opengles emulator: fix uniform name translation to apps"
* commit '1a9ad005bd7e492a2aa48e8be1a281b1c621374c':
  opengles emulator: fix uniform name translation to apps
2011-08-10 02:23:34 -07:00
David Turner
8c8a6187bd am 47dd884b: Merge "opengles emulator: Support current value for attribute 0"
* commit '47dd884b5adda8e8b5004ea653d9010da13f747f':
  opengles emulator: Support current value for attribute 0
2011-08-10 02:21:56 -07:00
David Turner
2f2f319d68 am 1216e72a: Merge "opengles emulator: GLESv2: adding more params validation."
* commit '1216e72aa57ced98d4a8cc6951f6320725d1008d':
  opengles emulator: GLESv2: adding more params validation.
2011-08-10 02:21:54 -07:00
David Turner
844c0987e0 am 364e9963: Merge "opengles emulator: check OES_standard_derivatives support"
* commit '364e99635ff77f027bbdcee0d143020aac2085a8':
  opengles emulator: check OES_standard_derivatives support
2011-08-10 02:21:52 -07:00
David Turner
1a9ad005bd am 0a931f55: Merge "opengles emulator: fix uniform name translation to apps"
* commit '0a931f5580cffab446d5eef5d87308eb67234ae9':
  opengles emulator: fix uniform name translation to apps
2011-08-10 02:21:50 -07:00
David Turner
b035c43d42 am 8bbc54f4: am d20186af: Merge "opengles emulator: GLES2 translator / codec"
* commit '8bbc54f445eb2be9cdae8449f92edcf6d045a418':
  opengles emulator: GLES2 translator / codec
2011-08-10 02:09:45 -07:00
David Turner
c4c77c0cde am ef1e9fa0: am 490bb2af: Merge "opengles emulator: GLES fix memory leaks"
* commit 'ef1e9fa0205b4d6499cf8a414f2d407f6ba77388':
  opengles emulator: GLES fix memory leaks
2011-08-10 02:09:43 -07:00
David Turner
4b05e0654c am 0cc0cb10: am 90d4ce08: Merge "opengles emulator: support glEGLImageTargetRenderbufferStorageOES"
* commit '0cc0cb10602e32c3ca826999fb60e73fb2bea8b6':
  opengles emulator: support glEGLImageTargetRenderbufferStorageOES
2011-08-10 02:09:41 -07:00
David Turner
cf7a50b2d4 am e594f31f: am f3bb27a7: Merge "opengles emulator: filter-out non-RGB configs"
* commit 'e594f31fafd8d4ad9e5a00c260bf5f1b1a36c991':
  opengles emulator: filter-out non-RGB configs
2011-08-10 02:09:38 -07:00
David Turner
52dc2b9eba am 3fa3021e: am fb8c84d8: Merge "opengles emulator: Workaround Cordy (Unity) bug with intel driver."
* commit '3fa3021e55d624cc05a67a49c88e4dac36961457':
  opengles emulator: Workaround Cordy (Unity) bug with intel driver.
2011-08-10 02:09:36 -07:00
David Turner
1b0a25eecf am 5d1dc7c9: am f7e07ec9: Merge "opengles emulator: make glFramebufferTexture2D work"
* commit '5d1dc7c9814ca3d82ddf144cdad28b672659c21e':
  opengles emulator: make glFramebufferTexture2D work
2011-08-10 02:09:33 -07:00
David Turner
dd37090d15 am 54c1aa4f: am be19b0fd: Merge "opengles emulator: Separate FramebufferData to header and source files"
* commit '54c1aa4fcbfefa572dfdf57aa6e9bb19c92ab539':
  opengles emulator: Separate FramebufferData to header and source files
2011-08-10 02:09:30 -07:00
David Turner
8bbc54f445 am d20186af: Merge "opengles emulator: GLES2 translator / codec"
* commit 'd20186af1b4c55b50278189ab29847f78b9f5576':
  opengles emulator: GLES2 translator / codec
2011-08-10 02:08:07 -07:00
David Turner
ef1e9fa020 am 490bb2af: Merge "opengles emulator: GLES fix memory leaks"
* commit '490bb2afed0cc94401749431ccbc5c952888a4f7':
  opengles emulator: GLES fix memory leaks
2011-08-10 02:08:05 -07:00
David Turner
0cc0cb1060 am 90d4ce08: Merge "opengles emulator: support glEGLImageTargetRenderbufferStorageOES"
* commit '90d4ce080c9f6683989e5bb8d66e07960fd29afc':
  opengles emulator: support glEGLImageTargetRenderbufferStorageOES
2011-08-10 02:08:03 -07:00