H. Verbeet : wined3d: Fix the default values for wined3d_settings.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Sep 27 03:46:06 CDT 2006
Module: wine
Branch: master
Commit: ba8a6a3c0cc6819556e366d476f884ef3b8c570b
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba8a6a3c0cc6819556e366d476f884ef3b8c570b
Author: H. Verbeet <hverbeet at gmail.com>
Date: Tue Sep 26 20:31:41 2006 +0200
wined3d: Fix the default values for wined3d_settings.
---
dlls/wined3d/wined3d_main.c | 16 +++++++++++-----
dlls/wined3d/wined3d_private.h | 2 ++
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 6b43995..752cbb3 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -32,13 +32,19 @@ void (*wine_tsx11_lock_ptr)(void) = NULL
void (*wine_tsx11_unlock_ptr)(void) = NULL;
+/* When updating default value here, make sure to update winecfg as well,
+ * where appropriate. */
wined3d_settings_t wined3d_settings =
{
- VS_HW, /* Hardware by default */
- PS_NONE, /* Disabled by default */
- VBO_HW, /* Hardware by default */
- FALSE, /* Use of GLSL disabled by default */
- RTL_AUTO /* Automatically determine best locking method */
+ VS_HW, /* Hardware by default */
+ PS_NONE, /* Disabled by default */
+ VBO_HW, /* Hardware by default */
+ FALSE, /* Use of GLSL disabled by default */
+ SHADER_ARB, /* Use ARB vertex programs, when available */
+ SHADER_ARB, /* Use ARB fragment programs, when available */
+ NP2_NONE, /* Box NPOT textures */
+ RTL_AUTO, /* Automatically determine best locking method */
+ 64*1024*1024 /* 64MB texture memory by default */
};
WineD3DGlobalStatistics *wineD3DGlobalStatistics = NULL;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 9921d4c..da607de 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -145,6 +145,8 @@ #define RTL_READTEX 2
#define RTL_TEXDRAW 3
#define RTL_TEXTEX 4
+/* 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;
More information about the wine-cvs
mailing list