diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-08-10 14:42:22 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-08-10 12:46:21 +0000 |
| commit | e31539ae3e06a35956578be8b6de54a4e0902418 (patch) | |
| tree | e5f827590641ddaae02e395b61deeef4694931b9 | |
| parent | daa0422317c55b68e12a0da5aa2d825b3f892d9b (diff) | |
Fix mixed up shader code in Scene3D
The previous change adding core profile support managed to convert also the
other vertex shader. Let's revert it.
Change-Id: Ib82d3c5b1cfcff37be5234e7ca900fbfcf1a5623
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3ditem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index c89a8bbe9..f3b0b67e5 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -303,9 +303,9 @@ protected: } else { return "" "uniform highp mat4 qt_Matrix; \n" - "in highp vec4 qt_VertexPosition; \n" - "in highp vec2 qt_VertexTexCoord; \n" - "out highp vec2 qt_TexCoord; \n" + "attribute highp vec4 qt_VertexPosition; \n" + "attribute highp vec2 qt_VertexTexCoord; \n" + "varying highp vec2 qt_TexCoord; \n" "void main() { \n" " qt_TexCoord = qt_VertexTexCoord; \n" " gl_Position = qt_Matrix * qt_VertexPosition; \n" |