Henri Verbeet : wined3d: Get rid of the wined3d_settings_t typedef.

Alexandre Julliard julliard at winehq.org
Fri May 6 13:44:00 CDT 2011


Module: wine
Branch: master
Commit: 9f90225fa59fa79eba177bfcb6fb035cff25200e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9f90225fa59fa79eba177bfcb6fb035cff25200e

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu May  5 20:56:09 2011 +0200

wined3d: Get rid of the wined3d_settings_t typedef.

---

 dlls/wined3d/wined3d_main.c    |    2 +-
 dlls/wined3d/wined3d_private.h |   41 ++++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 63cc677..2d60a6f 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -62,7 +62,7 @@ static CRITICAL_SECTION wined3d_cs = {&wined3d_cs_debug, -1, 0, 0, 0, 0};
 
 /* When updating default value here, make sure to update winecfg as well,
  * where appropriate. */
-wined3d_settings_t wined3d_settings =
+struct wined3d_settings wined3d_settings =
 {
     VS_HW,          /* Hardware by default */
     PS_HW,          /* Hardware by default */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 549f827..6ca0ed7 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -254,26 +254,27 @@ static inline float float_24_to_32(DWORD in)
 
 /* NOTE: When adding fields to this structure, make sure to update the default
  * values in wined3d_main.c as well. */
-typedef struct wined3d_settings_s {
-/* vertex and pixel shader modes */
-  int vs_mode;
-  int ps_mode;
-/* Ideally, we don't want the user to have to request GLSL.  If the hardware supports GLSL,
-    we should use it.  However, until it's fully implemented, we'll leave it as a registry
-    setting for developers. */
-  BOOL glslRequested;
-  int offscreen_rendering_mode;
-  int rendertargetlock_mode;
-  unsigned short pci_vendor_id;
-  unsigned short pci_device_id;
-/* Memory tracking and object counting */
-  unsigned int emulated_textureram;
-  char *logo;
-  int allow_multisampling;
-  BOOL strict_draw_ordering;
-} wined3d_settings_t;
-
-extern wined3d_settings_t wined3d_settings DECLSPEC_HIDDEN;
+struct wined3d_settings
+{
+    /* vertex and pixel shader modes */
+    int vs_mode;
+    int ps_mode;
+    /* Ideally, we don't want the user to have to request GLSL. If the
+     * hardware supports GLSL, we should use it. However, until it's fully
+     * implemented, we'll leave it as a registry setting for developers. */
+    BOOL glslRequested;
+    int offscreen_rendering_mode;
+    int rendertargetlock_mode;
+    unsigned short pci_vendor_id;
+    unsigned short pci_device_id;
+    /* Memory tracking and object counting. */
+    unsigned int emulated_textureram;
+    char *logo;
+    int allow_multisampling;
+    BOOL strict_draw_ordering;
+};
+
+extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN;
 
 typedef enum _WINED3DSAMPLER_TEXTURE_TYPE
 {




More information about the wine-cvs mailing list