From b466adff89db080c304ac3178ce1f4fef844cb28 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 28 Aug 2021 11:52:28 +0300
Subject: [PATCH] Miscellaneous cleanup

---
 blender/io_mspgl/export_scene.py             | 2 +-
 demos/desertpillars/data/exported/Desert.seq | 2 +-
 source/core/clipping.cpp                     | 1 -
 source/core/clipping.h                       | 1 -
 source/core/clipplane.h                      | 4 ++--
 source/core/pipelinestate.h                  | 5 ++---
 source/glsl/spirv.h                          | 4 ++--
 source/render/renderer.cpp                   | 1 -
 source/render/renderer.h                     | 2 --
 source/render/sequence.cpp                   | 2 +-
 10 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index 7bb32efe..ee9c8c2f 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -118,7 +118,7 @@ class SceneExporter:
 		if scene.background_set:
 			content = resources[scene.name+".wrapper.scene"]
 
-		ss = Statement("pass", "", "content")
+		ss = Statement("step", "", "content")
 		ss.sub.append(Statement("depth_test", Token("LEQUAL")))
 		ss.sub.append(seq_res.create_reference_statement("lighting", resources[scene.name+".lightn"]))
 		ss.sub.append(seq_res.create_reference_statement("scene", content))
diff --git a/demos/desertpillars/data/exported/Desert.seq b/demos/desertpillars/data/exported/Desert.seq
index 8000033c..b6f94ab9 100644
--- a/demos/desertpillars/data/exported/Desert.seq
+++ b/demos/desertpillars/data/exported/Desert.seq
@@ -1,5 +1,5 @@
 hdr true;
-pass "" "content"
+step "" "content"
 {
 	depth_test LEQUAL;
 	lighting "Desert.lightn";
diff --git a/source/core/clipping.cpp b/source/core/clipping.cpp
index e7ad643b..79e1aaf0 100644
--- a/source/core/clipping.cpp
+++ b/source/core/clipping.cpp
@@ -3,7 +3,6 @@
 #include "clipplane.h"
 #include "deviceinfo.h"
 #include "error.h"
-#include "matrix.h"
 
 using namespace std;
 
diff --git a/source/core/clipping.h b/source/core/clipping.h
index 109aeac9..6496aed0 100644
--- a/source/core/clipping.h
+++ b/source/core/clipping.h
@@ -9,7 +9,6 @@ namespace Msp {
 namespace GL {
 
 class ClipPlane;
-class Matrix;
 
 class Clipping
 {
diff --git a/source/core/clipplane.h b/source/core/clipplane.h
index f9dca0de..9160e526 100644
--- a/source/core/clipplane.h
+++ b/source/core/clipplane.h
@@ -1,5 +1,5 @@
-#ifndef MSP_GL_CLIP_H_
-#define MSP_GL_CLIP_H_
+#ifndef MSP_GL_CLIPPLANE_H_
+#define MSP_GL_CLIPPLANE_H_
 
 #include "vector.h"
 
diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index 9f6795f1..5c3bb9ce 100644
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -1,5 +1,5 @@
-#ifndef PIPELINESTATE_H_
-#define PIPELINESTATE_H_
+#ifndef MSP_GL_PIPELINESTATE_H_
+#define MSP_GL_PIPELINESTATE_H_
 
 #include <vector>
 #include <msp/core/noncopyable.h>
@@ -20,7 +20,6 @@ class StencilTest;
 class Texture;
 class UniformBlock;
 class VertexSetup;
-class WindingTest;
 
 class PipelineState: public NonCopyable
 {
diff --git a/source/glsl/spirv.h b/source/glsl/spirv.h
index f18bf61c..d680ee3c 100644
--- a/source/glsl/spirv.h
+++ b/source/glsl/spirv.h
@@ -1,5 +1,5 @@
-#ifndef MSP_GL_SL_SPIRV
-#define MSP_GL_SL_SPIRV
+#ifndef MSP_GL_SL_SPIRV_H_
+#define MSP_GL_SL_SPIRV_H_
 
 #include <map>
 #include <string>
diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 52edc249..575b44a8 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -385,7 +385,6 @@ Renderer::State::State():
 	viewport(0),
 	scissor(0),
 	texture_count(0),
-	lowest_effect_texunit(Limits::get_global().max_texture_bindings),
 	clipping(0),
 	shprog(0),
 	shdata_count(0),
diff --git a/source/render/renderer.h b/source/render/renderer.h
index 23f7c5cc..7997b35c 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -24,7 +24,6 @@ class Renderable;
 class Sampler;
 class Texture;
 class VertexSetup;
-class WindingTest;
 
 /**
 A class for supervising the rendering process.  While many Renderables (in
@@ -92,7 +91,6 @@ private:
 		const Rect *viewport;
 		const Rect *scissor;
 		unsigned texture_count;
-		unsigned lowest_effect_texunit;
 		const Clipping *clipping;
 		const Program *shprog;
 		unsigned shdata_count;
diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index 89d475e3..472b572f 100644
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -291,7 +291,7 @@ void Sequence::Step::set_blend(const Blend &b)
 
 void Sequence::Step::set_clipping(const Clipping *c)
 {
-	clipping =c;
+	clipping = c;
 }
 
 } // namespace GL
-- 
2.43.0