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

Additional Canvas validation;

This commit is contained in:
bjorn 2018-08-24 15:11:37 -07:00
parent 68d66f3f98
commit 329668eb39
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,9 @@
static int luax_checkattachment(lua_State* L, int index, Attachment* attachment) {
attachment->texture = luax_checktype(L, index++, Texture);
attachment->slice = lua_type(L, index) == LUA_TNUMBER ? lua_tointeger(L, index++) - 1 : 0;
attachment->level = 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;
}

14
src/graphics/opengl.c
View File

@ -1279,7 +1279,12 @@ void lovrCanvasSetAttachments(Canvas* canvas, Attachment* attachments, int count
if (canvas->dirty || memcmp(canvas->attachments, attachments, count * sizeof(Attachment))) {
for (int i = 0; i < count; i++) {
lovrRetain(attachments[i].texture);
Texture* texture = attachments[i].texture;
int width = lovrTextureGetWidth(texture, attachments[i].level);
int height = lovrTextureGetHeight(texture, attachments[i].level);
lovrAssert(width == canvas->width, "Texture width of %d does not match Canvas width", width);
lovrAssert(height == canvas->height, "Texture height of %d does not match Canvas height", height);
lovrRetain(texture);
}
for (int i = 0; i < canvas->count; i++) {
@ -1331,7 +1336,12 @@ void lovrCanvasBind(Canvas* canvas) {
glDrawBuffers(canvas->count, buffers);
GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
lovrAssert(status == GL_FRAMEBUFFER_COMPLETE, "Unable to bind framebuffer");
switch (status) {
case GL_FRAMEBUFFER_COMPLETE: break;
case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE: lovrThrow("Unable to set Canvas (MSAA settings)"); break;
case GL_FRAMEBUFFER_UNSUPPORTED: lovrThrow("Unable to set Canvas (Texture formats)"); break;
default: lovrThrow("Unable to set Canvas (reason unknown)"); break;
}
canvas->dirty = false;
}