[PATCH 0/1] MR1906: wined3d: Clamp the bound buffer range to the buffer size.

[Stefan Dösinger (＠stefan)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53671

---

Unless the application sets something, we use
WINED3D_MAX_CONSTANT_BUFFER_SIZE * sizeof(vec4).

https://registry.khronos.org/OpenGL-Refpages/gl4/html/glBindBufferRange.xhtm...
says it is an error to set offset + size larger than the buffer size. I don't
know why other drivers aren't rejecting our call.

[PATCH 1/1] wined3d: Clamp the bound buffer range to the buffer size.

[Stefan Dösinger]

From: Stefan Dösinger

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53671

---

Unless the application sets something, we use
WINED3D_MAX_CONSTANT_BUFFER_SIZE * sizeof(vec4).

https://registry.khronos.org/OpenGL-Refpages/gl4/html/glBindBufferRange.xhtm...
says it is an error to set offset + size larger than the buffer size. I don't
know why other drivers aren't rejecting our call.
---
 dlls/wined3d/state.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index eb25f01130e..a6d0b174e31 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4618,7 +4618,9 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state
         buffer = buffer_state->buffer;
         bo_gl = wined3d_bo_gl(buffer->buffer_object);
         GL_EXTCALL(glBindBufferRange(GL_UNIFORM_BUFFER, base + i,
-                bo_gl->id, bo_gl->b.buffer_offset + buffer_state->offset, buffer_state->size));
+                bo_gl->id, bo_gl->b.buffer_offset + buffer_state->offset,
+                min(buffer_state->size, buffer->resource.size - buffer_state->offset)));
+
         buffer->bo_user.valid = true;
     }
     checkGLcall("bind constant buffers");

[PATCH 0/1] MR1906: wined3d: Clamp the bound buffer range to the buffer size. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.

[PATCH 0/1] MR1906: wined3d: Clamp the bound buffer range to the buffer size. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.