Henri Verbeet : wined3d: wined3d_device_set_base_vertex_index() never fails .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b8feef883375d973b48d31b0f421619113d0749f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b8feef883375d973b48d31b0f4...

Author: Henri Verbeet 
Date:   Thu Sep 13 09:18:16 2012 +0200

wined3d: wined3d_device_set_base_vertex_index() never fails.

---

dlls/wined3d/device.c  |   16 +---------------
 include/wine/wined3d.h |    2 +-
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index b0ce4c4..e5cf69b 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2260,25 +2260,11 @@ struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined
     return device->stateBlock->state.index_buffer;
 }

-/* Method to offer d3d9 a simple way to set the base vertex index without messing with the index buffer */
-HRESULT CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index)
+void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index)
 {
     TRACE("device %p, base_index %d.\n", device, base_index);

-    if (device->updateStateBlock->state.base_vertex_index == base_index)
-    {
-        TRACE("Application is setting the old value over, nothing to do\n");
-        return WINED3D_OK;
-    }
-
     device->updateStateBlock->state.base_vertex_index = base_index;
-
-    if (device->isRecordingState)
-    {
-        TRACE("Recording... not performing anything\n");
-        return WINED3D_OK;
-    }
-    return WINED3D_OK;
 }

INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *device)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 15aeb57..478abe0 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2189,7 +2189,7 @@ HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device,
         const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode,
         wined3d_device_reset_cb callback);
 void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window);
-HRESULT __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index);
+void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index);
 HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device,
         UINT plane_idx, const struct wined3d_vec4 *plane);
 HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device,