LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-14 10:13:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

metal: initial work on setRenderTarget

Browse Source
This commit is contained in:
Alex Szpakowski
2020-02-16 09:04:50 -04:00
parent 455b0c2c6b
commit e001e4336d
6 changed files with 68 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Graphics.h
+1 -1
View File
@@ -475,7 +475,7 @@ public:
* @param width The viewport width.
* @param height The viewport height.
**/
virtual bool setMode(int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil) = 0;
virtual bool setMode(void *context, int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil) = 0;
/**
* Un-sets the current graphics display mode (uninitializing objects if
src/modules/graphics/metal/Graphics.h
+1 -1
View File
@@ -44,7 +44,7 @@ public:
love::graphics::Buffer *newBuffer(size_t size, const void *data, BufferType type, vertex::Usage usage, uint32 mapflags) override;
void setViewportSize(int width, int height, int pixelwidth, int pixelheight) override;
bool setMode(int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil) override;
bool setMode(void *context, int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil) override;
void unSetMode() override;
void setActive(bool active) override;
src/modules/graphics/metal/Graphics.mm
+54 -9
View File
@@ -26,6 +26,8 @@
#include "window/Window.h"
#include "image/Image.h"
#import <QuartzCore/CAMetalLayer.h>
namespace love
{
namespace graphics
@@ -182,7 +184,8 @@ Graphics::Graphics()
double dpiH = h;
window->windowToDPICoords(&dpiW, &dpiH);
setMode((int) dpiW, (int) dpiH, window->getPixelWidth(), window->getPixelHeight(), settings.stencil);
void *context = nullptr; // TODO
setMode(context, (int) dpiW, (int) dpiH, window->getPixelWidth(), window->getPixelHeight(), settings.stencil);
}
}
}}
@@ -276,8 +279,8 @@ void Graphics::setViewportSize(int width, int height, int pixelwidth, int pixelh
}
}
bool Graphics::setMode(int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil)
{
bool Graphics::setMode(void *context, int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil)
{ @autoreleasepool {
this->width = width;
this->height = height;
@@ -320,7 +323,7 @@ bool Graphics::setMode(int width, int height, int pixelwidth, int pixelheight, b
Shader::standardShaders[Shader::STANDARD_DEFAULT]->attach();
return true;
}
}}
void Graphics::unSetMode()
{
@@ -685,15 +688,57 @@ void Graphics::drawQuads(int start, int count, const vertex::Attributes &attribu
}}
void Graphics::setRenderTargetsInternal(const RenderTargets &rts, int w, int h, int pixelw, int pixelh, bool hasSRGBcanvas)
{
{ @autoreleasepool {
const DisplayState &state = states.back();
// TODO
flushStreamDraws();
endPass();
}
for (size_t i = 0; i < rts.colors.size(); i++)
{
auto rt = rts.colors[i];
auto tex = rt.texture;
auto desc = passDesc.colorAttachments[i];
desc.texture = (__bridge id<MTLTexture>)(void*)tex->getRenderTargetHandle();
desc.level = rt.mipmap;
if (tex->getTextureType() == TEXTURE_VOLUME)
{
desc.slice = 0;
desc.depthPlane = rt.slice;
}
else
{
desc.slice = rt.slice;
desc.depthPlane = 0;
}
// Default to load until clear or discard is called.
desc.loadAction = MTLLoadActionLoad;
desc.storeAction = MTLStoreActionStore;
desc.resolveTexture = nil;
if (tex->getMSAA() > 1)
{
// TODO
desc.resolveTexture = (__bridge id<MTLTexture>)(void*)tex->getHandle();
// TODO: This StoreAction is only supported sometimes.
desc.storeAction = MTLStoreActionStoreAndMultisampleResolve;
}
passDesc.colorAttachments[i] = desc;
}
for (size_t i = rts.colors.size(); i < MAX_COLOR_RENDER_TARGETS; i++)
passDesc.colorAttachments[i] = nil;
// TODO: depth/stencil attachments
// TODO: projection matrix
// TODO: backbuffer
dirtyRenderState = STATEBIT_ALL;
}}
void Graphics::endPass()
{
src/modules/graphics/opengl/Graphics.cpp
+3 -3
View File
@@ -127,7 +127,8 @@ Graphics::Graphics()
double dpiH = h;
window->windowToDPICoords(&dpiW, &dpiH);
setMode((int) dpiW, (int) dpiH, window->getPixelWidth(), window->getPixelHeight(), settings.stencil);
void *context = nullptr; // TODO
setMode(context, (int) dpiW, (int) dpiH, window->getPixelWidth(), window->getPixelHeight(), settings.stencil);
}
}
}
@@ -188,7 +189,7 @@ void Graphics::setViewportSize(int width, int height, int pixelwidth, int pixelh
}
}
bool Graphics::setMode(int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil)
bool Graphics::setMode(void *context, int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil)
{
this->width = width;
this->height = height;
@@ -521,7 +522,6 @@ void Graphics::setRenderTargetsInternal(const RenderTargets &rts, int w, int h,
OpenGL::TempDebugGroup debuggroup("setRenderTargets");
flushStreamDraws();
endPass();
bool iswindow = rts.getFirstTarget().texture == nullptr;
src/modules/graphics/opengl/Graphics.h
+1 -1
View File
@@ -63,7 +63,7 @@ public:
love::graphics::Buffer *newBuffer(size_t size, const void *data, BufferType type, vertex::Usage usage, uint32 mapflags) override;
void setViewportSize(int width, int height, int pixelwidth, int pixelheight) override;
bool setMode(int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil) override;
bool setMode(void *context, int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil) override;
void unSetMode() override;
void setActive(bool active) override;
src/modules/window/sdl/Window.cpp
+8 -1
View File
@@ -578,7 +578,14 @@ bool Window::setWindow(int width, int height, WindowSettings *settings)
{
double scaledw, scaledh;
fromPixels((double) pixelWidth, (double) pixelHeight, scaledw, scaledh);
graphics->setMode((int) scaledw, (int) scaledh, pixelWidth, pixelHeight, f.stencil);
void *context = (void *) glcontext;
#if defined(LOVE_MACOS) || defined(LOVE_IOS)
if (renderer == graphics::Graphics::RENDERER_METAL)
context = (void *) metalView;
#endif
graphics->setMode(context, (int) scaledw, (int) scaledh, pixelWidth, pixelHeight, f.stencil);
}
#ifdef LOVE_ANDROID