diff options
| author | Stenzek <stenzek@users.noreply.github.com> | 2018-05-22 13:52:26 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 13:52:26 +1000 |
| commit | 7eaba154a41c72826d4c660753386421f21336d7 (patch) | |
| tree | d47658663579320c3ec9cbf1e4432ff5d07877af /Source/Core/VideoBackends/OGL/TextureConverter.cpp | |
| parent | f64bd401b692fae42dbc3894d5213b55f5517fdd (diff) | |
| parent | f74dbc794c124e6f1c5d5f60ff1d6fe65acc379f (diff) | |
Merge pull request #6936 from stenzek/copy-filter-depth-fix
EFB2RAM: Apply copy filter as a float coefficient after sampling
Diffstat (limited to 'Source/Core/VideoBackends/OGL/TextureConverter.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/TextureConverter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index 615cc9e1c7..699e988196 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -50,7 +50,7 @@ std::unique_ptr<AbstractStagingTexture> s_encoding_readback_texture; const int renderBufferWidth = EFB_WIDTH * 4; const int renderBufferHeight = 1024; -} +} // namespace static EncodingProgram& GetOrCreateEncodingShader(const EFBCopyParams& params) { @@ -158,7 +158,7 @@ void EncodeToRamFromTexture(u8* dest_ptr, const EFBCopyParams& params, u32 nativ glUniform1f(texconv_shader.y_scale_uniform, y_scale); glUniform1f(texconv_shader.gamma_rcp_uniform, 1.0f / gamma); glUniform2f(texconv_shader.clamp_tb_uniform, clamp_top, clamp_bottom); - glUniform3i(texconv_shader.filter_coefficients_uniform, filter_coefficients[0], + glUniform3f(texconv_shader.filter_coefficients_uniform, filter_coefficients[0], filter_coefficients[1], filter_coefficients[2]); const GLuint read_texture = params.depth ? @@ -171,6 +171,6 @@ void EncodeToRamFromTexture(u8* dest_ptr, const EFBCopyParams& params, u32 nativ g_renderer->RestoreAPIState(); } -} // namespace +} // namespace TextureConverter } // namespace OGL |
