jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "First attempt on getting rid of the socket server"

Browse source 
This reverts commit 91d37082ab.
This commit is contained in:
Simon Fels 2016-11-18 12:53:43 +01:00
commit a6e26f46d6
17 changed files with 162 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

1
external/android-emugl/CMakeLists.txt vendored
View file

@ -3,7 +3,6 @@
set(CMAKE_C_FLAGS "-Wall")
include_directories(
${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/external/android-emugl/shared
${CMAKE_SOURCE_DIR}/external/android-emugl/host/include
${CMAKE_SOURCE_DIR}/external/android-emugl/shared/OpenglCodecCommon

4
external/android-emugl/host/include/libOpenglRender/IOStream.h vendored
View file

@ -21,8 +21,6 @@
#include "ErrorLog.h"
#include "anbox/logger.h"
class IOStream {
public:
@ -72,7 +70,7 @@ public:
}
int flush() {
DEBUG("buf %p free %d buf size %d", m_buf, m_free, m_bufsize);
if (!m_buf || m_free == m_bufsize) return 0;
int stat = commitBuffer(m_bufsize - m_free);

2
external/android-emugl/host/libs/GLESv1_dec/CMakeLists.txt vendored
View file

@ -14,7 +14,7 @@ add_custom_command(
set(SOURCES
GLESv1Decoder.cpp)
if ("${cmake_build_type_lower}" STREQUAL "debug")
if ("${cmake_build_type_lower}" STREQUAL "trace")
set(OPENGL_DEBUG "-DOPENGL_DEBUG_PRINTOUT -DCHECK_GL_ERROR")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPENGL_DEBUG}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENGL_DEBUG}")

2
external/android-emugl/host/libs/GLESv2_dec/CMakeLists.txt vendored
View file

@ -14,7 +14,7 @@ add_custom_command(
set(SOURCES
GLESv2Decoder.cpp)
if ("${cmake_build_type_lower}" STREQUAL "debug")
if ("${cmake_build_type_lower}" STREQUAL "trace")
set(OPENGL_DEBUG "-DOPENGL_DEBUG_PRINTOUT -DCHECK_GL_ERROR")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPENGL_DEBUG}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENGL_DEBUG}")

2
external/android-emugl/host/libs/renderControl_dec/CMakeLists.txt vendored
View file

@ -10,7 +10,7 @@ add_custom_command(
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS emugen)
if ("${cmake_build_type_lower}" STREQUAL "debug")
if ("${cmake_build_type_lower}" STREQUAL "trace")
set(OPENGL_DEBUG "-DOPENGL_DEBUG_PRINTOUT -DCHECK_GL_ERROR")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPENGL_DEBUG}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENGL_DEBUG}")