opengl: Remove compiler warnings.
Simply remove multiple compiler warnings about unused parameter.
Note that this modifies three auto-generated files, which will
require fixing the 'emugen' program in the future.
Change-Id: I19edce7c6480770b893d033ed6b1c65744091d62
diff --git a/shared/OpenglCodecCommon/FixedBuffer.h b/shared/OpenglCodecCommon/FixedBuffer.h
index 30b9a80..7026396 100644
--- a/shared/OpenglCodecCommon/FixedBuffer.h
+++ b/shared/OpenglCodecCommon/FixedBuffer.h
@@ -20,7 +20,7 @@
public:
FixedBuffer(size_t initialSize = 0) {
m_buffer = NULL;
- m_bufferLen = 0;
+ m_bufferLen = initialSize;
alloc(m_bufferLen);
}
diff --git a/system/GLESv1/gl.cpp b/system/GLESv1/gl.cpp
index c684d14..a7950eb 100644
--- a/system/GLESv1/gl.cpp
+++ b/system/GLESv1/gl.cpp
@@ -50,6 +50,8 @@
//GL extensions
void glEGLImageTargetTexture2DOES(void * self, GLenum target, GLeglImageOES image)
{
+ (void)self;
+
DBG("glEGLImageTargetTexture2DOES v1 target=%#x image=%p", target, image);
//TODO: check error - we don't have a way to set gl error
android_native_buffer_t* native_buffer = (android_native_buffer_t*)image;
@@ -75,6 +77,9 @@
void glEGLImageTargetRenderbufferStorageOES(void *self, GLenum target, GLeglImageOES image)
{
+ (void)self;
+ (void)target;
+
DBG("glEGLImageTargetRenderbufferStorageOES v1 target=%#x image=%p",
target, image);
//TODO: check error - we don't have a way to set gl error
@@ -113,6 +118,8 @@
const GLubyte *my_glGetString (void *self, GLenum name)
{
+ (void)self;
+
if (s_egl) {
return (const GLubyte*)s_egl->getGLString(name);
}
diff --git a/system/GLESv1_enc/GLEncoder.cpp b/system/GLESv1_enc/GLEncoder.cpp
index ae00ca7..0fe1d8e 100644
--- a/system/GLESv1_enc/GLEncoder.cpp
+++ b/system/GLESv1_enc/GLEncoder.cpp
@@ -235,6 +235,8 @@
const GLubyte *GLEncoder::s_glGetString(void *self, GLenum name)
{
+ (void)self;
+
GLubyte *retval = (GLubyte *) "";
switch(name) {
case GL_VENDOR:
diff --git a/system/GLESv1_enc/gl_client_context.h b/system/GLESv1_enc/gl_client_context.h
index aa058ec..35fb27a 100644
--- a/system/GLESv1_enc/gl_client_context.h
+++ b/system/GLESv1_enc/gl_client_context.h
@@ -304,7 +304,7 @@
typedef gl_client_context_t *CONTEXT_ACCESSOR_TYPE(void);
static void setContextAccessor(CONTEXT_ACCESSOR_TYPE *f);
int initDispatchByName( void *(*getProc)(const char *name, void *userData), void *userData);
- virtual void setError(unsigned int error){};
+ virtual void setError(unsigned int error){ (void)error; };
virtual unsigned int getError(){ return 0; };
};
diff --git a/system/GLESv2/gl2.cpp b/system/GLESv2/gl2.cpp
index e6b4d0b..e545779 100644
--- a/system/GLESv2/gl2.cpp
+++ b/system/GLESv2/gl2.cpp
@@ -50,6 +50,9 @@
//GL extensions
void glEGLImageTargetTexture2DOES(void * self, GLenum target, GLeglImageOES image)
{
+ (void)self;
+ (void)target;
+
DBG("glEGLImageTargetTexture2DOES v2 target=%#x img=%p\n", target, image);
//TODO: check error - we don't have a way to set gl error
android_native_buffer_t* native_buffer = (android_native_buffer_t*)image;
@@ -74,6 +77,9 @@
void glEGLImageTargetRenderbufferStorageOES(void *self, GLenum target, GLeglImageOES image)
{
+ (void)self;
+ (void)target;
+
DBG("glEGLImageTargetRenderbufferStorageOES v2 image=%p\n", image);
//TODO: check error - we don't have a way to set gl error
android_native_buffer_t* native_buffer = (android_native_buffer_t*)image;
@@ -110,6 +116,8 @@
const GLubyte *my_glGetString (void *self, GLenum name)
{
+ (void)self;
+
if (s_egl) {
return (const GLubyte*)s_egl->getGLString(name);
}
diff --git a/system/GLESv2_enc/GL2Encoder.cpp b/system/GLESv2_enc/GL2Encoder.cpp
index 3b2100e..9490571 100644
--- a/system/GLESv2_enc/GL2Encoder.cpp
+++ b/system/GLESv2_enc/GL2Encoder.cpp
@@ -150,6 +150,8 @@
const GLubyte *GL2Encoder::s_glGetString(void *self, GLenum name)
{
+ (void)self;
+
GLubyte *retval = (GLubyte *) "";
switch(name) {
case GL_VENDOR:
@@ -403,6 +405,8 @@
GL2Encoder *ctx = (GL2Encoder *)self;
if (ctx->m_state == NULL) return;
+ (void)pname;
+
const GLClientState::VertexAttribState *va_state = ctx->m_state->getState(index);
if (va_state != NULL) {
*pointer = va_state->data;
diff --git a/system/GLESv2_enc/gl2_client_context.h b/system/GLESv2_enc/gl2_client_context.h
index a92f4bb..87d62d5 100644
--- a/system/GLESv2_enc/gl2_client_context.h
+++ b/system/GLESv2_enc/gl2_client_context.h
@@ -221,7 +221,7 @@
typedef gl2_client_context_t *CONTEXT_ACCESSOR_TYPE(void);
static void setContextAccessor(CONTEXT_ACCESSOR_TYPE *f);
int initDispatchByName( void *(*getProc)(const char *name, void *userData), void *userData);
- virtual void setError(unsigned int error){};
+ virtual void setError(unsigned int error){ (void)error; };
virtual unsigned int getError(){ return 0; };
};
diff --git a/system/OpenglSystemCommon/ThreadInfo.cpp b/system/OpenglSystemCommon/ThreadInfo.cpp
index f9c8521..04ce508 100644
--- a/system/OpenglSystemCommon/ThreadInfo.cpp
+++ b/system/OpenglSystemCommon/ThreadInfo.cpp
@@ -24,7 +24,7 @@
EGLThreadInfo *ti = (EGLThreadInfo *)ptr;
delete ti->hostConn;
delete ti;
- ((intptr_t *)__get_tls())[TLS_SLOT_OPENGL] = NULL;
+ ((void **)__get_tls())[TLS_SLOT_OPENGL] = NULL;
}
}
diff --git a/system/egl/egl.cpp b/system/egl/egl.cpp
index daa52de..7ff7429 100644
--- a/system/egl/egl.cpp
+++ b/system/egl/egl.cpp
@@ -336,7 +336,7 @@
virtual ~egl_pbuffer_surface_t();
- virtual void setSwapInterval(int interval) {}
+ virtual void setSwapInterval(int interval) { (void)interval; }
virtual EGLBoolean swapBuffers() { return EGL_TRUE; }
uint32_t getRcColorBuffer() { return rcColorBuffer; }
@@ -542,7 +542,7 @@
EGLBoolean eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config)
{
- VALIDATE_DISPLAY_INIT(dpy, NULL);
+ VALIDATE_DISPLAY_INIT(dpy, EGL_FALSE);
if(!num_config) {
RETURN_ERROR(EGL_FALSE,EGL_BAD_PARAMETER);
@@ -554,7 +554,7 @@
return EGL_TRUE;
}
- uintptr_t i=0;
+ EGLint i=0;
for (i=0 ; i<numConfigs && i<config_size ; i++) {
*configs++ = (EGLConfig)i;
}
@@ -593,7 +593,7 @@
EGLBoolean eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value)
{
- VALIDATE_DISPLAY_INIT(dpy, NULL);
+ VALIDATE_DISPLAY_INIT(dpy, EGL_FALSE);
VALIDATE_CONFIG(config, EGL_FALSE);
if (s_display.getConfigAttrib(config, attribute, value))
@@ -608,6 +608,8 @@
EGLSurface eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list)
{
+ (void)attrib_list;
+
VALIDATE_DISPLAY_INIT(dpy, NULL);
VALIDATE_CONFIG(config, EGL_FALSE);
if (win == 0) {
@@ -699,6 +701,10 @@
// to s/w rendering -or- let the host render to a buffer that will be
// copied back to guest at some sync point. None of those methods not
// implemented and pixmaps are not used with OpenGL anyway ...
+ (void)dpy;
+ (void)config;
+ (void)pixmap;
+ (void)attrib_list;
return EGL_NO_SURFACE;
}
@@ -783,6 +789,11 @@
EGLSurface eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list)
{
//TODO
+ (void)dpy;
+ (void)buftype;
+ (void)buffer;
+ (void)config;
+ (void)attrib_list;
ALOGW("%s not implemented", __FUNCTION__);
return 0;
}
@@ -790,6 +801,10 @@
EGLBoolean eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value)
{
//TODO
+ (void)dpy;
+ (void)surface;
+ (void)attribute;
+ (void)value;
ALOGW("%s not implemented", __FUNCTION__);
return 0;
}
@@ -828,6 +843,9 @@
EGLBoolean eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
{
//TODO
+ (void)dpy;
+ (void)surface;
+ (void)buffer;
ALOGW("%s not implemented", __FUNCTION__);
return 0;
}
@@ -1088,6 +1106,7 @@
EGLBoolean eglWaitNative(EGLint engine)
{
+ (void)engine;
return EGL_TRUE;
}
@@ -1113,23 +1132,33 @@
EGLBoolean eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)
{
//TODO :later
+ (void)dpy;
+ (void)surface;
+ (void)target;
return 0;
}
EGLBoolean eglLockSurfaceKHR(EGLDisplay display, EGLSurface surface, const EGLint *attrib_list)
{
//TODO later
+ (void)display;
+ (void)surface;
+ (void)attrib_list;
return 0;
}
EGLBoolean eglUnlockSurfaceKHR(EGLDisplay display, EGLSurface surface)
{
//TODO later
+ (void)display;
+ (void)surface;
return 0;
}
EGLImageKHR eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list)
{
+ (void)attrib_list;
+
VALIDATE_DISPLAY_INIT(dpy, EGL_NO_IMAGE_KHR);
if (ctx != EGL_NO_CONTEXT) {
setErrorReturn(EGL_BAD_CONTEXT, EGL_NO_IMAGE_KHR);
@@ -1212,6 +1241,8 @@
EGLBoolean eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync)
{
+ (void)dpy;
+
if (sync != FENCE_SYNC_HANDLE) {
setErrorReturn(EGL_BAD_PARAMETER, EGL_FALSE);
}
@@ -1222,6 +1253,10 @@
EGLint eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags,
EGLTimeKHR timeout)
{
+ (void)dpy;
+ (void)flags;
+ (void)timeout;
+
if (sync != FENCE_SYNC_HANDLE) {
setErrorReturn(EGL_BAD_PARAMETER, EGL_FALSE);
}
@@ -1232,6 +1267,8 @@
EGLBoolean eglGetSyncAttribKHR(EGLDisplay dpy, EGLSyncKHR sync,
EGLint attribute, EGLint *value)
{
+ (void)dpy;
+
if (sync != FENCE_SYNC_HANDLE) {
setErrorReturn(EGL_BAD_PARAMETER, EGL_FALSE);
}
diff --git a/system/gralloc/gralloc.cpp b/system/gralloc/gralloc.cpp
index ac812c1..a6f7d91 100644
--- a/system/gralloc/gralloc.cpp
+++ b/system/gralloc/gralloc.cpp
@@ -427,6 +427,8 @@
static int fb_compositionComplete(struct framebuffer_device_t* dev)
{
+ (void)dev;
+
return 0;
}
@@ -465,6 +467,11 @@
{
fb_device_t *fbdev = (fb_device_t *)dev;
+ (void)l;
+ (void)t;
+ (void)w;
+ (void)h;
+
if (!fbdev) {
return -EINVAL;
}
diff --git a/system/renderControl_enc/renderControl_client_context.h b/system/renderControl_enc/renderControl_client_context.h
index 6b0d82f..4c71d89 100644
--- a/system/renderControl_enc/renderControl_client_context.h
+++ b/system/renderControl_enc/renderControl_client_context.h
@@ -39,7 +39,7 @@
typedef renderControl_client_context_t *CONTEXT_ACCESSOR_TYPE(void);
static void setContextAccessor(CONTEXT_ACCESSOR_TYPE *f);
int initDispatchByName( void *(*getProc)(const char *name, void *userData), void *userData);
- virtual void setError(unsigned int error){};
+ virtual void setError(unsigned int error){ (void)error; };
virtual unsigned int getError(){ return 0; };
};