system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-19 21:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Move the resource bind_count field up to wined3d_resource.

Browse source
This commit is contained in:
Henri Verbeet 2012-04-25 21:24:22 +02:00 committed by Alexandre Julliard
parent 9fd2d34d68
commit de43de510a
4 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/wined3d/buffer.c
View file

@ -767,7 +767,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer)
}
/* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */
if (device->isInDraw && buffer->bind_count > 0)
if (device->isInDraw && buffer->resource.bind_count > 0)
{
decl_changed = buffer_find_decl(buffer);
buffer->flags |= WINED3D_BUFFER_HASDESC;
@ -836,7 +836,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer)
FIXME("Too many full buffer conversions, stopping converting.\n");
buffer_unload(&buffer->resource);
buffer->flags &= ~WINED3D_BUFFER_CREATEBO;
if (buffer->bind_count)
if (buffer->resource.bind_count)
device_invalidate_state(device, STATE_STREAMSRC);
return;
}
@ -1063,7 +1063,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN
TRACE("Dynamic buffer, dropping VBO\n");
buffer_unload(&buffer->resource);
buffer->flags &= ~WINED3D_BUFFER_CREATEBO;
if (buffer->bind_count)
if (buffer->resource.bind_count)
device_invalidate_state(device, STATE_STREAMSRC);
}
else

12
dlls/wined3d/device.c
View file

@ -1696,12 +1696,12 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI
if (buffer)
{
InterlockedIncrement(&buffer->bind_count);
InterlockedIncrement(&buffer->resource.bind_count);
wined3d_buffer_incref(buffer);
}
if (prev_buffer)
{
InterlockedDecrement(&prev_buffer->bind_count);
InterlockedDecrement(&prev_buffer->resource.bind_count);
wined3d_buffer_decref(prev_buffer);
}
@ -2328,12 +2328,12 @@ HRESULT CDECL wined3d_device_set_index_buffer(struct wined3d_device *device,
device_invalidate_state(device, STATE_INDEXBUFFER);
if (buffer)
{
InterlockedIncrement(&buffer->bind_count);
InterlockedIncrement(&buffer->resource.bind_count);
wined3d_buffer_incref(buffer);
}
if (prev_buffer)
{
InterlockedDecrement(&prev_buffer->bind_count);
InterlockedDecrement(&prev_buffer->resource.bind_count);
wined3d_buffer_decref(prev_buffer);
}
}
@ -3669,7 +3669,7 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device,
if (texture)
{
LONG bind_count = InterlockedIncrement(&texture->bind_count);
LONG bind_count = InterlockedIncrement(&texture->resource.bind_count);
wined3d_texture_incref(texture);
@ -3691,7 +3691,7 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device,
if (prev)
{
LONG bind_count = InterlockedDecrement(&prev->bind_count);
LONG bind_count = InterlockedDecrement(&prev->resource.bind_count);
wined3d_texture_decref(prev);

4
dlls/wined3d/texture.c
View file

@ -502,7 +502,7 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod)
texture->texture_rgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U;
texture->texture_srgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U;
if (texture->bind_count)
if (texture->resource.bind_count)
device_invalidate_state(texture->resource.device, STATE_SAMPLER(texture->sampler));
}
@ -1056,7 +1056,7 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB
/* TODO: Use already acquired context when possible. */
context = context_acquire(device, NULL);
if (texture->bind_count > 0)
if (texture->resource.bind_count > 0)
{
BOOL texture_srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB;
BOOL sampler_srgb = texture_srgb_mode(texture, srgb);

3
dlls/wined3d/wined3d_private.h
View file

@ -1837,6 +1837,7 @@ struct wined3d_resource_ops
struct wined3d_resource
{
LONG ref;
LONG bind_count;
struct wined3d_device *device;
enum wined3d_resource_type type;
const struct wined3d_format *format;
@ -1929,7 +1930,6 @@ struct wined3d_texture
float pow2_matrix[16];
UINT lod;
enum wined3d_texture_filter_type filter_type;
LONG bind_count;
DWORD sampler;
DWORD flags;
const struct min_lookup *min_mip_lookup;
@ -2408,7 +2408,6 @@ struct wined3d_buffer
GLenum buffer_object_usage;
GLenum buffer_type_hint;
UINT buffer_object_size;
LONG bind_count;
DWORD flags;
LONG lock_count;