[PATCH] WineD3D: Remove a few texture initializations=0A=
Stefan Doesinger
stefan at codeweavers.com
Wed Aug 13 13:00:43 CDT 2008
=0A=
This is done by LoadLocation now=0A=
---=0A=
dlls/wined3d/surface.c | 17 -----------------=0A=
1 files changed, 0 insertions(+), 17 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c=0A=
index 0628e5a..c8c1e0f 100644=0A=
--- a/dlls/wined3d/surface.c=0A=
+++ b/dlls/wined3d/surface.c=0A=
@@ -1312,14 +1312,6 @@ static HRESULT WINAPI =
IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) {=0A=
case RTL_READTEX:=0A=
case RTL_TEXTEX:=0A=
ActivateContext(myDevice, iface, CTXUSAGE_BLIT);=0A=
- ENTER_GL();=0A=
- if (This->glDescription.textureName =3D=3D 0) {=0A=
- glGenTextures(1, &This->glDescription.textureName);=0A=
- checkGLcall("glGenTextures");=0A=
- }=0A=
- glBindTexture(This->glDescription.target, =
This->glDescription.textureName);=0A=
- checkGLcall("glBindTexture(This->glDescription.target, =
This->glDescription.textureName)");=0A=
- LEAVE_GL();=0A=
IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, =
NULL /* partial texture loading not supported yet */);=0A=
/* drop through */=0A=
=0A=
@@ -3804,15 +3796,6 @@ HRESULT WINAPI =
IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) {=0A=
=0A=
if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && =
(convert =3D=3D NO_CONVERSION))=0A=
{=0A=
- ENTER_GL();=0A=
- if (This->glDescription.textureName =3D=3D 0) {=0A=
- glGenTextures(1, &This->glDescription.textureName);=0A=
- checkGLcall("glGenTextures");=0A=
- }=0A=
- glBindTexture(This->glDescription.target, =
This->glDescription.textureName);=0A=
- checkGLcall("glBindTexture(This->glDescription.target, =
This->glDescription.textureName)");=0A=
- LEAVE_GL();=0A=
-=0A=
/* Make sure the texture is up to date. This call doesn't =
do anything if the texture is already up to date. */=0A=
IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL);=0A=
=0A=
-- =0A=
1.5.6.4=0A=
=0A=
------=_NextPart_000_001C_01C9046F.8CE971C0--
More information about the wine-patches
mailing list