David Turner
2e2e571cd6
am 86c57cf4: am dd70f991: am c1c47c08: am 6a9aa82f: Merge "emulator:opengl: custom framebuffer sizes"
...
* commit '86c57cf449958934400ad5794df9543f81760e21':
emulator:opengl: custom framebuffer sizes
2011-07-14 10:49:14 -07:00
Ying Wang
5280e81708
Merge "Remove simulator conditionals."
2011-07-13 16:30:52 -07:00
David Turner
70d01b635a
am 5fd128dc: am 85743bc8: am 37ac3401: am 2319e183: Merge "egl emulator: fixes for covegl conformance test"
...
* commit '5fd128dcbd645f6f77f55d518569c74c0febaf3f':
egl emulator: fixes for covegl conformance test
2011-07-13 14:55:11 -07:00
David Turner
7eb98b846a
am 40c3e893: am 37ba60c4: am 4b8bf442: am f4b1fa4c: Merge "GLESv2 Translator: fix glGet*"
...
* commit '40c3e89363048b6fe5672e0f32c67210dab47f90':
GLESv2 Translator: fix glGet*
2011-07-13 14:55:00 -07:00
David Turner
640a66ee2f
am 9e261942: am 735b35fb: am 14fa0201: am c559f761: Merge "GLES2 translator: fix glUseProgram error"
...
* commit '9e261942aa9dd9b653a09bb4bc0e66979664ce35':
GLES2 translator: fix glUseProgram error
2011-07-13 14:54:41 -07:00
David Turner
b52220aeef
am ec430289: am b7b2af83: am 49947927: am ad31d5ca: Merge "GLES2 Translator: GetVertexAttrib* fix"
...
* commit 'ec430289b4ea4a5d93a3bffc450744b7b0988bbc':
GLES2 Translator: GetVertexAttrib* fix
2011-07-13 14:54:38 -07:00
David Turner
4bbdb6aa3f
am 98c54ff0: am d538593a: am 29512bbb: am fbd9283c: Merge "GLES2 translator: fix point rendering"
...
* commit '98c54ff09fbd47c30e53a29b6c4b76313c13425d':
GLES2 translator: fix point rendering
2011-07-13 14:54:35 -07:00
David Turner
254be80903
am b8d215b0: am 248ba3e5: am a20d6fe0: am e7db3af6: Merge "GLES2 translator: DeleteShader/Program fix"
...
* commit 'b8d215b0443a88e4a6b544fbe7a396e7d1519404':
GLES2 translator: DeleteShader/Program fix
2011-07-13 14:54:31 -07:00
David Turner
c8a6c1c0c6
am a8d0b7e6: am 87c04589: am 37577cb6: am 05832ade: Merge "opengles Translator: fix uncompress palleted A1 textures"
...
* commit 'a8d0b7e6046abe1a61443ffc8420195a03298711':
opengles Translator: fix uncompress palleted A1 textures
2011-07-13 14:54:28 -07:00
Ying Wang
6a42c746e5
Remove simulator conditionals.
...
Simulator is gone.
Change-Id: Ia4454bde6d16666830b553ec42e5c19359505103
2011-07-13 10:34:21 -07:00
David Turner
86c57cf449
am dd70f991: am c1c47c08: am 6a9aa82f: Merge "emulator:opengl: custom framebuffer sizes"
...
* commit 'dd70f991a844e16316fc34c91a4f535ada25e25e':
emulator:opengl: custom framebuffer sizes
2011-07-12 03:48:41 -07:00
David Turner
70d98e6466
emulator:opengl: custom framebuffer sizes
...
This allows the "emulator_test_renderer" program to use
custom framebuffer sizes. You need to define ANDROID_WINDOW_SIZE
in your environment before launching the test program, e.g.:
export ANDROID_WINDOW_SIZE=640x480
Change-Id: I2559c6e75022762697ed4c4559d6c2ba3f400e8f
2011-07-12 06:35:25 +02:00
David Turner
5fd128dcbd
am 85743bc8: am 37ac3401: am 2319e183: Merge "egl emulator: fixes for covegl conformance test"
...
* commit '85743bc8e6e3ffe3238a61aed5d87ba308c2af82':
egl emulator: fixes for covegl conformance test
2011-07-11 16:08:04 -07:00
David Turner
40c3e89363
am 37ba60c4: am 4b8bf442: am f4b1fa4c: Merge "GLESv2 Translator: fix glGet*"
...
* commit '37ba60c470aad28a7b37cb4d61da9384b514b3c9':
GLESv2 Translator: fix glGet*
2011-07-11 16:08:02 -07:00
David Turner
9e261942aa
am 735b35fb: am 14fa0201: am c559f761: Merge "GLES2 translator: fix glUseProgram error"
...
* commit '735b35fb1be6a9a5e63fa0c639ca2eed007f4c71':
GLES2 translator: fix glUseProgram error
2011-07-11 15:59:12 -07:00
David Turner
ec430289b4
am b7b2af83: am 49947927: am ad31d5ca: Merge "GLES2 Translator: GetVertexAttrib* fix"
...
* commit 'b7b2af83869e1120962ac788d9019aa4ddbcade9':
GLES2 Translator: GetVertexAttrib* fix
2011-07-11 15:59:10 -07:00
David Turner
98c54ff09f
am d538593a: am 29512bbb: am fbd9283c: Merge "GLES2 translator: fix point rendering"
...
* commit 'd538593a21c8dd10c85b7eb5dec928f238cf8805':
GLES2 translator: fix point rendering
2011-07-11 15:59:08 -07:00
David Turner
b8d215b044
am 248ba3e5: am a20d6fe0: am e7db3af6: Merge "GLES2 translator: DeleteShader/Program fix"
...
* commit '248ba3e50c8fec456d47ddce648c9bf0335415fe':
GLES2 translator: DeleteShader/Program fix
2011-07-11 15:59:05 -07:00
David Turner
a8d0b7e604
am 87c04589: am 37577cb6: am 05832ade: Merge "opengles Translator: fix uncompress palleted A1 textures"
...
* commit '87c04589e498f669e1a16a849a2e6e7770bd5bc0':
opengles Translator: fix uncompress palleted A1 textures
2011-07-11 15:59:01 -07:00
Stas Gurtovoy
201584b1d4
egl emulator: fixes for covegl conformance test
...
Support for eglChooseConfig with configs==NULL.
Also added small change to query EGL_LARGEST_PBUFFER attrib of surfaces.
Fixed error print in QemuPipeStream::readFully.
Those changes make sure that covegl completes & passes on the emulator with Translator
on linux in the backend.
Change-Id: I892917ec102ae85d56a16a7cb321e8c12e7083f1
2011-07-12 00:46:06 +02:00
Liran
5dd421c56b
GLESv2 Translator: fix glGet*
...
Override glGet* for parameters that request information that have local namespace
convert global names to local names before returning the value
Change-Id: Ie334419b6a5ffe4904d8efe0827a30beaf8b2f6c
2011-07-12 00:46:06 +02:00
David Turner
c559f7612f
Merge "GLES2 translator: fix glUseProgram error"
2011-07-11 15:43:40 -07:00
David Turner
ad31d5ca44
Merge "GLES2 Translator: GetVertexAttrib* fix"
2011-07-11 15:43:18 -07:00
David Turner
fbd9283c22
Merge "GLES2 translator: fix point rendering"
2011-07-11 15:42:49 -07:00
David Turner
e7db3af6de
Merge "GLES2 translator: DeleteShader/Program fix"
2011-07-11 15:42:13 -07:00
David Turner
81a23f0579
am fef230b2: am 608383de: am 3e51ea6b: Merge "opengl emulator: Added gl error tracking on the guest (encoder)"
...
* commit 'fef230b282dce4b4f5c898eca24e4c403899717b':
opengl emulator: Added gl error tracking on the guest (encoder)
2011-07-11 11:21:37 -07:00
David Turner
d9989e1820
am 19756f43: am d0e43fbd: am b6d01e32: Merge "emulator opengl: fixing clean windows build"
...
* commit '19756f43cb5c74042f176a6385d501b078cfa419':
emulator opengl: fixing clean windows build
2011-07-11 11:21:35 -07:00
David Turner
4a2d903c6a
am eb95c216: am a3726566: am b798156b: Merge "opengl renderer: added option to dump GL stream to file."
...
* commit 'eb95c216f8fbe1781b5caabbb54db92e923e1967':
opengl renderer: added option to dump GL stream to file.
2011-07-11 11:21:15 -07:00
David Turner
3ec9721ebf
am bd1b82d5: am bbbdc458: am 829a2e5b: Merge "opengl translator: fixed EGL regression"
...
* commit 'bd1b82d50531fb8054d692d4989c14277dcf3b24':
opengl translator: fixed EGL regression
2011-07-11 11:21:12 -07:00
David Turner
d96d2e78f0
am cdce972d: am 81ff139c: am f8611d3f: Merge "opengl translator: Added support to ETC1 compressed textures."
...
* commit 'cdce972db9921468ffc22799596673a4d6de4f8e':
opengl translator: Added support to ETC1 compressed textures.
2011-07-11 11:21:09 -07:00
David Turner
331c3e2f1f
am 435e043d: am 4b0aee0d: am 4b8fefdc: Merge "Opengl translator: fix EGL Windows specific issues"
...
* commit '435e043dd671c7b5a9b7ad7283454e827a197b29':
Opengl translator: fix EGL Windows specific issues
2011-07-11 11:21:07 -07:00
David Turner
484d095146
am b0984737: am 398e3db0: am dcbb5192: Merge "opengl translator: add native config id to EglConfig"
...
* commit 'b098473757fe9cc281ac338181e7e49a553679e6':
opengl translator: add native config id to EglConfig
2011-07-11 11:21:04 -07:00
David Turner
f2dac48f3d
am 3b090d16: am 91ed228d: am 2d233e86: Merge "opengl translator: fixed normalized vertex attribs"
...
* commit '3b090d16032f52d8c17c987ec1b2514dd304b1fe':
opengl translator: fixed normalized vertex attribs
2011-07-11 11:21:00 -07:00
Liran
5f080f3914
GLES2 translator: fix glUseProgram error
...
glUseProgram with invalid program handle should return INVALID_VALUE error
Change-Id: I757d5d7011641d6c0aa053416c3e2bc48cf2df62
2011-07-11 16:32:54 +03:00
Liran
5593338ca3
GLES2 Translator: GetVertexAttrib* fix
...
fix error generated when glGetVertexAttrib* functions get
index larger or equal to MAX_VERTEX_ATTRIB
INVALID_VALUE should be generated instead of INVALID_ENUM
Change-Id: I0fbacc8fa5b5f14cd302cbe818536cffe5ed3a3c
2011-07-11 16:32:54 +03:00
Liran
addc68e9f5
GLES2 translator: fix point rendering
...
if points are rendered the built in shader variable gl_PointSize should be active.
added a call to enable VERTEX_PROGRAM_POINT_SIZE to signal opengl to activate this variable
GL_POINT_SPRITE should also be enabled when rendering points
Change-Id: Iba7f62844ee2208ae22700b985aef0229d75fc46
2011-07-11 16:32:54 +03:00
Liran
a24932259f
GLES2 translator: DeleteShader/Program fix
...
fix behavior of glDeleteShader and glDeleteProgram
when deleting an object which does not exist,
INVALID_VALUE error should be generated
Change-Id: I52de29f7f980d63f0d35c9dfbfd3da17f89436e6
2011-07-11 16:32:54 +03:00
Stas Gurtovoy
cea52a871d
opengles Translator: fix uncompress palleted A1 textures
...
There was a bug in uncompress of GL_PALETTE4_RGB5_A1_OES and
GL_PALETTE8_RGB5_A1_OES texture formats.
They were considered RGB (not RGBA) for some reason.
This also fixed the pink sky in Wave Blazer Lite
Change-Id: I8c047d624d9bf09e2a0de7f7340d676cfe5e76c9
2011-07-11 00:01:35 +03:00
David Turner
fef230b282
am 608383de: am 3e51ea6b: Merge "opengl emulator: Added gl error tracking on the guest (encoder)"
...
* commit '608383decf0f02f90d9f0f2d6256fe1070fa6bbf':
opengl emulator: Added gl error tracking on the guest (encoder)
2011-07-08 10:52:11 -07:00
David Turner
19756f43cb
am d0e43fbd: am b6d01e32: Merge "emulator opengl: fixing clean windows build"
...
* commit 'd0e43fbd117c66b86181d5b3ea30db9191c79932':
emulator opengl: fixing clean windows build
2011-07-08 10:52:09 -07:00
David Turner
eb95c216f8
am a3726566: am b798156b: Merge "opengl renderer: added option to dump GL stream to file."
...
* commit 'a3726566b383ddad797dab6a5d6eb9daf9f71c36':
opengl renderer: added option to dump GL stream to file.
2011-07-08 10:52:07 -07:00
David Turner
bd1b82d505
am bbbdc458: am 829a2e5b: Merge "opengl translator: fixed EGL regression"
...
* commit 'bbbdc458bdbf557a4a2af90a414db1ab8ab638e2':
opengl translator: fixed EGL regression
2011-07-08 10:52:04 -07:00
David Turner
cdce972db9
am 81ff139c: am f8611d3f: Merge "opengl translator: Added support to ETC1 compressed textures."
...
* commit '81ff139c00e440cac1109cbdff2699b4b31cf128':
opengl translator: Added support to ETC1 compressed textures.
2011-07-08 10:52:01 -07:00
David Turner
435e043dd6
am 4b0aee0d: am 4b8fefdc: Merge "Opengl translator: fix EGL Windows specific issues"
...
* commit '4b0aee0da0c7982b028af03e44cc7ef309369d51':
Opengl translator: fix EGL Windows specific issues
2011-07-08 10:51:58 -07:00
David Turner
b098473757
am 398e3db0: am dcbb5192: Merge "opengl translator: add native config id to EglConfig"
...
* commit '398e3db06e6dad9206b28457f67d2591e68868ce':
opengl translator: add native config id to EglConfig
2011-07-08 10:51:55 -07:00
David Turner
3b090d1603
am 91ed228d: am 2d233e86: Merge "opengl translator: fixed normalized vertex attribs"
...
* commit '91ed228d78e9c53ca4765c2968ec6873c7ef3a99':
opengl translator: fixed normalized vertex attribs
2011-07-08 10:51:51 -07:00
David Turner
3e51ea6b5b
Merge "opengl emulator: Added gl error tracking on the guest (encoder)"
2011-07-08 09:54:21 -07:00
David Turner
b6d01e328d
Merge "emulator opengl: fixing clean windows build"
2011-07-08 09:52:48 -07:00
David Turner
b798156bcb
Merge "opengl renderer: added option to dump GL stream to file."
2011-07-08 09:50:57 -07:00
Yochai Shefi Simchon
14f351baf7
opengl translator: fixed EGL regression
...
prevent rederence NULL surface objects in
EglOS layer.
Change-Id: If5e8dc1a0cdf25fe9b268cce6456cc7da88b9f7f
2011-07-08 18:47:13 +02:00