儲存庫 vbox 的更動 63206

時間撮記:

2016-8-9 下午02:13:22 (8 年 以前)

作者:

vboxsync

訊息:

GA/common/crOpenGL: warnings (gcc)

位置:

trunk/src/VBox/Additions/common/crOpenGL

檔案:

• egl.c (修改) (7 筆差異)
• feedback/feedback_context.c (修改) (3 筆差異)
• feedback/feedbackspu_config.c (修改) (1 筆差異)
• pack/packspu_beginend.py (修改) (2 筆差異)
• pack/packspu_get.py (修改) (1 筆差異)
• pack/packspu_glsl.c (修改) (1 筆差異)

trunk/src/VBox/Additions/common/crOpenGL/egl.c

@@ -149 +149 @@
 {
     Display *pDisplay;
-    int rc, cError, cEvent, cMajor, cMinor;
+    int cError, cEvent, cMajor, cMinor;
 
     if (!testValidDisplay(hDisplay))
@@ -201 +201 @@
 DECLEXPORT(const char *) eglQueryString(EGLDisplay hDisplay, EGLint name)
 {
+    RT_NOREF(hDisplay);
     switch (name)
     {
@@ -240 +241 @@
 }
 
-static int convertEGLAttribToGLX(EGLint EGLAttrib)
-{
-    switch (EGLAttrib)
+static int convertEGLAttribToGLX(EGLint a_EGLAttrib)
+{
+    switch (a_EGLAttrib)
     {
         case EGL_BUFFER_SIZE:
@@ -310 +311 @@
     const EGLint *pAttrib, *pAttrib2;
     EGLint cRenderableType = EGL_OPENGL_ES_BIT;
-    int cConfigCaveat = GLX_DONT_CARE, cConformant = GLX_DONT_CARE;
+    unsigned cConfigCaveat = GLX_DONT_CARE, cConformant = GLX_DONT_CARE;
     GLXFBConfig *paFBConfigs;
     int caFBConfigs;
@@ -442 +443 @@
         return setEGLError(EGL_BAD_ACCESS);
     *pcConfigs = caFBConfigs;
-    for (i = 0; i < caConfigs && i < caFBConfigs; ++i)
+    for (i = 0; (GLint)i < caConfigs && (GLint)i < caFBConfigs; ++i)
         paConfigs[i] = (EGLConfig)paFBConfigs[i];
     XFree(paFBConfigs);
@@ -635 +636 @@
             paAttributes += 2;
         }
-    EGL_ASSERT(cIndex < RT_ELEMENTS(aAttributes) - 1);
+    EGL_ASSERT((unsigned)cIndex < RT_ELEMENTS(aAttributes) - 1U);
     aAttributes[cIndex + 1] = None;
     hPbuffer = glXCreatePbuffer(pDisplay, (GLXFBConfig)config, aAttributes);
@@ -923 +924 @@
     Display *pDisplay = (Display *)hDisplay;
 
-    if (!VALID_PTR(hDisplay))
+    if (!VALID_PTR(pDisplay))
         return setEGLError(EGL_NOT_INITIALIZED);
 

trunk/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox feedback spu, context tracking.
@@ -20 +19 @@
 #include "cr_error.h"
 #include "feedbackspu.h"
+
+/** @todo r=bird: None of the code here is referenced externally, so I've
+ *        just prototyped the function here at the top of the file to make
+ *        the compiler happy. */
+GLint FEEDBACKSPU_APIENTRY  feedbackspu_VBoxCreateContext( GLint con, const char *dpyName, GLint visual, GLint shareCtx );
+GLint FEEDBACKSPU_APIENTRY  feedbackspu_CreateContext( const char *dpyName, GLint visual, GLint shareCtx );
+void FEEDBACKSPU_APIENTRY   feedbackspu_MakeCurrent( GLint window, GLint nativeWindow, GLint ctx );
+void FEEDBACKSPU_APIENTRY   feedbackspu_DestroyContext( GLint ctx );
+
 
 /*@todo Multithreading case. (See feedback_spu.self.RenderMode)*/
@@ -121 +129 @@
 #endif
 }
+

trunk/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu_config.c

@@ -23 +23 @@
 static void set_default_viewport( void *foo, const char *response )
 {
+   (void) foo;
    sscanf( response, "%d", &(feedback_spu.default_viewport) );
 }

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_beginend.py

@@ -19 +19 @@
 void PACKSPU_APIENTRY packspu_Begin( GLenum mode )
 {
+    CRPackBuffer *buf;
+#if CR_ARB_vertex_buffer_object
+    GET_CONTEXT(ctx);
+#else
     GET_THREAD(thread);
-    CRPackBuffer *buf = &thread->BeginEndBuffer;
+#endif
+
+    buf = &thread->BeginEndBuffer;
 
     /* XXX comparing mode >= 0 here is not needed since mode is unsigned */
@@ -28 +34 @@
     {
         GLboolean serverArrays = GL_FALSE;
-        GET_CONTEXT(ctx);
         if (ctx->clientState->extensions.ARB_vertex_buffer_object)
             serverArrays = crStateUseServerArrays();

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_get.py

@@ -21 +21 @@
 
 print """
-GLboolean crPackIsPixelStoreParm(GLenum pname)
+static GLboolean crPackIsPixelStoreParm(GLenum pname)
 {
     if (pname == GL_UNPACK_ALIGNMENT

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c

@@ -115 +115 @@
 }
 
-GLint PACKSPU_APIENTRY packspu_GetAttribLocationUnchached( GLuint program, const char * name )
+static GLint PACKSPU_APIENTRY packspu_GetAttribLocationUnchached( GLuint program, const char * name )
 {
     GET_THREAD(thread);