Merge pull request #245 from cgmb/fix-linux-build

Fix Linux build
This commit is contained in:
Baldur Karlsson committed 2016-04-13 10:27:54 +02:00
commit 8821ce3778
3 files changed
+13 -2

No files matched your search

+3
View File
@@ -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)
+8
View File
@@ -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)
+2 -2
View File
@@ -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);