diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2019-08-07 14:31:17 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2019-08-07 14:31:17 +0300 |
commit | 1fcc5adc60097d1245ade154986bb67bf9cdb926 (patch) | |
tree | e77a9e5a961a9f9687a5efdd6b470ff9d25b807c /source/blender/gpu/intern/gpu_context.cpp | |
parent | fa7643bc7bf815a61a57a03f6e42371269d4208b (diff) | |
parent | 5350015d519ec299b9a8937e4e035fe405001d8d (diff) |
Merge branch 'soc-2019-openxr' into temp-vr-draw-threadtemp-vr-draw-thread
Diffstat (limited to 'source/blender/gpu/intern/gpu_context.cpp')
-rw-r--r-- | source/blender/gpu/intern/gpu_context.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/gpu/intern/gpu_context.cpp b/source/blender/gpu/intern/gpu_context.cpp index 12a5748b198..93df65006ff 100644 --- a/source/blender/gpu/intern/gpu_context.cpp +++ b/source/blender/gpu/intern/gpu_context.cpp @@ -90,12 +90,7 @@ struct GPUContext { } }; -#if defined(_MSC_VER) && (_MSC_VER == 1800) -# define thread_local __declspec(thread) -thread_local GPUContext *active_ctx = NULL; -#else static thread_local GPUContext *active_ctx = NULL; -#endif static void orphans_add(GPUContext *ctx, std::vector<GLuint> *orphan_list, GLuint id) { |