Refactored uniform types.

This commit is contained in:
Branimir Karadžić
2015-05-28 15:27:00 -07:00
parent 4bd29facd0
commit ff01992cb7
717 changed files with 637 additions and 728 deletions

View File

@@ -2475,8 +2475,8 @@ BX_PRAGMA_DIAGNOSTIC_POP();
switch ( (uint32_t)type)
{
case UniformType::Uniform3x3fv:
case UniformType::Uniform3x3fv|BGFX_UNIFORM_FRAGMENTBIT: \
case UniformType::Mat3:
case UniformType::Mat3|BGFX_UNIFORM_FRAGMENTBIT: \
{
float* value = (float*)data;
for (uint32_t ii = 0, count = num/3; ii < count; ++ii, loc += 3*16, value += 9)
@@ -2499,14 +2499,9 @@ BX_PRAGMA_DIAGNOSTIC_POP();
}
break;
CASE_IMPLEMENT_UNIFORM(Uniform1i, I, int);
CASE_IMPLEMENT_UNIFORM(Uniform1f, F, float);
CASE_IMPLEMENT_UNIFORM(Uniform1iv, I, int);
CASE_IMPLEMENT_UNIFORM(Uniform1fv, F, float);
CASE_IMPLEMENT_UNIFORM(Uniform2fv, F, float);
CASE_IMPLEMENT_UNIFORM(Uniform3fv, F, float);
CASE_IMPLEMENT_UNIFORM(Uniform4fv, F, float);
CASE_IMPLEMENT_UNIFORM(Uniform4x4fv, F, float);
CASE_IMPLEMENT_UNIFORM(Int1, I, int);
CASE_IMPLEMENT_UNIFORM(Vec4, F, float);
CASE_IMPLEMENT_UNIFORM(Mat4, F, float);
case UniformType::End:
break;