[Bf-blender-cvs] [cc3b89e1b93] temp-gpu-compute-shader-hair: Merge branch 'master' into temp-gpu-compute-shader-hair

[Jeroen Bakker]

Commit: cc3b89e1b9339778465372c9484e8da5851afa64
Author: Jeroen Bakker
Date:   Wed May 26 17:01:54 2021 +0200
Branches: temp-gpu-compute-shader-hair
https://developer.blender.org/rBcc3b89e1b9339778465372c9484e8da5851afa64

Merge branch 'master' into temp-gpu-compute-shader-hair

===================================================================



===================================================================

diff --cc source/blender/gpu/GPU_capabilities.h
index 7eeaeea78a2,45c656b49be..0c054d4f264
--- a/source/blender/gpu/GPU_capabilities.h
+++ b/source/blender/gpu/GPU_capabilities.h
@@@ -37,8 -37,15 +37,17 @@@ int GPU_max_textures(void)
  int GPU_max_textures_vert(void);
  int GPU_max_textures_geom(void);
  int GPU_max_textures_frag(void);
 +int GPU_max_work_group_count(int index);
 +int GPU_max_work_group_size(int index);
+ int GPU_max_uniforms_vert(void);
+ int GPU_max_uniforms_frag(void);
+ int GPU_max_batch_indices(void);
+ int GPU_max_batch_vertices(void);
+ int GPU_max_vertex_attribs(void);
+ int GPU_max_varying_floats(void);
+ 
+ int GPU_extensions_len(void);
+ const char *GPU_extension_get(int i);
  
  int GPU_texture_size_with_limit(int res, bool limit_gl_texture_size);
  
diff --cc source/blender/gpu/intern/gpu_capabilities.cc
index f6224805ef4,bedc9ad3092..c6e9dc210cb
--- a/source/blender/gpu/intern/gpu_capabilities.cc
+++ b/source/blender/gpu/intern/gpu_capabilities.cc
@@@ -82,16 -82,46 +82,56 @@@ int GPU_max_textures(void
    return GCaps.max_textures;
  }
  
 +int GPU_max_work_group_count(int index)
 +{
 +  return GCaps.max_work_group_count[index];
 +}
 +
 +int GPU_max_work_group_size(int index)
 +{
 +  return GCaps.max_work_group_size[index];
 +}
 +
+ int GPU_max_uniforms_vert(void)
+ {
+   return GCaps.max_uniforms_vert;
+ }
+ 
+ int GPU_max_uniforms_frag(void)
+ {
+   return GCaps.max_uniforms_frag;
+ }
+ 
+ int GPU_max_batch_indices(void)
+ {
+   return GCaps.max_batch_indices;
+ }
+ 
+ int GPU_max_batch_vertices(void)
+ {
+   return GCaps.max_batch_vertices;
+ }
+ 
+ int GPU_max_vertex_attribs(void)
+ {
+   return GCaps.max_vertex_attribs;
+ }
+ 
+ int GPU_max_varying_floats(void)
+ {
+   return GCaps.max_varying_floats;
+ }
+ 
+ int GPU_extensions_len(void)
+ {
+   return GCaps.extensions_len;
+ }
+ 
+ const char *GPU_extension_get(int i)
+ {
+   return GCaps.extension_get ? GCaps.extension_get(i) : "\0";
+ }
+ 
  bool GPU_mip_render_workaround(void)
  {
    return GCaps.mip_render_workaround;
diff --cc source/blender/gpu/intern/gpu_capabilities_private.hh
index 9840d7a42a6,ee7ef1e69e6..95cf7fd335d
--- a/source/blender/gpu/intern/gpu_capabilities_private.hh
+++ b/source/blender/gpu/intern/gpu_capabilities_private.hh
@@@ -41,8 -41,15 +41,17 @@@ struct GPUCapabilities 
    int max_textures_vert = 0;
    int max_textures_geom = 0;
    int max_textures_frag = 0;
 +  int max_work_group_count[3] = {0, 0, 0};
 +  int max_work_group_size[3] = {0, 0, 0};
+   int max_uniforms_vert = 0;
+   int max_uniforms_frag = 0;
+   int max_batch_indices = 0;
+   int max_batch_vertices = 0;
+   int max_vertex_attribs = 0;
+   int max_varying_floats = 0;
+   int extensions_len = 0;
+   const char *(*extension_get)(int);
+ 
    bool mem_stats_support = false;
    bool compute_shader_support = false;
    bool shader_storage_buffer_objects_support = false;