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

Merged default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-08-21 16:53:43 -03:00
parent 23f2d617e0 44b97dfadc
commit 71c71985d3
23 changed files with 282 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/OpenGL.h
+15 -3
View File
@@ -139,6 +139,12 @@ public:
OpenGL ≷
};
struct Stats
{
size_t textureMemory;
int drawCalls;
} stats;
OpenGL();
/**
@@ -170,13 +176,17 @@ public:
void prepareDraw();
/**
* glDrawArraysInstanced with a pseudo-instancing fallback.
* glDrawArrays and glDrawElements which increment the draw-call counter by
* themselves.
**/
void drawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei primcount);
void drawArrays(GLenum mode, GLint first, GLsizei count);
void drawElements(GLenum mode, GLsizei count, GLenum type, const void *indices);
/**
* glDrawElementsInstanced with a pseudo-instancing fallback.
* glDrawArraysInstanced and glDrawElementsInstanced with pseudo-instancing
* fallbacks. They also increment the draw-call counter (once per call).
**/
void drawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei primcount);
void drawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
/**
@@ -291,6 +301,8 @@ public:
**/
int getMaxRenderTargets() const;
void updateTextureMemorySize(size_t oldsize, size_t newsize);
/**
* Get the GPU vendor of this OpenGL context.
**/