Merge branch 'master' of github.com:bkaradzic/bgfx

This commit is contained in:
Branimir Karadžić 2015-04-06 11:38:47 -07:00
commit 06314151c5

View File

@ -1732,7 +1732,7 @@ namespace bgfx { namespace d3d9
UniformRegistry m_uniformReg; UniformRegistry m_uniformReg;
void* m_uniforms[BGFX_CONFIG_MAX_UNIFORMS]; void* m_uniforms[BGFX_CONFIG_MAX_UNIFORMS];
uint32_t m_samplerFlags[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS][1]; uint32_t m_samplerFlags[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS][2];
TextureD3D9* m_updateTexture; TextureD3D9* m_updateTexture;
uint8_t* m_updateTextureBits; uint8_t* m_updateTextureBits;