[PATCH v2 2/8] wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported.

[Matteo Bruni]

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
Advertise a quality level for each power-of-two x such that
2 <= x <= MAX_SAMPLES.
For bug 12652.

v2: Also adjust surface_prepare_rb() accordingly.

 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 5041249..d312118 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 db33791..fcde8d8 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2863,7 +2863,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;
 
-- 
2.4.10