CodeCow/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2026-06-28 21:01:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

WARNING: REVERTED CHANGE THAT BROKE BATCHING!!! #4849
Some checks failed
Android / build (arm64) (push) Has been cancelled
Details
Android / build (x86_64) (push) Has been cancelled
Details
CMakeBuilds / Windows Build (push) Has been cancelled
Details
CMakeBuilds / Linux Build (push) Has been cancelled
Details
Linux / build (i386, i386, /user/bin, 32) (push) Has been cancelled
Details
Linux / build (x86_64, amd64, /user/bin, 64) (push) Has been cancelled
Details
Linux Examples / build (push) Has been cancelled
Details
macOS / build (push) Has been cancelled
Details
WebAssembly / build (push) Has been cancelled
Details
Windows / build (ARM64, ARM64, msvc16, winarm64) (push) Has been cancelled
Details
Windows / build (i686, pe-i386, mingw-w64, win32) (push) Has been cancelled
Details
Windows / build (x64, x64, msvc16, win64) (push) Has been cancelled
Details
Windows / build (x86, Win32, msvc16, win32) (push) Has been cancelled
Details
Windows / build (x86_64, pe-x86-64, mingw-w64, win64) (push) Has been cancelled
Details
Windows Examples / build (push) Has been cancelled
Details
CodeQL / Analyze (cpp) (push) Has been cancelled
Details

Browse Source 
I'm sorry... I did not detect this change was breaking batching... :(
This commit is contained in:
Ray 2025-03-21 17:17:45 +01:00
parent 266fba1111
commit 46cd07d2c7
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rlgl.h
View File

@ -1459,9 +1459,6 @@ void rlBegin(int mode)
// NOTE: In all three cases, vertex are accumulated over default internal vertex buffer
if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].mode != mode)
{
// Get current binded texture to preserve it between draw modes change (QUADS <--> TRIANGLES)
int currentTexture = RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].textureId;
if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount > 0)
{
// Make sure current RLGL.currentBatch->draws[i].vertexCount is aligned a multiple of 4,
@ -1484,16 +1481,13 @@ void rlBegin(int mode)
RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].mode = mode;
RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount = 0;
RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].textureId = currentTexture; // Preserve active texture
RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].textureId = RLGL.State.defaultTextureId;
}
}
// Finish vertex providing
void rlEnd(void)
{
// Reset texture to default
rlSetTexture(RLGL.State.defaultTextureId);
// NOTE: Depth increment is dependant on rlOrtho(): z-near and z-far values,
// as well as depth buffer bit-depth (16bit or 24bit or 32bit)
// Correct increment formula would be: depthInc = (zfar - znear)/pow(2, bits)