ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed blending and PC_TEX_FMT_I8 and PC_TEX_FMT_I4_AS_I8 texture loading in dx11 

enjoy

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5686 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Rodolfo Osvaldo Bogado 2010-06-14 00:13:49 +00:00
parent 7e27914b45
commit c759f7b3be
2 changed files with 17 additions and 13 deletions
Source/Plugins/Plugin_VideoDX11/Src
D3DTexture.cppRender.cpp

20
Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.cpp
View File

@ -78,18 +78,22 @@ void ReplaceTexture2D(ID3D11Texture2D* pTexture, const u8* buffer, unsigned int
break; break;
case PC_TEX_FMT_I8: case PC_TEX_FMT_I8:
case PC_TEX_FMT_I4_AS_I8: case PC_TEX_FMT_I4_AS_I8:
for (unsigned int y = 0; y < height; y++)
{ {
u8* in = (u8*)buffer + y * pitch; const u8 *pIn = buffer;
u32* pBits = (u32*)((u8*)outptr + y * destPitch); for (int y = 0; y < height; y++)
for (unsigned int x = 0; x < width; x++)
{ {
const u8 col = *in; u8* pBits = ((u8*)outptr + (y * destPitch));
*pBits = 0xFF000000 | (col << 16) | (col << 8) | col; for(int i = 0; i < width * 4; i += 4)
in++; {
pBits++; pBits[i] = pIn[i / 4];
pBits[i+1] = pIn[i / 4];
pBits[i+2] = pIn[i / 4];
pBits[i + 3] = pIn[i / 4];
}
pIn += pitch;
} }
} }
break; break;
case PC_TEX_FMT_BGRA32: case PC_TEX_FMT_BGRA32:
// BGRA32 textures can be uploaded directly to VRAM when using DEFAULT textures // BGRA32 textures can be uploaded directly to VRAM when using DEFAULT textures

10
Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
View File

@ -759,11 +759,11 @@ void Renderer::SetBlendMode(bool forceUpdate)
{ {
#define BLEND_ENABLE_MASK 1 #define BLEND_ENABLE_MASK 1
#define BLENDOP_SHIFT 2 #define BLENDOP_SHIFT 2
#define BLENDOP_MASK (1<<BLENDOP_SHIFT) #define BLENDOP_MASK 4
#define SRCFACTOR_SHIFT 3 #define SRCFACTOR_SHIFT 3
#define DESTFACTOR_SHIFT 6 #define DESTFACTOR_SHIFT 6
#define SRCFACTOR_MASK (7 << SRCFACTOR_SHIFT) #define FACTOR_MASK 7
#define DESTFACTOR_MASK (7 << DESTFACTOR_SHIFT)
// blend mode bit mask // blend mode bit mask
// 0 - blend enable // 0 - blend enable
@ -795,8 +795,8 @@ void Renderer::SetBlendMode(bool forceUpdate)
if (changes & 0x1F8) // blend RGB change if (changes & 0x1F8) // blend RGB change
{ {
D3D::gfxstate->SetSrcBlend(d3dSrcFactors[(newval & SRCFACTOR_MASK) >> SRCFACTOR_SHIFT]); D3D::gfxstate->SetSrcBlend(d3dSrcFactors[(newval >> SRCFACTOR_SHIFT) & FACTOR_MASK]);
D3D::gfxstate->SetDestBlend(d3dDestFactors[(newval & DESTFACTOR_MASK) >> DESTFACTOR_SHIFT]); D3D::gfxstate->SetDestBlend(d3dDestFactors[(newval >> DESTFACTOR_SHIFT) & FACTOR_MASK]);
} }
s_blendMode = newval; s_blendMode = newval;
} }