[PSDK] Update D3DCOLOR_ARGB and D3DQUERYTYPE. [DXSDK] Add missing D3DDEVICEDESC1...
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 16 Jun 2017 18:40:31 +0000 (18:40 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 16 Jun 2017 18:40:31 +0000 (18:40 +0000)
svn path=/trunk/; revision=75060

reactos/sdk/include/dxsdk/d3dcaps.h
reactos/sdk/include/psdk/d3d9types.h

index 76056a4..9c345d1 100644 (file)
@@ -277,6 +277,42 @@ typedef struct _D3DPrimCaps
   DWORD dwStippleHeight;
 } D3DPRIMCAPS, *LPD3DPRIMCAPS;
 
+typedef struct _D3DDeviceDesc1 {
+  DWORD dwSize;
+  DWORD dwFlags;
+  D3DCOLORMODEL dcmColorModel;
+  DWORD dwDevCaps;
+  D3DTRANSFORMCAPS dtcTransformCaps;
+  BOOL bClipping;
+  D3DLIGHTINGCAPS dlcLightingCaps;
+  D3DPRIMCAPS dpcLineCaps;
+  D3DPRIMCAPS dpcTriCaps;
+  DWORD dwDeviceRenderBitDepth;
+  DWORD dwDeviceZBufferBitDepth;
+  DWORD dwMaxBufferSize;
+  DWORD dwMaxVertexCount;
+} D3DDEVICEDESC1, *LPD3DDEVICEDESC1;
+
+typedef struct _D3DDeviceDesc2 {
+  DWORD dwSize;
+  DWORD dwFlags;
+  D3DCOLORMODEL dcmColorModel;
+  DWORD dwDevCaps;
+  D3DTRANSFORMCAPS dtcTransformCaps;
+  BOOL bClipping;
+  D3DLIGHTINGCAPS dlcLightingCaps;
+  D3DPRIMCAPS dpcLineCaps;
+  D3DPRIMCAPS dpcTriCaps;
+  DWORD dwDeviceRenderBitDepth;
+  DWORD dwDeviceZBufferBitDepth;
+  DWORD dwMaxBufferSize;
+  DWORD dwMaxVertexCount;
+  DWORD dwMinTextureWidth, dwMinTextureHeight;
+  DWORD dwMaxTextureWidth, dwMaxTextureHeight;
+  DWORD dwMinStippleWidth, dwMaxStippleWidth;
+  DWORD dwMinStippleHeight, dwMaxStippleHeight;
+} D3DDEVICEDESC2, *LPD3DDEVICEDESC2;
+
 typedef struct _D3DDeviceDesc
 {
   DWORD dwSize;
@@ -365,6 +401,20 @@ typedef struct _D3DFINDDEVICESEARCH
   D3DPRIMCAPS dpcPrimCaps;
 } D3DFINDDEVICESEARCH, *LPD3DFINDDEVICESEARCH;
 
+typedef struct _D3DFINDDEVICERESULT1 {
+  DWORD dwSize;
+  GUID guid;
+  D3DDEVICEDESC1 ddHwDesc;
+  D3DDEVICEDESC1 ddSwDesc;
+} D3DFINDDEVICERESULT1, *LPD3DFINDDEVICERESULT1;
+
+typedef struct _D3DFINDDEVICERESULT2 {
+  DWORD dwSize;
+  GUID guid;
+  D3DDEVICEDESC2 ddHwDesc;
+  D3DDEVICEDESC2 ddSwDesc;
+} D3DFINDDEVICERESULT2, *LPD3DFINDDEVICERESULT2;
+
 typedef struct _D3DFINDDEVICERESULT
 {
   DWORD dwSize;
index 6817999..f406cab 100644 (file)
@@ -39,7 +39,7 @@
 #define D3DCLIPPLANE4 (1 << 4)
 #define D3DCLIPPLANE5 (1 << 5)
 
-#define D3DCOLOR_ARGB(a,r,g,b)       ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff)))
+#define D3DCOLOR_ARGB(a,r,g,b)       ((D3DCOLOR)((((a)&0xffu)<<24)|(((r)&0xffu)<<16)|(((g)&0xffu)<<8)|((b)&0xffu)))
 #define D3DCOLOR_COLORVALUE(r,g,b,a) D3DCOLOR_RGBA((DWORD)((r)*255.f),(DWORD)((g)*255.f),(DWORD)((b)*255.f),(DWORD)((a)*255.f))
 #define D3DCOLOR_RGBA(r,g,b,a)       D3DCOLOR_ARGB(a,r,g,b)
 #define D3DCOLOR_XRGB(r,g,b)         D3DCOLOR_ARGB(0xff,r,g,b)
@@ -299,7 +299,8 @@ typedef enum _D3DQUERYTYPE {
     D3DQUERYTYPE_VERTEXTIMINGS = 15,
     D3DQUERYTYPE_PIXELTIMINGS = 16,
     D3DQUERYTYPE_BANDWIDTHTIMINGS = 17,
-    D3DQUERYTYPE_CACHEUTILIZATION = 18
+    D3DQUERYTYPE_CACHEUTILIZATION = 18,
+    D3DQUERYTYPE_MEMORYPRESSURE = 19,
 } D3DQUERYTYPE;
 
 #define D3DISSUE_BEGIN   (1 << 1)