summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar bunnei2019-04-07 17:58:27 -0400
committerGravatar GitHub2019-04-07 17:58:27 -0400
commitf14328bf0a420dd4e9b4500023a9ae2493eaab08 (patch)
tree5e1e2659476e1465cff39fee3d6e2262040e7c97 /src/video_core
parentMerge pull request #2355 from ReinUsesLisp/sync-point (diff)
parentPermit a Null Shader in case of a bad host_ptr. (diff)
downloadyuzu-f14328bf0a420dd4e9b4500023a9ae2493eaab08.tar.gz
yuzu-f14328bf0a420dd4e9b4500023a9ae2493eaab08.tar.xz
yuzu-f14328bf0a420dd4e9b4500023a9ae2493eaab08.zip
Merge pull request #2300 from FernandoS27/null-shader
shader_cache: Permit a Null Shader in case of a bad host_ptr.
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_cache.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index 7030db365..ab381932c 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -39,6 +39,10 @@ GPUVAddr GetShaderAddress(Maxwell::ShaderProgram program) {
39/// Gets the shader program code from memory for the specified address 39/// Gets the shader program code from memory for the specified address
40ProgramCode GetShaderCode(const u8* host_ptr) { 40ProgramCode GetShaderCode(const u8* host_ptr) {
41 ProgramCode program_code(VideoCommon::Shader::MAX_PROGRAM_LENGTH); 41 ProgramCode program_code(VideoCommon::Shader::MAX_PROGRAM_LENGTH);
42 ASSERT_OR_EXECUTE(host_ptr != nullptr, {
43 std::fill(program_code.begin(), program_code.end(), 0);
44 return program_code;
45 });
42 std::memcpy(program_code.data(), host_ptr, program_code.size() * sizeof(u64)); 46 std::memcpy(program_code.data(), host_ptr, program_code.size() * sizeof(u64));
43 return program_code; 47 return program_code;
44} 48}