diff options
| author | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-07-08 12:10:14 +0200 |
|---|---|---|
| committer | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-07-08 12:10:14 +0200 |
| commit | 3bde3988ebb3663ce26794c61cea2c92e7b49eb5 (patch) | |
| tree | 92f7db7e794a180606a1dbf12ade9ab3ae2f7171 /Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp | |
| parent | 59c938d3a7e21a17d778f346fc9a5ad39159ce6e (diff) | |
| parent | a523a6d1bfabddbd2030dda1aebf28ddb28b5f26 (diff) | |
Merge pull request #576 from lioncash/shader-string
D3D: Use std::strings for Compile[x]Shader and CompileAndCreate[x]Shader
Diffstat (limited to 'Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp index 8393c2148c..fd1bd8a76d 100644 --- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp +++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp @@ -929,7 +929,7 @@ void PSTextureEncoder::Init() // Create vertex shader D3DBlob* bytecode = nullptr; - if (!D3D::CompileVertexShader(EFB_ENCODE_VS, sizeof(EFB_ENCODE_VS), &bytecode)) + if (!D3D::CompileVertexShader(EFB_ENCODE_VS, &bytecode)) { ERROR_LOG(VIDEO, "EFB encode vertex shader failed to compile"); return; @@ -1254,7 +1254,7 @@ bool PSTextureEncoder::SetStaticShader(unsigned int dstFormat, PEControl::PixelF { "IMP_GENERATOR", generatorFuncName }, { nullptr, nullptr } }; - if (!D3D::CompilePixelShader(EFB_ENCODE_PS, sizeof(EFB_ENCODE_PS), &bytecode, macros)) + if (!D3D::CompilePixelShader(EFB_ENCODE_PS, &bytecode, macros)) { WARN_LOG(VIDEO, "EFB encoder shader for dstFormat 0x%X, srcFormat %d, isIntensity %d, scaleByHalf %d failed to compile", dstFormat, static_cast<int>(srcFormat), isIntensity ? 1 : 0, scaleByHalf ? 1 : 0); @@ -1296,7 +1296,7 @@ bool PSTextureEncoder::InitDynamicMode() }; D3DBlob* bytecode = nullptr; - if (!D3D::CompilePixelShader(EFB_ENCODE_PS, sizeof(EFB_ENCODE_PS), &bytecode, macros)) + if (!D3D::CompilePixelShader(EFB_ENCODE_PS, &bytecode, macros)) { ERROR_LOG(VIDEO, "EFB encode pixel shader failed to compile"); return false; |