Commit Graph

6691 Commits

Author SHA1 Message Date
David Turner
46f62cdca1 am e2b9bd38: am 67984d2d: am a99be30d: Merge "opengles Translator: get Compressed texture handling out from GLEScontext"
* commit 'e2b9bd38df22a4c364c9c34c7ba6308763a2de66':
  opengles Translator: get Compressed texture handling out from GLEScontext
2011-07-14 09:18:13 -07:00
David Turner
2a35102a6e am 72e117b6: am b2de740a: am 7fdf635d: Merge "opengles emulator: support for null in data parameter of glCompressedTexImage2D"
* commit '72e117b6022d79b90609c5cb13c7a462b167281d':
  opengles emulator: support for null in data parameter of glCompressedTexImage2D
2011-07-14 09:18:10 -07:00
David Turner
922d5aa97c am 1d01f3d2: am 01427d12: am c86fa4b8: Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)"
* commit '1d01f3d2958cfc85abbeb5e835fcabb40125b461':
  opengles emulator: support NULL as parameter to glTexImage2D (gles1)
2011-07-14 09:18:06 -07:00
David Turner
e2b9bd38df am 67984d2d: am a99be30d: Merge "opengles Translator: get Compressed texture handling out from GLEScontext"
* commit '67984d2d4ba35018d0f832301aaaab12d7949a78':
  opengles Translator: get Compressed texture handling out from GLEScontext
2011-07-13 18:18:34 -07:00
David Turner
67984d2d4b am a99be30d: Merge "opengles Translator: get Compressed texture handling out from GLEScontext"
* commit 'a99be30d60ab0902b856502334a9c363b432b3bd':
  opengles Translator: get Compressed texture handling out from GLEScontext
2011-07-13 18:16:40 -07:00
David Turner
a99be30d60 Merge "opengles Translator: get Compressed texture handling out from GLEScontext" 2011-07-13 18:07:08 -07:00
David Turner
72e117b602 am b2de740a: am 7fdf635d: Merge "opengles emulator: support for null in data parameter of glCompressedTexImage2D"
* commit 'b2de740a86870a888648a85a11b39bd991eb9405':
  opengles emulator: support for null in data parameter of glCompressedTexImage2D
2011-07-13 18:06:45 -07:00
David Turner
1d01f3d295 am 01427d12: am c86fa4b8: Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)"
* commit '01427d12868d5943cb80d430c2bcecd535b2c977':
  opengles emulator: support NULL as parameter to glTexImage2D (gles1)
2011-07-13 18:06:43 -07:00
Stas Gurtovoy
1d9dc99abb opengles Translator: get Compressed texture handling out from GLEScontext
This commit does few things:
1. Gets doCompressedTexImage2D out of the context and TextureUtils
2. Gets palette textures out of TextureUtils and into PaletteTexture
3. Makes TextureUtils generic for all compressed textures
4. Moves the glGet's dealing with compressed textures from GLEScontext to the impl.

Change-Id: Ibbde6968810a66a4f3488f3887ee3f015fc32c11
2011-07-14 03:05:38 +02:00
David Turner
b2de740a86 am 7fdf635d: Merge "opengles emulator: support for null in data parameter of glCompressedTexImage2D"
* commit '7fdf635d3a583fa419e4a567ffb9741a18784f7c':
  opengles emulator: support for null in data parameter of glCompressedTexImage2D
2011-07-13 18:05:00 -07:00
David Turner
01427d1286 am c86fa4b8: Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)"
* commit 'c86fa4b8f34ab06f463d08a447f86f296b38ae12':
  opengles emulator: support NULL as parameter to glTexImage2D (gles1)
2011-07-13 18:04:57 -07:00
David Turner
7fdf635d3a Merge "opengles emulator: support for null in data parameter of glCompressedTexImage2D" 2011-07-13 18:00:08 -07:00
David Turner
c86fa4b8f3 Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)" 2011-07-13 17:59:42 -07:00
Stas Gurtovoy
d9d1006222 opengles emulator: support for null in data parameter of glCompressedTexImage2D
Thought the spec doesn't speak about null in data parameter,
it is checked in covgl - so we'll base it on glTexImage2D and allow
null in data.

Change-Id: I9bf5131852bf795acc7ab89bd17b9df90ac99460
2011-07-13 11:26:37 +03:00
Stas Gurtovoy
c99d4a0594 opengles emulator: support NULL as parameter to glTexImage2D (gles1)
This is implemented using the nullAllowed attrib (same as gles2 in gl2.attrib)

Change-Id: I6d359a112daa8acf36dfa05403df42e921f3502c
2011-07-13 11:26:37 +03:00
David Turner
288151c64e am 067426e0: am 0fecb41c: am 7be5b706: Merge "emulator:opengl: input event redirection"
* commit '067426e01beaacf6bfd69bb23dafb789d21d789c':
  emulator:opengl: input event redirection
2011-07-12 03:48:44 -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
067426e01b am 0fecb41c: am 7be5b706: Merge "emulator:opengl: input event redirection"
* commit '0fecb41c1154c5b2ef54677fa32bedf8d0f221ad':
  emulator:opengl: input event redirection
2011-07-11 21:49:31 -07:00
David Turner
dd70f991a8 am c1c47c08: am 6a9aa82f: Merge "emulator:opengl: custom framebuffer sizes"
* commit 'c1c47c085b60263252e92a2d9b00c3ee4157f638':
  emulator:opengl: custom framebuffer sizes
2011-07-11 21:49:28 -07:00
David Turner
0fecb41c11 am 7be5b706: Merge "emulator:opengl: input event redirection"
* commit '7be5b706c60b7832107e6ad3c55941261a49d000':
  emulator:opengl: input event redirection
2011-07-11 21:46:42 -07:00
David Turner
c1c47c085b am 6a9aa82f: Merge "emulator:opengl: custom framebuffer sizes"
* commit '6a9aa82fe77fa1f5692b62c64c432c873174a3ca':
  emulator:opengl: custom framebuffer sizes
2011-07-11 21:46:40 -07:00
David Turner
7be5b706c6 Merge "emulator:opengl: input event redirection" 2011-07-11 21:41:14 -07:00
David Turner
6a9aa82fe7 Merge "emulator:opengl: custom framebuffer sizes" 2011-07-11 21:41:03 -07:00
David Turner
16f2e31f24 emulator:opengl: input event redirection
This patch allows the emulator_test_renderer program to redirect
input events (mouse, keyboard) to the emulator's console program.

This in order to make testing easier, while we wait for integration
of the display into the emulator program.

For now, this is hard-coded to use localhost port 5554, and only
a few keys are properly translated (Dpad, HOME, BACK, MENU).

Change-Id: Ie6e37c85c291f53de49220a181cb8724f66519ea
2011-07-12 06:35:25 +02: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
85743bc8e6 am 37ac3401: am 2319e183: Merge "egl emulator: fixes for covegl conformance test"
* commit '37ac3401d7d36197fcec0d3c831069cb837ca850':
  egl emulator: fixes for covegl conformance test
2011-07-11 16:06:58 -07:00
David Turner
37ba60c470 am 4b8bf442: am f4b1fa4c: Merge "GLESv2 Translator: fix glGet*"
* commit '4b8bf4426673f8f860bacd7a621abfc96d852d89':
  GLESv2 Translator: fix glGet*
2011-07-11 16:06:56 -07:00
David Turner
37ac3401d7 am 2319e183: Merge "egl emulator: fixes for covegl conformance test"
* commit '2319e1831264b7d6eac57b6c6f15ea343b22150b':
  egl emulator: fixes for covegl conformance test
2011-07-11 16:05:55 -07:00
David Turner
4b8bf44266 am f4b1fa4c: Merge "GLESv2 Translator: fix glGet*"
* commit 'f4b1fa4c498bd43365f3000746f004be6e815511':
  GLESv2 Translator: fix glGet*
2011-07-11 16:05:53 -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
2319e18312 Merge "egl emulator: fixes for covegl conformance test" 2011-07-11 15:59:11 -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
David Turner
f4b1fa4c49 Merge "GLESv2 Translator: fix glGet*" 2011-07-11 15:59:00 -07:00
David Turner
735b35fb1b am 14fa0201: am c559f761: Merge "GLES2 translator: fix glUseProgram error"
* commit '14fa0201119dd8cf94a5316ff8ab9f0c19f9dd44':
  GLES2 translator: fix glUseProgram error
2011-07-11 15:57:08 -07:00
David Turner
b7b2af8386 am 49947927: am ad31d5ca: Merge "GLES2 Translator: GetVertexAttrib* fix"
* commit '49947927c35b6e2320bad56330e59cccb0c54bd9':
  GLES2 Translator: GetVertexAttrib* fix
2011-07-11 15:57:06 -07:00
David Turner
d538593a21 am 29512bbb: am fbd9283c: Merge "GLES2 translator: fix point rendering"
* commit '29512bbbc099fa2cf38eb2ca031c2763269edb8e':
  GLES2 translator: fix point rendering
2011-07-11 15:57:04 -07:00
David Turner
248ba3e50c am a20d6fe0: am e7db3af6: Merge "GLES2 translator: DeleteShader/Program fix"
* commit 'a20d6fe07728a4a16a0bae9b154ad12c0d4dacc8':
  GLES2 translator: DeleteShader/Program fix
2011-07-11 15:57:02 -07:00
David Turner
87c04589e4 am 37577cb6: am 05832ade: Merge "opengles Translator: fix uncompress palleted A1 textures"
* commit '37577cb6ff4b68d4dde88238ba8bc0f545b2cddb':
  opengles Translator: fix uncompress palleted A1 textures
2011-07-11 15:56:59 -07:00
David Turner
14fa020111 am c559f761: Merge "GLES2 translator: fix glUseProgram error"
* commit 'c559f7612f32b0ae7a1ae22127619e9a4698ab72':
  GLES2 translator: fix glUseProgram error
2011-07-11 15:54:09 -07:00
David Turner
49947927c3 am ad31d5ca: Merge "GLES2 Translator: GetVertexAttrib* fix"
* commit 'ad31d5ca44c7c89a6f7f0e8b5182b6335a4f77e1':
  GLES2 Translator: GetVertexAttrib* fix
2011-07-11 15:54:08 -07:00
David Turner
29512bbbc0 am fbd9283c: Merge "GLES2 translator: fix point rendering"
* commit 'fbd9283c223d99acdb933d576e63c0fdca714e37':
  GLES2 translator: fix point rendering
2011-07-11 15:54:06 -07:00
David Turner
a20d6fe077 am e7db3af6: Merge "GLES2 translator: DeleteShader/Program fix"
* commit 'e7db3af6de4cc2c43e0c2c609422164a0dd06376':
  GLES2 translator: DeleteShader/Program fix
2011-07-11 15:54:04 -07:00
David Turner
37577cb6ff am 05832ade: Merge "opengles Translator: fix uncompress palleted A1 textures"
* commit '05832ade788bcecd6bf00bb36e724bebfdb72074':
  opengles Translator: fix uncompress palleted A1 textures
2011-07-11 15:54: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