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
5082c57e
Commit
5082c57e
authored
Oct 31, 2010
by
Stefan Dösinger
Committed by
Alexandre Julliard
Nov 01, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Don't pass the texture stages to basetexture_apply_state_changes.
parent
886193c3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
4 deletions
+1
-4
basetexture.c
dlls/wined3d/basetexture.c
+1
-2
state.c
dlls/wined3d/state.c
+0
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+0
-1
No files found.
dlls/wined3d/basetexture.c
View file @
5082c57e
...
@@ -380,7 +380,6 @@ static void apply_wrap(const struct wined3d_gl_info *gl_info, GLenum target,
...
@@ -380,7 +380,6 @@ static void apply_wrap(const struct wined3d_gl_info *gl_info, GLenum target,
/* GL locking is done by the caller (state handler) */
/* GL locking is done by the caller (state handler) */
void
basetexture_apply_state_changes
(
IWineD3DBaseTexture
*
iface
,
void
basetexture_apply_state_changes
(
IWineD3DBaseTexture
*
iface
,
const
DWORD
textureStates
[
WINED3D_HIGHEST_TEXTURE_STATE
+
1
],
const
DWORD
samplerStates
[
WINED3D_HIGHEST_SAMPLER_STATE
+
1
],
const
DWORD
samplerStates
[
WINED3D_HIGHEST_SAMPLER_STATE
+
1
],
const
struct
wined3d_gl_info
*
gl_info
)
const
struct
wined3d_gl_info
*
gl_info
)
{
{
...
@@ -391,7 +390,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
...
@@ -391,7 +390,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
DWORD
aniso
;
DWORD
aniso
;
struct
gl_texture
*
gl_tex
;
struct
gl_texture
*
gl_tex
;
TRACE
(
"iface %p,
textureStates %p, samplerStates %p
\n
"
,
iface
,
textureStates
,
samplerStates
);
TRACE
(
"iface %p,
samplerStates %p
\n
"
,
iface
,
samplerStates
);
if
(
This
->
baseTexture
.
is_srgb
)
{
if
(
This
->
baseTexture
.
is_srgb
)
{
gl_tex
=
&
This
->
baseTexture
.
texture_srgb
;
gl_tex
=
&
This
->
baseTexture
.
texture_srgb
;
...
...
dlls/wined3d/state.c
View file @
5082c57e
...
@@ -3648,7 +3648,6 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w
...
@@ -3648,7 +3648,6 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w
IWineD3DBaseTexture_BindTexture
(
texture
,
srgb
);
IWineD3DBaseTexture_BindTexture
(
texture
,
srgb
);
basetexture_apply_state_changes
(
texture
,
basetexture_apply_state_changes
(
texture
,
state
->
texture_states
[
sampler
],
state
->
sampler_states
[
sampler
],
gl_info
);
state
->
sampler_states
[
sampler
],
gl_info
);
if
(
gl_info
->
supported
[
EXT_TEXTURE_LOD_BIAS
])
if
(
gl_info
->
supported
[
EXT_TEXTURE_LOD_BIAS
])
...
...
dlls/wined3d/wined3d_private.h
View file @
5082c57e
...
@@ -1920,7 +1920,6 @@ typedef struct IWineD3DBaseTextureImpl
...
@@ -1920,7 +1920,6 @@ typedef struct IWineD3DBaseTextureImpl
}
IWineD3DBaseTextureImpl
;
}
IWineD3DBaseTextureImpl
;
void
basetexture_apply_state_changes
(
IWineD3DBaseTexture
*
iface
,
void
basetexture_apply_state_changes
(
IWineD3DBaseTexture
*
iface
,
const
DWORD
textureStates
[
WINED3D_HIGHEST_TEXTURE_STATE
+
1
],
const
DWORD
samplerStates
[
WINED3D_HIGHEST_SAMPLER_STATE
+
1
],
const
DWORD
samplerStates
[
WINED3D_HIGHEST_SAMPLER_STATE
+
1
],
const
struct
wined3d_gl_info
*
gl_info
)
DECLSPEC_HIDDEN
;
const
struct
wined3d_gl_info
*
gl_info
)
DECLSPEC_HIDDEN
;
HRESULT
basetexture_bind
(
IWineD3DBaseTexture
*
iface
,
BOOL
srgb
,
BOOL
*
set_surface_desc
)
DECLSPEC_HIDDEN
;
HRESULT
basetexture_bind
(
IWineD3DBaseTexture
*
iface
,
BOOL
srgb
,
BOOL
*
set_surface_desc
)
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