Fix #774

Author: hzqst

Build/svencoop/renderer/shader/common.h

@@ -105,15 +105,15 @@
 #define STENCIL_MASK_ALL						0xFF
 #define STENCIL_MASK_NONE						0
 
-//Main view
+		//Main view
 #define STENCIL_MASK_NO_FOG						0x1
 #define STENCIL_MASK_NO_LIGHTING				0x2
 #define STENCIL_MASK_NO_BLOOM					0x4
 #define STENCIL_MASK_NO_GLOW_BLUR				0x8
 #define STENCIL_MASK_HAS_FLATSHADE				0x10
 #define STENCIL_MASK_HAS_DECAL					0x20
-#define STENCIL_MASK_NO_GLOW_COLOR				0x20
 #define STENCIL_MASK_HAS_OUTLINE				0x40
+#define STENCIL_MASK_NO_GLOW_COLOR				0x40
 
 //Studio view
 #define STENCIL_MASK_HAS_SHADOW					0x1

Build/svencoop/renderer/shader/water_shader.vert.glsl

@@ -58,7 +58,7 @@ const float turbsin[] = {
 void main()
 {
 	vec3 vertpos = in_vertex;
-	vec4 worldpos4 = EntityUBO.entityMatrix * vec4(vertpos, 1.0);
+	vec4 worldpos4 = EntityUBO.r_entityMatrix * vec4(vertpos, 1.0);
 
 #if defined(LEGACY_ENABLED)
 
@@ -86,7 +86,7 @@ void main()
 
 	vec4 normal4 = vec4(in_normal, 0.0);
 
-	v_normal = normalize((EntityUBO.entityMatrix * normal4).xyz);
+	v_normal = normalize((EntityUBO.r_entityMatrix * normal4).xyz);
 
 	gl_Position = GetCameraProjMatrix(0) * GetCameraWorldMatrix(0) * worldpos4;
 

Build/svencoop/renderer/shader/wsurf_shader.vert.glsl

@@ -149,7 +149,7 @@ void main(void)
 
 #if 1//Use smooth normal for vertex scaling
 	vec4 smoothnormal4 = vec4(in_smoothnormal.xyz, 0.0);
-	smoothnormal3 = normalize((EntityUBO.r_entityMatrix * smoothnormal4).xyz);
+	vec3 smoothnormal3 = normalize((EntityUBO.r_entityMatrix * smoothnormal4).xyz);
 
 	worldpos4.xyz += smoothnormal3.xyz * EntityUBO.r_scale;
 #endif

Plugins/Renderer/gl_common.h

@@ -169,8 +169,8 @@ class CIndirectDrawAttrib
 #define STENCIL_MASK_NO_GLOW_BLUR				0x8
 #define STENCIL_MASK_HAS_FLATSHADE				0x10
 #define STENCIL_MASK_HAS_DECAL					0x20
-#define STENCIL_MASK_NO_GLOW_COLOR				0x20
 #define STENCIL_MASK_HAS_OUTLINE				0x40
+#define STENCIL_MASK_NO_GLOW_COLOR				0x40
 
 //Studio view
 #define STENCIL_MASK_HAS_SHADOW					0x1

Plugins/Renderer/gl_rmain.cpp

@@ -4288,7 +4288,7 @@ void R_SetupGLForViewModel(void)
 
 void R_SetupGL(void)
 {
-	GL_BeginDebugGroup("R_SetupGL");
+//	GL_BeginDebugGroup("R_SetupGL");
 
 	auto CurrentFBO = GL_GetCurrentSceneFBO();
 
@@ -4454,7 +4454,7 @@ void R_SetupGL(void)
 		InvertMatrix(gWorldToScreen, gScreenToWorld);
 	}
 
-	GL_EndDebugGroup();
+//	GL_EndDebugGroup();
 }
 
 void R_CheckVariables(void)