wined3d: Simplify sampler_texmatrix using pow2Matrix_identity.
This commit is contained in:
parent
38239be58c
commit
94a7cd42ed
|
@ -3290,8 +3290,7 @@ static void tex_bumpenvlscale(DWORD state, IWineD3DStateBlockImpl *stateblock, W
|
||||||
}
|
}
|
||||||
|
|
||||||
static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) {
|
static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) {
|
||||||
BOOL texIsPow2 = FALSE;
|
const DWORD sampler = state - STATE_SAMPLER(0);
|
||||||
DWORD sampler = state - STATE_SAMPLER(0);
|
|
||||||
IWineD3DBaseTexture *texture = stateblock->textures[sampler];
|
IWineD3DBaseTexture *texture = stateblock->textures[sampler];
|
||||||
|
|
||||||
TRACE("state %#x, stateblock %p, context %p\n", state, stateblock, context);
|
TRACE("state %#x, stateblock %p, context %p\n", state, stateblock, context);
|
||||||
|
@ -3305,21 +3304,7 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, W
|
||||||
* misc pipeline
|
* misc pipeline
|
||||||
*/
|
*/
|
||||||
if(sampler < MAX_TEXTURES) {
|
if(sampler < MAX_TEXTURES) {
|
||||||
UINT texture_dimensions = IWineD3DBaseTexture_GetTextureDimensions(texture);
|
const BOOL texIsPow2 = !((IWineD3DBaseTextureImpl *)texture)->baseTexture.pow2Matrix_identity;
|
||||||
|
|
||||||
if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB)
|
|
||||||
{
|
|
||||||
if(((IWineD3DTextureImpl *)texture)->baseTexture.pow2Matrix[0] != 1.0 ||
|
|
||||||
((IWineD3DTextureImpl *)texture)->baseTexture.pow2Matrix[5] != 1.0 ) {
|
|
||||||
texIsPow2 = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (texture_dimensions == GL_TEXTURE_CUBE_MAP_ARB)
|
|
||||||
{
|
|
||||||
if(((IWineD3DCubeTextureImpl *)texture)->baseTexture.pow2Matrix[0] != 1.0) {
|
|
||||||
texIsPow2 = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (texIsPow2 || (context->lastWasPow2Texture & (1 << sampler)))
|
if (texIsPow2 || (context->lastWasPow2Texture & (1 << sampler)))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue