diff options
| author | Tim Rowley <[email protected]> | 2016-04-25 14:19:58 -0600 |
|---|---|---|
| committer | Tim Rowley <[email protected]> | 2016-05-05 14:48:55 -0500 |
| commit | 1eb211c4a4c31e5e46840435df90554fbc864adc (patch) | |
| tree | 3af8af87bd2572f1fc4248ceceadcac7e542dd8c /src/gallium | |
| parent | d97e333ea435906a1b0a50972cb942c68dd734a2 (diff) | |
swr: [rasterizer] Whitespace cleanup and misc changes
Reviewed-by: Bruce Cherniak <[email protected]>
Diffstat (limited to 'src/gallium')
5 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h index 180a0560822..7bfc66fde38 100644 --- 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 057eb92b67e..af317cc5fe3 100644 --- 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 b668eb47927..08261e74ed7 100644 --- 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 9b34592aaad..8dbfafde2d9 100644 --- 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 fb0319cc699..82ee20f73c1 100644 --- 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 { |