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

wined3d: Merge D3DDP_MAXTEXCOORD constants into one constant in WINED3D namespace.

This commit is contained in:
Ivan Gyurdiev 2006-10-12 02:24:43 -04:00 committed by Alexandre Julliard
parent 2bac4a02da
commit 532fe7a1cf
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/wined3d/drawprim.c
View File

@ -368,24 +368,24 @@ static BOOL fixed_get_input(
*regnum = 5; *regnum = 5;
else if (usage == D3DDECLUSAGE_COLOR && usage_idx == 1) else if (usage == D3DDECLUSAGE_COLOR && usage_idx == 1)
*regnum = 6; *regnum = 6;
else if (usage == D3DDECLUSAGE_TEXCOORD && usage_idx < D3DDP_MAXTEXCOORD) else if (usage == D3DDECLUSAGE_TEXCOORD && usage_idx < WINED3DDP_MAXTEXCOORD)
*regnum = 7 + usage_idx; *regnum = 7 + usage_idx;
else if ((usage == D3DDECLUSAGE_POSITION || usage == D3DDECLUSAGE_POSITIONT) && usage_idx == 1) else if ((usage == D3DDECLUSAGE_POSITION || usage == D3DDECLUSAGE_POSITIONT) && usage_idx == 1)
*regnum = 7 + D3DDP_MAXTEXCOORD; *regnum = 7 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_NORMAL && usage_idx == 1) else if (usage == D3DDECLUSAGE_NORMAL && usage_idx == 1)
*regnum = 8 + D3DDP_MAXTEXCOORD; *regnum = 8 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_TANGENT && usage_idx == 0) else if (usage == D3DDECLUSAGE_TANGENT && usage_idx == 0)
*regnum = 9 + D3DDP_MAXTEXCOORD; *regnum = 9 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_BINORMAL && usage_idx == 0) else if (usage == D3DDECLUSAGE_BINORMAL && usage_idx == 0)
*regnum = 10 + D3DDP_MAXTEXCOORD; *regnum = 10 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_TESSFACTOR && usage_idx == 0) else if (usage == D3DDECLUSAGE_TESSFACTOR && usage_idx == 0)
*regnum = 11 + D3DDP_MAXTEXCOORD; *regnum = 11 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_FOG && usage_idx == 0) else if (usage == D3DDECLUSAGE_FOG && usage_idx == 0)
*regnum = 12 + D3DDP_MAXTEXCOORD; *regnum = 12 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_DEPTH && usage_idx == 0) else if (usage == D3DDECLUSAGE_DEPTH && usage_idx == 0)
*regnum = 13 + D3DDP_MAXTEXCOORD; *regnum = 13 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_SAMPLE && usage_idx == 0) else if (usage == D3DDECLUSAGE_SAMPLE && usage_idx == 0)
*regnum = 14 + D3DDP_MAXTEXCOORD; *regnum = 14 + WINED3DDP_MAXTEXCOORD;
if (*regnum < 0) { if (*regnum < 0) {
FIXME("Unsupported input stream [usage=%s, usage_idx=%u]\n", FIXME("Unsupported input stream [usage=%s, usage_idx=%u]\n",

9
include/wine/wined3d_types.h
View File

@ -25,11 +25,6 @@
#ifndef __WINE_WINED3D_TYPES_H #ifndef __WINE_WINED3D_TYPES_H
#define __WINE_WINED3D_TYPES_H #define __WINE_WINED3D_TYPES_H
/* TODO: remove the dependency on d3d9 or d3d8 */
#if !defined( __WINE_D3D_H ) && !defined( __WINE_D3D8_H ) && !defined( __WINE_D3D9_H )
# error You must include d3d.h, d3d8.h or d3d9.h header to use this header
#endif
typedef DWORD WINED3DCOLOR; typedef DWORD WINED3DCOLOR;
typedef enum _WINED3DLIGHTTYPE { typedef enum _WINED3DLIGHTTYPE {
@ -986,6 +981,8 @@ typedef struct glDescriptor {
int/*GLenum*/ glType; int/*GLenum*/ glType;
} glDescriptor; } glDescriptor;
#define WINED3DDP_MAXTEXCOORD 8
typedef enum _WINED3DDECLMETHOD { typedef enum _WINED3DDECLMETHOD {
WINED3DDECLMETHOD_DEFAULT = 0, WINED3DDECLMETHOD_DEFAULT = 0,
WINED3DDECLMETHOD_PARTIALU = 1, WINED3DDECLMETHOD_PARTIALU = 1,
@ -1038,7 +1035,7 @@ typedef struct WineDirect3DVertexStridedData {
WineDirect3DStridedData pSize; WineDirect3DStridedData pSize;
WineDirect3DStridedData diffuse; WineDirect3DStridedData diffuse;
WineDirect3DStridedData specular; WineDirect3DStridedData specular;
WineDirect3DStridedData texCoords[D3DDP_MAXTEXCOORD]; WineDirect3DStridedData texCoords[WINED3DDP_MAXTEXCOORD];
WineDirect3DStridedData position2; /* tween data */ WineDirect3DStridedData position2; /* tween data */
WineDirect3DStridedData normal2; /* tween data */ WineDirect3DStridedData normal2; /* tween data */
WineDirect3DStridedData tangent; WineDirect3DStridedData tangent;