diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-03 10:35:38 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-03 10:35:38 +0200 |
| commit | 41e762ca2973ce7aa03f14f81b98c85835d2b9d5 (patch) | |
| tree | 06a66566c346bcb4b3f2ad087c5625576f5a1516 /drivers | |
| parent | bc7a7a479eab822dd69756e35604093704233a5d (diff) | |
| parent | 62120c7841182cde448b94018ec924cde4369896 (diff) | |
| download | redot-engine-41e762ca2973ce7aa03f14f81b98c85835d2b9d5.tar.gz | |
Merge pull request #91454 from akien-mga/coverity-checks
Fix Steam input "crc" errors, and some other Coverity reports of uninitialized scalar variable
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/rasterizer_gles3.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/gles3/rasterizer_gles3.cpp b/drivers/gles3/rasterizer_gles3.cpp index 6e7d4a6733..993197e371 100644 --- a/drivers/gles3/rasterizer_gles3.cpp +++ b/drivers/gles3/rasterizer_gles3.cpp @@ -130,14 +130,11 @@ void RasterizerGLES3::clear_depth(float p_depth) { #ifdef CAN_DEBUG static void GLAPIENTRY _gl_debug_print(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const GLvoid *userParam) { - if (type == _EXT_DEBUG_TYPE_OTHER_ARB) { + // These are ultimately annoying, so removing for now. + if (type == _EXT_DEBUG_TYPE_OTHER_ARB || type == _EXT_DEBUG_TYPE_PERFORMANCE_ARB) { return; } - if (type == _EXT_DEBUG_TYPE_PERFORMANCE_ARB) { - return; //these are ultimately annoying, so removing for now - } - char debSource[256], debType[256], debSev[256]; if (source == _EXT_DEBUG_SOURCE_API_ARB) { @@ -152,6 +149,8 @@ static void GLAPIENTRY _gl_debug_print(GLenum source, GLenum type, GLuint id, GL strcpy(debSource, "Application"); } else if (source == _EXT_DEBUG_SOURCE_OTHER_ARB) { strcpy(debSource, "Other"); + } else { + ERR_FAIL_MSG(vformat("GL ERROR: Invalid or unhandled source '%d' in debug callback.", source)); } if (type == _EXT_DEBUG_TYPE_ERROR_ARB) { @@ -162,10 +161,8 @@ static void GLAPIENTRY _gl_debug_print(GLenum source, GLenum type, GLuint id, GL strcpy(debType, "Undefined behavior"); } else if (type == _EXT_DEBUG_TYPE_PORTABILITY_ARB) { strcpy(debType, "Portability"); - } else if (type == _EXT_DEBUG_TYPE_PERFORMANCE_ARB) { - strcpy(debType, "Performance"); - } else if (type == _EXT_DEBUG_TYPE_OTHER_ARB) { - strcpy(debType, "Other"); + } else { + ERR_FAIL_MSG(vformat("GL ERROR: Invalid or unhandled type '%d' in debug callback.", type)); } if (severity == _EXT_DEBUG_SEVERITY_HIGH_ARB) { @@ -174,6 +171,8 @@ static void GLAPIENTRY _gl_debug_print(GLenum source, GLenum type, GLuint id, GL strcpy(debSev, "Medium"); } else if (severity == _EXT_DEBUG_SEVERITY_LOW_ARB) { strcpy(debSev, "Low"); + } else { + ERR_FAIL_MSG(vformat("GL ERROR: Invalid or unhandled severity '%d' in debug callback.", severity)); } String output = String() + "GL ERROR: Source: " + debSource + "\tType: " + debType + "\tID: " + itos(id) + "\tSeverity: " + debSev + "\tMessage: " + message; |