Author: khornicek
Date: Wed Jan 6 16:05:25 2010
New Revision: 44979
URL: http://svn.reactos.org/svn/reactos?rev=44979&view=rev
Log:
- missed this one, sorry
Modified:
trunk/reactos/include/reactos/wine/wined3d.idl
Modified: trunk/reactos/include/reactos/wine/wined3d.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined3d.idl?rev=44979&r1=44978&r2=44979&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/wined3d.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/wined3d.idl [iso-8859-1] Wed Jan 6
16:05:25 2010
@@ -41,6 +41,12 @@
RGNDATAHEADER rdh;
char Buffer[1];
} RGNDATA;
+
+typedef struct _LUID
+{
+ DWORD LowPart;
+ LONG HighPart;
+} LUID, *PLUID;
cpp_quote("#endif")
cpp_quote("#define WINED3D_OK S_OK")
@@ -151,7 +157,6 @@
WINED3DFMT_D16_LOCKABLE,
WINED3DFMT_D32_UNORM,
WINED3DFMT_S1_UINT_D15_UNORM,
- WINED3DFMT_S8_UINT_D24_UNORM,
WINED3DFMT_X8D24_UNORM,
WINED3DFMT_S4X4_UINT_D24_UNORM,
WINED3DFMT_L16_UNORM,
@@ -247,27 +252,25 @@
WINED3DFMT_B5G5R5A1_UNORM,
WINED3DFMT_B8G8R8A8_UNORM,
WINED3DFMT_B8G8R8X8_UNORM,
+ /* FOURCC formats. */
+ WINED3DFMT_UYVY = 0x59565955, /* UYVY */
+ WINED3DFMT_YUY2 = 0x32595559, /* YUY2 */
+ WINED3DFMT_YV12 = 0x32315659, /* YV12 */
+ WINED3DFMT_DXT1 = 0x31545844, /* DXT1 */
+ WINED3DFMT_DXT2 = 0x32545844, /* DXT2 */
+ WINED3DFMT_DXT3 = 0x33545844, /* DXT3 */
+ WINED3DFMT_DXT4 = 0x34545844, /* DXT4 */
+ WINED3DFMT_DXT5 = 0x35545844, /* DXT5 */
+ WINED3DFMT_MULTI2_ARGB8 = 0x3154454d, /* MET1 */
+ WINED3DFMT_G8R8_G8B8 = 0x42475247, /* GRGB */
+ WINED3DFMT_R8G8_B8G8 = 0x47424752, /* RGBG */
+ WINED3DFMT_ATI2N = 0x32495441, /* ATI2 */
+ WINED3DFMT_INST = 0x54534e49, /* INST */
+ WINED3DFMT_NVHU = 0x5548564e, /* NVHU */
+ WINED3DFMT_NVHS = 0x5348564e, /* NVHS */
WINED3DFMT_FORCE_DWORD = 0xffffffff
} WINED3DFORMAT;
-cpp_quote("#define WINEMAKEFOURCC(ch0, ch1, ch2, ch3) \\")
-cpp_quote(" ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \\")
-cpp_quote(" ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))")
-cpp_quote("#define WINED3DFMT_UYVY WINEMAKEFOURCC('U', 'Y', 'V', 'Y')")
-cpp_quote("#define WINED3DFMT_YUY2 WINEMAKEFOURCC('Y', 'U', 'Y', '2')")
-cpp_quote("#define WINED3DFMT_YV12 WINEMAKEFOURCC('Y', 'V', '1', '2')")
-cpp_quote("#define WINED3DFMT_DXT1 WINEMAKEFOURCC('D', 'X', 'T', '1')")
-cpp_quote("#define WINED3DFMT_DXT2 WINEMAKEFOURCC('D', 'X', 'T', '2')")
-cpp_quote("#define WINED3DFMT_DXT3 WINEMAKEFOURCC('D', 'X', 'T', '3')")
-cpp_quote("#define WINED3DFMT_DXT4 WINEMAKEFOURCC('D', 'X', 'T', '4')")
-cpp_quote("#define WINED3DFMT_DXT5 WINEMAKEFOURCC('D', 'X', 'T', '5')")
-cpp_quote("#define WINED3DFMT_MULTI2_ARGB8 WINEMAKEFOURCC('M', 'E', 'T', '1')")
-cpp_quote("#define WINED3DFMT_G8R8_G8B8 WINEMAKEFOURCC('G', 'R', 'G', 'B')")
-cpp_quote("#define WINED3DFMT_R8G8_B8G8 WINEMAKEFOURCC('R', 'G', 'B', 'G')")
-/* Vendor specific formats */
-cpp_quote("#define WINED3DFMT_ATI2N WINEMAKEFOURCC('A', 'T', 'I', '2')")
-cpp_quote("#define WINED3DFMT_NVHU WINEMAKEFOURCC('N', 'V', 'H', 'U')")
-cpp_quote("#define WINED3DFMT_NVHS WINEMAKEFOURCC('N', 'V', 'H', 'S')")
typedef enum _WINED3DRENDERSTATETYPE
{
@@ -712,12 +715,12 @@
WINED3DTS_TEXTURE5 = 21,
WINED3DTS_TEXTURE6 = 22,
WINED3DTS_TEXTURE7 = 23,
+ WINED3DTS_WORLD = 256, /*WINED3DTS_WORLDMATRIX(0)*/
+ WINED3DTS_WORLD1 = 257,
+ WINED3DTS_WORLD2 = 258,
+ WINED3DTS_WORLD3 = 259,
WINED3DTS_FORCE_DWORD = 0x7fffffff
} WINED3DTRANSFORMSTATETYPE;
-cpp_quote("#define WINED3DTS_WORLD WINED3DTS_WORLDMATRIX(0)")
-cpp_quote("#define WINED3DTS_WORLD1 WINED3DTS_WORLDMATRIX(1)")
-cpp_quote("#define WINED3DTS_WORLD2 WINED3DTS_WORLDMATRIX(2)")
-cpp_quote("#define WINED3DTS_WORLD3 WINED3DTS_WORLDMATRIX(3)")
cpp_quote("#define WINED3DTS_WORLDMATRIX(index)
(WINED3DTRANSFORMSTATETYPE)(index + 256)")
typedef enum _WINED3DBASISTYPE
@@ -901,6 +904,7 @@
const UINT WINED3DUSAGE_AUTOGENMIPMAP = 0x00000400;
const UINT WINED3DUSAGE_DMAP = 0x00004000;
const UINT WINED3DUSAGE_MASK = 0x00004fff;
+const UINT WINED3DUSAGE_STATICDECL = 0x40000000;
const UINT WINED3DUSAGE_OVERLAY = 0x80000000;
const UINT WINED3DUSAGE_QUERY_LEGACYBUMPMAP = 0x00008000;
@@ -1697,6 +1701,8 @@
DWORD revision;
GUID device_identifier;
DWORD whql_level;
+ LUID adapter_luid;
+ SIZE_T video_memory;
} WINED3DADAPTER_IDENTIFIER;
typedef struct _WINED3DPRESENT_PARAMETERS
@@ -2317,9 +2323,6 @@
]
interface IWineD3DResource : IWineD3DBase
{
- HRESULT GetDevice(
- [out] IWineD3DDevice **device
- );
HRESULT SetPrivateData(
[in] REFGUID guid,
[in] const void *data,
@@ -2705,9 +2708,6 @@
]
interface IWineD3DVertexDeclaration : IWineD3DBase
{
- HRESULT GetDevice(
- [out] IWineD3DDevice **device
- );
}
[
@@ -2715,11 +2715,8 @@
local,
uuid(83b073ce-6f30-11d9-c687-00046142c14f)
]
-interface IWineD3DStateBlock : IWineD3DBase
-{
- HRESULT GetDevice(
- [out] IWineD3DDevice **device
- );
+interface IWineD3DStateBlock : IUnknown
+{
HRESULT Capture(
);
HRESULT Apply(
@@ -2735,9 +2732,6 @@
]
interface IWineD3DQuery : IWineD3DBase
{
- HRESULT GetDevice(
- [out] IWineD3DDevice **device
- );
HRESULT GetData(
[out] void *data,
[in] DWORD data_size,
@@ -2827,9 +2821,6 @@
]
interface IWineD3DBaseShader : IWineD3DBase
{
- HRESULT GetDevice(
- [out] IWineD3DDevice **device
- );
HRESULT GetFunction(
[out] void *data,
[in, out] UINT *data_size
@@ -2853,6 +2844,15 @@
[
object,
local,
+ uuid(8276c113-388b-49d1-ad8b-c9dd8bcbabcd)
+]
+interface IWineD3DGeometryShader : IWineD3DBaseShader
+{
+}
+
+[
+ object,
+ local,
uuid(818503da-6f30-11d9-c687-00046142c14f)
]
interface IWineD3DPixelShader : IWineD3DBaseShader
@@ -2876,7 +2876,6 @@
HRESULT CreateVertexBuffer(
[in] UINT length,
[in] DWORD usage,
- [in] DWORD fvf,
[in] WINED3DPOOL pool,
[out] IWineD3DBuffer **vertex_buffer,
[in] IUnknown *parent,
@@ -2991,6 +2990,13 @@
[in] IUnknown *parent,
[in] const struct wined3d_parent_ops *parent_ops
);
+ HRESULT CreateGeometryShader(
+ [in] const DWORD *byte_code,
+ [in] const struct wined3d_shader_signature *output_signature,
+ [out] IWineD3DGeometryShader **shader,
+ [in] IUnknown *parent,
+ [in] const struct wined3d_parent_ops *parent_ops
+ );
HRESULT CreatePixelShader(
[in] const DWORD *function,
[in] const struct wined3d_shader_signature *output_signature,
@@ -3074,8 +3080,6 @@
BOOL ShowCursor(
[in] BOOL show
);
- HRESULT TestCooperativeLevel(
- );
HRESULT SetClipPlane(
[in] DWORD plane_idx,
[in] const float *plane
@@ -3205,7 +3209,8 @@
);
HRESULT SetRenderTarget(
[in] DWORD render_target_idx,
- [in] IWineD3DSurface *render_target
+ [in] IWineD3DSurface *render_target,
+ [in] BOOL set_viewport
);
HRESULT GetRenderTarget(
[in] DWORD render_target_idx,
