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

metal: work towards shader uniform implementation.

Browse Source 
Misc cleanup.
This commit is contained in:
Alex Szpakowski
2020-10-24 00:33:02 -03:00
parent 5b4de2308d
commit 4b9c648c8b
10 changed files with 262 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+3 -3
View File
@@ -129,7 +129,7 @@ Graphics::Graphics()
window->windowToDPICoords(&dpiW, &dpiH);
void *context = nullptr; // TODO
setMode(context, (int) dpiW, (int) dpiH, window->getPixelWidth(), window->getPixelHeight(), settings.stencil);
setMode(context, (int) dpiW, (int) dpiH, window->getPixelWidth(), window->getPixelHeight(), settings.stencil, settings.depth);
}
}
}
@@ -190,12 +190,12 @@ void Graphics::setViewportSize(int width, int height, int pixelwidth, int pixelh
}
}
bool Graphics::setMode(void *context, int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil)
bool Graphics::setMode(void *context, int width, int height, int pixelwidth, int pixelheight, bool backbufferstencil, int /*backbufferdepth*/)
{
this->width = width;
this->height = height;
this->windowHasStencil = windowhasstencil;
this->windowHasStencil = backbufferstencil;
// Okay, setup OpenGL.
gl.initContext();
src/modules/graphics/opengl/Graphics.h
+1 -1
View File
@@ -63,7 +63,7 @@ public:
love::graphics::Buffer *newBuffer(const Buffer::Settings &settings, const std::vector<Buffer::DataDeclaration> &format, const void *data, size_t size, size_t arraylength) override;
void setViewportSize(int width, int height, int pixelwidth, int pixelheight) override;
bool setMode(void *context, int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil) override;
bool setMode(void *context, int width, int height, int pixelwidth, int pixelheight, bool backbufferstencil, int backbufferdepth) override;
void unSetMode() override;
void setActive(bool active) override;
src/modules/graphics/opengl/OpenGL.cpp
+1
View File
@@ -588,6 +588,7 @@ GLenum OpenGL::getGLBufferType(BufferType type)
case BUFFERTYPE_VERTEX: return GL_ARRAY_BUFFER;
case BUFFERTYPE_INDEX: return GL_ELEMENT_ARRAY_BUFFER;
case BUFFERTYPE_TEXEL: return GL_TEXTURE_BUFFER;
case BUFFERTYPE_UNIFORM: return GL_UNIFORM_BUFFER;
case BUFFERTYPE_MAX_ENUM: return GL_ZERO;
}