Browse Source

Fix -Werror=conversion error.

Markus Wick 6 years ago
parent
commit
c499c22cf7
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/common/bit_field.h
  2. 1 1
      src/video_core/renderer_vulkan/fixed_pipeline_state.h

+ 1 - 1
src/common/bit_field.h

@@ -180,7 +180,7 @@ public:
     }
 
     constexpr void Assign(const T& value) {
-        storage = (static_cast<StorageType>(storage) & ~mask) | FormatValue(value);
+        storage = static_cast<StorageType>((storage & ~mask) | FormatValue(value));
     }
 
     constexpr T Value() const {

+ 1 - 1
src/video_core/renderer_vulkan/fixed_pipeline_state.h

@@ -129,7 +129,7 @@ struct alignas(32) FixedPipelineState {
             auto& binding = bindings[index];
             binding.raw = 0;
             binding.enabled.Assign(enabled ? 1 : 0);
-            binding.stride.Assign(stride);
+            binding.stride.Assign(static_cast<u16>(stride));
             binding_divisors[index] = divisor;
         }