diff options
| author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2020-04-24 14:54:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 14:54:45 +0200 |
| commit | 6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0 (patch) | |
| tree | 6163449db6bf315f86afff9f1d5f1dac1fad48c6 /src/video_core | |
| parent | Merge pull request #3760 from Morph1984/trailing-filedir-separator (diff) | |
| parent | Fix -Wdeprecated-copy warning. (diff) | |
| download | yuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.tar yuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.tar.gz yuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.tar.bz2 yuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.tar.lz yuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.tar.xz yuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.tar.zst yuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.zip | |
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 1 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/fixed_pipeline_state.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index 7231597d4..73d98fe8c 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h @@ -655,6 +655,7 @@ union Instruction { } constexpr Instruction(u64 value) : value{value} {} + constexpr Instruction(const Instruction& instr) : value(instr.value) {} BitField<0, 8, Register> gpr0; BitField<8, 8, Register> gpr8; diff --git a/src/video_core/renderer_vulkan/fixed_pipeline_state.h b/src/video_core/renderer_vulkan/fixed_pipeline_state.h index 9fe6bdbf9..9a950f4de 100644 --- a/src/video_core/renderer_vulkan/fixed_pipeline_state.h +++ b/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; } |