Commit Graph

6691 Commits

Author SHA1 Message Date
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
05832ade78 Merge "opengles Translator: fix uncompress palleted A1 textures" 2011-07-11 15:41:13 -07:00
Xavier Ducrohet
dd0457ad25 am d5394e8f: am d8a9cfce: Fix sample package API level.
* commit 'd5394e8f835924a3ce26d448fb7cd5259c09866a':
  Fix sample package API level.
2011-07-11 13:39:38 -07:00
Xavier Ducrohet
d5394e8f83 am d8a9cfce: Fix sample package API level.
* commit 'd8a9cfce8d2e80d61cd9916947bb8d1903ed453d':
  Fix sample package API level.
2011-07-11 13:38:26 -07:00
Xavier Ducrohet
d8a9cfce8d Fix sample package API level.
Change-Id: I8bf67e3fdb21e4aca966c3721b75024241bade73
2011-07-11 13:36:09 -07:00
David 'Digit' Turner
6e571c4418 am 333a2f81: am dfd5d02c: merge intel x86 patches into gingerbread branch
* commit '333a2f8147c61595bdb239e8ea41650bd56ce0c7':
  sdk: Copy ABI-specific kernel image to platform image directory.
2011-07-11 11:58:10 -07:00
David 'Digit' Turner
333a2f8147 am dfd5d02c: merge intel x86 patches into gingerbread branch
* commit 'dfd5d02cec37eeea2673ea60a2236263a6d2a1dc':
  sdk: Copy ABI-specific kernel image to platform image directory.
2011-07-11 11:56:25 -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
608383decf am 3e51ea6b: Merge "opengl emulator: Added gl error tracking on the guest (encoder)"
* commit '3e51ea6b5baab25504af27db712d2f245333242d':
  opengl emulator: Added gl error tracking on the guest (encoder)
2011-07-08 10:44:06 -07:00
David Turner
d0e43fbd11 am b6d01e32: Merge "emulator opengl: fixing clean windows build"
* commit 'b6d01e328d6b74cb0d2bbeceedb4d9c60c97dab3':
  emulator opengl: fixing clean windows build
2011-07-08 10:44:01 -07:00
David Turner
a3726566b3 am b798156b: Merge "opengl renderer: added option to dump GL stream to file."
* commit 'b798156bcba72b23eed3c81cf917edff880f23f4':
  opengl renderer: added option to dump GL stream to file.
2011-07-08 10:43:58 -07:00
David Turner
bbbdc458bd am 829a2e5b: Merge "opengl translator: fixed EGL regression"
* commit '829a2e5b9a0f3bea21c643aaf1bc5668bcb2a4c6':
  opengl translator: fixed EGL regression
2011-07-08 10:43:53 -07:00
David Turner
81ff139c00 am f8611d3f: Merge "opengl translator: Added support to ETC1 compressed textures."
* commit 'f8611d3fe6583e85074ee597a64c30c27945ed5f':
  opengl translator: Added support to ETC1 compressed textures.
2011-07-08 10:43:48 -07:00
David Turner
4b0aee0da0 am 4b8fefdc: Merge "Opengl translator: fix EGL Windows specific issues"
* commit '4b8fefdc00271de992429795d9c675afe1ef05f5':
  Opengl translator: fix EGL Windows specific issues
2011-07-08 10:43:45 -07:00
David Turner
398e3db06e am dcbb5192: Merge "opengl translator: add native config id to EglConfig"
* commit 'dcbb51924f152c4e4502cd7f1326aeafde3076ed':
  opengl translator: add native config id to EglConfig
2011-07-08 10:43:42 -07:00
David Turner
91ed228d78 am 2d233e86: Merge "opengl translator: fixed normalized vertex attribs"
* commit '2d233e8633fdca4c34b9f620b36851b6f2678ab8':
  opengl translator: fixed normalized vertex attribs
2011-07-08 10:43:31 -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
David Turner
829a2e5b9a Merge "opengl translator: fixed EGL regression" 2011-07-08 09:49:40 -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
David Turner
f8611d3fe6 Merge "opengl translator: Added support to ETC1 compressed textures." 2011-07-08 09:45:33 -07:00
David Turner
4b8fefdc00 Merge "Opengl translator: fix EGL Windows specific issues" 2011-07-08 09:40:57 -07:00
David Turner
dcbb51924f Merge "opengl translator: add native config id to EglConfig" 2011-07-08 09:40:21 -07:00
David Turner
2d233e8633 Merge "opengl translator: fixed normalized vertex attribs" 2011-07-08 09:39:35 -07:00
David 'Digit' Turner
dfd5d02cec merge intel x86 patches into gingerbread branch 2011-07-08 18:19:01 +02:00
David 'Digit' Turner
bed131848e sdk: Copy ABI-specific kernel image to platform image directory.
Back-port from AOSP master tree.

This patch depends on https://review.source.android.com/24052

It is used to ensure that the proper kernel image is copied to the
platform image's kernel-qemu.

This is needed because for ARMv7 platform builds, the image is
in prebuilt/android-arm/kernel/kernel-qemu-armv7, instead of
   prebuilt/android-arm/kernel/kernel-qemu

Change-Id: I1d79c2ac9711472be1832605bb27bdce7b09344c
Orig-Changed-Id: f7f6842b32
2011-07-07 23:42:44 +02:00
Stas Gurtovoy
8bebd3b48b opengl translator: Added support to ETC1 compressed textures.
Copied the etc1 implementation from frameworks/base/opengl/libs/ETC1
to the translator common library, this is for keeping the translator
be independant.
Added support for ETC1 compressed textures in both GLESv1 and GLESv2
which is needed for some applications. (Cordy).

Change-Id: Ie615ed82896cb36c42fa640b83d9e93b723b3b80
2011-07-07 16:36:04 +03:00
Amit Feller
44fd37338e Opengl translator: fix EGL Windows specific issues
Fixed management of DC's, use one DC for each egl config as before
but use the correct one every time and not the last one used during
createContext call.

Filter out GENERIC pixel formats which might not be supported by
accelerated hardware.

Prevent calling to ChoosePixelFormat at every create{window/pbuffer}
call, instead use the exact config specified by the caller. We
need to call at least once to wglChoosePixelFormat in order to let
the driver initialize, we do it during eglInitialize time just before
querying the native pixel formats.

Change-Id: Id00addaed9cb0369c41311d2bcd3ce8c7ea6408c
2011-07-07 16:36:04 +03:00
Amit Feller
a62aa2c009 opengl translator: add native config id to EglConfig
The EGL_CONFIG_ID attribute should be uniqueue for each
config, at some cases we duplicate a configuration in
order to simulate different pixel format (RGB_565) at that
case we want to keep the native config_id of the backend
OpenGL the same on both configs.
This change adds extra attribute 'native_config_id' for that
purpose.

Change-Id: I7e560a4badd01d146b9753cee603ff4707ccfd7f
2011-07-07 16:36:04 +03:00
Stas Gurtovoy
d6f18cdf80 opengl emulator: Added gl error tracking on the guest (encoder)
Sometimes we need to check parameter values before encoding
to prevent crashes, for example:
glDeleteBufferes(-1, ptr); - would crash
For that we need to check some gl errors on the guest.

The change adds error state to the encoder and also
adds new feature to emugen which allows to insert
parameter check code into the attribute file.
Added such parameter check code in the appropiate
gl functions in gl.attrib and gl2.attrib

Change-Id: I7f317df52ac8fbd96979100a1031cf023a0b49d3
2011-07-07 16:35:16 +03:00
Amit Feller
dd3849c9ed emulator opengl: fixing clean windows build
Fixes windows build found after clean build.
the emugen tool does not built on windows. For
windows build we need to use the build host executable.
(that works for mingw builds since it uses the linux exeutable).

Change-Id: I6a0cc6936d4b9f11f074695066b800e12156fd83
2011-07-07 16:32:11 +03:00
Guy Zadickario
64f8ae0369 opengl renderer: added option to dump GL stream to file.
This is a debugging tool which enables to dump the guest
command stream to a file which can be later be examined
and "played" using a seperate tool.

Change-Id: I3fec19c1a651f0ed4394c33a0c0cd9ba54384355
2011-07-07 16:32:04 +03:00
David Turner
ad6c67b1f5 am f20da889: am ee856671: Merge "opengl Translator: adding type EGLNativeSurfaceType"
* commit 'f20da8890882ee2f313521b07b42f8de1bcebd20':
  opengl Translator: adding type EGLNativeSurfaceType
2011-07-06 07:46:36 -07:00
David Turner
e83a96362c am 737facef: am eec12a62: Merge "EGL translator: fixes shared context on windows"
* commit '737facef2204df476f2d27023d26119479d0a066':
  EGL translator: fixes shared context on windows
2011-07-06 07:46:34 -07:00