Merge branch 'master' of https://github.com/district53/irrlicht

solarenterprises · Mar 25, 2024 · 5097daa · 5097daa
2 parents d888cf0 + 1636ee8
commit 5097daa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/source/Irrlicht/COpenGLDriver.cpp b/source/Irrlicht/COpenGLDriver.cpp
@@ -496,7 +496,7 @@ bool COpenGLDriver::resizeIndexHardwareBufferSubData(SHWBufferLink* _HWBuffer, u
 	// Copy data from old buffer to new buffer
 	if (cpyIndexCount == 0)
 		cpyIndexCount = (irr::u32)size;
-	GLsizeiptrARB copySize = min(cpyIndexCount * indexSize, HWBuffer->vbo_indicesSize);
+	GLsizeiptrARB copySize = std::min((GLuint)cpyIndexCount * indexSize, HWBuffer->vbo_indicesSize);
 
 	extGlBindBuffer(GL_COPY_READ_BUFFER, prev_vbo_indicesID);
 	extGlBindBuffer(GL_COPY_WRITE_BUFFER, HWBuffer->vbo_indicesID);
@@ -553,7 +553,7 @@ bool COpenGLDriver::resizeVertexHardwareBufferSubData(SHWBufferLink* _HWBuffer,
 	// Copy data from old buffer to new buffer
 	if (cpyVertexCount == 0)
 		cpyVertexCount = (irr::u32)size;
-	GLsizeiptrARB copySize = min(cpyVertexCount * vertexSize, HWBuffer->vbo_verticesSize);
+	GLsizeiptrARB copySize = std::min((GLuint)cpyVertexCount * vertexSize, HWBuffer->vbo_verticesSize);
 
 	extGlBindBuffer(GL_COPY_READ_BUFFER, prev_vbo_vertexID);
 	extGlBindBuffer(GL_COPY_WRITE_BUFFER, HWBuffer->vbo_verticesID);