summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-11-16 10:47:31 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-11-17 13:30:57 +0000
commit0a9b2bd2d7152969110e9e37753e336fb418f8da (patch)
tree55ce106c4206c6b220b519beadf6902aa442eabd
parent91ac8d0264a3777a9d61f704001d032747e25c9f (diff)
Use texture() GLSL function rather than texture2D() in core profile
The texture2D() function doesn't exist in the core profile although some drivers allow it. Follow the standard to be safe. Task-number: QTBUG-64428 Change-Id: I69b3f300928c93663add35bebcfce99e0ee4c340 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/render/materialsystem/prototypes/default.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/materialsystem/prototypes/default.json b/src/render/materialsystem/prototypes/default.json
index 9f16b0f53..535f144d7 100644
--- a/src/render/materialsystem/prototypes/default.json
+++ b/src/render/materialsystem/prototypes/default.json
@@ -91,7 +91,7 @@
"major": 3,
"minor": 0
},
- "substitution": "vec4 $color = texture2D($name, $coord);",
+ "substitution": "vec4 $color = texture($name, $coord);",
"headerSnippets": [ "uniform sampler2D $name;" ]
}
]