Cleanup: trailing space

This commit is contained in:
Campbell Barton 2023-01-31 15:49:04 +11:00
parent b18b53eae0
commit 79c82fc1c5
43 changed files with 47 additions and 47 deletions

View File

@ -2,7 +2,7 @@
# LLVM does not switch over to cpp17 until llvm 16 and building ealier versions with # LLVM does not switch over to cpp17 until llvm 16 and building ealier versions with
# MSVC is leading to some crashes in ISPC. Switch back to their default on all platforms # MSVC is leading to some crashes in ISPC. Switch back to their default on all platforms
# for now. # for now.
string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " DPCPP_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}") string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " DPCPP_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}")
if(WIN32) if(WIN32)

View File

@ -42,7 +42,7 @@ endif()
# LLVM does not switch over to cpp17 until llvm 16 and building ealier versions with # LLVM does not switch over to cpp17 until llvm 16 and building ealier versions with
# MSVC is leading to some crashes in ISPC. Switch back to their default on all platforms # MSVC is leading to some crashes in ISPC. Switch back to their default on all platforms
# for now. # for now.
string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " LLVM_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}") string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " LLVM_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}")
# short project name due to long filename issues on windows # short project name due to long filename issues on windows

View File

@ -10,9 +10,9 @@ if(WIN32)
DOWNLOAD_DIR ${DOWNLOAD_DIR} DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH} URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH}
PREFIX ${BUILD_DIR}/ssl PREFIX ${BUILD_DIR}/ssl
CONFIGURE_COMMAND echo "." CONFIGURE_COMMAND echo "."
BUILD_COMMAND echo "." BUILD_COMMAND echo "."
INSTALL_COMMAND echo "." INSTALL_COMMAND echo "."
INSTALL_DIR ${LIBDIR}/ssl INSTALL_DIR ${LIBDIR}/ssl
) )
else() else()
@ -46,4 +46,4 @@ else()
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install
INSTALL_DIR ${LIBDIR}/ssl INSTALL_DIR ${LIBDIR}/ssl
) )
endif() endif()

View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
if(WIN32) if(WIN32)
set(XML2_EXTRA_ARGS set(XML2_EXTRA_ARGS
-DLIBXML2_WITH_ZLIB=OFF -DLIBXML2_WITH_ZLIB=OFF
-DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_LZMA=OFF
-DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_PYTHON=OFF

View File

@ -34,7 +34,7 @@ class MetalKernelContext {
kernel_assert(0); kernel_assert(0);
return 0; return 0;
} }
#ifdef __KERNEL_METAL_INTEL__ #ifdef __KERNEL_METAL_INTEL__
template<typename TextureType, typename CoordsType> template<typename TextureType, typename CoordsType>
inline __attribute__((__always_inline__)) inline __attribute__((__always_inline__))
@ -55,7 +55,7 @@ class MetalKernelContext {
} }
} }
#endif #endif
// texture2d // texture2d
template<> template<>
inline __attribute__((__always_inline__)) inline __attribute__((__always_inline__))

View File

@ -69,7 +69,7 @@ if "%BUILD_UPDATE%" == "1" (
REM Then update SVN platform libraries, since updating python while python is REM Then update SVN platform libraries, since updating python while python is
REM running tends to be problematic. The python script that update_sources REM running tends to be problematic. The python script that update_sources
REM calls later on may still try to switch branches and run into trouble, REM calls later on may still try to switch branches and run into trouble,
REM but for *most* people this will side step the problem. REM but for *most* people this will side step the problem.
call "%BLENDER_DIR%\build_files\windows\svn_update.cmd" call "%BLENDER_DIR%\build_files\windows\svn_update.cmd"
) )
REM Finally call the python script shared between all platforms that updates git REM Finally call the python script shared between all platforms that updates git

View File

@ -117,4 +117,4 @@ class VectorList {
} }
}; };
} // namespace blender } // namespace blender

View File

@ -340,4 +340,4 @@ void DEG_disable_visibility_optimization(struct Depsgraph *depsgraph)
{ {
deg::Depsgraph *deg_graph = reinterpret_cast<deg::Depsgraph *>(depsgraph); deg::Depsgraph *deg_graph = reinterpret_cast<deg::Depsgraph *>(depsgraph);
deg_graph->use_visibility_optimization = false; deg_graph->use_visibility_optimization = false;
} }

View File

@ -47,4 +47,4 @@ HitData decode_hit_data(vec4 hit_data, float hit_depth)
/* Blue noise categorized into 4 sets of samples. /* Blue noise categorized into 4 sets of samples.
* See "Stochastic all the things" presentation slide 32-37. */ * See "Stochastic all the things" presentation slide 32-37. */
#define resolve_samples_count 9 #define resolve_samples_count 9

View File

@ -271,4 +271,4 @@ inline eMTLDataType gpu_type_to_mtl_type(eGPUType type)
return MTL_DATATYPE_FLOAT; return MTL_DATATYPE_FLOAT;
} }
return MTL_DATATYPE_FLOAT; return MTL_DATATYPE_FLOAT;
} }

View File

@ -2,4 +2,4 @@ void main() {
int index = int(gl_GlobalInvocationID.x); int index = int(gl_GlobalInvocationID.x);
vec4 pos = vec4(gl_GlobalInvocationID.x); vec4 pos = vec4(gl_GlobalInvocationID.x);
imageStore(img_output, index, pos); imageStore(img_output, index, pos);
} }

View File

@ -1,4 +1,4 @@
void main() { void main() {
vec4 pixel = vec4(1.0, 0.5, 0.2, 1.0); vec4 pixel = vec4(1.0, 0.5, 0.2, 1.0);
imageStore(img_output, ivec2(gl_GlobalInvocationID.xy), pixel); imageStore(img_output, ivec2(gl_GlobalInvocationID.xy), pixel);
} }

View File

@ -1,2 +1,2 @@
void main () { void main () {
} }

View File

@ -1,4 +1,4 @@
void main() { void main() {
uint store_index = int(gl_GlobalInvocationID.x); uint store_index = int(gl_GlobalInvocationID.x);
out_indices[store_index] = store_index; out_indices[store_index] = store_index;
} }

View File

@ -2,4 +2,4 @@ void main() {
uint index = gl_GlobalInvocationID.x; uint index = gl_GlobalInvocationID.x;
vec4 pos = vec4(gl_GlobalInvocationID.x); vec4 pos = vec4(gl_GlobalInvocationID.x);
out_positions[index] = pos; out_positions[index] = pos;
} }

View File

@ -159,4 +159,4 @@ void VKBackend::capabilities_init(VKContext &context)
GCaps.shader_image_load_store_support = true; GCaps.shader_image_load_store_support = true;
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -71,4 +71,4 @@ class VKBackend : public GPUBackend {
static void platform_exit(); static void platform_exit();
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -24,4 +24,4 @@ void VKBatch::multi_draw_indirect(GPUStorageBuf * /*indirect_buf*/,
{ {
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -21,4 +21,4 @@ class VKBatch : public Batch {
intptr_t stride) override; intptr_t stride) override;
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -79,4 +79,4 @@ void VKContext::debug_group_end()
{ {
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -63,4 +63,4 @@ class VKContext : public Context {
} }
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -17,4 +17,4 @@ void VKDrawList::submit()
{ {
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -17,4 +17,4 @@ class VKDrawList : public DrawList {
void submit() override; void submit() override;
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -17,4 +17,4 @@ void VKFence::wait()
{ {
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -17,4 +17,4 @@ class VKFence : public Fence {
void wait() override; void wait() override;
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -59,4 +59,4 @@ void VKFrameBuffer::blit_to(eGPUFrameBufferBits /*planes*/,
{ {
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -47,4 +47,4 @@ class VKFrameBuffer : public FrameBuffer {
int dst_offset_y) override; int dst_offset_y) override;
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -30,4 +30,4 @@ void VKIndexBuffer::strip_restart_indices()
{ {
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -25,4 +25,4 @@ class VKIndexBuffer : public IndexBuf {
void strip_restart_indices() override; void strip_restart_indices() override;
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -32,4 +32,4 @@ uint VKPixelBuffer::get_size()
return size_; return size_;
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -20,4 +20,4 @@ class VKPixelBuffer : public PixelBuffer {
uint get_size() override; uint get_size() override;
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -25,4 +25,4 @@ void VKQueryPool::get_occlusion_result(MutableSpan<uint32_t> /*r_values*/)
{ {
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -19,4 +19,4 @@ class VKQueryPool : public QueryPool {
void get_occlusion_result(MutableSpan<uint32_t> r_values) override; void get_occlusion_result(MutableSpan<uint32_t> r_values) override;
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -940,4 +940,4 @@ int VKShader::program_handle_get() const
return -1; return -1;
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -65,4 +65,4 @@ class VKShader : public Shader {
VkShaderModule *r_shader_module); VkShaderModule *r_shader_module);
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -13,4 +13,4 @@ class VKLogParser : public GPULogParser {
char *skip_name(char *log_line); char *skip_name(char *log_line);
char *skip_severity_keyword(char *log_line, GPULogItem &log_item); char *skip_severity_keyword(char *log_line, GPULogItem &log_item);
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -27,4 +27,4 @@ class VKStorageBuffer : public StorageBuf {
void read(void *data) override; void read(void *data) override;
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -74,4 +74,4 @@ bool VKTexture::init_internal(const GPUTexture * /*src*/, int /*mip_offset*/, in
return false; return false;
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -40,4 +40,4 @@ class VKTexture : public Texture {
bool init_internal(const GPUTexture *src, int mip_offset, int layer_offset) override; bool init_internal(const GPUTexture *src, int mip_offset, int layer_offset) override;
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -29,4 +29,4 @@ void VKUniformBuffer::unbind()
{ {
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -24,4 +24,4 @@ class VKUniformBuffer : public UniformBuf {
void unbind() override; void unbind() override;
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -70,4 +70,4 @@ void VKVertexBuffer::duplicate_data(VertBuf * /*dst*/)
{ {
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -31,4 +31,4 @@ class VKVertexBuffer : public VertBuf {
void duplicate_data(VertBuf *dst) override; void duplicate_data(VertBuf *dst) override;
}; };
} // namespace blender::gpu } // namespace blender::gpu