diff options
| author | Jesse Hall <jessehall@google.com> | 2012-07-12 15:55:22 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-12 15:55:23 -0700 |
| commit | 3dcbebfd43e409c3bbff7fc79288e40666a947fd (patch) | |
| tree | 4338811f487cd81e377017016e3a1779bcd3a7e6 /android/hw-pipe-net.c | |
| parent | a593847491224cfab9eb94b1e36c85333dc081da (diff) | |
| parent | 055adab0b70c70890634649a27c12b2c25afcaca (diff) | |
| download | external_qemu-3dcbebfd43e409c3bbff7fc79288e40666a947fd.zip external_qemu-3dcbebfd43e409c3bbff7fc79288e40666a947fd.tar.gz external_qemu-3dcbebfd43e409c3bbff7fc79288e40666a947fd.tar.bz2 | |
Merge "Use a per-process server address for the GLES server"
Diffstat (limited to 'android/hw-pipe-net.c')
| -rw-r--r-- | android/hw-pipe-net.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/android/hw-pipe-net.c b/android/hw-pipe-net.c index 3e8dc70..1c71f18 100644 --- a/android/hw-pipe-net.c +++ b/android/hw-pipe-net.c @@ -492,19 +492,18 @@ openglesPipe_init( void* hwpipe, void* _looper, const char* args ) return NULL; } + char server_addr[PATH_MAX]; + android_gles_server_path(server_addr, sizeof(server_addr)); #ifndef _WIN32 if (android_gles_fast_pipes) { - char unix_path[PATH_MAX]; - android_gles_unix_path(unix_path, sizeof(unix_path), ANDROID_OPENGLES_BASE_PORT); - pipe = (NetPipe *)netPipe_initUnix(hwpipe, _looper, unix_path); - D("Creating Unix OpenGLES pipe for GPU emulation: %s", unix_path); + pipe = (NetPipe *)netPipe_initUnix(hwpipe, _looper, server_addr); + D("Creating Unix OpenGLES pipe for GPU emulation: %s", server_addr); } else { #else /* _WIN32 */ { #endif /* Connect through TCP as a fallback */ - snprintf(temp, sizeof temp, "%d", ANDROID_OPENGLES_BASE_PORT); - pipe = (NetPipe *)netPipe_initTcp(hwpipe, _looper, temp); + pipe = (NetPipe *)netPipe_initTcp(hwpipe, _looper, server_addr); D("Creating TCP OpenGLES pipe for GPU emulation!"); } if (pipe != NULL) { |