Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
042fa7be
Commit
042fa7be
authored
Oct 29, 2006
by
Ivan Gyurdiev
Committed by
Alexandre Julliard
Oct 30, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add D3DBLENDOP to the WINED3D namespace.
parent
4eced8ea
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
9 deletions
+19
-9
device.c
dlls/wined3d/device.c
+7
-7
stateblock.c
dlls/wined3d/stateblock.c
+2
-2
wined3d_types.h
include/wine/wined3d_types.h
+10
-0
No files found.
dlls/wined3d/device.c
View file @
042fa7be
...
...
@@ -3716,14 +3716,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
{
int
glParm
=
GL_FUNC_ADD
;
switch
((
D3DBLENDOP
)
Value
)
{
case
D3DBLENDOP_ADD
:
glParm
=
GL_FUNC_ADD
;
break
;
case
D3DBLENDOP_SUBTRACT
:
glParm
=
GL_FUNC_SUBTRACT
;
break
;
case
D3DBLENDOP_REVSUBTRACT
:
glParm
=
GL_FUNC_REVERSE_SUBTRACT
;
break
;
case
D3DBLENDOP_MIN
:
glParm
=
GL_MIN
;
break
;
case
D3DBLENDOP_MAX
:
glParm
=
GL_MAX
;
break
;
switch
((
WINE
D3DBLENDOP
)
Value
)
{
case
WINE
D3DBLENDOP_ADD
:
glParm
=
GL_FUNC_ADD
;
break
;
case
WINE
D3DBLENDOP_SUBTRACT
:
glParm
=
GL_FUNC_SUBTRACT
;
break
;
case
WINE
D3DBLENDOP_REVSUBTRACT
:
glParm
=
GL_FUNC_REVERSE_SUBTRACT
;
break
;
case
WINE
D3DBLENDOP_MIN
:
glParm
=
GL_MIN
;
break
;
case
WINE
D3DBLENDOP_MAX
:
glParm
=
GL_MAX
;
break
;
default:
FIXME
(
"Unrecognized/Unhandled D3DBLENDOP value %d
\n
"
,
Value
);
FIXME
(
"Unrecognized/Unhandled
WINE
D3DBLENDOP value %d
\n
"
,
Value
);
}
if
(
GL_SUPPORT
(
EXT_BLEND_MINMAX
))
{
...
...
dlls/wined3d/stateblock.c
View file @
042fa7be
...
...
@@ -935,7 +935,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat
IWineD3DDevice_SetRenderState
(
device
,
WINED3DRS_COLORWRITEENABLE
,
0x0000000F
);
tmpfloat
.
f
=
0
.
0
f
;
IWineD3DDevice_SetRenderState
(
device
,
WINED3DRS_TWEENFACTOR
,
tmpfloat
.
d
);
IWineD3DDevice_SetRenderState
(
device
,
WINED3DRS_BLENDOP
,
D3DBLENDOP_ADD
);
IWineD3DDevice_SetRenderState
(
device
,
WINED3DRS_BLENDOP
,
WINE
D3DBLENDOP_ADD
);
IWineD3DDevice_SetRenderState
(
device
,
WINED3DRS_POSITIONDEGREE
,
WINED3DDEGREE_CUBIC
);
IWineD3DDevice_SetRenderState
(
device
,
WINED3DRS_NORMALDEGREE
,
WINED3DDEGREE_LINEAR
);
/* states new in d3d9 */
...
...
@@ -975,7 +975,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat
IWineD3DDevice_SetRenderState
(
device
,
WINED3DRS_SEPARATEALPHABLENDENABLE
,
FALSE
);
IWineD3DDevice_SetRenderState
(
device
,
WINED3DRS_SRCBLENDALPHA
,
WINED3DBLEND_ONE
);
IWineD3DDevice_SetRenderState
(
device
,
WINED3DRS_DESTBLENDALPHA
,
WINED3DBLEND_ZERO
);
IWineD3DDevice_SetRenderState
(
device
,
WINED3DRS_BLENDOPALPHA
,
D3DBLENDOP_ADD
);
IWineD3DDevice_SetRenderState
(
device
,
WINED3DRS_BLENDOPALPHA
,
WINE
D3DBLENDOP_ADD
);
/* clipping status */
This
->
clip_status
.
ClipUnion
=
0
;
...
...
include/wine/wined3d_types.h
View file @
042fa7be
...
...
@@ -461,6 +461,16 @@ typedef enum _WINED3DBLEND {
WINED3DBLEND_FORCE_DWORD
=
0x7fffffff
}
WINED3DBLEND
;
typedef
enum
_WINED3DBLENDOP
{
WINED3DBLENDOP_ADD
=
1
,
WINED3DBLENDOP_SUBTRACT
=
2
,
WINED3DBLENDOP_REVSUBTRACT
=
3
,
WINED3DBLENDOP_MIN
=
4
,
WINED3DBLENDOP_MAX
=
5
,
WINED3DBLENDOP_FORCE_DWORD
=
0x7fffffff
}
WINED3DBLENDOP
;
typedef
enum
_WINED3DVERTEXBLENDFLAGS
{
WINED3DVBF_DISABLE
=
0
,
WINED3DVBF_1WEIGHTS
=
1
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment