diff options
| author |  robertphillips <robertphillips@google.com> | 2015-09-17 11:21:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-17 11:21:06 -0700 |
| commit | ef4ba3da0b1fe375b9631bcd17c43c645f4aa5a6 (patch) | |
| tree | 5bce1f3fd012c399e17401605e3d9f5dcba53169 | |
| parent | 2582dc539542b1c50e7a16e2a5b460fbb12074e5 (diff) | |
Fix Ganesh perspective projection bug
BUG=skia:3326
Review URL: https://codereview.chromium.org/1352883002
| -rw-r--r-- | src/gpu/gl/GrGLProgram.h | 2 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index 7b10c147b4..9381a6c204 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h @@ -72,7 +72,7 @@ public: * coords. Assuming the transformed position, pos, is a homogeneous vec3, the vec, v, is * applied as such: * pos.x = dot(v.xy, pos.xz) - * pos.y = dot(v.zq, pos.yz) + * pos.y = dot(v.zw, pos.yz) */ void getRTAdjustmentVec(GrGLfloat* destVec) { destVec[0] = 2.f / fRenderTargetSize.fWidth; diff --git a/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp b/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp index cde8279392..fc92da713a 100644 --- a/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp +++ b/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp @@ -58,12 +58,14 @@ void GrGLVertexBuilder::transformToNormalizedDeviceSpace(const GrShaderVar& posV this->codeAppendf("{vec2 _posTmp = %s;", posVar.c_str()); } this->codeAppendf("_posTmp = floor(_posTmp) + vec2(0.5, 0.5);" - "gl_Position = vec4(_posTmp.x * %s.x + %s.y, _posTmp.y * %s.z + %s.w, 0, 1);}", + "gl_Position = vec4(_posTmp.x * %s.x + %s.y," + "_posTmp.y * %s.z + %s.w, 0, 1);}", fRtAdjustName, fRtAdjustName, fRtAdjustName, fRtAdjustName); } else if (kVec3f_GrSLType == posVar.getType()) { - this->codeAppendf("gl_Position = vec4(dot(%s.xz, %s.xy)/%s.z, dot(%s.yz, %s.zw)/%s.z, 0, 1);", - posVar.c_str(), fRtAdjustName, posVar.c_str(), - posVar.c_str(), fRtAdjustName, posVar.c_str()); + this->codeAppendf("gl_Position = vec4(dot(%s.xz, %s.xy), dot(%s.yz, %s.zw), 0, %s.z);", + posVar.c_str(), fRtAdjustName, + posVar.c_str(), fRtAdjustName, + posVar.c_str()); } else { SkASSERT(kVec2f_GrSLType == posVar.getType()); this->codeAppendf("gl_Position = vec4(%s.x * %s.x + %s.y, %s.y * %s.z + %s.w, 0, 1);", |