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
866cf3ce
Commit
866cf3ce
authored
Dec 08, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Dec 08, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Reduce usage of long integral types in nvidia_texture_shader.c.
parent
4de630e9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
nvidia_texture_shader.c
dlls/wined3d/nvidia_texture_shader.c
+4
-4
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/nvidia_texture_shader.c
View file @
866cf3ce
...
@@ -89,7 +89,7 @@ struct tex_op_args
...
@@ -89,7 +89,7 @@ struct tex_op_args
GLenum
component_usage
[
3
];
GLenum
component_usage
[
3
];
};
};
static
GLenum
d3dta_to_combiner_input
(
DWORD
d3dta
,
DWORD
stage
,
INT
texture_idx
)
{
static
GLenum
d3dta_to_combiner_input
(
unsigned
int
d3dta
,
DWORD
stage
,
INT
texture_idx
)
{
switch
(
d3dta
)
{
switch
(
d3dta
)
{
case
WINED3DTA_DIFFUSE
:
case
WINED3DTA_DIFFUSE
:
return
GL_PRIMARY_COLOR_NV
;
return
GL_PRIMARY_COLOR_NV
;
...
@@ -145,7 +145,7 @@ static void get_src_and_opr_nvrc(DWORD stage, DWORD arg, BOOL is_alpha, GLenum*
...
@@ -145,7 +145,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
,
enum
wined3d_texture_op
op
,
DWORD
arg1
,
DWORD
arg2
,
DWORD
arg3
,
INT
texture_idx
,
DWORD
dst
)
int
stage
,
enum
wined3d_texture_op
op
,
uint32_t
arg1
,
uint32_t
arg2
,
uint32_t
arg3
,
INT
texture_idx
,
DWORD
dst
)
{
{
struct
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
;
...
@@ -481,7 +481,7 @@ void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d
...
@@ -481,7 +481,7 @@ void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d
static
void
nvrc_colorop
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
static
void
nvrc_colorop
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
{
{
DWORD
stage
=
(
state_id
-
STATE_TEXTURESTAGE
(
0
,
0
))
/
(
WINED3D_HIGHEST_TEXTURE_STATE
+
1
);
unsigned
int
stage
=
(
state_id
-
STATE_TEXTURESTAGE
(
0
,
0
))
/
(
WINED3D_HIGHEST_TEXTURE_STATE
+
1
);
struct
wined3d_context_gl
*
context_gl
=
wined3d_context_gl
(
context
);
struct
wined3d_context_gl
*
context_gl
=
wined3d_context_gl
(
context
);
BOOL
tex_used
=
context
->
fixed_function_usage_map
&
(
1u
<<
stage
);
BOOL
tex_used
=
context
->
fixed_function_usage_map
&
(
1u
<<
stage
);
const
struct
wined3d_gl_info
*
gl_info
=
context_gl
->
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
context_gl
->
gl_info
;
...
@@ -584,7 +584,7 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s
...
@@ -584,7 +584,7 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s
static
void
nvrc_resultarg
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
static
void
nvrc_resultarg
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
{
{
DWORD
stage
=
(
state_id
-
STATE_TEXTURESTAGE
(
0
,
0
))
/
(
WINED3D_HIGHEST_TEXTURE_STATE
+
1
);
unsigned
int
stage
=
(
state_id
-
STATE_TEXTURESTAGE
(
0
,
0
))
/
(
WINED3D_HIGHEST_TEXTURE_STATE
+
1
);
TRACE
(
"Setting result arg for stage %u.
\n
"
,
stage
);
TRACE
(
"Setting result arg for stage %u.
\n
"
,
stage
);
...
...
dlls/wined3d/wined3d_private.h
View file @
866cf3ce
...
@@ -5788,7 +5788,7 @@ void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN;
...
@@ -5788,7 +5788,7 @@ void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN;
BOOL
is_invalid_op
(
const
struct
wined3d_state
*
state
,
int
stage
,
BOOL
is_invalid_op
(
const
struct
wined3d_state
*
state
,
int
stage
,
enum
wined3d_texture_op
op
,
DWORD
arg1
,
DWORD
arg2
,
DWORD
arg3
)
DECLSPEC_HIDDEN
;
enum
wined3d_texture_op
op
,
DWORD
arg1
,
DWORD
arg2
,
DWORD
arg3
)
DECLSPEC_HIDDEN
;
void
set_tex_op_nvrc
(
const
struct
wined3d_gl_info
*
gl_info
,
const
struct
wined3d_state
*
state
,
void
set_tex_op_nvrc
(
const
struct
wined3d_gl_info
*
gl_info
,
const
struct
wined3d_state
*
state
,
BOOL
is_alpha
,
int
stage
,
enum
wined3d_texture_op
op
,
DWORD
arg1
,
DWORD
arg2
,
DWORD
arg3
,
BOOL
is_alpha
,
int
stage
,
enum
wined3d_texture_op
op
,
uint32_t
arg1
,
uint32_t
arg2
,
uint32_t
arg3
,
INT
texture_idx
,
DWORD
dst
)
DECLSPEC_HIDDEN
;
INT
texture_idx
,
DWORD
dst
)
DECLSPEC_HIDDEN
;
void
texture_activate_dimensions
(
struct
wined3d_texture
*
texture
,
void
texture_activate_dimensions
(
struct
wined3d_texture
*
texture
,
const
struct
wined3d_gl_info
*
gl_info
)
DECLSPEC_HIDDEN
;
const
struct
wined3d_gl_info
*
gl_info
)
DECLSPEC_HIDDEN
;
...
...
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