From 811552ef2e055199c3fed948a09d10be245c0749 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 24 Aug 2016 12:20:21 +0200 Subject: [PATCH] Improve error messages using GLenum strings --- renderdoc/driver/gl/gl_resources.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/renderdoc/driver/gl/gl_resources.cpp b/renderdoc/driver/gl/gl_resources.cpp index 55fe7c7a0..4e44f44bb 100644 --- a/renderdoc/driver/gl/gl_resources.cpp +++ b/renderdoc/driver/gl/gl_resources.cpp @@ -30,7 +30,7 @@ size_t GetCompressedByteSize(GLsizei w, GLsizei h, GLsizei d, GLenum internalfor { if(!IsCompressedFormat(internalformat)) { - RDCERR("Not compressed format"); + RDCERR("Not compressed format %s", ToStr::Get(internalformat).c_str()); return GetByteSize(w, h, d, GetBaseFormat(internalformat), GetDataType(internalformat)); } @@ -208,7 +208,7 @@ size_t GetCompressedByteSize(GLsizei w, GLsizei h, GLsizei d, GLenum internalfor return blocks[0] * blocks[1] * 16 * d; } - RDCERR("Unrecognised compressed format"); + RDCERR("Unrecognised compressed format %s", ToStr::Get(internalformat).c_str()); return GetByteSize(w, h, d, GetBaseFormat(internalformat), GetDataType(internalformat)); } @@ -250,7 +250,7 @@ size_t GetByteSize(GLsizei w, GLsizei h, GLsizei d, GLenum format, GLenum type) case eGL_UNSIGNED_INT_24_8: return w * h * d * 4; case eGL_DEPTH32F_STENCIL8: case eGL_FLOAT_32_UNSIGNED_INT_24_8_REV: return w * h * d * 8; - default: RDCERR("Unhandled Byte Size type %d!", type); break; + default: RDCERR("Unhandled Byte Size type %s!", ToStr::Get(type).c_str()); break; } switch((int)format) @@ -278,7 +278,7 @@ size_t GetByteSize(GLsizei w, GLsizei h, GLsizei d, GLenum format, GLenum type) case eGL_RGBA_INTEGER: case eGL_BGRA: case eGL_BGRA_INTEGER: return w * h * d * elemSize * 4; - default: RDCERR("Unhandled Byte Size format %d!", format); break; + default: RDCERR("Unhandled Byte Size format %s!", ToStr::Get(type).c_str()); break; } RDCERR("Unhandled Byte Size case!"); @@ -371,7 +371,7 @@ GLenum GetBaseFormat(GLenum internalFormat) default: break; } - RDCERR("Unhandled Base Format case %d!", internalFormat); + RDCERR("Unhandled Base Format case %s!", ToStr::Get(internalFormat).c_str()); return eGL_NONE; } @@ -455,7 +455,7 @@ GLenum GetDataType(GLenum internalFormat) default: break; } - RDCERR("Unhandled Data Type case %d!", internalFormat); + RDCERR("Unhandled Data Type case %s!", ToStr::Get(internalFormat).c_str()); return eGL_NONE; } @@ -889,7 +889,7 @@ GLenum TextureBinding(GLenum target) default: break; } - RDCERR("Unexpected target %x", target); + RDCERR("Unexpected target %s", ToStr::Get(target).c_str()); return eGL_NONE; } @@ -915,7 +915,7 @@ GLenum BufferBinding(GLenum target) default: break; } - RDCERR("Unexpected target %x", target); + RDCERR("Unexpected target %s", ToStr::Get(target).c_str()); return eGL_NONE; }