Henri Verbeet : wined3d: Merge wined3d_texture_check_block_align() into wined3d_texture_check_box_dimensions().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Mar  6 10:45:26 2017 +0100

wined3d: Merge wined3d_texture_check_block_align() into wined3d_texture_check_box_dimensions().

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/surface.c         | 81 +++++++--------------------------------
 dlls/wined3d/texture.c         | 87 ++++++++++++++++++------------------------
 dlls/wined3d/wined3d_private.h |  2 +-
 3 files changed, 52 insertions(+), 118 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=c51537ba9fffee96bfe50c3fc5e828045d2d57a3