[PATCH 2/5] wined3d: Limit the number of multisample levels reported by wined3d_check_device_multisample_type().

Matteo Bruni mbruni at codeweavers.com
Mon Dec 14 16:37:54 CST 2015


Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
Using log2(MAX_SAMPLES) is a pretty arbitrary choice which should be
fine in practice.

For bug 12652.

 dlls/wined3d/directx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 4b4209a..e022e19 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -4414,6 +4414,8 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3
 
     gl_info = &wined3d->adapters[adapter_idx].gl_info;
 
+    /* FIXME: Make use of ARB_internalformat_query2 NUM_SAMPLE_COUNTS and
+     * SAMPLES queries to give sensible results. */
     if (multisample_type > gl_info->limits.samples)
     {
         TRACE("Returning not supported.\n");
@@ -4426,7 +4428,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;
     }
-- 
2.4.10




More information about the wine-patches mailing list