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

[Alexandre Julliard]

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

Author: Matteo Bruni <mbruni(a)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(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)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 23fdd89..2fe9597 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -4430,7 +4430,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 715b4ac..70b9d44 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2864,7 +2864,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;