LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1

Browse Source 
* commit 'f0baef2fed555e87a0910e5aab6b8b763487b350':
  EmuGL: misc small cleanups
This commit is contained in:
Jesse Hall
2012-01-09 15:53:49 -08:00
committed by Android Git Automerger
parent 19b03e4ef1 f0baef2fed
commit d23522e614
6 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/emulator/opengl/README
View File

@@ -1,17 +1,5 @@
This directory contains the modules related to hardware OpenGL ES emulation. This directory contains the modules related to hardware OpenGL ES emulation.
For now, this feature is experimental, and *nothing* will be built unless
you define BUILD_EMULATOR_OPENGL in your environment, for example with:
export BUILD_EMULATOR_OPENGL=true
You can also define the following to enable the "gralloc" module, which
corresponds to system-wide GLES emulation (by default, only a specific set
of applications are enabled, see below):
export BUILD_EMULATOR_OPENGL_DRIVER=true
I. Overview of components: I. Overview of components:
========================== ==========================

2
tools/emulator/opengl/host/include/libOpenglRender/render_api.h
View File

@@ -77,7 +77,7 @@ bool createOpenGLSubwindow(FBNativeWindowType window,
bool destroyOpenGLSubwindow(); bool destroyOpenGLSubwindow();
// //
// setOpenGLDisplatRotation - // setOpenGLDisplayRotation -
// set the framebuffer display image rotation in units // set the framebuffer display image rotation in units
// of degrees around the z axis // of degrees around the z axis
// //

10
tools/emulator/opengl/host/libs/Translator/GLcommon/GLESvalidate.cpp
View File

@@ -1,8 +1,8 @@
#include<GLcommon/GLESvalidate.h> #include <GLcommon/GLESvalidate.h>
#include<GLES/gl.h> #include <GLES/gl.h>
#include<GLES/glext.h> #include <GLES/glext.h>
#include<GLES2/gl2.h> #include <GLES2/gl2.h>
#include<GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#include <OpenglCodecCommon/ErrorLog.h> #include <OpenglCodecCommon/ErrorLog.h>

1
tools/emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp
View File

@@ -78,7 +78,6 @@ int RenderThread::Main()
int stat = readBuf.getData(); int stat = readBuf.getData();
if (stat <= 0) { if (stat <= 0) {
fprintf(stderr, "client shutdown\n");
break; break;
} }

2
tools/emulator/opengl/host/tools/emugen/README
View File

@@ -46,7 +46,7 @@ will be encoded into :
101, // foo opcode 101, // foo opcode
14, // sizeof(opcode) + sizeof(packet_len) + sizeof(int) + sizeof(short) 14, // sizeof(opcode) + sizeof(packet_len) + sizeof(int) + sizeof(short)
p1, // 4 bytes p1, // 4 bytes
s1 // 4 bytes s1 // 2 bytes
} }
Since ‘foo’ returns value, the caller is expected to read back the return packet from the server->client stream. The return value in this example is in thus the return packet is: Since ‘foo’ returns value, the caller is expected to read back the return packet from the server->client stream. The return value in this example is in thus the return packet is:

1
tools/emulator/opengl/shared/OpenglCodecCommon/glUtils.cpp
View File

@@ -81,6 +81,7 @@ size_t glUtilsParamSize(GLenum param)
switch(param) switch(param)
{ {
case GL_DEPTH_TEST:
case GL_DEPTH_FUNC: case GL_DEPTH_FUNC:
case GL_DEPTH_BITS: case GL_DEPTH_BITS:
case GL_MAX_CLIP_PLANES: case GL_MAX_CLIP_PLANES: