remove build warnings

Change-Id: Ic02de954faaa4c2365da4d4a337d9808f3e02736

diff --git a/packaging/coregl.spec b/packaging/coregl.spec
index 8061a83..de13d65 100755 (executable)
--- a/packaging/coregl.spec
+++ b/packaging/coregl.spec
@@ -13,7 +13,6 @@ Requires(postun): /sbin/ldconfig
 %ifarch %{ix86}
 BuildRequires:  simulator-opengl-devel
 %else
-BuildRequires:  pkgconfig(gles11)
 BuildRequires:  pkgconfig(gles20)
 BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  opengl-es-devel

diff --git a/src/coregl_internal.h b/src/coregl_internal.h
index 50dfccf..b62ce46 100644 (file)
--- a/src/coregl_internal.h
+++ b/src/coregl_internal.h
@@ -53,8 +53,8 @@
        fflush(trace_fp)
 #define _COREGL_TRACE_OUTPUT_INTERVAL_SEC 5
 
-static inline GLint GET_INT_FROM_FLOAT(GLfloat value) { return *((GLint *)&value); }
-static inline GLuint GET_UINT_FROM_FLOAT(GLfloat value) { return *((GLint *)&value); }
+static inline GLint GET_INT_FROM_FLOAT(GLfloat value) { return (GLint)value; }
+static inline GLuint GET_UINT_FROM_FLOAT(GLfloat value) { return (GLuint)value; }
 
 
 #ifdef COREGL_DEBUG

diff --git a/src/modules/fastpath/coregl_fastpath.c b/src/modules/fastpath/coregl_fastpath.c
index ebe4896..71eac3a 100644 (file)
--- a/src/modules/fastpath/coregl_fastpath.c
+++ b/src/modules/fastpath/coregl_fastpath.c
@@ -696,7 +696,6 @@ int
 fastpath_remove_context_states_from_list(GLContextState *cstate, Mutex *mtx)
 {
        int ret = 0;
-       int tid = 0;
        GLContext_List *olditm = NULL;
        GLContext_List *current = NULL;
 
@@ -704,7 +703,6 @@ fastpath_remove_context_states_from_list(GLContextState *cstate, Mutex *mtx)
 
        AST(cstate != NULL);
 
-       tid = get_current_thread();
        current = glctx_list;
 
        while (current != NULL)
@@ -1241,8 +1239,8 @@ fastpath_dump_context_states(GLGlueContext *ctx, int force_output)
 #define PRINTF_CHAR_GLsizei "%10u"
 #define PRINTF_CHAR_GLuint "%10u"
 #define PRINTF_CHAR_GLuintmask "0x%8X"
-#define PRINTF_CHAR_GLintptr "0x%8X"
-#define PRINTF_CHAR_GLsizeiptr "%10d"
+#define PRINTF_CHAR_GLintptr "%10ld"
+#define PRINTF_CHAR_GLsizeiptr "%10ld"
 
 #define PRINTF_CHAR_GLclampf "%10.6f"
 #define PRINTF_CHAR_GLfloat "%10.6f"

diff --git a/src/modules/fastpath/coregl_fastpath_egl.c b/src/modules/fastpath/coregl_fastpath_egl.c
index a04b8d7..343223e 100644 (file)
--- a/src/modules/fastpath/coregl_fastpath_egl.c
+++ b/src/modules/fastpath/coregl_fastpath_egl.c
@@ -1397,7 +1397,6 @@ fastpath_eglCreateImageKHR (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLC
        if (ctx != NULL && ctx != EGL_NO_CONTEXT)
        {
                GLGlueContext *gctx = (GLGlueContext *)ctx;
-               GLuint glue_obj = (GLuint)buffer;
 
                if (gctx->magic != MAGIC_GLFAST)
                {

diff --git a/src/modules/fastpath/coregl_fastpath_gl.c b/src/modules/fastpath/coregl_fastpath_gl.c
index d021117..433ecb4 100644 (file)
--- a/src/modules/fastpath/coregl_fastpath_gl.c
+++ b/src/modules/fastpath/coregl_fastpath_gl.c
@@ -5679,7 +5679,6 @@ finish:
 void
 fastpath_glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-       GLboolean ret = GL_FALSE;
        GLuint real_obj;
 
        DEFINE_FASTPAH_GL_FUNC();
@@ -5688,7 +5687,6 @@ fastpath_glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 
        if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
        {
-               ret = GL_FALSE;
                goto finish;
        }
 
@@ -5703,7 +5701,6 @@ finish:
 void
 fastpath_glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint* param)
 {
-       GLboolean ret = GL_FALSE;
        GLuint real_obj;
 
        DEFINE_FASTPAH_GL_FUNC();
@@ -5712,7 +5709,6 @@ fastpath_glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint* param)
 
        if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
        {
-               ret = GL_FALSE;
                goto finish;
        }
 
@@ -5727,7 +5723,6 @@ finish:
 void
 fastpath_glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-       GLboolean ret = GL_FALSE;
        GLuint real_obj;
 
        DEFINE_FASTPAH_GL_FUNC();
@@ -5736,7 +5731,6 @@ fastpath_glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 
        if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
        {
-               ret = GL_FALSE;
                goto finish;
        }
 
@@ -5751,7 +5745,6 @@ finish:
 void
 fastpath_glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat* param)
 {
-       GLboolean ret = GL_FALSE;
        GLuint real_obj;
 
        DEFINE_FASTPAH_GL_FUNC();
@@ -5760,7 +5753,6 @@ fastpath_glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat* param
 
        if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
        {
-               ret = GL_FALSE;
                goto finish;
        }
 
@@ -5775,7 +5767,6 @@ finish:
 void
 fastpath_glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint* params)
 {
-       GLboolean ret = GL_FALSE;
        GLuint real_obj;
 
        DEFINE_FASTPAH_GL_FUNC();
@@ -5784,7 +5775,6 @@ fastpath_glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint* params)
 
        if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
        {
-               ret = GL_FALSE;
                goto finish;
        }
 
@@ -5799,7 +5789,6 @@ finish:
 void
 fastpath_glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat* params)
 {
-       GLboolean ret = GL_FALSE;
        GLuint real_obj;
 
        DEFINE_FASTPAH_GL_FUNC();
@@ -5808,7 +5797,6 @@ fastpath_glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat* params)
 
        if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
        {
-               ret = GL_FALSE;
                goto finish;
        }
 

diff --git a/src/modules/tracepath/coregl_tracepath.c b/src/modules/tracepath/coregl_tracepath.c
index 3a84310..9086044 100755 (executable)
--- a/src/modules/tracepath/coregl_tracepath.c
+++ b/src/modules/tracepath/coregl_tracepath.c
@@ -443,8 +443,8 @@ tracepath_dump_context_states(int force_output)
 #define PRINTF_CHAR_GLsizei "%10u"
 #define PRINTF_CHAR_GLuint "%10u"
 #define PRINTF_CHAR_GLuintmask "0x%8X"
-#define PRINTF_CHAR_GLintptr "0x%8X"
-#define PRINTF_CHAR_GLsizeiptr "%10d"
+#define PRINTF_CHAR_GLintptr "%10ld"
+#define PRINTF_CHAR_GLsizeiptr "%10ld"
 
 #define PRINTF_CHAR_GLclampf "%10.6f"
 #define PRINTF_CHAR_GLfloat "%10.6f"