[PATCH v2 2/5] include: Fix render state maximum version comments.
Matteo Bruni
mbruni at codeweavers.com
Sun Apr 9 14:03:36 CDT 2017
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
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.
Also moving them from wine/wined3d.h to d3dtypes.h. The other option
is to just get rid of them.
v2: Move the comments to d3dtypes.h.
include/d3dtypes.h | 24 ++++++++++++------------
include/wine/wined3d.h | 46 +++++++++++++++++++++++-----------------------
2 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/include/d3dtypes.h b/include/d3dtypes.h
index fe7f3b2..fdd417e 100644
--- a/include/d3dtypes.h
+++ b/include/d3dtypes.h
@@ -829,15 +829,15 @@ typedef enum {
D3DRENDERSTATE_ANTIALIAS = 2,
D3DRENDERSTATE_TEXTUREADDRESS = 3,
D3DRENDERSTATE_TEXTUREPERSPECTIVE = 4,
- D3DRENDERSTATE_WRAPU = 5,
- D3DRENDERSTATE_WRAPV = 6,
+ D3DRENDERSTATE_WRAPU = 5, /* <= d3d6 */
+ D3DRENDERSTATE_WRAPV = 6, /* <= d3d6 */
D3DRENDERSTATE_ZENABLE = 7,
D3DRENDERSTATE_FILLMODE = 8,
D3DRENDERSTATE_SHADEMODE = 9,
D3DRENDERSTATE_LINEPATTERN = 10,
- D3DRENDERSTATE_MONOENABLE = 11,
- D3DRENDERSTATE_ROP2 = 12,
- D3DRENDERSTATE_PLANEMASK = 13,
+ D3DRENDERSTATE_MONOENABLE = 11, /* <= d3d6 */
+ D3DRENDERSTATE_ROP2 = 12, /* <= d3d6 */
+ D3DRENDERSTATE_PLANEMASK = 13, /* <= d3d6 */
D3DRENDERSTATE_ZWRITEENABLE = 14,
D3DRENDERSTATE_ALPHATESTENABLE = 15,
D3DRENDERSTATE_LASTPIXEL = 16,
@@ -855,8 +855,8 @@ typedef enum {
D3DRENDERSTATE_FOGENABLE = 28,
D3DRENDERSTATE_SPECULARENABLE = 29,
D3DRENDERSTATE_ZVISIBLE = 30,
- D3DRENDERSTATE_SUBPIXEL = 31,
- D3DRENDERSTATE_SUBPIXELX = 32,
+ D3DRENDERSTATE_SUBPIXEL = 31, /* <= d3d6 */
+ D3DRENDERSTATE_SUBPIXELX = 32, /* <= d3d6 */
D3DRENDERSTATE_STIPPLEDALPHA = 33,
D3DRENDERSTATE_FOGCOLOR = 34,
D3DRENDERSTATE_FOGTABLEMODE = 35,
@@ -866,20 +866,20 @@ typedef enum {
D3DRENDERSTATE_FOGSTART = 36,
D3DRENDERSTATE_FOGEND = 37,
D3DRENDERSTATE_FOGDENSITY = 38,
- D3DRENDERSTATE_STIPPLEENABLE = 39,
+ D3DRENDERSTATE_STIPPLEENABLE = 39, /* <= d3d6 */
/* d3d5 */
D3DRENDERSTATE_EDGEANTIALIAS = 40,
D3DRENDERSTATE_COLORKEYENABLE = 41,
D3DRENDERSTATE_BORDERCOLOR = 43,
D3DRENDERSTATE_TEXTUREADDRESSU = 44,
D3DRENDERSTATE_TEXTUREADDRESSV = 45,
- D3DRENDERSTATE_MIPMAPLODBIAS = 46,
+ D3DRENDERSTATE_MIPMAPLODBIAS = 46, /* <= d3d6 */
D3DRENDERSTATE_ZBIAS = 47,
D3DRENDERSTATE_RANGEFOGENABLE = 48,
- D3DRENDERSTATE_ANISOTROPY = 49,
- D3DRENDERSTATE_FLUSHBATCH = 50,
+ D3DRENDERSTATE_ANISOTROPY = 49, /* <= d3d6 */
+ D3DRENDERSTATE_FLUSHBATCH = 50, /* <= d3d6 */
/* d3d6 */
- D3DRENDERSTATE_TRANSLUCENTSORTINDEPENDENT = 51,
+ D3DRENDERSTATE_TRANSLUCENTSORTINDEPENDENT = 51, /* <= d3d6 */
D3DRENDERSTATE_STENCILENABLE = 52,
D3DRENDERSTATE_STENCILFAIL = 53,
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 491f2fd..e598f80 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,
+ WINED3D_RS_TEXTUREPERSPECTIVE = 4,
+ WINED3D_RS_WRAPU = 5,
+ WINED3D_RS_WRAPV = 6,
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,
+ WINED3D_RS_MONOENABLE = 11,
+ WINED3D_RS_ROP2 = 12,
+ WINED3D_RS_PLANEMASK = 13,
WINED3D_RS_ZWRITEENABLE = 14,
WINED3D_RS_ALPHATESTENABLE = 15,
WINED3D_RS_LASTPIXEL = 16,
@@ -278,23 +278,23 @@ 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,
+ WINED3D_RS_SUBPIXEL = 31,
+ WINED3D_RS_SUBPIXELX = 32,
+ WINED3D_RS_STIPPLEDALPHA = 33,
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_EDGEANTIALIAS = 40, /* d3d7, d3d8 */
- WINED3D_RS_COLORKEYENABLE = 41, /* d3d7 */
- WINED3D_RS_MIPMAPLODBIAS = 46, /* d3d7 */
+ WINED3D_RS_STIPPLEENABLE = 39,
+ WINED3D_RS_EDGEANTIALIAS = 40,
+ WINED3D_RS_COLORKEYENABLE = 41,
+ WINED3D_RS_MIPMAPLODBIAS = 46,
WINED3D_RS_RANGEFOGENABLE = 48,
- WINED3D_RS_ANISOTROPY = 49, /* d3d7 */
- WINED3D_RS_FLUSHBATCH = 50, /* d3d7 */
- WINED3D_RS_TRANSLUCENTSORTINDEPENDENT = 51, /* d3d7 */
+ WINED3D_RS_ANISOTROPY = 49,
+ WINED3D_RS_FLUSHBATCH = 50,
+ WINED3D_RS_TRANSLUCENTSORTINDEPENDENT = 51,
WINED3D_RS_STENCILENABLE = 52,
WINED3D_RS_STENCILFAIL = 53,
WINED3D_RS_STENCILZFAIL = 54,
@@ -314,20 +314,20 @@ enum wined3d_render_state
WINED3D_RS_WRAP7 = 135,
WINED3D_RS_CLIPPING = 136,
WINED3D_RS_LIGHTING = 137,
- WINED3D_RS_EXTENTS = 138, /* d3d7 */
+ WINED3D_RS_EXTENTS = 138,
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,
WINED3D_RS_DIFFUSEMATERIALSOURCE = 145,
WINED3D_RS_SPECULARMATERIALSOURCE = 146,
WINED3D_RS_AMBIENTMATERIALSOURCE = 147,
WINED3D_RS_EMISSIVEMATERIALSOURCE = 148,
WINED3D_RS_VERTEXBLEND = 151,
WINED3D_RS_CLIPPLANEENABLE = 152,
- WINED3D_RS_SOFTWAREVERTEXPROCESSING = 153, /* d3d8 */
+ WINED3D_RS_SOFTWAREVERTEXPROCESSING = 153,
WINED3D_RS_POINTSIZE = 154,
WINED3D_RS_POINTSIZE_MIN = 155,
WINED3D_RS_POINTSPRITEENABLE = 156,
@@ -338,7 +338,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,
WINED3D_RS_DEBUGMONITORTOKEN = 165,
WINED3D_RS_POINTSIZE_MAX = 166,
WINED3D_RS_INDEXEDVERTEXBLENDENABLE = 167,
--
2.10.2
More information about the wine-patches
mailing list