From 3bb87ecbe6fead9dd4aa758122dbfaa34ff1550f Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 30 Mar 2022 20:05:14 +0100 Subject: [PATCH] Some small tweaks to shaders following trunk merge --- android/app/src/main/assets/pakQ3Q.pk3 | Bin 288703 -> 288796 bytes .../cpp/code/renderergl2/glsl/dlight_vp.glsl | 6 +++--- .../cpp/code/renderergl2/glsl/down4x_vp.glsl | 6 +++--- .../cpp/code/renderergl2/glsl/fogpass_vp.glsl | 6 +++--- .../cpp/code/renderergl2/glsl/generic_vp.glsl | 6 +++--- .../code/renderergl2/glsl/lightall_vp.glsl | 6 +++--- .../cpp/code/renderergl2/glsl/pshadow_vp.glsl | 6 +++--- .../code/renderergl2/glsl/shadowfill_vp.glsl | 6 +++--- .../renderergl2/glsl/texturecolor_vp.glsl | 6 +++--- .../cpp/code/renderergl2/glsl/tonemap_vp.glsl | 6 +++--- .../app/src/main/pakQ3Q/glsl/dlight_vp.glsl | 6 +++--- .../app/src/main/pakQ3Q/glsl/down4x_vp.glsl | 6 +++--- .../app/src/main/pakQ3Q/glsl/fogpass_vp.glsl | 6 +++--- .../app/src/main/pakQ3Q/glsl/generic_vp.glsl | 6 +++--- .../app/src/main/pakQ3Q/glsl/lightall_vp.glsl | 6 +++--- .../app/src/main/pakQ3Q/glsl/pshadow_vp.glsl | 6 +++--- .../src/main/pakQ3Q/glsl/shadowfill_vp.glsl | 6 +++--- .../src/main/pakQ3Q/glsl/texturecolor_vp.glsl | 6 +++--- .../app/src/main/pakQ3Q/glsl/tonemap_vp.glsl | 6 +++--- android/run.bat | 2 +- 20 files changed, 55 insertions(+), 55 deletions(-) diff --git a/android/app/src/main/assets/pakQ3Q.pk3 b/android/app/src/main/assets/pakQ3Q.pk3 index 0bf331a0d1d8166d3d571a3f9908f493792c79e8..76000de2f47bf9b927faefad4937a0794cb7744a 100644 GIT binary patch delta 12434 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 diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/dlight_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/dlight_vp.glsl index a9fe11bb..31fd10ae 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/dlight_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/dlight_vp.glsl @@ -12,16 +12,16 @@ uniform float u_Time; uniform vec4 u_Color; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_Tex1; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/down4x_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/down4x_vp.glsl index 27c0d8a6..aae50b68 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/down4x_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/down4x_vp.glsl @@ -2,15 +2,15 @@ attribute vec3 attr_Position; attribute vec4 attr_TexCoord0; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_TexCoords; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/fogpass_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/fogpass_vp.glsl index e03c0421..e25c69e7 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/fogpass_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/fogpass_vp.glsl @@ -15,7 +15,7 @@ uniform vec4 u_FogDistance; uniform vec4 u_FogDepth; uniform float u_FogEyeT; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; #if defined(USE_DEFORM_VERTEXES) uniform int u_DeformGen; @@ -35,11 +35,11 @@ uniform vec4 u_Color; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying float var_Scale; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/generic_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/generic_vp.glsl index e03f1400..e535f059 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/generic_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/generic_vp.glsl @@ -36,7 +36,7 @@ uniform float u_FogEyeT; uniform vec4 u_FogColorMask; #endif -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; #if defined(USE_DEFORM_VERTEXES) uniform int u_DeformGen; @@ -66,11 +66,11 @@ uniform mat4 u_BoneMatrix[MAX_GLSL_BONES]; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_DiffuseTex; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/lightall_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/lightall_vp.glsl index ce6d1372..1b6fdb67 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/lightall_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/lightall_vp.glsl @@ -42,7 +42,7 @@ uniform vec4 u_DiffuseTexOffTurb; #endif -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; uniform vec4 u_BaseColor; uniform vec4 u_VertColor; @@ -69,11 +69,11 @@ uniform float u_PrimaryLightRadius; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec4 var_TexCoords; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/pshadow_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/pshadow_vp.glsl index 98cdd231..b4f0821d 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/pshadow_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/pshadow_vp.glsl @@ -1,15 +1,15 @@ attribute vec3 attr_Position; attribute vec3 attr_Normal; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec3 var_Position; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/shadowfill_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/shadowfill_vp.glsl index 369740cd..7f2d93fc 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/shadowfill_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/shadowfill_vp.glsl @@ -20,7 +20,7 @@ uniform float u_DeformParams[5]; uniform float u_Time; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; #if defined(USE_VERTEX_ANIMATION) uniform float u_VertexLerp; @@ -30,11 +30,11 @@ uniform mat4 u_BoneMatrix[MAX_GLSL_BONES]; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec3 var_Position; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/texturecolor_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/texturecolor_vp.glsl index b844be3b..9aa7d0dc 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/texturecolor_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/texturecolor_vp.glsl @@ -3,15 +3,15 @@ attribute vec4 attr_TexCoord0; // Uniforms -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_Tex1; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/tonemap_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/tonemap_vp.glsl index 77188c43..2d8e62d1 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/tonemap_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/tonemap_vp.glsl @@ -2,17 +2,17 @@ attribute vec3 attr_Position; attribute vec4 attr_TexCoord0; // Uniforms -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; uniform vec3 u_ToneMinAvgMaxLinear; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; diff --git a/android/app/src/main/pakQ3Q/glsl/dlight_vp.glsl b/android/app/src/main/pakQ3Q/glsl/dlight_vp.glsl index a9fe11bb..31fd10ae 100644 --- a/android/app/src/main/pakQ3Q/glsl/dlight_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/dlight_vp.glsl @@ -12,16 +12,16 @@ uniform float u_Time; uniform vec4 u_Color; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_Tex1; diff --git a/android/app/src/main/pakQ3Q/glsl/down4x_vp.glsl b/android/app/src/main/pakQ3Q/glsl/down4x_vp.glsl index 27c0d8a6..aae50b68 100644 --- a/android/app/src/main/pakQ3Q/glsl/down4x_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/down4x_vp.glsl @@ -2,15 +2,15 @@ attribute vec3 attr_Position; attribute vec4 attr_TexCoord0; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_TexCoords; diff --git a/android/app/src/main/pakQ3Q/glsl/fogpass_vp.glsl b/android/app/src/main/pakQ3Q/glsl/fogpass_vp.glsl index e03c0421..e25c69e7 100644 --- a/android/app/src/main/pakQ3Q/glsl/fogpass_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/fogpass_vp.glsl @@ -15,7 +15,7 @@ uniform vec4 u_FogDistance; uniform vec4 u_FogDepth; uniform float u_FogEyeT; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; #if defined(USE_DEFORM_VERTEXES) uniform int u_DeformGen; @@ -35,11 +35,11 @@ uniform vec4 u_Color; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying float var_Scale; diff --git a/android/app/src/main/pakQ3Q/glsl/generic_vp.glsl b/android/app/src/main/pakQ3Q/glsl/generic_vp.glsl index e03f1400..e535f059 100644 --- a/android/app/src/main/pakQ3Q/glsl/generic_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/generic_vp.glsl @@ -36,7 +36,7 @@ uniform float u_FogEyeT; uniform vec4 u_FogColorMask; #endif -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; #if defined(USE_DEFORM_VERTEXES) uniform int u_DeformGen; @@ -66,11 +66,11 @@ uniform mat4 u_BoneMatrix[MAX_GLSL_BONES]; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_DiffuseTex; diff --git a/android/app/src/main/pakQ3Q/glsl/lightall_vp.glsl b/android/app/src/main/pakQ3Q/glsl/lightall_vp.glsl index ce6d1372..1b6fdb67 100644 --- a/android/app/src/main/pakQ3Q/glsl/lightall_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/lightall_vp.glsl @@ -42,7 +42,7 @@ uniform vec4 u_DiffuseTexOffTurb; #endif -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; uniform vec4 u_BaseColor; uniform vec4 u_VertColor; @@ -69,11 +69,11 @@ uniform float u_PrimaryLightRadius; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec4 var_TexCoords; diff --git a/android/app/src/main/pakQ3Q/glsl/pshadow_vp.glsl b/android/app/src/main/pakQ3Q/glsl/pshadow_vp.glsl index 98cdd231..b4f0821d 100644 --- a/android/app/src/main/pakQ3Q/glsl/pshadow_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/pshadow_vp.glsl @@ -1,15 +1,15 @@ attribute vec3 attr_Position; attribute vec3 attr_Normal; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec3 var_Position; diff --git a/android/app/src/main/pakQ3Q/glsl/shadowfill_vp.glsl b/android/app/src/main/pakQ3Q/glsl/shadowfill_vp.glsl index 369740cd..7f2d93fc 100644 --- a/android/app/src/main/pakQ3Q/glsl/shadowfill_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/shadowfill_vp.glsl @@ -20,7 +20,7 @@ uniform float u_DeformParams[5]; uniform float u_Time; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; #if defined(USE_VERTEX_ANIMATION) uniform float u_VertexLerp; @@ -30,11 +30,11 @@ uniform mat4 u_BoneMatrix[MAX_GLSL_BONES]; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec3 var_Position; diff --git a/android/app/src/main/pakQ3Q/glsl/texturecolor_vp.glsl b/android/app/src/main/pakQ3Q/glsl/texturecolor_vp.glsl index b844be3b..9aa7d0dc 100644 --- a/android/app/src/main/pakQ3Q/glsl/texturecolor_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/texturecolor_vp.glsl @@ -3,15 +3,15 @@ attribute vec4 attr_TexCoord0; // Uniforms -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_Tex1; diff --git a/android/app/src/main/pakQ3Q/glsl/tonemap_vp.glsl b/android/app/src/main/pakQ3Q/glsl/tonemap_vp.glsl index 77188c43..2d8e62d1 100644 --- a/android/app/src/main/pakQ3Q/glsl/tonemap_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/tonemap_vp.glsl @@ -2,17 +2,17 @@ attribute vec3 attr_Position; attribute vec4 attr_TexCoord0; // Uniforms -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; uniform vec3 u_ToneMinAvgMaxLinear; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; diff --git a/android/run.bat b/android/run.bat index 9865aa6d..8b82bc75 100644 --- a/android/run.bat +++ b/android/run.bat @@ -3,7 +3,7 @@ setlocal set BUILD_TYPE=release -set VERSION=0.29.0 +set VERSION=0.29.0-multiview @REM Define the following environment variables to sign a release build @REM set KEYSTORE=