wined3d: Make RTL_READTEX the default rendertarget locking method.

For most cards this should make more sense than RTL_READDRAW, even if e.g. surface_upload_data() has some room for improvement.

wined3d: Make RTL_READTEX the default rendertarget locking method.
ecd2dc76 · Henri Verbeet · Alexandre Julliard · 779ad6b9 · ecd2dc76 · ecd2dc76
Commit ecd2dc76 authored Aug 14, 2009 by Henri Verbeet Committed by Alexandre Julliard Aug 14, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

surface.c dlls/wined3d/surface.c +0 -1

wined3d_main.c dlls/wined3d/wined3d_main.c +1 -1

wined3d_private.h dlls/wined3d/wined3d_private.h +0 -1

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1518,7 +1518,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) {
                IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* partial texture loading not supported yet */);
                /* drop through */

-            case RTL_AUTO:
            case RTL_READDRAW:
                IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, fullsurface ? NULL : &This->dirtyRect);
                break;

--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -41,7 +41,7 @@ wined3d_settings_t wined3d_settings =
    PS_HW,          /* Hardware by default */
    TRUE,           /* Use of GLSL enabled by default */
    ORM_FBO,        /* Use FBOs to do offscreen rendering */
-    RTL_AUTO,       /* Automatically determine best locking method */
+    RTL_READTEX,    /* Default render target locking method */
    PCI_VENDOR_NONE,/* PCI Vendor ID */
    PCI_DEVICE_NONE,/* PCI Device ID */
    0,              /* The default of memory is set in FillGLCaps */

--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -267,7 +267,6 @@ static inline float float_24_to_32(DWORD in)
 #define SHADER_NONE 4

 #define RTL_DISABLE   -1
-#define RTL_AUTO       0
 #define RTL_READDRAW   1
 #define RTL_READTEX    2