diff options
| author | Connor McLaughlin <stenzek@gmail.com> | 2019-07-28 14:24:32 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-28 14:24:32 +1000 |
| commit | b0113b6c64a7807e35cfd9dd597d3c5e77b4ceda (patch) | |
| tree | 244173481164a0629c23d80893150a65f8a1c785 /Source/Core/VideoBackends/D3D/Render.cpp | |
| parent | 5bad233b1a25f817effa008b27c7e70db144ba9d (diff) | |
| parent | aca02f9734806572183d87b9432e8855adfa132d (diff) | |
Merge pull request #8266 from lioncash/shadowing
D3DCommon/Shader: Use std::optional where applicable
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/Render.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index c37871b5fb..e058bd1c66 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -115,11 +115,11 @@ std::unique_ptr<AbstractFramebuffer> Renderer::CreateFramebuffer(AbstractTexture std::unique_ptr<AbstractShader> Renderer::CreateShaderFromSource(ShaderStage stage, std::string_view source) { - DXShader::BinaryData bytecode; - if (!DXShader::CompileShader(D3D::feature_level, &bytecode, stage, source)) + auto bytecode = DXShader::CompileShader(D3D::feature_level, stage, source); + if (!bytecode) return nullptr; - return DXShader::CreateFromBytecode(stage, std::move(bytecode)); + return DXShader::CreateFromBytecode(stage, std::move(*bytecode)); } std::unique_ptr<AbstractShader> Renderer::CreateShaderFromBinary(ShaderStage stage, |
