Does this build problem still exist? https://bugs.freedesktop.org/show_bug.cgi?id=86944
On 02/15/2015 06:41 PM, Alan Coopersmith wrote: > The macro is defined to provide a trailing ; so this caused the expansion > to end in ";;" which made the Solaris Studio compilers issue warnings for > every line of: > "builtin_type_macros.h", line 113: Warning: extra ";" ignored. > for every file that included the header, filling build logs with thousands > of useless warnings. > > Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> > --- > src/glsl/builtin_type_macros.h | 66 > ++++++++++++++++++++-------------------- > 1 file changed, 33 insertions(+), 33 deletions(-) > > diff --git a/src/glsl/builtin_type_macros.h b/src/glsl/builtin_type_macros.h > index 236e1ce..7a21801 100644 > --- a/src/glsl/builtin_type_macros.h > +++ b/src/glsl/builtin_type_macros.h > @@ -110,39 +110,39 @@ DECL_TYPE(sampler2DRectShadow, > GL_SAMPLER_2D_RECT_SHADOW, GLSL_TYPE_SA > > DECL_TYPE(samplerExternalOES, GL_SAMPLER_EXTERNAL_OES, > GLSL_TYPE_SAMPLER, GLSL_SAMPLER_DIM_EXTERNAL, 0, 0, GLSL_TYPE_FLOAT) > > -DECL_TYPE(image1D, GL_IMAGE_1D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_FLOAT); > -DECL_TYPE(image2D, GL_IMAGE_2D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_2D, 0, 0, GLSL_TYPE_FLOAT); > -DECL_TYPE(image3D, GL_IMAGE_3D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_3D, 0, 0, GLSL_TYPE_FLOAT); > -DECL_TYPE(image2DRect, GL_IMAGE_2D_RECT, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_RECT, 0, 0, GLSL_TYPE_FLOAT); > -DECL_TYPE(imageCube, GL_IMAGE_CUBE, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_CUBE, 0, 0, GLSL_TYPE_FLOAT); > -DECL_TYPE(imageBuffer, GL_IMAGE_BUFFER, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_BUF, 0, 0, GLSL_TYPE_FLOAT); > -DECL_TYPE(image1DArray, GL_IMAGE_1D_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_1D, 0, 1, GLSL_TYPE_FLOAT); > -DECL_TYPE(image2DArray, GL_IMAGE_2D_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_2D, 0, 1, GLSL_TYPE_FLOAT); > -DECL_TYPE(imageCubeArray, GL_IMAGE_CUBE_MAP_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_CUBE, 0, 1, GLSL_TYPE_FLOAT); > -DECL_TYPE(image2DMS, GL_IMAGE_2D_MULTISAMPLE, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_MS, 0, 0, GLSL_TYPE_FLOAT); > -DECL_TYPE(image2DMSArray, GL_IMAGE_2D_MULTISAMPLE_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_MS, 0, 1, GLSL_TYPE_FLOAT); > -DECL_TYPE(iimage1D, GL_INT_IMAGE_1D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_INT); > -DECL_TYPE(iimage2D, GL_INT_IMAGE_2D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_2D, 0, 0, GLSL_TYPE_INT); > -DECL_TYPE(iimage3D, GL_INT_IMAGE_3D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_3D, 0, 0, GLSL_TYPE_INT); > -DECL_TYPE(iimage2DRect, GL_INT_IMAGE_2D_RECT, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_RECT, 0, 0, GLSL_TYPE_INT); > -DECL_TYPE(iimageCube, GL_INT_IMAGE_CUBE, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_CUBE, 0, 0, GLSL_TYPE_INT); > -DECL_TYPE(iimageBuffer, GL_INT_IMAGE_BUFFER, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_BUF, 0, 0, GLSL_TYPE_INT); > -DECL_TYPE(iimage1DArray, GL_INT_IMAGE_1D_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_1D, 0, 1, GLSL_TYPE_INT); > -DECL_TYPE(iimage2DArray, GL_INT_IMAGE_2D_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_2D, 0, 1, GLSL_TYPE_INT); > -DECL_TYPE(iimageCubeArray, GL_INT_IMAGE_CUBE_MAP_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_CUBE, 0, 1, GLSL_TYPE_INT); > -DECL_TYPE(iimage2DMS, GL_INT_IMAGE_2D_MULTISAMPLE, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_MS, 0, 0, GLSL_TYPE_INT); > -DECL_TYPE(iimage2DMSArray, GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_MS, 0, 1, GLSL_TYPE_INT); > -DECL_TYPE(uimage1D, GL_UNSIGNED_INT_IMAGE_1D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_UINT); > -DECL_TYPE(uimage2D, GL_UNSIGNED_INT_IMAGE_2D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_2D, 0, 0, GLSL_TYPE_UINT); > -DECL_TYPE(uimage3D, GL_UNSIGNED_INT_IMAGE_3D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_3D, 0, 0, GLSL_TYPE_UINT); > -DECL_TYPE(uimage2DRect, GL_UNSIGNED_INT_IMAGE_2D_RECT, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_RECT, 0, 0, GLSL_TYPE_UINT); > -DECL_TYPE(uimageCube, GL_UNSIGNED_INT_IMAGE_CUBE, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_CUBE, 0, 0, GLSL_TYPE_UINT); > -DECL_TYPE(uimageBuffer, GL_UNSIGNED_INT_IMAGE_BUFFER, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_BUF, 0, 0, GLSL_TYPE_UINT); > -DECL_TYPE(uimage1DArray, GL_UNSIGNED_INT_IMAGE_1D_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_1D, 0, 1, GLSL_TYPE_UINT); > -DECL_TYPE(uimage2DArray, GL_UNSIGNED_INT_IMAGE_2D_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_2D, 0, 1, GLSL_TYPE_UINT); > -DECL_TYPE(uimageCubeArray, GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_CUBE, 0, 1, GLSL_TYPE_UINT); > -DECL_TYPE(uimage2DMS, GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_MS, 0, 0, GLSL_TYPE_UINT); > -DECL_TYPE(uimage2DMSArray, GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_MS, 0, 1, GLSL_TYPE_UINT); > +DECL_TYPE(image1D, GL_IMAGE_1D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_FLOAT) > +DECL_TYPE(image2D, GL_IMAGE_2D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_2D, 0, 0, GLSL_TYPE_FLOAT) > +DECL_TYPE(image3D, GL_IMAGE_3D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_3D, 0, 0, GLSL_TYPE_FLOAT) > +DECL_TYPE(image2DRect, GL_IMAGE_2D_RECT, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_RECT, 0, 0, GLSL_TYPE_FLOAT) > +DECL_TYPE(imageCube, GL_IMAGE_CUBE, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_CUBE, 0, 0, GLSL_TYPE_FLOAT) > +DECL_TYPE(imageBuffer, GL_IMAGE_BUFFER, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_BUF, 0, 0, GLSL_TYPE_FLOAT) > +DECL_TYPE(image1DArray, GL_IMAGE_1D_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_1D, 0, 1, GLSL_TYPE_FLOAT) > +DECL_TYPE(image2DArray, GL_IMAGE_2D_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_2D, 0, 1, GLSL_TYPE_FLOAT) > +DECL_TYPE(imageCubeArray, GL_IMAGE_CUBE_MAP_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_CUBE, 0, 1, GLSL_TYPE_FLOAT) > +DECL_TYPE(image2DMS, GL_IMAGE_2D_MULTISAMPLE, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_MS, 0, 0, GLSL_TYPE_FLOAT) > +DECL_TYPE(image2DMSArray, GL_IMAGE_2D_MULTISAMPLE_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_MS, 0, 1, GLSL_TYPE_FLOAT) > +DECL_TYPE(iimage1D, GL_INT_IMAGE_1D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_INT) > +DECL_TYPE(iimage2D, GL_INT_IMAGE_2D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_2D, 0, 0, GLSL_TYPE_INT) > +DECL_TYPE(iimage3D, GL_INT_IMAGE_3D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_3D, 0, 0, GLSL_TYPE_INT) > +DECL_TYPE(iimage2DRect, GL_INT_IMAGE_2D_RECT, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_RECT, 0, 0, GLSL_TYPE_INT) > +DECL_TYPE(iimageCube, GL_INT_IMAGE_CUBE, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_CUBE, 0, 0, GLSL_TYPE_INT) > +DECL_TYPE(iimageBuffer, GL_INT_IMAGE_BUFFER, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_BUF, 0, 0, GLSL_TYPE_INT) > +DECL_TYPE(iimage1DArray, GL_INT_IMAGE_1D_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_1D, 0, 1, GLSL_TYPE_INT) > +DECL_TYPE(iimage2DArray, GL_INT_IMAGE_2D_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_2D, 0, 1, GLSL_TYPE_INT) > +DECL_TYPE(iimageCubeArray, GL_INT_IMAGE_CUBE_MAP_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_CUBE, 0, 1, GLSL_TYPE_INT) > +DECL_TYPE(iimage2DMS, GL_INT_IMAGE_2D_MULTISAMPLE, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_MS, 0, 0, GLSL_TYPE_INT) > +DECL_TYPE(iimage2DMSArray, GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_MS, 0, 1, GLSL_TYPE_INT) > +DECL_TYPE(uimage1D, GL_UNSIGNED_INT_IMAGE_1D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_UINT) > +DECL_TYPE(uimage2D, GL_UNSIGNED_INT_IMAGE_2D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_2D, 0, 0, GLSL_TYPE_UINT) > +DECL_TYPE(uimage3D, GL_UNSIGNED_INT_IMAGE_3D, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_3D, 0, 0, GLSL_TYPE_UINT) > +DECL_TYPE(uimage2DRect, GL_UNSIGNED_INT_IMAGE_2D_RECT, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_RECT, 0, 0, GLSL_TYPE_UINT) > +DECL_TYPE(uimageCube, GL_UNSIGNED_INT_IMAGE_CUBE, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_CUBE, 0, 0, GLSL_TYPE_UINT) > +DECL_TYPE(uimageBuffer, GL_UNSIGNED_INT_IMAGE_BUFFER, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_BUF, 0, 0, GLSL_TYPE_UINT) > +DECL_TYPE(uimage1DArray, GL_UNSIGNED_INT_IMAGE_1D_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_1D, 0, 1, GLSL_TYPE_UINT) > +DECL_TYPE(uimage2DArray, GL_UNSIGNED_INT_IMAGE_2D_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_2D, 0, 1, GLSL_TYPE_UINT) > +DECL_TYPE(uimageCubeArray, GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_CUBE, 0, 1, GLSL_TYPE_UINT) > +DECL_TYPE(uimage2DMS, GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_MS, 0, 0, GLSL_TYPE_UINT) > +DECL_TYPE(uimage2DMSArray, GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY, > GLSL_TYPE_IMAGE, GLSL_SAMPLER_DIM_MS, 0, 1, GLSL_TYPE_UINT) > > DECL_TYPE(atomic_uint, GL_UNSIGNED_INT_ATOMIC_COUNTER, > GLSL_TYPE_ATOMIC_UINT, 1, 1) > > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
