Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support

1 files changed, 23 insertions, 24 deletions

diff --git a/source/blender/gpu/intern/gpu_capabilities.cc b/source/blender/gpu/intern/gpu_capabilities.cc
index c6e9dc210cb..f12fd96d1ba 100644
--- a/source/blender/gpu/intern/gpu_capabilities.cc
+++ b/source/blender/gpu/intern/gpu_capabilities.cc
@@ -44,7 +44,7 @@ using namespace blender::gpu;
 /** \name Capabilities
  * \{ */
 
-int GPU_max_texture_size(void)
+int GPU_max_texture_size()
 {
   return GCaps.max_texture_size;
 }
@@ -57,27 +57,27 @@ int GPU_texture_size_with_limit(int res, bool limit_gl_texture_size)
   return min_ii(reslimit, res);
 }
 
-int GPU_max_texture_layers(void)
+int GPU_max_texture_layers()
 {
   return GCaps.max_texture_layers;
 }
 
-int GPU_max_textures_vert(void)
+int GPU_max_textures_vert()
 {
   return GCaps.max_textures_vert;
 }
 
-int GPU_max_textures_geom(void)
+int GPU_max_textures_geom()
 {
   return GCaps.max_textures_geom;
 }
 
-int GPU_max_textures_frag(void)
+int GPU_max_textures_frag()
 {
   return GCaps.max_textures_frag;
 }
 
-int GPU_max_textures(void)
+int GPU_max_textures()
 {
   return GCaps.max_textures;
 }
@@ -92,37 +92,37 @@ int GPU_max_work_group_size(int index)
   return GCaps.max_work_group_size[index];
 }
 
-int GPU_max_uniforms_vert(void)
+int GPU_max_uniforms_vert()
 {
   return GCaps.max_uniforms_vert;
 }
 
-int GPU_max_uniforms_frag(void)
+int GPU_max_uniforms_frag()
 {
   return GCaps.max_uniforms_frag;
 }
 
-int GPU_max_batch_indices(void)
+int GPU_max_batch_indices()
 {
   return GCaps.max_batch_indices;
 }
 
-int GPU_max_batch_vertices(void)
+int GPU_max_batch_vertices()
 {
   return GCaps.max_batch_vertices;
 }
 
-int GPU_max_vertex_attribs(void)
+int GPU_max_vertex_attribs()
 {
   return GCaps.max_vertex_attribs;
 }
 
-int GPU_max_varying_floats(void)
+int GPU_max_varying_floats()
 {
   return GCaps.max_varying_floats;
 }
 
-int GPU_extensions_len(void)
+int GPU_extensions_len()
 {
   return GCaps.extensions_len;
 }
@@ -132,43 +132,43 @@ const char *GPU_extension_get(int i)
   return GCaps.extension_get ? GCaps.extension_get(i) : "\0";
 }
 
-bool GPU_mip_render_workaround(void)
+bool GPU_mip_render_workaround()
 {
   return GCaps.mip_render_workaround;
 }
 
-bool GPU_depth_blitting_workaround(void)
+bool GPU_depth_blitting_workaround()
 {
   return GCaps.depth_blitting_workaround;
 }
 
-bool GPU_use_main_context_workaround(void)
+bool GPU_use_main_context_workaround()
 {
   return GCaps.use_main_context_workaround;
 }
 
-bool GPU_crappy_amd_driver(void)
+bool GPU_crappy_amd_driver()
 {
   /* Currently are the same drivers with the `unused_fb_slot` problem. */
   return GCaps.broken_amd_driver;
 }
 
-bool GPU_use_hq_normals_workaround(void)
+bool GPU_use_hq_normals_workaround()
 {
   return GCaps.use_hq_normals_workaround;
 }
 
-bool GPU_compute_shader_support(void)
+bool GPU_compute_shader_support()
 {
   return GCaps.compute_shader_support;
 }
 
-bool GPU_shader_storage_buffer_objects_support(void)
+bool GPU_shader_storage_buffer_objects_support()
 {
   return GCaps.shader_storage_buffer_objects_support;
 }
 
-bool GPU_shader_image_load_store_support(void)
+bool GPU_shader_image_load_store_support()
 {
   return GCaps.shader_image_load_store_support;
 }
@@ -179,7 +179,7 @@ bool GPU_shader_image_load_store_support(void)
 /** \name Memory statistics
  * \{ */
 
-bool GPU_mem_stats_supported(void)
+bool GPU_mem_stats_supported()
 {
   return GCaps.mem_stats_support;
 }
@@ -189,8 +189,7 @@ void GPU_mem_stats_get(int *totalmem, int *freemem)
   Context::get()->memory_statistics_get(totalmem, freemem);
 }
 
-/* Return support for the active context + window. */
-bool GPU_stereo_quadbuffer_support(void)
+bool GPU_stereo_quadbuffer_support()
 {
   return Context::get()->front_right != nullptr;
 }