Skip to content

W
wine-winehq
Commit 03196b9f authored by Chip Davis's avatar Chip Davis Committed by Alexandre Julliard
Browse files
Options

wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group.

Signed-off-by: 's avatarChip Davis <cdavis5x@gmail.com>
parent c24ca340
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
dlls/wined3d/resource.c
View file @ 03196b9f
...@@ -195,7 +195,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * ...@@ -195,7 +195,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
resource->multisample_quality = multisample_quality; resource->multisample_quality = multisample_quality;
resource->usage = usage; resource->usage = usage;
resource->bind_flags = bind_flags; resource->bind_flags = bind_flags;
if (resource->format_flags & WINED3DFMT_FLAG_MAPPABLE) if (resource->format_attrs & WINED3D_FORMAT_ATTR_MAPPABLE)
access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;
resource->access = access; resource->access = access;
resource->width = width; resource->width = width;
......
dlls/wined3d/utils.c
View file @ 03196b9f
...@@ -315,14 +315,10 @@ struct wined3d_format_base_flags ...@@ -315,14 +315,10 @@ struct wined3d_format_base_flags
* resource size. */ * resource size. */
static const struct wined3d_format_base_flags format_base_flags[] = static const struct wined3d_format_base_flags format_base_flags[] =
{ {
{WINED3DFMT_ATI1N, WINED3D_FORMAT_ATTR_BROKEN_PITCH, {WINED3DFMT_ATI1N, WINED3D_FORMAT_ATTR_MAPPABLE | WINED3D_FORMAT_ATTR_BROKEN_PITCH},
WINED3DFMT_FLAG_MAPPABLE}, {WINED3DFMT_ATI2N, WINED3D_FORMAT_ATTR_MAPPABLE | WINED3D_FORMAT_ATTR_BROKEN_PITCH},
{WINED3DFMT_ATI2N, WINED3D_FORMAT_ATTR_BROKEN_PITCH, {WINED3DFMT_D16_LOCKABLE, WINED3D_FORMAT_ATTR_MAPPABLE},
WINED3DFMT_FLAG_MAPPABLE}, {WINED3DFMT_INTZ, WINED3D_FORMAT_ATTR_MAPPABLE},
{WINED3DFMT_D16_LOCKABLE, 0,
WINED3DFMT_FLAG_MAPPABLE},
{WINED3DFMT_INTZ, 0,
WINED3DFMT_FLAG_MAPPABLE},
{WINED3DFMT_R11G11B10_FLOAT, WINED3D_FORMAT_ATTR_FLOAT}, {WINED3DFMT_R11G11B10_FLOAT, WINED3D_FORMAT_ATTR_FLOAT},
{WINED3DFMT_D32_FLOAT, WINED3D_FORMAT_ATTR_FLOAT}, {WINED3DFMT_D32_FLOAT, WINED3D_FORMAT_ATTR_FLOAT},
{WINED3DFMT_S8_UINT_D24_FLOAT, WINED3D_FORMAT_ATTR_FLOAT}, {WINED3DFMT_S8_UINT_D24_FLOAT, WINED3D_FORMAT_ATTR_FLOAT},
......
dlls/wined3d/wined3d_private.h
View file @ 03196b9f
...@@ -6118,6 +6118,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN ...@@ -6118,6 +6118,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN
#define WINED3D_FORMAT_ATTR_COMPRESSED 0x00000080 #define WINED3D_FORMAT_ATTR_COMPRESSED 0x00000080
#define WINED3D_FORMAT_ATTR_BROKEN_PITCH 0x00000100 #define WINED3D_FORMAT_ATTR_BROKEN_PITCH 0x00000100
#define WINED3D_FORMAT_ATTR_HEIGHT_SCALE 0x00000200 #define WINED3D_FORMAT_ATTR_HEIGHT_SCALE 0x00000200
#define WINED3D_FORMAT_ATTR_MAPPABLE 0x00000400
/* WineD3D pixel format flags */ /* WineD3D pixel format flags */
#define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 #define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001
...@@ -6136,7 +6137,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN ...@@ -6136,7 +6137,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN
#define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000
#define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000 #define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000
#define WINED3DFMT_FLAG_BLIT 0x02000000 #define WINED3DFMT_FLAG_BLIT 0x02000000
#define WINED3DFMT_FLAG_MAPPABLE 0x04000000
#define WINED3DFMT_FLAG_CAST_TO_BLOCK 0x08000000 #define WINED3DFMT_FLAG_CAST_TO_BLOCK 0x08000000
#define WINED3DFMT_FLAG_INDEX_BUFFER 0x10000000 #define WINED3DFMT_FLAG_INDEX_BUFFER 0x10000000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment