summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/qt3d/advancedcustommaterial/WaterMaterial.qml5
-rw-r--r--examples/qt3d/advancedcustommaterial/shaders/gl3/water.frag2
2 files changed, 3 insertions, 4 deletions
diff --git a/examples/qt3d/advancedcustommaterial/WaterMaterial.qml b/examples/qt3d/advancedcustommaterial/WaterMaterial.qml
index 2c5410bea..b67e8322c 100644
--- a/examples/qt3d/advancedcustommaterial/WaterMaterial.qml
+++ b/examples/qt3d/advancedcustommaterial/WaterMaterial.qml
@@ -228,12 +228,11 @@ Material {
}
},
- // OpenGL 2.0
+ // OpenGLES 2.0
Technique {
filterKeys: [ forward ]
graphicsApiFilter {
- api: GraphicsApiFilter.OpenGL
- profile: GraphicsApiFilter.NoProfile
+ api: GraphicsApiFilter.OpenGLES
majorVersion: 2
minorVersion: 0
}
diff --git a/examples/qt3d/advancedcustommaterial/shaders/gl3/water.frag b/examples/qt3d/advancedcustommaterial/shaders/gl3/water.frag
index ae40bdf37..9657cc63a 100644
--- a/examples/qt3d/advancedcustommaterial/shaders/gl3/water.frag
+++ b/examples/qt3d/advancedcustommaterial/shaders/gl3/water.frag
@@ -39,7 +39,7 @@ void main()
vec2 waveMovCoord = waveTexCoord;
waveMovCoord.x += offsetx;
waveMovCoord.y -= offsety;
- vec4 wave = texture2D(waveTexture, waveMovCoord);
+ vec4 wave = texture(waveTexture, waveMovCoord);
//Wiggle the newCoord by r and b colors of waveTexture
vec2 newCoord = texCoord;