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

Fix interaction between mipmaps/msaa resolution;

This commit is contained in:
bjorn 2018-08-29 14:08:03 -07:00
parent e287cee1c9
commit 3c78eae42b
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/graphics/opengl.c
View File

@ -1397,29 +1397,30 @@ void lovrCanvasBind(Canvas* canvas) {
}
void lovrCanvasResolve(Canvas* canvas) {
if (!canvas->needsResolve || !canvas->flags.msaa) {
if (!canvas->needsResolve) {
return;
}
int w = canvas->width;
int h = canvas->height;
glBindFramebuffer(GL_READ_FRAMEBUFFER, canvas->framebuffer);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, canvas->resolveBuffer);
state.framebuffer = canvas->resolveBuffer;
canvas->needsResolve = false;
if (canvas->flags.msaa) {
int w = canvas->width;
int h = canvas->height;
glBindFramebuffer(GL_READ_FRAMEBUFFER, canvas->framebuffer);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, canvas->resolveBuffer);
state.framebuffer = canvas->resolveBuffer;
if (canvas->count == 1) {
glBlitFramebuffer(0, 0, w, h, 0, 0, w, h, GL_COLOR_BUFFER_BIT, GL_NEAREST);
} else {
GLenum buffers[MAX_CANVAS_ATTACHMENTS] = { GL_NONE };
for (int i = 0; i < canvas->count; i++) {
buffers[i] = GL_COLOR_ATTACHMENT0 + i;
glReadBuffer(i);
glDrawBuffers(1, &buffers[i]);
if (canvas->count == 1) {
glBlitFramebuffer(0, 0, w, h, 0, 0, w, h, GL_COLOR_BUFFER_BIT, GL_NEAREST);
} else {
GLenum buffers[MAX_CANVAS_ATTACHMENTS] = { GL_NONE };
for (int i = 0; i < canvas->count; i++) {
buffers[i] = GL_COLOR_ATTACHMENT0 + i;
glReadBuffer(i);
glDrawBuffers(1, &buffers[i]);
glBlitFramebuffer(0, 0, w, h, 0, 0, w, h, GL_COLOR_BUFFER_BIT, GL_NEAREST);
}
glReadBuffer(0);
glDrawBuffers(canvas->count, buffers);
}
glReadBuffer(0);
glDrawBuffers(canvas->count, buffers);
}
if (canvas->flags.mipmaps) {
@ -1431,6 +1432,8 @@ void lovrCanvasResolve(Canvas* canvas) {
}
}
}
canvas->needsResolve = false;
}
void lovrCanvasBlit(Canvas* canvas) {