commit 7b261656fd1df9b5c6877f90d74e30ba183d57e7
author Oliver Stieber <oliver_stieber@yahoo.co.uk> Thu Mar 03 13:57:15 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Mar 03 13:57:15 2005 +0000
tree 128f48a869f66b097e581c9e01133de6b0ccc9fb
parent 5be005b0d5f99e19a5638edb8dad2e17a5d4841e

Added a stubbed out version of query to d3d9 and wined3d.
Update the d3d9 headers and creates wined3d types where d3d9 and d3d8
are incompatible.

dlls/wined3d/wined3d_private.h

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index e8ca912..683c594 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -126,13 +126,12 @@
 
 #define MAX_STREAMS  16  /* Maximum possible streams - used for fixed size arrays
                             See MaxStreams in MSDN under GetDeviceCaps */
+                         /* Maximum number of constants provided to the shaders */
 #define HIGHEST_TRANSFORMSTATE 512 
                          /* Highest value in D3DTRANSFORMSTATETYPE */
-#define HIGHEST_RENDER_STATE   209
-                         /* Highest D3DRS_ value                   */
-#define HIGHEST_TEXTURE_STATE   32
+#define HIGHEST_TEXTURE_STATE   D3DTSS_CONSTANT
                          /* Highest D3DTSS_ value                  */
-#define WINED3D_VSHADER_MAX_CONSTANTS  96   
+#define HIGHEST_SAMPLER_STATE   D3DSAMP_DMAPOFFSET
                          /* Maximum number of constants provided to the shaders */
 #define MAX_CLIPPLANES  D3DMAXUSERCLIPPLANES
 
@@ -666,7 +665,7 @@
         BOOL                      textures[8];
         BOOL                      transform[HIGHEST_TRANSFORMSTATE];
         BOOL                      viewport;
-        BOOL                      renderState[HIGHEST_RENDER_STATE];
+        BOOL                      renderState[WINEHIGHEST_RENDER_STATE];
         BOOL                      textureState[8][HIGHEST_TEXTURE_STATE];
         BOOL                      clipplane[MAX_CLIPPLANES];
         BOOL                      vertexDecl;
@@ -727,7 +726,7 @@
     FLOAT                     tween_factor;
 
     /* RenderState */
-    DWORD                     renderState[HIGHEST_RENDER_STATE];
+    DWORD                     renderState[WINEHIGHEST_RENDER_STATE];
 
     /* Texture */
     IWineD3DBaseTexture      *textures[8];
@@ -741,6 +740,31 @@
 extern IWineD3DStateBlockVtbl IWineD3DStateBlock_Vtbl;
 
 /*****************************************************************************
+ * IWineD3DQueryImpl implementation structure (extends IUnknown)
+ */
+typedef struct IWineD3DQueryImpl
+{
+    IWineD3DQueryVtbl        *lpVtbl;
+    DWORD                     ref;     /* Note: Ref counting not required */
+    
+    IUnknown                 *parent;
+    /*TODO: replace with iface usage */
+#if 0
+    IWineD3DDevice         *wineD3DDevice;
+#else
+    IWineD3DDeviceImpl       *wineD3DDevice;
+#endif
+    /* IWineD3DQuery fields */
+
+    D3DQUERYTYPE              type;
+    void                     *extendedData;
+    
+  
+} IWineD3DQueryImpl;
+
+extern IWineD3DQueryVtbl IWineD3DQuery_Vtbl;
+
+/*****************************************************************************
  * Utility function prototypes 
  */