diff options
| author | Ray <[email protected]> | 2017-02-07 09:40:06 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-02-07 09:40:06 +0100 |
| commit | 94929011330b27f3d027975b52cf0d43ba85c38b (patch) | |
| tree | 9ddff0e6ddba65004557c3628a3d56dfaf47ea4b /src/rlgl.h | |
| parent | 17f09cb03484a408cdd50a3d2e4d6604bb1f4c70 (diff) | |
| parent | 1f6eb1fc61d2cc0cca54a79c1516432f09c86313 (diff) | |
| download | raylib-94929011330b27f3d027975b52cf0d43ba85c38b.tar.gz raylib-94929011330b27f3d027975b52cf0d43ba85c38b.zip | |
Merge pull request #223 from raysan5/develop
Integrate develop branch into master
Diffstat (limited to 'src/rlgl.h')
| -rw-r--r-- | src/rlgl.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -97,7 +97,7 @@ // NOTE: This is the maximum amount of lines, triangles and quads per frame, be careful! #define MAX_LINES_BATCH 8192 #define MAX_TRIANGLES_BATCH 4096 - #define MAX_QUADS_BATCH 4096 + #define MAX_QUADS_BATCH 8192 #elif defined(GRAPHICS_API_OPENGL_ES2) // NOTE: Reduce memory sizes for embedded systems (RPI and HTML5) // NOTE: On HTML5 (emscripten) this is allocated on heap, by default it's only 16MB!...just take care... @@ -370,7 +370,7 @@ void rlglLoadExtensions(void *loader); // Load OpenGL extensions unsigned int rlglLoadTexture(void *data, int width, int height, int textureFormat, int mipmapCount); // Load texture in GPU RenderTexture2D rlglLoadRenderTexture(int width, int height); // Load a texture to be used for rendering (fbo with color and depth attachments) -void rlglUpdateTexture(unsigned int id, int width, int height, int format, void *data); // Update GPU texture with new data +void rlglUpdateTexture(unsigned int id, int width, int height, int format, const void *data); // Update GPU texture with new data void rlglGenerateMipmaps(Texture2D *texture); // Generate mipmap data for selected texture void rlglLoadMesh(Mesh *mesh, bool dynamic); // Upload vertex data into GPU and provided VAO/VBO ids |
