Henri Verbeet : wined3d: Keep track of "all_vbo" in the stream info structure.
Module: wine Branch: master Commit: 42b835754b71f8a9cf29d186c68201f9a01d0863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b835754b71f8a9cf29d186c6... Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 30 21:30:21 2012 +0200 wined3d: Keep track of "all_vbo" in the stream info structure. --- dlls/wined3d/device.c | 24 ++++++++++-------------- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e477021..2f48027 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -171,8 +171,7 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) } /* Context activation is done by the caller. */ -void device_stream_info_from_declaration(struct wined3d_device *device, - struct wined3d_stream_info *stream_info, BOOL *all_vbo) +void device_stream_info_from_declaration(struct wined3d_device *device, struct wined3d_stream_info *stream_info) { const struct wined3d_state *state = &device->stateBlock->state; /* We need to deal with frequency data! */ @@ -297,8 +296,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, if (!state->user_stream) { WORD map = stream_info->use_map; - if (all_vbo) - *all_vbo = TRUE; + stream_info->all_vbo = 1; /* PreLoad all the vertex buffers. */ for (i = 0; map; map >>= 1, ++i) @@ -320,16 +318,16 @@ void device_stream_info_from_declaration(struct wined3d_device *device, + (ptrdiff_t)element->data.addr; } - if (!buffer->buffer_object && all_vbo) - *all_vbo = FALSE; + if (!buffer->buffer_object) + stream_info->all_vbo = 0; if (buffer->query) device->buffer_queries[device->num_buffer_queries++] = buffer->query; } } - else if (all_vbo) + else { - *all_vbo = FALSE; + stream_info->all_vbo = 0; } } @@ -406,7 +404,6 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined { struct wined3d_stream_info *stream_info = &device->strided_streams; const struct wined3d_state *state = &device->stateBlock->state; - BOOL all_vbo; if (device->up_strided) { @@ -414,17 +411,16 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined TRACE("=============================== Strided Input ================================\n"); device_stream_info_from_strided(gl_info, device->up_strided, stream_info); if (TRACE_ON(d3d)) device_trace_strided_stream_info(stream_info); - all_vbo = FALSE; } else { TRACE("============================= Vertex Declaration =============================\n"); - device_stream_info_from_declaration(device, stream_info, &all_vbo); + device_stream_info_from_declaration(device, stream_info); } if (state->vertex_shader && !stream_info->position_transformed) { - if (state->vertex_declaration->half_float_conv_needed && !all_vbo) + if (state->vertex_declaration->half_float_conv_needed && !stream_info->all_vbo) { TRACE("Using drawStridedSlow with vertex shaders for FLOAT16 conversion.\n"); device->useDrawStridedSlow = TRUE; @@ -440,7 +436,7 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] & ((1 << WINED3D_FFP_DIFFUSE) | (1 << WINED3D_FFP_SPECULAR)); - if ((stream_info->position_transformed || (stream_info->use_map & slow_mask)) && !all_vbo) + if ((stream_info->position_transformed || (stream_info->use_map & slow_mask)) && !stream_info->all_vbo) { device->useDrawStridedSlow = TRUE; } @@ -3468,7 +3464,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, vs = state->vertex_shader; state->vertex_shader = NULL; state->user_stream = FALSE; - device_stream_info_from_declaration(device, &stream_info, NULL); + device_stream_info_from_declaration(device, &stream_info); state->user_stream = streamWasUP; state->vertex_shader = vs; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6c67ada..3a2b26b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -813,7 +813,7 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct wined3d_rect_pat * the stateblock. Beware of VBOs. */ vs = state->vertex_shader; state->vertex_shader = NULL; - device_stream_info_from_declaration(This, &stream_info, NULL); + device_stream_info_from_declaration(This, &stream_info); state->vertex_shader = vs; e = &stream_info.elements[WINED3D_FFP_POSITION]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 92b259e..1e5f87c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -920,7 +920,8 @@ struct wined3d_stream_info_element struct wined3d_stream_info { struct wined3d_stream_info_element elements[MAX_ATTRIBS]; - BOOL position_transformed; + DWORD position_transformed : 1; + DWORD all_vbo : 1; WORD swizzle_map; /* MAX_ATTRIBS, 16 */ WORD use_map; /* MAX_ATTRIBS, 16 */ }; @@ -1802,7 +1803,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_stream_info_from_declaration(struct wined3d_device *device, - struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN; + struct wined3d_stream_info *stream_info) DECLSPEC_HIDDEN; void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;
participants (1)
-
Alexandre Julliard