diff options
6 files changed, 11 insertions, 11 deletions
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp index 5021fe299fb..d77dffb98c8 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp +++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp @@ -31,10 +31,6 @@ #pragma warning(disable: 4800 4146 4244 4267 4355 4996) #endif -#include "jit_api.h" -#include "JitManager.h" -#include "fetch_jit.h" - #pragma push_macro("DEBUG") #undef DEBUG @@ -57,6 +53,10 @@ #pragma pop_macro("DEBUG") +#include "JitManager.h" +#include "jit_api.h" +#include "fetch_jit.h" + #include "core/state.h" #include "state_llvm.h" diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h index 7c0eaa9c31d..ed7216b89f4 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h +++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h @@ -29,9 +29,6 @@ ******************************************************************************/ #pragma once -#include "common/os.h" -#include "common/isa.hpp" - #if defined(_WIN32) #pragma warning(disable : 4146 4244 4267 4800 4996) #endif @@ -84,6 +81,9 @@ using PassManager = llvm::legacy::PassManager; #include "llvm/Support/DynamicLibrary.h" +#include "common/os.h" +#include "common/isa.hpp" + #pragma pop_macro("DEBUG") ////////////////////////////////////////////////////////////////////////// diff --git a/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp index 2fd011fcb94..76a58b652fd 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp +++ b/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp @@ -27,9 +27,9 @@ * Notes: * ******************************************************************************/ +#include "builder.h" #include "jit_api.h" #include "blend_jit.h" -#include "builder.h" #include "state_llvm.h" #include <sstream> diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder.cpp b/src/gallium/drivers/swr/rasterizer/jitter/builder.cpp index 6ee4d857326..4fc5af7f446 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/builder.cpp +++ b/src/gallium/drivers/swr/rasterizer/jitter/builder.cpp @@ -64,7 +64,7 @@ namespace SwrJit mSimdInt64Ty = VectorType::get(mInt64Ty, mVWidth); mSimdFP16Ty = VectorType::get(mFP16Ty, mVWidth); mSimdFP32Ty = VectorType::get(mFP32Ty, mVWidth); - mSimdVectorTy = StructType::get(pJitMgr->mContext, std::vector<Type*>(4, mSimdFP32Ty), false); + mSimdVectorTy = ArrayType::get(mSimdFP32Ty, 4); mSimdVectorTRTy = StructType::get(pJitMgr->mContext, std::vector<Type*>(5, mSimdFP32Ty), false); if (sizeof(uint32_t*) == 4) diff --git a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp index 984aab67cd6..901bce69468 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp +++ b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp @@ -27,9 +27,9 @@ * Notes: * ******************************************************************************/ +#include "builder.h" #include "jit_api.h" #include "fetch_jit.h" -#include "builder.h" #include "state_llvm.h" #include <sstream> #include <tuple> diff --git a/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp index c4fb3724c7c..793e5ec01ea 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp +++ b/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp @@ -27,9 +27,9 @@ * Notes: * ******************************************************************************/ +#include "builder.h" #include "jit_api.h" #include "streamout_jit.h" -#include "builder.h" #include "state_llvm.h" #include "llvm/IR/DataLayout.h" |