From: Matteo Bruni Subject: [PATCH 5/5] include: Fix render state maximum version comments. Message-Id: <20170322221755.13426-5-mbruni@codeweavers.com> Date: Wed, 22 Mar 2017 23:17:55 +0100 In-Reply-To: <20170322221755.13426-1-mbruni@codeweavers.com> References: <20170322221755.13426-1-mbruni@codeweavers.com> Signed-off-by: Matteo Bruni --- Actually I'm not sure what those comments meant in origin. Anyway, with this patch they should indicate the maximum d3d version supporting the relevant render state (no comment means d3d9, obviously). include/wine/wined3d.h | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index dfad9dd..b29f39c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -254,17 +254,17 @@ enum wined3d_format_id enum wined3d_render_state { - WINED3D_RS_ANTIALIAS = 2, /* d3d7 */ - WINED3D_RS_TEXTUREPERSPECTIVE = 4, /* d3d7 */ - WINED3D_RS_WRAPU = 5, /* d3d7 */ - WINED3D_RS_WRAPV = 6, /* d3d7 */ + WINED3D_RS_ANTIALIAS = 2, /* <= d3d7 */ + WINED3D_RS_TEXTUREPERSPECTIVE = 4, /* <= d3d7 */ + WINED3D_RS_WRAPU = 5, /* <= d3d6 */ + WINED3D_RS_WRAPV = 6, /* <= d3d6 */ WINED3D_RS_ZENABLE = 7, WINED3D_RS_FILLMODE = 8, WINED3D_RS_SHADEMODE = 9, - WINED3D_RS_LINEPATTERN = 10, /* d3d7, d3d8 */ - WINED3D_RS_MONOENABLE = 11, /* d3d7 */ - WINED3D_RS_ROP2 = 12, /* d3d7 */ - WINED3D_RS_PLANEMASK = 13, /* d3d7 */ + WINED3D_RS_LINEPATTERN = 10, /* <= d3d8 */ + WINED3D_RS_MONOENABLE = 11, /* <= d3d6 */ + WINED3D_RS_ROP2 = 12, /* <= d3d6 */ + WINED3D_RS_PLANEMASK = 13, /* <= d3d6 */ WINED3D_RS_ZWRITEENABLE = 14, WINED3D_RS_ALPHATESTENABLE = 15, WINED3D_RS_LASTPIXEL = 16, @@ -278,25 +278,25 @@ enum wined3d_render_state WINED3D_RS_ALPHABLENDENABLE = 27, WINED3D_RS_FOGENABLE = 28, WINED3D_RS_SPECULARENABLE = 29, - WINED3D_RS_ZVISIBLE = 30, /* d3d7, d3d8 */ - WINED3D_RS_SUBPIXEL = 31, /* d3d7 */ - WINED3D_RS_SUBPIXELX = 32, /* d3d7 */ - WINED3D_RS_STIPPLEDALPHA = 33, /* d3d7 */ + WINED3D_RS_ZVISIBLE = 30, /* <= d3d8 */ + WINED3D_RS_SUBPIXEL = 31, /* <= d3d6 */ + WINED3D_RS_SUBPIXELX = 32, /* <= d3d6 */ + WINED3D_RS_STIPPLEDALPHA = 33, /* <= d3d7 */ WINED3D_RS_FOGCOLOR = 34, WINED3D_RS_FOGTABLEMODE = 35, WINED3D_RS_FOGSTART = 36, WINED3D_RS_FOGEND = 37, WINED3D_RS_FOGDENSITY = 38, - WINED3D_RS_STIPPLEENABLE = 39, /* d3d7 */ + WINED3D_RS_STIPPLEENABLE = 39, /* <= d3d6 */ /* d3d5+ */ - WINED3D_RS_EDGEANTIALIAS = 40, /* d3d7, d3d8 */ - WINED3D_RS_COLORKEYENABLE = 41, /* d3d7 */ - WINED3D_RS_MIPMAPLODBIAS = 46, /* d3d7 */ + WINED3D_RS_EDGEANTIALIAS = 40, /* <= d3d8 */ + WINED3D_RS_COLORKEYENABLE = 41, /* <= d3d7 */ + WINED3D_RS_MIPMAPLODBIAS = 46, /* <= d3d6 */ WINED3D_RS_RANGEFOGENABLE = 48, - WINED3D_RS_ANISOTROPY = 49, /* d3d7 */ + WINED3D_RS_ANISOTROPY = 49, /* <= d3d6 */ /* d3d6+ */ - WINED3D_RS_FLUSHBATCH = 50, /* d3d7 */ - WINED3D_RS_TRANSLUCENTSORTINDEPENDENT = 51, /* d3d7 */ + WINED3D_RS_FLUSHBATCH = 50, /* <= d3d6 */ + WINED3D_RS_TRANSLUCENTSORTINDEPENDENT = 51, /* <= d3d6 */ WINED3D_RS_STENCILENABLE = 52, WINED3D_RS_STENCILFAIL = 53, WINED3D_RS_STENCILZFAIL = 54, @@ -317,13 +317,13 @@ enum wined3d_render_state /* d3d7+ */ WINED3D_RS_CLIPPING = 136, WINED3D_RS_LIGHTING = 137, - WINED3D_RS_EXTENTS = 138, /* d3d7 */ + WINED3D_RS_EXTENTS = 138, /* <= d3d7 */ WINED3D_RS_AMBIENT = 139, WINED3D_RS_FOGVERTEXMODE = 140, WINED3D_RS_COLORVERTEX = 141, WINED3D_RS_LOCALVIEWER = 142, WINED3D_RS_NORMALIZENORMALS = 143, - WINED3D_RS_COLORKEYBLENDENABLE = 144, /* d3d7 */ + WINED3D_RS_COLORKEYBLENDENABLE = 144, /* <= d3d7 */ WINED3D_RS_DIFFUSEMATERIALSOURCE = 145, WINED3D_RS_SPECULARMATERIALSOURCE = 146, WINED3D_RS_AMBIENTMATERIALSOURCE = 147, @@ -331,7 +331,7 @@ enum wined3d_render_state WINED3D_RS_VERTEXBLEND = 151, WINED3D_RS_CLIPPLANEENABLE = 152, /* d3d8+ */ - WINED3D_RS_SOFTWAREVERTEXPROCESSING = 153, /* d3d8 */ + WINED3D_RS_SOFTWAREVERTEXPROCESSING = 153, /* <= d3d8 */ WINED3D_RS_POINTSIZE = 154, WINED3D_RS_POINTSIZE_MIN = 155, WINED3D_RS_POINTSPRITEENABLE = 156, @@ -342,7 +342,7 @@ enum wined3d_render_state WINED3D_RS_MULTISAMPLEANTIALIAS = 161, WINED3D_RS_MULTISAMPLEMASK = 162, WINED3D_RS_PATCHEDGESTYLE = 163, - WINED3D_RS_PATCHSEGMENTS = 164, /* d3d8 */ + WINED3D_RS_PATCHSEGMENTS = 164, /* <= d3d8 */ WINED3D_RS_DEBUGMONITORTOKEN = 165, WINED3D_RS_POINTSIZE_MAX = 166, WINED3D_RS_INDEXEDVERTEXBLENDENABLE = 167, -- 2.10.2