mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected out-of-bounds array issue

Browse Source
This commit is contained in:
Ray 2017-09-13 22:23:24 +02:00
parent f3f6d3fd8e
commit 1d91a46008
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/audio.c
View File

@ -69,6 +69,7 @@
#define SUPPORT_FILEFORMAT_WAV #define SUPPORT_FILEFORMAT_WAV
#define SUPPORT_FILEFORMAT_OGG #define SUPPORT_FILEFORMAT_OGG
#define SUPPORT_FILEFORMAT_XM #define SUPPORT_FILEFORMAT_XM
#define SUPPORT_FILEFORMAT_MOD
//------------------------------------------------- //-------------------------------------------------
#if defined(AUDIO_STANDALONE) #if defined(AUDIO_STANDALONE)

10
src/rlgl.c
View File

@ -814,6 +814,12 @@ void rlEnableTexture(unsigned int id)
if (draws[drawsCounter - 1].textureId != id) if (draws[drawsCounter - 1].textureId != id)
{ {
if (draws[drawsCounter - 1].vertexCount > 0) drawsCounter++; if (draws[drawsCounter - 1].vertexCount > 0) drawsCounter++;
if (drawsCounter >= MAX_DRAWS_BY_TEXTURE)
{
rlglDraw();
drawsCounter = 1;
}
draws[drawsCounter - 1].textureId = id; draws[drawsCounter - 1].textureId = id;
draws[drawsCounter - 1].vertexCount = 0; draws[drawsCounter - 1].vertexCount = 0;
@ -2941,7 +2947,7 @@ void ToggleVrMode(void)
// Reset viewport and default projection-modelview matrices // Reset viewport and default projection-modelview matrices
rlViewport(0, 0, screenWidth, screenHeight); rlViewport(0, 0, screenWidth, screenHeight);
projection = MatrixOrtho(0, screenWidth, screenHeight, 0, 0.0f, 1.0f); projection = MatrixOrtho(0.0, screenWidth, screenHeight, 0.0, 0.0, 1.0);
modelview = MatrixIdentity(); modelview = MatrixIdentity();
} }
else vrStereoRender = true; else vrStereoRender = true;
@ -3043,7 +3049,7 @@ void EndVrDrawing(void)
// Reset viewport and default projection-modelview matrices // Reset viewport and default projection-modelview matrices
rlViewport(0, 0, screenWidth, screenHeight); rlViewport(0, 0, screenWidth, screenHeight);
projection = MatrixOrtho(0, screenWidth, screenHeight, 0, 0.0f, 1.0f); projection = MatrixOrtho(0.0, screenWidth, screenHeight, 0.0, 0.0, 1.0);
modelview = MatrixIdentity(); modelview = MatrixIdentity();
rlDisableDepthTest(); rlDisableDepthTest();