Implemented support for DX11 integer and boolean uniforms.
TRAC #22364
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1686 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index 4df6dae..00c3fcf 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -1611,7 +1611,7 @@
{
float vector[gl::D3D9_MAX_FLOAT_CONSTANTS * 4];
- if (targetUniform->ps.registerIndex >= 0 || targetUniform->vs.registerIndex >= 0)
+ if (targetUniform->psRegisterIndex >= 0 || targetUniform->vsRegisterIndex >= 0)
{
ASSERT(count <= gl::D3D9_MAX_FLOAT_CONSTANTS);
for (int i = 0; i < count; i++)
@@ -1635,16 +1635,14 @@
void Renderer9::applyUniformnfv(gl::Uniform *targetUniform, const GLfloat *v)
{
- if (targetUniform->ps.registerCount)
+ if (targetUniform->psRegisterIndex >= 0)
{
- ASSERT(targetUniform->ps.registerIndex >= 0);
- mDevice->SetPixelShaderConstantF(targetUniform->ps.registerIndex, v, targetUniform->ps.registerCount);
+ mDevice->SetPixelShaderConstantF(targetUniform->psRegisterIndex, v, targetUniform->registerCount);
}
- if (targetUniform->vs.registerCount)
+ if (targetUniform->vsRegisterIndex >= 0)
{
- ASSERT(targetUniform->vs.registerIndex >= 0);
- mDevice->SetVertexShaderConstantF(targetUniform->vs.registerIndex, v, targetUniform->vs.registerCount);
+ mDevice->SetVertexShaderConstantF(targetUniform->vsRegisterIndex, v, targetUniform->registerCount);
}
}