From 8a4e562b3964433d98d8272c458e82d6abcb6708 Mon Sep 17 00:00:00 2001 From: Cory Bloor Date: Wed, 13 Apr 2016 01:13:13 -0600 Subject: [PATCH 1/2] Update ReplayRenderer_SetFrameEvent on Linux These signature changes were missed during the removal of multi-frame support on Linux in 70b99a4412d1769bae4c6a9631521a6183a94786. --- renderdoccmd/renderdoccmd_linux.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renderdoccmd/renderdoccmd_linux.cpp b/renderdoccmd/renderdoccmd_linux.cpp index 3d2e5d1e5..3b4eb1f5d 100644 --- a/renderdoccmd/renderdoccmd_linux.cpp +++ b/renderdoccmd/renderdoccmd_linux.cpp @@ -120,7 +120,7 @@ void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay displayCfg) switch (event->response_type & 0x7f) { case XCB_EXPOSE: - ReplayRenderer_SetFrameEvent(renderer, 0, 10000000+rand()%1000, true); + ReplayRenderer_SetFrameEvent(renderer, 10000000+rand()%1000, true); ReplayOutput_Display(out); break; case XCB_CLIENT_MESSAGE: @@ -147,7 +147,7 @@ void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay displayCfg) free(event); } - ReplayRenderer_SetFrameEvent(renderer, 0, 10000000+rand()%1000, true); + ReplayRenderer_SetFrameEvent(renderer, 10000000+rand()%1000, true); ReplayOutput_Display(out); usleep(100000); From a95b69b28ab3718f0196f0e6d08847b8f7f10925 Mon Sep 17 00:00:00 2001 From: Cory Bloor Date: Wed, 13 Apr 2016 01:39:17 -0600 Subject: [PATCH 2/2] Fix -Wswitch compiler warning eResType_Count is not meant to be used, but with -Wswitch and -Werror enabled, the fact that it's missing from the switch statement is a compile error. --- renderdoc/driver/gl/gl_driver.cpp | 3 +++ renderdoc/driver/gl/gl_replay.cpp | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index c7f76b701..eda7bf36f 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -4264,6 +4264,9 @@ void WrappedOpenGL::AddUsage(FetchDrawcall d) texList = rs.TexCubeArray; listSize = sizeof(rs.TexCubeArray); break; + case eResType_Count: + RDCASSERT(false); + break; } if(texList != NULL && bind >= 0 && bind < listSize && texList[bind] != 0) diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp index 1817ff914..93473bfe3 100644 --- a/renderdoc/driver/gl/gl_replay.cpp +++ b/renderdoc/driver/gl/gl_replay.cpp @@ -1219,6 +1219,9 @@ void GLReplay::SavePipelineState() case eResType_TextureCubeArray: target = eGL_TEXTURE_CUBE_MAP_ARRAY; break; + case eResType_Count: + RDCASSERT(false); + break; } if(target != eGL_NONE) @@ -2684,6 +2687,11 @@ ResourceId GLReplay::CreateProxyTexture(FetchTexture templateTex) gl.glTextureStorage3DEXT(tex, eGL_TEXTURE_CUBE_MAP_ARRAY, templateTex.mips, intFormat, templateTex.width, templateTex.height, templateTex.arraysize); break; } + case eResType_Count: + { + RDCASSERT(false); + break; + } } if(templateTex.customName)