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
e3bcc754
Commit
e3bcc754
authored
Mar 12, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Mar 12, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove the shader_color_fixup field from IWineD3DBaseTextureClass.
This is redundant now.
parent
1dcf222a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
6 deletions
+2
-6
device.c
dlls/wined3d/device.c
+0
-3
pixelshader.c
dlls/wined3d/pixelshader.c
+1
-1
utils.c
dlls/wined3d/utils.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+0
-1
No files found.
dlls/wined3d/device.c
View file @
e3bcc754
...
...
@@ -1067,7 +1067,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface,
tmpW
=
max
(
1
,
tmpW
>>
1
);
tmpH
=
max
(
1
,
tmpH
>>
1
);
}
object
->
baseTexture
.
shader_color_fixup
=
object
->
resource
.
format_desc
->
color_fixup
;
object
->
baseTexture
.
internal_preload
=
texture_internal_preload
;
TRACE
(
"(%p) : Created texture %p
\n
"
,
This
,
object
);
...
...
@@ -1188,7 +1187,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa
tmpH
=
max
(
1
,
tmpH
>>
1
);
tmpD
=
max
(
1
,
tmpD
>>
1
);
}
object
->
baseTexture
.
shader_color_fixup
=
object
->
resource
.
format_desc
->
color_fixup
;
object
->
baseTexture
.
internal_preload
=
volumetexture_internal_preload
;
*
ppVolumeTexture
=
(
IWineD3DVolumeTexture
*
)
object
;
...
...
@@ -1386,7 +1384,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface
}
tmpW
=
max
(
1
,
tmpW
>>
1
);
}
object
->
baseTexture
.
shader_color_fixup
=
object
->
resource
.
format_desc
->
color_fixup
;
object
->
baseTexture
.
internal_preload
=
cubetexture_internal_preload
;
TRACE
(
"(%p) : Created Cube Texture %p
\n
"
,
This
,
object
);
...
...
dlls/wined3d/pixelshader.c
View file @
e3bcc754
...
...
@@ -468,7 +468,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp
args
->
color_fixup
[
i
]
=
COLOR_FIXUP_IDENTITY
;
continue
;
}
args
->
color_fixup
[
i
]
=
tex
->
baseTexture
.
shader_
color_fixup
;
args
->
color_fixup
[
i
]
=
tex
->
resource
.
format_desc
->
color_fixup
;
}
if
(
shader
->
baseShader
.
reg_maps
.
shader_version
>=
WINED3DPS_VERSION
(
3
,
0
))
{
...
...
dlls/wined3d/utils.c
View file @
e3bcc754
...
...
@@ -2105,7 +2105,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting
texture
=
(
IWineD3DBaseTextureImpl
*
)
stateblock
->
textures
[
i
];
if
(
texture
)
{
settings
->
op
[
i
].
color_fixup
=
texture
->
baseTexture
.
shader_
color_fixup
;
settings
->
op
[
i
].
color_fixup
=
texture
->
resource
.
format_desc
->
color_fixup
;
if
(
ignore_textype
)
{
settings
->
op
[
i
].
tex_type
=
tex_1d
;
}
else
{
...
...
dlls/wined3d/wined3d_private.h
View file @
e3bcc754
...
...
@@ -1336,7 +1336,6 @@ typedef struct IWineD3DBaseTextureClass
BOOL
is_srgb
;
const
struct
min_lookup
*
minMipLookup
;
const
GLenum
*
magLookup
;
struct
color_fixup_desc
shader_color_fixup
;
void
(
*
internal_preload
)(
IWineD3DBaseTexture
*
iface
,
enum
WINED3DSRGB
srgb
);
}
IWineD3DBaseTextureClass
;
...
...
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