=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: dxgi: Introduce ARRAY_SIZE() macro.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Wed May 30 12:18:35 2018 +0200

dxgi: Introduce ARRAY_SIZE() macro.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dxgi/dxgi_private.h | 2 ++
 dlls/dxgi/utils.c        | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h
index 547bd19..c8dc67f 100644
--- a/dlls/dxgi/dxgi_private.h
+++ b/dlls/dxgi/dxgi_private.h
@@ -40,6 +40,8 @@
 #include "wine/wined3d.h"
 #include "wine/winedxgi.h"
 
+#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
+
 enum dxgi_frame_latency
 {
     DXGI_FRAME_LATENCY_DEFAULT =  3,
diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c
index 063ec5a..73c3cf2 100644
--- a/dlls/dxgi/utils.c
+++ b/dlls/dxgi/utils.c
@@ -655,7 +655,7 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory,
     shader_model = min(caps.VertexShaderVersion, caps.PixelShaderVersion);
     for (i = 0; i < level_count; ++i)
     {
-        for (j = 0; j < sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0]); ++j)
+        for (j = 0; j < ARRAY_SIZE(feature_levels_sm); ++j)
         {
             if (feature_levels[i] == feature_levels_sm[j].feature_level)
             {
@@ -671,7 +671,7 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory,
         if (selected_feature_level)
             break;
 
-        if (j == sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0]))
+        if (j == ARRAY_SIZE(feature_levels_sm))
             FIXME("Unexpected feature level %#x.\n", feature_levels[i]);
         else
             TRACE("Feature level %s not supported, trying next fallback if available.\n",