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
e4e28c47
Commit
e4e28c47
authored
Mar 31, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Mar 31, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Fix the EXT_blend_color extension definitions.
parent
f8507d60
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
9 deletions
+21
-9
state.c
dlls/wined3d/state.c
+8
-8
wined3d_gl.h
dlls/wined3d/wined3d_gl.h
+13
-1
No files found.
dlls/wined3d/state.c
View file @
e4e28c47
...
...
@@ -314,8 +314,8 @@ static void state_blend(DWORD state, struct wined3d_stateblock *stateblock, stru
FIXME
(
"WINED3DRS_DESTBLEND = WINED3DBLEND_BOTHINVSRCALPHA, what to do?
\n
"
);
break
;
case
WINED3DBLEND_BLENDFACTOR
:
dstBlend
=
GL_CONSTANT_COLOR
;
break
;
case
WINED3DBLEND_INVBLENDFACTOR
:
dstBlend
=
GL_ONE_MINUS_CONSTANT_COLOR
;
break
;
case
WINED3DBLEND_BLENDFACTOR
:
dstBlend
=
GL_CONSTANT_COLOR
_EXT
;
break
;
case
WINED3DBLEND_INVBLENDFACTOR
:
dstBlend
=
GL_ONE_MINUS_CONSTANT_COLOR
_EXT
;
break
;
default:
FIXME
(
"Unrecognized dst blend value %#x.
\n
"
,
stateblock
->
state
.
render_states
[
WINED3DRS_DESTBLEND
]);
...
...
@@ -348,8 +348,8 @@ static void state_blend(DWORD state, struct wined3d_stateblock *stateblock, stru
dstBlend
=
GL_SRC_ALPHA
;
break
;
case
WINED3DBLEND_BLENDFACTOR
:
srcBlend
=
GL_CONSTANT_COLOR
;
break
;
case
WINED3DBLEND_INVBLENDFACTOR
:
srcBlend
=
GL_ONE_MINUS_CONSTANT_COLOR
;
break
;
case
WINED3DBLEND_BLENDFACTOR
:
srcBlend
=
GL_CONSTANT_COLOR
_EXT
;
break
;
case
WINED3DBLEND_INVBLENDFACTOR
:
srcBlend
=
GL_ONE_MINUS_CONSTANT_COLOR
_EXT
;
break
;
default:
FIXME
(
"Unrecognized src blend value %#x.
\n
"
,
stateblock
->
state
.
render_states
[
WINED3DRS_SRCBLEND
]);
...
...
@@ -417,8 +417,8 @@ static void state_blend(DWORD state, struct wined3d_stateblock *stateblock, stru
srcBlendAlpha
=
GL_ONE_MINUS_SRC_ALPHA
;
FIXME
(
"WINED3DRS_DESTBLENDALPHA = WINED3DBLEND_BOTHINVSRCALPHA, what to do?
\n
"
);
break
;
case
WINED3DBLEND_BLENDFACTOR
:
dstBlendAlpha
=
GL_CONSTANT_COLOR
;
break
;
case
WINED3DBLEND_INVBLENDFACTOR
:
dstBlendAlpha
=
GL_ONE_MINUS_CONSTANT_COLOR
;
break
;
case
WINED3DBLEND_BLENDFACTOR
:
dstBlendAlpha
=
GL_CONSTANT_COLOR
_EXT
;
break
;
case
WINED3DBLEND_INVBLENDFACTOR
:
dstBlendAlpha
=
GL_ONE_MINUS_CONSTANT_COLOR
_EXT
;
break
;
default:
FIXME
(
"Unrecognized dst blend alpha value %#x.
\n
"
,
stateblock
->
state
.
render_states
[
WINED3DRS_DESTBLENDALPHA
]);
...
...
@@ -445,8 +445,8 @@ static void state_blend(DWORD state, struct wined3d_stateblock *stateblock, stru
srcBlendAlpha
=
GL_ONE_MINUS_SRC_ALPHA
;
dstBlendAlpha
=
GL_SRC_ALPHA
;
break
;
case
WINED3DBLEND_BLENDFACTOR
:
srcBlendAlpha
=
GL_CONSTANT_COLOR
;
break
;
case
WINED3DBLEND_INVBLENDFACTOR
:
srcBlendAlpha
=
GL_ONE_MINUS_CONSTANT_COLOR
;
break
;
case
WINED3DBLEND_BLENDFACTOR
:
srcBlendAlpha
=
GL_CONSTANT_COLOR
_EXT
;
break
;
case
WINED3DBLEND_INVBLENDFACTOR
:
srcBlendAlpha
=
GL_ONE_MINUS_CONSTANT_COLOR
_EXT
;
break
;
default:
FIXME
(
"Unrecognized src blend alpha value %#x.
\n
"
,
stateblock
->
state
.
render_states
[
WINED3DRS_SRCBLENDALPHA
]);
...
...
dlls/wined3d/wined3d_gl.h
View file @
e4e28c47
...
...
@@ -2970,6 +2970,18 @@ typedef void (WINE_GLAPI *PGLFNSTENCILFUNCSEPARATEATIPROC)(GLenum, GLenum, GLint
#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743
#endif
/* GL_EXT_blend_color */
#ifndef GL_EXT_blend_color
#define GL_EXT_blend_color 1
#define GL_CONSTANT_COLOR_EXT 0x8001
#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002
#define GL_CONSTANT_ALPHA_EXT 0x8003
#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004
#define GL_BLEND_COLOR_EXT 0x8005
#endif
typedef
GLvoid
(
WINE_GLAPI
*
PGLFNBLENDCOLOREXTPROC
)(
GLclampf
red
,
GLclampf
green
,
GLclampf
blue
,
GLclampf
alpha
);
/* GL_EXT_blend_equation_separate */
typedef
void
(
WINE_GLAPI
*
PGLFNBLENDEQUATIONSEPARATEEXTPROC
)(
GLenum
modeRGB
,
GLenum
modeAlpha
);
...
...
@@ -4237,7 +4249,7 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSWAPINTERVALEXTPROC)(int interval);
USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEATIPROC, \
glStencilFuncSeparateATI, ATI_SEPARATE_STENCIL, NULL) \
/* GL_EXT_blend_color */
\
USE_GL_FUNC(PGLFNBLENDCOLORPROC, \
USE_GL_FUNC(PGLFNBLENDCOLOR
EXT
PROC, \
glBlendColorEXT, EXT_BLEND_COLOR, NULL) \
/* GL_EXT_blend_equation_separate */
\
USE_GL_FUNC(PGLFNBLENDFUNCSEPARATEEXTPROC, \
...
...
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