From e94726cbc128f810bd6162c51afe2816213344e7 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 22 Jul 2014 10:46:19 +0100 Subject: [PATCH] linux compile fixes --- renderdoc/common/common.cpp | 7 +++---- renderdoc/replay/replay_renderer.cpp | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/renderdoc/common/common.cpp b/renderdoc/common/common.cpp index 2ac9c353f..02f26c1bc 100644 --- a/renderdoc/common/common.cpp +++ b/renderdoc/common/common.cpp @@ -46,7 +46,7 @@ using std::string; // SRGB8_lookuptable[comp] = powf((0.055f + srgbF) / 1.055f, 2.4f); // } -extern float SRGB8_lookuptable[256] = { +float SRGB8_lookuptable[256] = { 0.000000f, 0.000304f, 0.000607f, 0.000911f, 0.001214f, 0.001518f, 0.001821f, 0.002125f, 0.002428f, 0.002732f, 0.003035f, 0.003347f, 0.003677f, 0.004025f, 0.004391f, 0.004777f, 0.005182f, 0.005605f, 0.006049f, 0.006512f, 0.006995f, 0.007499f, 0.008023f, 0.008568f, @@ -102,7 +102,9 @@ void rdcassert(const char *condition, const char *file, unsigned int line, const rdclog_int(RDCLog_Error, file, line, "Assertion failed: '%hs'", condition, file, line); } +#if 0 static __m128 zero = {0}; +#endif // assumes a and b both point to 16-byte aligned 16-byte chunks of memory. // Returns if they're equal or different @@ -160,9 +162,6 @@ bool FindDiffRange(void *a, void *b, size_t bufSize, size_t &diffStart, size_t & float *aflt = (float *)a; float *bflt = (float *)b; - // init a vector to 0 - __m128 zero = {0}; - // sweep to find the start of differences for(size_t v=0; v < numVecs; v++) { diff --git a/renderdoc/replay/replay_renderer.cpp b/renderdoc/replay/replay_renderer.cpp index 86ceced16..494d6a6c4 100644 --- a/renderdoc/replay/replay_renderer.cpp +++ b/renderdoc/replay/replay_renderer.cpp @@ -374,6 +374,7 @@ bool ReplayRenderer::PixelHistory(ResourceId target, uint32_t x, uint32_t y, rdc // read-only, not a valid pixel history event continue; + case eUsage_None: case eUsage_SO: case eUsage_CS_UAV: case eUsage_PS_UAV: