Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-09-07 20:35:56 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-09-07 20:37:05 +0300
commit6b436b80a45c947d49ab5fbda515fb02877eefd4 (patch)
tree70a96f4dff63482a378a9cb3ae02158ddbe8edeb /source/blender/gpu
parent5de4525e3939514b339c9775541ff7d1bc8af908 (diff)
GPU: Rename gpu_extensions to gpu_capabilities
This makes more sense as this module has more to it than just GL extensions.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/CMakeLists.txt6
-rw-r--r--source/blender/gpu/GPU_capabilities.h (renamed from source/blender/gpu/GPU_extensions.h)19
-rw-r--r--source/blender/gpu/intern/gpu_batch.cc1
-rw-r--r--source/blender/gpu/intern/gpu_capabilities.cc (renamed from source/blender/gpu/intern/gpu_extensions.cc)4
-rw-r--r--source/blender/gpu/intern/gpu_capabilities_private.hh (renamed from source/blender/gpu/intern/gpu_extensions_private.hh)0
-rw-r--r--source/blender/gpu/intern/gpu_codegen.c2
-rw-r--r--source/blender/gpu/intern/gpu_framebuffer.cc2
-rw-r--r--source/blender/gpu/intern/gpu_shader.cc2
-rw-r--r--source/blender/gpu/intern/gpu_shader_builtin.c1
-rw-r--r--source/blender/gpu/intern/gpu_state.cc1
-rw-r--r--source/blender/gpu/intern/gpu_uniform_buffer.cc2
-rw-r--r--source/blender/gpu/opengl/gl_backend.cc2
-rw-r--r--source/blender/gpu/opengl/gl_batch.cc2
-rw-r--r--source/blender/gpu/opengl/gl_drawlist.cc2
-rw-r--r--source/blender/gpu/opengl/gl_framebuffer.cc2
-rw-r--r--source/blender/gpu/opengl/gl_shader.cc1
-rw-r--r--source/blender/gpu/opengl/gl_state.cc2
-rw-r--r--source/blender/gpu/opengl/gl_texture.cc2
-rw-r--r--source/blender/gpu/opengl/gl_uniform_buffer.cc2
19 files changed, 20 insertions, 35 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 358bd045c2f..6fdd510ad28 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -59,11 +59,11 @@ set(SRC
intern/gpu_batch_presets.c
intern/gpu_batch_utils.c
intern/gpu_buffers.c
+ intern/gpu_capabilities.cc
intern/gpu_codegen.c
intern/gpu_context.cc
intern/gpu_debug.cc
intern/gpu_drawlist.cc
- intern/gpu_extensions.cc
intern/gpu_framebuffer.cc
intern/gpu_immediate.cc
intern/gpu_immediate_util.c
@@ -107,11 +107,11 @@ set(SRC
GPU_batch_presets.h
GPU_batch_utils.h
GPU_buffers.h
+ GPU_capabilities.h
GPU_common.h
GPU_context.h
GPU_debug.h
GPU_drawlist.h
- GPU_extensions.h
GPU_framebuffer.h
GPU_glew.h
GPU_immediate.h
@@ -134,10 +134,10 @@ set(SRC
intern/gpu_backend.hh
intern/gpu_batch_private.hh
+ intern/gpu_capabilities_private.hh
intern/gpu_codegen.h
intern/gpu_context_private.hh
intern/gpu_drawlist_private.hh
- intern/gpu_extensions_private.hh
intern/gpu_framebuffer_private.hh
intern/gpu_immediate_private.hh
intern/gpu_index_buffer_private.hh
diff --git a/source/blender/gpu/GPU_extensions.h b/source/blender/gpu/GPU_capabilities.h
index 357e867775a..b8a48735548 100644
--- a/source/blender/gpu/GPU_extensions.h
+++ b/source/blender/gpu/GPU_capabilities.h
@@ -19,6 +19,10 @@
/** \file
* \ingroup gpu
+ *
+ * GPU Capabilities & workarounds
+ * This module expose the reported implementation limits & enabled
+ * workaround for drivers that needs specific codepaths.
*/
#pragma once
@@ -27,32 +31,23 @@
extern "C" {
#endif
-/* GPU extensions support */
-
int GPU_max_texture_size(void);
-int GPU_max_texture_3d_size(void);
int GPU_max_texture_layers(void);
int GPU_max_textures(void);
int GPU_max_textures_vert(void);
int GPU_max_textures_geom(void);
int GPU_max_textures_frag(void);
-float GPU_max_texture_anisotropy(void);
-int GPU_max_color_texture_samples(void);
-int GPU_max_cube_map_size(void);
-int GPU_max_ubo_binds(void);
-int GPU_max_ubo_size(void);
+
+int GPU_texture_size_with_limit(int res);
+
bool GPU_mip_render_workaround(void);
bool GPU_depth_blitting_workaround(void);
bool GPU_use_main_context_workaround(void);
bool GPU_crappy_amd_driver(void);
-int GPU_texture_size_with_limit(int res);
-
bool GPU_mem_stats_supported(void);
void GPU_mem_stats_get(int *totalmem, int *freemem);
-void GPU_code_generate_glsl_lib(void);
-
bool GPU_stereo_quadbuffer_support(void);
#ifdef __cplusplus
diff --git a/source/blender/gpu/intern/gpu_batch.cc b/source/blender/gpu/intern/gpu_batch.cc
index 34655c48ca4..d6f4f223a83 100644
--- a/source/blender/gpu/intern/gpu_batch.cc
+++ b/source/blender/gpu/intern/gpu_batch.cc
@@ -30,7 +30,6 @@
#include "GPU_batch.h"
#include "GPU_batch_presets.h"
-#include "GPU_extensions.h"
#include "GPU_matrix.h"
#include "GPU_platform.h"
#include "GPU_shader.h"
diff --git a/source/blender/gpu/intern/gpu_extensions.cc b/source/blender/gpu/intern/gpu_capabilities.cc
index e06828bf994..83b9597abbb 100644
--- a/source/blender/gpu/intern/gpu_extensions.cc
+++ b/source/blender/gpu/intern/gpu_capabilities.cc
@@ -26,9 +26,9 @@
#include "DNA_userdef_types.h"
-#include "GPU_extensions.h"
+#include "GPU_capabilities.h"
-#include "gpu_extensions_private.hh"
+#include "gpu_capabilities_private.hh"
#include "gl_backend.hh" /* TODO remove */
diff --git a/source/blender/gpu/intern/gpu_extensions_private.hh b/source/blender/gpu/intern/gpu_capabilities_private.hh
index ec387555bfe..ec387555bfe 100644
--- a/source/blender/gpu/intern/gpu_extensions_private.hh
+++ b/source/blender/gpu/intern/gpu_capabilities_private.hh
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
index d67ce0be310..f10fd8cd137 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -40,7 +40,7 @@
#include "BKE_material.h"
-#include "GPU_extensions.h"
+#include "GPU_capabilities.h"
#include "GPU_material.h"
#include "GPU_shader.h"
#include "GPU_uniform_buffer.h"
diff --git a/source/blender/gpu/intern/gpu_framebuffer.cc b/source/blender/gpu/intern/gpu_framebuffer.cc
index 44994c2cabf..a0b05df583a 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.cc
+++ b/source/blender/gpu/intern/gpu_framebuffer.cc
@@ -28,7 +28,7 @@
#include "BLI_utildefines.h"
#include "GPU_batch.h"
-#include "GPU_extensions.h"
+#include "GPU_capabilities.h"
#include "GPU_shader.h"
#include "GPU_texture.h"
diff --git a/source/blender/gpu/intern/gpu_shader.cc b/source/blender/gpu/intern/gpu_shader.cc
index fd01160cff6..38acc773c49 100644
--- a/source/blender/gpu/intern/gpu_shader.cc
+++ b/source/blender/gpu/intern/gpu_shader.cc
@@ -36,7 +36,7 @@
#include "DNA_space_types.h"
-#include "GPU_extensions.h"
+#include "GPU_capabilities.h"
#include "GPU_matrix.h"
#include "GPU_platform.h"
#include "GPU_shader.h"
diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c b/source/blender/gpu/intern/gpu_shader_builtin.c
index ed95a236da5..f528e67a80a 100644
--- a/source/blender/gpu/intern/gpu_shader_builtin.c
+++ b/source/blender/gpu/intern/gpu_shader_builtin.c
@@ -35,7 +35,6 @@
#include "DNA_space_types.h"
-#include "GPU_extensions.h"
#include "GPU_matrix.h"
#include "GPU_platform.h"
#include "GPU_shader.h"
diff --git a/source/blender/gpu/intern/gpu_state.cc b/source/blender/gpu/intern/gpu_state.cc
index 478fd639cdd..90c6efad2e8 100644
--- a/source/blender/gpu/intern/gpu_state.cc
+++ b/source/blender/gpu/intern/gpu_state.cc
@@ -30,7 +30,6 @@
#include "BKE_global.h"
-#include "GPU_extensions.h"
#include "GPU_glew.h"
#include "GPU_state.h"
diff --git a/source/blender/gpu/intern/gpu_uniform_buffer.cc b/source/blender/gpu/intern/gpu_uniform_buffer.cc
index 24e5b452e03..4926a5fa2dc 100644
--- a/source/blender/gpu/intern/gpu_uniform_buffer.cc
+++ b/source/blender/gpu/intern/gpu_uniform_buffer.cc
@@ -32,8 +32,6 @@
#include "GPU_material.h"
-#include "GPU_extensions.h"
-
#include "GPU_uniform_buffer.h"
#include "gpu_uniform_buffer_private.hh"
diff --git a/source/blender/gpu/opengl/gl_backend.cc b/source/blender/gpu/opengl/gl_backend.cc
index 317416ca355..fedc03f5787 100644
--- a/source/blender/gpu/opengl/gl_backend.cc
+++ b/source/blender/gpu/opengl/gl_backend.cc
@@ -23,7 +23,7 @@
#include "BKE_global.h"
-#include "gpu_extensions_private.hh"
+#include "gpu_capabilities_private.hh"
#include "gpu_platform_private.hh"
#include "glew-mx.h"
diff --git a/source/blender/gpu/opengl/gl_batch.cc b/source/blender/gpu/opengl/gl_batch.cc
index f4ad7194ce1..c28d3e33e65 100644
--- a/source/blender/gpu/opengl/gl_batch.cc
+++ b/source/blender/gpu/opengl/gl_batch.cc
@@ -29,8 +29,6 @@
#include "glew-mx.h"
-#include "GPU_extensions.h"
-
#include "gpu_batch_private.hh"
#include "gpu_shader_private.hh"
diff --git a/source/blender/gpu/opengl/gl_drawlist.cc b/source/blender/gpu/opengl/gl_drawlist.cc
index 0768f7502ce..7cec6da7541 100644
--- a/source/blender/gpu/opengl/gl_drawlist.cc
+++ b/source/blender/gpu/opengl/gl_drawlist.cc
@@ -27,7 +27,7 @@
#include "BLI_assert.h"
#include "GPU_batch.h"
-#include "GPU_extensions.h"
+#include "GPU_capabilities.h"
#include "glew-mx.h"
diff --git a/source/blender/gpu/opengl/gl_framebuffer.cc b/source/blender/gpu/opengl/gl_framebuffer.cc
index 506a945d9d4..d0644b356ac 100644
--- a/source/blender/gpu/opengl/gl_framebuffer.cc
+++ b/source/blender/gpu/opengl/gl_framebuffer.cc
@@ -23,7 +23,7 @@
#include "BKE_global.h"
-#include "GPU_extensions.h"
+#include "GPU_capabilities.h"
#include "gl_backend.hh"
#include "gl_framebuffer.hh"
diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc
index 76e20de1e51..a303229fc3c 100644
--- a/source/blender/gpu/opengl/gl_shader.cc
+++ b/source/blender/gpu/opengl/gl_shader.cc
@@ -25,7 +25,6 @@
#include "BLI_string.h"
-#include "GPU_extensions.h"
#include "GPU_platform.h"
#include "gl_backend.hh"
diff --git a/source/blender/gpu/opengl/gl_state.cc b/source/blender/gpu/opengl/gl_state.cc
index dc6d475d39f..b43b01aed4f 100644
--- a/source/blender/gpu/opengl/gl_state.cc
+++ b/source/blender/gpu/opengl/gl_state.cc
@@ -25,7 +25,7 @@
#include "BLI_math_base.h"
#include "BLI_math_bits.h"
-#include "GPU_extensions.h"
+#include "GPU_capabilities.h"
#include "glew-mx.h"
diff --git a/source/blender/gpu/opengl/gl_texture.cc b/source/blender/gpu/opengl/gl_texture.cc
index 4c3d34a759f..2934865f4d1 100644
--- a/source/blender/gpu/opengl/gl_texture.cc
+++ b/source/blender/gpu/opengl/gl_texture.cc
@@ -25,7 +25,7 @@
#include "DNA_userdef_types.h"
-#include "GPU_extensions.h"
+#include "GPU_capabilities.h"
#include "GPU_framebuffer.h"
#include "GPU_platform.h"
diff --git a/source/blender/gpu/opengl/gl_uniform_buffer.cc b/source/blender/gpu/opengl/gl_uniform_buffer.cc
index 82b7341d145..8c8fac44fdc 100644
--- a/source/blender/gpu/opengl/gl_uniform_buffer.cc
+++ b/source/blender/gpu/opengl/gl_uniform_buffer.cc
@@ -25,8 +25,6 @@
#include "BLI_string.h"
-#include "GPU_extensions.h"
-
#include "gpu_backend.hh"
#include "gpu_context_private.hh"