ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Get rid of the SPRITEVERTEX typedef.

This commit is contained in:
Henri Verbeet 2013-09-27 00:15:17 +02:00 committed by Alexandre Julliard
parent be1dbc0dbb
commit be2e845cb3
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/d3dx9_36/sprite.c
View File

@ -25,11 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
/* the combination of all possible D3DXSPRITE flags */ /* the combination of all possible D3DXSPRITE flags */
#define D3DXSPRITE_FLAGLIMIT 511 #define D3DXSPRITE_FLAGLIMIT 511
typedef struct _SPRITEVERTEX { struct sprite_vertex
{
D3DXVECTOR3 pos; D3DXVECTOR3 pos;
DWORD col; DWORD col;
D3DXVECTOR2 tex; D3DXVECTOR2 tex;
} SPRITEVERTEX; };
typedef struct _SPRITE { typedef struct _SPRITE {
IDirect3DTexture9 *texture; IDirect3DTexture9 *texture;
@ -315,7 +316,7 @@ D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often)
set_states(This); set_states(This);
IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl); IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl);
IDirect3DDevice9_SetStreamSource(This->device, 0, NULL, 0, sizeof(SPRITEVERTEX)); IDirect3DDevice9_SetStreamSource(This->device, 0, NULL, 0, sizeof(struct sprite_vertex));
IDirect3DDevice9_SetIndices(This->device, NULL); IDirect3DDevice9_SetIndices(This->device, NULL);
IDirect3DDevice9_SetTexture(This->device, 0, NULL); IDirect3DDevice9_SetTexture(This->device, 0, NULL);
@ -398,7 +399,7 @@ static HRESULT WINAPI d3dx9_sprite_Draw(ID3DXSprite *iface, IDirect3DTexture9 *t
static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface) static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface)
{ {
struct d3dx9_sprite *This = impl_from_ID3DXSprite(iface); struct d3dx9_sprite *This = impl_from_ID3DXSprite(iface);
SPRITEVERTEX *vertices; struct sprite_vertex *vertices;
int i, count=0, start; int i, count=0, start;
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
@ -407,7 +408,7 @@ static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface)
if(!This->sprite_count) return D3D_OK; if(!This->sprite_count) return D3D_OK;
/* TODO: use of a vertex buffer here */ /* TODO: use of a vertex buffer here */
vertices=HeapAlloc(GetProcessHeap(), 0, sizeof(SPRITEVERTEX)*6*This->sprite_count); vertices = HeapAlloc(GetProcessHeap(), 0, sizeof(*vertices) * 6 * This->sprite_count);
for(start=0;start<This->sprite_count;start+=count,count=0) { for(start=0;start<This->sprite_count;start+=count,count=0) {
i=start; i=start;
@ -444,9 +445,8 @@ static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface)
vertices[6*i+4]=vertices[6*i]; vertices[6*i+4]=vertices[6*i];
vertices[6*i+5]=vertices[6*i+2]; vertices[6*i+5]=vertices[6*i+2];
D3DXVec3TransformCoordArray(&vertices[6*i].pos, sizeof(SPRITEVERTEX), D3DXVec3TransformCoordArray(&vertices[6 * i].pos, sizeof(*vertices),
&vertices[6*i].pos, sizeof(SPRITEVERTEX), &vertices[6 * i].pos, sizeof(*vertices), &This->sprites[i].transform, 6);
&This->sprites[i].transform, 6);
count++; count++;
i++; i++;
} }
@ -454,7 +454,8 @@ static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface)
IDirect3DDevice9_SetTexture(This->device, 0, (struct IDirect3DBaseTexture9 *)This->sprites[start].texture); IDirect3DDevice9_SetTexture(This->device, 0, (struct IDirect3DBaseTexture9 *)This->sprites[start].texture);
IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl); IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl);
IDirect3DDevice9_DrawPrimitiveUP(This->device, D3DPT_TRIANGLELIST, 2*count, vertices+6*start, sizeof(SPRITEVERTEX)); IDirect3DDevice9_DrawPrimitiveUP(This->device, D3DPT_TRIANGLELIST,
2 * count, vertices + 6 * start, sizeof(*vertices));
} }
HeapFree(GetProcessHeap(), 0, vertices); HeapFree(GetProcessHeap(), 0, vertices);