Nikolay Sivov : d2d1: Fix bind flags used for bitmap resources.
Alexandre Julliard
julliard at winehq.org
Tue Oct 2 22:12:31 CDT 2018
Module: wine
Branch: master
Commit: f2429e3109c4caa92fdc22bed48f2c8b580ba3fb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2429e3109c4caa92fdc22bed48f2c8b580ba3fb
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Oct 2 09:33:06 2018 +0300
d2d1: Fix bind flags used for bitmap resources.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d2d1/bitmap.c | 6 +++++-
dlls/d2d1/tests/d2d1.c | 5 ++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
index 3948c26..6eee1d1 100644
--- a/dlls/d2d1/bitmap.c
+++ b/dlls/d2d1/bitmap.c
@@ -338,7 +338,11 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size,
texture_desc.SampleDesc.Count = 1;
texture_desc.SampleDesc.Quality = 0;
texture_desc.Usage = D3D10_USAGE_DEFAULT;
- texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE;
+ texture_desc.BindFlags = 0;
+ if (desc->bitmapOptions & D2D1_BITMAP_OPTIONS_TARGET)
+ texture_desc.BindFlags |= D3D10_BIND_RENDER_TARGET;
+ if (!(desc->bitmapOptions & D2D1_BITMAP_OPTIONS_CANNOT_DRAW))
+ texture_desc.BindFlags |= D3D10_BIND_SHADER_RESOURCE;
texture_desc.CPUAccessFlags = 0;
texture_desc.MiscFlags = 0;
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index d31c8ad..55d2f56 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -813,9 +813,8 @@ static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap *bitmap, BOOL h
if (!(options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW))
bind_flags |= D3D10_BIND_SHADER_RESOURCE;
- todo_wine_if (options == D2D1_BITMAP_OPTIONS_TARGET)
- ok_(__FILE__, line)(desc.BindFlags == bind_flags, "Unexpected bind flags %#x for bitmap options %#x.\n",
- desc.BindFlags, options);
+ ok_(__FILE__, line)(desc.BindFlags == bind_flags, "Unexpected bind flags %#x for bitmap options %#x.\n",
+ desc.BindFlags, options);
ok_(__FILE__, line)(!desc.CPUAccessFlags, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags);
ok_(__FILE__, line)(!desc.MiscFlags, "Unexpected misc flags %#x.\n", desc.MiscFlags);
More information about the wine-cvs
mailing list