sascha/cool-retro-term
1
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2025-02-21 20:39:00 +00:00
Code Issues Releases Wiki Activity

Merge branch 'unstable' which fixes default precisions on ES systems.

Browse Source 
Conflicts:
	app/qml/PreprocessedTerminal.qml
	app/qml/ShaderTerminal.qml
	app/qml/frames/utils/TerminalFrame.qml
This commit is contained in:
Filippo Scognamiglio 2015-01-29 03:17:05 +01:00
commit 5807ea001a
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/qml/PreprocessedTerminal.qml
View File

@ -312,6 +312,10 @@ Item{
blending: false blending: false
fragmentShader: fragmentShader:
"#ifdef GL_ES
precision mediump float;
#endif\n" +
"uniform lowp float qt_Opacity;" + "uniform lowp float qt_Opacity;" +
"uniform lowp sampler2D txt_source;" + "uniform lowp sampler2D txt_source;" +

4
app/qml/ShaderTerminal.qml
View File

@ -151,6 +151,10 @@ ShaderEffect {
}" }"
fragmentShader: " fragmentShader: "
#ifdef GL_ES
precision mediump float;
#endif
uniform sampler2D source; uniform sampler2D source;
uniform highp float qt_Opacity; uniform highp float qt_Opacity;
uniform highp float time; uniform highp float time;

8
app/qml/frames/utils/TerminalFrame.qml
View File

@ -120,6 +120,10 @@ Item{
blending: true blending: true
fragmentShader: " fragmentShader: "
#ifdef GL_ES
precision mediump float;
#endif
uniform highp sampler2D normals; uniform highp sampler2D normals;
uniform highp sampler2D source; uniform highp sampler2D source;
uniform lowp float screenCurvature; uniform lowp float screenCurvature;
@ -181,6 +185,10 @@ Item{
blending: true blending: true
fragmentShader: " fragmentShader: "
#ifdef GL_ES
precision mediump float;
#endif
uniform sampler2D lightMask; uniform sampler2D lightMask;
uniform sampler2D reflectionSource; uniform sampler2D reflectionSource;
uniform lowp float diffuseComponent; uniform lowp float diffuseComponent;