Józef Kucia : wined3d: Use get_format_internal() in init_format_filter_info().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6edf38c205a6f5db369bf24a7edd4623ee6e32f1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6edf38c205a6f5db369bf24a7...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Thu Aug 30 14:54:51 2018 +0200

wined3d: Use get_format_internal() in init_format_filter_info().

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/wined3d/utils.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 5720cab..d75cbc1 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -3330,7 +3330,7 @@ static void init_format_filter_info(struct wined3d_adapter *adapter,
 {
     enum wined3d_pci_vendor vendor = adapter->driver_info.vendor;
     struct wined3d_format *format;
-    unsigned int fmt_idx, i;
+    unsigned int i;
     static const enum wined3d_format_id fmts16[] =
     {
         WINED3DFMT_R16_FLOAT,
@@ -3339,8 +3339,8 @@ static void init_format_filter_info(struct wined3d_adapter *adapter,
     };
     BOOL filtered;
 
+    /* This was already handled by init_format_texture_info(). */
     if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2])
-        /* This was already handled by init_format_texture_info(). */
         return;
 
     if (wined3d_settings.offscreen_rendering_mode != ORM_FBO
@@ -3367,8 +3367,8 @@ static void init_format_filter_info(struct wined3d_adapter *adapter,
         {
             for (i = 0; i < ARRAY_SIZE(fmts16); ++i)
             {
-                fmt_idx = get_format_idx(fmts16[i]);
-                format_set_flag(&adapter->formats[fmt_idx], WINED3DFMT_FLAG_FILTERING);
+                format = get_format_internal(adapter, fmts16[i]);
+                format_set_flag(format, WINED3DFMT_FLAG_FILTERING);
             }
         }
         return;
@@ -3376,19 +3376,19 @@ static void init_format_filter_info(struct wined3d_adapter *adapter,
 
     for (i = 0; i < ARRAY_SIZE(fmts16); ++i)
     {
-        fmt_idx = get_format_idx(fmts16[i]);
-        format = &adapter->formats[fmt_idx];
-        if (!format->glInternal) continue; /* Not supported by GL */
+        format = get_format_internal(adapter, fmts16[i]);
+        if (!format->glInternal)
+            continue; /* Not supported by GL */
 
-        filtered = check_filter(gl_info, adapter->formats[fmt_idx].glInternal);
+        filtered = check_filter(gl_info, format->glInternal);
         if (filtered)
         {
-            TRACE("Format %s supports filtering\n", debug_d3dformat(fmts16[i]));
+            TRACE("Format %s supports filtering.\n", debug_d3dformat(format->id));
             format_set_flag(format, WINED3DFMT_FLAG_FILTERING);
         }
         else
         {
-            TRACE("Format %s does not support filtering\n", debug_d3dformat(fmts16[i]));
+            TRACE("Format %s does not support filtering.\n", debug_d3dformat(format->id));
         }
     }
 }