Henri Verbeet : wined3d: Get rid of the "format_id" parameter to buffer_init().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1ae45f47cd969497563c146df623973e38358419
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1ae45f47cd969497563c146df...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue Oct 23 12:36:40 2018 +0330

wined3d: Get rid of the "format_id" parameter to buffer_init().

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/buffer.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index e7b0515..64ceeda 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -1341,11 +1341,11 @@ static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_
     return GL_ARRAY_BUFFER;
 }
 
-static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device,
-        UINT size, DWORD usage, enum wined3d_format_id format_id, unsigned int access, unsigned int bind_flags,
-        const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops)
+static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, UINT size,
+        DWORD usage, unsigned int access, unsigned int bind_flags, const struct wined3d_sub_resource_data *data,
+        void *parent, const struct wined3d_parent_ops *parent_ops)
 {
-    const struct wined3d_format *format = wined3d_get_format(device->adapter, format_id, usage);
+    const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, usage);
     const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
     struct wined3d_resource *resource = &buffer->resource;
     BOOL dynamic_buffer_ok;
@@ -1454,7 +1454,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct
     if (!(object = heap_alloc_zero(sizeof(*object))))
         return E_OUTOFMEMORY;
 
-    if (FAILED(hr = buffer_init(object, device, desc->byte_width, desc->usage, WINED3DFMT_UNKNOWN,
+    if (FAILED(hr = buffer_init(object, device, desc->byte_width, desc->usage,
             desc->access, desc->bind_flags, data, parent, parent_ops)))
     {
         WARN("Failed to initialize buffer, hr %#x.\n", hr);