lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve Canvas attachment errors;

This commit is contained in:
bjorn 2019-03-09 05:42:09 -08:00
parent c1705da8b7
commit 8722b6e296
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/types/canvas.c
View File

@ -33,8 +33,6 @@ static int luax_checkattachment(lua_State* L, int index, Attachment* attachment)
attachment->slice = lua_type(L, index) == LUA_TNUMBER ? lua_tointeger(L, index++) - 1 : 0;
attachment->level = lua_type(L, index) == LUA_TNUMBER ? luax_optmipmap(L, index++, attachment->texture) : 0;
}
bool isValidSlice = attachment->slice >= 0 && attachment->slice < lovrTextureGetDepth(attachment->texture, 0);
lovrAssert(isValidSlice, "Invalid slice %d\n", attachment->slice + 1);
return index;
}

16
src/graphics/canvas.c
View File

@ -18,11 +18,17 @@ void lovrCanvasSetAttachments(Canvas* canvas, Attachment* attachments, int count
for (int i = 0; i < count; i++) {
Texture* texture = attachments[i].texture;
int width = lovrTextureGetWidth(texture, attachments[i].level);
int height = lovrTextureGetHeight(texture, attachments[i].level);
bool hasDepth = canvas->flags.depth.enabled;
lovrAssert(!hasDepth || width == canvas->width, "Texture width of %d does not match Canvas width (%d)", width, canvas->width);
lovrAssert(!hasDepth || height == canvas->height, "Texture height of %d does not match Canvas height (%d)", height, canvas->height);
int slice = attachments[i].slice;
int level = attachments[i].level;
int width = lovrTextureGetWidth(texture, level);
int height = lovrTextureGetHeight(texture, level);
int depth = lovrTextureGetDepth(texture, level);
int mipmaps = lovrTextureGetMipmapCount(texture);
bool hasDepthBuffer = canvas->flags.depth.enabled;
lovrAssert(slice >= 0 && slice < depth, "Invalid attachment slice (Texture has %d, got %d)", depth, slice + 1);
lovrAssert(level >= 0 && level < mipmaps, "Invalid attachment mipmap level (Texture has %d, got %d)", mipmaps, level + 1);
lovrAssert(!hasDepthBuffer || width == canvas->width, "Texture width of %d does not match Canvas width (%d)", width, canvas->width);
lovrAssert(!hasDepthBuffer || height == canvas->height, "Texture height of %d does not match Canvas height (%d)", height, canvas->height);
lovrAssert(texture->msaa == canvas->flags.msaa, "Texture MSAA does not match Canvas MSAA");
lovrRetain(texture);
}