Henri Verbeet : wined3d: Don' t clear the alloc flags in wined3d_surface_set_format().

Alexandre Julliard julliard at winehq.org
Wed Jun 15 13:42:56 CDT 2011


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Jun 14 20:28:12 2011 +0200

wined3d: Don't clear the alloc flags in wined3d_surface_set_format().

Changing the format is only allowed for surfaces with format
WINED3DFMT_UNKNOWN, in which case there can't be a GL texture allocated.

---

 dlls/wined3d/surface.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 6202513..132a98a 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3099,7 +3099,6 @@ HRESULT CDECL wined3d_surface_set_format(struct wined3d_surface *surface, enum w
     surface->resource.size = wined3d_format_calculate_size(format, surface->resource.device->surface_alignment,
             surface->pow2Width, surface->pow2Height);
     surface->flags |= (WINED3DFMT_D16_LOCKABLE == format_id) ? SFLAG_LOCKABLE : 0;
-    surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED);
     surface->resource.format = format;
 
     TRACE("size %u, byte_count %u\n", surface->resource.size, format->byte_count);




More information about the wine-cvs mailing list