GRAPHICS: Add binding of texture view matrix in ShaderSurface

xoreos · Nov 17, 2018 · e2e7f03 · e2e7f03
1 parent cfc2b09
commit e2e7f03
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/graphics/shader/shadersurface.cpp b/src/graphics/shader/shadersurface.cpp
@@ -32,7 +32,7 @@ namespace Shader {
 
 #define SHADER_SURFACE_VARIABLE_OWNED (0x00000001)
 
-ShaderSurface::ShaderSurface(Shader::ShaderObject *vertShader, const Common::UString &name) : _variableData(), _vertShader(vertShader), _flags(0), _name(name), _usageCount(0), _objectModelviewIndex(0xFFFFFFFF) {
+ShaderSurface::ShaderSurface(Shader::ShaderObject *vertShader, const Common::UString &name) : _variableData(), _vertShader(vertShader), _flags(0), _name(name), _usageCount(0), _objectModelviewIndex(0xFFFFFFFF), _textureViewIndex(0xFFFFFFFF) {
 	vertShader->usageCount++;
 
 	uint32 varCount = vertShader->variablesCombined.size();
@@ -43,6 +43,8 @@ ShaderSurface::ShaderSurface(Shader::ShaderObject *vertShader, const Common::USt
 
 		if (vertShader->variablesCombined[i].name == "_objectModelviewMatrix") {
 			_objectModelviewIndex = i;
+		} else if (vertShader->variablesCombined[i].name == "_textureViewMatrix") {
+			_textureViewIndex = i;
 		} else if (vertShader->variablesCombined[i].name == "_projectionMatrix") {
 			setVariableExternal(i, &(GfxMan.getProjectionMatrix()));
 		} else if (vertShader->variablesCombined[i].name == "_modelviewMatrix") {
@@ -178,6 +180,12 @@ void ShaderSurface::bindObjectModelview(Shader::ShaderProgram *program, const gl
 	}
 }
 
+void ShaderSurface::bindTextureView(Shader::ShaderProgram *program, const glm::mat4 *t) {
+	if (_textureViewIndex != 0xFFFFFFFF) {
+		ShaderMan.bindShaderVariable(program->vertexObject->variablesCombined[_textureViewIndex], program->vertexVariableLocations[_objectModelviewIndex], t);
+	}
+}
+
 void ShaderSurface::bindGLState() {
 	if (_flags & SHADER_SURFACE_NOCULL) {
 		glDisable(GL_CULL_FACE);

diff --git a/src/graphics/shader/shadersurface.h b/src/graphics/shader/shadersurface.h
@@ -77,6 +77,7 @@ class ShaderSurface {
 	void bindProgram(Shader::ShaderProgram *program);
 	void bindProgram(Shader::ShaderProgram *program, const glm::mat4 *t);
 	void bindObjectModelview(Shader::ShaderProgram *program, const glm::mat4 *t);
+	void bindTextureView(Shader::ShaderProgram *program, const glm::mat4 *t);
 
 	void bindGLState();
 	void unbindGLState();
@@ -101,6 +102,7 @@ class ShaderSurface {
 	uint32 _usageCount;
 
 	uint32 _objectModelviewIndex;
+	uint32 _textureViewIndex;
 
 	void *genSurfaceVar(uint32 index);
 	void delSurfaceVar(uint32 index);