Skip to content

Commit

Permalink
meta: Add missing newlines to end of files
Browse files Browse the repository at this point in the history
Remove trailing whitespace also

Signed-off-by: Joshua Ashton <[email protected]>
  • Loading branch information
misyltoad authored and HansKristian-Work committed Nov 5, 2020
1 parent a18da45 commit 8dea487
Show file tree
Hide file tree
Showing 42 changed files with 57 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ vkd3d:
artifacts:
name: "vkd3d-${CI_COMMIT_REF_NAME}.${CI_COMMIT_SHA}"
paths:
- build/vkd3d-release
- build/vkd3d-release
2 changes: 1 addition & 1 deletion build-linux32.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ bindir = 'bin'
system = 'linux'
cpu_family = 'x86'
cpu = 'i686'
endian = 'little'
endian = 'little'
2 changes: 1 addition & 1 deletion demos/gears.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ static double cxg_get_time(void)

static void cxg_render_frame(struct cx_gears *cxg)
{
static double t_prev = -1.0;
static double t_prev = -1.0;
double dt, t;
float a;

Expand Down
2 changes: 1 addition & 1 deletion demos/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ executable('triangle', 'triangle.c',
include_directories : vkd3d_public_includes,
install : true,
gui_app : true,
override_options : [ 'c_std='+vkd3d_c_std ])
override_options : [ 'c_std='+vkd3d_c_std ])
2 changes: 1 addition & 1 deletion include/private/hashmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static inline bool hash_map_should_grow_before_insert(struct hash_map *hash_map)
static inline struct hash_map_entry *hash_map_find(const struct hash_map *hash_map, const void *key)
{
uint32_t hash_value, entry_idx;

if (!hash_map->entries)
return NULL;

Expand Down
4 changes: 2 additions & 2 deletions include/private/vkd3d_atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ FORCEINLINE uint32_t vkd3d_atomic_uint32_decrement(uint32_t *target, vkd3d_memor
#define vkd3d_memory_order_acquire __ATOMIC_ACQUIRE
#define vkd3d_memory_order_release __ATOMIC_RELEASE
#define vkd3d_memory_order_acq_rel __ATOMIC_ACQ_REL
#define vkd3d_memory_order_seq_cst __ATOMIC_SEQ_CST
#define vkd3d_memory_order_seq_cst __ATOMIC_SEQ_CST

# define vkd3d_atomic_uint32_load_explicit(target, order) __atomic_load_n(target, order)
# define vkd3d_atomic_uint32_store_explicit(target, value, order) __atomic_store_n(target, value, order)
Expand All @@ -134,4 +134,4 @@ FORCEINLINE uint32_t vkd3d_atomic_uint32_decrement(uint32_t *target, vkd3d_memor

#endif

#endif
#endif
2 changes: 1 addition & 1 deletion include/private/vkd3d_platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ const char *vkd3d_dlerror(void);

bool vkd3d_get_program_name(char program_name[VKD3D_PATH_MAX]);

#endif
#endif
2 changes: 1 addition & 1 deletion include/vkd3d_swapchain_factory.idl
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ interface IWineDXGISwapChainFactory : IUnknown
[in] IDXGIOutput *pRestrictToOutput,
[out] IDXGISwapChain1 **ppSwapChain
);
}
}
2 changes: 1 addition & 1 deletion include/vkd3d_win32.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@
#define VKD3D_NO_VULKAN_H
#include <vkd3d.h>

#endif
#endif
2 changes: 1 addition & 1 deletion libs/d3d12/d3d12.def
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ EXPORTS

D3D12EnableExperimentalFeatures @110
D3D12SerializeRootSignature @115
D3D12SerializeVersionedRootSignature @116
D3D12SerializeVersionedRootSignature @116
2 changes: 1 addition & 1 deletion libs/d3d12/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ d3d12_lib = shared_library('d3d12', d3d12_src,

d3d12_dep = declare_dependency(
link_with : d3d12_lib,
include_directories : vkd3d_public_includes)
include_directories : vkd3d_public_includes)
2 changes: 1 addition & 1 deletion libs/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ subdir('vkd3d')
subdir('vkd3d-utils')
if enable_d3d12
subdir('d3d12')
endif
endif
2 changes: 1 addition & 1 deletion libs/vkd3d-shader/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ vkd3d_shader_lib = static_library('vkd3d-shader', vkd3d_shader_src,
vkd3d_shader_dep = declare_dependency(
link_with : vkd3d_shader_lib,
dependencies : vkd3d_common_dep,
include_directories : vkd3d_public_includes)
include_directories : vkd3d_public_includes)
2 changes: 1 addition & 1 deletion libs/vkd3d-shader/spirv.c
Original file line number Diff line number Diff line change
Expand Up @@ -3427,7 +3427,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_abs(struct vkd3d_dxbc_compiler *compile
{
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
uint32_t type_id;

type_id = vkd3d_dxbc_compiler_get_type_id_for_reg(compiler, reg, write_mask);
if (reg->data_type == VKD3D_DATA_FLOAT || reg->data_type == VKD3D_DATA_DOUBLE)
return vkd3d_spirv_build_op_glsl_std450_fabs(builder, type_id, val_id);
Expand Down
2 changes: 1 addition & 1 deletion libs/vkd3d-shader/vkd3d_shader_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ unsigned int vkd3d_shader_scan_get_register_flags(const struct vkd3d_shader_scan

key.register_type = type;
key.register_id = id;

e = hash_map_find(&scan_info->register_map, &key);
return e ? e->flags : 0u;
}
Expand Down
2 changes: 1 addition & 1 deletion libs/vkd3d-shader/vkd3d_shader_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ enum VKD3D_SHADER_INSTRUCTION_HANDLER
VKD3DSIH_DMUL,
VKD3DSIH_DEQ,
VKD3DSIH_DGE,
VKD3DSIH_DLT,
VKD3DSIH_DLT,
VKD3DSIH_DNE,
VKD3DSIH_DMOV,
VKD3DSIH_DMOVC,
Expand Down
2 changes: 1 addition & 1 deletion libs/vkd3d-utils/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ vkd3d_utils_lib = shared_library('vkd3d-proton-utils', vkd3d_utils_src,

vkd3d_utils_dep = declare_dependency(
link_with : vkd3d_utils_lib,
include_directories : vkd3d_public_includes)
include_directories : vkd3d_public_includes)
2 changes: 1 addition & 1 deletion libs/vkd3d/command.c
Original file line number Diff line number Diff line change
Expand Up @@ -8282,7 +8282,7 @@ static void *d3d12_command_queue_submission_worker_main(void *userdata)
break;

case VKD3D_SUBMISSION_BIND_SPARSE:
d3d12_command_queue_bind_sparse(queue, submission.bind_sparse.mode,
d3d12_command_queue_bind_sparse(queue, submission.bind_sparse.mode,
submission.bind_sparse.dst_resource, submission.bind_sparse.src_resource,
submission.bind_sparse.bind_count, submission.bind_sparse.bind_infos);
vkd3d_free(submission.bind_sparse.bind_infos);
Expand Down
2 changes: 1 addition & 1 deletion libs/vkd3d/debug_ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -318,4 +318,4 @@ void vkd3d_shader_debug_ring_end_command_buffer(struct d3d12_command_list *list)
VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_HOST_BIT, 0,
1, &barrier, 0, NULL, 0, NULL));
}
}
}
2 changes: 1 addition & 1 deletion libs/vkd3d/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -4267,7 +4267,7 @@ static void d3d12_device_caps_init_feature_options1(struct d3d12_device *device)
const VkPhysicalDeviceShaderCorePropertiesAMD *amd = &device->device_info.shader_core_properties;
const VkPhysicalDeviceShaderCoreProperties2AMD *amd2 = &device->device_info.shader_core_properties2;
uint32_t compute_units;

if (device->vk_info.AMD_shader_core_properties2)
compute_units = amd2->activeComputeUnitCount;
else
Expand Down
2 changes: 1 addition & 1 deletion libs/vkd3d/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@ bool vkd3d_get_program_name(char program_name[VKD3D_PATH_MAX])
return false;
}

#endif
#endif
2 changes: 1 addition & 1 deletion libs/vkd3d/renderdoc.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,4 +284,4 @@ void vkd3d_renderdoc_command_queue_end_capture(struct d3d12_command_queue *comma
}
else
vkd3d_renderdoc_end_capture(command_queue->device->vkd3d_instance->vk_instance);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_buffer_float.comp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uniform u_info_t {

void main() {
int thread_id = int(gl_GlobalInvocationID.x);

if (thread_id < u_info.dst_extent.x)
imageStore(dst, u_info.dst_offset.x + thread_id, u_info.clear_value);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_buffer_raw.comp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ uniform u_info_t {

void main() {
int thread_id = int(gl_GlobalInvocationID.x);

if (thread_id < u_info.dst_extent.x)
dst.data[u_info.dst_offset.x + thread_id] = u_info.clear_value.x;
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_buffer_uint.comp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uniform u_info_t {

void main() {
int thread_id = int(gl_GlobalInvocationID.x);

if (thread_id < u_info.dst_extent.x)
imageStore(dst, u_info.dst_offset.x + thread_id, u_info.clear_value);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_image_1d_array_float.comp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uniform u_info_t {

void main() {
ivec3 thread_id = ivec3(gl_GlobalInvocationID);

if (thread_id.x < u_info.dst_extent.x)
imageStore(dst, ivec2(u_info.dst_offset.x + thread_id.x, thread_id.y), u_info.clear_value);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_image_1d_array_uint.comp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uniform u_info_t {

void main() {
ivec3 thread_id = ivec3(gl_GlobalInvocationID);

if (thread_id.x < u_info.dst_extent.x)
imageStore(dst, ivec2(u_info.dst_offset.x + thread_id.x, thread_id.y), u_info.clear_value);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_image_1d_float.comp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uniform u_info_t {

void main() {
ivec3 thread_id = ivec3(gl_GlobalInvocationID);

if (thread_id.x < u_info.dst_extent.x)
imageStore(dst, u_info.dst_offset.x + thread_id.x, u_info.clear_value);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_image_1d_uint.comp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uniform u_info_t {

void main() {
ivec3 thread_id = ivec3(gl_GlobalInvocationID);

if (thread_id.x < u_info.dst_extent.x)
imageStore(dst, u_info.dst_offset.x + thread_id.x, u_info.clear_value);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_image_2d_array_float.comp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uniform u_info_t {

void main() {
ivec3 thread_id = ivec3(gl_GlobalInvocationID);

if (all(lessThan(thread_id.xy, u_info.dst_extent.xy)))
imageStore(dst, ivec3(u_info.dst_offset.xy + thread_id.xy, thread_id.z), u_info.clear_value);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_image_2d_array_uint.comp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uniform u_info_t {

void main() {
ivec3 thread_id = ivec3(gl_GlobalInvocationID);

if (all(lessThan(thread_id.xy, u_info.dst_extent.xy)))
imageStore(dst, ivec3(u_info.dst_offset.xy + thread_id.xy, thread_id.z), u_info.clear_value);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_image_2d_float.comp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uniform u_info_t {

void main() {
ivec3 thread_id = ivec3(gl_GlobalInvocationID);

if (all(lessThan(thread_id.xy, u_info.dst_extent.xy)))
imageStore(dst, u_info.dst_offset.xy + thread_id.xy, u_info.clear_value);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_image_2d_uint.comp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uniform u_info_t {

void main() {
ivec3 thread_id = ivec3(gl_GlobalInvocationID);

if (all(lessThan(thread_id.xy, u_info.dst_extent.xy)))
imageStore(dst, u_info.dst_offset.xy + thread_id.xy, u_info.clear_value);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_image_3d_float.comp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uniform u_info_t {

void main() {
ivec3 thread_id = ivec3(gl_GlobalInvocationID);

if (all(lessThan(thread_id.xy, u_info.dst_extent)))
imageStore(dst, ivec3(u_info.dst_offset.xy, 0) + thread_id.xyz, u_info.clear_value);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/shaders/cs_clear_uav_image_3d_uint.comp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uniform u_info_t {

void main() {
ivec3 thread_id = ivec3(gl_GlobalInvocationID);

if (all(lessThan(thread_id.xy, u_info.dst_extent)))
imageStore(dst, ivec3(u_info.dst_offset.xy, 0) + thread_id.xyz, u_info.clear_value);
}
}
2 changes: 1 addition & 1 deletion libs/vkd3d/shaders/fs_copy_image_float.frag
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ void main() {
if (c_mode == MODE_2D) value = texelFetch(tex_2d, coord, 0).r;
if (c_mode == MODE_MS) value = texelFetch(tex_ms, coord, gl_SampleID).r;
gl_FragDepth = o_color = value;
}
}
2 changes: 1 addition & 1 deletion libs/vkd3d/shaders/gs_fullscreen.geom
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ void main() {
}

EndPrimitive();
}
}
2 changes: 1 addition & 1 deletion libs/vkd3d/shaders/vs_fullscreen.vert
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ void main() {
float(gl_VertexIndex & 1) * 4.0f - 1.0f,
float(gl_VertexIndex & 2) * 2.0f - 1.0f,
0.0f, 1.0f);
}
}
2 changes: 1 addition & 1 deletion libs/vkd3d/shaders/vs_fullscreen_layer.vert
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ void main() {
float(gl_VertexIndex & 1) * 4.0f - 1.0f,
float(gl_VertexIndex & 2) * 2.0f - 1.0f,
0.0f, 1.0f);
}
}
4 changes: 2 additions & 2 deletions libs/vkd3d/swapchain.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* This file uses extracts from the Wine project
* specifically dlls/wined3d/swapchain.c and dlls/dxgi/swapchain.c
* the license is as follows:
*
*
* Copyright 2002-2003 Jason Edmeades
* Copyright 2002-2003 Raphael Junqueira
* Copyright 2005 Oliver Stieber
Expand Down Expand Up @@ -315,7 +315,7 @@ static HRESULT d3d12_output_set_display_mode(IDXGIOutput *output, DXGI_MODE_DESC
ERR("Interlacing mode not supported.");
return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE;
}

}
}
else
Expand Down
2 changes: 1 addition & 1 deletion libs/vkd3d/vkd3d_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ struct d3d12_pipeline_state
VkPipelineBindPoint vk_bind_point;
VkPipelineCache vk_pso_cache;

ID3D12RootSignature *private_root_signature;
ID3D12RootSignature *private_root_signature;
struct d3d12_device *device;

struct vkd3d_private_store private_store;
Expand Down
2 changes: 1 addition & 1 deletion programs/vkd3d-compiler/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ executable('vkd3d-proton-compiler', 'main.c',
dependencies : [ vkd3d_shader_dep, threads_dep ],
include_directories : vkd3d_private_includes,
install : true,
override_options : [ 'c_std='+vkd3d_c_std ])
override_options : [ 'c_std='+vkd3d_c_std ])

0 comments on commit 8dea487

Please sign in to comment.