aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for struct with undound members

Browse Source
This commit is contained in:
Vsevolod Livinskiy
2016-02-06 17:08:17 +03:00
parent e1cb6ca15b
commit 6ea03bb3af
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
expr.cpp
View File

@@ -6784,9 +6784,12 @@ lUniformValueToVarying(FunctionEmitContext *ctx, llvm::Value *value,
type->GetAsVaryingType()->LLVMType(g->ctx); type->GetAsVaryingType()->LLVMType(g->ctx);
llvm::Value *retValue = llvm::UndefValue::get(llvmType); llvm::Value *retValue = llvm::UndefValue::get(llvmType);
const StructType *structType = CastType<StructType>(type->GetAsVaryingType());
for (int i = 0; i < collectionType->GetElementCount(); ++i) { for (int i = 0; i < collectionType->GetElementCount(); ++i) {
llvm::Value *v = ctx->ExtractInst(value, i, "get_element"); llvm::Value *v = ctx->ExtractInst(value, i, "get_element");
if (collectionType->GetElementType(i)->IsVaryingType()) // If struct has "bound uniform" member, we don't need to cast it to varying
if (!(structType != NULL && structType->GetElementType(i)->IsUniformType()))
v = lUniformValueToVarying(ctx, v, collectionType->GetElementType(i)); v = lUniformValueToVarying(ctx, v, collectionType->GetElementType(i));
retValue = ctx->InsertInst(retValue, v, i, "set_element"); retValue = ctx->InsertInst(retValue, v, i, "set_element");
} }

21
tests/struct-test-128.ispc Normal file
View File

@@ -0,0 +1,21 @@
export uniform int width() { return programCount; }
struct Foo {
float x;
};
export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
float a = aFOO[programIndex];
uniform Foo struct_1;
struct_1.x = b;
varying Foo struct_2 = struct_1;
RET[programIndex] = struct_2.x;
}
export void result(uniform float RET[]) {
RET[programIndex] = 5;
}