Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
82d74d56
Commit
82d74d56
authored
Jul 03, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 04, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of the tex_op_args typedef.
parent
b1664a2c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
nvidia_texture_shader.c
dlls/wined3d/nvidia_texture_shader.c
+4
-3
No files found.
dlls/wined3d/nvidia_texture_shader.c
View file @
82d74d56
...
@@ -70,11 +70,12 @@ static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD st
...
@@ -70,11 +70,12 @@ static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD st
}
}
}
}
typedef
struct
{
struct
tex_op_args
{
GLenum
input
[
3
];
GLenum
input
[
3
];
GLenum
mapping
[
3
];
GLenum
mapping
[
3
];
GLenum
component_usage
[
3
];
GLenum
component_usage
[
3
];
}
tex_op_args
;
};
static
GLenum
d3dta_to_combiner_input
(
DWORD
d3dta
,
DWORD
stage
,
INT
texture_idx
)
{
static
GLenum
d3dta_to_combiner_input
(
DWORD
d3dta
,
DWORD
stage
,
INT
texture_idx
)
{
switch
(
d3dta
)
{
switch
(
d3dta
)
{
...
@@ -134,7 +135,7 @@ static void get_src_and_opr_nvrc(DWORD stage, DWORD arg, BOOL is_alpha, GLenum*
...
@@ -134,7 +135,7 @@ static void get_src_and_opr_nvrc(DWORD stage, DWORD arg, BOOL is_alpha, GLenum*
void
set_tex_op_nvrc
(
const
struct
wined3d_gl_info
*
gl_info
,
const
struct
wined3d_state
*
state
,
BOOL
is_alpha
,
void
set_tex_op_nvrc
(
const
struct
wined3d_gl_info
*
gl_info
,
const
struct
wined3d_state
*
state
,
BOOL
is_alpha
,
int
stage
,
WINED3DTEXTUREOP
op
,
DWORD
arg1
,
DWORD
arg2
,
DWORD
arg3
,
INT
texture_idx
,
DWORD
dst
)
int
stage
,
WINED3DTEXTUREOP
op
,
DWORD
arg1
,
DWORD
arg2
,
DWORD
arg3
,
INT
texture_idx
,
DWORD
dst
)
{
{
tex_op_args
tex_op_args
=
{{
0
},
{
0
},
{
0
}};
struct
tex_op_args
tex_op_args
=
{{
0
},
{
0
},
{
0
}};
GLenum
portion
=
is_alpha
?
GL_ALPHA
:
GL_RGB
;
GLenum
portion
=
is_alpha
?
GL_ALPHA
:
GL_RGB
;
GLenum
target
=
GL_COMBINER0_NV
+
stage
;
GLenum
target
=
GL_COMBINER0_NV
+
stage
;
GLenum
output
;
GLenum
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