[Bf-blender-cvs] [8642a0cb61c] temp-gpu-compute-shaders: Merge branch 'master' into temp-gpu-compute-shaders

[Jeroen Bakker]

Commit: 8642a0cb61c06a098eb7be30f3c4e691e04c9da6
Author: Jeroen Bakker
Date:   Wed May 26 15:58:46 2021 +0200
Branches: temp-gpu-compute-shaders
https://developer.blender.org/rB8642a0cb61c06a098eb7be30f3c4e691e04c9da6

Merge branch 'master' into temp-gpu-compute-shaders

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



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

diff --cc source/blender/gpu/intern/gpu_capabilities_private.hh
index 0c2790d85c7,7c1d4590ce8..ee7ef1e69e6
--- a/source/blender/gpu/intern/gpu_capabilities_private.hh
+++ b/source/blender/gpu/intern/gpu_capabilities_private.hh
@@@ -41,9 -41,16 +41,18 @@@ struct GPUCapabilities 
    int max_textures_vert = 0;
    int max_textures_geom = 0;
    int max_textures_frag = 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;
    bool shader_image_load_store_support = false;
    /* OpenGL related workarounds. */
    bool mip_render_workaround = false;
diff --cc source/blender/gpu/opengl/gl_backend.cc
index e0337f7f4ae,31b6549fc3b..fb03a2c2d2a
--- a/source/blender/gpu/opengl/gl_backend.cc
+++ b/source/blender/gpu/opengl/gl_backend.cc
@@@ -419,10 -425,18 +425,20 @@@ void GLBackend::capabilities_init(
    glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &GCaps.max_textures_vert);
    glGetIntegerv(GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS, &GCaps.max_textures_geom);
    glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &GCaps.max_textures);
+   glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS, &GCaps.max_uniforms_vert);
+   glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, &GCaps.max_uniforms_frag);
+   glGetIntegerv(GL_MAX_ELEMENTS_INDICES, &GCaps.max_batch_indices);
+   glGetIntegerv(GL_MAX_ELEMENTS_VERTICES, &GCaps.max_batch_vertices);
+   glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &GCaps.max_vertex_attribs);
+   glGetIntegerv(GL_MAX_VARYING_FLOATS, &GCaps.max_varying_floats);
+ 
+   glGetIntegerv(GL_NUM_EXTENSIONS, &GCaps.extensions_len);
+   GCaps.extension_get = gl_extension_get;
+ 
    GCaps.mem_stats_support = GLEW_NVX_gpu_memory_info || GLEW_ATI_meminfo;
    GCaps.shader_image_load_store_support = GLEW_ARB_shader_image_load_store;
 +  GCaps.compute_shader_support = GLEW_ARB_compute_shader;
 +  GCaps.shader_storage_buffer_objects_support = GLEW_ARB_shader_storage_buffer_object;
    /* GL specific capabilities. */
    glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, &GLContext::max_texture_3d_size);
    glGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE, &GLContext::max_cubemap_size);