mirror of https://github.com/bjornbytes/lovr.git
Framebuffer and depthbuffer should also be passed into the canvas create-from-handle
This commit is contained in:
parent
c68c850157
commit
dba6724915
|
@ -24,7 +24,7 @@ typedef struct {
|
||||||
typedef struct Canvas Canvas;
|
typedef struct Canvas Canvas;
|
||||||
|
|
||||||
Canvas* lovrCanvasCreate(int width, int height, CanvasFlags flags);
|
Canvas* lovrCanvasCreate(int width, int height, CanvasFlags flags);
|
||||||
Canvas* lovrCanvasCreateFromHandle(int width, int height, CanvasFlags flags, uint32_t handle, int attachmentCount, bool immortal);
|
Canvas* lovrCanvasCreateFromHandle(int width, int height, CanvasFlags flags, uint32_t framebuffer, uint32_t depthBuffer, uint32_t resolveBuffer, int attachmentCount, bool immortal);
|
||||||
void lovrCanvasDestroy(void* ref);
|
void lovrCanvasDestroy(void* ref);
|
||||||
const Attachment* lovrCanvasGetAttachments(Canvas* canvas, int* count);
|
const Attachment* lovrCanvasGetAttachments(Canvas* canvas, int* count);
|
||||||
void lovrCanvasSetAttachments(Canvas* canvas, Attachment* attachments, int count);
|
void lovrCanvasSetAttachments(Canvas* canvas, Attachment* attachments, int count);
|
||||||
|
|
|
@ -1233,11 +1233,13 @@ Canvas* lovrCanvasCreate(int width, int height, CanvasFlags flags) {
|
||||||
return canvas;
|
return canvas;
|
||||||
}
|
}
|
||||||
|
|
||||||
Canvas* lovrCanvasCreateFromHandle(int width, int height, CanvasFlags flags, uint32_t handle, int attachmentCount, bool immortal) {
|
Canvas* lovrCanvasCreateFromHandle(int width, int height, CanvasFlags flags, uint32_t framebuffer, uint32_t depthBuffer, uint32_t resolveBuffer, int attachmentCount, bool immortal) {
|
||||||
Canvas* canvas = lovrAlloc(Canvas, lovrCanvasDestroy);
|
Canvas* canvas = lovrAlloc(Canvas, lovrCanvasDestroy);
|
||||||
if (!canvas) return NULL;
|
if (!canvas) return NULL;
|
||||||
|
|
||||||
canvas->framebuffer = handle;
|
canvas->framebuffer = framebuffer;
|
||||||
|
canvas->depthBuffer = depthBuffer;
|
||||||
|
canvas->resolveBuffer = resolveBuffer;
|
||||||
canvas->attachmentCount = attachmentCount;
|
canvas->attachmentCount = attachmentCount;
|
||||||
canvas->width = width;
|
canvas->width = width;
|
||||||
canvas->height = height;
|
canvas->height = height;
|
||||||
|
|
|
@ -13,7 +13,7 @@ void lovrOculusMobileDraw(int framebuffer, int width, int height, float *eyeView
|
||||||
lovrGpuDirtyTexture();
|
lovrGpuDirtyTexture();
|
||||||
|
|
||||||
CanvasFlags flags = {0};
|
CanvasFlags flags = {0};
|
||||||
Canvas *canvas = lovrCanvasCreateFromHandle(width, height, flags, framebuffer, 1, true);
|
Canvas *canvas = lovrCanvasCreateFromHandle(width, height, flags, framebuffer, 0, 0, 1, true);
|
||||||
|
|
||||||
Camera camera = { .canvas = canvas, .stereo = false };
|
Camera camera = { .canvas = canvas, .stereo = false };
|
||||||
memcpy(camera.viewMatrix[0], eyeViewMatrix, sizeof(camera.viewMatrix[0]));
|
memcpy(camera.viewMatrix[0], eyeViewMatrix, sizeof(camera.viewMatrix[0]));
|
||||||
|
|
Loading…
Reference in New Issue