[PATCH 5/5] wined3d: Move the "buffer_object_usage" field from struct wined3d_buffer to struct wined3d_buffer_gl.
Henri Verbeet
hverbeet at codeweavers.com
Fri Oct 26 08:13:09 CDT 2018
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/wined3d/buffer.c | 4 ++--
dlls/wined3d/wined3d_private.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index 1481e9bc6f6..17bcb70bc34 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -257,7 +257,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf
goto fail;
}
- buffer_gl->b.buffer_object_usage = gl_usage;
+ buffer_gl->buffer_object_usage = gl_usage;
buffer_invalidate_bo_range(&buffer_gl->b, 0, 0);
return TRUE;
@@ -827,7 +827,7 @@ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl,
if (flags & WINED3D_MAP_DISCARD)
{
GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size,
- NULL, buffer_gl->b.buffer_object_usage));
+ NULL, buffer_gl->buffer_object_usage));
checkGLcall("glBufferData");
return;
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 226fdd0d3f5..2b52218972f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3759,7 +3759,6 @@ struct wined3d_buffer
struct wined3d_buffer_desc desc;
GLuint buffer_object;
- GLenum buffer_object_usage;
unsigned int bind_flags;
DWORD flags;
DWORD locations;
@@ -3799,6 +3798,7 @@ struct wined3d_buffer_gl
{
struct wined3d_buffer b;
+ GLenum buffer_object_usage;
GLenum buffer_type_hint;
};
--
2.11.0
More information about the wine-devel
mailing list