Added border color index.

This commit is contained in:
Branimir Karadžić
2015-09-16 17:21:28 -07:00
parent c94f5acd6d
commit ae71103bf9
16 changed files with 235 additions and 111 deletions
+31 -15
View File
@@ -1083,7 +1083,7 @@ namespace bgfx { namespace d3d9
uint8_t flags = predefined.m_type;
setShaderUniform(flags, predefined.m_loc, proj, 4);
m_textures[_blitter.m_texture.idx].commit(0);
m_textures[_blitter.m_texture.idx].commit(0, BGFX_SAMPLER_DEFAULT_FLAGS, NULL);
}
void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) BX_OVERRIDE
@@ -1420,7 +1420,7 @@ namespace bgfx { namespace d3d9
}
}
static void setSamplerState(IDirect3DDevice9* _device, DWORD _stage, D3DSAMPLERSTATETYPE _type,DWORD _value)
static void setSamplerState(IDirect3DDevice9* _device, DWORD _stage, D3DSAMPLERSTATETYPE _type, DWORD _value)
{
DX_CHECK(_device->SetSamplerState(_stage, _type, _value) );
if (4 > _stage)
@@ -1429,7 +1429,7 @@ namespace bgfx { namespace d3d9
}
}
void setSamplerState(uint8_t _stage, uint32_t _flags)
void setSamplerState(uint8_t _stage, uint32_t _flags, const float _rgba[4])
{
const uint32_t flags = _flags&( (~BGFX_TEXTURE_RESERVED_MASK) | BGFX_TEXTURE_SAMPLER_BITS_MASK | BGFX_TEXTURE_SRGB);
BX_CHECK(_stage < BX_COUNTOF(m_samplerFlags), "");
@@ -1444,7 +1444,6 @@ namespace bgfx { namespace d3d9
D3DTEXTUREFILTERTYPE magFilter = s_textureFilter[(_flags&BGFX_TEXTURE_MAG_MASK)>>BGFX_TEXTURE_MAG_SHIFT];
D3DTEXTUREFILTERTYPE mipFilter = s_textureFilter[(_flags&BGFX_TEXTURE_MIP_MASK)>>BGFX_TEXTURE_MIP_SHIFT];
setSamplerState(device, _stage, D3DSAMP_ADDRESSU, tau);
setSamplerState(device, _stage, D3DSAMP_ADDRESSU, tau);
setSamplerState(device, _stage, D3DSAMP_ADDRESSV, tav);
setSamplerState(device, _stage, D3DSAMP_ADDRESSW, taw);
@@ -1453,6 +1452,20 @@ namespace bgfx { namespace d3d9
setSamplerState(device, _stage, D3DSAMP_MIPFILTER, mipFilter);
setSamplerState(device, _stage, D3DSAMP_MAXANISOTROPY, m_maxAnisotropy);
setSamplerState(device, _stage, D3DSAMP_SRGBTEXTURE, 0 != (flags & BGFX_TEXTURE_SRGB) );
if (NULL != _rgba)
{
if (BGFX_TEXTURE_U_BORDER == (_flags & BGFX_TEXTURE_U_BORDER)
|| BGFX_TEXTURE_V_BORDER == (_flags & BGFX_TEXTURE_V_BORDER)
|| BGFX_TEXTURE_W_BORDER == (_flags & BGFX_TEXTURE_W_BORDER) )
{
DWORD bc = D3DCOLOR_COLORVALUE(_rgba[0], _rgba[1], _rgba[2], _rgba[3]);
setSamplerState(device
, _stage
, D3DSAMP_BORDERCOLOR
, bc
);
}
}
}
}
@@ -1671,7 +1684,7 @@ namespace bgfx { namespace d3d9
{
if (BGFX_CLEAR_COLOR_USE_PALETTE & _clear.m_flags)
{
uint8_t index = (uint8_t)bx::uint32_min(BGFX_CONFIG_MAX_CLEAR_COLOR_PALETTE-1, _clear.m_index[0]);
uint8_t index = (uint8_t)bx::uint32_min(BGFX_CONFIG_MAX_COLOR_PALETTE-1, _clear.m_index[0]);
const float* rgba = _palette[index];
const float rr = rgba[0];
const float gg = rgba[1];
@@ -1810,7 +1823,7 @@ namespace bgfx { namespace d3d9
float mrtClear[BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS][4];
for (uint32_t ii = 0; ii < numMrt; ++ii)
{
uint8_t index = (uint8_t)bx::uint32_min(BGFX_CONFIG_MAX_CLEAR_COLOR_PALETTE-1, _clear.m_index[ii]);
uint8_t index = (uint8_t)bx::uint32_min(BGFX_CONFIG_MAX_COLOR_PALETTE-1, _clear.m_index[ii]);
memcpy(mrtClear[ii], _palette[index], 16);
}
@@ -2547,8 +2560,6 @@ namespace bgfx { namespace d3d9
void TextureD3D9::create(const Memory* _mem, uint32_t _flags, uint8_t _skip)
{
m_flags = _flags;
ImageContainer imageContainer;
if (imageParse(imageContainer, _mem->data, _mem->size) )
@@ -2560,6 +2571,7 @@ namespace bgfx { namespace d3d9
const uint32_t textureWidth = bx::uint32_max(blockInfo.blockWidth, imageContainer.m_width >>startLod);
const uint32_t textureHeight = bx::uint32_max(blockInfo.blockHeight, imageContainer.m_height>>startLod);
m_flags = _flags;
m_requestedFormat = imageContainer.m_format;
m_textureFormat = imageContainer.m_format;
@@ -2692,7 +2704,7 @@ namespace bgfx { namespace d3d9
{
uint32_t slicePitch;
s_renderD3D9->m_updateTextureSide = _side;
s_renderD3D9->m_updateTextureMip = _mip;
s_renderD3D9->m_updateTextureMip = _mip;
s_renderD3D9->m_updateTextureBits = lock(_side, _mip, s_renderD3D9->m_updateTexturePitch, slicePitch);
}
@@ -2743,11 +2755,15 @@ namespace bgfx { namespace d3d9
unlock(s_renderD3D9->m_updateTextureSide, s_renderD3D9->m_updateTextureMip);
}
void TextureD3D9::commit(uint8_t _stage, uint32_t _flags)
void TextureD3D9::commit(uint8_t _stage, uint32_t _flags, const float _palette[][4])
{
s_renderD3D9->setSamplerState(_stage
, 0 == (BGFX_SAMPLER_DEFAULT_FLAGS & _flags) ? _flags : m_flags
);
uint32_t flags = 0 == (BGFX_SAMPLER_DEFAULT_FLAGS & _flags)
? _flags
: m_flags
;
uint32_t index = (flags & BGFX_TEXTURE_BORDER_COLOR_MASK) >> BGFX_TEXTURE_BORDER_COLOR_SHIFT;
s_renderD3D9->setSamplerState(_stage, flags, _palette[index]);
IDirect3DDevice9* device = s_renderD3D9->m_device;
DX_CHECK(device->SetTexture(_stage, m_ptr) );
if (4 > _stage)
@@ -3267,7 +3283,7 @@ namespace bgfx { namespace d3d9
if (BGFX_CLEAR_NONE != (clear.m_flags & BGFX_CLEAR_MASK) )
{
clearQuad(_clearQuad, viewState.m_rect, clear, _render->m_clearColor);
clearQuad(_clearQuad, viewState.m_rect, clear, _render->m_colorPalette);
prim = s_primInfo[BX_COUNTOF(s_primName)]; // Force primitive type update after clear quad.
}
@@ -3536,7 +3552,7 @@ namespace bgfx { namespace d3d9
{
if (invalidHandle != bind.m_idx)
{
m_textures[bind.m_idx].commit(stage, bind.m_un.m_draw.m_flags);
m_textures[bind.m_idx].commit(stage, bind.m_un.m_draw.m_flags, _render->m_colorPalette);
}
else
{