Tidy up vertex shaders and bring the current code inline with the rest

dlls/wined3d/wined3d_private.h

@@ -1102,6 +1102,10 @@ typedef struct IWineD3DVertexShaderImpl {
     CONST DWORD                 *function;
     UINT                         functionLength;
 
+    DWORD usage;
+    DWORD version;
+    /* run time datas...  */
+    VSHADERDATA* data;
 #if 0 /* needs reworking */
     DWORD usage;
     DWORD version;
@@ -1125,13 +1129,11 @@ typedef struct IWineD3DPixelShaderImpl {
     IWineD3DDeviceImpl         *wineD3DDevice;
 
     
-    /* IWineD3DPixelShaderImpl*/
+    /* IWineD3DPixelShaderImpl */
     CONST DWORD                *function;
     UINT                        functionLength;
-
+        
 #if 0 /* needs reworking */
-    UINT functionLength;
-    DWORD version;
     /* run time datas */
     PSHADERDATA* data;
     PSHADERINPUTDATA input;

include/wine/wined3d_types.h

@@ -431,7 +431,7 @@ typedef struct _WINED3DSURFACE_DESC
 
 typedef struct _WINED3DVOLUME_DESC
 {
-    D3DFORMAT           *Format;
+    WINED3DFORMAT       *Format;
     D3DRESOURCETYPE     *Type;
     DWORD               *Usage;
     D3DPOOL             *Pool;
@@ -694,7 +694,45 @@ typedef struct glDescriptor {
     int/*GLenum*/ glFormatInternal;
     int/*GLenum*/ glType;
 } glDescriptor;
-
-
+/**************************** 
+ *  * Vertex Shaders Declaration
+ *   */
+
+typedef enum _WINED3DDECLUSAGE {
+      WINED3DSHADERDECLUSAGE_POSITION     = 0,
+      WINED3DSHADERDECLUSAGE_BLENDWEIGHT,
+      WINED3DSHADERDECLUSAGE_BLENDINDICES,
+      WINED3DSHADERDECLUSAGE_NORMAL,
+      WINED3DSHADERDECLUSAGE_PSIZE ,
+      WINED3DSHADERDECLUSAGE_TEXCOORD0,
+      WINED3DSHADERDECLUSAGE_TEXCOORD1,
+      WINED3DSHADERDECLUSAGE_TEXCOORD2,
+      WINED3DSHADERDECLUSAGE_TEXCOORD3,
+      WINED3DSHADERDECLUSAGE_TEXCOORD4,
+      WINED3DSHADERDECLUSAGE_TEXCOORD5,
+      WINED3DSHADERDECLUSAGE_TEXCOORD6,
+      WINED3DSHADERDECLUSAGE_TEXCOORD7,
+      WINED3DSHADERDECLUSAGE_TANGENT,
+      WINED3DSHADERDECLUSAGE_BINORMAL,
+      WINED3DSHADERDECLUSAGE_TESSFACTOR,
+      WINED3DSHADERDECLUSAGE_POSITIONT,
+      WINED3DSHADERDECLUSAGE_DIFFUSE,
+      WINED3DSHADERDECLUSAGE_SPECULAR,
+      WINED3DSHADERDECLUSAGE_FOG,
+      WINED3DSHADERDECLUSAGE_DEPTH,
+      WINED3DSHADERDECLUSAGE_SAMPLE,
+      WINED3DSHADERDECLUSAGE_POSITION2,
+      WINED3DSHADERDECLUSAGE_POSITION21,
+      WINED3DSHADERDECLUSAGE_POSITION22,
+      WINED3DSHADERDECLUSAGE_POSITION23,
+      WINED3DSHADERDECLUSAGE_POSITION24,
+      WINED3DSHADERDECLUSAGE_POSITION25,
+      WINED3DSHADERDECLUSAGE_POSITION26,
+      WINED3DSHADERDECLUSAGE_POSITION27,
+      WINED3DSHADERDECLUSAGE_POSITION28,
+      WINED3DSHADERDECLUSAGE_NORMAL2,
+      WINED3DSHADERDECLUSAGE_POSITIONT2,
+      WINED3DSHADERDECLUSAGE_MAX_USAGE
+} WINED3DSHADERDECLUSAGE;
 
 #endif