better debuggable shaders; fix projection matrices

Author: malytomas

data/cage/shaders/engine/standard.glsl

@@ -33,6 +33,7 @@ void main()
 		discard;
 #endif // CutOut
 	outColor = lighting(material);
+	outColor = vec4(material.albedo, 1); // todo remove debug
 
 #endif // DepthOnly
 }

sources/asset-processor/shader.cpp

@@ -464,7 +464,7 @@ namespace
 					std::advance(it, i);
 					const detail::StringBase<20> k = *it;
 					preamble += std::string("#define ") + k.c_str() + " 1\n";
-					id += hashRawString(k.c_str());
+					id += HashString(k);
 				}
 			}
 			try

sources/asset-processor/texture.cpp

@@ -171,6 +171,16 @@ namespace
 		CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "loading done");
 	}
 
+	void fillAlphaChannel(Image *img)
+	{
+		CAGE_ASSERT(img->channels() == 4);
+		const uint32 w = img->width();
+		const uint32 h = img->height();
+		for (uint32 y = 0; y < h; y++)
+			for (uint32 x = 0; x < w; x++)
+				img->value(x, y, 3, 1);
+	}
+
 	void overrideColorConfig(AlphaModeEnum alpha, GammaSpaceEnum gamma)
 	{
 		ImageColorConfig cfg;
@@ -442,7 +452,11 @@ void processTexture()
 		if (ch != 0 && images.parts[0].image->channels() != ch)
 		{
 			for (auto &p : images.parts)
+			{
 				imageConvert(+p.image, ch);
+				if (ch == 4)
+					fillAlphaChannel(+p.image);
+			}
 			CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "converted to " + ch + " channels");
 		}
 	}
@@ -551,6 +565,19 @@ void processTexture()
 		}
 	}
 
+	{ // convert 3 channels to 4
+		if (images.parts[0].image->channels() == 3)
+		{
+			CAGE_LOG(SeverityEnum::Warning, "assetProcessor", Stringizer() + "3-channel images are not supported, converting to 4 channels");
+			for (auto &p : images.parts)
+			{
+				imageConvert(+p.image, 4);
+				fillAlphaChannel(+p.image);
+			}
+			CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "converted to 4 channels");
+		}
+	}
+
 	CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "output resolution: " + images.parts[0].image->width() + "*" + images.parts[0].image->height() + "*" + numeric_cast<uint32>(images.parts.size()));
 	CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "output channels: " + images.parts[0].image->channels());
 

sources/include/cage-core/core.h

@@ -341,6 +341,12 @@ namespace cage
 			static_assert(std::is_trivially_copyable_v<T> && std::is_trivially_copyable_v<M>);
 			return PointerRange<M>((M *)begin_, (M *)end_);
 		}
+
+		CAGE_FORCE_INLINE PointerRange<T> subRange(size_type offset, size_type size) const
+		{
+			CAGE_ASSERT(offset + size <= this->size());
+			return PointerRange<T>(begin_ + offset, begin_ + offset + size);
+		}
 	};
 
 	// string

sources/include/cage-engine/shader.h

@@ -37,6 +37,8 @@ namespace cage
 
 		void addVariant(GraphicsDevice *device, uint32 variant, const Spirv *spirv);
 
+		bool checkKeyword(uint32 keyword) const;
+
 		Holder<Shader> get(uint32 variant); // sum of hashes of keywords
 
 		uint32 customDataCount = 0; // number of floats passed from the game to the shader, per instance

sources/libcore/geometry/shapes.cpp

@@ -355,13 +355,13 @@ namespace cage
 	{
 		const Mat4 invVP = inverse(viewProj);
 		static constexpr const Vec3 clipCorners[8] = {
-			Vec3(-1, -1, -1),
+			Vec3(-1, -1, 0),
 			Vec3(-1, -1, +1),
-			Vec3(-1, +1, -1),
+			Vec3(-1, +1, 0),
 			Vec3(-1, +1, +1),
-			Vec3(+1, -1, -1),
+			Vec3(+1, -1, 0),
 			Vec3(+1, -1, +1),
-			Vec3(+1, +1, -1),
+			Vec3(+1, +1, 0),
 			Vec3(+1, +1, +1),
 		};
 		Frustum::Corners res;

sources/libcore/math/camera.cpp

@@ -34,7 +34,7 @@ namespace cage
 		CAGE_ASSERT(aspectRatio > 0);
 		CAGE_ASSERT(sign(near) == sign(far) && near != far);
 		Real f = 1 / tan(fov / 2);
-		return Mat4(f / aspectRatio, 0, 0, 0, 0, f, 0, 0, 0, 0, (far + near) / (near - far), -1, 0, 0, far * near * 2.0 / (near - far), 0);
+		return Mat4(f / aspectRatio, 0, 0, 0, 0, f, 0, 0, 0, 0, -far / (far - near), -1, 0, 0, (-far * near) / (far - near), 0);
 	}
 
 	Mat4 perspectiveProjection(Rads fov, Real aspectRatio, Real near, Real far, Real zeroParallaxDistance, Real eyeSeparation)
@@ -56,15 +56,15 @@ namespace cage
 		CAGE_ASSERT(left != right);
 		CAGE_ASSERT(bottom != top);
 		CAGE_ASSERT(sign(near) == sign(far) && near != far);
-		return Mat4(near * 2.0 / (right - left), 0, 0, 0, 0, near * 2.0 / (top - bottom), 0, 0, (right + left) / (right - left), (top + bottom) / (top - bottom), (far + near) / (near - far), -1, 0, 0, 2 * far * near / (near - far), 0);
+		return Mat4((2 * near) / (right - left), 0, 0, 0, 0, -(2 * near) / (bottom - top), 0, 0, (right + left) / (right - left), -(bottom + top) / (bottom - top), -far / (far - near), -1, 0, 0, -(far * near) / (far - near), 0);
 	}
 
 	Mat4 orthographicProjection(Real left, Real right, Real bottom, Real top, Real near, Real far)
 	{
 		CAGE_ASSERT(left != right);
 		CAGE_ASSERT(bottom != top);
 		CAGE_ASSERT(near != far);
-		return transpose(Mat4(2 / (right - left), 0, 0, -(right + left) / (right - left), 0, 2 / (top - bottom), 0, -(top + bottom) / (top - bottom), 0, 0, -2 / (far - near), -(far + near) / (far - near), 0, 0, 0, 1));
+		return Mat4(2 / (right - left), 0, 0, 0, 0, 2 / (top - bottom), 0, 0, 0, 0, -1 / (far - near), 0, -(right + left) / (right - left), -(top + bottom) / (top - bottom), -near / (far - near), 1);
 	}
 
 	StringPointer stereoModeToString(StereoModeEnum mode)

sources/libengine/assets/texture.cpp

@@ -60,6 +60,16 @@ namespace cage
 			wgpu::Extent3D extents = { copyWidth, copyHeight, numeric_cast<uint32>(resolution[2]) };
 
 			queue.WriteTexture(&dest, data.data(), data.size(), &layout, &extents);
+
+			/*
+			for (uint32 i = 0; i < resolution[2]; i++)
+			{
+				dest.origin.z = i;
+				extents.depthOrArrayLayers = 1;
+				PointerRange sub = data.subRange(layout.bytesPerRow * layout.rowsPerImage * i, layout.bytesPerRow * layout.rowsPerImage);
+				queue.WriteTexture(&dest, sub.data(), sub.size(), &layout, &extents);
+			}
+			*/
 		}
 
 		void processLoad(AssetContext *context)

sources/libengine/graphics/device.cpp

@@ -136,11 +136,21 @@ namespace cage
 					desc.SetDeviceLostCallback(wgpu::CallbackMode::AllowProcessEvents, lostFromDevice);
 					desc.SetUncapturedErrorCallback(errorFromDevice);
 
-					std::array<wgpu::FeatureName, 1> requiredFeatures = {};
-					requiredFeatures[0] = wgpu::FeatureName::TextureCompressionBC;
+					static constexpr std::array<wgpu::FeatureName, 1> requiredFeatures = {
+						wgpu::FeatureName::TextureCompressionBC,
+					};
 					desc.requiredFeatures = requiredFeatures.data();
 					desc.requiredFeatureCount = requiredFeatures.size();
 
+					static constexpr std::array<const char *, 2> toggles = {
+						"use_user_defined_labels_in_backend", // show my names for textures etc in nsight
+						"disable_symbol_renaming", // preserve variable names in shaders
+					};
+					wgpu::DawnTogglesDescriptor togglesDesc;
+					togglesDesc.enabledToggles = toggles.data();
+					togglesDesc.enabledToggleCount = toggles.size();
+					desc.nextInChain = &togglesDesc;
+
 					device = adapter.CreateDevice(&desc);
 					if (!device)
 						CAGE_THROW_ERROR(Exception, "failed to create wgpu device");

sources/libengine/graphics/encoder.cpp

@@ -139,6 +139,7 @@ namespace cage
 			rpd.vertex.module = config.shader->nativeVertex();
 			rpd.vertex.bufferCount = 1;
 			rpd.vertex.buffers = &config.model->getLayout();
+			rpd.primitive.cullMode = wgpu::CullMode::None;
 			if (passData.depthTarget)
 				rpd.depthStencil = &dss;
 			rpd.fragment = &fs;