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

emulator opengl: more few fixups needed for the system to load.

Browse Source 
Change-Id: I698b14d0f594c091c237a605aeefbb048bf746ca
This commit is contained in:
Stas Gurtovoy
2011-06-01 11:10:29 +03:00
committed by Guy Zadickario
parent 613025efb3
commit 5def410ff5
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp
View File

@@ -148,12 +148,11 @@ const unsigned char *TcpStream::readFully(void *buf, size_t len)
{ {
if (!valid()) return NULL; if (!valid()) return NULL;
if (!buf) { if (!buf) {
ERR("TcpStream::readFully failed, buf=NULL");
return NULL; // do not allow NULL buf in that implementation return NULL; // do not allow NULL buf in that implementation
} }
size_t res = len; size_t res = len;
while (res > 0) { while (res > 0) {
ssize_t stat = ::recv(m_sock, (char *)(buf) + len - res, len, 0); ssize_t stat = ::recv(m_sock, (char *)(buf) + len - res, res, 0);
if (stat == 0) { if (stat == 0) {
// client shutdown; // client shutdown;
return NULL; return NULL;
@@ -161,7 +160,6 @@ const unsigned char *TcpStream::readFully(void *buf, size_t len)
if (errno == EINTR) { if (errno == EINTR) {
continue; continue;
} else { } else {
ERR("TcpStream::readFully failed (buf 0x%x): %s\n", buf, strerror(errno));
return NULL; return NULL;
} }
} else { } else {
@@ -175,7 +173,6 @@ const unsigned char *TcpStream::read( void *buf, size_t *inout_len)
{ {
if (!valid()) return NULL; if (!valid()) return NULL;
if (!buf) { if (!buf) {
ERR("TcpStream::read failed, buf=NULL");
return NULL; // do not allow NULL buf in that implementation return NULL; // do not allow NULL buf in that implementation
} }

4
tools/emulator/opengl/shared/OpenglOsUtils/osDynLibrary.cpp
View File

@@ -36,6 +36,10 @@ dynLibrary *dynLibrary::open(const char *p_libName)
#endif #endif
if (lib->m_lib == NULL) { if (lib->m_lib == NULL) {
printf("Failed to load %s\n", p_libName);
#ifndef _WIN32
printf("error %s\n", dlerror()); //only on linux
#endif
delete lib; delete lib;
return NULL; return NULL;
} }

2
tools/emulator/opengl/tests/emulator_test_renderer/main.cpp
View File

@@ -26,7 +26,7 @@ int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int n
int main(int argc, char *argv[]) int main(int argc, char *argv[])
#endif #endif
{ {
int portNum = 4141; int portNum = 22468;
int winWidth = 320; int winWidth = 320;
int winHeight = 480; int winHeight = 480;
FBNativeWindowType windowId = NULL; FBNativeWindowType windowId = NULL;

7
tools/emulator/opengl/tests/gles_android_wrapper/Android.mk
View File

@@ -127,10 +127,11 @@ LOCAL_SHARED_LIBRARIES := libdl \
libcutils \ libcutils \
libGLESv1_enc \ libGLESv1_enc \
libGLESv2_enc \ libGLESv2_enc \
libut_rendercontrol_enc \ libOpenglSystemCommon \
libOpenglSystemCommon libut_rendercontrol_enc
LOCAL_STATIC_LIBRARIES := libOpenglCodecCommon libqemu LOCAL_STATIC_LIBRARIES := libOpenglCodecCommon \
libqemu
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)