Matteo Bruni : wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 160a063c47731e6f88cccbef2c456875bdc6fa9d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=160a063c47731e6f88cccbef2c456875bdc6fa9d

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Tue Jan 26 22:51:29 2016 +0100

wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported.

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit a25c47f59a600d7da819869b643b0b17720c07c6)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

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

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 4b4209a..76fc04a 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -4426,7 +4426,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3
     if (quality_levels)
     {
         if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE)
-            *quality_levels = gl_info->limits.samples;
+            *quality_levels = wined3d_log2i(gl_info->limits.samples);
         else
             *quality_levels = 1;
     }
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 072c0ee..201a0c4 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2887,7 +2887,7 @@ static void surface_prepare_rb(struct wined3d_surface *surface, const struct win
          * AMD has a similar feature called Enhanced Quality Anti-Aliasing (EQAA),
          * but it does not have an equivalent OpenGL extension. */
         if (surface->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE)
-            samples = surface->resource.multisample_quality;
+            samples = 1u << (surface->resource.multisample_quality + 1);
         else
             samples = surface->resource.multisample_type;