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
5b8d3a0c
Commit
5b8d3a0c
authored
Apr 15, 2014
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 15, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Set the WINED3DPBLENDCAPS_SRCALPHASAT destination blend cap when…
wined3d: Set the WINED3DPBLENDCAPS_SRCALPHASAT destination blend cap when ARB_blend_func_extended is supported.
parent
7f2ae988
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
directx.c
dlls/wined3d/directx.c
+6
-6
wined3d_gl.h
dlls/wined3d/wined3d_gl.h
+4
-0
No files found.
dlls/wined3d/directx.c
View file @
5b8d3a0c
...
...
@@ -93,6 +93,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
{
"GL_APPLE_ycbcr_422"
,
APPLE_YCBCR_422
},
/* ARB */
{
"GL_ARB_blend_func_extended"
,
ARB_BLEND_FUNC_EXTENDED
},
{
"GL_ARB_color_buffer_float"
,
ARB_COLOR_BUFFER_FLOAT
},
{
"GL_ARB_debug_output"
,
ARB_DEBUG_OUTPUT
},
{
"GL_ARB_depth_buffer_float"
,
ARB_DEPTH_BUFFER_FLOAT
},
...
...
@@ -4239,6 +4240,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
WINED3DPCMPCAPS_NEVER
|
WINED3DPCMPCAPS_NOTEQUAL
;
/* WINED3DPBLENDCAPS_BOTHINVSRCALPHA and WINED3DPBLENDCAPS_BOTHSRCALPHA
* are legacy settings for srcblend only. */
caps
->
SrcBlendCaps
=
WINED3DPBLENDCAPS_BOTHINVSRCALPHA
|
WINED3DPBLENDCAPS_BOTHSRCALPHA
|
WINED3DPBLENDCAPS_DESTALPHA
|
...
...
@@ -4263,12 +4266,9 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
WINED3DPBLENDCAPS_SRCALPHA
|
WINED3DPBLENDCAPS_SRCCOLOR
|
WINED3DPBLENDCAPS_ZERO
;
/* NOTE: WINED3DPBLENDCAPS_SRCALPHASAT is not supported as dest blend factor,
* according to the glBlendFunc manpage
*
* WINED3DPBLENDCAPS_BOTHINVSRCALPHA and WINED3DPBLENDCAPS_BOTHSRCALPHA are
* legacy settings for srcblend only
*/
if
(
gl_info
->
supported
[
ARB_BLEND_FUNC_EXTENDED
])
caps
->
DestBlendCaps
|=
WINED3DPBLENDCAPS_SRCALPHASAT
;
if
(
gl_info
->
supported
[
EXT_BLEND_COLOR
])
{
...
...
dlls/wined3d/wined3d_gl.h
View file @
5b8d3a0c
...
...
@@ -43,6 +43,7 @@ enum wined3d_gl_extension
APPLE_FLUSH_BUFFER_RANGE
,
APPLE_YCBCR_422
,
/* ARB */
ARB_BLEND_FUNC_EXTENDED
,
ARB_COLOR_BUFFER_FLOAT
,
ARB_DEBUG_OUTPUT
,
ARB_DEPTH_BUFFER_FLOAT
,
...
...
@@ -180,6 +181,9 @@ enum wined3d_gl_extension
/* GL_APPLE_flush_buffer_range */
\
USE_GL_FUNC(glBufferParameteriAPPLE) \
USE_GL_FUNC(glFlushMappedBufferRangeAPPLE) \
/* GL_ARB_blend_func_extended */
\
USE_GL_FUNC(glBindFragDataLocationIndexed) \
USE_GL_FUNC(glGetFragDataIndex) \
/* GL_ARB_color_buffer_float */
\
USE_GL_FUNC(glClampColorARB) \
/* GL_ARB_debug_output */
\
...
...
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