diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-09-07 14:59:22 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-09-07 15:03:03 +0300 |
commit | 6b91c641e81ec2256b63e3dc8c0fe9d4e5dcf411 (patch) | |
tree | 02423eebd06fe2c1467dd461f2967e7b8fc64504 /source/blender/gpu/opengl | |
parent | aa32e7a2f31486503edb430b15ce31a819e02702 (diff) |
GPU: Fix clang tidy warnings
Diffstat (limited to 'source/blender/gpu/opengl')
-rw-r--r-- | source/blender/gpu/opengl/gl_debug.cc | 6 | ||||
-rw-r--r-- | source/blender/gpu/opengl/gl_texture.hh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc index 5915b3ea226..d54ea0919b6 100644 --- a/source/blender/gpu/opengl/gl_debug.cc +++ b/source/blender/gpu/opengl/gl_debug.cc @@ -207,7 +207,7 @@ void check_gl_resources(const char *info) /* NOTE: This only check binding. To be valid, the bound texture needs to * be the same format/target the shader expects. */ uint64_t tex_needed = interface->enabled_tex_mask_; - tex_needed &= ~ctx->state_manager_active_get()->bound_texture_slots(); + tex_needed &= ~GLContext::state_manager_active_get()->bound_texture_slots(); if (ubo_needed == 0 && tex_needed == 0) { return; @@ -236,9 +236,9 @@ void check_gl_resources(const char *info) } } -void raise_gl_error(const char *msg) +void raise_gl_error(const char *info) { - debug_callback(0, GL_DEBUG_TYPE_ERROR, 0, GL_DEBUG_SEVERITY_HIGH, 0, msg, NULL); + debug_callback(0, GL_DEBUG_TYPE_ERROR, 0, GL_DEBUG_SEVERITY_HIGH, 0, info, NULL); } /** \} */ diff --git a/source/blender/gpu/opengl/gl_texture.hh b/source/blender/gpu/opengl/gl_texture.hh index 0f241a6f57b..bdb8a4df4b7 100644 --- a/source/blender/gpu/opengl/gl_texture.hh +++ b/source/blender/gpu/opengl/gl_texture.hh @@ -66,14 +66,14 @@ class GLTexture : public Texture { ~GLTexture(); void update_sub( - int mip, int offset[3], int extent[3], eGPUDataFormat format, const void *data) override; + int mip, int offset[3], int extent[3], eGPUDataFormat type, const void *data) override; void generate_mipmap(void) override; - void copy_to(Texture *tex) override; + void copy_to(Texture *dst) override; void clear(eGPUDataFormat format, const void *data) override; void swizzle_set(const char swizzle_mask[4]) override; void mip_range_set(int min, int max) override; - void *read(int mip, eGPUDataFormat format) override; + void *read(int mip, eGPUDataFormat type) override; void check_feedback_loop(void); |