Henri Verbeet : wined3d: IWineD3DSurface_PreLoad() doesn' t do an implicit glBindTexture() anymore.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Sep  3 16:29:34 2008 +0200

wined3d: IWineD3DSurface_PreLoad() doesn't do an implicit glBindTexture() anymore.

This was exposed by moving texture id generation from Preload() to BindTexture().

---

 dlls/wined3d/device.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index d12aebd..74688dd 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -6160,6 +6160,7 @@ void attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWine
 
         IWineD3DSurface_PreLoad(depth_stencil);
 
+        glBindTexture(target, depth_stencil_impl->glDescription.textureName);
         glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
         glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
         glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE);
@@ -6202,6 +6203,7 @@ void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx,
 
     IWineD3DSurface_PreLoad(surface);
 
+    glBindTexture(target, surface_impl->glDescription.textureName);
     glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glBindTexture(target, old_binding);