Commit 9f90225f authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Get rid of the wined3d_settings_t typedef.

parent 493af7e5
...@@ -62,7 +62,7 @@ static CRITICAL_SECTION wined3d_cs = {&wined3d_cs_debug, -1, 0, 0, 0, 0}; ...@@ -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, /* When updating default value here, make sure to update winecfg as well,
* where appropriate. */ * where appropriate. */
wined3d_settings_t wined3d_settings = struct wined3d_settings wined3d_settings =
{ {
VS_HW, /* Hardware by default */ VS_HW, /* Hardware by default */
PS_HW, /* Hardware by default */ PS_HW, /* Hardware by default */
......
...@@ -254,26 +254,27 @@ static inline float float_24_to_32(DWORD in) ...@@ -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 /* NOTE: When adding fields to this structure, make sure to update the default
* values in wined3d_main.c as well. */ * values in wined3d_main.c as well. */
typedef struct wined3d_settings_s { struct wined3d_settings
/* vertex and pixel shader modes */ {
int vs_mode; /* vertex and pixel shader modes */
int ps_mode; int vs_mode;
/* Ideally, we don't want the user to have to request GLSL. If the hardware supports GLSL, int ps_mode;
we should use it. However, until it's fully implemented, we'll leave it as a registry /* Ideally, we don't want the user to have to request GLSL. If the
setting for developers. */ * hardware supports GLSL, we should use it. However, until it's fully
BOOL glslRequested; * implemented, we'll leave it as a registry setting for developers. */
int offscreen_rendering_mode; BOOL glslRequested;
int rendertargetlock_mode; int offscreen_rendering_mode;
unsigned short pci_vendor_id; int rendertargetlock_mode;
unsigned short pci_device_id; unsigned short pci_vendor_id;
/* Memory tracking and object counting */ unsigned short pci_device_id;
unsigned int emulated_textureram; /* Memory tracking and object counting. */
char *logo; unsigned int emulated_textureram;
int allow_multisampling; char *logo;
BOOL strict_draw_ordering; int allow_multisampling;
} wined3d_settings_t; BOOL strict_draw_ordering;
};
extern wined3d_settings_t wined3d_settings DECLSPEC_HIDDEN;
extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN;
typedef enum _WINED3DSAMPLER_TEXTURE_TYPE typedef enum _WINED3DSAMPLER_TEXTURE_TYPE
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment