Browse Source

dxgsg9: fix type mismatch in min() call

rdb 7 years ago
parent
commit
b7f8ddfe35
1 changed files with 1 additions and 1 deletions
  1. 1 1
      panda/src/dxgsg9/dxShaderContext9.cxx

+ 1 - 1
panda/src/dxgsg9/dxShaderContext9.cxx

@@ -207,7 +207,7 @@ issue_parameters(GSG *gsg, int altered) {
 
 
         // Calculate how many elements to transfer; no more than it expects,
         // Calculate how many elements to transfer; no more than it expects,
         // but certainly no more than we have.
         // but certainly no more than we have.
-        int input_size = min(abs(spec._dim[0] * spec._dim[1] * spec._dim[2]), ptr_data->_size);
+        int input_size = min(abs(spec._dim[0] * spec._dim[1] * spec._dim[2]), (int)ptr_data->_size);
 
 
         CGparameter p = _cg_parameter_map[spec._id._seqno];
         CGparameter p = _cg_parameter_map[spec._id._seqno];
         switch (ptr_data->_type) {
         switch (ptr_data->_type) {