diff options
author | George Kyriazis <[email protected]> | 2016-11-11 11:44:05 -0600 |
---|---|---|
committer | Tim Rowley <[email protected]> | 2016-11-21 12:44:46 -0600 |
commit | 974d280e815727f84e799cf69058630b954dec7e (patch) | |
tree | 38191fbe1665327171ad3af386f3e6f21609ed9d /src/gallium/drivers/swr/swr_context.cpp | |
parent | 915b4b0d494ad9705a7be59baec9e11a5576503a (diff) |
swr: Handle windows.h and NOMINMAX
Reorder header files so that we have a chance to defined NOMINMAX before
mesa include files include windows.h
v3: split from bigger patch
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/drivers/swr/swr_context.cpp')
-rw-r--r-- | src/gallium/drivers/swr/swr_context.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/swr/swr_context.cpp b/src/gallium/drivers/swr/swr_context.cpp index a5ab2362e55..3f5771219f6 100644 --- a/src/gallium/drivers/swr/swr_context.cpp +++ b/src/gallium/drivers/swr/swr_context.cpp @@ -21,6 +21,14 @@ * IN THE SOFTWARE. ***************************************************************************/ +#include "swr_context.h" +#include "swr_memory.h" +#include "swr_screen.h" +#include "swr_resource.h" +#include "swr_scratch.h" +#include "swr_query.h" +#include "swr_fence.h" + #include "util/u_memory.h" #include "util/u_inlines.h" #include "util/u_format.h" @@ -31,14 +39,6 @@ extern "C" { #include "util/u_surface.h" } -#include "swr_context.h" -#include "swr_memory.h" -#include "swr_screen.h" -#include "swr_resource.h" -#include "swr_scratch.h" -#include "swr_query.h" -#include "swr_fence.h" - #include "api.h" #include "backend.h" |