softgpu: Use vertType prim override for flags.

These parameters are a real shame, was so clean before...
hrydgard · Sep 7, 2022 · 764b7e7 · 764b7e7
1 parent 5093f6c
commit 764b7e7
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 19 deletions.
diff --git a/GPU/Common/VertexDecoderCommon.h b/GPU/Common/VertexDecoderCommon.h
@@ -28,6 +28,7 @@
 #include "GPU/ge_constants.h"
 #include "GPU/Common/ShaderCommon.h"
 #include "GPU/GPUCommon.h"
+#include "GPU/GPUState.h"
 
 #if PPSSPP_ARCH(ARM)
 #include "Common/ArmEmitter.h"
@@ -299,6 +300,8 @@ class VertexReader {
 	bool hasNormal() const { return decFmt_.nrmfmt != 0; }
 	bool hasUV() const { return decFmt_.uvfmt != 0; }
 	bool isThrough() const { return (vtype_ & GE_VTYPE_THROUGH) != 0; }
+	bool skinningEnabled() const { return vertTypeIsSkinningEnabled(vtype_); }
+	int numBoneWeights() const { return vertTypeGetNumBoneWeights(vtype_); }
 	void Goto(int index) {
 		data_ = base_ + index * decFmt_.stride;
 	}

diff --git a/GPU/Software/BinManager.cpp b/GPU/Software/BinManager.cpp
@@ -161,13 +161,13 @@ BinManager::~BinManager() {
 	}
 }
 
-void BinManager::UpdateState() {
+void BinManager::UpdateState(bool throughMode) {
 	PROFILE_THIS_SCOPE("bin_state");
 	if (HasDirty(SoftDirty::PIXEL_ALL | SoftDirty::SAMPLER_ALL | SoftDirty::RAST_ALL)) {
 		if (states_.Full())
 			Flush("states");
 		stateIndex_ = (int)states_.Push(RasterizerState());
-		ComputeRasterizerState(&states_[stateIndex_]);
+		ComputeRasterizerState(&states_[stateIndex_], throughMode);
 		states_[stateIndex_].samplerID.cached.clut = cluts_[clutIndex_].readable;
 
 		ClearDirty(SoftDirty::PIXEL_ALL | SoftDirty::SAMPLER_ALL | SoftDirty::RAST_ALL);

diff --git a/GPU/Software/BinManager.h b/GPU/Software/BinManager.h
@@ -181,7 +181,7 @@ class BinManager {
 	BinManager();
 	~BinManager();
 
-	void UpdateState();
+	void UpdateState(bool throughMode);
 	void UpdateClut(const void *src);
 
 	const Rasterizer::RasterizerState &State() {

diff --git a/GPU/Software/Clipper.cpp b/GPU/Software/Clipper.cpp
@@ -132,7 +132,7 @@ static inline bool CheckOutsideZ(ClipCoords p, int &pos, int &neg) {
 }
 
 void ProcessRect(const VertexData &v0, const VertexData &v1, BinManager &binner) {
-	if (!gstate.isModeThrough()) {
+	if (!binner.State().throughMode) {
 		// We may discard the entire rect based on depth values.
 		int outsidePos = 0, outsideNeg = 0;
 		CheckOutsideZ(v0.clippos, outsidePos, outsideNeg);
@@ -181,7 +181,7 @@ void ProcessPoint(const VertexData &v0, BinManager &binner) {
 }
 
 void ProcessLine(const VertexData &v0, const VertexData &v1, BinManager &binner) {
-	if (gstate.isModeThrough()) {
+	if (binner.State().throughMode) {
 		// Actually, should clip this one too so we don't need to do bounds checks in the rasterizer.
 		binner.AddLine(v0, v1);
 		return;
@@ -221,7 +221,7 @@ void ProcessLine(const VertexData &v0, const VertexData &v1, BinManager &binner)
 
 void ProcessTriangle(const VertexData &v0, const VertexData &v1, const VertexData &v2, const VertexData &provoking, BinManager &binner) {
 	int mask = 0;
-	if (!gstate.isModeThrough()) {
+	if (!binner.State().throughMode) {
 		mask |= CalcClipMask(v0.clippos);
 		mask |= CalcClipMask(v1.clippos);
 		mask |= CalcClipMask(v2.clippos);

diff --git a/GPU/Software/FuncId.cpp b/GPU/Software/FuncId.cpp
@@ -48,11 +48,11 @@ static inline PixelBlendFactor OptimizeAlphaFactor(uint32_t color) {
 	return PixelBlendFactor::FIX;
 }
 
-void ComputePixelFuncID(PixelFuncID *id) {
+void ComputePixelFuncID(PixelFuncID *id, bool throughMode) {
 	id->fullKey = 0;
 
 	// TODO: Could this be minz > 0x0000 || maxz < 0xFFFF?  Maybe unsafe, depending on verts...
-	id->applyDepthRange = !gstate.isModeThrough();
+	id->applyDepthRange = !throughMode;
 	// Dither happens even in clear mode.
 	id->dithering = gstate.isDitherEnabled();
 	id->fbFormat = gstate.FrameBufFormat();
@@ -162,7 +162,7 @@ void ComputePixelFuncID(PixelFuncID *id) {
 		}
 
 		id->applyLogicOp = gstate.isLogicOpEnabled() && gstate.getLogicOp() != GE_LOGIC_COPY;
-		id->applyFog = gstate.isFogEnabled() && !gstate.isModeThrough();
+		id->applyFog = gstate.isFogEnabled() && !throughMode;
 	}
 
 	// Cache some values for later convenience.

diff --git a/GPU/Software/FuncId.h b/GPU/Software/FuncId.h
@@ -243,7 +243,7 @@ struct hash<SamplerID> {
 
 };
 
-void ComputePixelFuncID(PixelFuncID *id);
+void ComputePixelFuncID(PixelFuncID *id, bool throughMode);
 std::string DescribePixelFuncID(const PixelFuncID &id);
 
 void ComputeSamplerID(SamplerID *id);

diff --git a/GPU/Software/Rasterizer.cpp b/GPU/Software/Rasterizer.cpp
@@ -101,8 +101,8 @@ static inline Vec4<float> Interpolate(const float &c0, const float &c1, const fl
 	return Interpolate(c0, c1, c2, w0.Cast<float>(), w1.Cast<float>(), w2.Cast<float>(), wsum_recip);
 }
 
-void ComputeRasterizerState(RasterizerState *state) {
-	ComputePixelFuncID(&state->pixelID);
+void ComputeRasterizerState(RasterizerState *state, bool throughMode) {
+	ComputePixelFuncID(&state->pixelID, throughMode);
 	state->drawPixel = Rasterizer::GetSingleFunc(state->pixelID);
 
 	state->enableTextures = gstate.isTextureMapEnabled() && !state->pixelID.clearMode;
@@ -140,7 +140,7 @@ void ComputeRasterizerState(RasterizerState *state) {
 	}
 
 	state->shadeGouraud = gstate.getShadeMode() == GE_SHADE_GOURAUD;
-	state->throughMode = gstate.isModeThrough();
+	state->throughMode = throughMode;
 	state->antialiasLines = gstate.isAntiAliasEnabled();
 
 	state->screenOffsetX = gstate.getOffsetX16();

diff --git a/GPU/Software/Rasterizer.h b/GPU/Software/Rasterizer.h
@@ -67,7 +67,7 @@ struct RasterizerState {
 	}
 };
 
-void ComputeRasterizerState(RasterizerState *state);
+void ComputeRasterizerState(RasterizerState *state, bool throughMode);
 
 // Draws a triangle if its vertices are specified in counter-clockwise order
 void DrawTriangle(const VertexData &v0, const VertexData &v1, const VertexData &v2, const BinCoords &range, const RasterizerState &state);

diff --git a/GPU/Software/TransformUnit.cpp b/GPU/Software/TransformUnit.cpp
@@ -202,11 +202,11 @@ struct TransformState {
 };
 
 void ComputeTransformState(TransformState *state, const VertexReader &vreader) {
-	state->enableTransform = !gstate.isModeThrough();
+	state->enableTransform = !vreader.isThrough();
 	state->enableLighting = gstate.isLightingEnabled();
 	state->enableFog = gstate.isFogEnabled();
 	state->readUV = !gstate.isModeClear() && gstate.isTextureMapEnabled() && vreader.hasUV();
-	state->readWeights = vertTypeIsSkinningEnabled(gstate.vertType) && state->enableTransform;
+	state->readWeights = vreader.skinningEnabled() && state->enableTransform;
 	state->negateNormals = gstate.areNormalsReversed();
 
 	state->uvGenMode = gstate.getUVGenMode();
@@ -302,7 +302,7 @@ VertexData TransformUnit::ReadVertex(VertexReader &vreader, const TransformState
 		Vec3<float> tmppos(0.f, 0.f, 0.f);
 		Vec3<float> tmpnrm(0.f, 0.f, 0.f);
 
-		for (int i = 0; i < vertTypeGetNumBoneWeights(gstate.vertType); ++i) {
+		for (int i = 0; i < vreader.numBoneWeights(); ++i) {
 			Vec3<float> step = Vec3ByMatrix43(pos, gstate.boneMatrix + i * 12);
 			tmppos += step * W[i];
 			if (vreader.hasNormal()) {
@@ -506,7 +506,7 @@ void TransformUnit::SubmitPrimitive(const void* vertices, const void* indices, G
 	// TODO: Do this in two passes - first process the vertices (before indexing/stripping),
 	// then resolve the indices. This lets us avoid transforming shared vertices twice.
 
-	binner_->UpdateState();
+	binner_->UpdateState(vreader.isThrough());
 
 	static TransformState transformState;
 	if (binner_->HasDirty(SoftDirty::LIGHT_ALL | SoftDirty::TRANSFORM_ALL)) {
@@ -595,7 +595,7 @@ void TransformUnit::SubmitPrimitive(const void* vertices, const void* indices, G
 				}
 			}
 
-			if (data_index == 4 && gstate.isModeThrough() && cullType == CullType::OFF) {
+			if (data_index == 4 && vreader.isThrough() && cullType == CullType::OFF) {
 				if (Rasterizer::DetectRectangleThroughModeSlices(binner_->State(), data)) {
 					data[1] = data[3];
 					data_index = 2;