aboutsummaryrefslogtreecommitdiffstats
path: root/emulator
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2014-03-05 12:55:49 +0100
committerDavid 'Digit' Turner <digit@google.com>2014-03-06 00:32:11 +0100
commitbfb9f632d4b0910cde452b116e7ce85c682f69ab (patch)
treebbc1982b603e372b4cf95154abf0b080b225bdbf /emulator
parentc3a816300ab5808bac7d5540d13a5d206ae0f707 (diff)
downloadsdk-bfb9f632d4b0910cde452b116e7ce85c682f69ab.zip
sdk-bfb9f632d4b0910cde452b116e7ce85c682f69ab.tar.gz
sdk-bfb9f632d4b0910cde452b116e7ce85c682f69ab.tar.bz2
emulator/opengl: Remove compiler warnings
This patch removes a few minor compiler warnings related to unused local variables. Change-Id: Icd4b3b478dce0c38cc1dd04419db7350dcbdb8f6
Diffstat (limited to 'emulator')
-rw-r--r--emulator/opengl/host/libs/libOpenglRender/FBConfig.cpp1
-rw-r--r--emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp2
-rw-r--r--emulator/opengl/host/libs/libOpenglRender/WindowSurface.cpp5
-rw-r--r--emulator/opengl/shared/OpenglCodecCommon/GLDecoderContextData.h4
4 files changed, 3 insertions, 9 deletions
diff --git a/emulator/opengl/host/libs/libOpenglRender/FBConfig.cpp b/emulator/opengl/host/libs/libOpenglRender/FBConfig.cpp
index ca7351e..08c71e8 100644
--- a/emulator/opengl/host/libs/libOpenglRender/FBConfig.cpp
+++ b/emulator/opengl/host/libs/libOpenglRender/FBConfig.cpp
@@ -67,7 +67,6 @@ InitConfigStatus FBConfig::initConfigList(FrameBuffer *fb)
return ret;
}
- const FrameBufferCaps &caps = fb->getCaps();
EGLDisplay dpy = fb->getDisplay();
if (dpy == EGL_NO_DISPLAY) {
diff --git a/emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp b/emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp
index 1b2c0fe..9ae2a43 100644
--- a/emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp
+++ b/emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp
@@ -94,7 +94,7 @@ int RenderThread::Main()
stats_totalBytes += readBuf.validData();
long long dt = GetCurrentTimeMS() - stats_t0;
if (dt > 1000) {
- float dts = (float)dt / 1000.0f;
+ //float dts = (float)dt / 1000.0f;
//printf("Used Bandwidth %5.3f MB/s\n", ((float)stats_totalBytes / dts) / (1024.0f*1024.0f));
stats_totalBytes = 0;
stats_t0 = GetCurrentTimeMS();
diff --git a/emulator/opengl/host/libs/libOpenglRender/WindowSurface.cpp b/emulator/opengl/host/libs/libOpenglRender/WindowSurface.cpp
index 9c32ff8..bdda01a 100644
--- a/emulator/opengl/host/libs/libOpenglRender/WindowSurface.cpp
+++ b/emulator/opengl/host/libs/libOpenglRender/WindowSurface.cpp
@@ -58,9 +58,6 @@ WindowSurface *WindowSurface::create(int p_config, int p_width, int p_height)
}
win->m_fbconf = fbconf;
- FrameBuffer *fb = FrameBuffer::getFB();
- const FrameBufferCaps &caps = fb->getCaps();
-
//
// Create a pbuffer to be used as the egl surface
// for that window.
@@ -209,8 +206,6 @@ bool WindowSurface::resizePbuffer(unsigned int p_width, unsigned int p_height)
m_eglSurface = NULL;
}
- const FrameBufferCaps &caps = fb->getCaps();
-
//
// Create pbuffer surface.
//
diff --git a/emulator/opengl/shared/OpenglCodecCommon/GLDecoderContextData.h b/emulator/opengl/shared/OpenglCodecCommon/GLDecoderContextData.h
index 23785ae..d5b5189 100644
--- a/emulator/opengl/shared/OpenglCodecCommon/GLDecoderContextData.h
+++ b/emulator/opengl/shared/OpenglCodecCommon/GLDecoderContextData.h
@@ -53,12 +53,12 @@ public:
void storePointerData(unsigned int loc, void *data, size_t len) {
- assert(loc < m_nLocations);
+ assert(loc < (unsigned)m_nLocations);
m_pointerData[loc].alloc(len);
memcpy(m_pointerData[loc].ptr(), data, len);
}
void *pointerData(unsigned int loc) {
- assert(loc < m_nLocations);
+ assert(loc < (unsigned)m_nLocations);
return m_pointerData[loc].ptr();
}
private: