Build fix

A few things needed to be fixed: - Removed unused local variables in Sampler.cpp - Local tests showed that newly added files for ubsan build fix broke Mac and Windows builds. Moved files to Linux non debug only to fix the issue on all platforms. Change-Id: I4d6d0d162603fdf36c581e84e177e6d042bf2d6e Reviewed-on: https://swiftshader-review.googlesource.com/8268Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com>

Build fix
3ea9295f · Alexis Hetu · Alexis Hétu · 2f48bcb9 · 3ea9295f · 3ea9295f
Commit 3ea9295f authored Dec 06, 2016 by Alexis Hetu Committed by Alexis Hétu Dec 07, 2016
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

BUILD.gn src/OpenGL/libEGL/BUILD.gn +5 -2

Sampler.cpp src/Renderer/Sampler.cpp +0 -4

No files found.
--- a/src/OpenGL/libEGL/BUILD.gn
+++ b/src/OpenGL/libEGL/BUILD.gn
@@ -39,8 +39,6 @@ shared_library("swiftshader_libEGL") {
  }
  sources = [
-    "../../Renderer/Surface.cpp",
-    "../common/Image.cpp",
    "../common/Object.cpp",
    "Config.cpp",
    "Display.cpp",
@@ -54,6 +52,11 @@ shared_library("swiftshader_libEGL") {
  if (is_debug) {
    sources += [ "../common/debug.cpp" ]
+  } else if (is_linux) {
+    sources += [
+      "../../Renderer/Surface.cpp",
+      "../common/Image.cpp",
+    ]
  }
  if (is_mac) {

--- a/src/Renderer/Sampler.cpp
+++ b/src/Renderer/Sampler.cpp
@@ -126,10 +126,6 @@ namespace sw
 				int pitchP = surface->getInternalPitchP();
 				int sliceP = surface->getInternalSliceP();
-				int logWidth = log2(width);
-				int logHeight = log2(height);
-				int logDepth = log2(depth);
 				if(level == 0)
 				{
 					texture.widthHeightLOD[0] = width * exp2LOD;