silence a bunch of warnings

diff --git a/src/mesa/shader/shaderobjects_3dlabs.c b/src/mesa/shader/shaderobjects_3dlabs.c
index acf1746c186ba62caf9a93a808359c0c8bb9d488..370670fdfc2a76400ee8826338395500ad1f3f9d 100755 (executable)
--- a/src/mesa/shader/shaderobjects_3dlabs.c
+++ b/src/mesa/shader/shaderobjects_3dlabs.c
@@ -31,6 +31,7 @@
 \r
 #include "glheader.h"\r
 #include "shaderobjects.h"\r
+#include "shaderobjects_3dlabs.h"\r
 #include "context.h"\r
 #include "macros.h"\r
 #include "hash.h"\r
@@ -176,9 +177,11 @@ _generic_GetInfoLog (struct gl2_generic_intf **intf)
 }\r
 \r
 static struct gl2_generic_intf _generic_vftbl = {\r
-       _unknown_AddRef,\r
-       _unknown_Release,\r
-       _generic_QueryInterface,\r
+       {\r
+               _unknown_AddRef,\r
+               _unknown_Release,\r
+               _generic_QueryInterface\r
+       },\r
        _generic_Delete,\r
        NULL,\r
        _generic_GetName,\r
@@ -311,14 +314,18 @@ _container_GetAttached (struct gl2_container_intf **intf, GLuint index)
 }\r
 \r
 static struct gl2_container_intf _container_vftbl = {\r
+   {\r
+      {\r
        _unknown_AddRef,\r
        _unknown_Release,\r
        _container_QueryInterface,\r
+      },\r
        _generic_Delete,\r
        NULL,\r
        _generic_GetName,\r
        _generic_GetDeleteStatus,\r
        _generic_GetInfoLog,\r
+   },\r
        _container_Attach,\r
        _container_Detach,\r
        _container_GetAttachedCount,\r
@@ -418,14 +425,18 @@ _shader_Compile (struct gl2_shader_intf **intf)
 }\r
 \r
 static struct gl2_shader_intf _shader_vftbl = {\r
+   {\r
+      {\r
        _unknown_AddRef,\r
        _unknown_Release,\r
        _shader_QueryInterface,\r
+      },\r
        _generic_Delete,\r
        _shader_GetType,\r
        _generic_GetName,\r
        _generic_GetDeleteStatus,\r
        _generic_GetInfoLog,\r
+   },\r
        NULL,\r
        _shader_GetCompileStatus,\r
        _shader_SetSource,\r
@@ -462,7 +473,7 @@ static void
 _program_destructor (struct gl2_unknown_intf **intf)\r
 {\r
        struct gl2_program_impl *impl = (struct gl2_program_impl *) intf;\r
-\r
+       (void) impl;\r
        _container_destructor (intf);\r
 }\r
 \r
@@ -539,18 +550,24 @@ _program_Validate (struct gl2_program_intf **intf)
 }\r
 \r
 static struct gl2_program_intf _program_vftbl = {\r
-       _unknown_AddRef,\r
-       _unknown_Release,\r
-       _program_QueryInterface,\r
-       _generic_Delete,\r
-       _program_GetType,\r
-       _generic_GetName,\r
-       _generic_GetDeleteStatus,\r
-       _generic_GetInfoLog,\r
-       _program_Attach,\r
-       _container_Detach,\r
-       _container_GetAttachedCount,\r
-       _container_GetAttached,\r
+       {\r
+               {\r
+                       {\r
+                               _unknown_AddRef,\r
+                               _unknown_Release,\r
+                               _program_QueryInterface,\r
+                       },\r
+                       _generic_Delete,\r
+                       _program_GetType,\r
+                       _generic_GetName,\r
+                       _generic_GetDeleteStatus,\r
+                       _generic_GetInfoLog,\r
+               },\r
+               _program_Attach,\r
+               _container_Detach,\r
+               _container_GetAttachedCount,\r
+               _container_GetAttached,\r
+       },\r
        _program_GetLinkStatus,\r
        _program_GetValidateStatus,\r
        _program_Link,\r
@@ -582,7 +599,7 @@ static void
 _fragment_shader_destructor (struct gl2_unknown_intf **intf)\r
 {\r
        struct gl2_fragment_shader_impl *impl = (struct gl2_fragment_shader_impl *) intf;\r
-\r
+       (void) impl;\r
        /* TODO free fragment shader data */\r
 \r
        _shader_destructor (intf);\r
@@ -606,19 +623,25 @@ _fragment_shader_GetSubType (struct gl2_shader_intf **intf)
 }\r
 \r
 static struct gl2_fragment_shader_intf _fragment_shader_vftbl = {\r
-       _unknown_AddRef,\r
-       _unknown_Release,\r
-       _fragment_shader_QueryInterface,\r
-       _generic_Delete,\r
-       _shader_GetType,\r
-       _generic_GetName,\r
-       _generic_GetDeleteStatus,\r
-       _generic_GetInfoLog,\r
-       _fragment_shader_GetSubType,\r
-       _shader_GetCompileStatus,\r
-       _shader_SetSource,\r
-       _shader_GetSource,\r
-       _shader_Compile\r
+       {\r
+               {\r
+                       {\r
+                               _unknown_AddRef,\r
+                               _unknown_Release,\r
+                               _fragment_shader_QueryInterface,\r
+                       },\r
+                       _generic_Delete,\r
+                       _shader_GetType,\r
+                       _generic_GetName,\r
+                       _generic_GetDeleteStatus,\r
+                       _generic_GetInfoLog,\r
+               },\r
+               _fragment_shader_GetSubType,\r
+               _shader_GetCompileStatus,\r
+               _shader_SetSource,\r
+               _shader_GetSource,\r
+               _shader_Compile\r
+       }\r
 };\r
 \r
 static void\r
@@ -644,7 +667,7 @@ static void
 _vertex_shader_destructor (struct gl2_unknown_intf **intf)\r
 {\r
        struct gl2_vertex_shader_impl *impl = (struct gl2_vertex_shader_impl *) intf;\r
-\r
+       (void) impl;\r
        /* TODO free vertex shader data */\r
 \r
        _shader_destructor (intf);\r
@@ -668,19 +691,25 @@ _vertex_shader_GetSubType (struct gl2_shader_intf **intf)
 }\r
 \r
 static struct gl2_vertex_shader_intf _vertex_shader_vftbl = {\r
-       _unknown_AddRef,\r
-       _unknown_Release,\r
-       _vertex_shader_QueryInterface,\r
-       _generic_Delete,\r
-       _shader_GetType,\r
-       _generic_GetName,\r
-       _generic_GetDeleteStatus,\r
-       _generic_GetInfoLog,\r
-       _vertex_shader_GetSubType,\r
-       _shader_GetCompileStatus,\r
-       _shader_SetSource,\r
-       _shader_GetSource,\r
-       _shader_Compile\r
+       {\r
+               {\r
+                       {\r
+                               _unknown_AddRef,\r
+                               _unknown_Release,\r
+                               _vertex_shader_QueryInterface,\r
+                       },\r
+                       _generic_Delete,\r
+                       _shader_GetType,\r
+                       _generic_GetName,\r
+                       _generic_GetDeleteStatus,\r
+                       _generic_GetInfoLog,\r
+               },\r
+               _vertex_shader_GetSubType,\r
+               _shader_GetCompileStatus,\r
+               _shader_SetSource,\r
+               _shader_GetSource,\r
+               _shader_Compile\r
+       }\r
 };\r
 \r
 static void\r
@@ -695,7 +724,7 @@ GLhandleARB
 _mesa_3dlabs_create_shader_object (GLenum shaderType)\r
 {\r
        GET_CURRENT_CONTEXT(ctx);\r
-\r
+       (void) ctx;\r
        switch (shaderType)\r
        {\r
        case GL_FRAGMENT_SHADER_ARB:\r
@@ -731,9 +760,10 @@ GLhandleARB
 _mesa_3dlabs_create_program_object (void)\r
 {\r
        GET_CURRENT_CONTEXT(ctx);\r
-       struct gl2_program_impl *x = (struct gl2_program_impl *) _mesa_malloc (sizeof (\r
-               struct gl2_program_impl));\r
+       struct gl2_program_impl *x = (struct gl2_program_impl *)\r
+               _mesa_malloc (sizeof (struct gl2_program_impl));\r
 \r
+       (void) ctx;\r
        if (x != NULL)\r
        {\r
                _program_constructor (x);\r