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
c2d97841
Commit
c2d97841
authored
Feb 16, 2008
by
Roderick Colenbrander
Committed by
Alexandre Julliard
Feb 18, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add separate alpha blend support.
parent
a29584b3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
1 deletion
+21
-1
directx.c
dlls/wined3d/directx.c
+5
-1
state.c
dlls/wined3d/state.c
+0
-0
wined3d_gl.h
include/wine/wined3d_gl.h
+16
-0
No files found.
dlls/wined3d/directx.c
View file @
c2d97841
...
@@ -85,6 +85,8 @@ static const struct {
...
@@ -85,6 +85,8 @@ static const struct {
/* EXT */
/* EXT */
{
"GL_EXT_blend_color"
,
EXT_BLEND_COLOR
,
0
},
{
"GL_EXT_blend_color"
,
EXT_BLEND_COLOR
,
0
},
{
"GL_EXT_blend_minmax"
,
EXT_BLEND_MINMAX
,
0
},
{
"GL_EXT_blend_minmax"
,
EXT_BLEND_MINMAX
,
0
},
{
"GL_EXT_blend_equation_separate"
,
EXT_BLEND_EQUATION_SEPARATE
,
0
},
{
"GL_EXT_blend_func_separate"
,
EXT_BLEND_FUNC_SEPARATE
,
0
},
{
"GL_EXT_fog_coord"
,
EXT_FOG_COORD
,
0
},
{
"GL_EXT_fog_coord"
,
EXT_FOG_COORD
,
0
},
{
"GL_EXT_framebuffer_blit"
,
EXT_FRAMEBUFFER_BLIT
,
0
},
{
"GL_EXT_framebuffer_blit"
,
EXT_FRAMEBUFFER_BLIT
,
0
},
{
"GL_EXT_framebuffer_object"
,
EXT_FRAMEBUFFER_OBJECT
,
0
},
{
"GL_EXT_framebuffer_object"
,
EXT_FRAMEBUFFER_OBJECT
,
0
},
...
@@ -2201,11 +2203,13 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
...
@@ -2201,11 +2203,13 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
WINED3DPMISCCAPS_NULLREFERENCE
WINED3DPMISCCAPS_NULLREFERENCE
WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS
WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS
WINED3DPMISCCAPS_FOGANDSPECULARALPHA
WINED3DPMISCCAPS_FOGANDSPECULARALPHA
WINED3DPMISCCAPS_SEPARATEALPHABLEND
WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS
WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS
WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING
WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING
WINED3DPMISCCAPS_FOGVERTEXCLAMPED */
WINED3DPMISCCAPS_FOGVERTEXCLAMPED */
if
(
GL_SUPPORT
(
EXT_BLEND_EQUATION_SEPARATE
)
&&
GL_SUPPORT
(
EXT_BLEND_FUNC_SEPARATE
))
*
pCaps
->
PrimitiveMiscCaps
|=
WINED3DPMISCCAPS_SEPARATEALPHABLEND
;
/* The caps below can be supported but aren't handled yet in utils.c 'd3dta_to_combiner_input', disable them until support is fixed */
/* The caps below can be supported but aren't handled yet in utils.c 'd3dta_to_combiner_input', disable them until support is fixed */
#if 0
#if 0
if (GL_SUPPORT(NV_REGISTER_COMBINERS))
if (GL_SUPPORT(NV_REGISTER_COMBINERS))
...
...
dlls/wined3d/state.c
View file @
c2d97841
This diff is collapsed.
Click to expand it.
include/wine/wined3d_gl.h
View file @
c2d97841
...
@@ -2237,6 +2237,16 @@ typedef GLvoid* (WINE_GLAPI * PGLFNMAPBUFFERARBPROC) (GLenum target, GLenum acce
...
@@ -2237,6 +2237,16 @@ typedef GLvoid* (WINE_GLAPI * PGLFNMAPBUFFERARBPROC) (GLenum target, GLenum acce
typedef
GLboolean
(
WINE_GLAPI
*
PGLFNUNMAPBUFFERARBPROC
)
(
GLenum
target
);
typedef
GLboolean
(
WINE_GLAPI
*
PGLFNUNMAPBUFFERARBPROC
)
(
GLenum
target
);
typedef
void
(
WINE_GLAPI
*
PGLFNGETBUFFERPARAMETERIVARBPROC
)
(
GLenum
target
,
GLenum
pname
,
GLint
*
params
);
typedef
void
(
WINE_GLAPI
*
PGLFNGETBUFFERPARAMETERIVARBPROC
)
(
GLenum
target
,
GLenum
pname
,
GLint
*
params
);
typedef
void
(
WINE_GLAPI
*
PGLFNGETBUFFERPOINTERVARBPROC
)
(
GLenum
target
,
GLenum
pname
,
GLvoid
*
*
params
);
typedef
void
(
WINE_GLAPI
*
PGLFNGETBUFFERPOINTERVARBPROC
)
(
GLenum
target
,
GLenum
pname
,
GLvoid
*
*
params
);
/* GL_EXT_blend_equation_separate */
typedef
void
(
WINE_GLAPI
*
PGLFNBLENDFUNCSEPARATEEXTPROC
)
(
GLenum
sfactorRGB
,
GLenum
dfactorRGB
,
GLenum
sfactorAlpha
,
GLenum
dfactorAlpha
);
/* GL_EXT_blend_func_separate */
#ifndef GL_EXT_blend_func_separate
#define GL_BLEND_DST_RGB_EXT 0x80C8
#define GL_BLEND_SRC_RGB_EXT 0x80C9
#define GL_BLEND_DST_ALPHA_EXT 0x80CA
#define GL_BLEND_SRC_ALPHA_EXT 0x80CB
#endif
typedef
void
(
WINE_GLAPI
*
PGLFNBLENDEQUATIONSEPARATEEXTPROC
)
(
GLenum
modeRGB
,
GLenum
modeAlpha
);
/* GL_EXT_fog_coord */
/* GL_EXT_fog_coord */
#ifndef GL_EXT_fog_coord
#ifndef GL_EXT_fog_coord
#define GL_EXT_fog_coord 1
#define GL_EXT_fog_coord 1
...
@@ -3190,6 +3200,8 @@ typedef enum _GL_SupportedExt {
...
@@ -3190,6 +3200,8 @@ typedef enum _GL_SupportedExt {
/* EXT */
/* EXT */
EXT_BLEND_COLOR
,
EXT_BLEND_COLOR
,
EXT_BLEND_MINMAX
,
EXT_BLEND_MINMAX
,
EXT_BLEND_EQUATION_SEPARATE
,
EXT_BLEND_FUNC_SEPARATE
,
EXT_FOG_COORD
,
EXT_FOG_COORD
,
EXT_FRAMEBUFFER_OBJECT
,
EXT_FRAMEBUFFER_OBJECT
,
EXT_FRAMEBUFFER_BLIT
,
EXT_FRAMEBUFFER_BLIT
,
...
@@ -3309,6 +3321,10 @@ typedef enum _GL_SupportedExt {
...
@@ -3309,6 +3321,10 @@ typedef enum _GL_SupportedExt {
USE_GL_FUNC(PGLFNGETBUFFERPARAMETERIVARBPROC, glGetBufferParameterivARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\
USE_GL_FUNC(PGLFNGETBUFFERPARAMETERIVARBPROC, glGetBufferParameterivARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\
USE_GL_FUNC(PGLFNGETBUFFERPOINTERVARBPROC, glGetBufferPointervARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\
USE_GL_FUNC(PGLFNGETBUFFERPOINTERVARBPROC, glGetBufferPointervARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\
/** EXT Extensions **/
\
/** EXT Extensions **/
\
/* GL_EXT_blend_equation_separate */
\
USE_GL_FUNC(PGLFNBLENDFUNCSEPARATEEXTPROC, glBlendFuncSeparateEXT, EXT_BLEND_FUNC_SEPARATE, NULL);\
/* GL_EXT_blend_func_separate */
\
USE_GL_FUNC(PGLFNBLENDEQUATIONSEPARATEEXTPROC, glBlendEquationSeparateEXT, EXT_BLEND_EQUATION_SEPARATE, NULL);\
/* GL_EXT_fog_coord */
\
/* GL_EXT_fog_coord */
\
USE_GL_FUNC(PGLFNGLFOGCOORDFEXTPROC, glFogCoordfEXT, EXT_FOG_COORD, NULL );\
USE_GL_FUNC(PGLFNGLFOGCOORDFEXTPROC, glFogCoordfEXT, EXT_FOG_COORD, NULL );\
USE_GL_FUNC(PGLFNGLFOGCOORDFVEXTPROC, glFogCoordfvEXT, EXT_FOG_COORD, NULL );\
USE_GL_FUNC(PGLFNGLFOGCOORDFVEXTPROC, glFogCoordfvEXT, EXT_FOG_COORD, NULL );\
...
...
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