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
2e49b85f
Commit
2e49b85f
authored
Jul 04, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 04, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context_gl structure to nvts_activate_dimensions().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
14f1cc73
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
11 deletions
+8
-11
nvidia_texture_shader.c
dlls/wined3d/nvidia_texture_shader.c
+8
-11
No files found.
dlls/wined3d/nvidia_texture_shader.c
View file @
2e49b85f
...
...
@@ -30,9 +30,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d);
/* Context activation for state handlers is done by the caller. */
static
void
nvts_activate_dimensions
(
const
struct
wined3d_state
*
state
,
DWORD
stage
,
struct
wined3d_context
*
context
)
static
void
nvts_activate_dimensions
(
const
struct
wined3d_state
*
state
,
unsigned
int
stage
,
struct
wined3d_context_gl
*
context_gl
)
{
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
context
_gl
->
c
.
gl_info
;
struct
wined3d_texture
*
texture
;
BOOL
bumpmap
=
FALSE
;
...
...
@@ -41,11 +42,11 @@ static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD st
||
state
->
texture_states
[
stage
-
1
][
WINED3D_TSS_COLOR_OP
]
==
WINED3D_TOP_BUMPENVMAP
))
{
bumpmap
=
TRUE
;
context
->
texShaderBumpMap
|=
(
1u
<<
stage
);
context
_gl
->
c
.
texShaderBumpMap
|=
(
1u
<<
stage
);
}
else
{
context
->
texShaderBumpMap
&=
~
(
1u
<<
stage
);
context
_gl
->
c
.
texShaderBumpMap
&=
~
(
1u
<<
stage
);
}
if
((
texture
=
state
->
textures
[
stage
]))
...
...
@@ -550,13 +551,9 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s
if
(
tex_used
)
{
if
(
gl_info
->
supported
[
NV_TEXTURE_SHADER2
])
{
nvts_activate_dimensions
(
state
,
stage
,
context
);
}
nvts_activate_dimensions
(
state
,
stage
,
context_gl
);
else
{
texture_activate_dimensions
(
state
->
textures
[
stage
],
gl_info
);
}
}
}
...
...
@@ -580,7 +577,7 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s
if
(
usesBump
!=
usedBump
)
{
wined3d_context_gl_active_texture
(
context_gl
,
gl_info
,
mapped_stage
+
1
);
nvts_activate_dimensions
(
state
,
stage
+
1
,
context
);
nvts_activate_dimensions
(
state
,
stage
+
1
,
context
_gl
);
wined3d_context_gl_active_texture
(
context_gl
,
gl_info
,
mapped_stage
);
}
}
...
...
@@ -620,7 +617,7 @@ static void nvts_texdim(struct wined3d_context *context, const struct wined3d_st
if
(
isStateDirty
(
context
,
STATE_TEXTURESTAGE
(
sampler
,
WINED3D_TSS_COLOR_OP
)))
return
;
nvts_activate_dimensions
(
state
,
sampler
,
context
);
nvts_activate_dimensions
(
state
,
sampler
,
context
_gl
);
}
static
void
nvts_bumpenvmat
(
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