[PATCH 0/1] MR1307: wined3d: Use the chunk allocator for GL element array buffers.

[PATCH 1/1] wined3d: Use the chunk allocator for GL element array buffers.

[Anton Baskanov]

From: Anton Baskanov

---
 dlls/wined3d/device.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index c314292031d..5fb5ba80f5b 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1084,7 +1084,8 @@ static struct wined3d_allocator_block *wined3d_device_gl_allocate_memory(struct
     return block;
 }

-static bool use_buffer_chunk_suballocation(const struct wined3d_gl_info *gl_info, GLenum binding)
+static bool use_buffer_chunk_suballocation(struct wined3d_device_gl *device_gl,
+        const struct wined3d_gl_info *gl_info, GLenum binding)
 {
     switch (binding)
     {
@@ -1095,6 +1096,11 @@ static bool use_buffer_chunk_suballocation(const struct wined3d_gl_info *gl_info
         case GL_UNIFORM_BUFFER:
             return true;

+        case GL_ELEMENT_ARRAY_BUFFER:
+            /* There is no way to specify an element array buffer offset for
+             * indirect draws in OpenGL. */
+            return device_gl->d.cs->c.state->feature_level < WINED3D_FEATURE_LEVEL_11;
+
         case GL_TEXTURE_BUFFER:
             return gl_info->supported[ARB_TEXTURE_BUFFER_RANGE];

@@ -1117,7 +1123,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win

if (gl_info->supported[ARB_BUFFER_STORAGE])
     {
-        if (use_buffer_chunk_suballocation(gl_info, binding))
+        if (use_buffer_chunk_suballocation(device_gl, gl_info, binding))
         {
             if ((memory = wined3d_device_gl_allocate_memory(device_gl, context_gl, memory_type_idx, size, &id)))
                 buffer_offset = memory->offset;

[Henri Verbeet (＠hverbeet)]

> +        case GL_ELEMENT_ARRAY_BUFFER:
> +            /* There is no way to specify an element array buffer offset for
> +             * indirect draws in OpenGL. */
> +            return device_gl->d.cs->c.state->feature_level < WINED3D_FEATURE_LEVEL_11;

In principle this would be a nice way to avoid the issue with indirect draws, but there are two issues with this:

- This code can get called from outside the CS thread, so accessing the CS state isn't necessarily safe.
  - Direct3D 11.1's SwapDeviceContextState() can end up changing the current feature level, without resources like index buffers needing to be recreated.