[6] WineD3D: Add WINED3DRS_STIPPLEPATTERNxy
Stefan Dösinger
stefan at codeweavers.com
Sun Dec 17 10:21:30 CST 2006
Am Freitag 15 Dezember 2006 20:42 schrieb Stefan Dösinger:
> While I'm working on render states add WINED3DRS_STIPPLEPATTERNxy. Those
> are mentioned as obsolete in the directx sdk, so if we implement them then
> in ddraw by wrapping to their successors. But wined3d should be able to
> name them in traces if it has to deal with them.
Use this patch instead, it fixes a spelling mistake in the comments spotted by
vitamin
-------------- next part --------------
From ed289e8df5fe8fff25fae4563b860be6a0f022c9 Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan at codeweavers.com>
Date: Sun, 17 Dec 2006 14:23:29 +0100
Subject: [PATCH] WineD3D: Add WINED3DRS_STIPPLEPATTERNxy
---
dlls/wined3d/state.c | 65 +++++++++++++++++++++---------------------
dlls/wined3d/utils.c | 32 +++++++++++++++++++++
include/wine/wined3d_types.h | 34 ++++++++++++++++++++++
3 files changed, 98 insertions(+), 33 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 524309c..59ae942 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1364,42 +1364,41 @@ const struct StateEntry StateTable[] =
{ /* 58, WINED3DRS_STENCILMASK */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil },
{ /* 59, WINED3DRS_STENCILWRITEMASK */ STATE_RENDER(WINED3DRS_STENCILWRITEMASK), state_stencilwrite },
{ /* 60, WINED3DRS_TEXTUREFACTOR */ STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor },
- /* A BIG hole. If wanted, 'fixed' states like the vertex type or the bound shaders can be put here */
{ /* 61, Undefined */ 0, state_undefined },
{ /* 62, Undefined */ 0, state_undefined },
{ /* 63, Undefined */ 0, state_undefined },
- { /* 64, Undefined */ 0, state_undefined },
- { /* 65, Undefined */ 0, state_undefined },
- { /* 66, Undefined */ 0, state_undefined },
- { /* 67, Undefined */ 0, state_undefined },
- { /* 68, Undefined */ 0, state_undefined },
- { /* 69, Undefined */ 0, state_undefined },
- { /* 70, Undefined */ 0, state_undefined },
- { /* 71, Undefined */ 0, state_undefined },
- { /* 72, Undefined */ 0, state_undefined },
- { /* 73, Undefined */ 0, state_undefined },
- { /* 74, Undefined */ 0, state_undefined },
- { /* 75, Undefined */ 0, state_undefined },
- { /* 76, Undefined */ 0, state_undefined },
- { /* 77, Undefined */ 0, state_undefined },
- { /* 78, Undefined */ 0, state_undefined },
- { /* 79, Undefined */ 0, state_undefined },
- { /* 80, Undefined */ 0, state_undefined },
- { /* 81, Undefined */ 0, state_undefined },
- { /* 82, Undefined */ 0, state_undefined },
- { /* 83, Undefined */ 0, state_undefined },
- { /* 84, Undefined */ 0, state_undefined },
- { /* 85, Undefined */ 0, state_undefined },
- { /* 86, Undefined */ 0, state_undefined },
- { /* 87, Undefined */ 0, state_undefined },
- { /* 88, Undefined */ 0, state_undefined },
- { /* 89, Undefined */ 0, state_undefined },
- { /* 90, Undefined */ 0, state_undefined },
- { /* 91, Undefined */ 0, state_undefined },
- { /* 92, Undefined */ 0, state_undefined },
- { /* 93, Undefined */ 0, state_undefined },
- { /* 94, Undefined */ 0, state_undefined },
- { /* 95, Undefined */ 0, state_undefined },
+ { /* 64, WINED3DRS_STIPPLEPATTERN00 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 65, WINED3DRS_STIPPLEPATTERN01 */ 0 /* Obsolete, should he handled by ddraw */, state_undefined },
+ { /* 66, WINED3DRS_STIPPLEPATTERN02 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 67, WINED3DRS_STIPPLEPATTERN03 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 68, WINED3DRS_STIPPLEPATTERN04 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 69, WINED3DRS_STIPPLEPATTERN05 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 70, WINED3DRS_STIPPLEPATTERN06 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 71, WINED3DRS_STIPPLEPATTERN07 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 72, WINED3DRS_STIPPLEPATTERN08 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 73, WINED3DRS_STIPPLEPATTERN09 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 74, WINED3DRS_STIPPLEPATTERN10 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 75, WINED3DRS_STIPPLEPATTERN11 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 76, WINED3DRS_STIPPLEPATTERN12 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 77, WINED3DRS_STIPPLEPATTERN13 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 78, WINED3DRS_STIPPLEPATTERN14 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 79, WINED3DRS_STIPPLEPATTERN15 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 80, WINED3DRS_STIPPLEPATTERN16 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 81, WINED3DRS_STIPPLEPATTERN17 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 82, WINED3DRS_STIPPLEPATTERN18 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 83, WINED3DRS_STIPPLEPATTERN19 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 84, WINED3DRS_STIPPLEPATTERN20 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 85, WINED3DRS_STIPPLEPATTERN21 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 86, WINED3DRS_STIPPLEPATTERN22 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 87, WINED3DRS_STIPPLEPATTERN23 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 88, WINED3DRS_STIPPLEPATTERN24 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 89, WINED3DRS_STIPPLEPATTERN25 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 90, WINED3DRS_STIPPLEPATTERN26 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 91, WINED3DRS_STIPPLEPATTERN27 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 92, WINED3DRS_STIPPLEPATTERN28 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 93, WINED3DRS_STIPPLEPATTERN29 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 94, WINED3DRS_STIPPLEPATTERN30 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
+ { /* 95, WINED3DRS_STIPPLEPATTERN31 */ 0 /* Obsolete, should be handled by ddraw */, state_undefined },
{ /* 96, Undefined */ 0, state_undefined },
{ /* 97, Undefined */ 0, state_undefined },
{ /* 98, Undefined */ 0, state_undefined },
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 8d09729..c1dceb3 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -433,6 +433,38 @@ #define D3DSTATE_TO_STR(u) case u: retur
D3DSTATE_TO_STR(WINED3DRS_STENCILMASK );
D3DSTATE_TO_STR(WINED3DRS_STENCILWRITEMASK );
D3DSTATE_TO_STR(WINED3DRS_TEXTUREFACTOR );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN00 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN01 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN02 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN03 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN04 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN05 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN06 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN07 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN08 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN09 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN10 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN11 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN12 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN13 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN14 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN15 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN16 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN17 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN18 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN19 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN20 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN21 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN22 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN23 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN24 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN25 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN26 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN27 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN28 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN29 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN30 );
+ D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN31 );
D3DSTATE_TO_STR(WINED3DRS_WRAP0 );
D3DSTATE_TO_STR(WINED3DRS_WRAP1 );
D3DSTATE_TO_STR(WINED3DRS_WRAP2 );
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index 6b71cd9..2f75be6 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -362,6 +362,40 @@ typedef enum _WINED3DRENDERSTATETYPE {
WINED3DRS_STENCILMASK = 58,
WINED3DRS_STENCILWRITEMASK = 59,
WINED3DRS_TEXTUREFACTOR = 60,
+
+ WINED3DRS_STIPPLEPATTERN00 = 64,
+ WINED3DRS_STIPPLEPATTERN01 = 65,
+ WINED3DRS_STIPPLEPATTERN02 = 66,
+ WINED3DRS_STIPPLEPATTERN03 = 67,
+ WINED3DRS_STIPPLEPATTERN04 = 68,
+ WINED3DRS_STIPPLEPATTERN05 = 69,
+ WINED3DRS_STIPPLEPATTERN06 = 70,
+ WINED3DRS_STIPPLEPATTERN07 = 71,
+ WINED3DRS_STIPPLEPATTERN08 = 72,
+ WINED3DRS_STIPPLEPATTERN09 = 73,
+ WINED3DRS_STIPPLEPATTERN10 = 74,
+ WINED3DRS_STIPPLEPATTERN11 = 75,
+ WINED3DRS_STIPPLEPATTERN12 = 76,
+ WINED3DRS_STIPPLEPATTERN13 = 77,
+ WINED3DRS_STIPPLEPATTERN14 = 78,
+ WINED3DRS_STIPPLEPATTERN15 = 79,
+ WINED3DRS_STIPPLEPATTERN16 = 80,
+ WINED3DRS_STIPPLEPATTERN17 = 81,
+ WINED3DRS_STIPPLEPATTERN18 = 82,
+ WINED3DRS_STIPPLEPATTERN19 = 83,
+ WINED3DRS_STIPPLEPATTERN20 = 84,
+ WINED3DRS_STIPPLEPATTERN21 = 85,
+ WINED3DRS_STIPPLEPATTERN22 = 86,
+ WINED3DRS_STIPPLEPATTERN23 = 87,
+ WINED3DRS_STIPPLEPATTERN24 = 88,
+ WINED3DRS_STIPPLEPATTERN25 = 89,
+ WINED3DRS_STIPPLEPATTERN26 = 90,
+ WINED3DRS_STIPPLEPATTERN27 = 91,
+ WINED3DRS_STIPPLEPATTERN28 = 92,
+ WINED3DRS_STIPPLEPATTERN29 = 93,
+ WINED3DRS_STIPPLEPATTERN30 = 94,
+ WINED3DRS_STIPPLEPATTERN31 = 95,
+
WINED3DRS_WRAP0 = 128,
WINED3DRS_WRAP1 = 129,
WINED3DRS_WRAP2 = 130,
--
1.4.2.4
More information about the wine-patches
mailing list