PackedTexture: Handle texture creation failure

Prevents possible crashes later on. See: crash report #444
arx · Jan 26, 2013 · 818a67e · 818a67e
1 parent 3eec2ef
commit 818a67e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/graphics/d3d9/D3D9Texture2D.cpp b/src/graphics/d3d9/D3D9Texture2D.cpp
@@ -58,8 +58,8 @@ DX9Texture2D::~DX9Texture2D()
 	Destroy();
 }
 
-bool DX9Texture2D::Create()
-{	
+bool DX9Texture2D::Create() {
+
 	arx_assert_msg(m_pTexture == 0, "Texture already created!");
 	arx_assert(size.x != 0);
 	arx_assert(size.y != 0);

diff --git a/src/graphics/font/Font.cpp b/src/graphics/font/Font.cpp
@@ -159,7 +159,14 @@ bool Font::insertGlyph(Char character) {
 		memcpy(dst, src, glyph.size.x * glyph.size.y);
 
 		Vec2i offset;
-		textures->insertImage(imgGlyph, glyph.texture, offset);
+		if(!textures->insertImage(imgGlyph, glyph.texture, offset)) {
+			std::ostringstream oss;
+			util::writeUTF8(std::ostream_iterator<char>(oss), character);
+			LogWarning << "Could not upload glyph for character U+" << std::hex << character
+			           << " (" << oss.str() << ") in font " << info.name;
+			insertPlaceholderGlyph(character);
+			return false;
+		}
 
 		// Compute UV mapping for each glyph.
 		const float textureSize = textures->getTextureSize();

diff --git a/src/graphics/texture/PackedTexture.cpp b/src/graphics/texture/PackedTexture.cpp
@@ -21,6 +21,7 @@
 
 #include "graphics/Renderer.h"
 #include "graphics/texture/Texture.h"
+#include "io/log/Logger.h"
 
 PackedTexture::PackedTexture(unsigned int pSize, Image::Format pFormat)
 	: textureSize(pSize), textureFormat(pFormat) { }
@@ -49,7 +50,12 @@ PackedTexture::TextureTree::TextureTree(unsigned int textureSize,
 	root.rect = Rect(0, 0, textureSize - 1, textureSize - 1);
 
 	texture = GRenderer->CreateTexture2D();
-	texture->Init(textureSize, textureSize, textureFormat);
+	if(!texture->Init(textureSize, textureSize, textureFormat)) {
+		LogError << "Could not create texture for size " << textureSize
+		         << " and format " << textureFormat;
+		delete texture, texture = NULL;
+		return;
+	}
 	texture->GetImage().Clear();
 	dirty = true;
 }
@@ -89,7 +95,12 @@ bool PackedTexture::insertImage(const Image & image, unsigned int & textureIndex
 
 	// No space found, create a new texture
 	if(!node) {
-		textures.push_back(new TextureTree(textureSize, textureFormat));
+		TextureTree * newTree = new TextureTree(textureSize, textureFormat);
+		if(!newTree->texture) {
+			delete newTree;
+			return false;
+		}
+		textures.push_back(newTree);
 		node = textures[textures.size() - 1]->insertImage(image);
 		nodeTree = textures.size() - 1;
 	}