AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-12 23:20:10 +00:00
Code Issues Releases Wiki Activity

Merge pull request #318 from nathan-at-digitalfish/fix_direct_compute

Browse Source 
Fix for DirectCompute tri-quad face-vertex kernel
This commit is contained in:
Manuel Kraemer 2014-06-10 22:13:11 -07:00
commit 50fb54a787
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opensubdiv/osd/hlslComputeKernel.hlsl
View File

@ -211,8 +211,8 @@ void runKernel( uint3 ID )
int fidx1 = _F_IT[tableOffset + 4 * i + 1];
int fidx2 = _F_IT[tableOffset + 4 * i + 2];
int fidx3 = _F_IT[tableOffset + 4 * i + 3];
bool triangle = (fidx2 == fidx3);
float weight = (triangle ? 1.0f / 3.0f : 1.0f / 4.0f);
bool isTriangle = (fidx2 == fidx3);
float weight = (isTriangle ? 1.0f / 3.0f : 1.0f / 4.0f);
Vertex dst;
clear(dst);
@ -223,7 +223,7 @@ void runKernel( uint3 ID )
addVaryingWithWeight(dst, readVertex(fidx0), weight);
addVaryingWithWeight(dst, readVertex(fidx1), weight);
addVaryingWithWeight(dst, readVertex(fidx2), weight);
if (!triangle) {
if (!isTriangle) {
addWithWeight(dst, readVertex(fidx3), weight);
addVaryingWithWeight(dst, readVertex(fidx3), weight);
}