Ivan Gyurdiev : wined3d:
Merge D3DDP_MAXTEXCOORD constants into one constant in WINED3D
namespace.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Oct 12 05:46:55 CDT 2006
Module: wine
Branch: master
Commit: 532fe7a1cf4c4165877e0305fee14df952f988cf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=532fe7a1cf4c4165877e0305fee14df952f988cf
Author: Ivan Gyurdiev <ivg231 at gmail.com>
Date: Thu Oct 12 02:24:43 2006 -0400
wined3d: Merge D3DDP_MAXTEXCOORD constants into one constant in WINED3D namespace.
---
dlls/wined3d/drawprim.c | 18 +++++++++---------
include/wine/wined3d_types.h | 9 +++------
2 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index ffde5d2..fad7bf8 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -368,24 +368,24 @@ static BOOL fixed_get_input(
*regnum = 5;
else if (usage == D3DDECLUSAGE_COLOR && usage_idx == 1)
*regnum = 6;
- else if (usage == D3DDECLUSAGE_TEXCOORD && usage_idx < D3DDP_MAXTEXCOORD)
+ else if (usage == D3DDECLUSAGE_TEXCOORD && usage_idx < WINED3DDP_MAXTEXCOORD)
*regnum = 7 + usage_idx;
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)
- *regnum = 8 + D3DDP_MAXTEXCOORD;
+ *regnum = 8 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_TANGENT && usage_idx == 0)
- *regnum = 9 + D3DDP_MAXTEXCOORD;
+ *regnum = 9 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_BINORMAL && usage_idx == 0)
- *regnum = 10 + D3DDP_MAXTEXCOORD;
+ *regnum = 10 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_TESSFACTOR && usage_idx == 0)
- *regnum = 11 + D3DDP_MAXTEXCOORD;
+ *regnum = 11 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_FOG && usage_idx == 0)
- *regnum = 12 + D3DDP_MAXTEXCOORD;
+ *regnum = 12 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_DEPTH && usage_idx == 0)
- *regnum = 13 + D3DDP_MAXTEXCOORD;
+ *regnum = 13 + WINED3DDP_MAXTEXCOORD;
else if (usage == D3DDECLUSAGE_SAMPLE && usage_idx == 0)
- *regnum = 14 + D3DDP_MAXTEXCOORD;
+ *regnum = 14 + WINED3DDP_MAXTEXCOORD;
if (*regnum < 0) {
FIXME("Unsupported input stream [usage=%s, usage_idx=%u]\n",
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index 48120e4..42afc1e 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -25,11 +25,6 @@
#ifndef __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 enum _WINED3DLIGHTTYPE {
@@ -986,6 +981,8 @@ typedef struct glDescriptor {
int/*GLenum*/ glType;
} glDescriptor;
+#define WINED3DDP_MAXTEXCOORD 8
+
typedef enum _WINED3DDECLMETHOD {
WINED3DDECLMETHOD_DEFAULT = 0,
WINED3DDECLMETHOD_PARTIALU = 1,
@@ -1038,7 +1035,7 @@ typedef struct WineDirect3DVertexStrided
WineDirect3DStridedData pSize;
WineDirect3DStridedData diffuse;
WineDirect3DStridedData specular;
- WineDirect3DStridedData texCoords[D3DDP_MAXTEXCOORD];
+ WineDirect3DStridedData texCoords[WINED3DDP_MAXTEXCOORD];
WineDirect3DStridedData position2; /* tween data */
WineDirect3DStridedData normal2; /* tween data */
WineDirect3DStridedData tangent;
More information about the wine-cvs
mailing list