diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-02-15 02:11:23 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-02-15 02:11:23 +0300 |
| commit | 89b47c121449c1e2e54470e71c7146222311951d (patch) | |
| tree | bb8af34424a317af745eaaa44dbdf2b8de4c620c | |
| parent | 302c74e596882cea13ac878cfe6b12d37d0cd9c6 (diff) | |
| parent | b744081f838409fda9a131e9039bd05b092c9d16 (diff) | |
Merge branch 'blender-v3.1-release'
| -rw-r--r-- | source/blender/gpu/intern/gpu_texture_private.hh | 11 | ||||
| -rw-r--r-- | source/blender/gpu/opengl/gl_debug.cc | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_texture_private.hh b/source/blender/gpu/intern/gpu_texture_private.hh index 0fc3a1f354b..2c57c467bcf 100644 --- a/source/blender/gpu/intern/gpu_texture_private.hh +++ b/source/blender/gpu/intern/gpu_texture_private.hh @@ -355,10 +355,15 @@ inline int to_component_len(eGPUTextureFormat format) { switch (format) { case GPU_RGBA8: + case GPU_RGBA8I: case GPU_RGBA8UI: - case GPU_RGBA16F: case GPU_RGBA16: + case GPU_RGBA16F: + case GPU_RGBA16I: + case GPU_RGBA16UI: case GPU_RGBA32F: + case GPU_RGBA32I: + case GPU_RGBA32UI: case GPU_SRGB8_A8: case GPU_RGB10_A2: return 4; @@ -366,11 +371,15 @@ inline int to_component_len(eGPUTextureFormat format) case GPU_R11F_G11F_B10F: return 3; case GPU_RG8: + case GPU_RG8I: + case GPU_RG8UI: case GPU_RG16: case GPU_RG16F: case GPU_RG16I: case GPU_RG16UI: case GPU_RG32F: + case GPU_RG32I: + case GPU_RG32UI: return 2; default: return 1; diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc index ea373afac7d..a3288ff4cff 100644 --- a/source/blender/gpu/opengl/gl_debug.cc +++ b/source/blender/gpu/opengl/gl_debug.cc @@ -112,7 +112,7 @@ static void APIENTRY debug_callback(GLenum UNUSED(source), break; } - if (((LOG.type->flag & CLG_FLAG_USE) && (LOG.type->level >= clog_severity))) { + if (((LOG.type->flag & CLG_FLAG_USE) && (LOG.type->level <= clog_severity))) { CLG_logf(LOG.type, clog_severity, debug_groups, "", "%s", message); if (severity == GL_DEBUG_SEVERITY_HIGH) { /* Focus on error message. */ |