Limit struct size to size of full shader constant.

The HLSL compiler can optimize out the last elements of a struct, which caused ANGLE to overwrite constants right after the end of the struct. Each element in a struct should be limited by the size of the entire struct. BUG= Review URL: https://codereview.appspot.com/6856100 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1394 736b8ea6-26fd-11df-bfd4-992fa37f6226

Limit struct size to size of full shader constant.
7210986f · jbauman@chromium.org · 835757fa · 7210986f · 7210986f · 7210986f
Commit 7210986f authored Nov 28, 2012 by jbauman@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

version.h src/common/version.h +1 -1

D3DConstantTable.cpp src/libGLESv2/D3DConstantTable.cpp +6 -6

D3DConstantTable.h src/libGLESv2/D3DConstantTable.h +2 -2

No files found.
--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1393
+#define BUILD_REVISION 1394

 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/libGLESv2/D3DConstantTable.cpp
+++ b/src/libGLESv2/D3DConstantTable.cpp
@@ -83,17 +83,17 @@ D3DConstant::D3DConstant(const char *base, const ctab::ConstantInfo *constantInf

    if (typeClass == CLASS_STRUCT)
    {
-        addStructMembers(base, registerSet, registerIndex, typeInfo);
+        addStructMembers(base, registerSet, registerIndex, registerIndex + registerCount, typeInfo);
    }
 }

-D3DConstant::D3DConstant(const char *base, RegisterSet registerSet, unsigned registerIndex, const ctab::StructMemberInfo *memberInfo)
+D3DConstant::D3DConstant(const char *base, RegisterSet registerSet, unsigned registerIndex, unsigned maxRegister, const ctab::StructMemberInfo *memberInfo)
    : registerSet(registerSet), registerIndex(registerIndex)
 {
    const ctab::TypeInfo *typeInfo = reinterpret_cast<const ctab::TypeInfo*>(base + memberInfo->typeInfo);

    name = base + memberInfo->name;
-    registerCount = typeInfo->rows * typeInfo->elements;
+    registerCount = std::min(static_cast<int>(maxRegister - registerIndex), typeInfo->rows * typeInfo->elements);
    typeClass = static_cast<Class>(typeInfo->typeClass);
    type = static_cast<Type>(typeInfo->type);
    rows = typeInfo->rows;
@@ -102,7 +102,7 @@ D3DConstant::D3DConstant(const char *base, RegisterSet registerSet, unsigned reg

    if (typeClass == CLASS_STRUCT)
    {
-        registerCount = addStructMembers(base, registerSet, registerIndex, typeInfo);
+        registerCount = addStructMembers(base, registerSet, registerIndex, maxRegister, typeInfo);
    }
 }

@@ -117,7 +117,7 @@ D3DConstant::~D3DConstant()
    }
 }

-unsigned D3DConstant::addStructMembers(const char *base, RegisterSet registerSet, unsigned registerIndex, const ctab::TypeInfo *typeInfo)
+unsigned D3DConstant::addStructMembers(const char *base, RegisterSet registerSet, unsigned registerIndex, unsigned maxRegister, const ctab::TypeInfo *typeInfo)
 {
    const ctab::StructMemberInfo *memberInfos = reinterpret_cast<const ctab::StructMemberInfo*>(
        base + typeInfo->structMemberInfos);
@@ -135,7 +135,7 @@ unsigned D3DConstant::addStructMembers(const char *base, RegisterSet registerSet
            const ctab::TypeInfo *memberTypeInfo = reinterpret_cast<const ctab::TypeInfo*>(
                base + memberInfos[i].typeInfo);

-            D3DConstant *member = new D3DConstant(base, registerSet, memberIndex, memberInfos + i);
+            D3DConstant *member = new D3DConstant(base, registerSet, memberIndex, maxRegister, memberInfos + i);
            memberIndex += member->registerCount;

            structMembers[j][i] = member;

--- a/src/libGLESv2/D3DConstantTable.h
+++ b/src/libGLESv2/D3DConstantTable.h
@@ -90,8 +90,8 @@ struct D3DConstant
    std::vector<std::vector<const D3DConstant*> > structMembers;    

  private:
-    D3DConstant(const char *base, RegisterSet registerSet, unsigned registerIndex, const ctab::StructMemberInfo *memberInfo);
-    unsigned addStructMembers(const char *base, RegisterSet registerSet, unsigned registerIndex, const ctab::TypeInfo *typeInfo);
+    D3DConstant(const char *base, RegisterSet registerSet, unsigned registerIndex, unsigned maxRegister, const ctab::StructMemberInfo *memberInfo);
+    unsigned addStructMembers(const char *base, RegisterSet registerSet, unsigned registerIndex, unsigned maxRegister, const ctab::TypeInfo *typeInfo);
 };

 class D3DConstantTable