tnl: Silence unused parameter 'attrib' warning in convert_half_to_float
authorIan Romanick <ian.d.romanick@intel.com>
Wed, 8 Apr 2020 03:42:30 +0000 (20:42 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Mon, 13 Apr 2020 17:26:45 +0000 (10:26 -0700)
Also clean up some trivial code / whitespace style issues.

src/mesa/tnl/t_draw.c: In function ‘convert_half_to_float’:
src/mesa/tnl/t_draw.c:121:57: warning: unused parameter ‘attrib’ [-Wunused-parameter]
  121 |                       const struct gl_array_attributes *attrib,
      |                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4512>

src/mesa/tnl/t_draw.c

index 2146fe92c8829577d48e7ef1fba2dbd811fea3aa..b60cec43e0006eb54557945e655210e8bb4af95c 100644 (file)
@@ -118,18 +118,17 @@ convert_bgra_to_float(const struct gl_vertex_buffer_binding *binding,
 
 static void
 convert_half_to_float(const struct gl_vertex_buffer_binding *binding,
-                      const struct gl_array_attributes *attrib,
-                     const GLubyte *ptr, GLfloat *fptr,
-                     GLuint count, GLuint sz)
+                      const GLubyte *ptr, GLfloat *fptr,
+                      GLuint count, GLuint sz)
 {
    GLuint i, j;
 
    for (i = 0; i < count; i++) {
       GLhalfARB *in = (GLhalfARB *)ptr;
 
-      for (j = 0; j < sz; j++) {
-        *fptr++ = _mesa_half_to_float(in[j]);
-      }
+      for (j = 0; j < sz; j++)
+         *fptr++ = _mesa_half_to_float(in[j]);
+
       ptr += binding->Stride;
    }
 }
@@ -221,8 +220,8 @@ static void _tnl_import_array( struct gl_context *ctx,
         CONVERT(GLdouble, (GLfloat)); 
         break;
       case GL_HALF_FLOAT:
-        convert_half_to_float(binding, attrib, ptr, fptr, count, sz);
-        break;
+         convert_half_to_float(binding, ptr, fptr, count, sz);
+         break;
       case GL_FIXED:
          convert_fixed_to_float(binding, attrib, ptr, fptr, count);
          break;