Merge branch 'unstable' which fixes default precisions on ES systems.
Conflicts: app/qml/PreprocessedTerminal.qml app/qml/ShaderTerminal.qml app/qml/frames/utils/TerminalFrame.qml
This commit is contained in:
@@ -120,6 +120,10 @@ Item{
|
||||
blending: true
|
||||
|
||||
fragmentShader: "
|
||||
#ifdef GL_ES
|
||||
precision mediump float;
|
||||
#endif
|
||||
|
||||
uniform highp sampler2D normals;
|
||||
uniform highp sampler2D source;
|
||||
uniform lowp float screenCurvature;
|
||||
@@ -181,6 +185,10 @@ Item{
|
||||
blending: true
|
||||
|
||||
fragmentShader: "
|
||||
#ifdef GL_ES
|
||||
precision mediump float;
|
||||
#endif
|
||||
|
||||
uniform sampler2D lightMask;
|
||||
uniform sampler2D reflectionSource;
|
||||
uniform lowp float diffuseComponent;
|
||||
|
||||
Reference in New Issue
Block a user