Commit Graph

128 Commits

Author SHA1 Message Date
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
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
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
Guy Zadickario
3db2bcf7e5 opengl translator: fixed normalized vertex attribs
That fixes the alpha and GUI components artifacts in Cordy.
The translator has ignored the 'normalized' argument of
glVertexAttribPointer function in GLESv2.
We now use the supplied value when applying the vertex attributes
to the backend OpenGL so that non-float color vertex attributes
are now normalized.

Change-Id: Idffda33225748276144ed70d2dcf4da17219d1d2
2011-07-04 22:30:58 +03:00
Amit Feller
223a949d1d opengl Translator: adding type EGLNativeSurfaceType
for supporting & storing spesific OS data of the surfaces
for example on Windows platform it is needed to save for each windowSurface
the HWNDL & HDC of the native window, this change caused changes in the EglOsApi
interface
2011-07-03 15:40:52 +03:00
Amit Feller
cdc5179b90 EGL translator: fixes shared context on windows
On windows it is not possible to create a context which
shares with another context if the other context is already
current to some thread.
This change makes the "global context" be a dummy context
on windows which we create during the first createContext
call, this dummy context will never bind to any thread so
it is safe to share with it at any time.
2011-07-03 15:40:52 +03:00
Amit Feller
15680c5e69 OpenGL renderer: handling subwindow messages
On windows we need to have a thread on the renderer process
which handles windows messages sent to the subwindow
we are creating during framebuffer initialization.
We run this message pump in the main renderer thread
and the server listener on a seperate thread.
2011-07-03 15:40:52 +03:00
Amit Feller
4672adab3f fixing bug of shadowing a variable 2011-07-03 15:40:52 +03:00
Guy Zadickario
b68a421908 opengl renderer: Enable and fix renderer Mac support
The following enables the renderer build on darwin.
Moved platform specific type declarations from render_api.h
to render_api_platform_types.h so it can be included from the
objective c code.
Fixed subwindow to use EmuGLView which overrides NSView to prevent
background drawing of the view.
2011-07-03 15:40:52 +03:00
Guy Zadickario
25f01dda07 opengl translator: Mac fixes for unbind context
Mac specific bug fix to support unbinding a context.
Removed NSOpenGLContext:clearDrawable call before binding
an NSView to the context to avoid re-paint of the view which
causes flash effect.
2011-07-03 15:35:12 +03:00
Liran
c3fb532e9a GLES2 translator:
the dispatch loaded incorrect functions from GL for framebuffer extension
the functions used belong to GL3, and didn't work with GL2 context
fixed this to use the EXT functions from GL
2011-07-03 15:35:12 +03:00
Stas Gurtovoy
304a1c21ca opengles Translator: Omit precision macros from shaders
The shaders fail to compile if we don't omit those changes (Cordy game for example).
Anyways, they have no semantic meaning in GLSL, quote for GLSL 4.1 spec:
"Precision qualifiers are added for code portability with OpenGL ES, not for functionality. They have the
same syntax as in OpenGL ES, as described below, but they have no semantic meaning, which includes no
effect on the precision used to store or operate on variables."
Also removed an anoying print in the encoder.
2011-07-03 15:35:11 +03:00
Stas Gurtovoy
440eb6e594 opengles host: some order in host gl debugging
Removed some debug prints in translator.
Added (remarked) options to enable gl debugging in decodes/renderer
2011-07-03 15:28:01 +03:00
Liran
8fa554f35b egl translator
fix infinite loop in egl translator
2011-07-03 15:28:01 +03:00
Liran
ccc72aa1bb add gles includes to the translator
those are up-to-date gles header files from khronos so that
host applications will be able to compile with the translator
with no dependencies. The translator now exports both egl/gles
headers and their implementation libraries.
2011-07-03 15:28:00 +03:00
Liran
74871cf4f1 Translator GLES2: fix glGetShaderSource
fix glGetShaderSource to return the currect string
2011-07-03 15:21:48 +03:00
Yochai Shefi Simchon
5ec953deef Make sure RGB_565 config is available to emulator
There are Android applications (notably BootAnimation) which require
exactly an RGB_565 configuration, and are not satisfied by an e.g.
RGBA_8888 configuration. This doens't make too much sense, and I think
such apps should be fixed.
However, until that happens, there is an issue when the host does not
have an RGB_565 FBConfig, which is typical to many OpenGL implementations.
In such cases, BootAnimation doesn't run.
The workaround is to add an RGB_565 config to the list maintained by the
translator, which is basically an 888 config in disguise.
2011-07-03 15:21:48 +03:00
Stas Gurtovoy
170eb97393 opengles renderer: added CHECK_GL_ERROR defie for gl debugging
This commit add CHECK_GL_ERROR define to decoders/renderer which enables various
glGetError() calls. Also changed emugen to add glGetError() after every dispatch call (based on
defintion of CHECK_GL_ERROR). Also cleaned some annoying printf's.
2011-07-03 15:21:48 +03:00
Stas Gurtovoy
3034c35701 opengles Translator: sort conformant configs first
When sorting configs, we want the conformant ones first.
This also makes Wave Blazer Lite work - specifically by placing a non
conformant config (rgba=0) at the end of the list.
2011-07-03 15:21:48 +03:00
Amit Feller
1d3f5f58ce opengl renderer: create rendering subwindow
The application provides the window handle to which the
OpenglRenderer should render to however only a sub-region of
this window needs to be rendered. This change adds this functionality
by creating a native child subwindow into which rendering will happen.
2011-07-03 15:14:59 +03:00
Amit Feller
31580f42b1 opengl renderer: windows runtime fix
Need to initialize networking by calling WSAStartup
in the renderer process.
2011-07-03 15:14:59 +03:00
Amit Feller
950192dbe3 opengl translator: EGL Windows bug fix
Fixed bug caused the creation of context
without setting it's pixel format.
Also removing unnecessary printfs.
2011-07-03 15:14:59 +03:00
Amit Feller
6adfa495ba opengl translator: fixing 2 Windows EGL issues:
- runtime segfaults
- pbuffer creation
2011-07-03 15:14:58 +03:00
Yochai Shefi Simchon
03d0055dc9 1.1 Translator: fix conversion of compressed textures
There were several bugs in the code converting palleted textures into
RGB/RGBA - fixed.
2011-07-03 15:08:42 +03:00
Yochai Shefi Simchon
747b20cf9d 1.1 Translator: fix drawing of GL_POINT_SIZE_ARRAY
When translating point size arrays from GLES to GL, an optimization
was implemented where all points of the same size in an array or elements
array where drawn together. This is wrong, since it means points
are not drawn in the order the app has requested, creating the wrong
result when points in the array are overlapping in screen space.
So removed this mechanism, and now just drawing the points in the right
order.
Some optimization is still there, where if there are several
consecutive points of the same size they are drawn together.

The change in GLEScmImp.cpp is only to make the condition more readable -
the functionality is identical.
2011-07-03 15:03:25 +03:00
Yochai Shefi Simchon
0b5684abbd 1.1 Translator: fix bug in glDeleteTexture
When glDeleteTexture is called for the currently bound texture,
binding should be reset to 0.
Also, calling glDeleteTexture on 0 should do nothing.
2011-07-03 15:03:25 +03:00
Yochai Shefi Simchon
fbae5aacb0 1.1 Translaotr: handle glGet(POINT_SIZE_ARRAY)
Should be handled internaly, like all other ARRAY queries.
2011-07-03 15:03:25 +03:00
Yochai Shefi Simchon
2da542b598 1.1 Translator conformance: fix texture issues
This fixes three issues:

1. glGet(GL_2d_TEXTURE_BINDING) should be handled by the translator rather
than by OpenGL.

2. glIsTexture shoud return GL_TRUE only if the texture was bound at some
point - add a wasBound member to the TextureData and maintain it.

3. glTexParameter(GL_GENERATE_MIPMAP) did not work. The first problem was
that it was not allowed by our validator - fixed. The next issue is that
this enum is not necessarily supported by the OpenGL implementation - it
is in OpenGL 2.x, but was replaced by an extension in 3.x. So in case the
extension does not exist, and GL_GENERATE_MIPMAP is required, save this info
in a new requiresAutoMipmap member of TextureData and call glGenerateMipmapExt
whenever glTex(Sub)Image2D is called.
There is a theoretical case where neither GL_GENERATE_MIPMAP nor glGenerateMipmap
is supported by the OpenGL implementation - this is not likely to happen, but
if we find such an implementation it might require implementing a mipmap
generation software algorithm (which is bad).
2011-07-03 14:56:13 +03:00
Stas Gurtovoy
635e929c44 opengl translator: fixed glGetString(GL_EXTENSIONS) for GLESv2
fixed query of GL_EXTENSIONS in glesv2.
Also fixed EGL surface desruction when there is
no current context.
2011-07-03 14:56:13 +03:00
Yochai Shefi Simchon
d18e93ba4c Translator 1.1 conformance: fix ARRAY related gets
There is a set of glGets which query the client state of the
binded arrays. The data exists in the translator context and is not
passed to GL, so the glGets should be handled internaly.
This is done by implementing four glGet*v methods in GLEScontext, which
return a boolean value indicating whether we have set the return value
or not, and are called by the glGet*v functions in GLEScmImp.
Two of the glGets are handled by GLEScontext, and the other 15 by
GLEScmContext since they are specific to GLES 1.1. The same should be
done for 2.0 specific glGets in a later patch.
Also. bufferName is now saved in GLESPointer in to allow the
GL_*_ARRAY_BUFFER_BINDING get.
2011-07-03 14:56:13 +03:00
Yochai Shefi Simchon
b241f904f0 Translator: fix eglGetProcAddress() on Linux
Our implementation of eglGetProcAddress() resolves the function addresses
in run time. Typically this is not an issue, but when a gl function is
also implemented by the calling app the address was resolved to the calling
app's version of the function rather than ours. This is the case with the
glDrawTex{isfx}OES functions in the 1.1 conformance test.
The solution is to add the -Bsymbolic switch when linking our libraries,
so all symbol resolution is done internaly.
The same fix should probably be done for Mac.
2011-07-03 14:56:12 +03:00
Yochai Shefi Simchon
83132ab0a2 Translator 1.1 - fix glGetPointer
getPointer is implemented both in GLEScmContext and its parent GLEScontext,
but was not declared virtual amd hence didn't work.
2011-07-03 14:52:28 +03:00
Yochai Shefi Simchon
6a40d94db4 Fix segfault when destroying context
m_texCoords was not initialized in the GLEScontext constructor, so when
destructing it resulted in an illegal free.
2011-07-03 14:47:12 +03:00
Yochai Shefi Simchon
03da50800f glDrawTex- GL_INVALID_VALUE if width/height <= 0 2011-07-03 14:47:12 +03:00
Amit Feller
772de2edde opengl translator: extending ConversionArrays class
inserting some of the logic which was scattered over some parts
of the GLESContext class to be encpsulated inside the ConversionArrays
so that the code will be more clea and organized.
2011-07-03 14:47:12 +03:00
Liran
166f3cb3c6 opengl translator: add vertex attrib index validation.
Fixed conformance test issue.
2011-07-03 14:32:43 +03:00
Liran
3c15de2f2e opengl translator: conformance fixes
fix shader and program names in glDeleteShader/Program
fix object name manager to accept objects with name 0
fix unbinding of buffers,framebuffers and renderbuffers
separate getPointer to have specific implementation for gles 1 and 2
fix number of supported texture images to match GL
fix incorrect optimization that skips draw on false conditions
2011-07-03 14:32:43 +03:00
Amit Feller
61d845731a validateing client's arrays type 2011-07-03 14:32:43 +03:00
Amit Feller
2ca84fb34a opengl translator: supporting GL_BYTE type
support GL_BYTE in glvertexpointer & glTexCoordPointer,
Desktop OpenGL does not support GL_BYTE in those calls
so we convert the data into GL_SHORT.
2011-07-03 14:32:43 +03:00
Amit Feller
87363ca283 opengl translator: Fix windows runtime problems
fixed functions calling conventions in dispatch tables,
added link flag to translator libraries to produce an alias
function for all exported functions with stdcall name mangling.

Change-Id: I4360f26da1f897764ba6d4dd02c365ed00420b51
2011-06-30 09:14:16 +03:00
Amit Feller
a20ba0e4de Setting Renderer default libs to use translator libs
Change-Id: I853a30ce1aa7325d01a30b30c18f4e0bd5a5702f
2011-06-30 09:14:16 +03:00
Amit Feller
efcbbc3f28 emulator opengl: fix windows build
Change-Id: I145c7bf3a664fdb2c9e113cd977b4b2431d0668d
2011-06-30 09:14:16 +03:00
Stas Gurtovoy
62d074d9f8 emulator opengl: add GLESv2 support to driver + renderer
Added GLESv2 library to system.
Made fixes to the host libOpenGLRender to
compile and support GLESv2 (defined WITH_GLES2).
Other fixes required to make GLESv2 to work.

Change-Id: I9eb198e6092e7fa3550342c50929dd1714282cb3
2011-06-30 09:14:12 +03:00
David Turner
5b060ef926 Merge changes I1c2d8bc4,I64a63c2e,Ia209f88a,I9e797024,Ic09a5d0e
* changes:
  emulator opengl: guest/host rendering syncronization.
  emulator opengl: initialize new colorbuffers
  emulator opengles: Fixed bug in gralloc unregister_buffer
  emulator opengles: Fixed a bug in eglChooseConfig implementation.
  opengles emulator: Fixed upside-down gl image
2011-06-28 04:44:48 -07:00
Yochai Shefi Simchon
e02b38778a Fix an iligal "free".
m_map[GL_TEXTURE_COORD_ARRAY] is not an allocated pointer, therefore it shouldn't be freed.

Change-Id: I84e2937c16ddcbb8922cdf270de86732ee966d60
2011-06-25 17:02:33 +03:00