Remove cpp_quote hackery from wined3d.idl
Gerald Pfeifer
gerald at pfeifer.com
Sun Jan 3 10:23:43 CST 2010
On Mon, 28 Dec 2009, Henri Verbeet wrote:
>> In dlls/wined3d/directx.c we have the following where I wonder whether
>> you may want to add this to the enum as well?
>> case WINEMAKEFOURCC('I','N','S','T'):
> Yeah, just turn that into WINED3DFMT_INST.
Thanks for the guidance, Henri. This patch implements it.
Gerald
ChangeLog:
Introduce WINED3DFMT_INST and use it in CheckTextureCapability().
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index f9bc752..53e2ef7 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3119,7 +3119,7 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter,
*
* With Shader Model 3.0 capable cards Instancing 'just works' in Windows.
*/
- case WINEMAKEFOURCC('I','N','S','T'):
+ case WINED3DFMT_INST:
TRACE("ATI Instancing check hack\n");
if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_VERTEX_SHADER])
{
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index 7c44b5e..c4fc4ca 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -266,6 +266,7 @@ typedef enum _WINED3DFORMAT
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 */
More information about the wine-patches
mailing list