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

tools/emulator/opengl/README

@@ -1,17 +1,5 @@
 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:
 ==========================
 

tools/emulator/opengl/host/include/libOpenglRender/render_api.h

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

tools/emulator/opengl/host/libs/Translator/GLcommon/GLESvalidate.cpp

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

tools/emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp

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

tools/emulator/opengl/host/tools/emugen/README

@@ -46,7 +46,7 @@ will be encoded into :
 	101, // foo opcode
 	14, // sizeof(opcode) + sizeof(packet_len) + sizeof(int) + sizeof(short)
 	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:

tools/emulator/opengl/shared/OpenglCodecCommon/glUtils.cpp

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