diff options
author | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:03 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:58 +0300 |
commit | 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch) | |
tree | ec50d7bdca3901a6afcc986943011f08f9516307 /intern/opensubdiv | |
parent | 008aaaa37841ca27d2bba80d8859336655cef455 (diff) |
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'intern/opensubdiv')
8 files changed, 9 insertions, 10 deletions
diff --git a/intern/opensubdiv/internal/opensubdiv.cc b/intern/opensubdiv/internal/opensubdiv.cc index dc19d3d9306..74b81b13351 100644 --- a/intern/opensubdiv/internal/opensubdiv.cc +++ b/intern/opensubdiv/internal/opensubdiv.cc @@ -22,8 +22,8 @@ #include <GL/glew.h> -#include "opensubdiv_device_context_opencl.h" #include "opensubdiv_device_context_cuda.h" +#include "opensubdiv_device_context_opencl.h" #include "opensubdiv_gl_mesh_capi.h" void openSubdiv_init(void) diff --git a/intern/opensubdiv/internal/opensubdiv_converter_internal.cc b/intern/opensubdiv/internal/opensubdiv_converter_internal.cc index e8d2f237936..0335219d6b9 100644 --- a/intern/opensubdiv/internal/opensubdiv_converter_internal.cc +++ b/intern/opensubdiv/internal/opensubdiv_converter_internal.cc @@ -22,8 +22,8 @@ #include "internal/opensubdiv_converter_internal.h" -#include <opensubdiv/sdc/crease.h> #include <cassert> +#include <opensubdiv/sdc/crease.h> namespace opensubdiv_capi { diff --git a/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc b/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc index 5ce8af0434e..c0355ab24a8 100644 --- a/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc +++ b/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc @@ -39,10 +39,10 @@ # include <X11/Xlib.h> # endif +# include <cstdio> # include <cuda.h> # include <cuda_gl_interop.h> # include <cuda_runtime_api.h> -# include <cstdio> # include "internal/opensubdiv_util.h" diff --git a/intern/opensubdiv/internal/opensubdiv_evaluator.cc b/intern/opensubdiv/internal/opensubdiv_evaluator.cc index 4f5a1db82ca..c599a3c9f68 100644 --- a/intern/opensubdiv/internal/opensubdiv_evaluator.cc +++ b/intern/opensubdiv/internal/opensubdiv_evaluator.cc @@ -18,8 +18,8 @@ #include "opensubdiv_evaluator_capi.h" -#include <new> #include "MEM_guardedalloc.h" +#include <new> #include "internal/opensubdiv_evaluator_internal.h" diff --git a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc index 431258aa415..c35909a045b 100644 --- a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc +++ b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc @@ -39,7 +39,6 @@ #include "internal/opensubdiv_topology_refiner_internal.h" #include "internal/opensubdiv_util.h" -#include "internal/opensubdiv_util.h" #include "opensubdiv_topology_refiner_capi.h" using OpenSubdiv::Far::PatchMap; diff --git a/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc b/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc index 0e4d9ce0a83..6afd763a63e 100644 --- a/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc +++ b/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc @@ -44,9 +44,9 @@ typedef Mesh<CpuGLVertexBuffer, StencilTable, OmpEvaluator, GLPatchTable> OsdOmp #endif // OpenCL backend. #ifdef OPENSUBDIV_HAS_OPENCL +# include "opensubdiv_device_context_opencl.h" # include <opensubdiv/osd/clEvaluator.h> # include <opensubdiv/osd/clGLVertexBuffer.h> -# include "opensubdiv_device_context_opencl.h" using OpenSubdiv::Osd::CLEvaluator; using OpenSubdiv::Osd::CLGLVertexBuffer; using OpenSubdiv::Osd::CLStencilTable; @@ -57,9 +57,9 @@ static CLDeviceContext g_cl_device_context; #endif // CUDA backend. #ifdef OPENSUBDIV_HAS_CUDA +# include "opensubdiv_device_context_cuda.h" # include <opensubdiv/osd/cudaEvaluator.h> # include <opensubdiv/osd/cudaGLVertexBuffer.h> -# include "opensubdiv_device_context_cuda.h" using OpenSubdiv::Osd::CudaEvaluator; using OpenSubdiv::Osd::CudaGLVertexBuffer; using OpenSubdiv::Osd::CudaStencilTable; @@ -89,12 +89,12 @@ typedef Mesh<GLVertexBuffer, GLStencilTableSSBO, GLComputeEvaluator, GLPatchTabl #include "MEM_guardedalloc.h" -#include "opensubdiv_topology_refiner_capi.h" #include "internal/opensubdiv_gl_mesh_draw.h" #include "internal/opensubdiv_gl_mesh_fvar.h" #include "internal/opensubdiv_gl_mesh_internal.h" #include "internal/opensubdiv_topology_refiner_internal.h" #include "internal/opensubdiv_util.h" +#include "opensubdiv_topology_refiner_capi.h" using opensubdiv_capi::vector; diff --git a/intern/opensubdiv/internal/opensubdiv_gl_mesh_fvar.h b/intern/opensubdiv/internal/opensubdiv_gl_mesh_fvar.h index cef78daced7..73a1af05605 100644 --- a/intern/opensubdiv/internal/opensubdiv_gl_mesh_fvar.h +++ b/intern/opensubdiv/internal/opensubdiv_gl_mesh_fvar.h @@ -23,8 +23,8 @@ // work. Still needs a lot of work to make it easy, correct and have proper // data ownership. -#include <opensubdiv/far/topologyRefiner.h> #include <opensubdiv/far/patchTable.h> +#include <opensubdiv/far/topologyRefiner.h> #include "internal/opensubdiv_util.h" diff --git a/intern/opensubdiv/internal/opensubdiv_util.h b/intern/opensubdiv/internal/opensubdiv_util.h index 7817ebac96e..e515859b42f 100644 --- a/intern/opensubdiv/internal/opensubdiv_util.h +++ b/intern/opensubdiv/internal/opensubdiv_util.h @@ -21,11 +21,11 @@ #include <algorithm> #include <cassert> -#include <vector> #include <stack> #include <string> #include <unordered_map> #include <utility> +#include <vector> namespace opensubdiv_capi { |