February 2016 - Wine-Commits

Alexandre Julliard : tools: Add a script to update the ANNOUNCE file at release time.
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: 4bc2cbef09be64d719fe1f1bfb1bedbd645b7d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc2cbef09be64d719fe1f1bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 17:53:19 2016 +0900 tools: Add a script to update the ANNOUNCE file at release time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_announce | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/tools/make_announce b/tools/make_announce new file mode 100755 index 0000000..fedbc37 --- /dev/null +++ b/tools/make_announce @@ -0,0 +1,172 @@ +#!/usr/bin/perl -w +# +# Update the ANNOUNCE file for a new release. +# +# Usage: make_announce [new_version] +# +# Copyright 2016 Alexandre Julliard +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +# + +use strict; +use locale; +use POSIX; +use Text::CSV::Encoded; +binmode STDOUT, ':utf8'; + +sub unescape($) +{ + my $str = shift; + $str =~ s/"/\"/g; + $str =~ s/'/\'/g; + $str =~ s/&/&/g; + $str =~ s/</</g; + $str =~ s/>/>/g; + $str =~ s/@/\@/g; + return $str; +} + +# update a file if changed +sub update_file($) +{ + my $file = shift; + if (!(-f $file) || system "cmp $file $file.new >/dev/null") + { + rename "$file.new", "$file"; + print "$file updated\n"; + } + else + { + unlink "$file.new"; + } +} + +# determine the current version number +sub get_current_version() +{ + my $version; + + open VERSION, "<VERSION" or die "cannot open VERSION"; + if (<VERSION> =~ /Wine version (\S+)/) { $version = $1; } + close VERSION; + die "failed to parse VERSION" unless $version; + return $version; +} + +# retrieve a list of bugs with the specified filter +sub get_bugs($) +{ + my $filter = shift; + my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", encoding_out => "utf-8" }); + my %bugs; + + open QUERY, "-|" or exec "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?columnlist=short_desc&query_format=adva…" + or die "cannot query bug list"; + <QUERY>; # skip header line + while (<QUERY>) + { + next unless $csv->parse($_); + my ($id, $descr) = $csv->fields(); + $bugs{$id} = $descr; + } + close QUERY; + return %bugs; +} + +# retrieve the current list of authors +sub get_authors() +{ + my %authors; + + open AUTHORS, "<AUTHORS" or die "cannot open AUTHORS"; + <AUTHORS>; # skip header line + while (<AUTHORS>) + { + chomp; + next if /^$/; + $authors{$_} = 1; + } + close AUTHORS; + return %authors; +} + +# determine the version number + +my $old = get_current_version(); +my $new = $ARGV[0]; +unless ($new) +{ + if ($old =~ /^([0-9]+)\.([0-9]+)$/) { $new = "$1.$2.1"; } + elsif ($old =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)$/) { $new = "$1.$2." . ($3 + 1); } + elsif ($old =~ /^([0-9]+)\.([0-9]+)-rc([0-9]+)$/) { $new = "$1.$2-rc" . ($3 + 1); } + else { die "unknown version format $old"; } +} + +print "Updating files for release $new\n"; + +(my $reldir = $new) =~ s/^([0-9]+\.[0-9]+).*/$1/; +my $is_stable = ($new =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)$/) && !($2 % 2); # stable releases have an even minor number +my $filter = "product=Wine&resolution=FIXED&" . ($is_stable ? "target_milestone=$reldir.x" : "bug_status=RESOLVED"); + +my %bugs = get_bugs( $filter ); +my %authors = get_authors(); + +# update the ANNOUNCE file + +open ANNOUNCE, "<ANNOUNCE" or die "cannot open ANNOUNCE"; +open NEW, ">ANNOUNCE.new" or die "cannot create ANNOUNCE.new"; +while (<ANNOUNCE>) +{ + last if /^------------------/; + s!http://mirrors.ibiblio.org/wine/source/.*!http://mirrors.ibiblio.org/wine…!; + s!http://dl.winehq.org/wine/source/.*!http://dl.winehq.org/wine/source/$rel…!; + print NEW $_; +} + +print NEW "----------------------------------------------------------------\n\n"; +printf NEW "Bugs fixed in %s (total %u):\n\n", $new, scalar( keys %bugs ); +foreach my $id (sort {$a <=> $b} keys %bugs) +{ + printf NEW " %6d %s\n", $id, unescape( $bugs{$id} ); +} + +print NEW "\n----------------------------------------------------------------\n\n"; +print NEW "Changes since $old:\n\n"; + +open LOG, "-|" or exec "git", "shortlog", "wine-$old..HEAD" or die "cannot run git shortlog"; +while (<LOG>) +{ + if (/^(\S.*)\s$\d+$:$/) { $authors{$1} = 1; } + print NEW $_; +} +close LOG; + +while (<ANNOUNCE>) { last if /^--$/; } +print NEW "--\n"; +while (<ANNOUNCE>) { print NEW $_; } + +close ANNOUNCE; +close NEW; +update_file( "ANNOUNCE" ); + +# update the AUTHORS file + +setlocale( LC_COLLATE, "en_US.UTF-8" ); + +open AUTHORS, ">AUTHORS.new" or die "cannot create AUTHORS.new"; +print AUTHORS "Wine is available thanks to the work of:\n\n", join( "\n", sort keys %authors ), "\n"; +close AUTHORS; +update_file( "AUTHORS" );

1 0

Henri Verbeet : wined3d: Introduce a debug function for struct wined3d_box.
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: 36b38b8a203c2cca77b101810770afe952f7164a URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b38b8a203c2cca77b101810… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 22:23:00 2016 +0100 wined3d: Introduce a debug function for struct wined3d_box. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 ++++++--------- dlls/wined3d/resource.c | 4 ++-- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 9 +++++++++ dlls/wined3d/volume.c | 12 ++++-------- dlls/wined3d/wined3d_private.h | 1 + 7 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16015a4..8f39c3b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3965,9 +3965,9 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev HRESULT hr; TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, dst_x %u, dst_y %u, dst_z %u, " - "src_resource %p, src_sub_resource_idx %u, src_box %p.\n", + "src_resource %p, src_sub_resource_idx %u, src_box %s.\n", device, dst_resource, dst_sub_resource_idx, dst_x, dst_y, dst_z, - src_resource, src_sub_resource_idx, src_box); + src_resource, src_sub_resource_idx, debug_box(src_box)); if (src_resource == dst_resource && src_sub_resource_idx == dst_sub_resource_idx) { @@ -4017,9 +4017,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev { if (src_box->front >= src_box->back) { - WARN("Invalid box (%u, %u, %u)->(%u, %u, %u) specified.\n", - src_box->left, src_box->top, src_box->front, - src_box->right, src_box->bottom, src_box->back); + WARN("Invalid box %s specified.\n", debug_box(src_box)); return WINED3DERR_INVALIDCALL; } @@ -4060,8 +4058,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str POINT dst_point; RECT src_rect; - TRACE("device %p, resource %p, sub_resource_idx %u, box %p, data %p, row_pitch %u, depth_pitch %u.\n", - device, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); + TRACE("device %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u.\n", + device, resource, sub_resource_idx, debug_box(box), data, row_pitch, depth_pitch); if (resource->type == WINED3D_RTYPE_BUFFER) { @@ -4102,8 +4100,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str || box->top >= box->bottom || box->bottom > sub_resource->height || box->front >= box->back) { - WARN("Invalid box (%u, %u, %u)->(%u, %u, %u) specified.\n", - box->left, box->top, box->front, box->right, box->bottom, box->back); + WARN("Invalid box %s specified.\n", debug_box(box)); return; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 73250ec..a4936cf 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -308,8 +308,8 @@ void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, st HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { - TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %p, flags %#x.\n", - resource, sub_resource_idx, map_desc, box, flags); + TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", + resource, sub_resource_idx, map_desc, debug_box(box), flags); return resource->resource_ops->resource_sub_resource_map(resource, sub_resource_idx, map_desc, box, flags); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 65827ac..e6c6258 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2460,8 +2460,8 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ const struct wined3d_gl_info *gl_info; BYTE *base_memory; - TRACE("surface %p, map_desc %p, box %p, flags %#x.\n", - surface, map_desc, box, flags); + TRACE("surface %p, map_desc %p, box %s, flags %#x.\n", + surface, map_desc, debug_box(box), flags); if (surface->resource.map_count) { @@ -2472,8 +2472,8 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ if ((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && box && !surface_check_block_align(surface, box)) { - WARN("Map rect %p is misaligned for %ux%u blocks.\n", - box, format->block_width, format->block_height); + WARN("Map box %s is misaligned for %ux%u blocks.\n", + debug_box(box), format->block_width, format->block_height); if (surface->resource.pool == WINED3D_POOL_DEFAULT) return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6f4d88f..88507fa 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -712,7 +712,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, { struct wined3d_resource *sub_resource; - TRACE("texture %p, layer %u, dirty_region %p.\n", texture, layer, dirty_region); + TRACE("texture %p, layer %u, dirty_region %s.\n", texture, layer, debug_box(dirty_region)); if (!(sub_resource = wined3d_texture_get_sub_resource(texture, layer * texture->level_count))) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index be6b32a..923d70a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2958,6 +2958,15 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT ali /***************************************************************************** * Trace formatting of useful values */ +const char *debug_box(const struct wined3d_box *box) +{ + if (!box) + return "(null)"; + return wine_dbg_sprintf("(%u, %u, %u)-(%u, %u, %u)", + box->left, box->top, box->front, + box->right, box->bottom, box->back); +} + const char *debug_d3dformat(enum wined3d_format_id format_id) { switch (format_id) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index be6fab4..3ac7f98 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -517,8 +517,8 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, const struct wined3d_format *format = volume->resource.format; const unsigned int fmt_flags = volume->container->resource.format_flags; - TRACE("volume %p, map_desc %p, box %p, flags %#x.\n", - volume, map_desc, box, flags); + TRACE("volume %p, map_desc %p, box %s, flags %#x.\n", + volume, map_desc, debug_box(box), flags); map_desc->data = NULL; if (!(volume->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU)) @@ -538,8 +538,8 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, } if ((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !volume_check_block_align(volume, box)) { - WARN("Map box is misaligned for %ux%u blocks.\n", - format->block_width, format->block_height); + WARN("Map box %s is misaligned for %ux%u blocks.\n", + debug_box(box), format->block_width, format->block_height); return WINED3DERR_INVALIDCALL; } @@ -612,14 +612,10 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, if (!box) { - TRACE("No box supplied - all is ok\n"); map_desc->data = base_memory; } else { - TRACE("Lock Box (%p) = l %u, t %u, r %u, b %u, fr %u, ba %u\n", - box, box->left, box->top, box->right, box->bottom, box->front, box->back); - if ((fmt_flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_BLOCKS) { /* Compressed textures are block based, so calculate the offset of diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 57689e2..6f4dc36 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2936,6 +2936,7 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPE */ /* Trace routines */ +const char *debug_box(const struct wined3d_box *box) DECLSPEC_HIDDEN; const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx) DECLSPEC_HIDDEN; const char *debug_d3dformat(enum wined3d_format_id format_id) DECLSPEC_HIDDEN; const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Merge cubetexture_init() into texture_init().
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: 46317e0cb1af2f0b2a07532903677dd412bde3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46317e0cb1af2f0b2a0753290… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 22:22:59 2016 +0100 wined3d: Merge cubetexture_init() into texture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 174 ++++++++++++------------------------------------- 1 file changed, 42 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46317e0cb1af2f0b2a075…

1 0

Henri Verbeet : wined3d: Pass a view to blit_shader.depth_fill().
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: 1ff966032370d568b2b3dbc51cfe17471d9eb611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff966032370d568b2b3dbc51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 22:22:57 2016 +0100 wined3d: Pass a view to blit_shader.depth_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/surface.c | 47 ++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cc1ed3f..6f73dd2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7929,8 +7929,8 @@ static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined return WINED3DERR_INVALIDCALL; } -static HRESULT arbfp_blit_depth_fill(struct wined3d_device *device, - struct wined3d_surface *surface, const RECT *rect, float depth) +static HRESULT arbfp_blit_depth_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, + const RECT *rect, float depth) { FIXME("Depth filling not implemented by arbfp_blit.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0fea138..65827ac 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1048,19 +1048,35 @@ static BOOL surface_convert_depth_to_float(const struct wined3d_surface *surface static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const RECT *rect, float depth) { - const struct wined3d_resource *resource = &surface->container->resource; + struct wined3d_resource *resource = &surface->container->resource; struct wined3d_device *device = resource->device; + struct wined3d_rendertarget_view_desc view_desc; + struct wined3d_rendertarget_view *view; const struct blit_shader *blitter; + HRESULT hr; - blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_BLIT_OP_DEPTH_FILL, - NULL, 0, 0, NULL, rect, resource->usage, resource->pool, resource->format); - if (!blitter) + if (!(blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, + WINED3D_BLIT_OP_DEPTH_FILL, NULL, 0, 0, NULL, rect, resource->usage, resource->pool, resource->format))) { FIXME("No blitter is capable of performing the requested depth fill operation.\n"); return WINED3DERR_INVALIDCALL; } - return blitter->depth_fill(device, surface, rect, depth); + view_desc.format_id = resource->format->id; + view_desc.u.texture.level_idx = surface->texture_level; + view_desc.u.texture.layer_idx = surface->texture_layer; + view_desc.u.texture.layer_count = 1; + if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, + resource, NULL, &wined3d_null_parent_ops, &view))) + { + ERR("Failed to create rendertarget view, hr %#x.\n", hr); + return hr; + } + + hr = blitter->depth_fill(device, view, rect, depth); + wined3d_rendertarget_view_decref(view); + + return hr; } static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, @@ -4186,22 +4202,13 @@ static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d return WINED3D_OK; } -static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface, - const RECT *dst_rect, float depth) +static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, + struct wined3d_rendertarget_view *view, const RECT *rect, float depth) { - const RECT draw_rect = {0, 0, dst_surface->resource.width, dst_surface->resource.height}; - struct wined3d_fb_state fb = {NULL, NULL}; - HRESULT hr; - - if (FAILED(hr = wined3d_rendertarget_view_create_from_surface(dst_surface, - NULL, &wined3d_null_parent_ops, &fb.depth_stencil))) - { - ERR("Failed to create rendertarget view, hr %#x.\n", hr); - return hr; - } + const RECT draw_rect = {0, 0, view->width, view->height}; + struct wined3d_fb_state fb = {NULL, view}; - device_clear_render_targets(device, 0, &fb, 1, dst_rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); - wined3d_rendertarget_view_decref(fb.depth_stencil); + device_clear_render_targets(device, 0, &fb, 1, rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); return WINED3D_OK; } @@ -4890,7 +4897,7 @@ static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d } static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, - struct wined3d_surface *surface, const RECT *rect, float depth) + struct wined3d_rendertarget_view *view, const RECT *rect, float depth) { FIXME("Depth filling not implemented by cpu_blit.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 703324e..57689e2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1465,7 +1465,7 @@ struct blit_shader HRESULT (*color_fill)(struct wined3d_device *device, struct wined3d_rendertarget_view *view, const RECT *rect, const struct wined3d_color *color); HRESULT (*depth_fill)(struct wined3d_device *device, - struct wined3d_surface *surface, const RECT *rect, float depth); + struct wined3d_rendertarget_view *view, const RECT *rect, float depth); void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect,

1 0

Henri Verbeet : wined3d: Pass a view to blit_shader.color_fill().
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: ed0b34623121af1b85206e82d405cc71d00ca001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0b34623121af1b85206e82d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 22:22:56 2016 +0100 wined3d: Pass a view to blit_shader.color_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 +-- dlls/wined3d/surface.c | 54 ++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 35 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 54bd1a9..cc1ed3f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7922,8 +7922,8 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding); } -static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface, - const RECT *dst_rect, const struct wined3d_color *color) +static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, + const RECT *rect, const struct wined3d_color *color) { FIXME("Color filling not implemented by arbfp_blit\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a98f767..0fea138 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3282,18 +3282,35 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) { - struct wined3d_device *device = s->resource.device; + struct wined3d_resource *resource = &s->container->resource; + struct wined3d_device *device = resource->device; + struct wined3d_rendertarget_view_desc view_desc; + struct wined3d_rendertarget_view *view; const struct blit_shader *blitter; + HRESULT hr; - blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_BLIT_OP_COLOR_FILL, - NULL, 0, 0, NULL, rect, s->resource.usage, s->resource.pool, s->resource.format); - if (!blitter) + if (!(blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, + WINED3D_BLIT_OP_COLOR_FILL, NULL, 0, 0, NULL, rect, resource->usage, resource->pool, resource->format))) { FIXME("No blitter is capable of performing the requested color fill operation.\n"); return WINED3DERR_INVALIDCALL; } - return blitter->color_fill(device, s, rect, color); + view_desc.format_id = resource->format->id; + view_desc.u.texture.level_idx = s->texture_level; + view_desc.u.texture.layer_idx = s->texture_layer; + view_desc.u.texture.layer_count = 1; + if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, + resource, NULL, &wined3d_null_parent_ops, &view))) + { + ERR("Failed to create rendertarget view, hr %#x.\n", hr); + return hr; + } + + hr = blitter->color_fill(device, view, rect, color); + wined3d_rendertarget_view_decref(view); + + return hr; } static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RECT *dst_rect, @@ -4158,23 +4175,13 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, } } -static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface, - const RECT *dst_rect, const struct wined3d_color *color) +static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, + const RECT *rect, const struct wined3d_color *color) { - const RECT draw_rect = {0, 0, dst_surface->resource.width, dst_surface->resource.height}; - struct wined3d_rendertarget_view *view; + const RECT draw_rect = {0, 0, view->width, view->height}; struct wined3d_fb_state fb = {&view, NULL}; - HRESULT hr; - if (FAILED(hr = wined3d_rendertarget_view_create_from_surface(dst_surface, - NULL, &wined3d_null_parent_ops, &view))) - { - ERR("Failed to create rendertarget view, hr %#x.\n", hr); - return hr; - } - - device_clear_render_targets(device, 1, &fb, 1, dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); - wined3d_rendertarget_view_decref(view); + device_clear_render_targets(device, 1, &fb, 1, rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); return WINED3D_OK; } @@ -4868,16 +4875,17 @@ release: return hr; } -static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface, - const RECT *dst_rect, const struct wined3d_color *color) +static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, + const RECT *rect, const struct wined3d_color *color) { + struct wined3d_surface *surface = wined3d_rendertarget_view_get_surface(view); static const RECT src_rect; WINEDDBLTFX BltFx; memset(&BltFx, 0, sizeof(BltFx)); BltFx.dwSize = sizeof(BltFx); - BltFx.u5.dwFillColor = wined3d_format_convert_from_float(dst_surface, color); - return surface_cpu_blt(dst_surface, dst_rect, NULL, &src_rect, + BltFx.u5.dwFillColor = wined3d_format_convert_from_float(surface, color); + return surface_cpu_blt(surface, rect, NULL, &src_rect, WINEDDBLT_COLORFILL, &BltFx, WINED3D_TEXF_POINT); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84a6dc1..703324e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1462,8 +1462,8 @@ struct blit_shader const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format); - HRESULT (*color_fill)(struct wined3d_device *device, struct wined3d_surface *dst_surface, - const RECT *dst_rect, const struct wined3d_color *color); + HRESULT (*color_fill)(struct wined3d_device *device, struct wined3d_rendertarget_view *view, + const RECT *rect, const struct wined3d_color *color); HRESULT (*depth_fill)(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, float depth); void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter,

1 0

Paul Gofman : mscoree: Call native DllEntryPoint when it is defined in COR header.
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: 98d5c4a90f1c0a91e45544cfad75e5c603e0e625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d5c4a90f1c0a91e45544cfa… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Sat Jan 30 04:36:49 2016 +0300 mscoree: Call native DllEntryPoint when it is defined in COR header. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/assembly.c | 14 ++++++++++++++ dlls/mscoree/corruntimehost.c | 29 +++++++++++++++++++++-------- dlls/mscoree/mscoree_private.h | 3 +++ include/winnt.h | 1 + 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index 7cfc359..4af6f28 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -314,3 +314,17 @@ HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWO return S_OK; } + +HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) +{ + if (assembly->corhdr->Flags & COMIMAGE_FLAGS_NATIVE_ENTRYPOINT) + { + *func = assembly_rva_to_va(assembly, assembly->corhdr->EntryPointRVA); + return S_OK; + } + else + { + *func = NULL; + return S_FALSE; + } +} diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 7998da9..8c03875 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1254,18 +1254,31 @@ __int32 WINAPI _CorExeMain(void) BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { + ASSEMBLY *assembly=NULL; + HRESULT hr; + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - switch (fdwReason) + hr = assembly_from_hmodule(&assembly, hinstDLL); + if (SUCCEEDED(hr)) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - FixupVTable(hinstDLL); - break; - case DLL_PROCESS_DETACH: - /* FIXME: clean up the vtables */ - break; + NativeEntryPointFunc NativeEntryPoint=NULL; + + assembly_get_native_entrypoint(assembly, &NativeEntryPoint); + if (fdwReason == DLL_PROCESS_ATTACH) + { + if (!NativeEntryPoint) + DisableThreadLibraryCalls(hinstDLL); + FixupVTable_Assembly(hinstDLL,assembly); + } + assembly_release(assembly); + /* FIXME: clean up the vtables on DLL_PROCESS_DETACH */ + if (NativeEntryPoint) + return NativeEntryPoint(hinstDLL, fdwReason, lpvReserved); } + else + ERR("failed to read CLR headers, hr=%x\n", hr); + return TRUE; } diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 7843407..8226463 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -36,11 +36,14 @@ typedef struct _VTableFixup { typedef struct tagASSEMBLY ASSEMBLY; +typedef BOOL (WINAPI *NativeEntryPointFunc)(HINSTANCE, DWORD, LPVOID); + extern HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN; extern HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) DECLSPEC_HIDDEN; extern HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN; extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; +extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/include/winnt.h b/include/winnt.h index c7874dd..2309ae3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3549,6 +3549,7 @@ typedef enum ReplacesCorHdrNumericDefines COMIMAGE_FLAGS_32BITREQUIRED = 0x00000002, COMIMAGE_FLAGS_IL_LIBRARY = 0x00000004, COMIMAGE_FLAGS_STRONGNAMESIGNED = 0x00000008, + COMIMAGE_FLAGS_NATIVE_ENTRYPOINT= 0x00000010, COMIMAGE_FLAGS_TRACKDEBUGDATA = 0x00010000, COR_VERSION_MAJOR_V2 = 2,

1 0

Paul Gofman : mscoree: Add FixupVTable_Assembly function which takes preloaded assembly headers.
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: 5dea748c5b733ac6f8c6e2be609bf9838a86e5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dea748c5b733ac6f8c6e2be6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Sat Jan 30 04:36:48 2016 +0300 mscoree: Add FixupVTable_Assembly function which takes preloaded assembly headers. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index c790c44..7998da9 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1135,23 +1135,28 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) list_add_tail(&dll_fixups, &fixup->entry); } +static void FixupVTable_Assembly(HMODULE hmodule, ASSEMBLY *assembly) +{ + VTableFixup *vtable_fixups; + ULONG vtable_fixup_count, i; + + assembly_get_vtable_fixups(assembly, &vtable_fixups, &vtable_fixup_count); + if (CAN_FIXUP_VTABLE) + for (i=0; i<vtable_fixup_count; i++) + FixupVTableEntry(hmodule, &vtable_fixups[i]); + else if (vtable_fixup_count) + FIXME("cannot fixup vtable; expect a crash\n"); +} + static void FixupVTable(HMODULE hmodule) { ASSEMBLY *assembly; HRESULT hr; - VTableFixup *vtable_fixups; - ULONG vtable_fixup_count, i; hr = assembly_from_hmodule(&assembly, hmodule); if (SUCCEEDED(hr)) { - hr = assembly_get_vtable_fixups(assembly, &vtable_fixups, &vtable_fixup_count); - if (CAN_FIXUP_VTABLE) - for (i=0; i<vtable_fixup_count; i++) - FixupVTableEntry(hmodule, &vtable_fixups[i]); - else if (vtable_fixup_count) - FIXME("cannot fixup vtable; expect a crash\n"); - + FixupVTable_Assembly(hmodule, assembly); assembly_release(assembly); } else

1 0

Hans Leidekker : webservices: Support more writer states in WsWriteText.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: 50797a803db9c72867be7fb3aac37a692a5b744b URL: http://source.winehq.org/git/wine.git/?a=commit;h=50797a803db9c72867be7fb3a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 15:43:45 2016 +0100 webservices: Support more writer states in WsWriteText. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index dafeb24..95f565d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -794,27 +794,32 @@ static inline void write_set_attribute_value( struct writer *writer, WS_XML_TEXT HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_ERROR *error ) { struct writer *writer = (struct writer *)handle; - WS_XML_UTF8_TEXT *src, *dst; + WS_XML_UTF8_TEXT *dst, *src = (WS_XML_UTF8_TEXT *)text; + HRESULT hr; TRACE( "%p %p %p\n", handle, text, error ); if (!writer || !text) return E_INVALIDARG; - if (writer->state != WRITER_STATE_STARTATTRIBUTE) - { - FIXME( "can't handle writer state %u\n", writer->state ); - return E_NOTIMPL; - } if (text->textType != WS_XML_TEXT_TYPE_UTF8) { FIXME( "text type %u not supported\n", text->textType ); return E_NOTIMPL; } - src = (WS_XML_UTF8_TEXT *)text; - if (!(dst = alloc_utf8_text( src->value.bytes, src->value.length ))) - return E_OUTOFMEMORY; - write_set_attribute_value( writer, &dst->text ); + if (writer->state == WRITER_STATE_STARTATTRIBUTE) + { + if (!(dst = alloc_utf8_text( src->value.bytes, src->value.length ))) + return E_OUTOFMEMORY; + + write_set_attribute_value( writer, &dst->text ); + } + else + { + if ((hr = write_grow_buffer( writer, src->value.length )) != S_OK) return hr; + write_bytes( writer, src->value.bytes, src->value.length ); + } + return S_OK; }

1 0

Hans Leidekker : webservices: Don' t validate reader state in read_endelement.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: b960e6f81b821ea4b5da6ddaf82badadd3c765d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b960e6f81b821ea4b5da6ddaf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 15:43:44 2016 +0100 webservices: Don't validate reader state in read_endelement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 10 ---------- dlls/webservices/tests/reader.c | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 08f2287..515ed1e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1101,16 +1101,6 @@ static HRESULT read_endelement( struct reader *reader ) WS_XML_STRING *prefix, *localname; HRESULT hr; - switch (reader->state) - { - case READER_STATE_TEXT: - case READER_STATE_STARTELEMENT: - case READER_STATE_STARTENDELEMENT: - break; - default: - return WS_E_INVALID_FORMAT; - } - if (read_cmp( reader, "</", 2 )) return WS_E_INVALID_FORMAT; read_skip( reader, 2 ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index d2f2308..958d08c 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -885,7 +885,7 @@ static void test_WsReadStartElement(void) if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Józef Kucia : d3d11/tests: Add test for SM4 sample_b instruction.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: f972350678a4eed4a9c8ee6e4564f72e7e5e9d37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f972350678a4eed4a9c8ee6e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 3 11:49:12 2016 +0100 d3d11/tests: Add test for SM4 sample_b instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ba9cc52..8ea0a76 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3039,6 +3039,35 @@ static void test_texture(void) 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; + static const DWORD ps_sample_b_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float bias; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.SampleBias(s, p, bias); + } +#endif + 0x43425844, 0xc39b0686, 0x8244a7fc, 0x14c0b97a, 0x2900b3b7, 0x00000001, 0x00000150, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000b4, 0x00000040, + 0x0000002d, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000, 0x00000000, + 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, + 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x0c00004a, + 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, + }; static const DWORD ps_sample_l_code[] = { #if 0 @@ -3072,6 +3101,7 @@ static void test_texture(void) static const struct shader ps_ld_sint8 = {ps_ld_sint8_code, sizeof(ps_ld_sint8_code)}; static const struct shader ps_ld_uint8 = {ps_ld_uint8_code, sizeof(ps_ld_uint8_code)}; static const struct shader ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; + static const struct shader ps_sample_b = {ps_sample_b_code, sizeof(ps_sample_b_code)}; static const struct shader ps_sample_l = {ps_sample_l_code, sizeof(ps_sample_l_code)}; static const struct { @@ -3205,6 +3235,18 @@ static void test_texture(void) {&ps_sample, &bc3_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0}, + {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 2.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0}, + {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, level_1_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, level_1_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 8.0f, level_1_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 8.4f, level_1_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 8.5f, level_2_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 9.0f, level_2_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 2.0f, 1.0f, rgba_level_0}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 2.0f, 9.0f, level_2_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 1.0f, 9.0f, level_1_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 9.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, -1.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 0.4f, rgba_level_0},

1 0