fixup! tmp wobbly

Author: ammen99

plugins/wobbly/wobbly.cpp

@@ -913,8 +913,8 @@ class wobbly_render_instance_t :
 
         params.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
         params.vertexInputDescription = {{
-            .binding = 0,
-            .stride = sizeof(float) * 4,
+            .binding   = 0,
+            .stride    = sizeof(float) * 4,
             .inputRate = VK_VERTEX_INPUT_RATE_VERTEX,
         }};
         params.vertexAttributeDescription = {
@@ -959,7 +959,7 @@ class wobbly_render_instance_t :
             // Try to reuse the vertex buffer if possible, to avoid reallocations.
             if (buffer && (buffer->get_size() >= total_size) && (buffer.use_count() == 1))
             {
-                //LOGI("Reuse buffer index ", i);
+                // LOGI("Reuse buffer index ", i);
                 return buffers[i];
             }
         }
@@ -990,7 +990,7 @@ class wobbly_render_instance_t :
         });
 
         data.pass->custom_vulkan_subpass([&] (wf::vulkan_render_state_t& state,
-                wf::vk::command_buffer_t& cmd_buf)
+                                              wf::vk::command_buffer_t& cmd_buf)
         {
             auto& our_state = ensure_vk(state);
 
@@ -1002,6 +1002,7 @@ class wobbly_render_instance_t :
                 unified_buffer.push_back(uv[2 * i]);
                 unified_buffer.push_back(uv[2 * i + 1]);
             }
+
             VkDeviceSize total_size = unified_buffer.size() * sizeof(float);
 
             auto buffer = find_buffer(state.get_context(), total_size);
@@ -1020,7 +1021,6 @@ class wobbly_render_instance_t :
             vkCmdPushConstants(cmd_buf, our_state.pipeline->layout(), VK_SHADER_STAGE_VERTEX_BIT,
                 0, sizeof(glm::mat4), &transform);
 
-
             cmd_buf.bind_buffer(buffer);
             VkDeviceSize offset = 0;
             vkCmdBindVertexBuffers(cmd_buf, 0, 1, &buffer->get_buffer(), &offset);

src/api/wayfire/render.hpp

@@ -31,8 +31,8 @@ struct color_transform_t
 {
     wlr_color_transfer_function transfer_function = WLR_COLOR_TRANSFER_FUNCTION_EXT_LINEAR;
     wlr_color_named_primaries primaries = WLR_COLOR_NAMED_PRIMARIES_SRGB;
-	wlr_color_encoding color_encoding = WLR_COLOR_ENCODING_NONE;
-	wlr_color_range color_range = WLR_COLOR_RANGE_NONE;
+    wlr_color_encoding color_encoding   = WLR_COLOR_ENCODING_NONE;
+    wlr_color_range color_range = WLR_COLOR_RANGE_NONE;
 
     bool operator ==(const color_transform_t& other) const;
     bool operator !=(const color_transform_t& other) const;

src/api/wayfire/vulkan.hpp

@@ -177,7 +177,7 @@ class gpu_buffer_t : public std::enable_shared_from_this<gpu_buffer_t>
     std::shared_ptr<context_t> context;
     VkBuffer buffer = VK_NULL_HANDLE;
     VkDeviceMemory memory = VK_NULL_HANDLE;
-    VkDeviceSize size = 0;
+    VkDeviceSize size     = 0;
 };
 
 class image_descriptor_set_pool_t : public std::enable_shared_from_this<image_descriptor_set_pool_t>

src/core/vulkan.cpp

@@ -104,7 +104,7 @@ bool gpu_buffer_t::write(const void *data, VkDeviceSize data_size, VkDeviceSize
     return true;
 }
 
-void *gpu_buffer_t::map(VkDeviceSize offset, VkDeviceSize map_size)
+void*gpu_buffer_t::map(VkDeviceSize offset, VkDeviceSize map_size)
 {
     void *mapped = nullptr;
     if (vkMapMemory(context->get_device(), memory, offset, map_size, 0, &mapped) != VK_SUCCESS)
@@ -254,8 +254,8 @@ VkDescriptorSet image_descriptor_set_pool_t::get_descriptor_set(
                 entry.image_view = VK_NULL_HANDLE;
             }
 
-            if (auto it = lookup_table.find(entry.last_texture->get_wlr_texture());
-                it != lookup_table.end() && it->second == index)
+            if ((auto it = lookup_table.find(entry.last_texture->get_wlr_texture());
+                 it != lookup_table.end()) && (it->second == index))
             {
                 lookup_table.erase(it);
             }
@@ -353,7 +353,7 @@ command_buffer_t::~command_buffer_t()
 static void handle_release_resources(void *user_data)
 {
     auto *cmd_buf = static_cast<command_buffer_t*>(user_data);
-    //LOGI("Render pass is releasing resources, deleting command buffer");
+    // LOGI("Render pass is releasing resources, deleting command buffer");
     delete cmd_buf;
 }
 

src/render.cpp

@@ -621,7 +621,7 @@ void wf::render_pass_t::add_texture(const std::shared_ptr<wf::texture_t>& textur
         opts.color_encoding = ct->color_encoding;
         opts.color_range    = ct->color_range;
         wlr_color_primaries_from_named(&primaries, ct->primaries);
-        opts.primaries         = &primaries;
+        opts.primaries = &primaries;
         opts.transfer_function = ct->transfer_function;
     }
 

src/view/wlr-surface-node.cpp

@@ -34,8 +34,8 @@ wf::scene::surface_state_t& wf::scene::surface_state_t::operator =(surface_state
     accumulated_damage = other.accumulated_damage;
     seq  = other.seq;
     size = other.size;
-    src_viewport    = other.src_viewport;
-    transform       = other.transform;
+    src_viewport = other.src_viewport;
+    transform    = other.transform;
     color_transform = other.color_transform;
 
     other.current_buffer = NULL;
@@ -77,21 +77,26 @@ void wf::scene::surface_state_t::merge_state(wlr_surface *surface)
     this->color_transform->transfer_function = WLR_COLOR_TRANSFER_FUNCTION_GAMMA22;
     const wlr_image_description_v1_data *img_desc =
         wlr_surface_get_image_description_v1_data(surface);
-    if (img_desc != NULL) {
+    if (img_desc != NULL)
+    {
         this->color_transform->transfer_function = wlr_color_manager_v1_transfer_function_to_wlr(
-                (wp_color_manager_v1_transfer_function)img_desc->tf_named);
+            (wp_color_manager_v1_transfer_function)img_desc->tf_named);
         this->color_transform->primaries = wlr_color_manager_v1_primaries_to_wlr(
             (wp_color_manager_v1_primaries)img_desc->primaries_named);
     }
 
     const wlr_color_representation_v1_surface_state *color_repr =
         wlr_color_representation_v1_get_surface_state(surface);
-    if (color_repr != NULL) {
-        if (color_repr->coefficients != 0) {
+    if (color_repr != NULL)
+    {
+        if (color_repr->coefficients != 0)
+        {
             this->color_transform->color_encoding = wlr_color_representation_v1_color_encoding_to_wlr(
                 (wp_color_representation_surface_v1_coefficients)color_repr->coefficients);
         }
-        if (color_repr->range != 0) {
+
+        if (color_repr->range != 0)
+        {
             this->color_transform->color_range = wlr_color_representation_v1_color_range_to_wlr(
                 (wp_color_representation_surface_v1_range)color_repr->range);
         }