Commit 1d97f52f authored by Lionel Ulmer's avatar Lionel Ulmer Committed by Alexandre Julliard

Some clean-ups after the DrawPrimitive rewrite.

parent 3429c3cf
...@@ -302,8 +302,6 @@ GL_IDirect3DDeviceImpl_7_3T_2T_1T_Release(LPDIRECT3DDEVICE7 iface) ...@@ -302,8 +302,6 @@ GL_IDirect3DDeviceImpl_7_3T_2T_1T_Release(LPDIRECT3DDEVICE7 iface)
if (This->current_texture[0] != NULL) if (This->current_texture[0] != NULL)
IDirect3DTexture2_Release(ICOM_INTERFACE(This->current_texture[0], IDirect3DTexture2)); IDirect3DTexture2_Release(ICOM_INTERFACE(This->current_texture[0], IDirect3DTexture2));
if (glThis->handler) HeapFree(GetProcessHeap(), 0, This);
ENTER_GL(); ENTER_GL();
glXDestroyContext(glThis->display, glThis->gl_context); glXDestroyContext(glThis->display, glThis->gl_context);
LEAVE_GL(); LEAVE_GL();
......
...@@ -99,12 +99,6 @@ typedef struct IDirect3DTextureGLImpl ...@@ -99,12 +99,6 @@ typedef struct IDirect3DTextureGLImpl
void (*unlock_update)(IDirectDrawSurfaceImpl* This, LPCRECT pRect); void (*unlock_update)(IDirectDrawSurfaceImpl* This, LPCRECT pRect);
} IDirect3DTextureGLImpl; } IDirect3DTextureGLImpl;
typedef struct {
int offset;
int extra;
void (*handler)(char *vertex, int offset, int extra);
} D3DFVF_GENERIC;
typedef struct IDirect3DDeviceGLImpl typedef struct IDirect3DDeviceGLImpl
{ {
struct IDirect3DDeviceImpl parent; struct IDirect3DDeviceImpl parent;
...@@ -118,12 +112,6 @@ typedef struct IDirect3DDeviceGLImpl ...@@ -118,12 +112,6 @@ typedef struct IDirect3DDeviceGLImpl
BOOLEAN last_vertices_transformed; BOOLEAN last_vertices_transformed;
BOOLEAN last_vertices_lit; 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 *world_mat;
D3DMATRIX *view_mat; D3DMATRIX *view_mat;
D3DMATRIX *proj_mat; D3DMATRIX *proj_mat;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment