swr: [rasterizer] Whitespace cleanup and misc changes

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>

diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
index 180a05608221f8b5e6233b08e49dad26a13765ea..7bfc66fde38f5c96e76b0f5a29c58147cf5e9e7a 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/common/os.h
+++ b/src/gallium/drivers/swr/rasterizer/common/os.h
@@ -167,6 +167,7 @@ unsigned char _bittest(const LONG *a, LONG b)
 }
 
 #define GetCurrentProcessId getpid
+#define GetCurrentThreadId gettid
 
 #define CreateDirectory(name, pSecurity) mkdir(name, 0777)
 

diff --git a/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.h b/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.h
index 057eb92b67e501935cd40e4da26490171b9af593..af317cc5fe3371a3216102981249c9a30e554d8d 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.h
+++ b/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.h
@@ -30,7 +30,6 @@
 #pragma once
 
 #include "common/formats.h"
-#include "core/context.h"
 #include "core/state.h"
 
 struct RENDER_TARGET_BLEND_COMPILE_STATE

diff --git a/src/gallium/drivers/swr/rasterizer/jitter/jit_api.h b/src/gallium/drivers/swr/rasterizer/jitter/jit_api.h
index b668eb479273f55a0e577572d403088e5294edd8..08261e74ed70e29f4543432a5a2e07c9c0f877e5 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/jitter/jit_api.h
+++ b/src/gallium/drivers/swr/rasterizer/jitter/jit_api.h
@@ -63,7 +63,6 @@ struct JIT_COMPILE_INPUT
     bool enableJitSampler;
 };
 
-
 //////////////////////////////////////////////////////////////////////////
 /// @brief Create JIT context.
 HANDLE JITCALL JitCreateContext(uint32_t targetSimdWidth, const char* arch);

diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/knobs.template b/src/gallium/drivers/swr/rasterizer/scripts/templates/knobs.template
index 9b34592aaad95a38cbdc2c01ba67fa304b072a6b..8dbfafde2d9d42c676af2807f55095372b3aa648 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/scripts/templates/knobs.template
+++ b/src/gallium/drivers/swr/rasterizer/scripts/templates/knobs.template
@@ -116,7 +116,6 @@ extern GlobalKnobs g_GlobalKnobs;
 #define KNOB_${knob[0]}${space_knob(knob[0])} GET_KNOB(${knob[0]})
 % endfor
 
-
 % else:
 % for inc in includes:
 #include <${inc}>
@@ -135,7 +134,6 @@ GlobalKnobs::GlobalKnobs()
     % for knob in knobs:
     InitKnob(${knob[0]});
     % endfor
-
 }
 
 //========================================================
@@ -164,5 +162,4 @@ std::string GlobalKnobs::ToString(const char* optPerLinePrefix)
     return str.str();
 }
 
-
 % endif

diff --git a/src/gallium/drivers/swr/swr_state.h b/src/gallium/drivers/swr/swr_state.h
index fb0319cc699e9897fecd0117a2899085629891d6..82ee20f73c1451d90ed007196055226da346c62a 100644 (file)
--- a/src/gallium/drivers/swr/swr_state.h
+++ b/src/gallium/drivers/swr/swr_state.h
@@ -35,6 +35,7 @@
 #include "swr_tex_sample.h"
 #include "swr_shader.h"
 #include <unordered_map>
+#include <memory>
 
 template <typename T>
 struct ShaderVariant {