PushBuffer fixes

Author: VReaperV

src/engine/renderer/GLMemory.h

@@ -51,7 +51,7 @@ class GLBuffer {
 	std::string name;
 	const GLuint64 SYNC_TIMEOUT = 10000000000; // 10 seconds
 
-	GLuint id;
+	GLuint id = 0;
 
 	GLBuffer( const char* newName, const GLuint newBindingPoint, const GLbitfield newFlags, const GLbitfield newMapFlags ) :
 		name( newName ),
@@ -330,12 +330,6 @@ struct PushBuffer {
 	uint32_t globalUBOSize;
 	uint32_t* globalUBOData;
 
-	uint32_t pushStart = UINT32_MAX;
-	uint32_t pushEnd = 0;
-
-	uint32_t sector = 0;
-	const uint32_t MAX_SECTORS = 1024;
-
 	GLUBO globalUBO = GLUBO( "globalUniforms", BufferBind::GLOBAL_DATA, 0, 0 );
 
 	void InitGLBuffers();

src/engine/renderer/Material.cpp

@@ -1669,8 +1669,9 @@ void MaterialSystem::DepthReduction() {
 	uint32_t globalWorkgroupX = ( width + 7 ) / 8;
 	uint32_t globalWorkgroupY = ( height + 7 ) / 8;
 
-	// FIXME: u_DepthMap object on the shader is not actually used
-	GL_Bind( tr.currentDepthImage );
+	gl_depthReductionShader->SetUniform_DepthMapBindless(
+		GL_BindToTMU( 0, tr.currentDepthImage )
+	);
 	glBindImageTexture( 2, depthImage->texnum, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32F );
 
 	gl_depthReductionShader->SetUniform_InitialDepthLevel( true );

src/engine/renderer/gl_shader_test.cpp

@@ -36,13 +36,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace {
 
-struct u_float_A : GLUniform1f { u_float_A(GLShader* s) : GLUniform1f(s, "u_float_A") {} };
-struct u_float_B : GLUniform1f { u_float_B(GLShader* s) : GLUniform1f(s, "u_float_B") {} };
-struct u_vec2_A : GLUniform2f { u_vec2_A(GLShader* s) : GLUniform2f(s, "u_vec2_A") {} };
-struct u_vec3_A : GLUniform3f { u_vec3_A(GLShader* s) : GLUniform3f(s, "u_vec3_A") {} };
-struct u_vec3_B : GLUniform3f { u_vec3_B(GLShader* s) : GLUniform3f(s, "u_vec3_B") {} };
-struct u_mat4_A: GLUniformMatrix4f { u_mat4_A(GLShader* s) : GLUniformMatrix4f(s, "u_mat4_A") {} };
-struct u_vec4Array6_A : GLUniform4fv { u_vec4Array6_A(GLShader* s) : GLUniform4fv( s, "u_Vec4Array6_A", 6 ) {} };
+struct u_float_A : GLUniform1f { u_float_A(GLShader* s) : GLUniform1f(s, "u_float_A", MATERIAL_OR_PUSH) {} };
+struct u_float_B : GLUniform1f { u_float_B(GLShader* s) : GLUniform1f(s, "u_float_B", MATERIAL_OR_PUSH) {} };
+struct u_vec2_A : GLUniform2f { u_vec2_A(GLShader* s) : GLUniform2f(s, "u_vec2_A", MATERIAL_OR_PUSH) {} };
+struct u_vec3_A : GLUniform3f { u_vec3_A(GLShader* s) : GLUniform3f(s, "u_vec3_A", MATERIAL_OR_PUSH) {} };
+struct u_vec3_B : GLUniform3f { u_vec3_B(GLShader* s) : GLUniform3f(s, "u_vec3_B", MATERIAL_OR_PUSH) {} };
+struct u_mat4_A: GLUniformMatrix4f { u_mat4_A(GLShader* s) : GLUniformMatrix4f(s, "u_mat4_A", MATERIAL_OR_PUSH) {} };
+struct u_vec4Array6_A : GLUniform4fv { u_vec4Array6_A(GLShader* s) : GLUniform4fv( s, "u_Vec4Array6_A", 6, MATERIAL_OR_PUSH ) {} };
 
 class MaterialUniformPackingTestShaderBase : public GLShader
 {

src/engine/renderer/tr_bsp.cpp

@@ -4659,9 +4659,11 @@ static void SetConstUniforms() {
 			globalUBOProxy->SetUniform_ColorMap3DBindless( GL_BindToTMU( 3, tr.colorGradeImage ) );
 		}
 
-		globalUBOProxy->SetUniform_DepthMapBindless( GL_BindToTMU( 1, tr.currentDepthImage ) );
+		globalUBOProxy->SetUniform_DepthMapBindless( GL_BindToTMU( 1, tr.depthSamplerImage ) );
 
-		globalUBOProxy->SetUniform_PortalMapBindless( GL_BindToTMU( 1, tr.portalRenderImage ) );
+		if ( r_liquidMapping->integer ) {
+			globalUBOProxy->SetUniform_PortalMapBindless( GL_BindToTMU( 1, tr.portalRenderImage ) );
+		}
 
 		if ( glConfig.realtimeLighting ) {
 			globalUBOProxy->SetUniform_DepthTile1Bindless(