Fix transform feedback type.

We were using the wrong enum for the varying type, as well as using the row count of the type. We should be using the column count, but for matrices we treat them as transposed. BUG=angle:679 Change-Id: I0eb7f68f629a4372c6822f65b2de51ecc88a03ed Reviewed-on: https://chromium-review.googlesource.com/204520Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Fix transform feedback type.
6195ef87 · Jamie Madill · afa40f7d · 6195ef87
Commit 6195ef87 authored Jun 18, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Renderer11.cpp src/libGLESv2/renderer/d3d11/Renderer11.cpp +3 -1

No files found.
--- a/src/libGLESv2/renderer/d3d11/Renderer11.cpp
+++ b/src/libGLESv2/renderer/d3d11/Renderer11.cpp
@@ -2632,6 +2632,8 @@ ShaderExecutable *Renderer11::loadExecutable(const void *function, size_t length
                for (size_t i = 0; i < transformFeedbackVaryings.size(); i++)
                {
                    const gl::LinkedVarying &varying = transformFeedbackVaryings[i];
+                    GLenum transposedType = gl::TransposeMatrixType(varying.type);
+
                    for (size_t j = 0; j < varying.semanticIndexCount; j++)
                    {
                        D3D11_SO_DECLARATION_ENTRY entry = { 0 };
@@ -2639,7 +2641,7 @@ ShaderExecutable *Renderer11::loadExecutable(const void *function, size_t length
                        entry.SemanticName = varying.semanticName.c_str();
                        entry.SemanticIndex = varying.semanticIndex + j;
                        entry.StartComponent = 0;
-                        entry.ComponentCount = gl::VariableRowCount(type);
+                        entry.ComponentCount = gl::VariableColumnCount(transposedType);
                        entry.OutputSlot = (separatedOutputBuffers ? i : 0);
                        soDeclaration.push_back(entry);
                    }