mirror of
				https://github.com/Swordfish90/cool-retro-term.git
				synced 2025-10-31 07:04:20 +00:00 
			
		
		
		
	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:
		| @@ -312,6 +312,10 @@ Item{ | ||||
|             blending: false | ||||
|  | ||||
|             fragmentShader: | ||||
|                 "#ifdef GL_ES | ||||
|                     precision mediump float; | ||||
|                 #endif\n" + | ||||
|  | ||||
|                 "uniform lowp float qt_Opacity;" + | ||||
|                 "uniform lowp sampler2D txt_source;" + | ||||
|  | ||||
|   | ||||
| @@ -151,6 +151,10 @@ ShaderEffect { | ||||
|         }" | ||||
|  | ||||
|     fragmentShader: " | ||||
|         #ifdef GL_ES | ||||
|             precision mediump float; | ||||
|         #endif | ||||
|  | ||||
|         uniform sampler2D source; | ||||
|         uniform highp float qt_Opacity; | ||||
|         uniform highp float time; | ||||
|   | ||||
| @@ -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