ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Remove the shader_color_fixup field from IWineD3DBaseTextureClass. 

This is redundant now.
This commit is contained in:
Henri Verbeet 2009-03-12 09:53:15 +01:00 committed by Alexandre Julliard
parent 1dcf222ab2
commit e3bcc7544c
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/wined3d/device.c
View File

@ -1067,7 +1067,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface,
tmpW = max(1, tmpW >> 1); tmpW = max(1, tmpW >> 1);
tmpH = max(1, tmpH >> 1); tmpH = max(1, tmpH >> 1);
} }
object->baseTexture.shader_color_fixup = object->resource.format_desc->color_fixup;
object->baseTexture.internal_preload = texture_internal_preload; object->baseTexture.internal_preload = texture_internal_preload;
TRACE("(%p) : Created texture %p\n", This, object); TRACE("(%p) : Created texture %p\n", This, object);
@ -1188,7 +1187,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa
tmpH = max(1, tmpH >> 1); tmpH = max(1, tmpH >> 1);
tmpD = max(1, tmpD >> 1); tmpD = max(1, tmpD >> 1);
} }
object->baseTexture.shader_color_fixup = object->resource.format_desc->color_fixup;
object->baseTexture.internal_preload = volumetexture_internal_preload; object->baseTexture.internal_preload = volumetexture_internal_preload;
*ppVolumeTexture = (IWineD3DVolumeTexture *) object; *ppVolumeTexture = (IWineD3DVolumeTexture *) object;
@ -1386,7 +1384,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface
} }
tmpW = max(1, tmpW >> 1); tmpW = max(1, tmpW >> 1);
} }
object->baseTexture.shader_color_fixup = object->resource.format_desc->color_fixup;
object->baseTexture.internal_preload = cubetexture_internal_preload; object->baseTexture.internal_preload = cubetexture_internal_preload;
TRACE("(%p) : Created Cube Texture %p\n", This, object); TRACE("(%p) : Created Cube Texture %p\n", This, object);

2
dlls/wined3d/pixelshader.c
View File

@ -468,7 +468,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp
args->color_fixup[i] = COLOR_FIXUP_IDENTITY; args->color_fixup[i] = COLOR_FIXUP_IDENTITY;
continue; 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)) if (shader->baseShader.reg_maps.shader_version >= WINED3DPS_VERSION(3,0))
{ {

2
dlls/wined3d/utils.c
View File

@ -2105,7 +2105,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting
texture = (IWineD3DBaseTextureImpl *) stateblock->textures[i]; texture = (IWineD3DBaseTextureImpl *) stateblock->textures[i];
if(texture) { 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) { if(ignore_textype) {
settings->op[i].tex_type = tex_1d; settings->op[i].tex_type = tex_1d;
} else { } else {

1
dlls/wined3d/wined3d_private.h
View File

@ -1336,7 +1336,6 @@ typedef struct IWineD3DBaseTextureClass
BOOL is_srgb; BOOL is_srgb;
const struct min_lookup *minMipLookup; const struct min_lookup *minMipLookup;
const GLenum *magLookup; const GLenum *magLookup;
struct color_fixup_desc shader_color_fixup;
void (*internal_preload)(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb); void (*internal_preload)(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb);
} IWineD3DBaseTextureClass; } IWineD3DBaseTextureClass;