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
7e169d43
Commit
7e169d43
authored
Jan 14, 2015
by
Matteo Bruni
Committed by
Alexandre Julliard
Jan 15, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use the core glColorMaski function.
parent
79a0dece
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
directx.c
dlls/wined3d/directx.c
+2
-0
state.c
dlls/wined3d/state.c
+2
-1
No files found.
dlls/wined3d/directx.c
View file @
7e169d43
...
...
@@ -2883,6 +2883,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
USE_GL_FUNC
(
glBlendFuncSeparate
)
/* OpenGL 1.4 */
USE_GL_FUNC
(
glBufferData
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glBufferSubData
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glColorMaski
)
/* OpenGL 3.0 */
USE_GL_FUNC
(
glDeleteBuffers
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glGenBuffers
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glGetBufferSubData
)
/* OpenGL 1.5 */
...
...
@@ -2911,6 +2912,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
MAP_GL_FUNCTION
(
glBlendFuncSeparate
,
glBlendFuncSeparateEXT
);
MAP_GL_FUNCTION
(
glBufferData
,
glBufferDataARB
);
MAP_GL_FUNCTION
(
glBufferSubData
,
glBufferSubDataARB
);
MAP_GL_FUNCTION
(
glColorMaski
,
glColorMaskIndexedEXT
);
MAP_GL_FUNCTION
(
glDeleteBuffers
,
glDeleteBuffersARB
);
MAP_GL_FUNCTION
(
glGenBuffers
,
glGenBuffersARB
);
MAP_GL_FUNCTION
(
glGetBufferSubData
,
glGetBufferSubDataARB
);
...
...
dlls/wined3d/state.c
View file @
7e169d43
...
...
@@ -1600,11 +1600,12 @@ static void state_colorwrite(struct wined3d_context *context, const struct wined
static
void
set_color_mask
(
const
struct
wined3d_gl_info
*
gl_info
,
UINT
index
,
DWORD
mask
)
{
GL_EXTCALL
(
glColorMask
IndexedEXT
(
index
,
GL_EXTCALL
(
glColorMask
i
(
index
,
mask
&
WINED3DCOLORWRITEENABLE_RED
?
GL_TRUE
:
GL_FALSE
,
mask
&
WINED3DCOLORWRITEENABLE_GREEN
?
GL_TRUE
:
GL_FALSE
,
mask
&
WINED3DCOLORWRITEENABLE_BLUE
?
GL_TRUE
:
GL_FALSE
,
mask
&
WINED3DCOLORWRITEENABLE_ALPHA
?
GL_TRUE
:
GL_FALSE
));
checkGLcall
(
"glColorMaski"
);
}
static
void
state_colorwrite0
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
...
...
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