[D3D 43] Some clean-ups...
Lionel Ulmer
lionel.ulmer at free.fr
Tue Dec 24 09:59:36 CST 2002
Changelog:
Some clean-ups after the DrawPrimitive rewrite
--
Lionel Ulmer - http://www.bbrox.org/
-------------- next part --------------
--- /home/ulmer/Wine/wine_base//dlls/ddraw/d3ddevice/mesa.c 2002-12-23 22:22:28.000000000 +0100
+++ /home/ulmer/Wine/wine_work//dlls/ddraw/d3ddevice/mesa.c 2002-12-24 13:35:21.000000000 +0100
@@ -302,8 +302,6 @@
if (This->current_texture[0] != NULL)
IDirect3DTexture2_Release(ICOM_INTERFACE(This->current_texture[0], IDirect3DTexture2));
- if (glThis->handler) HeapFree(GetProcessHeap(), 0, This);
-
ENTER_GL();
glXDestroyContext(glThis->display, glThis->gl_context);
LEAVE_GL();
--- /home/ulmer/Wine/wine_base//dlls/ddraw/mesa_private.h 2002-12-23 22:22:28.000000000 +0100
+++ /home/ulmer/Wine/wine_work//dlls/ddraw/mesa_private.h 2002-12-24 13:34:49.000000000 +0100
@@ -99,12 +99,6 @@
void (*unlock_update)(IDirectDrawSurfaceImpl* This, LPCRECT pRect);
} IDirect3DTextureGLImpl;
-typedef struct {
- int offset;
- int extra;
- void (*handler)(char *vertex, int offset, int extra);
-} D3DFVF_GENERIC;
-
typedef struct IDirect3DDeviceGLImpl
{
struct IDirect3DDeviceImpl parent;
@@ -118,12 +112,6 @@
BOOLEAN last_vertices_transformed;
BOOLEAN last_vertices_lit;
- /* This is to optimize a little bit the 'slow generic' path for the DrawPrimitive stuff */
- D3DFVF_GENERIC *handler;
- DWORD last_vertex_format;
- DWORD last_vertex_format_size;
- DWORD last_vertex_format_elements;
-
D3DMATRIX *world_mat;
D3DMATRIX *view_mat;
D3DMATRIX *proj_mat;
More information about the wine-patches
mailing list