VirtualBox

Changeset 98416 in vbox for trunk/src/VBox/Additions/3D/mesa


Ignore:
Timestamp:
Feb 1, 2023 4:25:17 PM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
155660
Message:

Additions/*.kmk: Automatic scm cleanups. bugref:10348

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Additions/3D/mesa/Makefile.kmk

    r98103 r98416  
    3333#
    3434ifndef VBOX_MESA3D_CONFIG_KMK_INCLUDED
    35 include $(PATH_SUB_CURRENT)/../Config.kmk
     35 include $(PATH_SUB_CURRENT)/../Config.kmk
    3636endif
    3737
     
    6363TEMPLATE_VBoxMesa3DGuestR3Lib_INST          = $(INST_ADDITIONS_LIB)
    6464ifeq ($(KBUILD_TARGET),win)
    65 # Do not treat warnings as errors, because Mesa code produces too many warnings with MSC.
    66 TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS        = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS))
    67 TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS      = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CXXFLAGS))
    68 #  -wd4005: vcc120: '__useHeader' : macro redefinition
    69 #  -wd4018: signed/unsigned mismatch
    70 #  -wd4054: 'type cast' : from function pointer to data pointer 'void *'
    71 #  -wd4057: 'function' : 'int *' differs in indirection to slightly different base types from 'uint32_t *'
    72 #  -wd4090: 'function' : different 'const' qualifiers
    73 #  -wd4098: 'void' function returning a value
    74 #  -wd4099: 'st_src_reg' : type name first seen using 'class' now seen using 'struct'
    75 #  -wd4100: unreferenced formal parameter
    76 #  -wd4101: unreferenced local variable
    77 #  -wd4130: '==' : logical operation on address of string constant
    78 #  -wd4132: 'color' : const object should be initialized
    79 #  -wd4146: unary minus operator applied to unsigned type, result still unsigned
    80 #  -wd4152: nonstandard extension, function/data pointer conversion in expression
    81 #  -wd4189: 'signo' : local variable is initialized but not referenced
    82 #  -wd4200: nonstandard extension used : zero-sized array in struct/union
    83 #  -wd4204: nonstandard extension used : non-constant aggregate initializer
    84 #  -wd4206: nonstandard extension used : translation unit is empty
    85 #  -wd4211: nonstandard extension used : redefined extern to static
    86 #  -wd4221: nonstandard extension used : 'tokens' : cannot be initialized using address of automatic variable 'tokens'
    87 #  -wd4245: '=' : conversion from 'int' to 'unsigned int', signed/unsigned mismatch
    88 #  -wd4255: no function prototype given
    89 #  -wd4258: 'i' : definition from the for loop is ignored; the definition from the enclosing scope is used
    90 #  -wd4265: 'ir_variable_refcount_visitor' : class has virtual functions, but destructor is not virtual
    91 #  -wd4267: '=' : conversion from 'size_t' to 'unsigned int', possible loss of data
    92 #  -wd4266: 'void ir_visitor::visit(ir_rvalue *)' : no override available for virtual member function from base 'ir_visitor'; function is hidden
    93 #  -wd4287: unsigned/negative constant mismatch
    94 #  -wd4291: 'void *exec_node::operator new(size_t,void *)' : no matching operator delete found; memory will not be freed if initialization throws an exception
    95 #  -wd4305: truncation from 'double' to 'const float'
    96 #  -wd4306: 'type cast' : conversion from 'int' to 'void *' of greater size
    97 #  -wd4310: cast truncates constant value
    98 #  -wd4311: 'type cast' : pointer truncation from 'void *' to 'unsigned long'
    99 #  -wd4351: new behavior: elements of array '_mesa_glsl_parse_state::cs_input_local_size' will be default initialized
    100 #  -wd4355: 'this' : used in base member initializer list
    101 #  -wd4388: '==' : signed/unsigned mismatch
    102 #  -wd4389: '==' : signed/unsigned mismatch
    103 #  -wd4640: 'ts' : construction of local static object is not thread-safe
    104 #  -wd4668: '__STDC_VERSION__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
    105 #  -wd4700: uninitialized local variable 'tmp' used
    106 #  -wd4701: potentially uninitialized local variable 'query' used
    107 #  -wd4702: unreachable code
    108 #  -wd4703: vcc120: potentially uninitialized local pointer variable 'gen_func' used
    109 #  -wd4756: overflow in constant arithmetic
    110 #  -wd4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
    111 #  -wd4805: '|=' : unsafe mix of type 'GLboolean' and type 'bool' in operation
    112 #  -wd4918: 'y' : invalid character in pragma optimization list
    113 VBOX_MESA3D_VCC_DISABLED_WARNINGS          := \
    114         -wd4005 -wd4018 -wd4054 -wd4057 -wd4090 -wd4098 -wd4099 -wd4100 -wd4101 -wd4130 -wd4132 -wd4146 \
    115         -wd4152 -wd4189 -wd4200 -wd4204 -wd4206 -wd4211 -wd4221 -wd4245 -wd4255 -wd4258 -wd4265 -wd4267 -wd4266 \
    116         -wd4287 -wd4291 -wd4305 -wd4306 -wd4310 -wd4311 -wd4351 -wd4355 -wd4388 -wd4389 -wd4640 -wd4668 -wd4700 \
    117         -wd4701 -wd4702 -wd4703 -wd4756 -wd4800 -wd4805 -wd4918
    118 # -wd4458: declaration of 'array' hides class member
    119 # -wd4477: 'fprintf' : format string '%u' requires an argument of type 'unsigned int', but variadic argument 1 has type 'LONGLONG'
    120 # -wd4774: 'printf' : format string expected in argument 1 is not a string literal
    121 # -wd4456: declaration of 'pos_dst' hides previous local declaration
    122 # -wd4777: '_snprintf' : format string '%u' requires an argument of type 'unsigned int', but variadic argument 1 has type 'const DWORD'
    123 # -wd4459: declaration of 'stw_dev' hides global declaration
    124 # -wd4457: declaration of 'usage' hides function parameter
    125 VBOX_MESA3D_VCC_DISABLED_WARNINGS          += \
    126         -wd4458 -wd4477 -wd4774 -wd4456 -wd4777 -wd4459 -wd4457
    127 # -wd4254: '=': conversion from 'unsigned int':'3' to 'unsigned int':'2', possible loss of data
    128 # -wd5039: pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception
    129 # -wd5204: class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly
    130 # -wd5219: implicit conversion from 'int' to 'float', possible loss of data
    131 VBOX_MESA3D_VCC_DISABLED_WARNINGS          += \
    132         -wd4254 -wd5039 -wd5204 -wd5219
    133 
    134 TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS.win   += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS)
    135 TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS.win += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS)
     65 # Do not treat warnings as errors, because Mesa code produces too many warnings with MSC.
     66 TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS       = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS))
     67 TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS     = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CXXFLAGS))
     68 #  -wd4005: vcc120: '__useHeader' : macro redefinition
     69 #  -wd4018: signed/unsigned mismatch
     70 #  -wd4054: 'type cast' : from function pointer to data pointer 'void *'
     71 #  -wd4057: 'function' : 'int *' differs in indirection to slightly different base types from 'uint32_t *'
     72 #  -wd4090: 'function' : different 'const' qualifiers
     73 #  -wd4098: 'void' function returning a value
     74 #  -wd4099: 'st_src_reg' : type name first seen using 'class' now seen using 'struct'
     75 #  -wd4100: unreferenced formal parameter
     76 #  -wd4101: unreferenced local variable
     77 #  -wd4130: '==' : logical operation on address of string constant
     78 #  -wd4132: 'color' : const object should be initialized
     79 #  -wd4146: unary minus operator applied to unsigned type, result still unsigned
     80 #  -wd4152: nonstandard extension, function/data pointer conversion in expression
     81 #  -wd4189: 'signo' : local variable is initialized but not referenced
     82 #  -wd4200: nonstandard extension used : zero-sized array in struct/union
     83 #  -wd4204: nonstandard extension used : non-constant aggregate initializer
     84 #  -wd4206: nonstandard extension used : translation unit is empty
     85 #  -wd4211: nonstandard extension used : redefined extern to static
     86 #  -wd4221: nonstandard extension used : 'tokens' : cannot be initialized using address of automatic variable 'tokens'
     87 #  -wd4245: '=' : conversion from 'int' to 'unsigned int', signed/unsigned mismatch
     88 #  -wd4255: no function prototype given
     89 #  -wd4258: 'i' : definition from the for loop is ignored; the definition from the enclosing scope is used
     90 #  -wd4265: 'ir_variable_refcount_visitor' : class has virtual functions, but destructor is not virtual
     91 #  -wd4267: '=' : conversion from 'size_t' to 'unsigned int', possible loss of data
     92 #  -wd4266: 'void ir_visitor::visit(ir_rvalue *)' : no override available for virtual member function from base 'ir_visitor'; function is hidden
     93 #  -wd4287: unsigned/negative constant mismatch
     94 #  -wd4291: 'void *exec_node::operator new(size_t,void *)' : no matching operator delete found; memory will not be freed if initialization throws an exception
     95 #  -wd4305: truncation from 'double' to 'const float'
     96 #  -wd4306: 'type cast' : conversion from 'int' to 'void *' of greater size
     97 #  -wd4310: cast truncates constant value
     98 #  -wd4311: 'type cast' : pointer truncation from 'void *' to 'unsigned long'
     99 #  -wd4351: new behavior: elements of array '_mesa_glsl_parse_state::cs_input_local_size' will be default initialized
     100 #  -wd4355: 'this' : used in base member initializer list
     101 #  -wd4388: '==' : signed/unsigned mismatch
     102 #  -wd4389: '==' : signed/unsigned mismatch
     103 #  -wd4640: 'ts' : construction of local static object is not thread-safe
     104 #  -wd4668: '__STDC_VERSION__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
     105 #  -wd4700: uninitialized local variable 'tmp' used
     106 #  -wd4701: potentially uninitialized local variable 'query' used
     107 #  -wd4702: unreachable code
     108 #  -wd4703: vcc120: potentially uninitialized local pointer variable 'gen_func' used
     109 #  -wd4756: overflow in constant arithmetic
     110 #  -wd4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
     111 #  -wd4805: '|=' : unsafe mix of type 'GLboolean' and type 'bool' in operation
     112 #  -wd4918: 'y' : invalid character in pragma optimization list
     113 VBOX_MESA3D_VCC_DISABLED_WARNINGS         := \
     114        -wd4005 -wd4018 -wd4054 -wd4057 -wd4090 -wd4098 -wd4099 -wd4100 -wd4101 -wd4130 -wd4132 -wd4146 \
     115        -wd4152 -wd4189 -wd4200 -wd4204 -wd4206 -wd4211 -wd4221 -wd4245 -wd4255 -wd4258 -wd4265 -wd4267 -wd4266 \
     116        -wd4287 -wd4291 -wd4305 -wd4306 -wd4310 -wd4311 -wd4351 -wd4355 -wd4388 -wd4389 -wd4640 -wd4668 -wd4700 \
     117        -wd4701 -wd4702 -wd4703 -wd4756 -wd4800 -wd4805 -wd4918
     118 # -wd4458: declaration of 'array' hides class member
     119 # -wd4477: 'fprintf' : format string '%u' requires an argument of type 'unsigned int', but variadic argument 1 has type 'LONGLONG'
     120 # -wd4774: 'printf' : format string expected in argument 1 is not a string literal
     121 # -wd4456: declaration of 'pos_dst' hides previous local declaration
     122 # -wd4777: '_snprintf' : format string '%u' requires an argument of type 'unsigned int', but variadic argument 1 has type 'const DWORD'
     123 # -wd4459: declaration of 'stw_dev' hides global declaration
     124 # -wd4457: declaration of 'usage' hides function parameter
     125 VBOX_MESA3D_VCC_DISABLED_WARNINGS         += \
     126        -wd4458 -wd4477 -wd4774 -wd4456 -wd4777 -wd4459 -wd4457
     127 # -wd4254: '=': conversion from 'unsigned int':'3' to 'unsigned int':'2', possible loss of data
     128 # -wd5039: pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception
     129 # -wd5204: class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly
     130 # -wd5219: implicit conversion from 'int' to 'float', possible loss of data
     131 VBOX_MESA3D_VCC_DISABLED_WARNINGS         += \
     132        -wd4254 -wd5039 -wd5204 -wd5219
     133
     134 TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS.win  += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS)
     135 TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS.win += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS)
    136136endif
    137137TEMPLATE_VBoxMesa3DGuestR3Lib_INCS          = \
     
    150150        $(VBOX_MESA)/src/gallium/state_trackers/wgl
    151151ifdef VBOX_WITH_NOCRT_STATIC
    152 TEMPLATE_VBoxMesa3DGuestR3Lib_INCS         += \
    153         $(TEMPLATE_VBoxMesa3DGuestR3Dll_INCS)
     152 TEMPLATE_VBoxMesa3DGuestR3Lib_INCS        += \
     153        $(TEMPLATE_VBoxMesa3DGuestR3Dll_INCS)
    154154endif
    155155ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    156 TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS          = \
    157         $(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS) \
    158         PACKAGE_VERSION="$(VBOX_MESA)" \
    159         PACKAGE_BUGREPORT="$(VBOX_MESA)"
     156 TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS         = \
     157        $(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS) \
     158        PACKAGE_VERSION="$(VBOX_MESA)" \
     159        PACKAGE_BUGREPORT="$(VBOX_MESA)"
    160160else
    161 TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS          = \
    162         $(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS) \
    163         PACKAGE_VERSION=\"$(VBOX_MESA)\" \
    164         PACKAGE_BUGREPORT=\"$(VBOX_MESA)\"
     161 TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS         = \
     162        $(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS) \
     163        PACKAGE_VERSION=\"$(VBOX_MESA)\" \
     164        PACKAGE_BUGREPORT=\"$(VBOX_MESA)\"
    165165endif
    166166# For wgl, glapi and mesa
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette