From: Andrei Slăvoiu <andrei.slavoiu@gmail.com>
Subject: [5/9] wined3d: Make d3d_level_from_gl_info return an enum instead of a plain int (try3)
Message-Id: <4299674.G2pIKbpiRV@kaveri>
Date: Fri, 11 Jul 2014 21:44:25 +0300

---
 dlls/wined3d/directx.c | 60 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index bd98227..c34ac11 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -79,6 +79,18 @@ enum wined3d_gl_vendor
     GL_VENDOR_NVIDIA,
 };
 
+enum wined3d_d3d_level
+{
+    WINED3D_D3D_LEVEL_5,
+    WINED3D_D3D_LEVEL_6,
+    WINED3D_D3D_LEVEL_7,
+    WINED3D_D3D_LEVEL_8,
+    WINED3D_D3D_LEVEL_9_SM2,
+    WINED3D_D3D_LEVEL_9_SM3,
+    WINED3D_D3D_LEVEL_10,
+    WINED3D_D3D_LEVEL_11,
+};
+
 /* The d3d device ID */
 static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } };
 
@@ -1656,25 +1668,25 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s
     return HW_VENDOR_NVIDIA;
 }
 
-static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info)
+static enum wined3d_d3d_level d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info)
 {
-    UINT level = 0;
+    enum wined3d_d3d_level level = WINED3D_D3D_LEVEL_5;
 
     if (gl_info->supported[ARB_MULTITEXTURE])
-        level = 6;
+        level = WINED3D_D3D_LEVEL_6;
     if (gl_info->supported[ARB_TEXTURE_COMPRESSION]
             && gl_info->supported[ARB_TEXTURE_CUBE_MAP]
             && gl_info->supported[ARB_TEXTURE_ENV_DOT3])
-        level = 7;
-    if (level == 7 && gl_info->supported[ARB_MULTISAMPLE]
+        level = WINED3D_D3D_LEVEL_7;
+    if (level == WINED3D_D3D_LEVEL_7 && gl_info->supported[ARB_MULTISAMPLE]
             && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP])
-        level = 8;
-    if (level == 8 && gl_info->supported[ARB_FRAGMENT_PROGRAM]
+        level = WINED3D_D3D_LEVEL_8;
+    if (level == WINED3D_D3D_LEVEL_8 && gl_info->supported[ARB_FRAGMENT_PROGRAM]
             && gl_info->supported[ARB_VERTEX_SHADER])
-        level = 9;
-    if (level == 9 && (gl_info->supported[EXT_GPU_SHADER4]
+        level = WINED3D_D3D_LEVEL_9_SM2;
+    if (level == WINED3D_D3D_LEVEL_9_SM2 && (gl_info->supported[EXT_GPU_SHADER4]
 	    || gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)))
-        level = 10;
+        level = WINED3D_D3D_LEVEL_10;
 
     return level;
 }
@@ -2145,40 +2157,40 @@ intel_gl_vendor_table[] =
 
 static enum wined3d_pci_device select_card_fallback_nvidia(const struct wined3d_gl_info *gl_info)
 {
-    UINT d3d_level = d3d_level_from_gl_info(gl_info);
-    if (d3d_level >= 10)
+    enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info);
+    if (d3d_level >= WINED3D_D3D_LEVEL_10)
         return CARD_NVIDIA_GEFORCE_8800GTX;
-    if (d3d_level >= 9 && gl_info->supported[NV_VERTEX_PROGRAM3])
+    if (d3d_level >= WINED3D_D3D_LEVEL_9_SM3)
         return CARD_NVIDIA_GEFORCE_6800;
-    if (d3d_level >= 9)
+    if (d3d_level >= WINED3D_D3D_LEVEL_9_SM2)
         return CARD_NVIDIA_GEFORCEFX_5800;
-    if (d3d_level >= 8)
+    if (d3d_level >= WINED3D_D3D_LEVEL_8)
         return CARD_NVIDIA_GEFORCE3;
-    if (d3d_level >= 7)
+    if (d3d_level >= WINED3D_D3D_LEVEL_7)
         return CARD_NVIDIA_GEFORCE;
-    if (d3d_level >= 6)
+    if (d3d_level >= WINED3D_D3D_LEVEL_6)
         return CARD_NVIDIA_RIVA_TNT;
     return CARD_NVIDIA_RIVA_128;
 }
 
 static enum wined3d_pci_device select_card_fallback_amd(const struct wined3d_gl_info *gl_info)
 {
-    UINT d3d_level = d3d_level_from_gl_info(gl_info);
-    if (d3d_level >= 10)
+    enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info);
+    if (d3d_level >= WINED3D_D3D_LEVEL_10)
         return CARD_AMD_RADEON_HD2900;
-    if (d3d_level >= 9)
+    if (d3d_level >= WINED3D_D3D_LEVEL_9_SM2)
         return CARD_AMD_RADEON_9500;
-    if (d3d_level >= 8)
+    if (d3d_level >= WINED3D_D3D_LEVEL_8)
         return CARD_AMD_RADEON_8500;
-    if (d3d_level >= 7)
+    if (d3d_level >= WINED3D_D3D_LEVEL_7)
         return CARD_AMD_RADEON_7200;
     return CARD_AMD_RAGE_128PRO;
 }
 
 static enum wined3d_pci_device select_card_fallback_intel(const struct wined3d_gl_info *gl_info)
 {
-    UINT d3d_level = d3d_level_from_gl_info(gl_info);
-    if (d3d_level >= 10)
+    enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info);
+    if (d3d_level >= WINED3D_D3D_LEVEL_10)
         return CARD_INTEL_G45;
     return CARD_INTEL_915G;
 }
-- 
2.0.0